From ce88524a89088e5104301470ce917cdfc086a6f2 Mon Sep 17 00:00:00 2001 From: Brian Schlenker Date: Sat, 29 Nov 2025 22:20:53 -0500 Subject: [PATCH 1/3] reorganize files --- .../font-grid.module.css | 0 .../font-list.components}/font-grid.tsx | 14 +++++----- .../search-bar.module.css | 0 .../font-list.components}/search-bar.tsx | 0 .../font-list.module.css} | 2 ++ .../font-list.tsx} | 6 ++--- .../font-view/components/head.module.css | 3 ++- .../components/font-view/font-view.module.css | 26 ++++++++++++++----- .../src/components/font-view/font-view.tsx | 20 +++----------- packages/otfjs-ui/src/routes/index.tsx | 2 +- 10 files changed, 37 insertions(+), 36 deletions(-) rename packages/otfjs-ui/src/components/{no-font-view => font-list/font-list.components}/font-grid.module.css (100%) rename packages/otfjs-ui/src/components/{no-font-view => font-list/font-list.components}/font-grid.tsx (94%) rename packages/otfjs-ui/src/components/{no-font-view/components => font-list/font-list.components}/search-bar.module.css (100%) rename packages/otfjs-ui/src/components/{no-font-view/components => font-list/font-list.components}/search-bar.tsx (100%) rename packages/otfjs-ui/src/components/{no-font-view/no-font-view.module.css => font-list/font-list.module.css} (93%) rename packages/otfjs-ui/src/components/{no-font-view/no-font-view.tsx => font-list/font-list.tsx} (69%) diff --git a/packages/otfjs-ui/src/components/no-font-view/font-grid.module.css b/packages/otfjs-ui/src/components/font-list/font-list.components/font-grid.module.css similarity index 100% rename from packages/otfjs-ui/src/components/no-font-view/font-grid.module.css rename to packages/otfjs-ui/src/components/font-list/font-list.components/font-grid.module.css diff --git a/packages/otfjs-ui/src/components/no-font-view/font-grid.tsx b/packages/otfjs-ui/src/components/font-list/font-list.components/font-grid.tsx similarity index 94% rename from packages/otfjs-ui/src/components/no-font-view/font-grid.tsx rename to packages/otfjs-ui/src/components/font-list/font-list.components/font-grid.tsx index 0036a06..dc5ec6e 100644 --- a/packages/otfjs-ui/src/components/no-font-view/font-grid.tsx +++ b/packages/otfjs-ui/src/components/font-list/font-list.components/font-grid.tsx @@ -1,13 +1,13 @@ import { memo, useEffect, useMemo, useRef } from 'react' import { Link, useRouter } from '@tanstack/react-router' -import { useTimeoutAfterSet } from '../../hooks/use-timeout-after-set' -import { handle } from '../../shortcuts/shortcuts' -import { Fonts } from '../../types/fonts' -import { createElementWalkerFactory } from '../../utils/dom' -import { addListener } from '../../utils/event' -import { entriesFilterMap } from '../../utils/object' -import { FontIcon } from '../font-icon/font-icon' +import { useTimeoutAfterSet } from '../../../hooks/use-timeout-after-set' +import { handle } from '../../../shortcuts/shortcuts' +import { Fonts } from '../../../types/fonts' +import { createElementWalkerFactory } from '../../../utils/dom' +import { addListener } from '../../../utils/event' +import { entriesFilterMap } from '../../../utils/object' +import { FontIcon } from '../../font-icon/font-icon' import styles from './font-grid.module.css' diff --git a/packages/otfjs-ui/src/components/no-font-view/components/search-bar.module.css b/packages/otfjs-ui/src/components/font-list/font-list.components/search-bar.module.css similarity index 100% rename from packages/otfjs-ui/src/components/no-font-view/components/search-bar.module.css rename to packages/otfjs-ui/src/components/font-list/font-list.components/search-bar.module.css diff --git a/packages/otfjs-ui/src/components/no-font-view/components/search-bar.tsx b/packages/otfjs-ui/src/components/font-list/font-list.components/search-bar.tsx similarity index 100% rename from packages/otfjs-ui/src/components/no-font-view/components/search-bar.tsx rename to packages/otfjs-ui/src/components/font-list/font-list.components/search-bar.tsx diff --git a/packages/otfjs-ui/src/components/no-font-view/no-font-view.module.css b/packages/otfjs-ui/src/components/font-list/font-list.module.css similarity index 93% rename from packages/otfjs-ui/src/components/no-font-view/no-font-view.module.css rename to packages/otfjs-ui/src/components/font-list/font-list.module.css index 630bddd..e0420ad 100644 --- a/packages/otfjs-ui/src/components/no-font-view/no-font-view.module.css +++ b/packages/otfjs-ui/src/components/font-list/font-list.module.css @@ -1,4 +1,6 @@ .root { + --gap: 26px; + position: relative; display: grid; padding-top: 20px; diff --git a/packages/otfjs-ui/src/components/no-font-view/no-font-view.tsx b/packages/otfjs-ui/src/components/font-list/font-list.tsx similarity index 69% rename from packages/otfjs-ui/src/components/no-font-view/no-font-view.tsx rename to packages/otfjs-ui/src/components/font-list/font-list.tsx index 1567afc..16c89bc 100644 --- a/packages/otfjs-ui/src/components/no-font-view/no-font-view.tsx +++ b/packages/otfjs-ui/src/components/font-list/font-list.tsx @@ -1,10 +1,10 @@ import { useDeferredValue, useState } from 'react' import fonts from '../../fonts.json' -import { SearchBar } from './components/search-bar' -import { FontGrid } from './font-grid' +import { FontGrid } from './font-list.components/font-grid' +import { SearchBar } from './font-list.components/search-bar' -import styles from './no-font-view.module.css' +import styles from './font-list.module.css' export function NoFontView() { const [filter, setFilter] = useState('') diff --git a/packages/otfjs-ui/src/components/font-view/components/head.module.css b/packages/otfjs-ui/src/components/font-view/components/head.module.css index a8cc378..c5bd7eb 100644 --- a/packages/otfjs-ui/src/components/font-view/components/head.module.css +++ b/packages/otfjs-ui/src/components/font-view/components/head.module.css @@ -1,8 +1,9 @@ .head { + grid-area: head; display: grid; grid-template-columns: auto 1fr; height: 97px; gap: 8px; padding: 8px; - border-bottom: 1px solid var(--color-border); + background: var(--color-bg-sidebar); } diff --git a/packages/otfjs-ui/src/components/font-view/font-view.module.css b/packages/otfjs-ui/src/components/font-view/font-view.module.css index b2074b7..290dc0e 100644 --- a/packages/otfjs-ui/src/components/font-view/font-view.module.css +++ b/packages/otfjs-ui/src/components/font-view/font-view.module.css @@ -1,19 +1,30 @@ .root { display: grid; - grid-template-columns: auto 1fr; + gap: 1px; + grid: + 'head view' auto + 'tabs view' 1fr / 240px 1fr; height: 100%; overflow: hidden; + + background: var(--color-border); + + :where(& > *) { + background: var(--color-bg); + } + + @media screen and (max-width: 600px) { + grid: + 'head head' auto + 'tabs view' 1fr / 100px 1fr; + } } -.sidebar { +.tabs { + grid-area: tabs; overflow: scroll; - width: 240px; - box-sizing: content-box; - border-right: 1px solid var(--color-border); background: var(--color-bg-sidebar); -} -.tabs { & ul { list-style: none; padding: 0; @@ -50,6 +61,7 @@ } .tableView { + grid-area: view; position: relative; overflow: scroll; } diff --git a/packages/otfjs-ui/src/components/font-view/font-view.tsx b/packages/otfjs-ui/src/components/font-view/font-view.tsx index 1388874..4964ddf 100644 --- a/packages/otfjs-ui/src/components/font-view/font-view.tsx +++ b/packages/otfjs-ui/src/components/font-view/font-view.tsx @@ -19,33 +19,19 @@ export function FontView({ font }: FontViewProps) { return (
- + +
) } -function Sidebar({ - tab, - setTab, -}: { - tab: string - setTab: React.Dispatch> -}) { - return ( -
- - -
- ) -} - function Tabs({ tab, setTab }: { tab: string; setTab: (tab: string) => void }) { const font = useFont() return ( -
+