Use named type instead of ReturnType<typeof...>

jupyterlab · Sep 11, 2022 · a02d471 · a02d471
1 parent 7dcd334
commit a02d471
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/coreutils/tests/src/schedule.spec.ts b/packages/coreutils/tests/src/schedule.spec.ts
@@ -25,7 +25,7 @@ describe('@lumino/coreutils', () => {
     it('should allow a callback to be unscheduled', async () => {
       let called = false;
       unschedule(schedule(() => (called = true)));
-      await sleep(20);
+      await sleep(100);
       expect(called).to.equal(false);
     });
   });

diff --git a/packages/messaging/src/index.ts b/packages/messaging/src/index.ts
@@ -11,7 +11,7 @@ import { ArrayExt, every, retro, some } from '@lumino/algorithm';
 
 import { LinkedList } from '@lumino/collections';
 
-import { schedule, unschedule } from '@lumino/coreutils';
+import { schedule, ScheduleHandle, unschedule } from '@lumino/coreutils';
 
 /**
  * A message which can be delivered to a message handler.
@@ -472,7 +472,7 @@ export namespace MessageLoop {
   /**
    * The id of the pending loop task animation frame.
    */
-  let loopTaskID: ReturnType<typeof schedule> = 0;
+  let loopTaskID: ScheduleHandle = 0;
 
   /**
    * A guard flag to prevent flush recursion.

diff --git a/packages/polling/src/poll.ts b/packages/polling/src/poll.ts
@@ -5,6 +5,7 @@ import {
   JSONExt,
   PromiseDelegate,
   schedule,
+  ScheduleHandle,
   unschedule
 } from '@lumino/coreutils';
 
@@ -38,7 +39,7 @@ export class Poll<T = any, U = any, V extends string = 'standby'>
   constructor(options: Poll.IOptions<T, U, V>) {
     this.standby = options.standby || Private.DEFAULT_STANDBY;
     this._factory = options.factory;
-    this._linger = options.linger ?? 1;
+    this._linger = options.linger ?? Private.DEFAULT_LINGER;
     this._state = { ...Private.DEFAULT_STATE, timestamp: new Date().getTime() };
 
     // Normalize poll frequency `max` to be the greater of
@@ -339,7 +340,7 @@ export class Poll<T = any, U = any, V extends string = 'standby'>
   private _disposed = new Signal<this, void>(this);
   private _factory: Poll.Factory<T, U, V>;
   private _frequency: IPoll.Frequency;
-  private _handle: ReturnType<typeof schedule> = -1;
+  private _handle: ScheduleHandle = -1;
   private _linger: number;
   private _lingered = 0;
   private _state: IPoll.State<T, U, V>;
@@ -455,6 +456,11 @@ namespace Private {
     max: 30 * 1000
   };
 
+  /**
+   * The default number of times to `linger` when a poll is hidden.
+   */
+  export const DEFAULT_LINGER = 1;
+
   /**
    * The default poll name.
    */