Try/refactor insertion #65282
Draft
Try/refactor insertion #65282
Conversation
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 reverts commit df849a9.
… related actions and selectors
|
Size Change: -182 B (-0.01%) Total Size: 1.78 MB
ℹ️ View Unchanged
|
…nd add getNextInsertionPoint
jeryj
commented
Sep 12, 2024
Comment on lines
99
to
112
| _destinationIndex = insertionPoint.insertionIndex; | ||
| } else if ( clientId ) { | ||
| // Insert after a specific client ID. | ||
| _destinationIndex = getBlockIndex( clientId ); | ||
| } else if ( ! isAppender && selectedBlockClientId ) { | ||
| _destinationRootClientId = getBlockRootClientId( | ||
| selectedBlockClientId | ||
| ); | ||
| _destinationIndex = getBlockIndex( selectedBlockClientId ) + 1; | ||
| } else { | ||
| // Insert at the end of the list. | ||
| _destinationIndex = getBlockOrder( | ||
| _destinationRootClientId | ||
| ).length; |
There was a problem hiding this comment.
I think I should leave all of this in and address it in a follow-up to refactor further.
jeryj
commented
Sep 12, 2024
Comment on lines
+1519
to
+1556
| export const getNextInsertionPoint = createRegistrySelector( ( select ) => | ||
| createSelector( | ||
| ( state ) => { | ||
| let rootClientId, index; | ||
|
|
||
| const { | ||
| insertionPoint, | ||
| selection: { selectionEnd }, | ||
| } = state; | ||
| if ( insertionPoint !== null ) { | ||
| return insertionPoint; | ||
| } | ||
|
|
||
| const { clientId } = selectionEnd; | ||
| const sectionRootClientId = unlock( | ||
| select( STORE_NAME ) | ||
| ).getSectionRootClientId( state, clientId ); | ||
|
|
||
| if ( clientId ) { | ||
| rootClientId = | ||
| getBlockRootClientId( state, clientId ) || undefined; | ||
| index = getBlockIndex( state, selectionEnd.clientId ) + 1; | ||
| } else if ( sectionRootClientId ) { | ||
| index = getBlockOrder( state, sectionRootClientId ).length; | ||
| } else { | ||
| index = getBlockOrder( state ).length; | ||
| } | ||
|
|
||
| return { rootClientId, index }; | ||
| }, | ||
| ( state ) => [ | ||
| state.insertionPoint, | ||
| state.selection.selectionEnd.clientId, | ||
| state.blocks.parents, | ||
| state.blocks.order, | ||
| ] | ||
| ) | ||
| ); |
There was a problem hiding this comment.
This is only used in one spot, so I think we should remove it. I think it could be useful in the future though.
There was a problem hiding this comment.
I also think that if we had it available, it would have been used. May be worth going through and seeing how much it would simplify things.
|
We should set the insertion point when clicking an inline + rather than waiting until Browse All. That would remove the need for a lot of code in the inline inserter. |
There's a lot happening within the inserter select well before we seemingly need any of it. How much of this do we need to constantly fire? Can't we delay checking it until we've clicked the toggle?
jeryj
force-pushed
the
fix/insertion-point-hover
branch
from
a0f66e9
to
24a2aec
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Exploring #65290
What?
Rework Block Insertion API for clarity and performance.
Why?
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast