diff --git a/packages/react-core/src/components/DataList/examples/DataList.md b/packages/react-core/src/components/DataList/examples/DataList.md index e56620485c7..8a25af028c6 100644 --- a/packages/react-core/src/components/DataList/examples/DataList.md +++ b/packages/react-core/src/components/DataList/examples/DataList.md @@ -83,7 +83,7 @@ import { DragDrop, Draggable, Droppable } from '@patternfly/react-core/deprecate ### Draggable -Note: There is a new recommended drag and drop implementation with full keyboard functionality, which replaces this implementation. To adhere to our new recommendations, refer to the [drag and drop demos](/components/drag-and-drop/react-next-demos). +Note: There is a new recommended drag and drop implementation with full keyboard functionality, which replaces this implementation. To adhere to our new recommendations, refer to the [drag and drop demos](/components/drag-and-drop/react-demos). Previously, draggable data lists had their own API for the [drag and drop component](/components/drag-and-drop), which wasn't flexible enough to allow custom styling for items as they are dragged. To address this disparity, ``, ``, and `` components were added to replace our now deprecated HTML5-based API. Keyboard and screen reader accessibility for the `` component is still in development. diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md b/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md index bfa40d3b81f..5dd542efcc3 100644 --- a/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md +++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md @@ -88,7 +88,7 @@ The dual list selector can also be built in a composable manner to make customiz ### Composable with drag and drop -Note: There is a new recommended drag and drop implementation with full keyboard functionality, which replaces this implementation. To adhere to our new recommendations, refer to the [drag and drop demos](/components/drag-and-drop/react-next-demos). +Note: There is a new recommended drag and drop implementation with full keyboard functionality, which replaces this implementation. To adhere to our new recommendations, refer to the [drag and drop demos](/components/drag-and-drop/react-demos). This example only allows reordering the contents of the "chosen" pane with drag and drop. To make a pane able to be reordered: diff --git a/packages/react-docs/patternfly-docs/patternfly-docs.source.js b/packages/react-docs/patternfly-docs/patternfly-docs.source.js index b04b4effea9..04f64dd8b9a 100644 --- a/packages/react-docs/patternfly-docs/patternfly-docs.source.js +++ b/packages/react-docs/patternfly-docs/patternfly-docs.source.js @@ -46,7 +46,7 @@ module.exports = (baseSourceMD, sourceProps) => { sourceMD(path.join(reactCodeEditorPath, '/**/examples/*.md'), 'react'); // Drag drop MD - sourceMD(path.join(reactDragDropPath, '/**/examples/*.md'), 'react-next'); + sourceMD(path.join(reactDragDropPath, '/**/examples/*.md'), 'react'); // Templates MD sourceMD(path.join(reactTemplatesPath, '/**/examples/*.md'), 'react-templates'); diff --git a/packages/react-drag-drop/src/next/components/DragDrop/DragButton.tsx b/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/DragButton.tsx rename to packages/react-drag-drop/src/components/DragDrop/DragButton.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/DragDropSort.tsx b/packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/DragDropSort.tsx rename to packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/Draggable.tsx b/packages/react-drag-drop/src/components/DragDrop/Draggable.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/Draggable.tsx rename to packages/react-drag-drop/src/components/DragDrop/Draggable.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/DraggableDataListItem.tsx b/packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/DraggableDataListItem.tsx rename to packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/DraggableDualListSelectorListItem.tsx b/packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/DraggableDualListSelectorListItem.tsx rename to packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/Droppable.tsx b/packages/react-drag-drop/src/components/DragDrop/Droppable.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/Droppable.tsx rename to packages/react-drag-drop/src/components/DragDrop/Droppable.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/DroppableContext.ts b/packages/react-drag-drop/src/components/DragDrop/DroppableContext.ts similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/DroppableContext.ts rename to packages/react-drag-drop/src/components/DragDrop/DroppableContext.ts diff --git a/packages/react-drag-drop/src/next/components/DragDrop/__tests__/DragDrop.test.tsx b/packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/__tests__/DragDrop.test.tsx rename to packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap b/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap rename to packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/BasicSorting.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/BasicSorting.tsx rename to packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/BasicSortingWithDragButton.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/BasicSortingWithDragButton.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/BasicSortingWithDragButton.tsx rename to packages/react-drag-drop/src/components/DragDrop/examples/BasicSortingWithDragButton.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/DataListDraggable.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/DataListDraggable.tsx rename to packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/DragDrop.md b/packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/DragDrop.md rename to packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/DragDropDemos.md b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md similarity index 98% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/DragDropDemos.md rename to packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md index 0be4b53e561..9a23855c643 100644 --- a/packages/react-drag-drop/src/next/components/DragDrop/examples/DragDropDemos.md +++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md @@ -1,7 +1,7 @@ --- id: Drag and drop section: components -source: react-next-demos +source: react-demos propComponents: ['DragDropSort', 'DraggableObject'] beta: true --- diff --git a/packages/react-drag-drop/src/next/components/DragDrop/examples/DualListSelectorDraggable.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/examples/DualListSelectorDraggable.tsx rename to packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx diff --git a/packages/react-drag-drop/src/next/components/DragDrop/index.ts b/packages/react-drag-drop/src/components/DragDrop/index.ts similarity index 100% rename from packages/react-drag-drop/src/next/components/DragDrop/index.ts rename to packages/react-drag-drop/src/components/DragDrop/index.ts diff --git a/packages/react-drag-drop/src/next/components/index.ts b/packages/react-drag-drop/src/components/index.ts similarity index 100% rename from packages/react-drag-drop/src/next/components/index.ts rename to packages/react-drag-drop/src/components/index.ts diff --git a/packages/react-drag-drop/src/index.ts b/packages/react-drag-drop/src/index.ts index 4007789b7ae..07635cbbc8e 100644 --- a/packages/react-drag-drop/src/index.ts +++ b/packages/react-drag-drop/src/index.ts @@ -1 +1 @@ -export * from './next'; +export * from './components'; diff --git a/packages/react-drag-drop/src/next/index.ts b/packages/react-drag-drop/src/next/index.ts deleted file mode 100644 index 07635cbbc8e..00000000000 --- a/packages/react-drag-drop/src/next/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components';