-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add/drag handle to mover component (#9569)
- Loading branch information
Showing
11 changed files
with
210 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Draggable } from '@wordpress/components'; | ||
| import { withSelect } from '@wordpress/data'; | ||
|
|
||
| const BlockDraggable = ( { children, clientId, rootClientId, blockElementId, index, layout, onDragStart, onDragEnd } ) => { | ||
| const transferData = { | ||
| type: 'block', | ||
| fromIndex: index, | ||
| rootClientId, | ||
| clientId, | ||
| layout, | ||
| }; | ||
|
|
||
| return ( | ||
| <Draggable | ||
| elementId={ blockElementId } | ||
| transferData={ transferData } | ||
| onDragStart={ onDragStart } | ||
| onDragEnd={ onDragEnd } | ||
| > | ||
| { | ||
| ( { onDraggableStart, onDraggableEnd } ) => { | ||
| return children( { | ||
| onDraggableStart: onDraggableStart, | ||
| onDraggableEnd: onDraggableEnd, | ||
| } ); | ||
| } | ||
| } | ||
| </Draggable> | ||
| ); | ||
| }; | ||
|
|
||
| export default withSelect( ( select, { clientId } ) => { | ||
| const { getBlockIndex, getBlockRootClientId } = select( 'core/editor' ); | ||
| return { | ||
| index: getBlockIndex( clientId ), | ||
| rootClientId: getBlockRootClientId( clientId ), | ||
| }; | ||
| } )( BlockDraggable ); |
46 changes: 0 additions & 46 deletions
46
packages/editor/src/components/block-list/block-draggable.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import classnames from 'classnames'; | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import BlockDraggable from '../block-draggable'; | ||
|
|
||
| export const IconDragHandle = ( { isVisible, className, icon, onDragStart, onDragEnd, blockElementId, clientId, layout } ) => { | ||
| if ( ! isVisible ) { | ||
| return null; | ||
| } | ||
|
|
||
| const dragHandleClassNames = classnames( 'editor-block-mover__control-drag-handle', className ); | ||
|
|
||
| return ( | ||
| <BlockDraggable | ||
| clientId={ clientId } | ||
| blockElementId={ blockElementId } | ||
| layout={ layout } | ||
| onDragStart={ onDragStart } | ||
| onDragEnd={ onDragEnd } | ||
| > | ||
| { | ||
| ( { onDraggableStart, onDraggableEnd } ) => ( | ||
| <div | ||
| className={ dragHandleClassNames } | ||
| aria-hidden="true" | ||
| onDragStart={ onDraggableStart } | ||
| onDragEnd={ onDraggableEnd } | ||
| draggable | ||
| > | ||
| { icon } | ||
| </div> | ||
| ) } | ||
| </BlockDraggable> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.