fix: 修复计算问题

limaofeng · Nov 13, 2021 · 6f3499c · 6f3499c
1 parent d3c32b9
commit 6f3499c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/SortableProvider.tsx b/src/SortableProvider.tsx
@@ -350,11 +350,9 @@ function useStore(items: ISortableItem[], pos: number[]): ISortableContext {
     (dispatch as any)({
       type: SortableActionType.init,
       payload: {
-        items: outside.map((item, index) => {
+        items: outside.map((item) => {
           const data = state.items.find((x) => x.id == item.id);
           if (!data) {
-            item.index = index;
-            item.pos = state.pos ? [...state.pos, index] : item.pos;
             return item;
           }
           const { _originalSortable, _sortable, _rect, ...prevData } = data;
@@ -379,6 +377,9 @@ function useStore(items: ISortableItem[], pos: number[]): ISortableContext {
         id: state.id,
       },
     });
+    if (!!state.pos) {
+      (dispatch as any)({ type: SortableActionType.UPDATE_POS, payload: state.pos });
+    }
   }, [outside]);
 
   useEffect(() => {

diff --git a/src/hooks/useSortItem.ts b/src/hooks/useSortItem.ts
@@ -210,11 +210,6 @@ function useSortItem<T extends ISortableItem, RT extends HTMLElement>(
     });
   }, [sortableId]);
 
-  // useEffect(() => {
-  //   // console.log('handleUpdate pos', pos, options?.index);
-  //   handleUpdate({ ...dataRef.current, index: options?.index, pos: [...pos, options?.index] });
-  // }, [options?.index, pos.join('-')]);
-
   return [
     {
       clicked: clicked.current,