Add/drag handle #9569
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 ); |
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 |
|---|---|---|
|
|
@@ -43,7 +43,6 @@ import BlockContextualToolbar from './block-contextual-toolbar'; | |
| import BlockMultiControls from './multi-controls'; | ||
| import BlockMobileToolbar from './block-mobile-toolbar'; | ||
| import BlockInsertionPoint from './insertion-point'; | ||
| import IgnoreNestedEvents from './ignore-nested-events'; | ||
| import InserterWithShortcuts from '../inserter-with-shortcuts'; | ||
| import Inserter from '../inserter'; | ||
|
|
@@ -373,6 +372,7 @@ export class BlockListBlock extends Component { | |
| hasSelectedInnerBlock, | ||
| isParentOfSelectedBlock, | ||
| hasMultiSelection, | ||
| isDraggable, | ||
|
There was a problem hiding this comment. I think this prop is useless, (in the block layout as well), I don't see where it's being set? There was a problem hiding this comment. No, it isn't. This is a Matías' request so specific editor implementations can hide the drag handler. To maintain backwards-compatibility, unless it is specifically set to |
||
| } = this.props; | ||
| const isHovered = this.state.isHovered && ! isMultiSelecting; | ||
| const { name: blockName, isValid } = block; | ||
|
|
@@ -410,7 +410,7 @@ export class BlockListBlock extends Component { | |
| 'is-selected-parent': shouldAppearSelectedParent, | ||
| 'is-hovered': shouldAppearHovered, | ||
| 'is-reusable': isReusableBlock( blockType ), | ||
| 'is-dragging': dragging, | ||
| 'is-typing': isTypingWithinBlock, | ||
| 'is-focused': isFocusMode && ( isSelected || isParentOfSelectedBlock ), | ||
| 'is-focus-mode': isFocusMode, | ||
|
|
@@ -480,18 +480,6 @@ export class BlockListBlock extends Component { | |
| ] } | ||
| { ...wrapperProps } | ||
| > | ||
| { shouldShowInsertionPoint && ( | ||
| <BlockInsertionPoint | ||
| clientId={ clientId } | ||
|
|
@@ -509,11 +497,14 @@ export class BlockListBlock extends Component { | |
| { shouldRenderMovers && ( | ||
| <BlockMover | ||
| clientIds={ clientId } | ||
| blockElementId={ blockElementId } | ||
| layout={ layout } | ||
| isFirst={ isFirst } | ||
| isLast={ isLast } | ||
| isHidden={ ! ( isHovered || isSelected ) || hoverArea !== 'left' } | ||
| isDraggable={ ( isDraggable !== false ) && ( ! isPartOfMultiSelection && isMovable ) } | ||
| onDragStart={ this.onDragStart } | ||
| onDragEnd={ this.onDragEnd } | ||
| /> | ||
| ) } | ||
| { shouldShowBreadcrumb && ( | ||
|
|
||
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 |
|---|---|---|
| @@ -1,104 +1,35 @@ | ||
| .editor-block-list__layout .components-draggable__clone { | ||
| // Hide the Block UI when dragging the block | ||
| // This ensures the page scroll properly (no sticky elements) | ||
| .editor-block-contextual-toolbar, | ||
| .editor-block-settings-menu { | ||
| // I think important is fine here to avoid over complexing the selector | ||
| display: none !important; | ||
| } | ||
| } | ||
|
|
||
| .editor-block-list__layout .editor-block-list__block.is-selected { // Needs specificity to override inherited styles. | ||
|
There was a problem hiding this comment. It looks like the changes here introduced a regression in Spotlight mode. It should be fixed here #9951 |
||
| // While block is being dragged, dim the slot dragged from, and hide some UI. | ||
| &.is-dragging { | ||
| .editor-block-list__block-edit::before { | ||
| outline: none; | ||
| } | ||
|
|
||
| > .editor-block-list__block-edit > * { | ||
| background: $light-gray-100; | ||
| } | ||
|
|
||
| > .editor-block-list__block-edit > * > * { | ||
| visibility: hidden; | ||
| } | ||
|
|
||
| .editor-block-mover, | ||
| .editor-block-contextual-toolbar { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Adds a feature by removing code |
||
| > .editor-block-list__block-edit .reusable-block-edit-panel * { | ||
| z-index: z-index(".editor-block-list__block-edit .reusable-block-edit-panel *"); | ||
| } | ||
|
|
||
|
|
@@ -438,12 +369,6 @@ | |
| float: left; | ||
| } | ||
|
|
||
| // Position hover label on the right | ||
| > .editor-block-list__breadcrumb { | ||
| right: -$border-width; | ||
|
|
||
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 } ) => { | ||
|
There was a problem hiding this comment. Minor: This component looks useless to me, we can just embed it inside the mover but I don't feel strongly. There was a problem hiding this comment. I find it useful to hide how the drag logic works from the block-mover itself, so the icons in the |
||
| 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dragging no longer needs a dedicated DOM node. This PR removes the
editor-block-list__block-draggablenode fromBlockDraggable.