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

Fix Link UI showing on mount for first and last nav menu items #50638

Closed
wants to merge 2 commits into from
Closed

Fix Link UI showing on mount for first and last nav menu items #50638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8698b3
Fix Link UI showing on mount for last nav menu item
jeryj May 15, 2023
fe881da
Check isMounted.current, not isMounted
jeryj May 15, 2023
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
19 changes: 12 additions & 7 deletions packages/block-library/src/navigation/edit/menu-inspector-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
Spinner,
} from '@wordpress/components';
import { useSelect } from '@wordpress/data';
import { useState, useEffect } from '@wordpress/element';
import { useState, useEffect, useRef } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';

/**
Expand Down Expand Up @@ -46,6 +46,7 @@ const MainContent = ( {

// Provide a hierarchy of clientIds for the given Navigation block (clientId).
// This is required else the list view will display the entire block tree.
// Note: This is only the top-level items. Submenu items will not show in this tree.
const clientIdsTree = useSelect(
( select ) => {
const { __unstableGetClientIdsTree } = select( blockEditorStore );
Expand Down Expand Up @@ -73,21 +74,25 @@ const MainContent = ( {
} = useInsertedBlock( lastInsertedBlockClientId );

const hasExistingLinkValue = insertedBlockAttributes?.url;
const isMounted = useRef( false );

useEffect( () => {
// We need to check isMounted because we never want to show the Link UI on initial render,
// as there's no way that a user interaction would have caused the Link UI to be shown from that state.
if (
isMounted.current &&
lastInsertedBlockClientId &&
BLOCKS_WITH_LINK_UI_SUPPORT?.includes( insertedBlockName ) &&
! hasExistingLinkValue // don't re-show the Link UI if the block already has a link value.
) {
setClientIdWithOpenLinkUI( lastInsertedBlockClientId );
}
}, [
lastInsertedBlockClientId,
clientId,
insertedBlockName,
hasExistingLinkValue,
] );
}, [ lastInsertedBlockClientId, insertedBlockName, hasExistingLinkValue ] );

// This is to prevent the Link UI from showing on initial render if the lastInsertedBlockId doesn't have a link value: https://github.com/WordPress/gutenberg/issues/50601
useEffect( () => {
isMounted.current = true;
}, [] );

const { navigationMenu } = useNavigationMenu( currentMenuId );

Expand Down