react-reorder-list 0.7.2 → 0.8.1

package/LICENSE

@@ -1,9 +1,9 @@
 MIT License
 
-Copyright (c) 2024 Sahil Aggawal, <aggarwalsahil2004@gmail.com>
+Copyright (c) Sahil Aggawal, <aggarwalsahil2004@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -212,6 +212,6 @@ type PositionChangeParams = {
 type PositionChangeHandler = (params?: PositionChangeParams) => void;
 ```
 
-## Author
+## License
 
-[Sahil Aggarwal](https://www.github.com/SahilAggarwal2004)
+This project is licensed under the [MIT License](LICENSE).

package/dist/animation.js

@@ -1,18 +1,17 @@
-import { useState, useLayoutEffect, Children } from "react";
-import { usePrevious } from "./hooks.js";
+import { useLayoutEffect, Children } from "react";
+import { useStateWithHistory } from "./hooks.js";
 import { getKey } from "./utils.js";
 function calculateBoundingBoxes(children) {
     const boundingBoxes = {};
     Children.forEach(children, (child) => {
         const key = getKey(child);
         if (key)
-            boundingBoxes[key] = child.ref.current.getBoundingClientRect();
+            boundingBoxes[key] = child.props.ref.current.getBoundingClientRect();
     });
     return boundingBoxes;
 }
 export default function Animation({ duration, children }) {
-    const [boundingBox, setBoundingBox] = useState({});
-    const prevBoundingBox = usePrevious(boundingBox);
+    const [boundingBox, prevBoundingBox, setBoundingBox] = useStateWithHistory({});
     useLayoutEffect(() => {
         if (duration > 0)
             setBoundingBox(calculateBoundingBoxes(children));
@@ -22,11 +21,10 @@ export default function Animation({ duration, children }) {
     useLayoutEffect(() => {
         if (duration > 0 && prevBoundingBox && Object.keys(prevBoundingBox).length)
             Children.forEach(children, (child) => {
-                var _a;
-                const domNode = (_a = child === null || child === void 0 ? void 0 : child.ref) === null || _a === void 0 ? void 0 : _a.current;
                 const key = getKey(child);
                 if (!key)
                     return;
+                const domNode = child.props.ref.current;
                 const { left: prevLeft, top: prevTop } = prevBoundingBox[key] || {};
                 const { left, top } = boundingBox[key];
                 const changeInX = prevLeft - left, changeInY = prevTop - top;

package/dist/constants.d.ts

@@ -0,0 +1,4 @@
+export declare const scrollThreshold: {
+    x: number;
+    y: number;
+};

package/dist/constants.js

@@ -0,0 +1 @@
+export const scrollThreshold = { x: 10, y: 100 };

package/dist/hooks.d.ts

@@ -4,4 +4,4 @@ export declare function useDraggable(initValue?: boolean): readonly [boolean, {
     onTouchStart: () => void;
     onTouchEnd: () => void;
 }];
-export declare function usePrevious<T>(value: T): T | undefined;
+export declare function useStateWithHistory<T>(initValue: T): readonly [T, T | undefined, (value: T) => void];

package/dist/hooks.js

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useState } from "react";
 export function useDraggable(initValue = false) {
     const [draggable, setDraggable] = useState(initValue);
     const enableDragging = () => setDraggable(true);
@@ -6,10 +6,12 @@ export function useDraggable(initValue = false) {
     const draggableProps = { onMouseEnter: enableDragging, onMouseLeave: disableDragging, onTouchStart: enableDragging, onTouchEnd: disableDragging };
     return [draggable, draggableProps];
 }
-export function usePrevious(value) {
-    const prevChildrenRef = useRef();
-    useEffect(() => {
-        prevChildrenRef.current = value;
-    }, [value]);
-    return prevChildrenRef.current;
+export function useStateWithHistory(initValue) {
+    const [state, setState] = useState(initValue);
+    const [prevState, setPrevState] = useState();
+    function setStateWithHistory(value) {
+        setPrevState(state);
+        setState(value);
+    }
+    return [state, prevState, setStateWithHistory];
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import React, { CSSProperties, DetailedHTMLProps, DragEventHandler, HTMLAttributes, ReactNode, TouchEventHandler } from "react";
+import { CSSProperties, DetailedHTMLProps, DragEventHandler, HTMLAttributes, JSX, ReactNode, RefObject, TouchEventHandler } from "react";
 export type Props = DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
 export type PositionChangeHandler = (params?: {
     start?: number;
@@ -23,6 +23,7 @@ export type DivTouchEventHandler = TouchEventHandler<HTMLDivElement>;
 export type ReorderItemProps = {
     useOnlyIconToDrag: boolean;
     disable: boolean;
+    ref: RefObject<HTMLDivElement | null>;
     style: CSSProperties;
     onDragStart?: DivDragEventHandler;
     onDragEnter: DivDragEventHandler;
@@ -32,5 +33,5 @@ export type ReorderItemProps = {
     children: ReactNode;
 };
 export type { IconProps } from "./icons.js";
-export default function ReorderList({ useOnlyIconToDrag, selectedItemOpacity, animationDuration, watchChildrenUpdates, preserveOrder, onPositionChange, disabled, props, children }: ReorderListProps): React.JSX.Element;
-export declare function ReorderIcon({ children, style, ...props }: Props): React.JSX.Element;
+export declare function ReorderIcon({ children, style, ...props }: Props): JSX.Element;
+export default function ReorderList({ useOnlyIconToDrag, selectedItemOpacity, animationDuration, watchChildrenUpdates, preserveOrder, onPositionChange, disabled, props, children }: ReorderListProps): JSX.Element;

package/dist/index.js

@@ -9,15 +9,34 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { Children, cloneElement, createRef, forwardRef, isValidElement, useEffect, useMemo, useRef, useState } from "react";
+import React, { Children, cloneElement, createRef, isValidElement, useEffect, useMemo, useRef, useState } from "react";
 import Animation from "./animation.js";
-import { PiDotsSixVerticalBold } from "./icons.js";
+import { scrollThreshold } from "./constants.js";
 import { useDraggable } from "./hooks.js";
+import { PiDotsSixVerticalBold } from "./icons.js";
 import { swap } from "./utils.js";
 if (typeof window !== "undefined")
     import("drag-drop-touch");
-const scrollThreshold = { x: 10, y: 100 };
-const ReorderItemRef = forwardRef(ReorderItem);
+export function ReorderIcon(_a) {
+    var { children = React.createElement(PiDotsSixVerticalBold, null), style } = _a, props = __rest(_a, ["children", "style"]);
+    return (React.createElement("span", Object.assign({ style: Object.assign({ cursor: "grab" }, style) }, props), children));
+}
+function ReorderItem(_a) {
+    var { useOnlyIconToDrag, disable, ref, style, children, onTouchEnd: propOnTouchEnd } = _a, events = __rest(_a, ["useOnlyIconToDrag", "disable", "ref", "style", "children", "onTouchEnd"]);
+    const [draggable, _b] = useDraggable(), { onTouchEnd: draggableOnTouchEnd } = _b, draggableProps = __rest(_b, ["onTouchEnd"]);
+    if (!draggable)
+        events.onDragStart = undefined;
+    const recursiveClone = (children) => Children.map(children, (child) => {
+        if (!isValidElement(child))
+            return child;
+        return cloneElement(child, child.type === ReorderIcon ? draggableProps : {}, recursiveClone(child.props.children));
+    });
+    const recursiveChildren = useMemo(() => (useOnlyIconToDrag ? recursiveClone(children) : children), [useOnlyIconToDrag, children]);
+    return (React.createElement("div", Object.assign({ ref: ref, draggable: !disable && draggable, style: style }, (!disable && Object.assign(Object.assign(Object.assign({}, events), (!useOnlyIconToDrag && draggableProps)), { onTouchEnd: (event) => {
+            draggableOnTouchEnd();
+            propOnTouchEnd(event);
+        } }))), recursiveChildren));
+}
 export default function ReorderList({ useOnlyIconToDrag = false, selectedItemOpacity = 0.5, animationDuration = 400, watchChildrenUpdates = false, preserveOrder = false, onPositionChange, disabled = false, props, children }) {
     const ref = useRef(null);
     const [start, setStart] = useState(-1);
@@ -72,11 +91,12 @@ export default function ReorderList({ useOnlyIconToDrag = false, selectedItemOpa
     return (React.createElement("div", Object.assign({ ref: ref }, props), disabled ? (children) : (React.createElement(Animation, { duration: +(start !== -1 && !scroll) && animationDuration }, items.map((child, i) => {
         if (!isValidElement(child))
             return child;
-        return (React.createElement(ReorderItemRef, { key: child.key, ref: refs[i], useOnlyIconToDrag: useOnlyIconToDrag, disable: disableArr[i], style: { opacity: selected === i ? selectedItemOpacity : 1, touchAction: "pan-y" }, onDragStart: (event) => {
+        return (React.createElement(ReorderItem, { key: child.key, ref: refs[i], useOnlyIconToDrag: useOnlyIconToDrag, disable: disableArr[i], style: { opacity: selected === i ? selectedItemOpacity : 1, touchAction: "pan-y" }, onDragStart: (event) => {
+                var _a, _b;
                 event.stopPropagation();
                 setStart(i);
                 setSelected(i);
-                setTemp({ items, rect: ref.current.children[i].getBoundingClientRect() });
+                setTemp({ items, rect: ((_b = (_a = ref.current.childNodes[i]).getBoundingClientRect) === null || _b === void 0 ? void 0 : _b.call(_a)) || {} });
             }, onDragEnter: (event) => {
                 event.stopPropagation();
                 if (start === -1 || selected === i || isAnimating)
@@ -118,23 +138,3 @@ export default function ReorderList({ useOnlyIconToDrag = false, selectedItemOpa
             }, onTouchEnd: () => setScroll(undefined) }, child));
     })))));
 }
-function ReorderItem(_a, ref) {
-    var { useOnlyIconToDrag, disable, style, children, onTouchEnd: propOnTouchEnd } = _a, events = __rest(_a, ["useOnlyIconToDrag", "disable", "style", "children", "onTouchEnd"]);
-    const [draggable, _b] = useDraggable(), { onTouchEnd: draggableOnTouchEnd } = _b, draggableProps = __rest(_b, ["onTouchEnd"]);
-    if (!draggable)
-        events.onDragStart = undefined;
-    const recursiveClone = (children) => Children.map(children, (child) => {
-        if (!isValidElement(child))
-            return child;
-        return cloneElement(child, child.type === ReorderIcon ? draggableProps : {}, recursiveClone(child.props.children));
-    });
-    const recursiveChildren = useMemo(() => (useOnlyIconToDrag ? recursiveClone(children) : children), [useOnlyIconToDrag, children]);
-    return (React.createElement("div", Object.assign({ ref: ref, draggable: !disable && draggable, style: style }, (!disable && Object.assign(Object.assign(Object.assign({}, events), (!useOnlyIconToDrag && draggableProps)), { onTouchEnd: (event) => {
-            draggableOnTouchEnd();
-            propOnTouchEnd(event);
-        } }))), recursiveChildren));
-}
-export function ReorderIcon(_a) {
-    var { children = React.createElement(PiDotsSixVerticalBold, null), style } = _a, props = __rest(_a, ["children", "style"]);
-    return (React.createElement("span", Object.assign({ style: Object.assign({ cursor: "grab" }, style) }, props), children));
-}

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "react-reorder-list",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "description": "A simple react component that facilitates the reordering of JSX/HTML elements through drag-and-drop functionality, allowing for easy position changes.",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "bun i && tsc"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/SahilAggarwal2004/react-reorder-list.git"
@@ -29,12 +26,15 @@
   },
   "homepage": "https://github.com/SahilAggarwal2004/react-reorder-list#readme",
   "peerDependencies": {
-    "react": ">=17.0.0"
+    "react": "^19.0.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.79"
+    "@types/react": "^19.0.2"
   },
   "dependencies": {
     "drag-drop-touch": "^1.3.1"
+  },
+  "scripts": {
+    "build": "pnpm i && tsc"
   }
 }