From 6023bddafc3df016833b31bd70c861bb85779361 Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Tue, 13 Jun 2023 12:48:33 +0200 Subject: [PATCH] Replaced tab component in themes (AdminX) refs. https://github.com/TryGhost/Team/issues/3432 --- .../components/settings/site/DesignModal.tsx | 5 --- .../components/settings/site/ThemeModal.tsx | 39 ++++++++----------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx index 29d0f5ea5c..3ea82a1201 100644 --- a/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx @@ -128,11 +128,6 @@ const DesignModal: React.FC = () => { title: id === 'site-wide' ? 'Site wide' : (id === 'homepage' ? 'Homepage' : 'Post') })); - // const urlOptions: SelectOption[] = [ - // {value: getHomepageUrl(siteData!), label: 'Homepage'}, - // latestPost && {value: latestPost.url, label: 'Post'} - // ].filter((option): option is SelectOption => Boolean(option)); - let previewTabs: Tab[] = []; if (latestPost) { previewTabs = [ diff --git a/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx b/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx index a9caed10e0..0c62d9863e 100644 --- a/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx @@ -6,10 +6,11 @@ import Modal from '../../../admin-x-ds/global/Modal'; import NewThemePreview from './theme/ThemePreview'; import NiceModal, {useModal} from '@ebay/nice-modal-react'; import OfficialThemes from './theme/OfficialThemes'; +import TabView from '../../../admin-x-ds/global/TabView'; import {useState} from 'react'; const ChangeThemeModal = NiceModal.create(() => { - const [currentTab, setCurrentTab] = useState<'official-themes' | 'advanced'>('official-themes'); + const [currentTab, setCurrentTab] = useState('official'); const [selectedTheme, setSelectedTheme] = useState(''); const modal = useModal(); @@ -20,14 +21,14 @@ const ChangeThemeModal = NiceModal.create(() => { let content; switch (currentTab) { - case 'official-themes': + case 'official': if (selectedTheme) { content = ; } else { content = ; } break; - case 'advanced': + case 'installed': content = ; break; } @@ -41,7 +42,7 @@ const ChangeThemeModal = NiceModal.create(() => { className={`text-sm`} type="button" onClick={() => { - setCurrentTab('official-themes'); + setCurrentTab('official'); setSelectedTheme(''); }}> Official themes @@ -62,25 +63,17 @@ const ChangeThemeModal = NiceModal.create(() => { } else { toolBar =
-
- - -
+ { + setCurrentTab(id); + }} + /> +
{ alert(file.name);