fix: remove wrong react types #703

daybrush · Jul 22, 2022 · 25dced4 · 25dced4
1 parent 21c7629
commit 25dced4
Show file tree

Hide file tree

Showing 12 changed files with 347 additions and 303 deletions.
diff --git a/packages/react-moveable/src/react-moveable/MoveableGroup.tsx b/packages/react-moveable/src/react-moveable/MoveableGroup.tsx
@@ -4,10 +4,11 @@ import ChildrenDiffer from "@egjs/children-differ";
 import { getAbleGesto, getTargetAbleGesto } from "./gesto/getAbleGesto";
 import Groupable from "./ables/Groupable";
 import { MIN_NUM, MAX_NUM, TINY_NUM } from "./consts";
-import { getTargetInfo, getAbsolutePosesByState, equals, unset } from "./utils";
+import { getAbsolutePosesByState, equals, unset } from "./utils";
 import { minus, plus, rotate } from "@scena/matrix";
 import { getMinMaxs } from "overlap-area";
 import { throttle } from "@daybrush/utils";
+import { getMoveableTargetInfo } from "./utils/getMoveableTargetInfo";
 
 function getMaxPos(poses: number[][][], index: number) {
     return Math.max(...poses.map(([pos1, pos2, pos3, pos4]) => {
@@ -143,7 +144,7 @@ class MoveableGroup extends MoveableManager<GroupableProps> {
         state.height = height;
 
         const container = this.getContainer();
-        const info = getTargetInfo(
+        const info = getMoveableTargetInfo(
             this.controlBox.getElement(),
             target,
             this.controlBox.getElement(),

diff --git a/packages/react-moveable/src/react-moveable/MoveableManager.tsx b/packages/react-moveable/src/react-moveable/MoveableManager.tsx
@@ -3,7 +3,6 @@ import { createElement } from "react";
 import { PREFIX } from "./consts";
 import {
     prefix,
-    getTargetInfo,
     unset,
     getAbsolutePosesByState,
     getRect,
@@ -32,6 +31,7 @@ import { fitPoints, getAreaSize, getOverlapSize, isInside } from "overlap-area";
 import EventManager from "./EventManager";
 import styled from "react-css-styled";
 import EventEmitter from "@scena/event-emitter";
+import { getMoveableTargetInfo } from "./utils/getMoveableTargetInfo";
 
 export default class MoveableManager<T = {}>
     extends React.PureComponent<MoveableManagerProps<T>, MoveableManagerState> {
@@ -72,7 +72,7 @@ export default class MoveableManager<T = {}>
         gesto: null,
         renderPoses: [[0, 0], [0, 0], [0, 0], [0, 0]],
         disableNativeEvent: false,
-        ...getTargetInfo(null),
+        ...getMoveableTargetInfo(null),
     };
     public enabledAbles: Able[] = [];
     public targetAbles: Able[] = [];
@@ -336,7 +336,7 @@ export default class MoveableManager<T = {}>
             ? parentMoveable.props.rootContainer
             : props.rootContainer;
         this.updateState(
-            getTargetInfo(this.controlBox && this.controlBox.getElement(),
+            getMoveableTargetInfo(this.controlBox && this.controlBox.getElement(),
                 target,
                 container,
                 container,

diff --git a/packages/react-moveable/src/react-moveable/externalTypes.ts b/packages/react-moveable/src/react-moveable/externalTypes.ts
@@ -0,0 +1,4 @@
+export * from "./types";
+export type { MoveableElementMatrixInfo }  from "./utils/calculateMatrixStack";
+export type { MoveableElementInfo }  from "./utils/getElementInfo";
+export type { MoveableTargetInfo }  from "./utils/getMoveableTargetInfo";
diff --git a/packages/react-moveable/src/react-moveable/index.esm.ts b/packages/react-moveable/src/react-moveable/index.esm.ts
@@ -18,7 +18,7 @@ export {
     InitialMoveable,
 } from "./InitialMoveable";
 
-export { getElementInfo } from "./utils";
+export { getElementInfo } from "./utils/getElementInfo";
 
 export {
     default as Draggable,

diff --git a/packages/react-moveable/src/react-moveable/types.ts b/packages/react-moveable/src/react-moveable/types.ts
@@ -2,6 +2,7 @@ import { IObject } from "@daybrush/utils";
 import Gesto, * as GestoTypes from "gesto";
 import CustomGesto from "./gesto/CustomGesto";
 import { MOVEABLE_EVENTS_MAP, MOVEABLE_PROPS_MAP } from "./ables/consts";
+import { MoveableTargetInfo } from "./utils/getMoveableTargetInfo";
 
 export interface MoveableClientRect {
     left: number;
@@ -28,6 +29,24 @@ export type MoveableManagerProps<T = {}> = {
 } & MoveableDefaultOptions & (unknown extends T ? IObject<any> : T);
 
 export type AnyObject<T> = (unknown extends T ? IObject<any> : T);
+
+/**
+ * @typedef
+ * @memberof Moveable
+ */
+export interface MoveablePosition {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+    origin: number[];
+    pos1: number[];
+    pos2: number[];
+    pos3: number[];
+    pos4: number[];
+    direction: 1 | -1;
+}
+
 /**
  * @typedef
  * @memberof Moveable
@@ -162,41 +181,10 @@ export interface MatrixInfo {
 }
 export type MoveableManagerState<T = {}> = {
     container: SVGElement | HTMLElement | null | undefined;
-    target: SVGElement | HTMLElement | null | undefined;
-    left: number;
-    top: number;
-    right: number;
-    bottom: number;
-    width: number;
-    height: number;
-    beforeMatrix: number[];
-    allMatrix: number[];
-    targetTransform: string;
-    rootMatrix: number[];
-    targetMatrix: number[];
-    offsetMatrix: number[];
-    is3d: boolean;
-    transformOrigin: number[];
-    targetOrigin: number[];
-    beforeOrigin: number[];
-    origin: number[];
-    originalBeforeOrigin: number[];
-    beforeDirection: number;
-    direction: number;
-    renderPoses: number[][];
     disableNativeEvent: boolean;
-    pos1: number[];
-    pos2: number[];
-    pos3: number[];
-    pos4: number[];
     gesto: Gesto | CustomGesto | null;
-    targetClientRect: MoveableClientRect;
-    containerClientRect: MoveableClientRect;
-    moveableClientRect: MoveableClientRect;
-    rootContainerClientRect: MoveableClientRect;
-    rotation: number;
-    hasFixed: boolean;
-} & ElementSizes & T;
+    renderPoses: number[][];
+} & MoveableTargetInfo & T;
 
 /**
  * @typedef