Fix: Inserter on the navigation sidebar. (#48049 #48049
Merged
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
jorgefilipecosta
added
[Type] Bug
|
Size Change: +1.99 kB (0%) Total Size: 1.33 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in d96da60. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/4241952442
|
|
It seems to me the off canvas editor shouldn't be assuming that the menu is selected. Can't we instead update the logic within the off canvas editor instead of adding a new inserter and hiding the built-in one? |
|
I think the same as Riad - let's try to not need to hide via CSS the elements but instead make the thing better at composing different parts. |
jorgefilipecosta
force-pushed
the
fix/make-navigation-page-list-load-its-items-on-sidebar
branch
from
55a71ae
to
4b61df1
Compare
jorgefilipecosta
force-pushed
the
fix/inserter-on-navigation-menu-sidebar
branch
from
a433b4f
to
be1cf88
Compare
jorgefilipecosta
force-pushed
the
fix/inserter-on-navigation-menu-sidebar
branch
from
3000cc0
to
ff7ad9d
Compare
|
Hi @youknowriad, @draganescu, this PR was updated. Now, it updates the OffSiteNavigationEditor. Visually things look like this: The same as before. |
jorgefilipecosta
force-pushed
the
fix/make-navigation-page-list-load-its-items-on-sidebar
branch
from
4b61df1
to
30afe97
Compare
jorgefilipecosta
force-pushed
the
fix/inserter-on-navigation-menu-sidebar
branch
from
ff7ad9d
to
761e037
Compare
youknowriad
reviewed
Feb 20, 2023
There was a problem hiding this comment.
This looks good to me, I'd appreciate a review from folks working on the off canvas editor cc @draganescu
draganescu
reviewed
Feb 20, 2023
| // Only show the appender at the first level. | ||
| const showAppender = level === 1; | ||
| // Only show the appender at the first level and if there is a parent block. | ||
| const showAppender = level === 1 && parentId; |
There was a problem hiding this comment.
What does this addition do?
There was a problem hiding this comment.
If there is no parentId, we don't show the appender. The case where we may not have a parentId is if for example, we don't have navigation menus on the page the sidebar shows the offsite navigation editor which says correctly navigation is empty but without this change shows an appender that adds things to the root which is unexpected.
There was a problem hiding this comment.
I understand. Ok it's a good guard, but we should never be in this situation:
we don't have navigation menus on the page
I think the navigation is not empty just because the current page is not showing it. This is tricky and outside the scope of this PR but, what if the page with no navigation block is linked in the navigation, clicking on it in the sidebar would then hide the navigation from the sidebar - quite unexpected.
| @@ -227,6 +232,7 @@ function OffCanvasEditor( | |||
| > | |||
| <ListViewContext.Provider value={ contextValue }> | |||
| <ListViewBranch | |||
| parentId={ parentId } | |||
There was a problem hiding this comment.
is a better name for this rootBlockId or something as the list view is not really a child of a block?
There was a problem hiding this comment.
The component ListViewBranch already had the parentId property, I'm just passing the property in a case where we were not passing it before, but the prop already existed.
The list view component also calls it parentId
I can change it to rootBlockId on the offsite canvas editor and the list view if you prefer. I don't have a specific preference.
There was a problem hiding this comment.
Oh I lost this fact in reviewing the code, thought we just added parentId. Let's not change anything then :)
draganescu
approved these changes
Feb 22, 2023
👏🏻Squashed commits: [b429410eea] Fix: Inserter on navigation menu sidebar.
jorgefilipecosta
force-pushed
the
fix/inserter-on-navigation-menu-sidebar
branch
from
761e037
to
d96da60
Compare
jorgefilipecosta
requested review from
TimothyBJacobs,
spacedmonkey,
fluiddot,
ajitbohra,
kevin940726,
ntwb,
nerrad,
noisysocks,
talldan and
tellthemachines
as code owners
jorgefilipecosta
requested review from
adamziel,
ryanwelcher,
juanmaguitar and
fabiankaegy
as code owners
jorgefilipecosta
changed the base branch from
fix/make-navigation-page-list-load-its-items-on-sidebar
to
trunk
jorgefilipecosta
changed the title
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.
With the changes on #47853, we are not using a specific block editor for the navigation sidebar anymore. The inserter of the off-canvas menu editor assumes the navigation block or a child is selected. On the navigation sidebar, the navigation block may not be selected, so we need a specific inserter for the navigation sidebar.
This PR adds a simple inserter for the navigation sidebar. Given that we previously wanted to have the text "Add menu item" this PR also adds the text to the inserter superseding PR #46949.
Testing
Verify the navigation sidebar works as expected.