Skip to content

fix: change settings page position #6

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
parthnvaswani merged 2 commits into from
Aug 11, 2025
Merged

fix: change settings page position #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7880bfb
fix: change settings page position
parthnvaswani Aug 11, 2025
17ce57e
fix: PHPCS fixes
parthnvaswani Aug 11, 2025
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
13 changes: 13 additions & 0 deletions assets/src/css/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,19 @@
animation: fadeIn 0.3s ease;
}

.onedesign-modal-tabs {
position: relative;

.onedesign-settings-button {
position: absolute;
top: 0;
right: 0;
background-color: #fff;
height: 45px;
width: 55px;
}
}

.onedesign-tabs {

.components-tab-panel__tabs {
Expand Down
87 changes: 49 additions & 38 deletions assets/src/patterns-popover/components/LibraryModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { useState, useEffect, useCallback, useMemo } from '@wordpress/element';
import { Modal, SearchControl, TabPanel, Spinner } from '@wordpress/components';
import { Modal, SearchControl, TabPanel, Spinner, IconButton } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import apiFetch from '@wordpress/api-fetch';
Expand Down Expand Up @@ -453,47 +453,58 @@ const LibraryModal = () => {
{ renderSearchResults() }
</div>

<TabPanel
className="onedesign-tabs"
activeClass="active-tab"
tabs={ tabs }
onSelect={ handleTabSelect }
>
{ ( tab ) => {
if ( tab.name === 'basePatterns' ) {
<div className="onedesign-modal-tabs">
<TabPanel
className="onedesign-tabs"
activeClass="active-tab"
tabs={ tabs }
onSelect={ handleTabSelect }
>
{ ( tab ) => {
if ( tab.name === 'basePatterns' ) {
return (
<BasePatternsTab
isLoading={ isLoading }
basePatterns={ filteredBasePatterns }
visibleCount={ visibleCount }
handlePatternSelection={ handlePatternSelection }
hasMorePatterns={ hasMorePatterns }
loadMorePatterns={ loadMorePatterns }
searchTerm={ searchTerm }
setSelectedPatterns={ setSelectedPatterns }
selectedPatterns={ selectedPatterns }
applySelectedPatterns={ applySelectedPatterns }
consumerSites={ consumerSites }
sitePatterns={ allConsumerSitePatterns }
/>
Comment on lines +467 to +479
Copy link
Collaborator

@danish17 danish17 Aug 11, 2025

Choose a reason for hiding this comment

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

Better to pass a single options prop instead of passing so many props separately.

);
}
// based on tab name show applied patterns
return (
<BasePatternsTab
isLoading={ isLoading }
basePatterns={ filteredBasePatterns }
visibleCount={ visibleCount }
handlePatternSelection={ handlePatternSelection }
hasMorePatterns={ hasMorePatterns }
loadMorePatterns={ loadMorePatterns }
searchTerm={ searchTerm }
setSelectedPatterns={ setSelectedPatterns }
<AppliedPatternsTab
isLoadingApplied={ isLoadingApplied }
appliedPatterns={ getFilteredPatterns( tab ) }
visibleAppliedCount={ visibleAppliedCount }
selectedPatterns={ selectedPatterns }
applySelectedPatterns={ applySelectedPatterns }
consumerSites={ consumerSites }
sitePatterns={ allConsumerSitePatterns }
hasMoreAppliedPatterns={ hasMoreAppliedPatterns }
loadMoreAppliedPatterns={ loadMoreAppliedPatterns }
applySelectedPatterns={ removeSelectedPatterns }
setVisibleAppliedCount={ setVisibleAppliedCount }
siteInfo={ tab }
/>
);
}
// based on tab name show applied patterns
return (
<AppliedPatternsTab
isLoadingApplied={ isLoadingApplied }
appliedPatterns={ getFilteredPatterns( tab ) }
visibleAppliedCount={ visibleAppliedCount }
selectedPatterns={ selectedPatterns }
hasMoreAppliedPatterns={ hasMoreAppliedPatterns }
loadMoreAppliedPatterns={ loadMoreAppliedPatterns }
applySelectedPatterns={ removeSelectedPatterns }
setVisibleAppliedCount={ setVisibleAppliedCount }
siteInfo={ tab }
/>
);
} }
</TabPanel>
} }
</TabPanel>
{ /* Add icon button to redirect user to onedesign-settings page */ }
<IconButton
icon="admin-generic"
label={ __( 'Go to OneDesign Settings', 'onedesign' ) }
onClick={ () => {
window.location.href = '/wp-admin/admin.php?page=onedesign-settings';
} }
className="onedesign-settings-button"
/>
</div>
</div>
</div>
</Modal>
Expand Down
21 changes: 17 additions & 4 deletions inc/classes/class-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Settings {
*
* @var string
*/
const PAGE_SLUG = 'onedesign-settings';
const PAGE_SLUG = 'onedesign';

/**
* Option name for site type.
Expand Down Expand Up @@ -81,7 +81,7 @@ public function add_settings_page(): void {
__( 'OneDesign', 'onedesign' ),
'manage_options',
self::PAGE_SLUG,
array( $this, 'settings_page_content' ),
'__return_null',
'dashicons-admin-generic',
100
);
Expand All @@ -98,6 +98,17 @@ public function add_settings_page(): void {
'__return_null'
);
}

add_submenu_page(
self::PAGE_SLUG,
__( 'Settings', 'onedesign' ),
__( 'Settings', 'onedesign' ),
'manage_options',
'onedesign-settings',
array( $this, 'settings_page_content' )
);

remove_submenu_page( 'onedesign', 'onedesign' );
}

/**
Expand All @@ -109,8 +120,10 @@ public function add_settings_page(): void {
* @return void
*/
public function handle_design_library_redirect(): void {
$pages = array( 'design-library', 'onedesign' );

// phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( ! isset( $_GET['page'] ) || 'design-library' !== $_GET['page'] ) {
if ( ! isset( $_GET['page'] ) || ! in_array( $_GET['page'], $pages, true ) ) {
return;
}

Expand Down Expand Up @@ -379,7 +392,7 @@ public function api_key_regenerated_notice(): void {
* @return void
*/
public function enqueue_admin_scripts( string $hook ): void {
if ( ( 'toplevel_page_' . self::PAGE_SLUG ) !== $hook && 'onedesign_page_design-library' !== $hook ) {
if ( ! str_contains( $hook, self::PAGE_SLUG ) ) {
return;
}

Expand Down