v1.5.1

taye · Jul 14, 2019 · 9b8e274 · 9b8e274
1 parent 9ebfd7d
commit 9b8e274
Show file tree

Hide file tree

Showing 27 changed files with 186 additions and 223 deletions.
diff --git a/packages/interactjs/dist/api/doclets.json b/packages/interactjs/dist/api/doclets.json
diff --git a/packages/interactjs/dist/api/packages_modifiers_snap_edges.ts.html b/packages/interactjs/dist/api/packages_modifiers_snap_edges.ts.html
@@ -71,7 +71,7 @@ <h1 class="page-title">packages/modifiers/snap/edges.ts</h1>
 
 import clone from '@interactjs/utils/clone'
 import extend from '@interactjs/utils/extend'
-import snapSize from './size'
+import snapSize, { SnapSizeOptions } from './size'
 
 function start (arg) {
   const edges = arg.interaction.prepared.edges
@@ -92,9 +92,9 @@ <h1 class="page-title">packages/modifiers/snap/edges.ts</h1>
 const snapEdges = {
   start,
   set,
-  defaults: extend(clone(snapSize.defaults), {
+  defaults: extend(clone(snapSize.defaults) as SnapSizeOptions, {
     offset: { x: 0, y: 0 },
-  }),
+  } as unknown),
 }
 
 export default snapEdges

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,10 +1,11 @@
 import interact from '@interactjs/interact';
+import * as modifiers from '@interactjs/modifiers';
 import { Modifier } from '@interactjs/modifiers/base';
 import '@interactjs/types';
 import * as snappers from '@interactjs/utils/snappers';
 declare module '@interactjs/interact/interact' {
     interface InteractStatic {
-        modifiers?: {
+        modifiers?: typeof modifiers & {
             [key: string]: (options?: any) => Modifier;
         };
         snappers?: typeof snappers & {

diff --git a/packages/interactjs/index.js b/packages/interactjs/index.js
diff --git a/packages/modifiers/index.d.ts b/packages/modifiers/index.d.ts
@@ -1,27 +1,6 @@
 export declare const snap: {
-    (_options?: Partial<{
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-        offsetWithOrigin: boolean;
-        relativePoints: any;
-    }>): import("./base").Modifier<"snap", {
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-        offsetWithOrigin: boolean;
-        relativePoints: any;
-    }>;
-    _defaults: {
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-        offsetWithOrigin: boolean;
-        relativePoints: any;
-    };
+    (_options?: Partial<import("./snap/pointer").SnapOptions>): import("./base").Modifier<"snap", import("./snap/pointer").SnapOptions>;
+    _defaults: import("./snap/pointer").SnapOptions;
     _methods: {
         start: any;
         set: any;
@@ -30,23 +9,8 @@ export declare const snap: {
     };
 };
 export declare const snapSize: {
-    (_options?: Partial<{
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    }>): import("./base").Modifier<"snapSize", {
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    }>;
-    _defaults: {
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    };
+    (_options?: Partial<Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">>): import("./base").Modifier<"snapSize", Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">>;
+    _defaults: Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">;
     _methods: {
         start: any;
         set: any;
@@ -55,38 +19,8 @@ export declare const snapSize: {
     };
 };
 export declare const snapEdges: {
-    (_options?: Partial<{
-        offset: {
-            x: number;
-            y: number;
-        };
-    } & Partial<{
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    }>>): import("./base").Modifier<"snapEdges", {
-        offset: {
-            x: number;
-            y: number;
-        };
-    } & Partial<{
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    }>>;
-    _defaults: {
-        offset: {
-            x: number;
-            y: number;
-        };
-    } & Partial<{
-        enabled: boolean;
-        range: number;
-        targets: any;
-        offset: any;
-    }>;
+    (_options?: Partial<Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">>): import("./base").Modifier<"snapEdges", Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">>;
+    _defaults: Pick<import("./snap/pointer").SnapOptions, "enabled" | "offset" | "endOnly" | "targets" | "range">;
     _methods: {
         start: any;
         set: any;
@@ -95,8 +29,8 @@ export declare const snapEdges: {
     };
 };
 export declare const restrict: {
-    (_options?: Partial<import("../types/types").RestrictOptions>): import("./base").Modifier<"restrict", import("../types/types").RestrictOptions>;
-    _defaults: import("../types/types").RestrictOptions;
+    (_options?: Partial<import("./restrict/pointer").RestrictOptions>): import("./base").Modifier<"restrict", import("./restrict/pointer").RestrictOptions>;
+    _defaults: import("./restrict/pointer").RestrictOptions;
     _methods: {
         start: any;
         set: any;
@@ -105,22 +39,22 @@ export declare const restrict: {
     };
 };
 export declare const restrictRect: {
-    (_options?: Partial<import("../types/types").RestrictOptions & {
+    (_options?: Partial<import("./restrict/pointer").RestrictOptions & {
         elementRect: {
             top: number;
             left: number;
             bottom: number;
             right: number;
         };
-    }>): import("./base").Modifier<"restrictRect", import("../types/types").RestrictOptions & {
+    }>): import("./base").Modifier<"restrictRect", import("./restrict/pointer").RestrictOptions & {
         elementRect: {
             top: number;
             left: number;
             bottom: number;
             right: number;
         };
     }>;
-    _defaults: import("../types/types").RestrictOptions & {
+    _defaults: import("./restrict/pointer").RestrictOptions & {
         elementRect: {
             top: number;
             left: number;
@@ -136,23 +70,8 @@ export declare const restrictRect: {
     };
 };
 export declare const restrictEdges: {
-    (_options?: Partial<{
-        enabled: boolean;
-        inner: any;
-        outer: any;
-        offset: any;
-    }>): import("./base").Modifier<"restrictEdges", {
-        enabled: boolean;
-        inner: any;
-        outer: any;
-        offset: any;
-    }>;
-    _defaults: {
-        enabled: boolean;
-        inner: any;
-        outer: any;
-        offset: any;
-    };
+    (_options?: Partial<import("./restrict/edges").RestrictEdgesOptions>): import("./base").Modifier<"restrictEdges", import("./restrict/edges").RestrictEdgesOptions>;
+    _defaults: import("./restrict/edges").RestrictEdgesOptions;
     _methods: {
         start: any;
         set: any;
@@ -161,20 +80,8 @@ export declare const restrictEdges: {
     };
 };
 export declare const restrictSize: {
-    (_options?: Partial<{
-        enabled: boolean;
-        min: any;
-        max: any;
-    }>): import("./base").Modifier<"restrictSize", {
-        enabled: boolean;
-        min: any;
-        max: any;
-    }>;
-    _defaults: {
-        enabled: boolean;
-        min: any;
-        max: any;
-    };
+    (_options?: Partial<import("./restrict/size").RestrictSizeOptions>): import("./base").Modifier<"restrictSize", import("./restrict/size").RestrictSizeOptions>;
+    _defaults: import("./restrict/size").RestrictSizeOptions;
     _methods: {
         start: any;
         set: any;

diff --git a/packages/modifiers/restrict/edges.d.ts b/packages/modifiers/restrict/edges.d.ts
@@ -1,4 +1,12 @@
 import Interaction from '@interactjs/core/Interaction';
+import { RestrictOptions } from './pointer';
+export interface RestrictEdgesOptions {
+    inner: RestrictOptions['restriction'];
+    outer: RestrictOptions['restriction'];
+    offset: RestrictOptions['offset'];
+    endOnly: boolean;
+    enabled: boolean;
+}
 declare function start({ interaction, state }: {
     interaction: Interaction;
     state: any;
@@ -24,11 +32,6 @@ declare const restrictEdges: {
     getRestrictionRect: (value: any, interaction: any, coords?: import("../../types/types").Point) => import("../../types/types").Rect;
     start: typeof start;
     set: typeof set;
-    defaults: {
-        enabled: boolean;
-        inner: any;
-        outer: any;
-        offset: any;
-    };
+    defaults: RestrictEdgesOptions;
 };
 export default restrictEdges;