v1.4.14

taye · Jul 11, 2019 · e20cd75 · e20cd75
1 parent a19426e
commit e20cd75
Show file tree

Hide file tree

Showing 18 changed files with 266 additions and 122 deletions.
diff --git a/packages/actions/resize.d.ts b/packages/actions/resize.d.ts
@@ -70,7 +70,7 @@ declare const resize: {
         topright: string;
         bottomleft: string;
     };
-    getCursor(action: ActionProps<any>): string;
+    getCursor(action: ActionProps<any>): any;
     defaultMargin: number;
 };
 export default resize;
diff --git a/packages/actions/resize.js b/packages/actions/resize.js
diff --git a/packages/core/tests/_helpers.d.ts b/packages/core/tests/_helpers.d.ts
@@ -63,14 +63,14 @@ export declare function mockScope(options?: any): any;
 export declare function mockSignals(): any;
 export declare function mockInteractable(props?: {}): any;
 export declare function getProps<T extends {}, K extends keyof T>(src: T, props: K[]): Pick<T, K>;
-export declare function testEnv({ plugins, target, rect, }?: {
+export declare function testEnv<T extends Interact.Target = HTMLElement>({ plugins, target, rect, }?: {
     plugins?: Interact.Plugin[];
-    target?: Interact.Target;
+    target?: T;
     rect?: Interact.Rect;
 }): {
     scope: import("@interactjs/core/scope").Scope;
     interaction: import("@interactjs/core/Interaction").Interaction<any>;
-    target: import("../../types/types").Target;
+    target: T;
     interactable: import("@interactjs/core/Interactable").Interactable;
     coords: MockCoords;
     event: ({

diff --git a/packages/core/tests/_helpers.js b/packages/core/tests/_helpers.js
diff --git a/packages/interact/index.js b/packages/interact/index.js
diff --git a/packages/interactjs/dist/api/doclets.json b/packages/interactjs/dist/api/doclets.json
diff --git a/packages/interactjs/dist/api/packages_actions_resize.ts.html b/packages/interactjs/dist/api/packages_actions_resize.ts.html
@@ -266,10 +266,11 @@ <h1 class="page-title">packages/actions/resize.ts</h1>
     return null
   },
 
-  cursors: null as unknown as ReturnType&lt;typeof initCursors>,
+  cursors: null as ReturnType&lt;typeof initCursors>,
 
   getCursor (action: ActionProps) {
-    const cursors = resize.cursors as { [key: string]: string }
+    const cursors = resize.cursors
+
     if (action.axis) {
       return cursors[action.name + action.axis]
     }
@@ -289,7 +290,7 @@ <h1 class="page-title">packages/actions/resize.ts</h1>
     return null
   },
 
-  defaultMargin: null as unknown as number,
+  defaultMargin: null as number,
 }
 
 function resizable (interactable: Interact.Interactable, options: Interact.OrBoolean&lt;Interact.ResizableOptions> | boolean, scope: Scope) {

diff --git a/packages/interactjs/dist/interact.js b/packages/interactjs/dist/interact.js
diff --git a/packages/interactjs/dist/interact.js.map b/packages/interactjs/dist/interact.js.map
diff --git a/packages/interactjs/dist/interact.min.js b/packages/interactjs/dist/interact.min.js
diff --git a/packages/interactjs/dist/interact.min.js.map b/packages/interactjs/dist/interact.min.js.map
diff --git a/packages/interactjs/index.d.ts b/packages/interactjs/index.d.ts
@@ -1,9 +1,12 @@
 import interact from '@interactjs/interact';
+import { Modifier } from '@interactjs/modifiers/base';
 import '@interactjs/types';
 import * as snappers from '@interactjs/utils/snappers';
 declare module '@interactjs/interact/interact' {
     interface InteractStatic {
-        modifiers?: any;
+        modifiers?: {
+            [key: string]: (options?: any) => Modifier;
+        };
         snappers?: typeof snappers & {
             [key: string]: any;
         };