@patternfly/react-drag-drop 6.5.0-prerelease.8 → 6.5.0-prerelease.80
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.
- package/CHANGELOG.md +288 -0
- package/dist/cjs.tsbuildinfo +1 -1
- package/dist/esm/components/DragDrop/DragButton.js +2 -2
- package/dist/esm/components/DragDrop/DragButton.js.map +1 -1
- package/dist/esm/components/DragDrop/DragDropContainer.d.ts +2 -0
- package/dist/esm/components/DragDrop/DragDropContainer.d.ts.map +1 -1
- package/dist/esm/components/DragDrop/DragDropContainer.js +9 -8
- package/dist/esm/components/DragDrop/DragDropContainer.js.map +1 -1
- package/dist/esm/components/DragDrop/Draggable.d.ts +2 -0
- package/dist/esm/components/DragDrop/Draggable.d.ts.map +1 -1
- package/dist/esm/components/DragDrop/Draggable.js +2 -2
- package/dist/esm/components/DragDrop/Draggable.js.map +1 -1
- package/dist/esm.tsbuildinfo +1 -1
- package/dist/js/components/DragDrop/DragButton.js +2 -2
- package/dist/js/components/DragDrop/DragButton.js.map +1 -1
- package/dist/js/components/DragDrop/DragDropContainer.d.ts +2 -0
- package/dist/js/components/DragDrop/DragDropContainer.d.ts.map +1 -1
- package/dist/js/components/DragDrop/DragDropContainer.js +9 -8
- package/dist/js/components/DragDrop/DragDropContainer.js.map +1 -1
- package/dist/js/components/DragDrop/Draggable.d.ts +2 -0
- package/dist/js/components/DragDrop/Draggable.d.ts.map +1 -1
- package/dist/js/components/DragDrop/Draggable.js +2 -2
- package/dist/js/components/DragDrop/Draggable.js.map +1 -1
- package/package.json +5 -5
- package/src/components/DragDrop/DragButton.tsx +2 -2
- package/src/components/DragDrop/DragDropContainer.tsx +13 -7
- package/src/components/DragDrop/Draggable.tsx +4 -1
- package/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap +9 -9
|
@@ -6,10 +6,10 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
6
6
|
const react_styles_1 = require("@patternfly/react-styles");
|
|
7
7
|
const Button_1 = require('@patternfly/react-core/dist/js/components/Button');
|
|
8
8
|
const data_list_1 = tslib_1.__importDefault(require("@patternfly/react-styles/css/components/DataList/data-list"));
|
|
9
|
-
const
|
|
9
|
+
const rh_ui_grip_vertical_fill_icon_1 = tslib_1.__importDefault(require('@patternfly/react-icons/dist/js/icons/rh-ui-grip-vertical-fill-icon'));
|
|
10
10
|
const DragButton = (_a) => {
|
|
11
11
|
var { className, 'aria-label': ariaLabel = 'Drag button', 'aria-labelledby': ariaLabelledby } = _a, props = tslib_1.__rest(_a, ["className", 'aria-label', 'aria-labelledby']);
|
|
12
|
-
return ((0, jsx_runtime_1.jsx)(Button_1.Button, Object.assign({ variant: "plain", className: (0, react_styles_1.css)(className), "aria-label": ariaLabel, "aria-labelledby": ariaLabelledby, icon: (0, jsx_runtime_1.jsx)("span", { className: (0, react_styles_1.css)(data_list_1.default.dataListItemDraggableIcon), children: (0, jsx_runtime_1.jsx)(
|
|
12
|
+
return ((0, jsx_runtime_1.jsx)(Button_1.Button, Object.assign({ variant: "plain", className: (0, react_styles_1.css)(className), "aria-label": ariaLabel, "aria-labelledby": ariaLabelledby, icon: (0, jsx_runtime_1.jsx)("span", { className: (0, react_styles_1.css)(data_list_1.default.dataListItemDraggableIcon), children: (0, jsx_runtime_1.jsx)(rh_ui_grip_vertical_fill_icon_1.default, {}) }) }, props)));
|
|
13
13
|
};
|
|
14
14
|
exports.DragButton = DragButton;
|
|
15
15
|
exports.DragButton.displayName = 'DragButton';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DragButton.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragButton.tsx"],"names":[],"mappings":";;;;;AAAA,2DAA+C;;AAE/C,mHAA0F;;AAgBnF,MAAM,UAAU,GAA6C,CAAC,EAKnD,EAAE,EAAE;QAL+C,EACnE,SAAS,EACT,YAAY,EAAE,SAAS,GAAG,aAAa,EACvC,iBAAiB,EAAE,cAAc,OAEjB,EADb,KAAK,sBAJ2D,8CAKpE,CADS;IACa,OAAA,CACrB,uBAAC,eAAM,kBACL,OAAO,EAAC,OAAO,EACf,SAAS,EAAE,IAAA,kBAAG,EAAC,SAAS,CAAC,gBACb,SAAS,qBACJ,cAAc,EAC/B,IAAI,EACF,iCAAM,SAAS,EAAE,IAAA,kBAAG,EAAC,mBAAgB,CAAC,yBAAyB,CAAC,YAC9D,uBAAC,
|
|
1
|
+
{"version":3,"file":"DragButton.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragButton.tsx"],"names":[],"mappings":";;;;;AAAA,2DAA+C;;AAE/C,mHAA0F;;AAgBnF,MAAM,UAAU,GAA6C,CAAC,EAKnD,EAAE,EAAE;QAL+C,EACnE,SAAS,EACT,YAAY,EAAE,SAAS,GAAG,aAAa,EACvC,iBAAiB,EAAE,cAAc,OAEjB,EADb,KAAK,sBAJ2D,8CAKpE,CADS;IACa,OAAA,CACrB,uBAAC,eAAM,kBACL,OAAO,EAAC,OAAO,EACf,SAAS,EAAE,IAAA,kBAAG,EAAC,SAAS,CAAC,gBACb,SAAS,qBACJ,cAAc,EAC/B,IAAI,EACF,iCAAM,SAAS,EAAE,IAAA,kBAAG,EAAC,mBAAgB,CAAC,yBAAyB,CAAC,YAC9D,uBAAC,uCAAwB,KAAG,GACvB,IAEL,KAAK,EACT,CACH,CAAA;CAAA,CAAC;AAlBW,QAAA,UAAU,cAkBrB;AACF,kBAAU,CAAC,WAAW,GAAG,YAAY,CAAC"}
|
|
@@ -36,6 +36,8 @@ export interface DragDropContainerProps extends DndContextProps {
|
|
|
36
36
|
variant?: 'default' | 'DataList' | 'DualListSelectorList';
|
|
37
37
|
/** Additional classes to apply to the drag overlay */
|
|
38
38
|
overlayProps?: any;
|
|
39
|
+
/** The parent container to append the drag overlay to. Defaults to document.body. */
|
|
40
|
+
appendTo?: HTMLElement | (() => HTMLElement);
|
|
39
41
|
}
|
|
40
42
|
export declare const DragDropContainer: React.FunctionComponent<DragDropContainerProps>;
|
|
41
43
|
//# sourceMappingURL=DragDropContainer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DragDropContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragDropContainer.tsx"],"names":[],"mappings":";AAGA,OAAO,EAIL,eAAe,EAKf,YAAY,EACZ,cAAc,EAEd,aAAa,EAKb,eAAe,EAChB,MAAM,eAAe,CAAC;AASvB,MAAM,MAAM,+BAA+B,GAAG,cAAc,CAAC;AAC7D,MAAM,MAAM,8BAA8B,GAAG,aAAa,CAAC;AAC3D,MAAM,MAAM,6BAA6B,GAAG,YAAY,CAAC;AACzD,MAAM,MAAM,gCAAgC,GAAG,eAAe,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,wCAAwC;IACxC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,+CAA+C;IAC/C,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,mEAAmE;IACnE,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,sDAAsD;IACtD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACzC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,+BAA+B,KAAK,IAAI,CAAC;IAC1D,4DAA4D;IAC5D,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5G,kDAAkD;IAClD,MAAM,EAAE,CAAC,KAAK,EAAE,6BAA6B,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IACjG,sCAAsC;IACtC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IACvG;;;;SAIK;IACL,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,sBAAsB,CAAC;IAC1D,sDAAsD;IACtD,YAAY,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"DragDropContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragDropContainer.tsx"],"names":[],"mappings":";AAGA,OAAO,EAIL,eAAe,EAKf,YAAY,EACZ,cAAc,EAEd,aAAa,EAKb,eAAe,EAChB,MAAM,eAAe,CAAC;AASvB,MAAM,MAAM,+BAA+B,GAAG,cAAc,CAAC;AAC7D,MAAM,MAAM,8BAA8B,GAAG,aAAa,CAAC;AAC3D,MAAM,MAAM,6BAA6B,GAAG,YAAY,CAAC;AACzD,MAAM,MAAM,gCAAgC,GAAG,eAAe,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,wCAAwC;IACxC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,+CAA+C;IAC/C,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,mEAAmE;IACnE,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,eAAe;IAC7D,sDAAsD;IACtD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACzC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,+BAA+B,KAAK,IAAI,CAAC;IAC1D,4DAA4D;IAC5D,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5G,kDAAkD;IAClD,MAAM,EAAE,CAAC,KAAK,EAAE,6BAA6B,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IACjG,sCAAsC;IACtC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,KAAK,IAAI,CAAC;IACvG;;;;SAIK;IACL,OAAO,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,sBAAsB,CAAC;IAC1D,sDAAsD;IACtD,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qFAAqF;IACrF,QAAQ,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;CAC9C;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,CA8O7E,CAAC"}
|
|
@@ -15,7 +15,7 @@ const drag_drop_1 = tslib_1.__importDefault(require("@patternfly/react-styles/cs
|
|
|
15
15
|
const DataList_1 = require('@patternfly/react-core/dist/js/components/DataList/DataList');
|
|
16
16
|
const util_1 = require('@patternfly/react-core/dist/js/helpers/util');
|
|
17
17
|
const DragDropContainer = (_a) => {
|
|
18
|
-
var { children, items, onDrag = () => { }, onContainerMove = () => { }, onDrop = () => { }, onCancel = () => { }, variant = 'default', overlayProps } = _a, props = tslib_1.__rest(_a, ["children", "items", "onDrag", "onContainerMove", "onDrop", "onCancel", "variant", "overlayProps"]);
|
|
18
|
+
var { children, items, onDrag = () => { }, onContainerMove = () => { }, onDrop = () => { }, onCancel = () => { }, variant = 'default', overlayProps, appendTo = () => document.body } = _a, props = tslib_1.__rest(_a, ["children", "items", "onDrag", "onContainerMove", "onDrop", "onCancel", "variant", "overlayProps", "appendTo"]);
|
|
19
19
|
const itemsCopy = (0, react_1.useRef)(null);
|
|
20
20
|
const hasRecentlyMovedContainer = (0, react_1.useRef)(false);
|
|
21
21
|
const [activeId, setActiveId] = (0, react_1.useState)(null);
|
|
@@ -32,7 +32,7 @@ const DragDropContainer = (_a) => {
|
|
|
32
32
|
}));
|
|
33
33
|
const collisionDetectionStrategy = (0, react_1.useCallback)((args) => {
|
|
34
34
|
var _a;
|
|
35
|
-
if (activeId && activeId in items) {
|
|
35
|
+
if (activeId != null && activeId in items) {
|
|
36
36
|
return (0, core_1.closestCenter)(Object.assign(Object.assign({}, args), { droppableContainers: args.droppableContainers.filter((container) => container.id in items) }));
|
|
37
37
|
}
|
|
38
38
|
const pointerIntersections = (0, core_1.pointerWithin)(args);
|
|
@@ -51,7 +51,7 @@ const DragDropContainer = (_a) => {
|
|
|
51
51
|
if (hasRecentlyMovedContainer.current) {
|
|
52
52
|
lastOverId.current = activeId;
|
|
53
53
|
}
|
|
54
|
-
return lastOverId.current ? [{ id: lastOverId.current }] : [];
|
|
54
|
+
return lastOverId.current != null ? [{ id: lastOverId.current }] : [];
|
|
55
55
|
}, [activeId, items]);
|
|
56
56
|
(0, react_1.useEffect)(() => {
|
|
57
57
|
requestAnimationFrame(() => {
|
|
@@ -68,7 +68,7 @@ const DragDropContainer = (_a) => {
|
|
|
68
68
|
const { active, over } = event;
|
|
69
69
|
const { id: activeId } = active;
|
|
70
70
|
const { id: overId } = over;
|
|
71
|
-
if (
|
|
71
|
+
if (overId == null || activeId in items) {
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
74
|
const activeContainer = findContainer(activeId);
|
|
@@ -121,7 +121,7 @@ const DragDropContainer = (_a) => {
|
|
|
121
121
|
setActiveId(null);
|
|
122
122
|
};
|
|
123
123
|
const getDragOverlay = () => {
|
|
124
|
-
if (
|
|
124
|
+
if (activeId == null) {
|
|
125
125
|
return;
|
|
126
126
|
}
|
|
127
127
|
const item = findItem(activeId, findContainer(activeId));
|
|
@@ -137,11 +137,12 @@ const DragDropContainer = (_a) => {
|
|
|
137
137
|
content = ((0, jsx_runtime_1.jsx)(Draggable_1.Draggable, Object.assign({ useDragButton: variant === 'default', id: item.id }, item.props, { children: item.content }), item.id));
|
|
138
138
|
}
|
|
139
139
|
return ((0, jsx_runtime_1.jsxs)("div", { className: (0, react_styles_1.css)(drag_drop_1.default.draggable, drag_drop_1.default.modifiers.dragging), style: {
|
|
140
|
-
'--pf-v6-c-draggable--m-dragging--BackgroundColor': 'var(--pf-t--global--background--color--
|
|
140
|
+
'--pf-v6-c-draggable--m-dragging--BackgroundColor': 'var(--pf-t--global--background--color--floating--default)'
|
|
141
141
|
}, children: [variant === 'DualListSelectorList' && (0, jsx_runtime_1.jsx)("ul", { className: "pf-v6-c-dual-list-selector", children: content }), variant === 'DataList' && ((0, jsx_runtime_1.jsx)(DataList_1.DataList, Object.assign({ "aria-label": "draggable overlay" }, overlayProps, { children: content }))), variant !== 'DualListSelectorList' && variant !== 'DataList' && content] }));
|
|
142
142
|
};
|
|
143
|
-
const dragOverlay = (0, jsx_runtime_1.jsx)(core_1.DragOverlay, { children: activeId && getDragOverlay() });
|
|
144
|
-
|
|
143
|
+
const dragOverlay = (0, jsx_runtime_1.jsx)(core_1.DragOverlay, { children: activeId != null && getDragOverlay() });
|
|
144
|
+
const portalTarget = typeof appendTo === 'function' ? appendTo() : appendTo || document.body;
|
|
145
|
+
return ((0, jsx_runtime_1.jsxs)(core_1.DndContext, Object.assign({ sensors: sensors, collisionDetection: collisionDetectionStrategy, onDragEnd: handleDragEnd, onDragOver: handleDragOver, onDragStart: handleDragStart, onDragCancel: handleDragCancel }, props, { children: [children, util_1.canUseDOM && portalTarget ? ReactDOM.createPortal(dragOverlay, portalTarget) : dragOverlay] })));
|
|
145
146
|
};
|
|
146
147
|
exports.DragDropContainer = DragDropContainer;
|
|
147
148
|
exports.DragDropContainer.displayName = 'DragDropContainer';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DragDropContainer.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragDropContainer.tsx"],"names":[],"mappings":";;;;;AAAA,iCAAiE;AACjE,4DAAsC;AACtC,2DAA+C;AAC/C,wCAkBuB;AACvB,gDAA2E;AAC3E,2CAAwC;AACxC,mEAAgE;AAChE,2FAAwF;AACxF,mHAAgF;;;
|
|
1
|
+
{"version":3,"file":"DragDropContainer.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/DragDropContainer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ export interface DraggableProps extends React.HTMLProps<HTMLDivElement> {
|
|
|
8
8
|
id?: string;
|
|
9
9
|
/** Flag indicating the draggable element should include a drag button. */
|
|
10
10
|
useDragButton?: boolean;
|
|
11
|
+
/** Accessible name of the drag button. */
|
|
12
|
+
dragButtonAriaLabel?: string;
|
|
11
13
|
}
|
|
12
14
|
export declare const Draggable: React.FunctionComponent<DraggableProps>;
|
|
13
15
|
//# sourceMappingURL=Draggable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Draggable.d.ts","sourceRoot":"","sources":["../../../../src/components/DragDrop/Draggable.tsx"],"names":[],"mappings":";AAMA,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IACrE,uCAAuC;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,aAAa,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Draggable.d.ts","sourceRoot":"","sources":["../../../../src/components/DragDrop/Draggable.tsx"],"names":[],"mappings":";AAMA,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IACrE,uCAAuC;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,0CAA0C;IAC1C,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAuC7D,CAAC"}
|
|
@@ -9,7 +9,7 @@ const react_styles_1 = require("@patternfly/react-styles");
|
|
|
9
9
|
const drag_drop_1 = tslib_1.__importDefault(require("@patternfly/react-styles/css/components/DragDrop/drag-drop"));
|
|
10
10
|
const DragButton_1 = require("./DragButton");
|
|
11
11
|
const Draggable = (_a) => {
|
|
12
|
-
var { children, id, className, useDragButton = false } = _a, props = tslib_1.__rest(_a, ["children", "id", "className", "useDragButton"]);
|
|
12
|
+
var { children, id, className, useDragButton = false, dragButtonAriaLabel } = _a, props = tslib_1.__rest(_a, ["children", "id", "className", "useDragButton", "dragButtonAriaLabel"]);
|
|
13
13
|
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = (0, sortable_1.useSortable)({
|
|
14
14
|
id
|
|
15
15
|
});
|
|
@@ -17,7 +17,7 @@ const Draggable = (_a) => {
|
|
|
17
17
|
transform: utilities_1.CSS.Transform.toString(transform),
|
|
18
18
|
transition
|
|
19
19
|
};
|
|
20
|
-
return useDragButton ? ((0, jsx_runtime_1.jsxs)("div", Object.assign({ className: (0, react_styles_1.css)(isDragging && drag_drop_1.default.droppable, isDragging && drag_drop_1.default.modifiers.dragging, className), ref: setNodeRef, style: style }, props, { children: [(0, jsx_runtime_1.jsx)(DragButton_1.DragButton, Object.assign({}, attributes, listeners)), children] }))) : ((0, jsx_runtime_1.jsx)("div", Object.assign({ className: (0, react_styles_1.css)(isDragging && drag_drop_1.default.droppable, isDragging && drag_drop_1.default.modifiers.dragging, className), ref: setNodeRef, style: style }, listeners, attributes, props, { children: children })));
|
|
20
|
+
return useDragButton ? ((0, jsx_runtime_1.jsxs)("div", Object.assign({ className: (0, react_styles_1.css)(isDragging && drag_drop_1.default.droppable, isDragging && drag_drop_1.default.modifiers.dragging, className), ref: setNodeRef, style: style }, props, { children: [(0, jsx_runtime_1.jsx)(DragButton_1.DragButton, Object.assign({}, attributes, listeners, (dragButtonAriaLabel && { 'aria-label': dragButtonAriaLabel }))), children] }))) : ((0, jsx_runtime_1.jsx)("div", Object.assign({ className: (0, react_styles_1.css)(isDragging && drag_drop_1.default.droppable, isDragging && drag_drop_1.default.modifiers.dragging, className), ref: setNodeRef, style: style }, listeners, attributes, props, { children: children })));
|
|
21
21
|
};
|
|
22
22
|
exports.Draggable = Draggable;
|
|
23
23
|
exports.Draggable.displayName = 'Draggable';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Draggable.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/Draggable.tsx"],"names":[],"mappings":";;;;;AAAA,gDAAgD;AAChD,kDAAyC;AACzC,2DAA+C;AAC/C,mHAAgF;AAChF,6CAA0C;
|
|
1
|
+
{"version":3,"file":"Draggable.js","sourceRoot":"","sources":["../../../../src/components/DragDrop/Draggable.tsx"],"names":[],"mappings":";;;;;AAAA,gDAAgD;AAChD,kDAAyC;AACzC,2DAA+C;AAC/C,mHAAgF;AAChF,6CAA0C;AAenC,MAAM,SAAS,GAA4C,CAAC,EAOlD,EAAE,EAAE;QAP8C,EACjE,QAAQ,EACR,EAAE,EACF,SAAS,EACT,aAAa,GAAG,KAAK,EACrB,mBAAmB,OAEJ,EADZ,KAAK,sBANyD,uEAOlE,CADS;IAER,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,sBAAW,EAAC;QAC3F,EAAE;KACH,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG;QACZ,SAAS,EAAE,eAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC5C,UAAU;KACX,CAAC;IAEF,OAAO,aAAa,CAAC,CAAC,CAAC,CACrB,+CACE,SAAS,EAAE,IAAA,kBAAG,EAAC,UAAU,IAAI,mBAAM,CAAC,SAAS,EAAE,UAAU,IAAI,mBAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,EAClG,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK,IACR,KAAK,eAET,uBAAC,uBAAU,oBAAK,UAAU,EAAM,SAAS,EAAM,CAAC,mBAAmB,IAAI,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAI,EAChH,QAAQ,KACL,CACP,CAAC,CAAC,CAAC,CACF,8CACE,SAAS,EAAE,IAAA,kBAAG,EAAC,UAAU,IAAI,mBAAM,CAAC,SAAS,EAAE,UAAU,IAAI,mBAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,EAClG,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK,IACR,SAAS,EACT,UAAU,EACV,KAAK,cAER,QAAQ,IACL,CACP,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,SAAS,aAuCpB;AACF,iBAAS,CAAC,WAAW,GAAG,WAAW,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@patternfly/react-drag-drop",
|
|
3
|
-
"version": "6.5.0-prerelease.
|
|
3
|
+
"version": "6.5.0-prerelease.80",
|
|
4
4
|
"description": "PatternFly drag and drop solution",
|
|
5
5
|
"main": "dist/js/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"@dnd-kit/core": "^6.3.1",
|
|
33
33
|
"@dnd-kit/modifiers": "^9.0.0",
|
|
34
34
|
"@dnd-kit/sortable": "^10.0.0",
|
|
35
|
-
"@patternfly/react-core": "^6.5.0-prerelease.
|
|
36
|
-
"@patternfly/react-icons": "^6.5.0-prerelease.
|
|
37
|
-
"@patternfly/react-styles": "^6.5.0-prerelease.
|
|
35
|
+
"@patternfly/react-core": "^6.5.0-prerelease.78",
|
|
36
|
+
"@patternfly/react-icons": "^6.5.0-prerelease.38",
|
|
37
|
+
"@patternfly/react-styles": "^6.5.0-prerelease.28",
|
|
38
38
|
"resize-observer-polyfill": "^1.5.1"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"react": "^17 || ^18 || ^19",
|
|
42
42
|
"react-dom": "^17 || ^18 || ^19"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "e1278729a36ad73cf22b4edab8054c44af704c85"
|
|
45
45
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { css } from '@patternfly/react-styles';
|
|
2
2
|
import { Button } from '@patternfly/react-core/dist/esm/components/Button';
|
|
3
3
|
import dragButtonStyles from '@patternfly/react-styles/css/components/DataList/data-list';
|
|
4
|
-
import
|
|
4
|
+
import RhUiGripVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-grip-vertical-fill-icon';
|
|
5
5
|
|
|
6
6
|
export interface DragButtonProps extends Omit<React.HTMLProps<HTMLButtonElement>, 'size'> {
|
|
7
7
|
/** Additional classes added to the drag button */
|
|
@@ -29,7 +29,7 @@ export const DragButton: React.FunctionComponent<DragButtonProps> = ({
|
|
|
29
29
|
aria-labelledby={ariaLabelledby}
|
|
30
30
|
icon={
|
|
31
31
|
<span className={css(dragButtonStyles.dataListItemDraggableIcon)}>
|
|
32
|
-
<
|
|
32
|
+
<RhUiGripVerticalFillIcon />
|
|
33
33
|
</span>
|
|
34
34
|
}
|
|
35
35
|
{...props}
|
|
@@ -66,6 +66,8 @@ export interface DragDropContainerProps extends DndContextProps {
|
|
|
66
66
|
variant?: 'default' | 'DataList' | 'DualListSelectorList';
|
|
67
67
|
/** Additional classes to apply to the drag overlay */
|
|
68
68
|
overlayProps?: any;
|
|
69
|
+
/** The parent container to append the drag overlay to. Defaults to document.body. */
|
|
70
|
+
appendTo?: HTMLElement | (() => HTMLElement);
|
|
69
71
|
}
|
|
70
72
|
|
|
71
73
|
export const DragDropContainer: React.FunctionComponent<DragDropContainerProps> = ({
|
|
@@ -77,6 +79,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
77
79
|
onCancel = () => {},
|
|
78
80
|
variant = 'default',
|
|
79
81
|
overlayProps,
|
|
82
|
+
appendTo = () => document.body,
|
|
80
83
|
...props
|
|
81
84
|
}: DragDropContainerProps) => {
|
|
82
85
|
const itemsCopy = useRef<Record<string, DraggableObject[]> | null>(null);
|
|
@@ -108,7 +111,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
108
111
|
|
|
109
112
|
const collisionDetectionStrategy: CollisionDetection = useCallback(
|
|
110
113
|
(args) => {
|
|
111
|
-
if (activeId && activeId in items) {
|
|
114
|
+
if (activeId != null && activeId in items) {
|
|
112
115
|
return closestCenter({
|
|
113
116
|
...args,
|
|
114
117
|
droppableContainers: args.droppableContainers.filter((container) => container.id in items)
|
|
@@ -141,7 +144,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
141
144
|
if (hasRecentlyMovedContainer.current) {
|
|
142
145
|
lastOverId.current = activeId;
|
|
143
146
|
}
|
|
144
|
-
return lastOverId.current ? [{ id: lastOverId.current }] : [];
|
|
147
|
+
return lastOverId.current != null ? [{ id: lastOverId.current }] : [];
|
|
145
148
|
},
|
|
146
149
|
[activeId, items]
|
|
147
150
|
);
|
|
@@ -165,7 +168,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
165
168
|
const { id: activeId } = active;
|
|
166
169
|
const { id: overId } = over;
|
|
167
170
|
|
|
168
|
-
if (
|
|
171
|
+
if (overId == null || activeId in items) {
|
|
169
172
|
return;
|
|
170
173
|
}
|
|
171
174
|
|
|
@@ -237,7 +240,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
237
240
|
};
|
|
238
241
|
|
|
239
242
|
const getDragOverlay = () => {
|
|
240
|
-
if (
|
|
243
|
+
if (activeId == null) {
|
|
241
244
|
return;
|
|
242
245
|
}
|
|
243
246
|
const item = findItem(activeId, findContainer(activeId));
|
|
@@ -272,7 +275,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
272
275
|
style={
|
|
273
276
|
{
|
|
274
277
|
'--pf-v6-c-draggable--m-dragging--BackgroundColor':
|
|
275
|
-
'var(--pf-t--global--background--color--
|
|
278
|
+
'var(--pf-t--global--background--color--floating--default)'
|
|
276
279
|
} as React.CSSProperties
|
|
277
280
|
}
|
|
278
281
|
>
|
|
@@ -287,7 +290,10 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
287
290
|
);
|
|
288
291
|
};
|
|
289
292
|
|
|
290
|
-
const dragOverlay = <DragOverlay>{activeId && getDragOverlay()}</DragOverlay>;
|
|
293
|
+
const dragOverlay = <DragOverlay>{activeId != null && getDragOverlay()}</DragOverlay>;
|
|
294
|
+
|
|
295
|
+
const portalTarget = typeof appendTo === 'function' ? appendTo() : appendTo || document.body;
|
|
296
|
+
|
|
291
297
|
return (
|
|
292
298
|
<DndContext
|
|
293
299
|
sensors={sensors}
|
|
@@ -299,7 +305,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
|
|
|
299
305
|
{...props}
|
|
300
306
|
>
|
|
301
307
|
{children}
|
|
302
|
-
{canUseDOM ? ReactDOM.createPortal(dragOverlay,
|
|
308
|
+
{canUseDOM && portalTarget ? ReactDOM.createPortal(dragOverlay, portalTarget) : dragOverlay}
|
|
303
309
|
</DndContext>
|
|
304
310
|
);
|
|
305
311
|
};
|
|
@@ -13,6 +13,8 @@ export interface DraggableProps extends React.HTMLProps<HTMLDivElement> {
|
|
|
13
13
|
id?: string;
|
|
14
14
|
/** Flag indicating the draggable element should include a drag button. */
|
|
15
15
|
useDragButton?: boolean;
|
|
16
|
+
/** Accessible name of the drag button. */
|
|
17
|
+
dragButtonAriaLabel?: string;
|
|
16
18
|
}
|
|
17
19
|
|
|
18
20
|
export const Draggable: React.FunctionComponent<DraggableProps> = ({
|
|
@@ -20,6 +22,7 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
|
|
|
20
22
|
id,
|
|
21
23
|
className,
|
|
22
24
|
useDragButton = false,
|
|
25
|
+
dragButtonAriaLabel,
|
|
23
26
|
...props
|
|
24
27
|
}: DraggableProps) => {
|
|
25
28
|
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
|
@@ -38,7 +41,7 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
|
|
|
38
41
|
style={style}
|
|
39
42
|
{...props}
|
|
40
43
|
>
|
|
41
|
-
<DragButton {...attributes} {...listeners} />
|
|
44
|
+
<DragButton {...attributes} {...listeners} {...(dragButtonAriaLabel && { 'aria-label': dragButtonAriaLabel })} />
|
|
42
45
|
{children}
|
|
43
46
|
</div>
|
|
44
47
|
) : (
|
|
@@ -15,7 +15,7 @@ exports[`renders some divs 1`] = `
|
|
|
15
15
|
aria-label="Drag button"
|
|
16
16
|
aria-roledescription="sortable"
|
|
17
17
|
class="pf-v6-c-button pf-m-plain"
|
|
18
|
-
data-ouia-component-id="OUIA-Generated-Button-plain
|
|
18
|
+
data-ouia-component-id="OUIA-Generated-Button-plain-:r0:"
|
|
19
19
|
data-ouia-component-type="PF6/Button"
|
|
20
20
|
data-ouia-safe="true"
|
|
21
21
|
role="button"
|
|
@@ -34,11 +34,11 @@ exports[`renders some divs 1`] = `
|
|
|
34
34
|
fill="currentColor"
|
|
35
35
|
height="1em"
|
|
36
36
|
role="img"
|
|
37
|
-
viewBox="0 0
|
|
37
|
+
viewBox="0 0 32 32"
|
|
38
38
|
width="1em"
|
|
39
39
|
>
|
|
40
40
|
<path
|
|
41
|
-
d="
|
|
41
|
+
d="M13.75 2.25v5.5c0 .551-.448 1-1 1h-5.5c-.552 0-1-.449-1-1v-5.5c0-.551.448-1 1-1h5.5c.552 0 1 .449 1 1Zm11-1h-5.5c-.552 0-1 .449-1 1v5.5c0 .551.448 1 1 1h5.5c.552 0 1-.449 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm12 0h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Zm12 0h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Z"
|
|
42
42
|
/>
|
|
43
43
|
</svg>
|
|
44
44
|
</span>
|
|
@@ -55,7 +55,7 @@ exports[`renders some divs 1`] = `
|
|
|
55
55
|
aria-label="Drag button"
|
|
56
56
|
aria-roledescription="sortable"
|
|
57
57
|
class="pf-v6-c-button pf-m-plain"
|
|
58
|
-
data-ouia-component-id="OUIA-Generated-Button-plain
|
|
58
|
+
data-ouia-component-id="OUIA-Generated-Button-plain-:r1:"
|
|
59
59
|
data-ouia-component-type="PF6/Button"
|
|
60
60
|
data-ouia-safe="true"
|
|
61
61
|
role="button"
|
|
@@ -74,11 +74,11 @@ exports[`renders some divs 1`] = `
|
|
|
74
74
|
fill="currentColor"
|
|
75
75
|
height="1em"
|
|
76
76
|
role="img"
|
|
77
|
-
viewBox="0 0
|
|
77
|
+
viewBox="0 0 32 32"
|
|
78
78
|
width="1em"
|
|
79
79
|
>
|
|
80
80
|
<path
|
|
81
|
-
d="
|
|
81
|
+
d="M13.75 2.25v5.5c0 .551-.448 1-1 1h-5.5c-.552 0-1-.449-1-1v-5.5c0-.551.448-1 1-1h5.5c.552 0 1 .449 1 1Zm11-1h-5.5c-.552 0-1 .449-1 1v5.5c0 .551.448 1 1 1h5.5c.552 0 1-.449 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm12 0h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Zm12 0h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Z"
|
|
82
82
|
/>
|
|
83
83
|
</svg>
|
|
84
84
|
</span>
|
|
@@ -95,7 +95,7 @@ exports[`renders some divs 1`] = `
|
|
|
95
95
|
aria-label="Drag button"
|
|
96
96
|
aria-roledescription="sortable"
|
|
97
97
|
class="pf-v6-c-button pf-m-plain"
|
|
98
|
-
data-ouia-component-id="OUIA-Generated-Button-plain
|
|
98
|
+
data-ouia-component-id="OUIA-Generated-Button-plain-:r2:"
|
|
99
99
|
data-ouia-component-type="PF6/Button"
|
|
100
100
|
data-ouia-safe="true"
|
|
101
101
|
role="button"
|
|
@@ -114,11 +114,11 @@ exports[`renders some divs 1`] = `
|
|
|
114
114
|
fill="currentColor"
|
|
115
115
|
height="1em"
|
|
116
116
|
role="img"
|
|
117
|
-
viewBox="0 0
|
|
117
|
+
viewBox="0 0 32 32"
|
|
118
118
|
width="1em"
|
|
119
119
|
>
|
|
120
120
|
<path
|
|
121
|
-
d="
|
|
121
|
+
d="M13.75 2.25v5.5c0 .551-.448 1-1 1h-5.5c-.552 0-1-.449-1-1v-5.5c0-.551.448-1 1-1h5.5c.552 0 1 .449 1 1Zm11-1h-5.5c-.552 0-1 .449-1 1v5.5c0 .551.448 1 1 1h5.5c.552 0 1-.449 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm12 0h-5.5c-.552 0-1 .449-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5c0-.551-.448-1-1-1Zm-12 11h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Zm12 0h-5.5a1 1 0 0 0-1 1v5.5a1 1 0 0 0 1 1h5.5a1 1 0 0 0 1-1v-5.5a1 1 0 0 0-1-1Z"
|
|
122
122
|
/>
|
|
123
123
|
</svg>
|
|
124
124
|
</span>
|