nuudel-core 0.2.79 → 0.2.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -34,12 +34,18 @@ const measuringConfig = {
|
|
|
34
34
|
strategy: core_1.MeasuringStrategy.Always,
|
|
35
35
|
},
|
|
36
36
|
};
|
|
37
|
+
const objectsEqual = (o1, o2) => Object.keys(o1).length === Object.keys(o2).length &&
|
|
38
|
+
Object.keys(o1).every((p) => o1[p] === o2[p]);
|
|
39
|
+
const arraysEqual = (a1, a2) => a1.length === a2.length && a1.every((o, idx) => objectsEqual(o, a2[idx]));
|
|
37
40
|
const Sortable = (_a) => {
|
|
38
41
|
var { onChange, renderItem, children } = _a, props = __rest(_a, ["onChange", "renderItem", "children"]);
|
|
39
42
|
const [items, setItems] = (0, react_1.useState)(props.items || []);
|
|
40
43
|
const [active, setActive] = (0, react_1.useState)(null);
|
|
41
44
|
(0, react_1.useEffect)(() => {
|
|
42
|
-
|
|
45
|
+
console.log('===', props.items, items);
|
|
46
|
+
if (!arraysEqual(props.items, items)) {
|
|
47
|
+
setItems(props.items || []);
|
|
48
|
+
}
|
|
43
49
|
}, [props.items]);
|
|
44
50
|
const activeItem = (0, react_1.useMemo)(() => items.find((item) => (item === null || item === void 0 ? void 0 : item.uri) === (active === null || active === void 0 ? void 0 : active.id)), [active, items]);
|
|
45
51
|
const sensors = (0, core_1.useSensors)((0, core_1.useSensor)(core_1.TouchSensor), (0, core_1.useSensor)(core_1.PointerSensor), (0, core_1.useSensor)(core_1.KeyboardSensor, {
|
|
@@ -59,13 +65,17 @@ const Sortable = (_a) => {
|
|
|
59
65
|
return arr;
|
|
60
66
|
});
|
|
61
67
|
}
|
|
62
|
-
|
|
68
|
+
if (active != null) {
|
|
69
|
+
setActive(null);
|
|
70
|
+
}
|
|
63
71
|
}, []);
|
|
64
72
|
const handleDragCancel = (0, react_1.useCallback)(() => {
|
|
65
|
-
|
|
73
|
+
if (active != null) {
|
|
74
|
+
setActive(null);
|
|
75
|
+
}
|
|
66
76
|
}, []);
|
|
67
77
|
return (items === null || items === void 0 ? void 0 : items.length) > 1 ? ((0, jsx_runtime_1.jsxs)(core_1.DndContext, Object.assign({ sensors: sensors, collisionDetection: core_1.closestCenter, onDragStart: handleDragStart, onDragEnd: handleDragEnd, onDragCancel: handleDragCancel, measuring: measuringConfig }, { children: [(0, jsx_runtime_1.jsx)(sortable_1.SortableContext, Object.assign({ items: items.filter(Boolean), strategy: sortable_1.rectSortingStrategy, disabled: props.disabled }, { children: (0, jsx_runtime_1.jsxs)(Grid_1.default, Object.assign({ columns: items.length + 1, gridGap: props.gridGap }, { children: [items === null || items === void 0 ? void 0 : items.filter(Boolean).map((item, index) => ((0, jsx_runtime_1.jsx)("li", { children: renderItem(item) }, (item === null || item === void 0 ? void 0 : item.uri) || index))), children] }), void 0) }), void 0), (0, jsx_runtime_1.jsx)(core_1.DragOverlay, Object.assign({ adjustScale: true, dropAnimation: dropAnimationConfig }, { children: !activeItem ? null : renderItem(activeItem) }), void 0)] }), void 0)) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children }, void 0));
|
|
68
78
|
};
|
|
69
79
|
exports.Sortable = Sortable;
|
|
70
80
|
exports.default = exports.Sortable;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvU29ydGFibGUvaW5kZXgudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlDQUE2RTtBQUU3RSx3Q0FjdUI7QUFDdkIsZ0RBSzJCO0FBQzNCLGtEQUEwQjtBQWdCMUIsTUFBTSxtQkFBbUIsR0FBa0I7SUFDekMsV0FBVyxFQUFFLElBQUEsc0NBQStCLEVBQUM7UUFDM0MsTUFBTSxFQUFFO1lBQ04sTUFBTSxFQUFFO2dCQUNOLE9BQU8sRUFBRSxLQUFLO2FBQ2Y7U0FDRjtLQUNGLENBQUM7Q0FDSCxDQUFDO0FBRUYsTUFBTSxlQUFlLEdBQUc7SUFDdEIsU0FBUyxFQUFFO1FBQ1QsUUFBUSxFQUFFLHdCQUFpQixDQUFDLE1BQU07S0FDbkM7Q0FDRixDQUFDO0FBQ0YsTUFBTSxZQUFZLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FDOUIsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNO0lBQ2pELE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFaEQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FDN0IsRUFBRSxDQUFDLE1BQU0sS0FBSyxFQUFFLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxD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
|
|
@@ -17,11 +17,17 @@ const measuringConfig = {
|
|
|
17
17
|
strategy: MeasuringStrategy.Always,
|
|
18
18
|
},
|
|
19
19
|
};
|
|
20
|
+
const objectsEqual = (o1, o2) => Object.keys(o1).length === Object.keys(o2).length &&
|
|
21
|
+
Object.keys(o1).every((p) => o1[p] === o2[p]);
|
|
22
|
+
const arraysEqual = (a1, a2) => a1.length === a2.length && a1.every((o, idx) => objectsEqual(o, a2[idx]));
|
|
20
23
|
export const Sortable = ({ onChange, renderItem, children, ...props }) => {
|
|
21
24
|
const [items, setItems] = useState(props.items || []);
|
|
22
25
|
const [active, setActive] = useState(null);
|
|
23
26
|
useEffect(() => {
|
|
24
|
-
|
|
27
|
+
console.log('===', props.items, items);
|
|
28
|
+
if (!arraysEqual(props.items, items)) {
|
|
29
|
+
setItems(props.items || []);
|
|
30
|
+
}
|
|
25
31
|
}, [props.items]);
|
|
26
32
|
const activeItem = useMemo(() => items.find((item) => item?.uri === active?.id), [active, items]);
|
|
27
33
|
const sensors = useSensors(useSensor(TouchSensor), useSensor(PointerSensor), useSensor(KeyboardSensor, {
|
|
@@ -41,12 +47,16 @@ export const Sortable = ({ onChange, renderItem, children, ...props }) => {
|
|
|
41
47
|
return arr;
|
|
42
48
|
});
|
|
43
49
|
}
|
|
44
|
-
|
|
50
|
+
if (active != null) {
|
|
51
|
+
setActive(null);
|
|
52
|
+
}
|
|
45
53
|
}, []);
|
|
46
54
|
const handleDragCancel = useCallback(() => {
|
|
47
|
-
|
|
55
|
+
if (active != null) {
|
|
56
|
+
setActive(null);
|
|
57
|
+
}
|
|
48
58
|
}, []);
|
|
49
59
|
return items?.length > 1 ? (_jsxs(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragStart: handleDragStart, onDragEnd: handleDragEnd, onDragCancel: handleDragCancel, measuring: measuringConfig, children: [_jsx(SortableContext, { items: items.filter(Boolean), strategy: rectSortingStrategy, disabled: props.disabled, children: _jsxs(Grid, { columns: items.length + 1, gridGap: props.gridGap, children: [items?.filter(Boolean).map((item, index) => (_jsx("li", { children: renderItem(item) }, item?.uri || index))), children] }, void 0) }, void 0), _jsx(DragOverlay, { adjustScale: true, dropAnimation: dropAnimationConfig, children: !activeItem ? null : renderItem(activeItem) }, void 0)] }, void 0)) : (_jsx(_Fragment, { children: children }, void 0));
|
|
50
60
|
};
|
|
51
61
|
export default Sortable;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvU29ydGFibGUvaW5kZXgudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFjLEVBQU0sUUFBUSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sT0FBTyxDQUFDO0FBRTdFLE9BQU8sRUFDTCxVQUFVLEVBQ1YsYUFBYSxFQUViLFdBQVcsRUFDWCxXQUFXLEVBQ1gsU0FBUyxFQUNULFVBQVUsRUFHViwrQkFBK0IsRUFDL0IsaUJBQWlCLEVBQ2pCLGNBQWMsRUFDZCxhQUFhLEdBQ2QsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUNMLFNBQVMsRUFDVCxlQUFlLEVBQ2YsbUJBQW1CLEVBQ25CLDJCQUEyQixHQUM1QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sSUFBSSxNQUFNLFFBQVEsQ0FBQztBQWdCMUIsTUFBTSxtQkFBbUIsR0FBa0I7SUFDekMsV0FBVyxFQUFFLCtCQUErQixDQUFDO1FBQzNDLE1BQU0sRUFBRTtZQUNOLE1BQU0sRUFBRTtnQkFDTixPQUFPLEVBQUUsS0FBSzthQUNmO1NBQ0Y7S0FDRixDQUFDO0NBQ0gsQ0FBQztBQUVGLE1BQU0sZUFBZSxHQUFHO0lBQ3RCLFNBQVMsRUFBRTtRQUNULFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxNQUFNO0tBQ25DO0NBQ0YsQ0FBQztBQUNGLE1BQU0sWUFBWSxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQzlCLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTTtJQUNqRCxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRWhELE1BQU0sV0FBVyxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQzdCLEVBQUUsQ0FBQyxNQUFNLEtBQUssRUFBRSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRTVFLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBb0IsQ0FBQyxFQUN4QyxRQUFRLEVBQ1IsVUFBVSxFQUNWLFFBQVEsRUFDUixHQUFHLEtBQUssRUFDVCxFQUFFLEVBQUU7SUFDSCxNQUFNLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxHQUFHLFFBQVEsQ0FBUSxLQUFLLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzdELE1BQU0sQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLEdBQUcsUUFBUSxDQUFnQixJQUFJLENBQUMsQ0FBQztJQUUxRCxTQUFTLENBQUMsR0FBRyxFQUFFO1FBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2QyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDcEMsUUFBUSxDQUFDLEtBQUssQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDLENBQUM7U0FDN0I7SUFDSCxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUVsQixNQUFNLFVBQVUsR0FBRyxPQUFPLENBQ3hCLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssTUFBTSxFQUFFLEVBQUUsQ0FBQyxF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
|