Skip to content

Simplify insertion point #30301

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

Merged
ellatrix merged 10 commits into from
Apr 23, 2021
Merged

Simplify insertion point #30301

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
46ff56d
Partial revert
ellatrix Mar 26, 2021
a7a3139
Pass position info directly to inserter
ellatrix Mar 26, 2021
9d7387f
Fix typo
ellatrix Mar 26, 2021
f9f19ae
Remove getBlockInsertionPoint
ellatrix Mar 26, 2021
ff0a461
Remove dead prop
ellatrix Apr 20, 2021
db53bcd
Add for site editor
ellatrix Apr 20, 2021
b4817ab
Add fallback to selected block position
ellatrix Apr 20, 2021
9237f37
Reuse existing experimental prop
ellatrix Apr 21, 2021
50ce7ff
Pass to search results
ellatrix Apr 21, 2021
98bb5aa
Create separate experimental selector and add docs
ellatrix Apr 23, 2021
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
Prev Previous commit
Next Next commit
Add fallback to selected block position
  • Loading branch information
@ellatrix
ellatrix committed Apr 23, 2021
commit b4817ab4bab29804e0041be77d17c9fe7e4f8502
14 changes: 13 additions & 1 deletion packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ function useInsertionPoint( {
const { destinationRootClientId, destinationIndex } = useSelect(
( select ) => {
const {
getSelectedBlockClientId,
getBlockRootClientId,
getBlockIndex,
getBlockOrder,
} = select( blockEditorStore );
const selectedBlockClientId = getSelectedBlockClientId();

const _destinationRootClientId = rootClientId;
let _destinationRootClientId = rootClientId;
let _destinationIndex;

if ( insertionIndex ) {
Expand All @@ -65,6 +68,15 @@ function useInsertionPoint( {
clientId,
_destinationRootClientId
);
} else if ( ! isAppender && selectedBlockClientId ) {
_destinationRootClientId = getBlockRootClientId(
selectedBlockClientId
);
_destinationIndex =
getBlockIndex(
selectedBlockClientId,
_destinationRootClientId
) + 1;
} else {
// Insert at the end of the list.
_destinationIndex = getBlockOrder( _destinationRootClientId )
Expand Down