v1.4.0-rc.9

taye · Apr 5, 2019 · 5ff448b · 5ff448b
1 parent 653c42d
commit 5ff448b
Show file tree

Hide file tree

Showing 13 changed files with 1,101 additions and 1,006 deletions.
diff --git a/packages/auto-scroll/index.js b/packages/auto-scroll/index.js
diff --git a/packages/core/InteractableSet.d.ts b/packages/core/InteractableSet.d.ts
@@ -0,0 +1,16 @@
+import Signals from '@interactjs/utils/Signals';
+export default class InteractableSet {
+    protected scope: Interact.Scope;
+    signals: Signals;
+    list: Interact.Interactable[];
+    selectorMap: {
+        [selector: string]: Array<{
+            context: Document | Element;
+            interactable: Interact.Interactable;
+        }>;
+    };
+    constructor(scope: Interact.Scope);
+    new(target: Interact.Target, options?: any): Interact.Interactable;
+    get(target: Interact.Target, options: any): any;
+    forEachMatch(element: Document | Element, callback: (interactable: any) => any): any;
+}
diff --git a/packages/core/InteractableSet.js b/packages/core/InteractableSet.js
diff --git a/packages/core/scope.d.ts b/packages/core/scope.d.ts
@@ -2,6 +2,7 @@ import * as utils from '@interactjs/utils';
 import defaults from './defaultOptions';
 import Eventable from './Eventable';
 import InteractableBase from './Interactable';
+import InteractableSet from './InteractableSet';
 import InteractEvent from './InteractEvent';
 export declare enum ActionName {
 }
@@ -20,6 +21,7 @@ export interface Plugin {
     [key: string]: any;
 }
 export declare class Scope {
+    id: string;
     signals: utils.Signals;
     browser: {
         init: (window: any) => void;
@@ -97,14 +99,4 @@ export declare class Scope {
     getDocOptions(doc: Document): any;
     now(): number;
 }
-export declare class InteractableSet {
-    protected scope: Scope;
-    signals: utils.Signals;
-    list: InteractableBase[];
-    constructor(scope: Scope);
-    new(target: Interact.Target, options?: any): InteractableBase;
-    indexOfElement(target: Interact.Target, context: Document | Element): number;
-    get(element: Interact.Target, options: any, dontCheckInContext?: boolean): InteractableBase;
-    forEachMatch(element: Document | Element, callback: (interactable: any) => any): any;
-}
 export declare function initScope(scope: Scope, window: Window): Scope;
diff --git a/packages/core/scope.js b/packages/core/scope.js
diff --git a/packages/interact/interact.d.ts b/packages/interact/interact.d.ts
@@ -61,7 +61,7 @@ export declare const interact: InteractStatic;
 declare function use(plugin: Interact.Plugin, options?: {
     [key: string]: any;
 }): InteractStatic;
-declare function isSet(element: Element, options?: any): boolean;
+declare function isSet(target: Element, options?: any): boolean;
 declare function on(type: string | Interact.EventTypes, listener: Interact.ListenersArg, options?: any): InteractStatic;
 declare function off(type: any, listener: any, options: any): InteractStatic;
 declare function debug(): Scope;

diff --git a/packages/interact/interact.js b/packages/interact/interact.js
diff --git a/packages/interactjs/dist/docs/doclets.json b/packages/interactjs/dist/docs/doclets.json
diff --git a/packages/interactjs/dist/docs/packages_interact_interact.ts.html b/packages/interactjs/dist/docs/packages_interact_interact.ts.html
@@ -146,8 +146,8 @@ <h1 class="page-title">packages/interact/interact.ts</h1>
  * passed to interact
  */
 interact.isSet = isSet
-function isSet (element: Element, options?: any) {
-  return scope.interactables.indexOfElement(element, options &amp;&amp; options.context) !== -1
+function isSet (target: Element, options?: any) {
+  return !!scope.interactables.get(target, options &amp;&amp; options.context)
 }
 
 /**