@cmdniels/uikit 1.5.0 → 1.5.2

package/out/components/sortable/Sortable.d.ts

@@ -26,6 +26,7 @@ export interface SortableRootContextValue<T> {
     setActiveId: (id: UniqueIdentifier | null) => void;
     getItemValue: (item: T) => UniqueIdentifier;
     flatCursor: boolean;
+    disabled: boolean;
 }
 export default function Sortable<T>(props: DndContextProps & (T extends object ? {
     /**
@@ -49,4 +50,5 @@ export default function Sortable<T>(props: DndContextProps & (T extends object ?
     strategy?: SortableContextProps["strategy"];
     orientation?: "vertical" | "horizontal" | "mixed";
     flatCursor?: boolean;
+    disabled?: boolean;
 }): import("react/jsx-runtime").JSX.Element;

package/out/components/sortable/Sortable.js

@@ -34,10 +34,14 @@ export const orientationConfig = {
     },
 };
 export default function Sortable(props) {
-    const { value, onValueChange, collisionDetection, modifiers, strategy, onMove, orientation = "vertical", flatCursor = false, getItemValue: getItemValueProp, accessibility, onDragStart: onDragStartProp, onDragEnd: onDragEndProp, onDragCancel: onDragCancelProp } = props, sortableProps = __rest(props, ["value", "onValueChange", "collisionDetection", "modifiers", "strategy", "onMove", "orientation", "flatCursor", "getItemValue", "accessibility", "onDragStart", "onDragEnd", "onDragCancel"]);
+    const { value, onValueChange, collisionDetection, modifiers, strategy, onMove, orientation = "vertical", flatCursor = false, disabled = false, getItemValue: getItemValueProp, accessibility, onDragStart: onDragStartProp, onDragEnd: onDragEndProp, onDragCancel: onDragCancelProp } = props, sortableProps = __rest(props, ["value", "onValueChange", "collisionDetection", "modifiers", "strategy", "onMove", "orientation", "flatCursor", "disabled", "getItemValue", "accessibility", "onDragStart", "onDragEnd", "onDragCancel"]);
     const id = useId();
     const [activeId, setActiveId] = useState(null);
-    const sensors = useSensors(useSensor(MouseSensor), useSensor(TouchSensor), useSensor(KeyboardSensor, {
+    const sensors = useSensors(useSensor(MouseSensor, {
+        activationConstraint: disabled ? { distance: Number.MAX_SAFE_INTEGER } : undefined,
+    }), useSensor(TouchSensor, {
+        activationConstraint: disabled ? { distance: Number.MAX_SAFE_INTEGER } : undefined,
+    }), useSensor(KeyboardSensor, {
         coordinateGetter: sortableKeyboardCoordinates,
     }));
     const config = useMemo(() => orientationConfig[orientation], [orientation]);
@@ -140,7 +144,19 @@ export default function Sortable(props) {
         setActiveId,
         getItemValue,
         flatCursor,
-    }), [id, items, modifiers, strategy, config.modifiers, config.strategy, activeId, getItemValue, flatCursor]);
+        disabled,
+    }), [
+        id,
+        items,
+        modifiers,
+        strategy,
+        config.modifiers,
+        config.strategy,
+        activeId,
+        getItemValue,
+        flatCursor,
+        disabled,
+    ]);
     return (_jsx(SortableRootContext.Provider, { value: contextValue, children: _jsx(DndContext, Object.assign({ collisionDetection: collisionDetection !== null && collisionDetection !== void 0 ? collisionDetection : config.collisionDetection, modifiers: modifiers !== null && modifiers !== void 0 ? modifiers : config.modifiers, sensors: sensors }, sortableProps, { id: id, onDragStart: onDragStart, onDragEnd: onDragEnd, onDragCancel: onDragCancel, accessibility: Object.assign({ announcements,
                 screenReaderInstructions }, accessibility) })) }));
 }

package/out/components/sortable/SortableItem.js

@@ -32,12 +32,13 @@ export default function SortableItem(props) {
     }
     const context = useSortableContext();
     const id = useId();
+    const isDisabled = disabled !== null && disabled !== void 0 ? disabled : context.disabled;
     const { attributes, listeners, setNodeRef, setActivatorNodeRef, transform, transition, isDragging } = useSortable({
         id: value,
-        disabled,
+        disabled: isDisabled,
     });
     const composedRef = useComposedRefs(ref, (node) => {
-        if (disabled) {
+        if (isDisabled) {
             return;
         }
         setNodeRef(node);
@@ -52,15 +53,14 @@ export default function SortableItem(props) {
         listeners,
         setActivatorNodeRef,
         isDragging,
-        disabled,
-    }), [id, attributes, listeners, setActivatorNodeRef, isDragging, disabled]);
-    const mergedProps = Object.assign(Object.assign(Object.assign(Object.assign({ id, "data-disabled": disabled, "data-dragging": isDragging ? "" : undefined, "data-slot": "sortable-item" }, itemProps), (asHandle && !disabled ? attributes : {})), (asHandle && !disabled ? listeners : {})), { ref: composedRef, style: composedStyle, className: cn("focus-visible:ring-1 focus-visible:ring-neutral-950 focus-visible:ring-offset-1 focus-visible:outline-hidden dark:focus-visible:ring-neutral-300", {
-            "touch-none select-none": asHandle,
-            "cursor-default": context.flatCursor,
-            "data-dragging:cursor-grabbing": !context.flatCursor,
-            "cursor-grab": !isDragging && asHandle && !context.flatCursor,
+        disabled: isDisabled,
+    }), [id, attributes, listeners, setActivatorNodeRef, isDragging, isDisabled]);
+    const mergedProps = Object.assign(Object.assign(Object.assign(Object.assign({ id, "data-disabled": isDisabled, "data-dragging": isDragging ? "" : undefined, "data-slot": "sortable-item" }, itemProps), (asHandle && !isDisabled ? attributes : {})), (asHandle && !isDisabled ? listeners : {})), { ref: composedRef, style: composedStyle, className: cn("focus-visible:ring-1 focus-visible:ring-neutral-950 focus-visible:ring-offset-1 focus-visible:outline-hidden dark:focus-visible:ring-neutral-300", {
+            "touch-none select-none": asHandle && !isDisabled,
+            "cursor-default": context.flatCursor || isDisabled,
+            "data-dragging:cursor-grabbing": !context.flatCursor && !isDisabled,
+            "cursor-grab": !isDragging && asHandle && !context.flatCursor && !isDisabled,
             "opacity-50": isDragging,
-            "pointer-events-none opacity-50": disabled,
         }, className) });
     const element = render ? cloneElement(render, mergedProps) : _jsx("div", Object.assign({}, mergedProps));
     return _jsx(SortableItemContext.Provider, { value: itemContext, children: element });

package/out/components/sortable/SortableItemHandle.js

@@ -22,11 +22,11 @@ export default function SortableItemHandle(props) {
     const itemContext = useSortableItemContext();
     const isDisabled = disabled !== null && disabled !== void 0 ? disabled : itemContext.disabled;
     const composedRef = useComposedRefs(itemHandleProps.ref, (node) => {
-        if (!isDisabled) {
+        if (isDisabled) {
             return;
         }
         itemContext.setActivatorNodeRef(node);
     });
-    const mergedProps = Object.assign(Object.assign(Object.assign(Object.assign({ type: "button", "aria-controls": itemContext.id, "data-disabled": isDisabled, "data-dragging": itemContext.isDragging ? "" : undefined, "data-slot": "sortable-item-handle" }, itemHandleProps), (isDisabled ? {} : itemContext.attributes)), (isDisabled ? {} : itemContext.listeners)), { ref: composedRef, className: cn("select-none disabled:pointer-events-none disabled:opacity-50", context.flatCursor ? "cursor-default" : "cursor-grab data-dragging:cursor-grabbing", className), disabled: isDisabled });
+    const mergedProps = Object.assign(Object.assign(Object.assign(Object.assign({ type: "button", "aria-controls": itemContext.id, "data-disabled": isDisabled, "data-dragging": itemContext.isDragging ? "" : undefined, "data-slot": "sortable-item-handle" }, itemHandleProps), (isDisabled ? {} : itemContext.attributes)), (isDisabled ? {} : itemContext.listeners)), { ref: composedRef, className: cn("select-none disabled:pointer-events-none", context.flatCursor ? "cursor-default" : "cursor-grab data-dragging:cursor-grabbing", className), disabled: isDisabled });
     return render ? cloneElement(render, mergedProps) : _jsx("button", Object.assign({}, mergedProps));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cmdniels/uikit",
-	"version": "1.5.0",
+	"version": "1.5.2",
 	"private": false,
 	"license": "MIT",
 	"type": "module",