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

call isMultiSelecting and isNavigationMode selectors where needed #22135

Merged
merged 1 commit into from
Jun 19, 2020
Merged

call isMultiSelecting and isNavigationMode selectors where needed #22135

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
30 changes: 19 additions & 11 deletions packages/block-editor/src/components/block-list/block-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ const BlockComponent = forwardRef(
isSelected,
isFirstMultiSelected,
isLastMultiSelected,
isMultiSelecting,
isNavigationMode,
isPartOfMultiSelection,
enableAnimation,
index,
Expand All @@ -53,16 +51,26 @@ const BlockComponent = forwardRef(
blockTitle,
wrapperProps,
} = useContext( BlockListBlockContext );
const { initialPosition } = useSelect(
const {
initialPosition,
shouldFocusFirstElement,
isNavigationMode,
} = useSelect(
( select ) => {
if ( ! isSelected ) {
return {};
}
const {
getSelectedBlocksInitialCaretPosition,
isMultiSelecting: _isMultiSelecting,
isNavigationMode: _isNavigationMode,
} = select( 'core/block-editor' );

return {
initialPosition: select(
'core/block-editor'
).getSelectedBlocksInitialCaretPosition(),
shouldFocusFirstElement:
isSelected &&
! _isMultiSelecting() &&
! _isNavigationMode(),
initialPosition: isSelected
? getSelectedBlocksInitialCaretPosition()
: undefined,
};
},
[ isSelected ]
Expand Down Expand Up @@ -134,10 +142,10 @@ const BlockComponent = forwardRef(
};

useEffect( () => {
if ( ! isMultiSelecting && ! isNavigationMode && isSelected ) {
if ( shouldFocusFirstElement ) {
focusTabbable();
}
}, [ isSelected, isMultiSelecting, isNavigationMode ] );
}, [ shouldFocusFirstElement ] );

// Block Reordering animation
useMovingAnimation(
Expand Down
6 changes: 0 additions & 6 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 @@ -64,8 +64,6 @@ function BlockListBlock( {
toggleSelection,
index,
enableAnimation,
isNavigationMode,
isMultiSelecting,
} ) {
// In addition to withSelect, we should favor using useSelect in this
// component going forward to avoid leaking new props to the public API
Expand Down Expand Up @@ -177,8 +175,6 @@ function BlockListBlock( {
isSelected,
isFirstMultiSelected,
isLastMultiSelected,
isMultiSelecting,
isNavigationMode,
isPartOfMultiSelection,
enableAnimation,
index,
Expand Down Expand Up @@ -243,7 +239,6 @@ const applyWithSelect = withSelect(
hasSelectedInnerBlock,
getTemplateLock,
__unstableGetBlockWithoutInnerBlocks,
isNavigationMode,
getMultiSelectedBlockClientIds,
} = select( 'core/block-editor' );
const block = __unstableGetBlockWithoutInnerBlocks( clientId );
Expand Down Expand Up @@ -289,7 +284,6 @@ const applyWithSelect = withSelect(
isSelectionEnabled: isSelectionEnabled(),
isLocked: !! templateLock,
isFocusMode: focusMode && isLargeViewport,
isNavigationMode: isNavigationMode(),
isRTL,

// Users of the editor.BlockListBlock filter used to be able to
Expand Down
6 changes: 1 addition & 5 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 @@ -38,7 +38,6 @@ function BlockList(
const {
getBlockOrder,
getBlockListSettings,
isMultiSelecting,
getSelectedBlockClientId,
getMultiSelectedBlockClientIds,
hasMultiSelection,
Expand All @@ -48,7 +47,6 @@ function BlockList(

return {
blockClientIds: getBlockOrder( rootClientId ),
isMultiSelecting: isMultiSelecting(),
selectedBlockClientId: getSelectedBlockClientId(),
multiSelectedBlockClientIds: getMultiSelectedBlockClientIds(),
moverDirection: getBlockListSettings( rootClientId )
Expand All @@ -62,7 +60,6 @@ function BlockList(

const {
blockClientIds,
isMultiSelecting,
selectedBlockClientId,
multiSelectedBlockClientIds,
moverDirection,
Expand Down Expand Up @@ -103,8 +100,7 @@ function BlockList(
<BlockListBlock
rootClientId={ rootClientId }
clientId={ clientId }
isMultiSelecting={ isMultiSelecting }
// This prop is explicitly computed and passed down
// This prop is explicitely computed and passed down
// to avoid being impacted by the async mode
// otherwise there might be a small delay to trigger the animation.
index={ index }
Expand Down
22 changes: 13 additions & 9 deletions packages/block-editor/src/components/block-list/insertion-point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ function Indicator( { clientId } ) {
}

export default function InsertionPoint( {
isMultiSelecting,
hasMultiSelection,
selectedBlockClientId,
children,
Expand All @@ -60,15 +59,20 @@ export default function InsertionPoint( {
const [ inserterElement, setInserterElement ] = useState( null );
const [ inserterClientId, setInserterClientId ] = useState( null );
const ref = useRef();
const { multiSelectedBlockClientIds } = useSelect( ( select ) => {
const { getMultiSelectedBlockClientIds } = select(
'core/block-editor'
);
const { multiSelectedBlockClientIds, isMultiSelecting } = useSelect(
( select ) => {
const {
getMultiSelectedBlockClientIds,
isMultiSelecting: _isMultiSelecting,
} = select( 'core/block-editor' );

return {
multiSelectedBlockClientIds: getMultiSelectedBlockClientIds(),
};
} );
return {
isMultiSelecting: _isMultiSelecting(),
multiSelectedBlockClientIds: getMultiSelectedBlockClientIds(),
};
},
[]
);

function onMouseMove( event ) {
if (
Expand Down
19 changes: 7 additions & 12 deletions packages/block-editor/src/components/block-list/root-container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,13 @@ export const BlockNodes = createContext();
export const SetBlockNodes = createContext();

function selector( select ) {
const {
getSelectedBlockClientId,
hasMultiSelection,
isMultiSelecting,
} = select( 'core/block-editor' );
const { getSelectedBlockClientId, hasMultiSelection } = select(
'core/block-editor'
);

return {
selectedBlockClientId: getSelectedBlockClientId(),
hasMultiSelection: hasMultiSelection(),
isMultiSelecting: isMultiSelecting(),
};
}

Expand All @@ -53,11 +50,10 @@ function onDragStart( event ) {
}

function RootContainer( { children, className }, ref ) {
const {
selectedBlockClientId,
hasMultiSelection,
isMultiSelecting,
} = useSelect( selector, [] );
const { selectedBlockClientId, hasMultiSelection } = useSelect(
selector,
[]
);
const { selectBlock } = useDispatch( 'core/block-editor' );
const onSelectionStart = useMultiSelection( ref );

Expand All @@ -84,7 +80,6 @@ function RootContainer( { children, className }, ref ) {

return (
<InsertionPoint
isMultiSelecting={ isMultiSelecting }
hasMultiSelection={ hasMultiSelection }
selectedBlockClientId={ selectedBlockClientId }
containerRef={ ref }
Expand Down