Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid passing down isFirst and isLast props #15043

Merged
merged 1 commit into from
Apr 19, 2019
Merged

Avoid passing down isFirst and isLast props #15043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/block-editor/src/components/block-list/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,6 @@ export class BlockListBlock extends Component {
isFocusMode,
hasFixedToolbar,
isLocked,
isFirst,
isLast,
clientId,
rootClientId,
isSelected,
Expand Down Expand Up @@ -527,8 +525,6 @@ export class BlockListBlock extends Component {
<BlockMover
clientIds={ clientId }
blockElementId={ blockElementId }
isFirst={ isFirst }
isLast={ isLast }
isHidden={ ! ( isHovered || isSelected ) || hoverArea !== 'left' }
isDraggable={
isDraggable !== false &&
Expand Down
4 changes: 1 addition & 3 deletions packages/block-editor/src/components/block-list/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class BlockList extends Component {

return (
<div className="editor-block-list__layout block-editor-block-list__layout">
{ map( blockClientIds, ( clientId, blockIndex ) => {
{ map( blockClientIds, ( clientId ) => {
const isBlockInSelection = hasMultiSelection ?
multiSelectedBlockClientIds.includes( clientId ) :
selectedBlockClientId === clientId;
Expand All @@ -216,8 +216,6 @@ class BlockList extends Component {
blockRef={ this.setBlockRef }
onSelectionStart={ this.onSelectionStart }
rootClientId={ rootClientId }
isFirst={ blockIndex === 0 }
isLast={ blockIndex === blockClientIds.length - 1 }
isDraggable={ isDraggable }
/>
</AsyncModeProvider>
Expand Down
20 changes: 1 addition & 19 deletions packages/block-editor/src/components/block-list/multi-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* External dependencies
*/
import { first, last } from 'lodash';

/**
* WordPress dependencies
*/
Expand All @@ -15,41 +10,28 @@ import BlockMover from '../block-mover';

function BlockListMultiControls( {
multiSelectedBlockClientIds,
clientId,
isSelecting,
isFirst,
isLast,
} ) {
if ( isSelecting ) {
return null;
}

return (
<BlockMover
key="mover"
clientId={ clientId }
clientIds={ multiSelectedBlockClientIds }
isFirst={ isFirst }
isLast={ isLast }
/>
);
}

export default withSelect( ( select, { clientId } ) => {
export default withSelect( ( select ) => {
const {
getMultiSelectedBlockClientIds,
isMultiSelecting,
getBlockIndex,
getBlockCount,
} = select( 'core/block-editor' );
const clientIds = getMultiSelectedBlockClientIds();
const firstIndex = getBlockIndex( first( clientIds ), clientId );
const lastIndex = getBlockIndex( last( clientIds ), clientId );

return {
multiSelectedBlockClientIds: clientIds,
isSelecting: isMultiSelecting(),
isFirst: firstIndex === 0,
isLast: lastIndex + 1 === getBlockCount(),
};
} )( BlockListMultiControls );
16 changes: 11 additions & 5 deletions packages/block-editor/src/components/block-mover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* External dependencies
*/
import { first, partial, castArray } from 'lodash';
import { first, last, partial, castArray } from 'lodash';
import classnames from 'classnames';

/**
Expand Down Expand Up @@ -117,16 +117,22 @@ export class BlockMover extends Component {

export default compose(
withSelect( ( select, { clientIds } ) => {
const { getBlock, getBlockIndex, getTemplateLock, getBlockRootClientId } = select( 'core/block-editor' );
const firstClientId = first( castArray( clientIds ) );
const { getBlock, getBlockIndex, getTemplateLock, getBlockRootClientId, getBlockOrder } = select( 'core/block-editor' );
const normalizedClientIds = castArray( clientIds );
const firstClientId = first( normalizedClientIds );
const block = getBlock( firstClientId );
const rootClientId = getBlockRootClientId( first( castArray( clientIds ) ) );
const rootClientId = getBlockRootClientId( first( normalizedClientIds ) );
const blockOrder = getBlockOrder( rootClientId );
const firstIndex = getBlockIndex( firstClientId, rootClientId );
const lastIndex = getBlockIndex( last( normalizedClientIds ), rootClientId );

return {
firstIndex: getBlockIndex( firstClientId, rootClientId ),
blockType: block ? getBlockType( block.name ) : null,
isLocked: getTemplateLock( rootClientId ) === 'all',
rootClientId,
firstIndex,
isFirst: firstIndex === 0,
isLast: lastIndex === blockOrder.length - 1,
};
} ),
withDispatch( ( dispatch, { clientIds, rootClientId } ) => {
Expand Down