Skip to content

Remove duplicate template areas from the site view sidebar #54942

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
scruffian merged 2 commits into from
Oct 16, 2023
Merged

Remove duplicate template areas from the site view sidebar #54942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f163c72
Remvoe duplicate template areas from the site view sidebar
scruffian Sep 29, 2023
aeae7b4
use a set instead of an array for available template parts
draganescu Oct 13, 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
28 changes: 21 additions & 7 deletions ...ages/edit-site/src/components/sidebar-navigation-screen-template/home-template-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,28 @@ export default function HomeTemplateDetails() {
* which contains the template icon and fallback labels
*/
const templateAreas = useMemo( () => {
// Keep track of template part IDs that have already been added to the array.
const templatePartIds = new Set();
const filterOutDuplicateTemplateParts = ( currentTemplatePart ) => {
// If the template part has already been added to the array, skip it.
if ( templatePartIds.has( currentTemplatePart.templatePart.id ) ) {
return;
}
// Add to the array of template part IDs.
templatePartIds.add( currentTemplatePart.templatePart.id );
return currentTemplatePart;
};

return currentTemplateParts.length && templatePartAreas
? currentTemplateParts.map( ( { templatePart, block } ) => ( {
...templatePartAreas?.find(
( { area } ) => area === templatePart?.area
),
...templatePart,
clientId: block.clientId,
} ) )
? currentTemplateParts
.filter( filterOutDuplicateTemplateParts )
.map( ( { templatePart, block } ) => ( {
...templatePartAreas?.find(
( { area } ) => area === templatePart?.area
),
...templatePart,
clientId: block.clientId,
} ) )
: [];
}, [ currentTemplateParts, templatePartAreas ] );

Expand Down