deepsea-components 5.16.11 → 5.16.13

package/dist/components/DraggableGrid.cjs

@@ -166,6 +166,12 @@ function DraggableGridItem(t0) {
     } else t3 = $[18];
     return t3;
 }
+function isLegalOrderMap({ orders, keys, orderMap }) {
+    if (!isTheSameIterable(orderMap.keys(), keys)) return false;
+    const values = Array.from(orderMap.values());
+    if (values.some((value)=>!orders.includes(value))) return false;
+    return values.length === new Set(values).size;
+}
 function DraggableGrid({ className, classNames, style, items = [], disabled, columns, rows, gap = 0, gapX = gap, gapY = gap, itemWidth, itemHeight, orderMap, onOrderMapChange, render, keyExtractor, isItemDisabled: _isItemDisabled, isOrderDisabled, orderPriority, handle, onDragMoveStart: _onDragMoveStart, onDragMove: _onDragMove, onDragMoveEnd: _onDragMoveEnd, ...rest }) {
     const keyToItem_0 = (0, external_react_namespaceObject.useMemo)(()=>{
         const keyToItem = new Map();
@@ -173,7 +179,6 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
             const key = keyExtractor ? keyExtractor(item) : item;
             keyToItem.set(key, item);
         });
-        console.log(keyToItem);
         return keyToItem;
     }, [
         items,
@@ -192,9 +197,13 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
         orderPriority
     ]);
     const [keyToOrder, setKeyToOrder] = (0, external_react_namespaceObject.useState)(()=>{
-        if (orderMap) return orderMap;
+        if (orderMap && isLegalOrderMap({
+            orders: orders_0,
+            keys: keyToItem_0.keys(),
+            orderMap
+        })) return orderMap;
         const newOrderMap = getOrderMap({
-            prev: void 0,
+            prev: orderMap,
             orders: orders_0,
             keys: Array.from(keyToItem_0.keys()),
             orderPriority
@@ -256,7 +265,11 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
     ]);
     (0, external_react_namespaceObject.useEffect)(()=>{
         if (orderMap === keyToOrder) return;
-        if (orderMap) setKeyToOrder(orderMap);
+        if (!!orderMap && isLegalOrderMap({
+            orders: orders_0,
+            keys: keyToItem_0.keys(),
+            orderMap
+        })) setKeyToOrder(orderMap);
         else null == onOrderMapChange || onOrderMapChange(keyToOrder);
     }, [
         orderMap,

package/dist/components/DraggableGrid.js

@@ -128,6 +128,12 @@ function DraggableGridItem(t0) {
     } else t3 = $[18];
     return t3;
 }
+function isLegalOrderMap({ orders, keys, orderMap }) {
+    if (!isTheSameIterable(orderMap.keys(), keys)) return false;
+    const values = Array.from(orderMap.values());
+    if (values.some((value)=>!orders.includes(value))) return false;
+    return values.length === new Set(values).size;
+}
 function DraggableGrid({ className, classNames, style, items = [], disabled, columns, rows, gap = 0, gapX = gap, gapY = gap, itemWidth, itemHeight, orderMap, onOrderMapChange, render, keyExtractor, isItemDisabled: _isItemDisabled, isOrderDisabled, orderPriority, handle, onDragMoveStart: _onDragMoveStart, onDragMove: _onDragMove, onDragMoveEnd: _onDragMoveEnd, ...rest }) {
     const keyToItem_0 = useMemo(()=>{
         const keyToItem = new Map();
@@ -135,7 +141,6 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
             const key = keyExtractor ? keyExtractor(item) : item;
             keyToItem.set(key, item);
         });
-        console.log(keyToItem);
         return keyToItem;
     }, [
         items,
@@ -154,9 +159,13 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
         orderPriority
     ]);
     const [keyToOrder, setKeyToOrder] = useState(()=>{
-        if (orderMap) return orderMap;
+        if (orderMap && isLegalOrderMap({
+            orders: orders_0,
+            keys: keyToItem_0.keys(),
+            orderMap
+        })) return orderMap;
         const newOrderMap = getOrderMap({
-            prev: void 0,
+            prev: orderMap,
             orders: orders_0,
             keys: Array.from(keyToItem_0.keys()),
             orderPriority
@@ -218,7 +227,11 @@ function DraggableGrid({ className, classNames, style, items = [], disabled, col
     ]);
     useEffect(()=>{
         if (orderMap === keyToOrder) return;
-        if (orderMap) setKeyToOrder(orderMap);
+        if (!!orderMap && isLegalOrderMap({
+            orders: orders_0,
+            keys: keyToItem_0.keys(),
+            orderMap
+        })) setKeyToOrder(orderMap);
         else null == onOrderMapChange || onOrderMapChange(keyToOrder);
     }, [
         orderMap,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepsea-components",
-  "version": "5.16.11",
+  "version": "5.16.13",
   "description": "格数科技自用组件库",
   "type": "module",
   "exports": {

package/src/components/DraggableGrid.tsx

@@ -248,6 +248,20 @@ interface DraggingItem<K extends Key> {
     keyToOrder: DraggableGridKeyToOrder<K>
 }
 
+interface IsLegalOrderMapParams<K extends Key> {
+    orders: number[]
+    keys: Iterable<K>
+    orderMap: DraggableGridKeyToOrder<K>
+}
+
+/** 检查 orderMap 是否合法 */
+function isLegalOrderMap<K extends Key>({ orders, keys, orderMap }: IsLegalOrderMapParams<K>) {
+    if (!isTheSameIterable(orderMap.keys(), keys)) return false
+    const values = Array.from(orderMap.values())
+    if (values.some(value => !orders.includes(value))) return false
+    return values.length === new Set(values).size
+}
+
 export function DraggableGrid<T, K extends Key = T extends Key ? T : never>({
     className,
     classNames,
@@ -280,7 +294,6 @@ export function DraggableGrid<T, K extends Key = T extends Key ? T : never>({
             const key = keyExtractor ? keyExtractor(item) : (item as unknown as K)
             keyToItem.set(key, item)
         })
-        console.log(keyToItem)
         return keyToItem
     }, [items, keyExtractor])
 
@@ -300,8 +313,8 @@ export function DraggableGrid<T, K extends Key = T extends Key ? T : never>({
 
     /** 元素的 key 到次序的映射 */
     const [keyToOrder, setKeyToOrder] = useState(() => {
-        if (orderMap) return orderMap
-        const newOrderMap = getOrderMap({ prev: undefined, orders, keys: Array.from(keyToItem.keys()), orderPriority })
+        if (orderMap && isLegalOrderMap({ orders, keys: keyToItem.keys(), orderMap })) return orderMap
+        const newOrderMap = getOrderMap({ prev: orderMap, orders, keys: Array.from(keyToItem.keys()), orderPriority })
         onOrderMapChange?.(newOrderMap)
         return newOrderMap
     })
@@ -355,7 +368,7 @@ export function DraggableGrid<T, K extends Key = T extends Key ? T : never>({
     /** 受控 */
     useEffect(() => {
         if (orderMap === keyToOrder) return
-        if (!!orderMap) setKeyToOrder(orderMap)
+        if (!!orderMap && isLegalOrderMap({ orders, keys: keyToItem.keys(), orderMap })) setKeyToOrder(orderMap)
         else onOrderMapChange?.(keyToOrder)
     }, [orderMap, keyToOrder, onOrderMapChange])