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

Show file tree
Hide file tree
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 for site editor
  • Loading branch information
@ellatrix
ellatrix committed Apr 23, 2021
commit db53bcd8c48afa32fce3f6fdfee59f9560184de5
7 changes: 6 additions & 1 deletion packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ function Editor( { initialSettings } ) {

const secondarySidebar = () => {
if ( isInserterOpen ) {
return <InserterSidebar />;
return (
<InserterSidebar
rootClientId={ isInserterOpen?.rootClientId }
Copy link
Contributor

@youknowriad youknowriad Apr 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems weird that isInserterOpen is not a boolean. Can we rename the selectors? Are these stable?

Copy link
Member Author

@ellatrix ellatrix Apr 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The setting (action) is exposed as experimental (__experimentalSetIsInserterOpened), but the selector was not. I created a separate experimental selector to get the insertion point and make sure that the isInserterOpen selector remains boolean.

index={ isInserterOpen?.blockIndex }
/>
);
}
if ( isListViewOpen ) {
return (
Expand Down
9 changes: 7 additions & 2 deletions packages/edit-site/src/components/secondary-sidebar/inserter-sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
*/
import { store as editSiteStore } from '../../store';

export default function InserterSidebar() {
export default function InserterSidebar( { rootClientId, index } ) {
const { setIsInserterOpened } = useDispatch( editSiteStore );

const isMobile = useViewportMatch( 'medium', '<' );
Expand All @@ -36,7 +36,12 @@ export default function InserterSidebar() {
/>
</div>
<div className="edit-site-editor__inserter-panel-content">
<Library showInserterHelpPanel shouldFocusBlock={ isMobile } />
<Library
showInserterHelpPanel
shouldFocusBlock={ isMobile }
rootClientId={ rootClientId }
index={ index }
/>
</div>
</div>
);
Expand Down