Skip to content

Commit

Permalink
Merge pull request Yoast#20907 from Yoast/make-menu-items-order-consi…
Browse files Browse the repository at this point in the history 
…stent-throughout-editors

Re-order menu items to be consistent throughout various editors.
  • Loading branch information
@vraja-pro
vraja-pro authored Dec 5, 2023
2 parents 8aff30f + be032b5 commit e6adf6e
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 59 deletions.
8 changes: 4 additions & 4 deletions packages/js/src/components/fills/MetaboxFill.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ export default function MetaboxFill( { settings } ) {
{ settings.isKeywordAnalysisActive && <SidebarItem key="additional-keywords-upsell" renderPriority={ 22 }>
{ settings.shouldUpsell && <KeywordUpsell /> }
</SidebarItem> }
{ settings.shouldUpsell && ! isTerm && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 23 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
{ settings.isKeywordAnalysisActive && settings.isWincherIntegrationActive &&
<SidebarItem key="wincher-seo-performance" renderPriority={ 25 }>
<SidebarItem key="wincher-seo-performance" renderPriority={ 23 }>
<WincherSEOPerformanceModal location="metabox" />
</SidebarItem>
}
{ settings.shouldUpsell && ! isTerm && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 25 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
{ settings.isCornerstoneActive && <SidebarItem key="cornerstone" renderPriority={ 30 }>
<CollapsibleCornerstone />
</SidebarItem> }
Expand Down
58 changes: 29 additions & 29 deletions packages/js/src/components/fills/SidebarFill.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,6 @@ export default function SidebarFill( { settings } ) {
isSEMrushIntegrationActive={ settings.isSEMrushIntegrationActive }
/>
</SidebarItem> }
<SidebarItem key="search-appearance" renderPriority={ 25 }>
<SearchAppearanceModal />
</SidebarItem>
{ ( settings.useOpenGraphData || settings.useTwitterData ) && <SidebarItem key="social-appearance" renderPriority={ 26 }>
<SocialAppearanceModal
useOpenGraphData={ settings.useOpenGraphData }
useTwitterData={ settings.useTwitterData }
/>
</SidebarItem> }
{ settings.displaySchemaSettings && <SidebarItem key="schema" renderPriority={ 28 }>
<SidebarCollapsible
title={ __( "Schema", "wordpress-seo" ) }
>
<SchemaTabContainer />
</SidebarCollapsible>
</SidebarItem> }
{ settings.displayAdvancedTab && <SidebarItem key="advanced" renderPriority={ 29 }>
<SidebarCollapsible
title={ __( "Advanced", "wordpress-seo" ) }
>
<AdvancedSettings />
</SidebarCollapsible>
</SidebarItem> }
{ settings.isKeywordAnalysisActive && <SidebarItem key="seo" renderPriority={ 10 }>
<Fragment>
<SeoAnalysis
Expand All @@ -103,17 +80,40 @@ export default function SidebarFill( { settings } ) {
{ settings.isKeywordAnalysisActive && <SidebarItem key="additional-keywords-upsell" renderPriority={ 22 }>
{ settings.shouldUpsell && <KeywordUpsell /> }
</SidebarItem> }
{ settings.shouldUpsell && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 23 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
{ settings.isCornerstoneActive && <SidebarItem key="cornerstone" renderPriority={ 30 }>
<CollapsibleCornerstone />
</SidebarItem> }
{ settings.isKeywordAnalysisActive && settings.isWincherIntegrationActive && <SidebarItem renderPriority={ 23 }>
<WincherSEOPerformanceModal
location="sidebar"
/>
</SidebarItem> }
{ settings.shouldUpsell && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 25 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
<SidebarItem key="search-appearance" renderPriority={ 26 }>
<SearchAppearanceModal />
</SidebarItem>
{ ( settings.useOpenGraphData || settings.useTwitterData ) && <SidebarItem key="social-appearance" renderPriority={ 27 }>
<SocialAppearanceModal
useOpenGraphData={ settings.useOpenGraphData }
useTwitterData={ settings.useTwitterData }
/>
</SidebarItem> }
{ settings.displaySchemaSettings && <SidebarItem key="schema" renderPriority={ 28 }>
<SidebarCollapsible
title={ __( "Schema", "wordpress-seo" ) }
>
<SchemaTabContainer />
</SidebarCollapsible>
</SidebarItem> }
{ settings.displayAdvancedTab && <SidebarItem key="advanced" renderPriority={ 29 }>
<SidebarCollapsible
title={ __( "Advanced", "wordpress-seo" ) }
>
<AdvancedSettings />
</SidebarCollapsible>
</SidebarItem> }
{ settings.isCornerstoneActive && <SidebarItem key="cornerstone" renderPriority={ 30 }>
<CollapsibleCornerstone />
</SidebarItem> }
{ settings.isInsightsEnabled && <SidebarItem renderPriority={ 32 }>
<InsightsModal location="sidebar" />
</SidebarItem> }
Expand Down
52 changes: 26 additions & 26 deletions packages/js/src/elementor/components/fills/ElementorFill.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,29 +76,6 @@ export default function ElementorFill( { isLoading, onLoad, settings } ) {
<SEMrushRelatedKeyphrases />
</Fill> }
</SidebarItem> }
<SidebarItem renderPriority={ 25 }>
<SearchAppearanceModal />
</SidebarItem>
{ ( settings.useOpenGraphData || settings.useTwitterData ) && <SidebarItem key="social-appearance" renderPriority={ 26 }>
<SocialAppearanceModal
useOpenGraphData={ settings.useOpenGraphData }
useTwitterData={ settings.useTwitterData }
/>
</SidebarItem> }
{ settings.displaySchemaSettings && <SidebarItem renderPriority={ 28 }>
<SidebarCollapsible
title={ __( "Schema", "wordpress-seo" ) }
>
<SchemaTabContainer />
</SidebarCollapsible>
</SidebarItem> }
{ settings.displayAdvancedTab && <SidebarItem renderPriority={ 29 }>
<SidebarCollapsible
title={ __( "Advanced", "wordpress-seo" ) }
>
<AdvancedSettings location="sidebar" />
</SidebarCollapsible>
</SidebarItem> }
{ settings.isKeywordAnalysisActive && <SidebarItem renderPriority={ 10 }>
<Fragment>
<SeoAnalysis
Expand All @@ -119,13 +96,36 @@ export default function ElementorFill( { isLoading, onLoad, settings } ) {
{ settings.isKeywordAnalysisActive && <SidebarItem key="additional-keywords-upsell" renderPriority={ 22 }>
{ settings.shouldUpsell && <KeywordUpsell /> }
</SidebarItem> }
{ settings.shouldUpsell && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 23 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
{ settings.isKeywordAnalysisActive && settings.isWincherIntegrationActive &&
<SidebarItem key="wincher-seo-performance" renderPriority={ 23 }>
<WincherSEOPerformanceModal location="sidebar" shouldCloseOnClickOutside={ false } />
</SidebarItem> }
{ settings.shouldUpsell && <SidebarItem key="internal-linking-suggestions-upsell" renderPriority={ 24 }>
<InternalLinkingSuggestionsUpsell />
</SidebarItem> }
<SidebarItem renderPriority={ 25 }>
<SearchAppearanceModal />
</SidebarItem>
{ ( settings.useOpenGraphData || settings.useTwitterData ) && <SidebarItem key="social-appearance" renderPriority={ 26 }>
<SocialAppearanceModal
useOpenGraphData={ settings.useOpenGraphData }
useTwitterData={ settings.useTwitterData }
/>
</SidebarItem> }
{ settings.displaySchemaSettings && <SidebarItem renderPriority={ 28 }>
<SidebarCollapsible
title={ __( "Schema", "wordpress-seo" ) }
>
<SchemaTabContainer />
</SidebarCollapsible>
</SidebarItem> }
{ settings.displayAdvancedTab && <SidebarItem renderPriority={ 29 }>
<SidebarCollapsible
title={ __( "Advanced", "wordpress-seo" ) }
>
<AdvancedSettings location="sidebar" />
</SidebarCollapsible>
</SidebarItem> }
{ settings.isCornerstoneActive && <SidebarItem renderPriority={ 30 }>
<CollapsibleCornerstone />
</SidebarItem> }
Expand Down

0 comments on commit e6adf6e

Please sign in to comment.