fix: 添加 ts 类型给 compact, 并修复错误的 logic

czf0321 · Mar 1, 2018 · 7ae8168 · 7ae8168
1 parent 8e97bfb
commit 7ae8168
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/lib/dragact.tsx b/src/lib/dragact.tsx
@@ -164,7 +164,7 @@ export class Dragact extends React.Component<DragactProps, DragactState> {
 
     resetLayout = () => {
        const { compacted, mapLayout } = this.recalculateLayout(this.props.layout)
-       this.cachingLayout(this.state.mapLayout, this.state.layout);
+       this.cachingLayout();
        this.storeLayoutToHistory();
        this.setState({
            layout: compacted,
@@ -181,7 +181,7 @@ export class Dragact extends React.Component<DragactProps, DragactState> {
             return;
         }
         this.activeItem = layoutItem
-        this.cachingLayout(this.state.mapLayout, this.state.layout);
+        this.cachingLayout();
     }
 
     cacheCurrentLayoutEnd = (layoutItem: GridItemEvent) => {
@@ -195,7 +195,8 @@ export class Dragact extends React.Component<DragactProps, DragactState> {
         this.storeLayoutToHistory()
     }
 
-    cachingLayout = (mapLayout: mapLayout | undefined, layout: DragactLayoutItem[]) => {
+    cachingLayout = () => {
+        const { mapLayout, layout } = this.state
         this.cacheLayouts = JSON.stringify({
             mapLayout,
             layout
@@ -374,7 +375,7 @@ export class Dragact extends React.Component<DragactProps, DragactState> {
         }
 
     }
-    
+
     recalculateLayout = (layout: DragactLayoutItem[]) => {
         layout = correctLayout(layout, this.props.col)
         return compactLayout(layout, undefined, this.state.mapLayout);
@@ -383,11 +384,13 @@ export class Dragact extends React.Component<DragactProps, DragactState> {
     componentDidMount() {
         setTimeout(() => {
             const { compacted, mapLayout } = this.recalculateLayout(this.state.layout);
-            this.mapLayoutHistory.push(mapLayout);
             this.setState({
                 layout: compacted,
                 mapLayout: mapLayout,
                 containerHeight: getMaxContainerHeight(compacted, this.props.rowHeight, this.props.margin[1], this.state.containerHeight, false)
+            }, () => {
+                this.cachingLayout();
+                this.storeLayoutToHistory();
             })
         }, 1);
     }

diff --git a/src/lib/util/compact.ts b/src/lib/util/compact.ts
@@ -39,7 +39,7 @@ export const compactLayout = function () {
     var _cache: any = {
     };
 
-    return function (layout: DragactLayoutItem[], movingItem: GridItemEvent | undefined, mapedLayout: any) {
+    return function (layout: DragactLayoutItem[], movingItem: GridItemEvent | undefined, mapedLayout: mapLayout | undefined) {
         if (movingItem) {
             if (_cache.GridX === movingItem.GridX
                 && _cache.GridY === movingItem.GridY &&