diff --git a/packages/block-editor/src/components/block-draggable/index.js b/packages/block-editor/src/components/block-draggable/index.js index 0b8f3c2d87f52..4532461a09a3f 100644 --- a/packages/block-editor/src/components/block-draggable/index.js +++ b/packages/block-editor/src/components/block-draggable/index.js @@ -14,11 +14,14 @@ import useScrollWhenDragging from './use-scroll-when-dragging'; import { store as blockEditorStore } from '../../store'; const BlockDraggable = ( { + appendToOwnerDocument, children, clientIds, cloneClassname, + elementId, onDragStart, onDragEnd, + __experimentalDragComponent, } ) => { const { srcRootClientId, isDraggable, icon } = useSelect( ( select ) => { @@ -73,6 +76,7 @@ const BlockDraggable = ( { return ( + // Check against `undefined` so that `null` can be used to disable + // the default drag component. + __experimentalDragComponent !== undefined ? ( + __experimentalDragComponent + ) : ( + + ) } + elementId={ elementId } > { ( { onDraggableStart, onDraggableEnd } ) => { return children( { diff --git a/packages/block-editor/src/components/list-view/block-contents.js b/packages/block-editor/src/components/list-view/block-contents.js index 8d5b03395f3e2..356cc7cbf411e 100644 --- a/packages/block-editor/src/components/list-view/block-contents.js +++ b/packages/block-editor/src/components/list-view/block-contents.js @@ -47,8 +47,12 @@ const ListViewBlockContents = forwardRef( [] ); - const { AdditionalBlockContent, insertedBlock, setInsertedBlock } = - useListViewContext(); + const { + AdditionalBlockContent, + insertedBlock, + listViewInstanceId, + setInsertedBlock, + } = useListViewContext(); const isBlockMoveTarget = blockMovingClientId && selectedBlockInBlockEditor === clientId; @@ -74,7 +78,12 @@ const ListViewBlockContents = forwardRef( setInsertedBlock={ setInsertedBlock } /> ) } - + { ( { draggable, onDragStart, onDragEnd } ) => (