use better id for _holds request (fix memory leak)

doc22940 · Jul 24, 2019 · b6d20c9 · b6d20c9
1 parent b7cb261
commit b6d20c9
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 68 deletions.
diff --git a/dist/es2015/UI.js b/dist/es2015/UI.js
diff --git a/dist/es5.js b/dist/es5.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/pts.js b/dist/pts.js
diff --git a/src/UI.ts b/src/UI.ts
@@ -35,7 +35,7 @@ export class UI {
   protected _actions: {[key:string]: UIHandler[] };
   protected _states: {[key:string]: any};
 
-  protected _holds:string[] = [];
+  protected _holds = new Map<number, string>();
 
   /**
    * Create an UI element. You may also create a new UI using one of the static helper like [`UI.fromRectangle`](#link) or [`UI.fromCircle`](#link).
@@ -164,17 +164,17 @@ export class UI {
 
   /**
    * Listen for UI events and trigger action handlers.
-   * @param key an action key. Can be one of UIPointerActions or a custom one.
+   * @param event an action event. Can be one of UIPointerActions or a custom one.
    * @param p a point to check
    */
-  listen( key:string, p:PtLike ):boolean {
-    if ( this._actions[key] !== undefined ) {
+  listen( event:string, p:PtLike ):boolean {
+    if ( this._actions[event] !== undefined ) {
 
-      if ( this._within(p) || this._holds.indexOf(key) >= 0 ) {
-        UI._trigger( this._actions[key], this, p, key );
+      if ( this._within(p) || Array.from(this._holds.values()).indexOf(event) >= 0 ) {
+        UI._trigger( this._actions[event], this, p, event );
         return true;
       } else if (this._actions['all']) { // listen for all regardless of trigger
-        UI._trigger( this._actions['all'], this, p, key );
+        UI._trigger( this._actions['all'], this, p, event );
         return true;
       }
     }
@@ -184,23 +184,26 @@ export class UI {
 
   /**
    * Continue to keep track of an actions even if it's not within this UI. Useful for hover-leave and drag-outside.
-   * @param key a string defined in [`UIPointerActions`](#link)
+   * @param event a string defined in [`UIPointerActions`](#link)
    */
-  protected hold( key:string ):number {
-    this._holds.push( key );
-    return this._holds.length-1;
+  protected hold( event:string ):number {
+    let newKey = Math.max(0, ...Array.from(this._holds.keys())) + 1;
+    this._holds.set(newKey, event);
+    console.log('hold', newKey);
+    return newKey;
   }
 
 
   /**
    * Stop keeping track of this action
-   * @param id an id returned by the [`UI.hold`](#link) function
+   * @param key an id returned by the [`UI.hold`](#link) function
    */
-  protected unhold( id?:number ):void {
-    if (id !== undefined) {
-      this._holds.splice( id, 1 );
+  protected unhold( key?:number ):void {
+    console.log('unhold', key);
+    if (key !== undefined) {
+      this._holds.delete(key);
     } else {
-      this._holds = [];
+      this._holds.clear();
     }
   }