Compare commits
58 Commits
main
...
feature/un
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66dcffa448 | ||
|
|
cca00fccaa | ||
|
|
af05443763 | ||
|
|
99d92d487f | ||
|
|
4a907619cc | ||
|
|
6c69d7a5b3 | ||
|
|
993812de0a | ||
|
|
67c16530af | ||
|
|
fbbb439023 | ||
|
|
c2046770ef | ||
|
|
adfba38063 | ||
|
|
dfb304d436 | ||
|
|
f55043a1e7 | ||
|
|
409dd1b229 | ||
|
|
9fbce095b2 | ||
|
|
171627e0ea | ||
|
|
d07fb1a3af | ||
|
|
6f84644ecb | ||
|
|
5ab5cda611 | ||
|
|
7975d9aeee | ||
|
|
2ba5fc0e3e | ||
|
|
1947d7731e | ||
|
|
38bfc4ba4b | ||
|
|
6cf3047b74 | ||
|
|
81363156d7 | ||
|
|
bb65f1c8d6 | ||
|
|
5eb9584797 | ||
|
|
bb5c3667b4 | ||
|
|
3711616a91 | ||
|
|
6905c54040 | ||
|
|
1e8e22e2eb | ||
|
|
8a93c7b545 | ||
|
|
0004b81e40 | ||
|
|
fb1d2765d0 | ||
|
|
12e8bc0a89 | ||
|
|
cfaff46d59 | ||
|
|
0ebf75b24e | ||
|
|
7b46e06f8b | ||
|
|
0737db69a9 | ||
|
|
64b4a65e7b | ||
|
|
7f0d2b54e0 | ||
|
|
5b1a1d0b0a | ||
|
|
0562b94b03 | ||
|
|
ef08512986 | ||
|
|
816d4b89ce | ||
|
|
aa1379c15b | ||
|
|
33e589f041 | ||
|
|
b12dc6257d | ||
|
|
35e0f06a77 | ||
|
|
dde187e0b2 | ||
|
|
5a7c61ade7 | ||
|
|
d2bce85f9c | ||
|
|
e509463911 | ||
|
|
db08f523f6 | ||
|
|
c5fa159c14 | ||
|
|
8645c7dcc8 | ||
|
|
fbeb84270b | ||
|
|
c1ac9b5bc4 |
@@ -41,7 +41,7 @@ jobs:
|
|||||||
run: yarn lint
|
run: yarn lint
|
||||||
|
|
||||||
- name: Type Check
|
- name: Type Check
|
||||||
run: yarn check:shadcn-excluded
|
run: yarn check
|
||||||
|
|
||||||
publish:
|
publish:
|
||||||
needs: build # Only runs if tests/lint pass
|
needs: build # Only runs if tests/lint pass
|
||||||
|
|||||||
@@ -4,12 +4,11 @@
|
|||||||
|
|
||||||
This provides:
|
This provides:
|
||||||
- ResponsiveManager context for breakpoint tracking
|
- ResponsiveManager context for breakpoint tracking
|
||||||
- TooltipProvider for shadcn Tooltip components
|
- TooltipProvider for tooltip components
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { createResponsiveManager } from '$shared/lib';
|
import { createResponsiveManager } from '$shared/lib';
|
||||||
import type { ResponsiveManager } from '$shared/lib';
|
import type { ResponsiveManager } from '$shared/lib';
|
||||||
import { Provider as TooltipProvider } from '$shared/shadcn/ui/tooltip';
|
|
||||||
import { setContext } from 'svelte';
|
import { setContext } from 'svelte';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -24,6 +23,4 @@ $effect(() => responsiveManager.init());
|
|||||||
setContext<ResponsiveManager>('responsive', responsiveManager);
|
setContext<ResponsiveManager>('responsive', responsiveManager);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<TooltipProvider delayDuration={200} skipDelayDuration={300}>
|
{@render children()}
|
||||||
{@render children()}
|
|
||||||
</TooltipProvider>
|
|
||||||
|
|||||||
@@ -1,14 +1,18 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
interface Props {
|
interface Props {
|
||||||
children: import('svelte').Snippet;
|
children: import('svelte').Snippet;
|
||||||
width?: string; // Optional width override
|
/**
|
||||||
|
* Tailwind max-width class applied to the card, or 'none' to remove width constraint.
|
||||||
|
* @default 'max-w-3xl'
|
||||||
|
*/
|
||||||
|
maxWidth?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { children, width = 'max-w-3xl' }: Props = $props();
|
let { children, maxWidth = 'max-w-3xl' }: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex min-h-screen w-full items-center justify-center bg-background p-8">
|
<div class="flex min-h-screen w-full items-center justify-center bg-background p-8">
|
||||||
<div class="w-full bg-card shadow-lg ring-1 ring-border rounded-xl p-12 {width}">
|
<div class="w-full bg-card shadow-lg ring-1 ring-border rounded-xl p-12 {maxWidth !== 'none' ? maxWidth : ''}">
|
||||||
<div class="relative flex justify-center items-center text-foreground">
|
<div class="relative flex justify-center items-center text-foreground">
|
||||||
{@render children()}
|
{@render children()}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -5,68 +5,6 @@ import ThemeDecorator from './ThemeDecorator.svelte';
|
|||||||
import '../src/app/styles/app.css';
|
import '../src/app/styles/app.css';
|
||||||
|
|
||||||
const preview: Preview = {
|
const preview: Preview = {
|
||||||
globalTypes: {
|
|
||||||
viewport: {
|
|
||||||
description: 'Viewport size for responsive design',
|
|
||||||
defaultValue: 'widgetWide',
|
|
||||||
toolbar: {
|
|
||||||
icon: 'view',
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
value: 'reset',
|
|
||||||
icon: 'refresh',
|
|
||||||
title: 'Reset viewport',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'mobile1',
|
|
||||||
icon: 'mobile',
|
|
||||||
title: 'iPhone 5/SE',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'mobile2',
|
|
||||||
icon: 'mobile',
|
|
||||||
title: 'iPhone 14 Pro Max',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'tablet',
|
|
||||||
icon: 'tablet',
|
|
||||||
title: 'iPad (Portrait)',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'desktop',
|
|
||||||
icon: 'desktop',
|
|
||||||
title: 'Desktop (Small)',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'widgetMedium',
|
|
||||||
icon: 'view',
|
|
||||||
title: 'Widget Medium',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'widgetWide',
|
|
||||||
icon: 'view',
|
|
||||||
title: 'Widget Wide',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'widgetExtraWide',
|
|
||||||
icon: 'view',
|
|
||||||
title: 'Widget Extra Wide',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'fullWidth',
|
|
||||||
icon: 'view',
|
|
||||||
title: 'Full Width',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: 'fullScreen',
|
|
||||||
icon: 'expand',
|
|
||||||
title: 'Full Screen',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
dynamicTitle: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
parameters: {
|
parameters: {
|
||||||
layout: 'padded',
|
layout: 'padded',
|
||||||
controls: {
|
controls: {
|
||||||
@@ -195,10 +133,11 @@ const preview: Preview = {
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
// Wrap with StoryStage for presentation styling
|
// Wrap with StoryStage for presentation styling
|
||||||
story => ({
|
(story, context) => ({
|
||||||
Component: StoryStage,
|
Component: StoryStage,
|
||||||
props: {
|
props: {
|
||||||
children: story(),
|
children: story(),
|
||||||
|
maxWidth: context.parameters.storyStage?.maxWidth,
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ A modern font exploration and comparison tool for browsing fonts from Google Fon
|
|||||||
- **Side-by-Side Comparison**: Compare up to 4 fonts simultaneously with customizable text, size, and typography settings
|
- **Side-by-Side Comparison**: Compare up to 4 fonts simultaneously with customizable text, size, and typography settings
|
||||||
- **Advanced Filtering**: Filter by category, provider, character subsets, and weight
|
- **Advanced Filtering**: Filter by category, provider, character subsets, and weight
|
||||||
- **Virtual Scrolling**: Fast, smooth browsing of thousands of fonts
|
- **Virtual Scrolling**: Fast, smooth browsing of thousands of fonts
|
||||||
- **Responsive UI**: Beautiful interface built with shadcn components and Tailwind CSS
|
- **Responsive UI**: Beautiful interface built with Tailwind CSS
|
||||||
- **Type-Safe**: Full TypeScript coverage with strict mode enabled
|
- **Type-Safe**: Full TypeScript coverage with strict mode enabled
|
||||||
|
|
||||||
## Tech Stack
|
## Tech Stack
|
||||||
|
|
||||||
- **Framework**: Svelte 5 with reactive primitives (runes)
|
- **Framework**: Svelte 5 with reactive primitives (runes)
|
||||||
- **Styling**: Tailwind CSS v4
|
- **Styling**: Tailwind CSS v4
|
||||||
- **Components**: shadcn-svelte (via bits-ui)
|
- **Components**: Bits UI primitives
|
||||||
- **State Management**: TanStack Query for async data
|
- **State Management**: TanStack Query for async data
|
||||||
- **Architecture**: Feature-Sliced Design (FSD)
|
- **Architecture**: Feature-Sliced Design (FSD)
|
||||||
- **Quality**: oxlint (linting), dprint (formatting), lefthook (git hooks)
|
- **Quality**: oxlint (linting), dprint (formatting), lefthook (git hooks)
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://shadcn-svelte.com/schema.json",
|
|
||||||
"tailwind": {
|
|
||||||
"css": "src/app.css",
|
|
||||||
"baseColor": "zinc"
|
|
||||||
},
|
|
||||||
"aliases": {
|
|
||||||
"components": "$shared/shadcn/ui",
|
|
||||||
"utils": "$shared/shadcn/utils/shadcn-utils",
|
|
||||||
"ui": "$shared/shadcn/ui",
|
|
||||||
"hooks": "$shared/shadcn/hooks",
|
|
||||||
"lib": "$shared"
|
|
||||||
},
|
|
||||||
"typescript": true,
|
|
||||||
"registry": "https://shadcn-svelte.com/registry"
|
|
||||||
}
|
|
||||||
@@ -31,7 +31,12 @@
|
|||||||
"importDeclaration.forceMultiLine": "whenMultiple",
|
"importDeclaration.forceMultiLine": "whenMultiple",
|
||||||
"importDeclaration.forceSingleLine": false,
|
"importDeclaration.forceSingleLine": false,
|
||||||
"exportDeclaration.forceMultiLine": "whenMultiple",
|
"exportDeclaration.forceMultiLine": "whenMultiple",
|
||||||
"exportDeclaration.forceSingleLine": false
|
"exportDeclaration.forceSingleLine": false,
|
||||||
|
"ifStatement.useBraces": "always",
|
||||||
|
"whileStatement.useBraces": "always",
|
||||||
|
"forStatement.useBraces": "always",
|
||||||
|
"forInStatement.useBraces": "always",
|
||||||
|
"forOfStatement.useBraces": "always"
|
||||||
},
|
},
|
||||||
"json": {
|
"json": {
|
||||||
"indentWidth": 2,
|
"indentWidth": 2,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ pre-push:
|
|||||||
run: yarn tsc --noEmit
|
run: yarn tsc --noEmit
|
||||||
|
|
||||||
svelte-check:
|
svelte-check:
|
||||||
run: yarn check:shadcn-excluded --threshold warning
|
run: yarn check --threshold warning
|
||||||
|
|
||||||
format-check:
|
format-check:
|
||||||
glob: "*.{ts,js,svelte,json,md}"
|
glob: "*.{ts,js,svelte,json,md}"
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
"prepare": "svelte-check --tsconfig ./tsconfig.json || echo ''",
|
"prepare": "svelte-check --tsconfig ./tsconfig.json || echo ''",
|
||||||
"check": "svelte-check",
|
"check": "svelte-check",
|
||||||
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
|
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
"check:shadcn-excluded": "svelte-check --no-tsconfig --ignore \"src/shared/shadcn\"",
|
|
||||||
"lint": "oxlint",
|
"lint": "oxlint",
|
||||||
"format": "dprint fmt",
|
"format": "dprint fmt",
|
||||||
"format:check": "dprint check",
|
"format:check": "dprint check",
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
/* Base font size */
|
/* Base font size */
|
||||||
--font-size: 16px;
|
--font-size: 16px;
|
||||||
|
|
||||||
/* GLYPHDIFF Swiss Design System */
|
/* GLYPHDIFF Design System */
|
||||||
/* Primary Colors */
|
/* Primary Colors */
|
||||||
--swiss-beige: #f3f0e9;
|
--swiss-beige: #f3f0e9;
|
||||||
--swiss-red: #ff3b30;
|
--swiss-red: #ff3b30;
|
||||||
@@ -91,7 +91,6 @@
|
|||||||
--space-4xl: 4rem;
|
--space-4xl: 4rem;
|
||||||
|
|
||||||
/* Typography Scale */
|
/* Typography Scale */
|
||||||
--text-2xs: 0.625rem;
|
|
||||||
--text-xs: 0.75rem;
|
--text-xs: 0.75rem;
|
||||||
--text-sm: 0.875rem;
|
--text-sm: 0.875rem;
|
||||||
--text-base: 1rem;
|
--text-base: 1rem;
|
||||||
@@ -205,6 +204,14 @@
|
|||||||
--font-mono: 'Space Mono', monospace;
|
--font-mono: 'Space Mono', monospace;
|
||||||
--font-primary: 'Space Grotesk', system-ui, -apple-system, 'Segoe UI', Inter, Roboto, Arial, sans-serif;
|
--font-primary: 'Space Grotesk', system-ui, -apple-system, 'Segoe UI', Inter, Roboto, Arial, sans-serif;
|
||||||
--font-secondary: 'Inter', system-ui, -apple-system, 'Segoe UI', Roboto, Arial, sans-serif;
|
--font-secondary: 'Inter', system-ui, -apple-system, 'Segoe UI', Roboto, Arial, sans-serif;
|
||||||
|
|
||||||
|
/* Micro typography scale — extends Tailwind's text-xs (0.75rem) downward */
|
||||||
|
--text-5xs: 0.4375rem;
|
||||||
|
--text-4xs: 0.5rem;
|
||||||
|
--text-3xs: 0.5625rem;
|
||||||
|
--text-2xs: 0.625rem;
|
||||||
|
/* Monospace label tracking — used in Loader and Footnote */
|
||||||
|
--tracking-wider-mono: 0.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
@layer base {
|
@layer base {
|
||||||
@@ -265,6 +272,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@layer utilities {
|
||||||
|
/* 21× border-black/5 dark:border-white/10 → single token */
|
||||||
|
.border-subtle {
|
||||||
|
@apply border-black/5 dark:border-white/10;
|
||||||
|
}
|
||||||
|
/* Secondary text pair */
|
||||||
|
.text-secondary {
|
||||||
|
@apply text-neutral-500 dark:text-neutral-400;
|
||||||
|
}
|
||||||
|
/* Standard focus ring */
|
||||||
|
.focus-ring {
|
||||||
|
@apply focus-visible:ring-2 focus-visible:ring-brand focus-visible:ring-offset-2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Global utility - useful across your app */
|
/* Global utility - useful across your app */
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
* {
|
* {
|
||||||
|
|||||||
@@ -14,12 +14,10 @@
|
|||||||
*
|
*
|
||||||
* - Footer area (currently empty, reserved for future use)
|
* - Footer area (currently empty, reserved for future use)
|
||||||
*/
|
*/
|
||||||
import { BreadcrumbHeader } from '$entities/Breadcrumb';
|
|
||||||
import { themeManager } from '$features/ChangeAppTheme';
|
import { themeManager } from '$features/ChangeAppTheme';
|
||||||
import GD from '$shared/assets/GD.svg';
|
import GD from '$shared/assets/GD.svg';
|
||||||
import { ResponsiveProvider } from '$shared/lib';
|
import { ResponsiveProvider } from '$shared/lib';
|
||||||
import { Provider as TooltipProvider } from '$shared/shadcn/ui/tooltip';
|
import clsx from 'clsx';
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils';
|
|
||||||
import {
|
import {
|
||||||
type Snippet,
|
type Snippet,
|
||||||
onDestroy,
|
onDestroy,
|
||||||
@@ -80,24 +78,14 @@ onDestroy(() => themeManager.destroy());
|
|||||||
<ResponsiveProvider>
|
<ResponsiveProvider>
|
||||||
<div
|
<div
|
||||||
id="app-root"
|
id="app-root"
|
||||||
class={cn(
|
class={clsx(
|
||||||
'min-h-screen w-auto flex flex-col bg-surface dark:bg-dark-bg',
|
'min-h-screen w-auto flex flex-col bg-surface dark:bg-dark-bg',
|
||||||
theme === 'dark' ? 'dark' : '',
|
theme === 'dark' ? 'dark' : '',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<header>
|
|
||||||
<BreadcrumbHeader />
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<!-- <ScrollArea class="h-screen w-screen"> -->
|
|
||||||
<!-- <main class="flex-1 w-full mx-auto relative"> -->
|
|
||||||
<TooltipProvider>
|
|
||||||
{#if fontsReady}
|
{#if fontsReady}
|
||||||
{@render children?.()}
|
{@render children?.()}
|
||||||
{/if}
|
{/if}
|
||||||
</TooltipProvider>
|
|
||||||
<!-- </main> -->
|
|
||||||
<!-- </ScrollArea> -->
|
|
||||||
<footer></footer>
|
<footer></footer>
|
||||||
</div>
|
</div>
|
||||||
</ResponsiveProvider>
|
</ResponsiveProvider>
|
||||||
|
|||||||
@@ -34,11 +34,17 @@
|
|||||||
* A breadcrumb item representing a tracked section
|
* A breadcrumb item representing a tracked section
|
||||||
*/
|
*/
|
||||||
export interface BreadcrumbItem {
|
export interface BreadcrumbItem {
|
||||||
/** Unique index for ordering */
|
/**
|
||||||
|
* Unique index for ordering
|
||||||
|
*/
|
||||||
index: number;
|
index: number;
|
||||||
/** Display title for the breadcrumb */
|
/**
|
||||||
|
* Display title for the breadcrumb
|
||||||
|
*/
|
||||||
title: string;
|
title: string;
|
||||||
/** DOM element to track */
|
/**
|
||||||
|
* DOM element to track
|
||||||
|
*/
|
||||||
element: HTMLElement;
|
element: HTMLElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,21 +56,37 @@ export interface BreadcrumbItem {
|
|||||||
* past while moving down the page.
|
* past while moving down the page.
|
||||||
*/
|
*/
|
||||||
class ScrollBreadcrumbsStore {
|
class ScrollBreadcrumbsStore {
|
||||||
/** All tracked breadcrumb items */
|
/**
|
||||||
|
* All tracked breadcrumb items
|
||||||
|
*/
|
||||||
#items = $state<BreadcrumbItem[]>([]);
|
#items = $state<BreadcrumbItem[]>([]);
|
||||||
/** Set of indices that have scrolled past (exited viewport while scrolling down) */
|
/**
|
||||||
|
* Set of indices that have scrolled past (exited viewport while scrolling down)
|
||||||
|
*/
|
||||||
#scrolledPast = $state<Set<number>>(new Set());
|
#scrolledPast = $state<Set<number>>(new Set());
|
||||||
/** Intersection Observer instance */
|
/**
|
||||||
|
* Intersection Observer instance
|
||||||
|
*/
|
||||||
#observer: IntersectionObserver | null = null;
|
#observer: IntersectionObserver | null = null;
|
||||||
/** Offset for smooth scrolling (sticky header height) */
|
/**
|
||||||
|
* Offset for smooth scrolling (sticky header height)
|
||||||
|
*/
|
||||||
#scrollOffset = 0;
|
#scrollOffset = 0;
|
||||||
/** Current scroll direction */
|
/**
|
||||||
|
* Current scroll direction
|
||||||
|
*/
|
||||||
#isScrollingDown = $state(false);
|
#isScrollingDown = $state(false);
|
||||||
/** Previous scroll Y position to determine direction */
|
/**
|
||||||
|
* Previous scroll Y position to determine direction
|
||||||
|
*/
|
||||||
#prevScrollY = 0;
|
#prevScrollY = 0;
|
||||||
/** Throttled scroll handler */
|
/**
|
||||||
|
* Throttled scroll handler
|
||||||
|
*/
|
||||||
#handleScroll: (() => void) | null = null;
|
#handleScroll: (() => void) | null = null;
|
||||||
/** Listener count for cleanup */
|
/**
|
||||||
|
* Listener count for cleanup
|
||||||
|
*/
|
||||||
#listenerCount = 0;
|
#listenerCount = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -83,13 +105,17 @@ class ScrollBreadcrumbsStore {
|
|||||||
* (fires as soon as any part of element crosses viewport edge).
|
* (fires as soon as any part of element crosses viewport edge).
|
||||||
*/
|
*/
|
||||||
#initObserver(): void {
|
#initObserver(): void {
|
||||||
if (this.#observer) return;
|
if (this.#observer) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.#observer = new IntersectionObserver(
|
this.#observer = new IntersectionObserver(
|
||||||
entries => {
|
entries => {
|
||||||
for (const entry of entries) {
|
for (const entry of entries) {
|
||||||
const item = this.#items.find(i => i.element === entry.target);
|
const item = this.#items.find(i => i.element === entry.target);
|
||||||
if (!item) continue;
|
if (!item) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (!entry.isIntersecting && this.#isScrollingDown) {
|
if (!entry.isIntersecting && this.#isScrollingDown) {
|
||||||
// Element exited viewport while scrolling DOWN - add to breadcrumbs
|
// Element exited viewport while scrolling DOWN - add to breadcrumbs
|
||||||
@@ -141,17 +167,23 @@ class ScrollBreadcrumbsStore {
|
|||||||
this.#detachScrollListener();
|
this.#detachScrollListener();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** All tracked items sorted by index */
|
/**
|
||||||
|
* All tracked items sorted by index
|
||||||
|
*/
|
||||||
get items(): BreadcrumbItem[] {
|
get items(): BreadcrumbItem[] {
|
||||||
return this.#items.slice().sort((a, b) => a.index - b.index);
|
return this.#items.slice().sort((a, b) => a.index - b.index);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Items that have scrolled past viewport top (visible in breadcrumbs) */
|
/**
|
||||||
|
* Items that have scrolled past viewport top (visible in breadcrumbs)
|
||||||
|
*/
|
||||||
get scrolledPastItems(): BreadcrumbItem[] {
|
get scrolledPastItems(): BreadcrumbItem[] {
|
||||||
return this.items.filter(item => this.#scrolledPast.has(item.index));
|
return this.items.filter(item => this.#scrolledPast.has(item.index));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Index of the most recently scrolled item (active section) */
|
/**
|
||||||
|
* Index of the most recently scrolled item (active section)
|
||||||
|
*/
|
||||||
get activeIndex(): number | null {
|
get activeIndex(): number | null {
|
||||||
const past = this.scrolledPastItems;
|
const past = this.scrolledPastItems;
|
||||||
return past.length > 0 ? past[past.length - 1].index : null;
|
return past.length > 0 ? past[past.length - 1].index : null;
|
||||||
@@ -171,7 +203,9 @@ class ScrollBreadcrumbsStore {
|
|||||||
* @param offset - Scroll offset in pixels (for sticky headers)
|
* @param offset - Scroll offset in pixels (for sticky headers)
|
||||||
*/
|
*/
|
||||||
add(item: BreadcrumbItem, offset = 0): void {
|
add(item: BreadcrumbItem, offset = 0): void {
|
||||||
if (this.#items.find(i => i.index === item.index)) return;
|
if (this.#items.find(i => i.index === item.index)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.#scrollOffset = offset;
|
this.#scrollOffset = offset;
|
||||||
this.#items.push(item);
|
this.#items.push(item);
|
||||||
@@ -188,7 +222,9 @@ class ScrollBreadcrumbsStore {
|
|||||||
*/
|
*/
|
||||||
remove(index: number): void {
|
remove(index: number): void {
|
||||||
const item = this.#items.find(i => i.index === index);
|
const item = this.#items.find(i => i.index === index);
|
||||||
if (!item) return;
|
if (!item) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.#observer?.unobserve(item.element);
|
this.#observer?.unobserve(item.element);
|
||||||
this.#items = this.#items.filter(i => i.index !== index);
|
this.#items = this.#items.filter(i => i.index !== index);
|
||||||
@@ -209,7 +245,9 @@ class ScrollBreadcrumbsStore {
|
|||||||
*/
|
*/
|
||||||
scrollTo(index: number, container: HTMLElement | Window = window): void {
|
scrollTo(index: number, container: HTMLElement | Window = window): void {
|
||||||
const item = this.#items.find(i => i.index === index);
|
const item = this.#items.find(i => i.index === index);
|
||||||
if (!item) return;
|
if (!item) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const rect = item.element.getBoundingClientRect();
|
const rect = item.element.getBoundingClientRect();
|
||||||
const scrollTop = container === window ? window.scrollY : (container as HTMLElement).scrollTop;
|
const scrollTop = container === window ? window.scrollY : (container as HTMLElement).scrollTop;
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import {
|
import {
|
||||||
afterEach,
|
afterEach,
|
||||||
beforeEach,
|
beforeEach,
|
||||||
@@ -24,7 +26,9 @@ class MockIntersectionObserver implements IntersectionObserver {
|
|||||||
|
|
||||||
constructor(callback: IntersectionObserverCallback, options?: IntersectionObserverInit) {
|
constructor(callback: IntersectionObserverCallback, options?: IntersectionObserverInit) {
|
||||||
this.callbacks.push(callback);
|
this.callbacks.push(callback);
|
||||||
if (options?.rootMargin) this.rootMargin = options.rootMargin;
|
if (options?.rootMargin) {
|
||||||
|
this.rootMargin = options.rootMargin;
|
||||||
|
}
|
||||||
if (options?.threshold) {
|
if (options?.threshold) {
|
||||||
this.thresholds = Array.isArray(options.threshold) ? options.threshold : [options.threshold];
|
this.thresholds = Array.isArray(options.threshold) ? options.threshold : [options.threshold];
|
||||||
}
|
}
|
||||||
@@ -118,7 +122,9 @@ describe('ScrollBreadcrumbsStore', () => {
|
|||||||
(event: string, listener: EventListenerOrEventListenerObject) => {
|
(event: string, listener: EventListenerOrEventListenerObject) => {
|
||||||
if (event === 'scroll') {
|
if (event === 'scroll') {
|
||||||
const index = scrollListeners.indexOf(listener as () => void);
|
const index = scrollListeners.indexOf(listener as () => void);
|
||||||
if (index > -1) scrollListeners.splice(index, 1);
|
if (index > -1) {
|
||||||
|
scrollListeners.splice(index, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<script module>
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import BreadcrumbHeader from './BreadcrumbHeader.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Entities/BreadcrumbHeader',
|
||||||
|
component: BreadcrumbHeader,
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Fixed header that slides in when the user scrolls past tracked page sections. Reads `scrollBreadcrumbsStore.scrolledPastItems` — renders nothing when the list is empty. Requires the `responsive` context provided by `Providers`.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'fullscreen',
|
||||||
|
},
|
||||||
|
argTypes: {},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import Providers from '$shared/lib/storybook/Providers.svelte';
|
||||||
|
import BreadcrumbHeaderSeeded from './BreadcrumbHeaderSeeded.svelte';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="With Breadcrumbs"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Three sections are registered with the breadcrumb store. The story scrolls the iframe so the IntersectionObserver marks them as scrolled-past, revealing the fixed header.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<BreadcrumbHeaderSeeded />
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Empty"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'No sections registered — BreadcrumbHeader renders nothing. This is the initial state before the user scrolls past any tracked section.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<div style="padding: 2rem; color: #888; font-size: 0.875rem;">
|
||||||
|
BreadcrumbHeader renders nothing when scrolledPastItems is empty.
|
||||||
|
</div>
|
||||||
|
<BreadcrumbHeader />
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -44,7 +44,7 @@ function createButtonText(item: BreadcrumbItem) {
|
|||||||
flex items-center justify-between
|
flex items-center justify-between
|
||||||
z-40
|
z-40
|
||||||
bg-surface/90 dark:bg-dark-bg/90 backdrop-blur-md
|
bg-surface/90 dark:bg-dark-bg/90 backdrop-blur-md
|
||||||
border-b border-black/5 dark:border-white/10
|
border-b border-subtle
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="max-w-8xl px-4 sm:px-6 h-full w-full flex items-center justify-between gap-2 sm:gap-4">
|
<div class="max-w-8xl px-4 sm:px-6 h-full w-full flex items-center justify-between gap-2 sm:gap-4">
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { render } from '@testing-library/svelte';
|
||||||
|
import BreadcrumbHeader from './BreadcrumbHeader.svelte';
|
||||||
|
|
||||||
|
const context = new Map([['responsive', { isMobile: false, isMobileOrTablet: false }]]);
|
||||||
|
|
||||||
|
describe('BreadcrumbHeader', () => {
|
||||||
|
it('renders nothing when no sections have been scrolled past', () => {
|
||||||
|
const { container } = render(BreadcrumbHeader, { context });
|
||||||
|
expect(container.firstElementChild).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<script>
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { scrollBreadcrumbsStore } from '../../model';
|
||||||
|
import BreadcrumbHeader from './BreadcrumbHeader.svelte';
|
||||||
|
|
||||||
|
const sections = [
|
||||||
|
{ index: 100, title: 'Introduction' },
|
||||||
|
{ index: 101, title: 'Typography' },
|
||||||
|
{ index: 102, title: 'Spacing' },
|
||||||
|
];
|
||||||
|
|
||||||
|
/** @type {HTMLDivElement} */
|
||||||
|
let container;
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
for (const section of sections) {
|
||||||
|
const el = /** @type {HTMLElement} */ (container.querySelector(`[data-story-index="${section.index}"]`));
|
||||||
|
scrollBreadcrumbsStore.add({ index: section.index, title: section.title, element: el }, 96);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Scroll past the sections so IntersectionObserver marks them as
|
||||||
|
* scrolled-past, making scrolledPastItems non-empty and the header visible.
|
||||||
|
*/
|
||||||
|
setTimeout(() => {
|
||||||
|
window.scrollTo({ top: 2000, behavior: 'instant' });
|
||||||
|
}, 100);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
for (const { index } of sections) {
|
||||||
|
scrollBreadcrumbsStore.remove(index);
|
||||||
|
}
|
||||||
|
window.scrollTo({ top: 0, behavior: 'instant' });
|
||||||
|
};
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div bind:this={container} style="height: 2400px; padding-top: 900px;">
|
||||||
|
{#each sections as section}
|
||||||
|
<div
|
||||||
|
data-story-index={section.index}
|
||||||
|
style="height: 400px; padding: 2rem; background: #f5f5f5; margin-bottom: 1rem;"
|
||||||
|
>
|
||||||
|
{section.title} — scroll up to see the breadcrumb header
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<BreadcrumbHeader />
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
<script module>
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import NavigationWrapper from './NavigationWrapper.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Entities/NavigationWrapper',
|
||||||
|
component: NavigationWrapper,
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Thin wrapper that registers an HTML section with `scrollBreadcrumbsStore` via a Svelte use-directive action. Has no visual output of its own — renders `{@render content(registerBreadcrumb)}` where `registerBreadcrumb` is the action to attach with `use:`. On destroy the section is automatically removed from the store.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'fullscreen',
|
||||||
|
},
|
||||||
|
argTypes: {
|
||||||
|
index: {
|
||||||
|
control: { type: 'number', min: 0 },
|
||||||
|
description: 'Unique index used for ordering in the breadcrumb trail',
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
control: 'text',
|
||||||
|
description: 'Display title shown in the breadcrumb header',
|
||||||
|
},
|
||||||
|
offset: {
|
||||||
|
control: { type: 'number', min: 0 },
|
||||||
|
description: 'Scroll offset in pixels to account for sticky headers',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import type { ComponentProps } from 'svelte';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Single Section"
|
||||||
|
args={{ index: 0, title: 'Introduction', offset: 96 }}
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'A single section registered with NavigationWrapper. The `content` snippet receives the `register` action and applies it via `use:register`.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof NavigationWrapper>)}
|
||||||
|
<NavigationWrapper {...args}>
|
||||||
|
{#snippet content(register)}
|
||||||
|
<section use:register style="padding: 2rem; background: #f5f5f5; min-height: 200px;">
|
||||||
|
<p style="font-size: 0.875rem; color: #555;">
|
||||||
|
Section registered as <strong>{args.title}</strong> at index {args.index}. Scroll past this
|
||||||
|
section to see it appear in the breadcrumb header.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
{/snippet}
|
||||||
|
</NavigationWrapper>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Multiple Sections"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Three sequential sections each wrapped in NavigationWrapper with distinct indices and titles. Demonstrates how the breadcrumb trail builds as the user scrolls.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{#snippet template()}
|
||||||
|
<div style="display: flex; flex-direction: column; gap: 0;">
|
||||||
|
<NavigationWrapper index={0} title="Introduction" offset={96}>
|
||||||
|
{#snippet content(register)}
|
||||||
|
<section use:register style="padding: 2rem; background: #f5f5f5; min-height: 300px;">
|
||||||
|
<h2 style="margin: 0 0 0.5rem;">Introduction</h2>
|
||||||
|
<p style="font-size: 0.875rem; color: #555;">
|
||||||
|
Registered as section 0. Scroll down to build the breadcrumb trail.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
{/snippet}
|
||||||
|
</NavigationWrapper>
|
||||||
|
|
||||||
|
<NavigationWrapper index={1} title="Typography" offset={96}>
|
||||||
|
{#snippet content(register)}
|
||||||
|
<section use:register style="padding: 2rem; background: #ebebeb; min-height: 300px;">
|
||||||
|
<h2 style="margin: 0 0 0.5rem;">Typography</h2>
|
||||||
|
<p style="font-size: 0.875rem; color: #555;">Registered as section 1.</p>
|
||||||
|
</section>
|
||||||
|
{/snippet}
|
||||||
|
</NavigationWrapper>
|
||||||
|
|
||||||
|
<NavigationWrapper index={2} title="Spacing" offset={96}>
|
||||||
|
{#snippet content(register)}
|
||||||
|
<section use:register style="padding: 2rem; background: #e0e0e0; min-height: 300px;">
|
||||||
|
<h2 style="margin: 0 0 0.5rem;">Spacing</h2>
|
||||||
|
<p style="font-size: 0.875rem; color: #555;">Registered as section 2.</p>
|
||||||
|
</section>
|
||||||
|
{/snippet}
|
||||||
|
</NavigationWrapper>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -97,16 +97,24 @@ export interface ProxyFontsParams extends QueryParams {
|
|||||||
* Includes pagination metadata alongside font data
|
* Includes pagination metadata alongside font data
|
||||||
*/
|
*/
|
||||||
export interface ProxyFontsResponse {
|
export interface ProxyFontsResponse {
|
||||||
/** Array of unified font objects */
|
/**
|
||||||
|
* List of font objects returned by the proxy
|
||||||
|
*/
|
||||||
fonts: UnifiedFont[];
|
fonts: UnifiedFont[];
|
||||||
|
|
||||||
/** Total number of fonts matching the query */
|
/**
|
||||||
|
* Total number of matching fonts (ignoring limit/offset)
|
||||||
|
*/
|
||||||
total: number;
|
total: number;
|
||||||
|
|
||||||
/** Limit used for this request */
|
/**
|
||||||
|
* Page size used for the request
|
||||||
|
*/
|
||||||
limit: number;
|
limit: number;
|
||||||
|
|
||||||
/** Offset used for this request */
|
/**
|
||||||
|
* Start index for the result set
|
||||||
|
*/
|
||||||
offset: number;
|
offset: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,7 +197,9 @@ export async function fetchProxyFontById(
|
|||||||
* @returns Promise resolving to an array of fonts
|
* @returns Promise resolving to an array of fonts
|
||||||
*/
|
*/
|
||||||
export async function fetchFontsByIds(ids: string[]): Promise<UnifiedFont[]> {
|
export async function fetchFontsByIds(ids: string[]): Promise<UnifiedFont[]> {
|
||||||
if (ids.length === 0) return [];
|
if (ids.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
const queryString = ids.join(',');
|
const queryString = ids.join(',');
|
||||||
const url = `${PROXY_API_URL}/batch?ids=${queryString}`;
|
const url = `${PROXY_API_URL}/batch?ids=${queryString}`;
|
||||||
|
|||||||
@@ -3,7 +3,9 @@ import type {
|
|||||||
UnifiedFont,
|
UnifiedFont,
|
||||||
} from '../../model';
|
} from '../../model';
|
||||||
|
|
||||||
/** Valid font weight values (100-900 in increments of 100) */
|
/**
|
||||||
|
* Valid font weight values (100-900 in increments of 100)
|
||||||
|
*/
|
||||||
const SIZES = [100, 200, 300, 400, 500, 600, 700, 800, 900];
|
const SIZES = [100, 200, 300, 400, 500, 600, 700, 800, 900];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,31 +1,3 @@
|
|||||||
/**
|
|
||||||
* Mock font filter data
|
|
||||||
*
|
|
||||||
* Factory functions and preset mock data for font-related filters.
|
|
||||||
* Used in Storybook stories for font filtering components.
|
|
||||||
*
|
|
||||||
* ## Usage
|
|
||||||
*
|
|
||||||
* ```ts
|
|
||||||
* import {
|
|
||||||
* createMockFilter,
|
|
||||||
* MOCK_FILTERS,
|
|
||||||
* } from '$entities/Font/lib/mocks';
|
|
||||||
*
|
|
||||||
* // Create a custom filter
|
|
||||||
* const customFilter = createMockFilter({
|
|
||||||
* properties: [
|
|
||||||
* { id: 'option1', name: 'Option 1', value: 'option1' },
|
|
||||||
* { id: 'option2', name: 'Option 2', value: 'option2', selected: true },
|
|
||||||
* ],
|
|
||||||
* });
|
|
||||||
*
|
|
||||||
* // Use preset filters
|
|
||||||
* const categoriesFilter = MOCK_FILTERS.categories;
|
|
||||||
* const subsetsFilter = MOCK_FILTERS.subsets;
|
|
||||||
* ```
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
FontCategory,
|
FontCategory,
|
||||||
FontProvider,
|
FontProvider,
|
||||||
@@ -34,13 +6,13 @@ import type {
|
|||||||
import type { Property } from '$shared/lib';
|
import type { Property } from '$shared/lib';
|
||||||
import { createFilter } from '$shared/lib';
|
import { createFilter } from '$shared/lib';
|
||||||
|
|
||||||
// TYPE DEFINITIONS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Options for creating a mock filter
|
* Options for creating a mock filter
|
||||||
*/
|
*/
|
||||||
export interface MockFilterOptions {
|
export interface MockFilterOptions {
|
||||||
/** Filter properties */
|
/**
|
||||||
|
* Initial set of properties for the mock filter
|
||||||
|
*/
|
||||||
properties: Property<string>[];
|
properties: Property<string>[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,16 +20,20 @@ export interface MockFilterOptions {
|
|||||||
* Preset mock filters for font filtering
|
* Preset mock filters for font filtering
|
||||||
*/
|
*/
|
||||||
export interface MockFilters {
|
export interface MockFilters {
|
||||||
/** Provider filter (Google, Fontshare) */
|
/**
|
||||||
|
* Provider filter (Google, Fontshare)
|
||||||
|
*/
|
||||||
providers: ReturnType<typeof createFilter<'google' | 'fontshare'>>;
|
providers: ReturnType<typeof createFilter<'google' | 'fontshare'>>;
|
||||||
/** Category filter (sans-serif, serif, display, etc.) */
|
/**
|
||||||
|
* Category filter (sans-serif, serif, display, etc.)
|
||||||
|
*/
|
||||||
categories: ReturnType<typeof createFilter<FontCategory>>;
|
categories: ReturnType<typeof createFilter<FontCategory>>;
|
||||||
/** Subset filter (latin, latin-ext, cyrillic, etc.) */
|
/**
|
||||||
|
* Subset filter (latin, latin-ext, cyrillic, etc.)
|
||||||
|
*/
|
||||||
subsets: ReturnType<typeof createFilter<FontSubset>>;
|
subsets: ReturnType<typeof createFilter<FontSubset>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FONT CATEGORIES
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unified categories (combines both providers)
|
* Unified categories (combines both providers)
|
||||||
*/
|
*/
|
||||||
@@ -71,8 +47,6 @@ export const UNIFIED_CATEGORIES: Property<FontCategory>[] = [
|
|||||||
{ id: 'script', name: 'Script', value: 'script' },
|
{ id: 'script', name: 'Script', value: 'script' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// FONT SUBSETS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Common font subsets
|
* Common font subsets
|
||||||
*/
|
*/
|
||||||
@@ -85,8 +59,6 @@ export const FONT_SUBSETS: Property<FontSubset>[] = [
|
|||||||
{ id: 'devanagari', name: 'Devanagari', value: 'devanagari' },
|
{ id: 'devanagari', name: 'Devanagari', value: 'devanagari' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// FONT PROVIDERS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Font providers
|
* Font providers
|
||||||
*/
|
*/
|
||||||
@@ -95,8 +67,6 @@ export const FONT_PROVIDERS: Property<FontProvider>[] = [
|
|||||||
{ id: 'fontshare', name: 'Fontshare', value: 'fontshare' },
|
{ id: 'fontshare', name: 'Fontshare', value: 'fontshare' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// FILTER FACTORIES
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a mock filter from properties
|
* Create a mock filter from properties
|
||||||
*/
|
*/
|
||||||
@@ -139,8 +109,6 @@ export function createProvidersFilter(options?: { selected?: FontProvider[] }) {
|
|||||||
return createFilter<FontProvider>({ properties });
|
return createFilter<FontProvider>({ properties });
|
||||||
}
|
}
|
||||||
|
|
||||||
// PRESET FILTERS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Preset mock filters - use these directly in stories
|
* Preset mock filters - use these directly in stories
|
||||||
*/
|
*/
|
||||||
@@ -216,8 +184,6 @@ export const MOCK_FILTERS_ALL_SELECTED: MockFilters = {
|
|||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
// GENERIC FILTER MOCKS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a mock filter with generic string properties
|
* Create a mock filter with generic string properties
|
||||||
* Useful for testing generic filter components
|
* Useful for testing generic filter components
|
||||||
@@ -239,7 +205,9 @@ export function createGenericFilter(
|
|||||||
* Preset generic filters for testing
|
* Preset generic filters for testing
|
||||||
*/
|
*/
|
||||||
export const GENERIC_FILTERS = {
|
export const GENERIC_FILTERS = {
|
||||||
/** Small filter with 3 items */
|
/**
|
||||||
|
* Small filter with 3 items
|
||||||
|
*/
|
||||||
small: createFilter({
|
small: createFilter({
|
||||||
properties: [
|
properties: [
|
||||||
{ id: 'option-1', name: 'Option 1', value: 'option-1' },
|
{ id: 'option-1', name: 'Option 1', value: 'option-1' },
|
||||||
@@ -247,7 +215,9 @@ export const GENERIC_FILTERS = {
|
|||||||
{ id: 'option-3', name: 'Option 3', value: 'option-3' },
|
{ id: 'option-3', name: 'Option 3', value: 'option-3' },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
/** Medium filter with 6 items */
|
/**
|
||||||
|
* Medium filter with 6 items
|
||||||
|
*/
|
||||||
medium: createFilter({
|
medium: createFilter({
|
||||||
properties: [
|
properties: [
|
||||||
{ id: 'alpha', name: 'Alpha', value: 'alpha' },
|
{ id: 'alpha', name: 'Alpha', value: 'alpha' },
|
||||||
@@ -258,7 +228,9 @@ export const GENERIC_FILTERS = {
|
|||||||
{ id: 'zeta', name: 'Zeta', value: 'zeta' },
|
{ id: 'zeta', name: 'Zeta', value: 'zeta' },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
/** Large filter with 12 items */
|
/**
|
||||||
|
* Large filter with 12 items
|
||||||
|
*/
|
||||||
large: createFilter({
|
large: createFilter({
|
||||||
properties: [
|
properties: [
|
||||||
{ id: 'jan', name: 'January', value: 'jan' },
|
{ id: 'jan', name: 'January', value: 'jan' },
|
||||||
@@ -275,7 +247,9 @@ export const GENERIC_FILTERS = {
|
|||||||
{ id: 'dec', name: 'December', value: 'dec' },
|
{ id: 'dec', name: 'December', value: 'dec' },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
/** Filter with some pre-selected items */
|
/**
|
||||||
|
* Filter with some pre-selected items
|
||||||
|
*/
|
||||||
partial: createFilter({
|
partial: createFilter({
|
||||||
properties: [
|
properties: [
|
||||||
{ id: 'red', name: 'Red', value: 'red', selected: true },
|
{ id: 'red', name: 'Red', value: 'red', selected: true },
|
||||||
@@ -284,7 +258,9 @@ export const GENERIC_FILTERS = {
|
|||||||
{ id: 'yellow', name: 'Yellow', value: 'yellow', selected: false },
|
{ id: 'yellow', name: 'Yellow', value: 'yellow', selected: false },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
/** Filter with all items selected */
|
/**
|
||||||
|
* Filter with all items selected
|
||||||
|
*/
|
||||||
allSelected: createFilter({
|
allSelected: createFilter({
|
||||||
properties: [
|
properties: [
|
||||||
{ id: 'cat', name: 'Cat', value: 'cat', selected: true },
|
{ id: 'cat', name: 'Cat', value: 'cat', selected: true },
|
||||||
@@ -292,7 +268,9 @@ export const GENERIC_FILTERS = {
|
|||||||
{ id: 'bird', name: 'Bird', value: 'bird', selected: true },
|
{ id: 'bird', name: 'Bird', value: 'bird', selected: true },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
/** Empty filter (no items) */
|
/**
|
||||||
|
* Empty filter (no items)
|
||||||
|
*/
|
||||||
empty: createFilter({
|
empty: createFilter({
|
||||||
properties: [],
|
properties: [],
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -51,23 +51,41 @@ import type {
|
|||||||
* Options for creating a mock UnifiedFont
|
* Options for creating a mock UnifiedFont
|
||||||
*/
|
*/
|
||||||
export interface MockUnifiedFontOptions {
|
export interface MockUnifiedFontOptions {
|
||||||
/** Unique identifier (default: derived from name) */
|
/**
|
||||||
|
* Unique identifier (default: derived from name)
|
||||||
|
*/
|
||||||
id?: string;
|
id?: string;
|
||||||
/** Font display name (default: 'Mock Font') */
|
/**
|
||||||
|
* Font display name (default: 'Mock Font')
|
||||||
|
*/
|
||||||
name?: string;
|
name?: string;
|
||||||
/** Font provider (default: 'google') */
|
/**
|
||||||
|
* Font provider (default: 'google')
|
||||||
|
*/
|
||||||
provider?: FontProvider;
|
provider?: FontProvider;
|
||||||
/** Font category (default: 'sans-serif') */
|
/**
|
||||||
|
* Font category (default: 'sans-serif')
|
||||||
|
*/
|
||||||
category?: FontCategory;
|
category?: FontCategory;
|
||||||
/** Font subsets (default: ['latin']) */
|
/**
|
||||||
|
* Font subsets (default: ['latin'])
|
||||||
|
*/
|
||||||
subsets?: FontSubset[];
|
subsets?: FontSubset[];
|
||||||
/** Font variants (default: ['regular', '700', 'italic', '700italic']) */
|
/**
|
||||||
|
* Font variants (default: ['regular', '700', 'italic', '700italic'])
|
||||||
|
*/
|
||||||
variants?: FontVariant[];
|
variants?: FontVariant[];
|
||||||
/** Style URLs (if not provided, mock URLs are generated) */
|
/**
|
||||||
|
* Style URLs (if not provided, mock URLs are generated)
|
||||||
|
*/
|
||||||
styles?: FontStyleUrls;
|
styles?: FontStyleUrls;
|
||||||
/** Metadata overrides */
|
/**
|
||||||
|
* Metadata overrides
|
||||||
|
*/
|
||||||
metadata?: Partial<FontMetadata>;
|
metadata?: Partial<FontMetadata>;
|
||||||
/** Features overrides */
|
/**
|
||||||
|
* Features overrides
|
||||||
|
*/
|
||||||
features?: Partial<FontFeatures>;
|
features?: Partial<FontFeatures>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
/**
|
/**
|
||||||
* ============================================================================
|
|
||||||
* MOCK FONT STORE HELPERS
|
|
||||||
* ============================================================================
|
|
||||||
*
|
|
||||||
* Factory functions and preset mock data for TanStack Query stores and state management.
|
* Factory functions and preset mock data for TanStack Query stores and state management.
|
||||||
* Used in Storybook stories for components that use reactive stores.
|
* Used in Storybook stories for components that use reactive stores.
|
||||||
*
|
*
|
||||||
@@ -35,27 +31,73 @@ import {
|
|||||||
generateMockFonts,
|
generateMockFonts,
|
||||||
} from './fonts.mock';
|
} from './fonts.mock';
|
||||||
|
|
||||||
// TANSTACK QUERY MOCK TYPES
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mock TanStack Query state
|
* Mock TanStack Query state
|
||||||
*/
|
*/
|
||||||
export interface MockQueryState<TData = unknown, TError = Error> {
|
export interface MockQueryState<TData = unknown, TError = Error> {
|
||||||
|
/**
|
||||||
|
* Primary query status (pending, success, error)
|
||||||
|
*/
|
||||||
status: QueryStatus;
|
status: QueryStatus;
|
||||||
|
/**
|
||||||
|
* Payload data (present on success)
|
||||||
|
*/
|
||||||
data?: TData;
|
data?: TData;
|
||||||
|
/**
|
||||||
|
* Caught error object (present on error)
|
||||||
|
*/
|
||||||
error?: TError;
|
error?: TError;
|
||||||
|
/**
|
||||||
|
* True if initial load is in progress
|
||||||
|
*/
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
|
/**
|
||||||
|
* True if background fetch is in progress
|
||||||
|
*/
|
||||||
isFetching?: boolean;
|
isFetching?: boolean;
|
||||||
|
/**
|
||||||
|
* True if query resolved successfully
|
||||||
|
*/
|
||||||
isSuccess?: boolean;
|
isSuccess?: boolean;
|
||||||
|
/**
|
||||||
|
* True if query failed
|
||||||
|
*/
|
||||||
isError?: boolean;
|
isError?: boolean;
|
||||||
|
/**
|
||||||
|
* True if query is waiting to be executed
|
||||||
|
*/
|
||||||
isPending?: boolean;
|
isPending?: boolean;
|
||||||
|
/**
|
||||||
|
* Timestamp of last successful data retrieval
|
||||||
|
*/
|
||||||
dataUpdatedAt?: number;
|
dataUpdatedAt?: number;
|
||||||
|
/**
|
||||||
|
* Timestamp of last recorded error
|
||||||
|
*/
|
||||||
errorUpdatedAt?: number;
|
errorUpdatedAt?: number;
|
||||||
|
/**
|
||||||
|
* Total number of consecutive failures
|
||||||
|
*/
|
||||||
failureCount?: number;
|
failureCount?: number;
|
||||||
|
/**
|
||||||
|
* Detailed reason for the last failure
|
||||||
|
*/
|
||||||
failureReason?: TError;
|
failureReason?: TError;
|
||||||
|
/**
|
||||||
|
* Number of times an error has been caught
|
||||||
|
*/
|
||||||
errorUpdateCount?: number;
|
errorUpdateCount?: number;
|
||||||
|
/**
|
||||||
|
* True if currently refetching in background
|
||||||
|
*/
|
||||||
isRefetching?: boolean;
|
isRefetching?: boolean;
|
||||||
|
/**
|
||||||
|
* True if refetch attempt failed
|
||||||
|
*/
|
||||||
isRefetchError?: boolean;
|
isRefetchError?: boolean;
|
||||||
|
/**
|
||||||
|
* True if query is paused (e.g. offline)
|
||||||
|
*/
|
||||||
isPaused?: boolean;
|
isPaused?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,26 +105,72 @@ export interface MockQueryState<TData = unknown, TError = Error> {
|
|||||||
* Mock TanStack Query observer result
|
* Mock TanStack Query observer result
|
||||||
*/
|
*/
|
||||||
export interface MockQueryObserverResult<TData = unknown, TError = Error> {
|
export interface MockQueryObserverResult<TData = unknown, TError = Error> {
|
||||||
|
/**
|
||||||
|
* Current observer status
|
||||||
|
*/
|
||||||
status?: QueryStatus;
|
status?: QueryStatus;
|
||||||
|
/**
|
||||||
|
* Cached or active data payload
|
||||||
|
*/
|
||||||
data?: TData;
|
data?: TData;
|
||||||
|
/**
|
||||||
|
* Caught error from the observer
|
||||||
|
*/
|
||||||
error?: TError;
|
error?: TError;
|
||||||
|
/**
|
||||||
|
* Loading flag for the observer
|
||||||
|
*/
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
|
/**
|
||||||
|
* Fetching flag for the observer
|
||||||
|
*/
|
||||||
isFetching?: boolean;
|
isFetching?: boolean;
|
||||||
|
/**
|
||||||
|
* Success flag for the observer
|
||||||
|
*/
|
||||||
isSuccess?: boolean;
|
isSuccess?: boolean;
|
||||||
|
/**
|
||||||
|
* Error flag for the observer
|
||||||
|
*/
|
||||||
isError?: boolean;
|
isError?: boolean;
|
||||||
|
/**
|
||||||
|
* Pending flag for the observer
|
||||||
|
*/
|
||||||
isPending?: boolean;
|
isPending?: boolean;
|
||||||
|
/**
|
||||||
|
* Last update time for data
|
||||||
|
*/
|
||||||
dataUpdatedAt?: number;
|
dataUpdatedAt?: number;
|
||||||
|
/**
|
||||||
|
* Last update time for error
|
||||||
|
*/
|
||||||
errorUpdatedAt?: number;
|
errorUpdatedAt?: number;
|
||||||
|
/**
|
||||||
|
* Consecutive failure count
|
||||||
|
*/
|
||||||
failureCount?: number;
|
failureCount?: number;
|
||||||
|
/**
|
||||||
|
* Failure reason object
|
||||||
|
*/
|
||||||
failureReason?: TError;
|
failureReason?: TError;
|
||||||
|
/**
|
||||||
|
* Error count for the observer
|
||||||
|
*/
|
||||||
errorUpdateCount?: number;
|
errorUpdateCount?: number;
|
||||||
|
/**
|
||||||
|
* Refetching flag
|
||||||
|
*/
|
||||||
isRefetching?: boolean;
|
isRefetching?: boolean;
|
||||||
|
/**
|
||||||
|
* Refetch error flag
|
||||||
|
*/
|
||||||
isRefetchError?: boolean;
|
isRefetchError?: boolean;
|
||||||
|
/**
|
||||||
|
* Paused flag
|
||||||
|
*/
|
||||||
isPaused?: boolean;
|
isPaused?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TANSTACK QUERY MOCK FACTORIES
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a mock query state for TanStack Query
|
* Create a mock query state for TanStack Query
|
||||||
*/
|
*/
|
||||||
@@ -138,33 +226,53 @@ export function createSuccessState<TData>(data: TData): MockQueryObserverResult<
|
|||||||
return createMockQueryState<TData>({ status: 'success', data, error: undefined });
|
return createMockQueryState<TData>({ status: 'success', data, error: undefined });
|
||||||
}
|
}
|
||||||
|
|
||||||
// FONT STORE MOCKS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mock UnifiedFontStore state
|
* Mock UnifiedFontStore state
|
||||||
*/
|
*/
|
||||||
export interface MockFontStoreState {
|
export interface MockFontStoreState {
|
||||||
/** All cached fonts */
|
/**
|
||||||
|
* Map of mock fonts indexed by ID
|
||||||
|
*/
|
||||||
fonts: Record<string, UnifiedFont>;
|
fonts: Record<string, UnifiedFont>;
|
||||||
/** Current page */
|
/**
|
||||||
|
* Currently active page number
|
||||||
|
*/
|
||||||
page: number;
|
page: number;
|
||||||
/** Total pages available */
|
/**
|
||||||
|
* Total number of pages calculated from limit
|
||||||
|
*/
|
||||||
totalPages: number;
|
totalPages: number;
|
||||||
/** Items per page */
|
/**
|
||||||
|
* Number of items per page
|
||||||
|
*/
|
||||||
limit: number;
|
limit: number;
|
||||||
/** Total font count */
|
/**
|
||||||
|
* Total number of available fonts
|
||||||
|
*/
|
||||||
total: number;
|
total: number;
|
||||||
/** Loading state */
|
/**
|
||||||
|
* Store-level loading status
|
||||||
|
*/
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
/** Error state */
|
/**
|
||||||
|
* Caught error object
|
||||||
|
*/
|
||||||
error: Error | null;
|
error: Error | null;
|
||||||
/** Search query */
|
/**
|
||||||
|
* Mock search filter string
|
||||||
|
*/
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
/** Selected provider */
|
/**
|
||||||
|
* Mock provider filter selection
|
||||||
|
*/
|
||||||
provider: 'google' | 'fontshare' | 'all';
|
provider: 'google' | 'fontshare' | 'all';
|
||||||
/** Selected category */
|
/**
|
||||||
|
* Mock category filter selection
|
||||||
|
*/
|
||||||
category: string | null;
|
category: string | null;
|
||||||
/** Selected subset */
|
/**
|
||||||
|
* Mock subset filter selection
|
||||||
|
*/
|
||||||
subset: string | null;
|
subset: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,10 +318,12 @@ export function createMockFontStoreState(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Preset font store states
|
* Preset font store states for UI testing
|
||||||
*/
|
*/
|
||||||
export const MOCK_FONT_STORE_STATES = {
|
export const MOCK_FONT_STORE_STATES = {
|
||||||
/** Initial loading state */
|
/**
|
||||||
|
* Initial loading state with no data
|
||||||
|
*/
|
||||||
loading: createMockFontStoreState({
|
loading: createMockFontStoreState({
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
fonts: {},
|
fonts: {},
|
||||||
@@ -221,7 +331,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
page: 1,
|
page: 1,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Empty state (no fonts found) */
|
/**
|
||||||
|
* State with no fonts matching filters
|
||||||
|
*/
|
||||||
empty: createMockFontStoreState({
|
empty: createMockFontStoreState({
|
||||||
fonts: {},
|
fonts: {},
|
||||||
total: 0,
|
total: 0,
|
||||||
@@ -229,7 +341,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** First page with fonts */
|
/**
|
||||||
|
* First page of results (10 items)
|
||||||
|
*/
|
||||||
firstPage: createMockFontStoreState({
|
firstPage: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS).slice(0, 10).map(font => [font.id, font]),
|
Object.values(UNIFIED_FONTS).slice(0, 10).map(font => [font.id, font]),
|
||||||
@@ -241,7 +355,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Second page with fonts */
|
/**
|
||||||
|
* Second page of results (10 items)
|
||||||
|
*/
|
||||||
secondPage: createMockFontStoreState({
|
secondPage: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS).slice(10, 20).map(font => [font.id, font]),
|
Object.values(UNIFIED_FONTS).slice(10, 20).map(font => [font.id, font]),
|
||||||
@@ -253,7 +369,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Last page with fonts */
|
/**
|
||||||
|
* Final page of results (5 items)
|
||||||
|
*/
|
||||||
lastPage: createMockFontStoreState({
|
lastPage: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS).slice(0, 5).map(font => [font.id, font]),
|
Object.values(UNIFIED_FONTS).slice(0, 5).map(font => [font.id, font]),
|
||||||
@@ -265,7 +383,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Error state */
|
/**
|
||||||
|
* Terminal failure state
|
||||||
|
*/
|
||||||
error: createMockFontStoreState({
|
error: createMockFontStoreState({
|
||||||
fonts: {},
|
fonts: {},
|
||||||
error: new Error('Failed to load fonts'),
|
error: new Error('Failed to load fonts'),
|
||||||
@@ -274,7 +394,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** With search query */
|
/**
|
||||||
|
* State with active search query
|
||||||
|
*/
|
||||||
withSearch: createMockFontStoreState({
|
withSearch: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS).slice(0, 3).map(font => [font.id, font]),
|
Object.values(UNIFIED_FONTS).slice(0, 3).map(font => [font.id, font]),
|
||||||
@@ -285,7 +407,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
searchQuery: 'Roboto',
|
searchQuery: 'Roboto',
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Filtered by category */
|
/**
|
||||||
|
* State with active category filter
|
||||||
|
*/
|
||||||
filteredByCategory: createMockFontStoreState({
|
filteredByCategory: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS)
|
Object.values(UNIFIED_FONTS)
|
||||||
@@ -299,7 +423,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
category: 'serif',
|
category: 'serif',
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Filtered by provider */
|
/**
|
||||||
|
* State with active provider filter
|
||||||
|
*/
|
||||||
filteredByProvider: createMockFontStoreState({
|
filteredByProvider: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
Object.values(UNIFIED_FONTS)
|
Object.values(UNIFIED_FONTS)
|
||||||
@@ -313,7 +439,9 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
provider: 'google',
|
provider: 'google',
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Large dataset */
|
/**
|
||||||
|
* Large collection for performance testing (50 items)
|
||||||
|
*/
|
||||||
largeDataset: createMockFontStoreState({
|
largeDataset: createMockFontStoreState({
|
||||||
fonts: Object.fromEntries(
|
fonts: Object.fromEntries(
|
||||||
generateMockFonts(50).map(font => [font.id, font]),
|
generateMockFonts(50).map(font => [font.id, font]),
|
||||||
@@ -326,17 +454,30 @@ export const MOCK_FONT_STORE_STATES = {
|
|||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
// MOCK STORE OBJECT
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a mock store object that mimics TanStack Query behavior
|
* Create a mock store object that mimics TanStack Query behavior
|
||||||
* Useful for components that subscribe to store properties
|
* Useful for components that subscribe to store properties
|
||||||
*/
|
*/
|
||||||
export function createMockStore<T>(config: {
|
export function createMockStore<T>(config: {
|
||||||
|
/**
|
||||||
|
* Reactive data payload
|
||||||
|
*/
|
||||||
data?: T;
|
data?: T;
|
||||||
|
/**
|
||||||
|
* Loading status flag
|
||||||
|
*/
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
|
/**
|
||||||
|
* Error status flag
|
||||||
|
*/
|
||||||
isError?: boolean;
|
isError?: boolean;
|
||||||
|
/**
|
||||||
|
* Catch-all error object
|
||||||
|
*/
|
||||||
error?: Error;
|
error?: Error;
|
||||||
|
/**
|
||||||
|
* Background fetching flag
|
||||||
|
*/
|
||||||
isFetching?: boolean;
|
isFetching?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const {
|
const {
|
||||||
@@ -348,50 +489,81 @@ export function createMockStore<T>(config: {
|
|||||||
} = config;
|
} = config;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
/**
|
||||||
|
* Returns the active data payload
|
||||||
|
*/
|
||||||
get data() {
|
get data() {
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if initially loading
|
||||||
|
*/
|
||||||
get isLoading() {
|
get isLoading() {
|
||||||
return isLoading;
|
return isLoading;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if last request failed
|
||||||
|
*/
|
||||||
get isError() {
|
get isError() {
|
||||||
return isError;
|
return isError;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Returns the caught error object
|
||||||
|
*/
|
||||||
get error() {
|
get error() {
|
||||||
return error;
|
return error;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if fetching in background
|
||||||
|
*/
|
||||||
get isFetching() {
|
get isFetching() {
|
||||||
return isFetching;
|
return isFetching;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if query is stable and has data
|
||||||
|
*/
|
||||||
get isSuccess() {
|
get isSuccess() {
|
||||||
return !isLoading && !isError && data !== undefined;
|
return !isLoading && !isError && data !== undefined;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Returns semantic status string
|
||||||
|
*/
|
||||||
get status() {
|
get status() {
|
||||||
if (isLoading) return 'pending';
|
if (isLoading) {
|
||||||
if (isError) return 'error';
|
return 'pending';
|
||||||
|
}
|
||||||
|
if (isError) {
|
||||||
|
return 'error';
|
||||||
|
}
|
||||||
return 'success';
|
return 'success';
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Preset mock stores
|
* Preset mock stores for common UI states
|
||||||
*/
|
*/
|
||||||
export const MOCK_STORES = {
|
export const MOCK_STORES = {
|
||||||
/** Font store in loading state */
|
/**
|
||||||
|
* Initial loading state
|
||||||
|
*/
|
||||||
loadingFontStore: createMockStore<UnifiedFont[]>({
|
loadingFontStore: createMockStore<UnifiedFont[]>({
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
data: undefined,
|
data: undefined,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Font store with fonts loaded */
|
/**
|
||||||
|
* Successful data load state
|
||||||
|
*/
|
||||||
successFontStore: createMockStore<UnifiedFont[]>({
|
successFontStore: createMockStore<UnifiedFont[]>({
|
||||||
data: Object.values(UNIFIED_FONTS),
|
data: Object.values(UNIFIED_FONTS),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
isError: false,
|
isError: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Font store with error */
|
/**
|
||||||
|
* API error state
|
||||||
|
*/
|
||||||
errorFontStore: createMockStore<UnifiedFont[]>({
|
errorFontStore: createMockStore<UnifiedFont[]>({
|
||||||
data: undefined,
|
data: undefined,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -399,7 +571,9 @@ export const MOCK_STORES = {
|
|||||||
error: new Error('Failed to load fonts'),
|
error: new Error('Failed to load fonts'),
|
||||||
}),
|
}),
|
||||||
|
|
||||||
/** Font store with empty results */
|
/**
|
||||||
|
* Empty result set state
|
||||||
|
*/
|
||||||
emptyFontStore: createMockStore<UnifiedFont[]>({
|
emptyFontStore: createMockStore<UnifiedFont[]>({
|
||||||
data: [],
|
data: [],
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -414,36 +588,69 @@ export const MOCK_STORES = {
|
|||||||
const mockState = createMockFontStoreState(state);
|
const mockState = createMockFontStoreState(state);
|
||||||
return {
|
return {
|
||||||
// State properties
|
// State properties
|
||||||
|
/**
|
||||||
|
* Collection of mock fonts
|
||||||
|
*/
|
||||||
get fonts() {
|
get fonts() {
|
||||||
return mockState.fonts;
|
return mockState.fonts;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Current mock page
|
||||||
|
*/
|
||||||
get page() {
|
get page() {
|
||||||
return mockState.page;
|
return mockState.page;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Total mock pages
|
||||||
|
*/
|
||||||
get totalPages() {
|
get totalPages() {
|
||||||
return mockState.totalPages;
|
return mockState.totalPages;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock items per page
|
||||||
|
*/
|
||||||
get limit() {
|
get limit() {
|
||||||
return mockState.limit;
|
return mockState.limit;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Total mock items
|
||||||
|
*/
|
||||||
get total() {
|
get total() {
|
||||||
return mockState.total;
|
return mockState.total;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock loading status
|
||||||
|
*/
|
||||||
get isLoading() {
|
get isLoading() {
|
||||||
return mockState.isLoading;
|
return mockState.isLoading;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock error status
|
||||||
|
*/
|
||||||
get error() {
|
get error() {
|
||||||
return mockState.error;
|
return mockState.error;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock search string
|
||||||
|
*/
|
||||||
get searchQuery() {
|
get searchQuery() {
|
||||||
return mockState.searchQuery;
|
return mockState.searchQuery;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock provider filter
|
||||||
|
*/
|
||||||
get provider() {
|
get provider() {
|
||||||
return mockState.provider;
|
return mockState.provider;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock category filter
|
||||||
|
*/
|
||||||
get category() {
|
get category() {
|
||||||
return mockState.category;
|
return mockState.category;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock subset filter
|
||||||
|
*/
|
||||||
get subset() {
|
get subset() {
|
||||||
return mockState.subset;
|
return mockState.subset;
|
||||||
},
|
},
|
||||||
@@ -464,15 +671,45 @@ export const MOCK_STORES = {
|
|||||||
* Matches FontStore's public API for Storybook use
|
* Matches FontStore's public API for Storybook use
|
||||||
*/
|
*/
|
||||||
fontStore: (config: {
|
fontStore: (config: {
|
||||||
|
/**
|
||||||
|
* Preset font list
|
||||||
|
*/
|
||||||
fonts?: UnifiedFont[];
|
fonts?: UnifiedFont[];
|
||||||
|
/**
|
||||||
|
* Total item count
|
||||||
|
*/
|
||||||
total?: number;
|
total?: number;
|
||||||
|
/**
|
||||||
|
* Items per page
|
||||||
|
*/
|
||||||
limit?: number;
|
limit?: number;
|
||||||
|
/**
|
||||||
|
* Pagination offset
|
||||||
|
*/
|
||||||
offset?: number;
|
offset?: number;
|
||||||
|
/**
|
||||||
|
* Loading flag
|
||||||
|
*/
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
|
/**
|
||||||
|
* Fetching flag
|
||||||
|
*/
|
||||||
isFetching?: boolean;
|
isFetching?: boolean;
|
||||||
|
/**
|
||||||
|
* Error flag
|
||||||
|
*/
|
||||||
isError?: boolean;
|
isError?: boolean;
|
||||||
|
/**
|
||||||
|
* Catch-all error object
|
||||||
|
*/
|
||||||
error?: Error | null;
|
error?: Error | null;
|
||||||
|
/**
|
||||||
|
* Has more pages flag
|
||||||
|
*/
|
||||||
hasMore?: boolean;
|
hasMore?: boolean;
|
||||||
|
/**
|
||||||
|
* Current page number
|
||||||
|
*/
|
||||||
page?: number;
|
page?: number;
|
||||||
} = {}) => {
|
} = {}) => {
|
||||||
const {
|
const {
|
||||||
@@ -495,27 +732,51 @@ export const MOCK_STORES = {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
// State getters
|
// State getters
|
||||||
|
/**
|
||||||
|
* Current mock parameters
|
||||||
|
*/
|
||||||
get params() {
|
get params() {
|
||||||
return state.params;
|
return state.params;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock font list
|
||||||
|
*/
|
||||||
get fonts() {
|
get fonts() {
|
||||||
return mockFonts;
|
return mockFonts;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock loading state
|
||||||
|
*/
|
||||||
get isLoading() {
|
get isLoading() {
|
||||||
return isLoading;
|
return isLoading;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock fetching state
|
||||||
|
*/
|
||||||
get isFetching() {
|
get isFetching() {
|
||||||
return isFetching;
|
return isFetching;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock error state
|
||||||
|
*/
|
||||||
get isError() {
|
get isError() {
|
||||||
return isError;
|
return isError;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock error object
|
||||||
|
*/
|
||||||
get error() {
|
get error() {
|
||||||
return error;
|
return error;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock empty state check
|
||||||
|
*/
|
||||||
get isEmpty() {
|
get isEmpty() {
|
||||||
return !isLoading && !isFetching && mockFonts.length === 0;
|
return !isLoading && !isFetching && mockFonts.length === 0;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Mock pagination metadata
|
||||||
|
*/
|
||||||
get pagination() {
|
get pagination() {
|
||||||
return {
|
return {
|
||||||
total: mockTotal,
|
total: mockTotal,
|
||||||
@@ -527,18 +788,33 @@ export const MOCK_STORES = {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
// Category getters
|
// Category getters
|
||||||
|
/**
|
||||||
|
* Derived sans-serif filter
|
||||||
|
*/
|
||||||
get sansSerifFonts() {
|
get sansSerifFonts() {
|
||||||
return mockFonts.filter(f => f.category === 'sans-serif');
|
return mockFonts.filter(f => f.category === 'sans-serif');
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Derived serif filter
|
||||||
|
*/
|
||||||
get serifFonts() {
|
get serifFonts() {
|
||||||
return mockFonts.filter(f => f.category === 'serif');
|
return mockFonts.filter(f => f.category === 'serif');
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Derived display filter
|
||||||
|
*/
|
||||||
get displayFonts() {
|
get displayFonts() {
|
||||||
return mockFonts.filter(f => f.category === 'display');
|
return mockFonts.filter(f => f.category === 'display');
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Derived handwriting filter
|
||||||
|
*/
|
||||||
get handwritingFonts() {
|
get handwritingFonts() {
|
||||||
return mockFonts.filter(f => f.category === 'handwriting');
|
return mockFonts.filter(f => f.category === 'handwriting');
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Derived monospace filter
|
||||||
|
*/
|
||||||
get monospaceFonts() {
|
get monospaceFonts() {
|
||||||
return mockFonts.filter(f => f.category === 'monospace');
|
return mockFonts.filter(f => f.category === 'monospace');
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,15 +13,25 @@ import type {
|
|||||||
* (e.g. `SvelteMap.get()`) is automatically tracked as a dependency.
|
* (e.g. `SvelteMap.get()`) is automatically tracked as a dependency.
|
||||||
*/
|
*/
|
||||||
export interface FontRowSizeResolverOptions {
|
export interface FontRowSizeResolverOptions {
|
||||||
/** Returns the current fonts array. Index `i` corresponds to row `i`. */
|
/**
|
||||||
|
* Returns the current fonts array. Index `i` corresponds to row `i`.
|
||||||
|
*/
|
||||||
getFonts: () => UnifiedFont[];
|
getFonts: () => UnifiedFont[];
|
||||||
/** Returns the active font weight (e.g. 400). */
|
/**
|
||||||
|
* Returns the active font weight (e.g. 400).
|
||||||
|
*/
|
||||||
getWeight: () => number;
|
getWeight: () => number;
|
||||||
/** Returns the preview text string. */
|
/**
|
||||||
|
* Returns the preview text string.
|
||||||
|
*/
|
||||||
getPreviewText: () => string;
|
getPreviewText: () => string;
|
||||||
/** Returns the scroll container's inner width in pixels. Returns 0 before mount. */
|
/**
|
||||||
|
* Returns the scroll container's inner width in pixels. Returns 0 before mount.
|
||||||
|
*/
|
||||||
getContainerWidth: () => number;
|
getContainerWidth: () => number;
|
||||||
/** Returns the font size in pixels (e.g. `controlManager.renderedSize`). */
|
/**
|
||||||
|
* Returns the font size in pixels (e.g. `controlManager.renderedSize`).
|
||||||
|
*/
|
||||||
getFontSizePx: () => number;
|
getFontSizePx: () => number;
|
||||||
/**
|
/**
|
||||||
* Returns the computed line height in pixels.
|
* Returns the computed line height in pixels.
|
||||||
@@ -44,9 +54,13 @@ export interface FontRowSizeResolverOptions {
|
|||||||
* the content width is never over-estimated, keeping the height estimate safe.
|
* the content width is never over-estimated, keeping the height estimate safe.
|
||||||
*/
|
*/
|
||||||
contentHorizontalPadding: number;
|
contentHorizontalPadding: number;
|
||||||
/** Fixed height in pixels of chrome that is not text content (header bar, etc.). */
|
/**
|
||||||
|
* Fixed height in pixels of chrome that is not text content (header bar, etc.).
|
||||||
|
*/
|
||||||
chromeHeight: number;
|
chromeHeight: number;
|
||||||
/** Height in pixels to return when the font is not loaded or container width is 0. */
|
/**
|
||||||
|
* Height in pixels to return when the font is not loaded or container width is 0.
|
||||||
|
*/
|
||||||
fallbackHeight: number;
|
fallbackHeight: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,12 +93,16 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
|
|||||||
return function resolveRowHeight(rowIndex: number): number {
|
return function resolveRowHeight(rowIndex: number): number {
|
||||||
const fonts = options.getFonts();
|
const fonts = options.getFonts();
|
||||||
const font = fonts[rowIndex];
|
const font = fonts[rowIndex];
|
||||||
if (!font) return options.fallbackHeight;
|
if (!font) {
|
||||||
|
return options.fallbackHeight;
|
||||||
|
}
|
||||||
|
|
||||||
const containerWidth = options.getContainerWidth();
|
const containerWidth = options.getContainerWidth();
|
||||||
const previewText = options.getPreviewText();
|
const previewText = options.getPreviewText();
|
||||||
|
|
||||||
if (containerWidth <= 0 || !previewText) return options.fallbackHeight;
|
if (containerWidth <= 0 || !previewText) {
|
||||||
|
return options.fallbackHeight;
|
||||||
|
}
|
||||||
|
|
||||||
const weight = options.getWeight();
|
const weight = options.getWeight();
|
||||||
// generateFontKey: '{id}@{weight}' for static fonts, '{id}@vf' for variable fonts.
|
// generateFontKey: '{id}@{weight}' for static fonts, '{id}@vf' for variable fonts.
|
||||||
@@ -93,7 +111,9 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
|
|||||||
// Reading via getStatus() allows the caller to pass appliedFontsManager.statuses.get(),
|
// Reading via getStatus() allows the caller to pass appliedFontsManager.statuses.get(),
|
||||||
// which creates a Svelte 5 reactive dependency when called inside $derived.by.
|
// which creates a Svelte 5 reactive dependency when called inside $derived.by.
|
||||||
const status = options.getStatus(fontKey);
|
const status = options.getStatus(fontKey);
|
||||||
if (status !== 'loaded') return options.fallbackHeight;
|
if (status !== 'loaded') {
|
||||||
|
return options.fallbackHeight;
|
||||||
|
}
|
||||||
|
|
||||||
const fontSizePx = options.getFontSizePx();
|
const fontSizePx = options.getFontSizePx();
|
||||||
const lineHeightPx = options.getLineHeightPx();
|
const lineHeightPx = options.getLineHeightPx();
|
||||||
@@ -102,7 +122,9 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
|
|||||||
|
|
||||||
const cacheKey = `${fontCssString}|${previewText}|${contentWidth}|${lineHeightPx}`;
|
const cacheKey = `${fontCssString}|${previewText}|${contentWidth}|${lineHeightPx}`;
|
||||||
const cached = cache.get(cacheKey);
|
const cached = cache.get(cacheKey);
|
||||||
if (cached !== undefined) return cached;
|
if (cached !== undefined) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
const { totalHeight } = engine.layout(previewText, fontCssString, contentWidth, lineHeightPx);
|
const { totalHeight } = engine.layout(previewText, fontCssString, contentWidth, lineHeightPx);
|
||||||
const result = totalHeight + options.chromeHeight;
|
const result = totalHeight + options.chromeHeight;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { ControlModel } from '$shared/lib';
|
import type { ControlModel } from '$shared/lib';
|
||||||
import type { ControlId } from '..';
|
import type { ControlId } from '../types/typography';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Font size constants
|
* Font size constants
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
|
export * from './const/const';
|
||||||
export * from './store';
|
export * from './store';
|
||||||
export * from './types';
|
export * from './types';
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import { AppliedFontsManager } from './appliedFontsStore.svelte';
|
import { AppliedFontsManager } from './appliedFontsStore.svelte';
|
||||||
import { FontFetchError } from './errors';
|
import { FontFetchError } from './errors';
|
||||||
import { FontEvictionPolicy } from './utils/fontEvictionPolicy/FontEvictionPolicy';
|
import { FontEvictionPolicy } from './utils/fontEvictionPolicy/FontEvictionPolicy';
|
||||||
|
|
||||||
// ── Fake collaborators ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
class FakeBufferCache {
|
class FakeBufferCache {
|
||||||
async get(_url: string): Promise<ArrayBuffer> {
|
async get(_url: string): Promise<ArrayBuffer> {
|
||||||
return new ArrayBuffer(8);
|
return new ArrayBuffer(8);
|
||||||
@@ -13,7 +13,9 @@ class FakeBufferCache {
|
|||||||
clear(): void {}
|
clear(): void {}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Throws {@link FontFetchError} on every `get()` — simulates network/HTTP failure. */
|
/**
|
||||||
|
* Throws {@link FontFetchError} on every `get()` — simulates network/HTTP failure.
|
||||||
|
*/
|
||||||
class FailingBufferCache {
|
class FailingBufferCache {
|
||||||
async get(url: string): Promise<never> {
|
async get(url: string): Promise<never> {
|
||||||
throw new FontFetchError(url, new Error('network error'), 500);
|
throw new FontFetchError(url, new Error('network error'), 500);
|
||||||
@@ -22,8 +24,6 @@ class FailingBufferCache {
|
|||||||
clear(): void {}
|
clear(): void {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
const makeConfig = (id: string, overrides: Partial<{ weight: number; isVariable: boolean }> = {}) => ({
|
const makeConfig = (id: string, overrides: Partial<{ weight: number; isVariable: boolean }> = {}) => ({
|
||||||
id,
|
id,
|
||||||
name: id,
|
name: id,
|
||||||
@@ -32,8 +32,6 @@ const makeConfig = (id: string, overrides: Partial<{ weight: number; isVariable:
|
|||||||
...overrides,
|
...overrides,
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── Suite ─────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('AppliedFontsManager', () => {
|
describe('AppliedFontsManager', () => {
|
||||||
let manager: AppliedFontsManager;
|
let manager: AppliedFontsManager;
|
||||||
let eviction: FontEvictionPolicy;
|
let eviction: FontEvictionPolicy;
|
||||||
@@ -66,8 +64,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
vi.unstubAllGlobals();
|
vi.unstubAllGlobals();
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── touch() ───────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('touch()', () => {
|
describe('touch()', () => {
|
||||||
it('queues and loads a new font', async () => {
|
it('queues and loads a new font', async () => {
|
||||||
manager.touch([makeConfig('roboto')]);
|
manager.touch([makeConfig('roboto')]);
|
||||||
@@ -131,8 +127,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── queue processing ──────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('queue processing', () => {
|
describe('queue processing', () => {
|
||||||
it('filters non-critical weights in data-saver mode', async () => {
|
it('filters non-critical weights in data-saver mode', async () => {
|
||||||
(navigator as any).connection = { saveData: true };
|
(navigator as any).connection = { saveData: true };
|
||||||
@@ -163,8 +157,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── Phase 1: fetch ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('Phase 1 — fetch', () => {
|
describe('Phase 1 — fetch', () => {
|
||||||
it('sets status to error on fetch failure', async () => {
|
it('sets status to error on fetch failure', async () => {
|
||||||
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||||
@@ -209,8 +201,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── Phase 2: parse ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('Phase 2 — parse', () => {
|
describe('Phase 2 — parse', () => {
|
||||||
it('sets status to error on parse failure', async () => {
|
it('sets status to error on parse failure', async () => {
|
||||||
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||||
@@ -241,8 +231,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── #purgeUnused ──────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('#purgeUnused', () => {
|
describe('#purgeUnused', () => {
|
||||||
it('evicts fonts after TTL expires', async () => {
|
it('evicts fonts after TTL expires', async () => {
|
||||||
manager.touch([makeConfig('ephemeral')]);
|
manager.touch([makeConfig('ephemeral')]);
|
||||||
@@ -300,8 +288,6 @@ describe('AppliedFontsManager', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── destroy() ─────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
describe('destroy()', () => {
|
describe('destroy()', () => {
|
||||||
it('clears all statuses', async () => {
|
it('clears all statuses', async () => {
|
||||||
manager.touch([makeConfig('roboto')]);
|
manager.touch([makeConfig('roboto')]);
|
||||||
|
|||||||
@@ -156,7 +156,9 @@ export class AppliedFontsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns true if data-saver mode is enabled (defers non-critical weights). */
|
/**
|
||||||
|
* Returns true if data-saver mode is enabled (defers non-critical weights).
|
||||||
|
*/
|
||||||
#shouldDeferNonCritical(): boolean {
|
#shouldDeferNonCritical(): boolean {
|
||||||
return (navigator as any).connection?.saveData === true;
|
return (navigator as any).connection?.saveData === true;
|
||||||
}
|
}
|
||||||
@@ -188,13 +190,11 @@ export class AppliedFontsManager {
|
|||||||
const concurrency = getEffectiveConcurrency();
|
const concurrency = getEffectiveConcurrency();
|
||||||
const buffers = new Map<string, ArrayBuffer>();
|
const buffers = new Map<string, ArrayBuffer>();
|
||||||
|
|
||||||
// ==================== PHASE 1: Concurrent Fetching ====================
|
|
||||||
// Fetch multiple font files in parallel since network I/O is non-blocking
|
// Fetch multiple font files in parallel since network I/O is non-blocking
|
||||||
for (let i = 0; i < entries.length; i += concurrency) {
|
for (let i = 0; i < entries.length; i += concurrency) {
|
||||||
await this.#fetchChunk(entries.slice(i, i + concurrency), buffers);
|
await this.#fetchChunk(entries.slice(i, i + concurrency), buffers);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== PHASE 2: Sequential Parsing ====================
|
|
||||||
// Parse buffers one at a time with periodic yields to avoid blocking UI
|
// Parse buffers one at a time with periodic yields to avoid blocking UI
|
||||||
const hasInputPending = !!(navigator as any).scheduling?.isInputPending;
|
const hasInputPending = !!(navigator as any).scheduling?.isInputPending;
|
||||||
let lastYield = performance.now();
|
let lastYield = performance.now();
|
||||||
@@ -246,12 +246,16 @@ export class AppliedFontsManager {
|
|||||||
);
|
);
|
||||||
|
|
||||||
for (const result of results) {
|
for (const result of results) {
|
||||||
if (result.ok) continue;
|
if (result.ok) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
const { key, config, reason } = result;
|
const { key, config, reason } = result;
|
||||||
const isAbort = reason instanceof FontFetchError
|
const isAbort = reason instanceof FontFetchError
|
||||||
&& reason.cause instanceof Error
|
&& reason.cause instanceof Error
|
||||||
&& reason.cause.name === 'AbortError';
|
&& reason.cause.name === 'AbortError';
|
||||||
if (isAbort) continue;
|
if (isAbort) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (reason instanceof FontFetchError) {
|
if (reason instanceof FontFetchError) {
|
||||||
console.error(`Font fetch failed: ${config.name}`, reason);
|
console.error(`Font fetch failed: ${config.name}`, reason);
|
||||||
}
|
}
|
||||||
@@ -279,7 +283,9 @@ export class AppliedFontsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Removes fonts unused within TTL (LRU-style cleanup). Runs every PURGE_INTERVAL. Pinned fonts are never evicted. */
|
/**
|
||||||
|
* Removes fonts unused within TTL (LRU-style cleanup). Runs every PURGE_INTERVAL. Pinned fonts are never evicted.
|
||||||
|
*/
|
||||||
#purgeUnused() {
|
#purgeUnused() {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
// Iterate through all tracked font keys
|
// Iterate through all tracked font keys
|
||||||
@@ -291,7 +297,9 @@ export class AppliedFontsManager {
|
|||||||
|
|
||||||
// Remove FontFace from document to free memory
|
// Remove FontFace from document to free memory
|
||||||
const font = this.#loadedFonts.get(key);
|
const font = this.#loadedFonts.get(key);
|
||||||
if (font) document.fonts.delete(font);
|
if (font) {
|
||||||
|
document.fonts.delete(font);
|
||||||
|
}
|
||||||
|
|
||||||
// Evict from cache and cleanup URL mapping
|
// Evict from cache and cleanup URL mapping
|
||||||
const url = this.#urlByKey.get(key);
|
const url = this.#urlByKey.get(key);
|
||||||
@@ -307,7 +315,9 @@ export class AppliedFontsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns current loading status for a font, or undefined if never requested. */
|
/**
|
||||||
|
* Returns current loading status for a font, or undefined if never requested.
|
||||||
|
*/
|
||||||
getFontStatus(id: string, weight: number, isVariable = false) {
|
getFontStatus(id: string, weight: number, isVariable = false) {
|
||||||
try {
|
try {
|
||||||
return this.statuses.get(generateFontKey({ id, weight, isVariable }));
|
return this.statuses.get(generateFontKey({ id, weight, isVariable }));
|
||||||
@@ -316,17 +326,23 @@ export class AppliedFontsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Pins a font so it is never evicted by #purgeUnused(), regardless of TTL. */
|
/**
|
||||||
|
* Pins a font so it is never evicted by #purgeUnused(), regardless of TTL.
|
||||||
|
*/
|
||||||
pin(id: string, weight: number, isVariable = false): void {
|
pin(id: string, weight: number, isVariable = false): void {
|
||||||
this.#eviction.pin(generateFontKey({ id, weight, isVariable }));
|
this.#eviction.pin(generateFontKey({ id, weight, isVariable }));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Unpins a font, allowing it to be evicted by #purgeUnused() once its TTL expires. */
|
/**
|
||||||
|
* Unpins a font, allowing it to be evicted by #purgeUnused() once its TTL expires.
|
||||||
|
*/
|
||||||
unpin(id: string, weight: number, isVariable = false): void {
|
unpin(id: string, weight: number, isVariable = false): void {
|
||||||
this.#eviction.unpin(generateFontKey({ id, weight, isVariable }));
|
this.#eviction.unpin(generateFontKey({ id, weight, isVariable }));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Waits for all fonts to finish loading using document.fonts.ready. */
|
/**
|
||||||
|
* Waits for all fonts to finish loading using document.fonts.ready.
|
||||||
|
*/
|
||||||
async ready(): Promise<void> {
|
async ready(): Promise<void> {
|
||||||
if (typeof document === 'undefined') {
|
if (typeof document === 'undefined') {
|
||||||
return;
|
return;
|
||||||
@@ -336,7 +352,9 @@ export class AppliedFontsManager {
|
|||||||
} catch { /* document unloaded */ }
|
} catch { /* document unloaded */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Aborts all operations, removes fonts from document, and clears state. Manager cannot be reused after. */
|
/**
|
||||||
|
* Aborts all operations, removes fonts from document, and clears state. Manager cannot be reused after.
|
||||||
|
*/
|
||||||
destroy() {
|
destroy() {
|
||||||
// Abort all in-flight network requests
|
// Abort all in-flight network requests
|
||||||
this.#abortController.abort();
|
this.#abortController.abort();
|
||||||
@@ -375,5 +393,7 @@ export class AppliedFontsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Singleton instance — use throughout the application for unified font loading state. */
|
/**
|
||||||
|
* Singleton instance — use throughout the application for unified font loading state.
|
||||||
|
*/
|
||||||
export const appliedFontsManager = new AppliedFontsManager();
|
export const appliedFontsManager = new AppliedFontsManager();
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import { FontFetchError } from '../../errors';
|
import { FontFetchError } from '../../errors';
|
||||||
import { FontBufferCache } from './FontBufferCache';
|
import { FontBufferCache } from './FontBufferCache';
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,13 @@ import { FontFetchError } from '../../errors';
|
|||||||
type Fetcher = (url: string, init?: RequestInit) => Promise<Response>;
|
type Fetcher = (url: string, init?: RequestInit) => Promise<Response>;
|
||||||
|
|
||||||
interface FontBufferCacheOptions {
|
interface FontBufferCacheOptions {
|
||||||
/** Custom fetch implementation. Defaults to `globalThis.fetch`. Inject in tests for isolation. */
|
/**
|
||||||
|
* Custom fetch implementation. Defaults to `globalThis.fetch`. Inject in tests for isolation.
|
||||||
|
*/
|
||||||
fetcher?: Fetcher;
|
fetcher?: Fetcher;
|
||||||
/** Cache API cache name. Defaults to `'font-cache-v1'`. */
|
/**
|
||||||
|
* Cache API cache name. Defaults to `'font-cache-v1'`.
|
||||||
|
*/
|
||||||
cacheName?: string;
|
cacheName?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,12 +89,16 @@ export class FontBufferCache {
|
|||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Removes a URL from the in-memory cache. Next call to `get()` will re-fetch. */
|
/**
|
||||||
|
* Removes a URL from the in-memory cache. Next call to `get()` will re-fetch.
|
||||||
|
*/
|
||||||
evict(url: string): void {
|
evict(url: string): void {
|
||||||
this.#buffersByUrl.delete(url);
|
this.#buffersByUrl.delete(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Clears all in-memory cached buffers. */
|
/**
|
||||||
|
* Clears all in-memory cached buffers.
|
||||||
|
*/
|
||||||
clear(): void {
|
clear(): void {
|
||||||
this.#buffersByUrl.clear();
|
this.#buffersByUrl.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
interface FontEvictionPolicyOptions {
|
interface FontEvictionPolicyOptions {
|
||||||
/** TTL in milliseconds. Defaults to 5 minutes. */
|
/**
|
||||||
|
* TTL in milliseconds. Defaults to 5 minutes.
|
||||||
|
*/
|
||||||
ttl?: number;
|
ttl?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,12 +30,16 @@ export class FontEvictionPolicy {
|
|||||||
this.#usageTracker.set(key, now);
|
this.#usageTracker.set(key, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Pins a font key so it is never evicted regardless of TTL. */
|
/**
|
||||||
|
* Pins a font key so it is never evicted regardless of TTL.
|
||||||
|
*/
|
||||||
pin(key: string): void {
|
pin(key: string): void {
|
||||||
this.#pinnedFonts.add(key);
|
this.#pinnedFonts.add(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Unpins a font key, allowing it to be evicted once its TTL expires. */
|
/**
|
||||||
|
* Unpins a font key, allowing it to be evicted once its TTL expires.
|
||||||
|
*/
|
||||||
unpin(key: string): void {
|
unpin(key: string): void {
|
||||||
this.#pinnedFonts.delete(key);
|
this.#pinnedFonts.delete(key);
|
||||||
}
|
}
|
||||||
@@ -57,18 +63,24 @@ export class FontEvictionPolicy {
|
|||||||
return now - lastUsed >= this.#TTL;
|
return now - lastUsed >= this.#TTL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns an iterator over all tracked font keys. */
|
/**
|
||||||
|
* Returns an iterator over all tracked font keys.
|
||||||
|
*/
|
||||||
keys(): IterableIterator<string> {
|
keys(): IterableIterator<string> {
|
||||||
return this.#usageTracker.keys();
|
return this.#usageTracker.keys();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Removes a font key from tracking. Called by the orchestrator after eviction. */
|
/**
|
||||||
|
* Removes a font key from tracking. Called by the orchestrator after eviction.
|
||||||
|
*/
|
||||||
remove(key: string): void {
|
remove(key: string): void {
|
||||||
this.#usageTracker.delete(key);
|
this.#usageTracker.delete(key);
|
||||||
this.#pinnedFonts.delete(key);
|
this.#pinnedFonts.delete(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Clears all usage timestamps and pinned keys. */
|
/**
|
||||||
|
* Clears all usage timestamps and pinned keys.
|
||||||
|
*/
|
||||||
clear(): void {
|
clear(): void {
|
||||||
this.#usageTracker.clear();
|
this.#usageTracker.clear();
|
||||||
this.#pinnedFonts.clear();
|
this.#pinnedFonts.clear();
|
||||||
|
|||||||
@@ -34,22 +34,30 @@ export class FontLoadQueue {
|
|||||||
return entries;
|
return entries;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns `true` if the key is currently in the queue. */
|
/**
|
||||||
|
* Returns `true` if the key is currently in the queue.
|
||||||
|
*/
|
||||||
has(key: string): boolean {
|
has(key: string): boolean {
|
||||||
return this.#queue.has(key);
|
return this.#queue.has(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Increments the retry count for a font key. */
|
/**
|
||||||
|
* Increments the retry count for a font key.
|
||||||
|
*/
|
||||||
incrementRetry(key: string): void {
|
incrementRetry(key: string): void {
|
||||||
this.#retryCounts.set(key, (this.#retryCounts.get(key) ?? 0) + 1);
|
this.#retryCounts.set(key, (this.#retryCounts.get(key) ?? 0) + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns `true` if the font has reached or exceeded the maximum retry limit. */
|
/**
|
||||||
|
* Returns `true` if the font has reached or exceeded the maximum retry limit.
|
||||||
|
*/
|
||||||
isMaxRetriesReached(key: string): boolean {
|
isMaxRetriesReached(key: string): boolean {
|
||||||
return (this.#retryCounts.get(key) ?? 0) >= this.#MAX_RETRIES;
|
return (this.#retryCounts.get(key) ?? 0) >= this.#MAX_RETRIES;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Clears all queued fonts and resets all retry counts. */
|
/**
|
||||||
|
* Clears all queued fonts and resets all retry counts.
|
||||||
|
*/
|
||||||
clear(): void {
|
clear(): void {
|
||||||
this.#queue.clear();
|
this.#queue.clear();
|
||||||
this.#retryCounts.clear();
|
this.#retryCounts.clear();
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import { FontParseError } from '../../errors';
|
import { FontParseError } from '../../errors';
|
||||||
import { loadFont } from './loadFont';
|
import { loadFont } from './loadFont';
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ import type { UnifiedFont } from '../../model/types';
|
|||||||
* Standalone function to avoid 'this' issues during construction.
|
* Standalone function to avoid 'this' issues during construction.
|
||||||
*/
|
*/
|
||||||
async function fetchAndSeed(ids: string[]): Promise<UnifiedFont[]> {
|
async function fetchAndSeed(ids: string[]): Promise<UnifiedFont[]> {
|
||||||
if (ids.length === 0) return [];
|
if (ids.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
let response: UnifiedFont[];
|
let response: UnifiedFont[];
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ describe('FontStore', () => {
|
|||||||
vi.resetAllMocks();
|
vi.resetAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('construction', () => {
|
describe('construction', () => {
|
||||||
it('stores initial params', () => {
|
it('stores initial params', () => {
|
||||||
const store = makeStore({ limit: 20 });
|
const store = makeStore({ limit: 20 });
|
||||||
@@ -90,7 +89,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('state after fetch', () => {
|
describe('state after fetch', () => {
|
||||||
it('exposes loaded fonts', async () => {
|
it('exposes loaded fonts', async () => {
|
||||||
const store = await fetchedStore({}, generateMockFonts(7));
|
const store = await fetchedStore({}, generateMockFonts(7));
|
||||||
@@ -129,7 +127,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('error states', () => {
|
describe('error states', () => {
|
||||||
it('isError is false before any fetch', () => {
|
it('isError is false before any fetch', () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -178,7 +175,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('font accumulation', () => {
|
describe('font accumulation', () => {
|
||||||
it('replaces fonts when refetching the first page', async () => {
|
it('replaces fonts when refetching the first page', async () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -212,7 +208,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('pagination state', () => {
|
describe('pagination state', () => {
|
||||||
it('returns zero-value defaults before any fetch', () => {
|
it('returns zero-value defaults before any fetch', () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -248,7 +243,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('setParams', () => {
|
describe('setParams', () => {
|
||||||
it('merges updates into existing params', () => {
|
it('merges updates into existing params', () => {
|
||||||
const store = makeStore({ limit: 10 });
|
const store = makeStore({ limit: 10 });
|
||||||
@@ -266,7 +260,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('filter change resets', () => {
|
describe('filter change resets', () => {
|
||||||
it('clears accumulated fonts when a filter changes', async () => {
|
it('clears accumulated fonts when a filter changes', async () => {
|
||||||
const store = await fetchedStore({}, generateMockFonts(5));
|
const store = await fetchedStore({}, generateMockFonts(5));
|
||||||
@@ -302,7 +295,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('staleTime in buildOptions', () => {
|
describe('staleTime in buildOptions', () => {
|
||||||
it('is 5 minutes with no active filters', () => {
|
it('is 5 minutes with no active filters', () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -331,7 +323,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('buildQueryKey', () => {
|
describe('buildQueryKey', () => {
|
||||||
it('omits empty-string params', () => {
|
it('omits empty-string params', () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -366,7 +357,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('destroy', () => {
|
describe('destroy', () => {
|
||||||
it('does not throw', () => {
|
it('does not throw', () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -380,7 +370,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('refetch', () => {
|
describe('refetch', () => {
|
||||||
it('triggers a fetch', async () => {
|
it('triggers a fetch', async () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -400,7 +389,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('nextPage', () => {
|
describe('nextPage', () => {
|
||||||
let store: FontStore;
|
let store: FontStore;
|
||||||
|
|
||||||
@@ -437,7 +425,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('prevPage and goToPage', () => {
|
describe('prevPage and goToPage', () => {
|
||||||
it('prevPage is a no-op — infinite scroll does not support backward navigation', async () => {
|
it('prevPage is a no-op — infinite scroll does not support backward navigation', async () => {
|
||||||
const store = await fetchedStore({}, generateMockFonts(5));
|
const store = await fetchedStore({}, generateMockFonts(5));
|
||||||
@@ -454,7 +441,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('prefetch', () => {
|
describe('prefetch', () => {
|
||||||
it('triggers a fetch for the provided params', async () => {
|
it('triggers a fetch for the provided params', async () => {
|
||||||
const store = makeStore();
|
const store = makeStore();
|
||||||
@@ -465,7 +451,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('getCachedData / setQueryData', () => {
|
describe('getCachedData / setQueryData', () => {
|
||||||
it('getCachedData returns undefined before any fetch', () => {
|
it('getCachedData returns undefined before any fetch', () => {
|
||||||
queryClient.clear();
|
queryClient.clear();
|
||||||
@@ -497,7 +482,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('invalidate', () => {
|
describe('invalidate', () => {
|
||||||
it('calls invalidateQueries', async () => {
|
it('calls invalidateQueries', async () => {
|
||||||
const store = await fetchedStore();
|
const store = await fetchedStore();
|
||||||
@@ -508,7 +492,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('setLimit', () => {
|
describe('setLimit', () => {
|
||||||
it('updates the limit param', () => {
|
it('updates the limit param', () => {
|
||||||
const store = makeStore({ limit: 10 });
|
const store = makeStore({ limit: 10 });
|
||||||
@@ -518,7 +501,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('filter shortcut methods', () => {
|
describe('filter shortcut methods', () => {
|
||||||
let store: FontStore;
|
let store: FontStore;
|
||||||
|
|
||||||
@@ -561,7 +543,6 @@ describe('FontStore', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
describe('category getters', () => {
|
describe('category getters', () => {
|
||||||
it('each getter returns only fonts of that category', async () => {
|
it('each getter returns only fonts of that category', async () => {
|
||||||
const fonts = generateMixedCategoryFonts(2); // 2 of each category = 10 total
|
const fonts = generateMixedCategoryFonts(2); // 2 of each category = 10 total
|
||||||
|
|||||||
@@ -18,7 +18,9 @@ import type { UnifiedFont } from '../../types';
|
|||||||
|
|
||||||
type PageParam = { offset: number };
|
type PageParam = { offset: number };
|
||||||
|
|
||||||
/** Filter params + limit — offset is managed by TQ as a page param, not a user param. */
|
/**
|
||||||
|
* Filter params + limit — offset is managed by TQ as a page param, not a user param.
|
||||||
|
*/
|
||||||
type FontStoreParams = Omit<ProxyFontsParams, 'offset'>;
|
type FontStoreParams = Omit<ProxyFontsParams, 'offset'>;
|
||||||
|
|
||||||
type FontStoreResult = InfiniteQueryObserverResult<InfiniteData<ProxyFontsResponse, PageParam>, Error>;
|
type FontStoreResult = InfiniteQueryObserverResult<InfiniteData<ProxyFontsResponse, PageParam>, Error>;
|
||||||
@@ -44,34 +46,53 @@ export class FontStore {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Public state --
|
/**
|
||||||
|
* Current filter and limit configuration
|
||||||
|
*/
|
||||||
get params(): FontStoreParams {
|
get params(): FontStoreParams {
|
||||||
return this.#params;
|
return this.#params;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Flattened list of all fonts loaded across all pages (reactive)
|
||||||
|
*/
|
||||||
get fonts(): UnifiedFont[] {
|
get fonts(): UnifiedFont[] {
|
||||||
return this.#result.data?.pages.flatMap((p: ProxyFontsResponse) => p.fonts) ?? [];
|
return this.#result.data?.pages.flatMap((p: ProxyFontsResponse) => p.fonts) ?? [];
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* True if the first page is currently being fetched
|
||||||
|
*/
|
||||||
get isLoading(): boolean {
|
get isLoading(): boolean {
|
||||||
return this.#result.isLoading;
|
return this.#result.isLoading;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* True if any background fetch is in progress (initial or pagination)
|
||||||
|
*/
|
||||||
get isFetching(): boolean {
|
get isFetching(): boolean {
|
||||||
return this.#result.isFetching;
|
return this.#result.isFetching;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* True if the last fetch attempt resulted in an error
|
||||||
|
*/
|
||||||
get isError(): boolean {
|
get isError(): boolean {
|
||||||
return this.#result.isError;
|
return this.#result.isError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Last caught error from the query observer
|
||||||
|
*/
|
||||||
get error(): Error | null {
|
get error(): Error | null {
|
||||||
return this.#result.error ?? null;
|
return this.#result.error ?? null;
|
||||||
}
|
}
|
||||||
// isEmpty is false during loading/fetching so the UI never flashes "no results"
|
/**
|
||||||
// while a fetch is in progress. The !isFetching guard is specifically for the filter-change
|
* True if no fonts were found for the current filter criteria
|
||||||
// transition: fonts clear synchronously → isFetching becomes true → isEmpty stays false.
|
*/
|
||||||
get isEmpty(): boolean {
|
get isEmpty(): boolean {
|
||||||
return !this.isLoading && !this.isFetching && this.fonts.length === 0;
|
return !this.isLoading && !this.isFetching && this.fonts.length === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pagination metadata derived from the last loaded page
|
||||||
|
*/
|
||||||
get pagination() {
|
get pagination() {
|
||||||
const pages = this.#result.data?.pages;
|
const pages = this.#result.data?.pages;
|
||||||
const last = pages?.at(-1);
|
const last = pages?.at(-1);
|
||||||
@@ -95,45 +116,65 @@ export class FontStore {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Lifecycle --
|
/**
|
||||||
|
* Cleans up subscriptions and destroys the observer
|
||||||
|
*/
|
||||||
destroy() {
|
destroy() {
|
||||||
this.#unsubscribe();
|
this.#unsubscribe();
|
||||||
this.#observer.destroy();
|
this.#observer.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Param management --
|
/**
|
||||||
|
* Merge new parameters into existing state and trigger a refetch
|
||||||
|
*/
|
||||||
setParams(updates: Partial<FontStoreParams>) {
|
setParams(updates: Partial<FontStoreParams>) {
|
||||||
this.#params = { ...this.#params, ...updates };
|
this.#params = { ...this.#params, ...updates };
|
||||||
this.#observer.setOptions(this.buildOptions());
|
this.#observer.setOptions(this.buildOptions());
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Forcefully invalidate and refetch the current query from the network
|
||||||
|
*/
|
||||||
invalidate() {
|
invalidate() {
|
||||||
this.#qc.invalidateQueries({ queryKey: this.buildQueryKey(this.#params) });
|
this.#qc.invalidateQueries({ queryKey: this.buildQueryKey(this.#params) });
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Async operations --
|
/**
|
||||||
|
* Manually trigger a query refetch
|
||||||
|
*/
|
||||||
async refetch() {
|
async refetch() {
|
||||||
await this.#observer.refetch();
|
await this.#observer.refetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prime the cache with data for a specific parameter set
|
||||||
|
*/
|
||||||
async prefetch(params: FontStoreParams) {
|
async prefetch(params: FontStoreParams) {
|
||||||
await this.#qc.prefetchInfiniteQuery(this.buildOptions(params));
|
await this.#qc.prefetchInfiniteQuery(this.buildOptions(params));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Abort any active network requests for this store
|
||||||
|
*/
|
||||||
cancel() {
|
cancel() {
|
||||||
this.#qc.cancelQueries({ queryKey: this.buildQueryKey(this.#params) });
|
this.#qc.cancelQueries({ queryKey: this.buildQueryKey(this.#params) });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve current font list from cache without triggering a fetch
|
||||||
|
*/
|
||||||
getCachedData(): UnifiedFont[] | undefined {
|
getCachedData(): UnifiedFont[] | undefined {
|
||||||
const data = this.#qc.getQueryData<InfiniteData<ProxyFontsResponse, PageParam>>(
|
const data = this.#qc.getQueryData<InfiniteData<ProxyFontsResponse, PageParam>>(
|
||||||
this.buildQueryKey(this.#params),
|
this.buildQueryKey(this.#params),
|
||||||
);
|
);
|
||||||
if (!data) return undefined;
|
if (!data) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
return data.pages.flatMap(p => p.fonts);
|
return data.pages.flatMap(p => p.fonts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manually update the cached font data (useful for optimistic updates)
|
||||||
|
*/
|
||||||
setQueryData(updater: (old: UnifiedFont[] | undefined) => UnifiedFont[]) {
|
setQueryData(updater: (old: UnifiedFont[] | undefined) => UnifiedFont[]) {
|
||||||
const key = this.buildQueryKey(this.#params);
|
const key = this.buildQueryKey(this.#params);
|
||||||
this.#qc.setQueryData<InfiniteData<ProxyFontsResponse, PageParam>>(
|
this.#qc.setQueryData<InfiniteData<ProxyFontsResponse, PageParam>>(
|
||||||
@@ -164,56 +205,90 @@ export class FontStore {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Filter shortcuts --
|
/**
|
||||||
|
* Shortcut to update provider filters
|
||||||
|
*/
|
||||||
setProviders(v: ProxyFontsParams['providers']) {
|
setProviders(v: ProxyFontsParams['providers']) {
|
||||||
this.setParams({ providers: v });
|
this.setParams({ providers: v });
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Shortcut to update category filters
|
||||||
|
*/
|
||||||
setCategories(v: ProxyFontsParams['categories']) {
|
setCategories(v: ProxyFontsParams['categories']) {
|
||||||
this.setParams({ categories: v });
|
this.setParams({ categories: v });
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Shortcut to update subset filters
|
||||||
|
*/
|
||||||
setSubsets(v: ProxyFontsParams['subsets']) {
|
setSubsets(v: ProxyFontsParams['subsets']) {
|
||||||
this.setParams({ subsets: v });
|
this.setParams({ subsets: v });
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Shortcut to update search query
|
||||||
|
*/
|
||||||
setSearch(v: string) {
|
setSearch(v: string) {
|
||||||
this.setParams({ q: v || undefined });
|
this.setParams({ q: v || undefined });
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Shortcut to update sort order
|
||||||
|
*/
|
||||||
setSort(v: ProxyFontsParams['sort']) {
|
setSort(v: ProxyFontsParams['sort']) {
|
||||||
this.setParams({ sort: v });
|
this.setParams({ sort: v });
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Pagination navigation --
|
/**
|
||||||
|
* Fetch the next page of results if available
|
||||||
|
*/
|
||||||
async nextPage(): Promise<void> {
|
async nextPage(): Promise<void> {
|
||||||
await this.#observer.fetchNextPage();
|
await this.#observer.fetchNextPage();
|
||||||
}
|
}
|
||||||
prevPage(): void {} // no-op: infinite scroll accumulates forward only; method kept for API compatibility
|
/**
|
||||||
goToPage(_page: number): void {} // no-op
|
* Backward pagination (no-op: infinite scroll accumulates forward only)
|
||||||
|
*/
|
||||||
|
prevPage(): void {}
|
||||||
|
/**
|
||||||
|
* Jump to specific page (no-op for infinite scroll)
|
||||||
|
*/
|
||||||
|
goToPage(_page: number): void {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the number of items fetched per page
|
||||||
|
*/
|
||||||
setLimit(limit: number) {
|
setLimit(limit: number) {
|
||||||
this.setParams({ limit });
|
this.setParams({ limit });
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Category views --
|
/**
|
||||||
|
* Derived list of sans-serif fonts in the current set
|
||||||
|
*/
|
||||||
get sansSerifFonts() {
|
get sansSerifFonts() {
|
||||||
return this.fonts.filter(f => f.category === 'sans-serif');
|
return this.fonts.filter(f => f.category === 'sans-serif');
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Derived list of serif fonts in the current set
|
||||||
|
*/
|
||||||
get serifFonts() {
|
get serifFonts() {
|
||||||
return this.fonts.filter(f => f.category === 'serif');
|
return this.fonts.filter(f => f.category === 'serif');
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Derived list of display fonts in the current set
|
||||||
|
*/
|
||||||
get displayFonts() {
|
get displayFonts() {
|
||||||
return this.fonts.filter(f => f.category === 'display');
|
return this.fonts.filter(f => f.category === 'display');
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Derived list of handwriting fonts in the current set
|
||||||
|
*/
|
||||||
get handwritingFonts() {
|
get handwritingFonts() {
|
||||||
return this.fonts.filter(f => f.category === 'handwriting');
|
return this.fonts.filter(f => f.category === 'handwriting');
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Derived list of monospace fonts in the current set
|
||||||
|
*/
|
||||||
get monospaceFonts() {
|
get monospaceFonts() {
|
||||||
return this.fonts.filter(f => f.category === 'monospace');
|
return this.fonts.filter(f => f.category === 'monospace');
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Private helpers (TypeScript-private so tests can spy via `as any`) --
|
|
||||||
|
|
||||||
private buildQueryKey(params: FontStoreParams): readonly unknown[] {
|
private buildQueryKey(params: FontStoreParams): readonly unknown[] {
|
||||||
const filtered: Record<string, any> = {};
|
const filtered: Record<string, any> = {};
|
||||||
|
|
||||||
@@ -263,9 +338,15 @@ export class FontStore {
|
|||||||
throw new FontNetworkError(cause);
|
throw new FontNetworkError(cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!response) throw new FontResponseError('response', response);
|
if (!response) {
|
||||||
if (!response.fonts) throw new FontResponseError('response.fonts', response.fonts);
|
throw new FontResponseError('response', response);
|
||||||
if (!Array.isArray(response.fonts)) throw new FontResponseError('response.fonts', response.fonts);
|
}
|
||||||
|
if (!response.fonts) {
|
||||||
|
throw new FontResponseError('response.fonts', response.fonts);
|
||||||
|
}
|
||||||
|
if (!Array.isArray(response.fonts)) {
|
||||||
|
throw new FontResponseError('response.fonts', response.fonts);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fonts: response.fonts,
|
fonts: response.fonts,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// Applied fonts manager
|
// Applied fonts manager
|
||||||
export { appliedFontsManager } from './appliedFontsStore/appliedFontsStore.svelte';
|
export * from './appliedFontsStore/appliedFontsStore.svelte';
|
||||||
|
|
||||||
// Batch font store
|
// Batch font store
|
||||||
export { BatchFontStore } from './batchFontStore.svelte';
|
export { BatchFontStore } from './batchFontStore.svelte';
|
||||||
|
|||||||
@@ -31,18 +31,28 @@ export type FontSubset = 'latin' | 'latin-ext' | 'cyrillic' | 'greek' | 'arabic'
|
|||||||
* Combined filter state for font queries
|
* Combined filter state for font queries
|
||||||
*/
|
*/
|
||||||
export interface FontFilters {
|
export interface FontFilters {
|
||||||
/** Selected font providers */
|
/**
|
||||||
|
* Active font providers to fetch from
|
||||||
|
*/
|
||||||
providers: FontProvider[];
|
providers: FontProvider[];
|
||||||
/** Selected font categories */
|
/**
|
||||||
|
* Visual classifications (sans, serif, etc.)
|
||||||
|
*/
|
||||||
categories: FontCategory[];
|
categories: FontCategory[];
|
||||||
/** Selected character subsets */
|
/**
|
||||||
|
* Character sets required for the sample text
|
||||||
|
*/
|
||||||
subsets: FontSubset[];
|
subsets: FontSubset[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Filter group identifier */
|
/**
|
||||||
|
* Filter group identifier
|
||||||
|
*/
|
||||||
export type FilterGroup = 'providers' | 'categories' | 'subsets';
|
export type FilterGroup = 'providers' | 'categories' | 'subsets';
|
||||||
|
|
||||||
/** Filter type including search query */
|
/**
|
||||||
|
* Filter type including search query
|
||||||
|
*/
|
||||||
export type FilterType = FilterGroup | 'searchQuery';
|
export type FilterType = FilterGroup | 'searchQuery';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -80,15 +90,25 @@ export type UnifiedFontVariant = FontVariant;
|
|||||||
* Font style URLs
|
* Font style URLs
|
||||||
*/
|
*/
|
||||||
export interface FontStyleUrls {
|
export interface FontStyleUrls {
|
||||||
/** Regular weight URL */
|
/**
|
||||||
|
* URL for the regular (400) weight
|
||||||
|
*/
|
||||||
regular?: string;
|
regular?: string;
|
||||||
/** Italic URL */
|
/**
|
||||||
|
* URL for the italic (400) style
|
||||||
|
*/
|
||||||
italic?: string;
|
italic?: string;
|
||||||
/** Bold weight URL */
|
/**
|
||||||
|
* URL for the bold (700) weight
|
||||||
|
*/
|
||||||
bold?: string;
|
bold?: string;
|
||||||
/** Bold italic URL */
|
/**
|
||||||
|
* URL for the bold-italic (700) style
|
||||||
|
*/
|
||||||
boldItalic?: string;
|
boldItalic?: string;
|
||||||
/** Additional variant mapping */
|
/**
|
||||||
|
* Mapping for all other numeric/custom variants
|
||||||
|
*/
|
||||||
variants?: Partial<Record<UnifiedFontVariant, string>>;
|
variants?: Partial<Record<UnifiedFontVariant, string>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,19 +116,24 @@ export interface FontStyleUrls {
|
|||||||
* Font metadata
|
* Font metadata
|
||||||
*/
|
*/
|
||||||
export interface FontMetadata {
|
export interface FontMetadata {
|
||||||
/** Timestamp when font was cached */
|
/**
|
||||||
|
* Epoch timestamp of last successful fetch
|
||||||
|
*/
|
||||||
cachedAt: number;
|
cachedAt: number;
|
||||||
/** Font version from provider */
|
/**
|
||||||
|
* Semantic version string from upstream
|
||||||
|
*/
|
||||||
version?: string;
|
version?: string;
|
||||||
/** Last modified date from provider */
|
/**
|
||||||
|
* ISO date string of last remote update
|
||||||
|
*/
|
||||||
lastModified?: string;
|
lastModified?: string;
|
||||||
/** Popularity rank (if available from provider) */
|
/**
|
||||||
|
* Raw ranking integer from provider
|
||||||
|
*/
|
||||||
popularity?: number;
|
popularity?: number;
|
||||||
/**
|
/**
|
||||||
* Normalized popularity score (0-100)
|
* Normalized score (0-100) used for global sorting
|
||||||
*
|
|
||||||
* Normalized across all fonts for consistent ranking
|
|
||||||
* Higher values indicate more popular fonts
|
|
||||||
*/
|
*/
|
||||||
popularityScore?: number;
|
popularityScore?: number;
|
||||||
}
|
}
|
||||||
@@ -117,17 +142,38 @@ export interface FontMetadata {
|
|||||||
* Font features (variable fonts, axes, tags)
|
* Font features (variable fonts, axes, tags)
|
||||||
*/
|
*/
|
||||||
export interface FontFeatures {
|
export interface FontFeatures {
|
||||||
/** Whether this is a variable font */
|
/**
|
||||||
|
* Whether the font supports fluid weight/width axes
|
||||||
|
*/
|
||||||
isVariable?: boolean;
|
isVariable?: boolean;
|
||||||
/** Variable font axes (for Fontshare) */
|
/**
|
||||||
|
* Definable axes for variable font interpolation
|
||||||
|
*/
|
||||||
axes?: Array<{
|
axes?: Array<{
|
||||||
|
/**
|
||||||
|
* Human-readable axis name (e.g., 'Weight')
|
||||||
|
*/
|
||||||
name: string;
|
name: string;
|
||||||
|
/**
|
||||||
|
* CSS property name (e.g., 'wght')
|
||||||
|
*/
|
||||||
property: string;
|
property: string;
|
||||||
|
/**
|
||||||
|
* Default numeric value for the axis
|
||||||
|
*/
|
||||||
default: number;
|
default: number;
|
||||||
|
/**
|
||||||
|
* Minimum inclusive bound
|
||||||
|
*/
|
||||||
min: number;
|
min: number;
|
||||||
|
/**
|
||||||
|
* Maximum inclusive bound
|
||||||
|
*/
|
||||||
max: number;
|
max: number;
|
||||||
}>;
|
}>;
|
||||||
/** Usage tags (for Fontshare) */
|
/**
|
||||||
|
* Descriptive keywords for search indexing
|
||||||
|
*/
|
||||||
tags?: string[];
|
tags?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,29 +184,44 @@ export interface FontFeatures {
|
|||||||
* for consistent font handling across the application.
|
* for consistent font handling across the application.
|
||||||
*/
|
*/
|
||||||
export interface UnifiedFont {
|
export interface UnifiedFont {
|
||||||
/** Unique identifier (Google: family name, Fontshare: slug) */
|
/**
|
||||||
|
* Unique ID (family name for Google, slug for Fontshare)
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
/** Font display name */
|
/**
|
||||||
|
* Canonical family name for CSS font-family
|
||||||
|
*/
|
||||||
name: string;
|
name: string;
|
||||||
/** Font provider (google | fontshare) */
|
/**
|
||||||
|
* Upstream data source
|
||||||
|
*/
|
||||||
provider: FontProvider;
|
provider: FontProvider;
|
||||||
/**
|
/**
|
||||||
* Provider badge display name
|
* Display label for provider badges
|
||||||
*
|
|
||||||
* Human-readable provider name for UI display
|
|
||||||
* e.g., "Google Fonts" or "Fontshare"
|
|
||||||
*/
|
*/
|
||||||
providerBadge?: string;
|
providerBadge?: string;
|
||||||
/** Font category classification */
|
/**
|
||||||
|
* Primary typographic category
|
||||||
|
*/
|
||||||
category: FontCategory;
|
category: FontCategory;
|
||||||
/** Supported character subsets */
|
/**
|
||||||
|
* All supported character sets
|
||||||
|
*/
|
||||||
subsets: FontSubset[];
|
subsets: FontSubset[];
|
||||||
/** Available font variants (weights, styles) */
|
/**
|
||||||
|
* List of available weights and styles
|
||||||
|
*/
|
||||||
variants: UnifiedFontVariant[];
|
variants: UnifiedFontVariant[];
|
||||||
/** URL mapping for font file downloads */
|
/**
|
||||||
|
* Remote assets for font loading
|
||||||
|
*/
|
||||||
styles: FontStyleUrls;
|
styles: FontStyleUrls;
|
||||||
/** Additional metadata */
|
/**
|
||||||
|
* Technical metadata and rankings
|
||||||
|
*/
|
||||||
metadata: FontMetadata;
|
metadata: FontMetadata;
|
||||||
/** Advanced font features */
|
/**
|
||||||
|
* Variable font details and tags
|
||||||
|
*/
|
||||||
features: FontFeatures;
|
features: FontFeatures;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,3 @@
|
|||||||
/**
|
|
||||||
* ============================================================================
|
|
||||||
* SINGLE EXPORT POINT
|
|
||||||
* ============================================================================
|
|
||||||
*
|
|
||||||
* This is the single export point for all Font types.
|
|
||||||
* All imports should use: `import { X } from '$entities/Font/model/types'`
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Font domain and model types
|
// Font domain and model types
|
||||||
export type {
|
export type {
|
||||||
FilterGroup,
|
FilterGroup,
|
||||||
@@ -33,3 +24,4 @@ export type {
|
|||||||
} from './store';
|
} from './store';
|
||||||
|
|
||||||
export * from './store/appliedFonts';
|
export * from './store/appliedFonts';
|
||||||
|
export * from './typography';
|
||||||
|
|||||||
@@ -1,9 +1,3 @@
|
|||||||
/**
|
|
||||||
* ============================================================================
|
|
||||||
* STORE TYPES
|
|
||||||
* ============================================================================
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
FontCategory,
|
FontCategory,
|
||||||
FontProvider,
|
FontProvider,
|
||||||
@@ -12,37 +6,55 @@ import type {
|
|||||||
} from './font';
|
} from './font';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Font collection state
|
* Global state for the local font collection
|
||||||
*/
|
*/
|
||||||
export interface FontCollectionState {
|
export interface FontCollectionState {
|
||||||
/** All cached fonts */
|
/**
|
||||||
|
* Map of cached fonts indexed by their unique family ID
|
||||||
|
*/
|
||||||
fonts: Record<string, UnifiedFont>;
|
fonts: Record<string, UnifiedFont>;
|
||||||
/** Active filters */
|
/**
|
||||||
|
* Set of active user-defined filters
|
||||||
|
*/
|
||||||
filters: FontCollectionFilters;
|
filters: FontCollectionFilters;
|
||||||
/** Sort configuration */
|
/**
|
||||||
|
* Current sorting parameters for the display list
|
||||||
|
*/
|
||||||
sort: FontCollectionSort;
|
sort: FontCollectionSort;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Font collection filters
|
* Filter configuration for narrow collections
|
||||||
*/
|
*/
|
||||||
export interface FontCollectionFilters {
|
export interface FontCollectionFilters {
|
||||||
/** Search query */
|
/**
|
||||||
|
* Partial family name to match against
|
||||||
|
*/
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
/** Filter by providers */
|
/**
|
||||||
|
* Data sources (Google, Fontshare) to include
|
||||||
|
*/
|
||||||
providers?: FontProvider[];
|
providers?: FontProvider[];
|
||||||
/** Filter by categories */
|
/**
|
||||||
|
* Typographic categories (Serif, Sans, etc.) to include
|
||||||
|
*/
|
||||||
categories?: FontCategory[];
|
categories?: FontCategory[];
|
||||||
/** Filter by subsets */
|
/**
|
||||||
|
* Character sets (Latin, Cyrillic, etc.) to include
|
||||||
|
*/
|
||||||
subsets?: FontSubset[];
|
subsets?: FontSubset[];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Font collection sort configuration
|
* Ordering configuration for the font list
|
||||||
*/
|
*/
|
||||||
export interface FontCollectionSort {
|
export interface FontCollectionSort {
|
||||||
/** Sort field */
|
/**
|
||||||
|
* The font property to order by
|
||||||
|
*/
|
||||||
field: 'name' | 'popularity' | 'category';
|
field: 'name' | 'popularity' | 'category';
|
||||||
/** Sort direction */
|
/**
|
||||||
|
* The sort order (Ascending or Descending)
|
||||||
|
*/
|
||||||
direction: 'asc' | 'desc';
|
direction: 'asc' | 'desc';
|
||||||
}
|
}
|
||||||
|
|||||||
1
src/entities/Font/model/types/typography.ts
Normal file
1
src/entities/Font/model/types/typography.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export type ControlId = 'font_size' | 'font_weight' | 'line_height' | 'letter_spacing';
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<script module>
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import FontApplicator from './FontApplicator.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Entities/FontApplicator',
|
||||||
|
component: FontApplicator,
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Loads a font and applies it to children. Shows blur/scale loading state until font is ready, then reveals with a smooth transition.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'centered',
|
||||||
|
},
|
||||||
|
argTypes: {
|
||||||
|
weight: { control: 'number' },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { mockUnifiedFont } from '$entities/Font/lib/mocks';
|
||||||
|
import type { ComponentProps } from 'svelte';
|
||||||
|
|
||||||
|
const fontUnknown = mockUnifiedFont({ id: 'nonexistent-font-xk92z', name: 'Nonexistent Font Xk92z' });
|
||||||
|
|
||||||
|
const fontArial = mockUnifiedFont({ id: 'arial', name: 'Arial' });
|
||||||
|
|
||||||
|
const fontArialBold = mockUnifiedFont({ id: 'arial-bold', name: 'Arial' });
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Loading State"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Font that has never been loaded by appliedFontsManager. The component renders in its pending state: blurred, scaled down, and semi-transparent.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ font: fontUnknown, weight: 400 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontApplicator>)}
|
||||||
|
<FontApplicator {...args}>
|
||||||
|
<p class="text-xl">The quick brown fox jumps over the lazy dog</p>
|
||||||
|
</FontApplicator>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Loaded State"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Uses Arial, a system font available in all browsers. Because appliedFontsManager has not loaded it via FontFace, the manager status may remain pending — meaning the blur/scale state may still show. In a real app the manager would load the font and transition to the revealed state.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ font: fontArial, weight: 400 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontApplicator>)}
|
||||||
|
<FontApplicator {...args}>
|
||||||
|
<p class="text-xl">The quick brown fox jumps over the lazy dog</p>
|
||||||
|
</FontApplicator>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Custom Weight"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Demonstrates passing a custom weight (700). The weight is forwarded to appliedFontsManager for font resolution; visually identical to the loaded state story until the manager confirms the font.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ font: fontArialBold, weight: 700 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontApplicator>)}
|
||||||
|
<FontApplicator {...args}>
|
||||||
|
<p class="text-xl">The quick brown fox jumps over the lazy dog</p>
|
||||||
|
</FontApplicator>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -6,10 +6,11 @@
|
|||||||
- Adds smooth transition when font appears
|
- Adds smooth transition when font appears
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils';
|
import clsx from 'clsx';
|
||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
import { prefersReducedMotion } from 'svelte/motion';
|
import { prefersReducedMotion } from 'svelte/motion';
|
||||||
import {
|
import {
|
||||||
|
DEFAULT_FONT_WEIGHT,
|
||||||
type UnifiedFont,
|
type UnifiedFont,
|
||||||
appliedFontsManager,
|
appliedFontsManager,
|
||||||
} from '../../model';
|
} from '../../model';
|
||||||
@@ -36,7 +37,7 @@ interface Props {
|
|||||||
|
|
||||||
let {
|
let {
|
||||||
font,
|
font,
|
||||||
weight = 400,
|
weight = DEFAULT_FONT_WEIGHT,
|
||||||
className,
|
className,
|
||||||
children,
|
children,
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
@@ -63,7 +64,7 @@ const transitionClasses = $derived(
|
|||||||
style:font-family={shouldReveal
|
style:font-family={shouldReveal
|
||||||
? `'${font.name}'`
|
? `'${font.name}'`
|
||||||
: 'system-ui, -apple-system, sans-serif'}
|
: 'system-ui, -apple-system, sans-serif'}
|
||||||
class={cn(
|
class={clsx(
|
||||||
transitionClasses,
|
transitionClasses,
|
||||||
// If reduced motion is on, we skip the transform/blur entirely
|
// If reduced motion is on, we skip the transform/blur entirely
|
||||||
!shouldReveal
|
!shouldReveal
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
<script module>
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import FontVirtualList from './FontVirtualList.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Entities/FontVirtualList',
|
||||||
|
component: FontVirtualList,
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Virtualized font list backed by the `fontStore` singleton. Handles font loading registration (pin/touch) for visible items and triggers infinite scroll pagination via `fontStore.nextPage()`. Because the component reads directly from the `fontStore` singleton, stories render against a live (but empty/loading) store — no font data will appear unless the API is reachable from the Storybook host.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'padded',
|
||||||
|
},
|
||||||
|
argTypes: {
|
||||||
|
weight: { control: 'number', description: 'Font weight applied to visible fonts' },
|
||||||
|
itemHeight: { control: 'number', description: 'Height of each list item in pixels' },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import type { ComponentProps } from 'svelte';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Loading Skeleton"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Skeleton state shown while `fontStore.fonts` is empty and `fontStore.isLoading` is true. In a real session the skeleton fades out once the first page loads.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ weight: 400, itemHeight: 72 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontVirtualList>)}
|
||||||
|
<div class="h-[400px] w-full">
|
||||||
|
<FontVirtualList {...args}>
|
||||||
|
{#snippet skeleton()}
|
||||||
|
<div class="flex flex-col gap-2 p-4">
|
||||||
|
{#each Array(6) as _}
|
||||||
|
<div class="h-16 animate-pulse rounded bg-neutral-200"></div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
{#snippet children({ item })}
|
||||||
|
<div class="border-b border-neutral-100 p-3">{item.name}</div>
|
||||||
|
{/snippet}
|
||||||
|
</FontVirtualList>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="Empty State"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'No `skeleton` snippet provided. When `fontStore.fonts` is empty the underlying VirtualList renders its empty state directly.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ weight: 400, itemHeight: 72 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontVirtualList>)}
|
||||||
|
<div class="h-[400px] w-full">
|
||||||
|
<FontVirtualList {...args}>
|
||||||
|
{#snippet children({ item })}
|
||||||
|
<div class="border-b border-neutral-100 p-3">{item.name}</div>
|
||||||
|
{/snippet}
|
||||||
|
</FontVirtualList>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story
|
||||||
|
name="With Item Renderer"
|
||||||
|
parameters={{
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
story:
|
||||||
|
'Demonstrates how to configure a `children` snippet for item rendering. The list will be empty because `fontStore` is not populated in Storybook, but the template shows the expected slot shape: `{ item: UnifiedFont }`.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
args={{ weight: 400, itemHeight: 80 }}
|
||||||
|
>
|
||||||
|
{#snippet template(args: ComponentProps<typeof FontVirtualList>)}
|
||||||
|
<div class="h-[400px] w-full">
|
||||||
|
<FontVirtualList {...args}>
|
||||||
|
{#snippet skeleton()}
|
||||||
|
<div class="flex flex-col gap-2 p-4">
|
||||||
|
{#each Array(6) as _}
|
||||||
|
<div class="h-16 animate-pulse rounded bg-neutral-200"></div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
{#snippet children({ item })}
|
||||||
|
<div class="flex items-center justify-between border-b border-neutral-100 px-4 py-3">
|
||||||
|
<span class="text-sm font-medium">{item.name}</span>
|
||||||
|
<span class="text-xs text-neutral-400">{item.category}</span>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
</FontVirtualList>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -18,8 +18,8 @@ import {
|
|||||||
type FontLoadRequestConfig,
|
type FontLoadRequestConfig,
|
||||||
type UnifiedFont,
|
type UnifiedFont,
|
||||||
appliedFontsManager,
|
appliedFontsManager,
|
||||||
|
fontStore,
|
||||||
} from '../../model';
|
} from '../../model';
|
||||||
import { fontStore } from '../../model/store';
|
|
||||||
|
|
||||||
interface Props extends
|
interface Props extends
|
||||||
Omit<
|
Omit<
|
||||||
@@ -53,30 +53,44 @@ const isLoading = $derived(
|
|||||||
fontStore.isFetching || fontStore.isLoading,
|
fontStore.isFetching || fontStore.isLoading,
|
||||||
);
|
);
|
||||||
|
|
||||||
function handleInternalVisibleChange(visibleItems: UnifiedFont[]) {
|
let visibleFonts = $state<UnifiedFont[]>([]);
|
||||||
const configs: FontLoadRequestConfig[] = [];
|
|
||||||
|
|
||||||
visibleItems.forEach(item => {
|
|
||||||
const url = getFontUrl(item, weight);
|
|
||||||
|
|
||||||
if (url) {
|
|
||||||
configs.push({
|
|
||||||
id: item.id,
|
|
||||||
name: item.name,
|
|
||||||
weight,
|
|
||||||
url,
|
|
||||||
isVariable: item.features?.isVariable,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Auto-register fonts with the manager
|
|
||||||
appliedFontsManager.touch(configs);
|
|
||||||
|
|
||||||
|
function handleInternalVisibleChange(items: UnifiedFont[]) {
|
||||||
|
visibleFonts = items;
|
||||||
// Forward the call to any external listener
|
// Forward the call to any external listener
|
||||||
// onVisibleItemsChange?.(visibleItems);
|
onVisibleItemsChange?.(items);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Re-touch whenever visible set or weight changes — fixes weight-change gap
|
||||||
|
$effect(() => {
|
||||||
|
const configs: FontLoadRequestConfig[] = visibleFonts.flatMap(item => {
|
||||||
|
const url = getFontUrl(item, weight);
|
||||||
|
if (!url) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
return [{ id: item.id, name: item.name, weight, url, isVariable: item.features?.isVariable }];
|
||||||
|
});
|
||||||
|
if (configs.length > 0) {
|
||||||
|
appliedFontsManager.touch(configs);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Pin visible fonts so the eviction policy never removes on-screen entries.
|
||||||
|
// Cleanup captures the snapshot values, so a weight change unpins the old
|
||||||
|
// weight before pinning the new one.
|
||||||
|
$effect(() => {
|
||||||
|
const w = weight;
|
||||||
|
const fonts = visibleFonts;
|
||||||
|
for (const f of fonts) {
|
||||||
|
appliedFontsManager.pin(f.id, w, f.features?.isVariable);
|
||||||
|
}
|
||||||
|
return () => {
|
||||||
|
for (const f of fonts) {
|
||||||
|
appliedFontsManager.unpin(f.id, w, f.features?.isVariable);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load more fonts by moving to the next page
|
* Load more fonts by moving to the next page
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -41,15 +41,25 @@ type ThemeSource = 'system' | 'user';
|
|||||||
*/
|
*/
|
||||||
class ThemeManager {
|
class ThemeManager {
|
||||||
// Private reactive state
|
// Private reactive state
|
||||||
/** Current theme value ('light' or 'dark') */
|
/**
|
||||||
|
* Current theme value ('light' or 'dark')
|
||||||
|
*/
|
||||||
#theme = $state<Theme>('light');
|
#theme = $state<Theme>('light');
|
||||||
/** Whether theme is controlled by user or follows system */
|
/**
|
||||||
|
* Whether theme is controlled by user or follows system
|
||||||
|
*/
|
||||||
#source = $state<ThemeSource>('system');
|
#source = $state<ThemeSource>('system');
|
||||||
/** MediaQueryList for detecting system theme changes */
|
/**
|
||||||
|
* MediaQueryList for detecting system theme changes
|
||||||
|
*/
|
||||||
#mediaQuery: MediaQueryList | null = null;
|
#mediaQuery: MediaQueryList | null = null;
|
||||||
/** Persistent storage for user's theme preference */
|
/**
|
||||||
|
* Persistent storage for user's theme preference
|
||||||
|
*/
|
||||||
#store = createPersistentStore<Theme | null>('glyphdiff:theme', null);
|
#store = createPersistentStore<Theme | null>('glyphdiff:theme', null);
|
||||||
/** Bound handler for system theme change events */
|
/**
|
||||||
|
* Bound handler for system theme change events
|
||||||
|
*/
|
||||||
#systemChangeHandler = this.#onSystemChange.bind(this);
|
#systemChangeHandler = this.#onSystemChange.bind(this);
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
@@ -64,22 +74,30 @@ class ThemeManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Current theme value */
|
/**
|
||||||
|
* Current theme value
|
||||||
|
*/
|
||||||
get value(): Theme {
|
get value(): Theme {
|
||||||
return this.#theme;
|
return this.#theme;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Source of current theme ('system' or 'user') */
|
/**
|
||||||
|
* Source of current theme ('system' or 'user')
|
||||||
|
*/
|
||||||
get source(): ThemeSource {
|
get source(): ThemeSource {
|
||||||
return this.#source;
|
return this.#source;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether dark theme is active */
|
/**
|
||||||
|
* Whether dark theme is active
|
||||||
|
*/
|
||||||
get isDark(): boolean {
|
get isDark(): boolean {
|
||||||
return this.#theme === 'dark';
|
return this.#theme === 'dark';
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether theme is controlled by user (not following system) */
|
/**
|
||||||
|
* Whether theme is controlled by user (not following system)
|
||||||
|
*/
|
||||||
get isUserControlled(): boolean {
|
get isUserControlled(): boolean {
|
||||||
return this.#source === 'user';
|
return this.#source === 'user';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// Mock MediaQueryListEvent for system theme change simulations
|
// Mock MediaQueryListEvent for system theme change simulations
|
||||||
// Note: Other mocks (ResizeObserver, localStorage, matchMedia) are set up in vitest.setup.unit.ts
|
// Note: Other mocks (ResizeObserver, localStorage, matchMedia) are set up in vitest.setup.unit.ts
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
class MockMediaQueryListEvent extends Event {
|
class MockMediaQueryListEvent extends Event {
|
||||||
matches: boolean;
|
matches: boolean;
|
||||||
@@ -16,9 +16,7 @@ class MockMediaQueryListEvent extends Event {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================================
|
|
||||||
// NOW IT'S SAFE TO IMPORT
|
// NOW IT'S SAFE TO IMPORT
|
||||||
// ============================================================
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
afterEach,
|
afterEach,
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import {
|
||||||
|
fireEvent,
|
||||||
|
render,
|
||||||
|
screen,
|
||||||
|
} from '@testing-library/svelte';
|
||||||
|
import { themeManager } from '../../model';
|
||||||
|
import ThemeSwitch from './ThemeSwitch.svelte';
|
||||||
|
|
||||||
|
const context = new Map([['responsive', { isMobile: false }]]);
|
||||||
|
|
||||||
|
describe('ThemeSwitch', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
themeManager.setTheme('light');
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Rendering', () => {
|
||||||
|
it('renders an icon button', () => {
|
||||||
|
render(ThemeSwitch, { context });
|
||||||
|
expect(screen.getByRole('button')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('has "Toggle theme" title', () => {
|
||||||
|
render(ThemeSwitch, { context });
|
||||||
|
expect(screen.getByTitle('Toggle theme')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders an SVG icon', () => {
|
||||||
|
const { container } = render(ThemeSwitch, { context });
|
||||||
|
expect(container.querySelector('svg')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Interaction', () => {
|
||||||
|
it('toggles theme from light to dark on click', async () => {
|
||||||
|
render(ThemeSwitch, { context });
|
||||||
|
expect(themeManager.value).toBe('light');
|
||||||
|
await fireEvent.click(screen.getByRole('button'));
|
||||||
|
expect(themeManager.value).toBe('dark');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toggles theme from dark to light on click', async () => {
|
||||||
|
themeManager.setTheme('dark');
|
||||||
|
render(ThemeSwitch, { context });
|
||||||
|
await fireEvent.click(screen.getByRole('button'));
|
||||||
|
expect(themeManager.value).toBe('light');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('double click returns to original theme', async () => {
|
||||||
|
render(ThemeSwitch, { context });
|
||||||
|
const btn = screen.getByRole('button');
|
||||||
|
await fireEvent.click(btn);
|
||||||
|
await fireEvent.click(btn);
|
||||||
|
expect(themeManager.value).toBe('light');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -35,7 +35,7 @@ const { Story } = defineMeta({
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { UnifiedFont } from '$entities/Font';
|
import type { UnifiedFont } from '$entities/Font';
|
||||||
import { controlManager } from '$features/SetupFont';
|
import type { ComponentProps } from 'svelte';
|
||||||
|
|
||||||
// Mock fonts for testing
|
// Mock fonts for testing
|
||||||
const mockArial: UnifiedFont = {
|
const mockArial: UnifiedFont = {
|
||||||
@@ -89,7 +89,7 @@ const mockGeorgia: UnifiedFont = {
|
|||||||
index: 0,
|
index: 0,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{#snippet template(args)}
|
{#snippet template(args: ComponentProps<typeof FontSampler>)}
|
||||||
<Providers>
|
<Providers>
|
||||||
<div class="max-w-2xl mx-auto">
|
<div class="max-w-2xl mx-auto">
|
||||||
<FontSampler {...args} />
|
<FontSampler {...args} />
|
||||||
@@ -106,7 +106,7 @@ const mockGeorgia: UnifiedFont = {
|
|||||||
index: 1,
|
index: 1,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{#snippet template(args)}
|
{#snippet template(args: ComponentProps<typeof FontSampler>)}
|
||||||
<Providers>
|
<Providers>
|
||||||
<div class="max-w-2xl mx-auto">
|
<div class="max-w-2xl mx-auto">
|
||||||
<FontSampler {...args} />
|
<FontSampler {...args} />
|
||||||
|
|||||||
@@ -8,14 +8,13 @@ import {
|
|||||||
FontApplicator,
|
FontApplicator,
|
||||||
type UnifiedFont,
|
type UnifiedFont,
|
||||||
} from '$entities/Font';
|
} from '$entities/Font';
|
||||||
import { controlManager } from '$features/SetupFont';
|
import { typographySettingsStore } from '$features/SetupFont/model';
|
||||||
import {
|
import {
|
||||||
Badge,
|
Badge,
|
||||||
ContentEditable,
|
ContentEditable,
|
||||||
Divider,
|
Divider,
|
||||||
Footnote,
|
Footnote,
|
||||||
Stat,
|
Stat,
|
||||||
StatGroup,
|
|
||||||
} from '$shared/ui';
|
} from '$shared/ui';
|
||||||
import { fly } from 'svelte/transition';
|
import { fly } from 'svelte/transition';
|
||||||
|
|
||||||
@@ -37,11 +36,6 @@ interface Props {
|
|||||||
|
|
||||||
let { font, text = $bindable(), index = 0 }: Props = $props();
|
let { font, text = $bindable(), index = 0 }: Props = $props();
|
||||||
|
|
||||||
const fontWeight = $derived(controlManager.weight);
|
|
||||||
const fontSize = $derived(controlManager.renderedSize);
|
|
||||||
const lineHeight = $derived(controlManager.height);
|
|
||||||
const letterSpacing = $derived(controlManager.spacing);
|
|
||||||
|
|
||||||
// Adjust the property name to match your UnifiedFont type
|
// Adjust the property name to match your UnifiedFont type
|
||||||
const fontType = $derived((font as any).type ?? (font as any).category ?? '');
|
const fontType = $derived((font as any).type ?? (font as any).category ?? '');
|
||||||
|
|
||||||
@@ -52,10 +46,10 @@ const providerBadge = $derived(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const stats = $derived([
|
const stats = $derived([
|
||||||
{ label: 'SZ', value: `${fontSize}PX` },
|
{ label: 'SZ', value: `${typographySettingsStore.renderedSize}PX` },
|
||||||
{ label: 'WGT', value: `${fontWeight}` },
|
{ label: 'WGT', value: `${typographySettingsStore.weight}` },
|
||||||
{ label: 'LH', value: lineHeight?.toFixed(2) },
|
{ label: 'LH', value: typographySettingsStore.height?.toFixed(2) },
|
||||||
{ label: 'LTR', value: `${letterSpacing}` },
|
{ label: 'LTR', value: `${typographySettingsStore.spacing}` },
|
||||||
]);
|
]);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -65,7 +59,7 @@ const stats = $derived([
|
|||||||
group relative
|
group relative
|
||||||
w-full h-full
|
w-full h-full
|
||||||
bg-paper dark:bg-dark-card
|
bg-paper dark:bg-dark-card
|
||||||
border border-black/5 dark:border-white/10
|
border border-subtle
|
||||||
hover:border-brand dark:hover:border-brand
|
hover:border-brand dark:hover:border-brand
|
||||||
hover:shadow-brand/10
|
hover:shadow-brand/10
|
||||||
hover:shadow-[5px_5px_0px_0px]
|
hover:shadow-[5px_5px_0px_0px]
|
||||||
@@ -75,20 +69,20 @@ const stats = $derived([
|
|||||||
min-h-60
|
min-h-60
|
||||||
rounded-none
|
rounded-none
|
||||||
"
|
"
|
||||||
style:font-weight={fontWeight}
|
style:font-weight={typographySettingsStore.weight}
|
||||||
>
|
>
|
||||||
<!-- ── Header bar ─────────────────────────────────────────────────── -->
|
<!-- ── Header bar ─────────────────────────────────────────────────── -->
|
||||||
<div
|
<div
|
||||||
class="
|
class="
|
||||||
flex items-center justify-between
|
flex items-center justify-between
|
||||||
px-4 sm:px-5 md:px-6 py-3 sm:py-4
|
px-4 sm:px-5 md:px-6 py-3 sm:py-4
|
||||||
border-b border-black/5 dark:border-white/10
|
border-b border-subtle
|
||||||
bg-paper dark:bg-dark-card
|
bg-paper dark:bg-dark-card
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<!-- Left: index · name · type badge · provider badge -->
|
<!-- Left: index · name · type badge · provider badge -->
|
||||||
<div class="flex items-center gap-2 sm:gap-4 min-w-0 shrink-0">
|
<div class="flex items-center gap-2 sm:gap-4 min-w-0 shrink-0">
|
||||||
<span class="font-mono text-[0.625rem] tracking-widest text-neutral-400 uppercase leading-none shrink-0">
|
<span class="font-mono text-2xs tracking-widest text-neutral-400 uppercase leading-none shrink-0">
|
||||||
{String(index + 1).padStart(2, '0')}
|
{String(index + 1).padStart(2, '0')}
|
||||||
</span>
|
</span>
|
||||||
<Divider orientation="vertical" class="h-3 shrink-0" />
|
<Divider orientation="vertical" class="h-3 shrink-0" />
|
||||||
@@ -100,14 +94,14 @@ const stats = $derived([
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
{#if fontType}
|
{#if fontType}
|
||||||
<Badge size="xs" variant="default" class="text-nowrap font-mono">
|
<Badge size="xs" variant="default" nowrap>
|
||||||
{fontType}
|
{fontType}
|
||||||
</Badge>
|
</Badge>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- Provider badge -->
|
<!-- Provider badge -->
|
||||||
{#if providerBadge}
|
{#if providerBadge}
|
||||||
<Badge size="xs" variant="default" class="text-nowrap font-mono" data-provider={font.provider}>
|
<Badge size="xs" variant="default" nowrap data-provider={font.provider}>
|
||||||
{providerBadge}
|
{providerBadge}
|
||||||
</Badge>
|
</Badge>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -140,20 +134,20 @@ const stats = $derived([
|
|||||||
|
|
||||||
<!-- ── Main content area ──────────────────────────────────────────── -->
|
<!-- ── Main content area ──────────────────────────────────────────── -->
|
||||||
<div class="flex-1 p-4 sm:p-5 md:p-8 flex items-center overflow-hidden bg-paper dark:bg-dark-card relative z-10">
|
<div class="flex-1 p-4 sm:p-5 md:p-8 flex items-center overflow-hidden bg-paper dark:bg-dark-card relative z-10">
|
||||||
<FontApplicator {font} weight={fontWeight}>
|
<FontApplicator {font} weight={typographySettingsStore.weight}>
|
||||||
<ContentEditable
|
<ContentEditable
|
||||||
bind:text
|
bind:text
|
||||||
{fontSize}
|
fontSize={typographySettingsStore.renderedSize}
|
||||||
{lineHeight}
|
lineHeight={typographySettingsStore.height}
|
||||||
{letterSpacing}
|
letterSpacing={typographySettingsStore.spacing}
|
||||||
/>
|
/>
|
||||||
</FontApplicator>
|
</FontApplicator>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ── Mobile stats footer (md:hidden — header stats take over above) -->
|
<!-- ── Mobile stats footer (md:hidden — header stats take over above) -->
|
||||||
<div class="md:hidden px-4 sm:px-5 py-1.5 sm:py-2 border-t border-black/5 dark:border-white/10 flex gap-2 sm:gap-4 bg-paper dark:bg-dark-card mt-auto">
|
<div class="md:hidden px-4 sm:px-5 py-1.5 sm:py-2 border-t border-subtle flex gap-2 sm:gap-4 bg-paper dark:bg-dark-card mt-auto">
|
||||||
{#each stats as stat, i}
|
{#each stats as stat, i}
|
||||||
<Footnote class="text-[0.4375rem] sm:text-[0.5rem] tracking-wider {i === 0 ? 'ml-auto' : ''}">
|
<Footnote class="text-5xs sm:text-4xs tracking-wider {i === 0 ? 'ml-auto' : ''}">
|
||||||
{stat.label}:{stat.value}
|
{stat.label}:{stat.value}
|
||||||
</Footnote>
|
</Footnote>
|
||||||
{#if i < stats.length - 1}
|
{#if i < stats.length - 1}
|
||||||
|
|||||||
@@ -15,19 +15,29 @@ const PROXY_API_URL = 'https://api.glyphdiff.com/api/v1/filters' as const;
|
|||||||
* Filter metadata type from backend
|
* Filter metadata type from backend
|
||||||
*/
|
*/
|
||||||
export interface FilterMetadata {
|
export interface FilterMetadata {
|
||||||
/** Filter ID (e.g., "providers", "categories", "subsets") */
|
/**
|
||||||
|
* Filter ID (e.g., "providers", "categories", "subsets")
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
/** Display name (e.g., "Font Providers", "Categories", "Character Subsets") */
|
/**
|
||||||
|
* Display name (e.g., "Font Providers", "Categories", "Character Subsets")
|
||||||
|
*/
|
||||||
name: string;
|
name: string;
|
||||||
|
|
||||||
/** Filter description */
|
/**
|
||||||
|
* Filter description
|
||||||
|
*/
|
||||||
description: string;
|
description: string;
|
||||||
|
|
||||||
/** Filter type */
|
/**
|
||||||
|
* Filter type
|
||||||
|
*/
|
||||||
type: 'enum' | 'string' | 'array';
|
type: 'enum' | 'string' | 'array';
|
||||||
|
|
||||||
/** Available filter options */
|
/**
|
||||||
|
* Available filter options
|
||||||
|
*/
|
||||||
options: FilterOption[];
|
options: FilterOption[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,16 +45,24 @@ export interface FilterMetadata {
|
|||||||
* Filter option type
|
* Filter option type
|
||||||
*/
|
*/
|
||||||
export interface FilterOption {
|
export interface FilterOption {
|
||||||
/** Option ID (e.g., "google", "serif", "latin") */
|
/**
|
||||||
|
* Option ID (e.g., "google", "serif", "latin")
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
/** Display name (e.g., "Google Fonts", "Serif", "Latin") */
|
/**
|
||||||
|
* Display name (e.g., "Google Fonts", "Serif", "Latin")
|
||||||
|
*/
|
||||||
name: string;
|
name: string;
|
||||||
|
|
||||||
/** Option value (e.g., "google", "serif", "latin") */
|
/**
|
||||||
|
* Option value (e.g., "google", "serif", "latin")
|
||||||
|
*/
|
||||||
value: string;
|
value: string;
|
||||||
|
|
||||||
/** Number of fonts with this value */
|
/**
|
||||||
|
* Number of fonts with this value
|
||||||
|
*/
|
||||||
count: number;
|
count: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,7 +70,9 @@ export interface FilterOption {
|
|||||||
* Proxy filters API response
|
* Proxy filters API response
|
||||||
*/
|
*/
|
||||||
export interface ProxyFiltersResponse {
|
export interface ProxyFiltersResponse {
|
||||||
/** Array of filter metadata */
|
/**
|
||||||
|
* Array of filter metadata
|
||||||
|
*/
|
||||||
filters: FilterMetadata[];
|
filters: FilterMetadata[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,56 @@
|
|||||||
export type {
|
export type {
|
||||||
|
/**
|
||||||
|
* Top-level configuration for all filters
|
||||||
|
*/
|
||||||
FilterConfig,
|
FilterConfig,
|
||||||
|
/**
|
||||||
|
* Configuration for a single grouping of filter properties
|
||||||
|
*/
|
||||||
FilterGroupConfig,
|
FilterGroupConfig,
|
||||||
} from './types/filter';
|
} from './types/filter';
|
||||||
|
|
||||||
export { filtersStore } from './state/filters.svelte';
|
/**
|
||||||
export { filterManager } from './state/manager.svelte';
|
* Global reactive filter state
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Low-level property selection store
|
||||||
|
*/
|
||||||
|
filtersStore,
|
||||||
|
} from './state/filters.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Main filter controller
|
||||||
|
*/
|
||||||
|
export {
|
||||||
|
/**
|
||||||
|
* High-level manager for syncing search and filters
|
||||||
|
*/
|
||||||
|
filterManager,
|
||||||
|
} from './state/manager.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sorting logic
|
||||||
|
*/
|
||||||
|
export {
|
||||||
|
/**
|
||||||
|
* Map of human-readable labels to API sort keys
|
||||||
|
*/
|
||||||
SORT_MAP,
|
SORT_MAP,
|
||||||
|
/**
|
||||||
|
* List of all available sort options for the UI
|
||||||
|
*/
|
||||||
SORT_OPTIONS,
|
SORT_OPTIONS,
|
||||||
|
/**
|
||||||
|
* Valid sort key values
|
||||||
|
*/
|
||||||
type SortApiValue,
|
type SortApiValue,
|
||||||
|
/**
|
||||||
|
* UI model for a single sort option
|
||||||
|
*/
|
||||||
type SortOption,
|
type SortOption,
|
||||||
|
/**
|
||||||
|
* Reactive store for the current sort selection
|
||||||
|
*/
|
||||||
sortStore,
|
sortStore,
|
||||||
} from './store/sortStore.svelte';
|
} from './store/sortStore.svelte';
|
||||||
|
|||||||
@@ -32,13 +32,19 @@ import {
|
|||||||
* Provides reactive access to filter data
|
* Provides reactive access to filter data
|
||||||
*/
|
*/
|
||||||
class FiltersStore {
|
class FiltersStore {
|
||||||
/** TanStack Query result state */
|
/**
|
||||||
|
* TanStack Query result state
|
||||||
|
*/
|
||||||
protected result = $state<QueryObserverResult<FilterMetadata[], Error>>({} as any);
|
protected result = $state<QueryObserverResult<FilterMetadata[], Error>>({} as any);
|
||||||
|
|
||||||
/** TanStack Query observer instance */
|
/**
|
||||||
|
* TanStack Query observer instance
|
||||||
|
*/
|
||||||
protected observer: QueryObserver<FilterMetadata[], Error>;
|
protected observer: QueryObserver<FilterMetadata[], Error>;
|
||||||
|
|
||||||
/** Shared query client */
|
/**
|
||||||
|
* Shared query client
|
||||||
|
*/
|
||||||
protected qc = queryClient;
|
protected qc = queryClient;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -21,17 +21,23 @@ function createSortStore(initial: SortOption = 'Popularity') {
|
|||||||
let current = $state<SortOption>(initial);
|
let current = $state<SortOption>(initial);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
/** Current display label (e.g. 'Popularity') */
|
/**
|
||||||
|
* Current display label (e.g. 'Popularity')
|
||||||
|
*/
|
||||||
get value() {
|
get value() {
|
||||||
return current;
|
return current;
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Mapped API value (e.g. 'popularity') */
|
/**
|
||||||
|
* Mapped API value (e.g. 'popularity')
|
||||||
|
*/
|
||||||
get apiValue(): SortApiValue {
|
get apiValue(): SortApiValue {
|
||||||
return SORT_MAP[current];
|
return SORT_MAP[current];
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Set the active sort option by its display label */
|
/**
|
||||||
|
* Set the active sort option by its display label
|
||||||
|
*/
|
||||||
set(option: SortOption) {
|
set(option: SortOption) {
|
||||||
current = option;
|
current = option;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,12 +1,27 @@
|
|||||||
import type { Property } from '$shared/lib';
|
import type { Property } from '$shared/lib';
|
||||||
|
|
||||||
export interface FilterGroupConfig<TValue extends string> {
|
export interface FilterGroupConfig<TValue extends string> {
|
||||||
|
/**
|
||||||
|
* Unique identifier for the filter group (e.g. 'categories')
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
|
/**
|
||||||
|
* Human-readable label displayed in the UI header
|
||||||
|
*/
|
||||||
label: string;
|
label: string;
|
||||||
|
/**
|
||||||
|
* List of toggleable properties within this group
|
||||||
|
*/
|
||||||
properties: Property<TValue>[];
|
properties: Property<TValue>[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface FilterConfig<TValue extends string> {
|
export interface FilterConfig<TValue extends string> {
|
||||||
|
/**
|
||||||
|
* Optional string to filter results by name
|
||||||
|
*/
|
||||||
queryValue?: string;
|
queryValue?: string;
|
||||||
|
/**
|
||||||
|
* Collection of filter groups to display
|
||||||
|
*/
|
||||||
groups: FilterGroupConfig<TValue>[];
|
groups: FilterGroupConfig<TValue>[];
|
||||||
}
|
}
|
||||||
|
|||||||
26
src/features/GetFonts/ui/Filters/Filters.stories.svelte
Normal file
26
src/features/GetFonts/ui/Filters/Filters.stories.svelte
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<script module>
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import Filters from './Filters.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Features/Filters',
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Renders the full list of filter groups managed by filterManager. Each group maps to a collapsible FilterGroup with checkboxes. No props — reads directly from the filterManager singleton.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'padded',
|
||||||
|
},
|
||||||
|
argTypes: {},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story name="Default">
|
||||||
|
{#snippet template()}
|
||||||
|
<Filters />
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
63
src/features/GetFonts/ui/Filters/Filters.svelte.test.ts
Normal file
63
src/features/GetFonts/ui/Filters/Filters.svelte.test.ts
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
import { filterManager } from '$features/GetFonts';
|
||||||
|
import {
|
||||||
|
render,
|
||||||
|
screen,
|
||||||
|
} from '@testing-library/svelte';
|
||||||
|
import Filters from './Filters.svelte';
|
||||||
|
|
||||||
|
describe('Filters', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
filterManager.setGroups([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Rendering', () => {
|
||||||
|
it('renders nothing when filter groups are empty', () => {
|
||||||
|
const { container } = render(Filters);
|
||||||
|
expect(container.firstElementChild).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders a label for each filter group', () => {
|
||||||
|
filterManager.setGroups([
|
||||||
|
{ id: 'cat', label: 'Category', properties: [] },
|
||||||
|
{ id: 'prov', label: 'Provider', properties: [] },
|
||||||
|
]);
|
||||||
|
render(Filters);
|
||||||
|
expect(screen.getByText('Category')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Provider')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders filter properties within groups', () => {
|
||||||
|
filterManager.setGroups([
|
||||||
|
{
|
||||||
|
id: 'cat',
|
||||||
|
label: 'Category',
|
||||||
|
properties: [
|
||||||
|
{ id: 'serif', name: 'Serif', value: 'serif', selected: false },
|
||||||
|
{ id: 'sans', name: 'Sans-Serif', value: 'sans-serif', selected: false },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
render(Filters);
|
||||||
|
expect(screen.getByText('Serif')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Sans-Serif')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders multiple groups with their properties', () => {
|
||||||
|
filterManager.setGroups([
|
||||||
|
{
|
||||||
|
id: 'cat',
|
||||||
|
label: 'Category',
|
||||||
|
properties: [{ id: 'mono', name: 'Monospace', value: 'monospace', selected: false }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'prov',
|
||||||
|
label: 'Provider',
|
||||||
|
properties: [{ id: 'google', name: 'Google', value: 'google', selected: false }],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
render(Filters);
|
||||||
|
expect(screen.getByText('Monospace')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Google')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<script module>
|
||||||
|
import Providers from '$shared/lib/storybook/Providers.svelte';
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import FilterControls from './FilterControls.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Features/FilterControls',
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Sort options and Reset_Filters button rendered below the filter list. Reads sort state from sortStore and dispatches resets via filterManager. Requires responsive context — wrap with Providers.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'padded',
|
||||||
|
},
|
||||||
|
argTypes: {},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story name="Default">
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<FilterControls />
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story name="Mobile layout">
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<div style="width: 375px;">
|
||||||
|
<FilterControls />
|
||||||
|
</div>
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -6,10 +6,10 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { fontStore } from '$entities/Font';
|
import { fontStore } from '$entities/Font';
|
||||||
import type { ResponsiveManager } from '$shared/lib';
|
import type { ResponsiveManager } from '$shared/lib';
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils';
|
|
||||||
import { Button } from '$shared/ui';
|
import { Button } from '$shared/ui';
|
||||||
import { Label } from '$shared/ui';
|
import { Label } from '$shared/ui';
|
||||||
import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
|
import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
|
||||||
|
import clsx from 'clsx';
|
||||||
import {
|
import {
|
||||||
getContext,
|
getContext,
|
||||||
untrack,
|
untrack,
|
||||||
@@ -45,7 +45,7 @@ function handleReset() {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class={cn(
|
class={clsx(
|
||||||
'flex flex-col md:flex-row justify-between items-start md:items-center',
|
'flex flex-col md:flex-row justify-between items-start md:items-center',
|
||||||
'gap-1 md:gap-6',
|
'gap-1 md:gap-6',
|
||||||
'pt-6 mt-6 md:pt-8 md:mt-8',
|
'pt-6 mt-6 md:pt-8 md:mt-8',
|
||||||
@@ -61,13 +61,10 @@ function handleReset() {
|
|||||||
{#each SORT_OPTIONS as option}
|
{#each SORT_OPTIONS as option}
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size={isMobileOrTabletPortrait ? 'sm' : 'md'}
|
size={isMobileOrTabletPortrait ? 'xs' : 'sm'}
|
||||||
active={sortStore.value === option}
|
active={sortStore.value === option}
|
||||||
onclick={() => sortStore.set(option)}
|
onclick={() => sortStore.set(option)}
|
||||||
class={cn(
|
class="tracking-wide px-0"
|
||||||
'font-bold uppercase tracking-wide font-primary, px-0',
|
|
||||||
isMobileOrTabletPortrait ? 'text-[0.5625rem]' : 'text-[0.625rem]',
|
|
||||||
)}
|
|
||||||
>
|
>
|
||||||
{option}
|
{option}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -78,12 +75,9 @@ function handleReset() {
|
|||||||
<!-- Reset_Filters -->
|
<!-- Reset_Filters -->
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size={isMobileOrTabletPortrait ? 'sm' : 'md'}
|
size={isMobileOrTabletPortrait ? 'xs' : 'sm'}
|
||||||
onclick={handleReset}
|
onclick={handleReset}
|
||||||
class={cn(
|
class={clsx('group font-mono tracking-widest text-neutral-400', isMobileOrTabletPortrait && 'px-0')}
|
||||||
'group text-[0.5625rem] md:text-[0.625rem] font-mono font-bold uppercase tracking-widest text-neutral-400',
|
|
||||||
isMobileOrTabletPortrait && 'px-0',
|
|
||||||
)}
|
|
||||||
iconPosition="left"
|
iconPosition="left"
|
||||||
>
|
>
|
||||||
{#snippet icon()}
|
{#snippet icon()}
|
||||||
|
|||||||
@@ -1,28 +1,6 @@
|
|||||||
export { TypographyMenu } from './ui';
|
|
||||||
|
|
||||||
export {
|
export {
|
||||||
type ControlId,
|
createTypographySettingsManager,
|
||||||
controlManager,
|
type TypographySettingsManager,
|
||||||
DEFAULT_FONT_SIZE,
|
|
||||||
DEFAULT_FONT_WEIGHT,
|
|
||||||
DEFAULT_LETTER_SPACING,
|
|
||||||
DEFAULT_LINE_HEIGHT,
|
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
|
||||||
FONT_SIZE_STEP,
|
|
||||||
FONT_WEIGHT_STEP,
|
|
||||||
LINE_HEIGHT_STEP,
|
|
||||||
MAX_FONT_SIZE,
|
|
||||||
MAX_FONT_WEIGHT,
|
|
||||||
MAX_LINE_HEIGHT,
|
|
||||||
MIN_FONT_SIZE,
|
|
||||||
MIN_FONT_WEIGHT,
|
|
||||||
MIN_LINE_HEIGHT,
|
|
||||||
MULTIPLIER_L,
|
|
||||||
MULTIPLIER_M,
|
|
||||||
MULTIPLIER_S,
|
|
||||||
} from './model';
|
|
||||||
|
|
||||||
export {
|
|
||||||
createTypographyControlManager,
|
|
||||||
type TypographyControlManager,
|
|
||||||
} from './lib';
|
} from './lib';
|
||||||
|
export { typographySettingsStore } from './model';
|
||||||
|
export { TypographyMenu } from './ui';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
export {
|
export {
|
||||||
createTypographyControlManager,
|
createTypographySettingsManager,
|
||||||
type TypographyControlManager,
|
type TypographySettingsManager,
|
||||||
} from './controlManager/controlManager.svelte';
|
} from './settingsManager/settingsManager.svelte';
|
||||||
|
|||||||
@@ -10,6 +10,13 @@
|
|||||||
* when displaying/editing, but the base size is what's stored.
|
* when displaying/editing, but the base size is what's stored.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import {
|
||||||
|
type ControlId,
|
||||||
|
DEFAULT_FONT_SIZE,
|
||||||
|
DEFAULT_FONT_WEIGHT,
|
||||||
|
DEFAULT_LETTER_SPACING,
|
||||||
|
DEFAULT_LINE_HEIGHT,
|
||||||
|
} from '$entities/Font';
|
||||||
import {
|
import {
|
||||||
type ControlDataModel,
|
type ControlDataModel,
|
||||||
type ControlModel,
|
type ControlModel,
|
||||||
@@ -19,20 +26,16 @@ import {
|
|||||||
createTypographyControl,
|
createTypographyControl,
|
||||||
} from '$shared/lib';
|
} from '$shared/lib';
|
||||||
import { SvelteMap } from 'svelte/reactivity';
|
import { SvelteMap } from 'svelte/reactivity';
|
||||||
import {
|
|
||||||
type ControlId,
|
|
||||||
DEFAULT_FONT_SIZE,
|
|
||||||
DEFAULT_FONT_WEIGHT,
|
|
||||||
DEFAULT_LETTER_SPACING,
|
|
||||||
DEFAULT_LINE_HEIGHT,
|
|
||||||
} from '../../model';
|
|
||||||
|
|
||||||
type ControlOnlyFields<T extends string = string> = Omit<ControlModel<T>, keyof ControlDataModel>;
|
type ControlOnlyFields<T extends string = string> = Omit<ControlModel<T>, keyof ControlDataModel>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A control with its instance
|
* A control with its associated instance
|
||||||
*/
|
*/
|
||||||
export interface Control extends ControlOnlyFields<ControlId> {
|
export interface Control extends ControlOnlyFields<ControlId> {
|
||||||
|
/**
|
||||||
|
* The reactive typography control instance
|
||||||
|
*/
|
||||||
instance: TypographyControl;
|
instance: TypographyControl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,9 +43,21 @@ export interface Control extends ControlOnlyFields<ControlId> {
|
|||||||
* Storage schema for typography settings
|
* Storage schema for typography settings
|
||||||
*/
|
*/
|
||||||
export interface TypographySettings {
|
export interface TypographySettings {
|
||||||
|
/**
|
||||||
|
* Base font size (User preference, unscaled)
|
||||||
|
*/
|
||||||
fontSize: number;
|
fontSize: number;
|
||||||
|
/**
|
||||||
|
* Numeric font weight (100-900)
|
||||||
|
*/
|
||||||
fontWeight: number;
|
fontWeight: number;
|
||||||
|
/**
|
||||||
|
* Line height multiplier (e.g. 1.5)
|
||||||
|
*/
|
||||||
lineHeight: number;
|
lineHeight: number;
|
||||||
|
/**
|
||||||
|
* Letter spacing in em/px
|
||||||
|
*/
|
||||||
letterSpacing: number;
|
letterSpacing: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,14 +67,22 @@ export interface TypographySettings {
|
|||||||
* Manages multiple typography controls with persistent storage and
|
* Manages multiple typography controls with persistent storage and
|
||||||
* responsive scaling support for font size.
|
* responsive scaling support for font size.
|
||||||
*/
|
*/
|
||||||
export class TypographyControlManager {
|
export class TypographySettingsManager {
|
||||||
/** Map of controls keyed by ID */
|
/**
|
||||||
|
* Internal map of reactive controls keyed by their identifier
|
||||||
|
*/
|
||||||
#controls = new SvelteMap<string, Control>();
|
#controls = new SvelteMap<string, Control>();
|
||||||
/** Responsive multiplier for font size display */
|
/**
|
||||||
|
* Global multiplier for responsive font size scaling
|
||||||
|
*/
|
||||||
#multiplier = $state(1);
|
#multiplier = $state(1);
|
||||||
/** Persistent storage for settings */
|
/**
|
||||||
|
* LocalStorage-backed storage for persistence
|
||||||
|
*/
|
||||||
#storage: PersistentStore<TypographySettings>;
|
#storage: PersistentStore<TypographySettings>;
|
||||||
/** Base font size (user preference, unscaled) */
|
/**
|
||||||
|
* The underlying font size before responsive scaling is applied
|
||||||
|
*/
|
||||||
#baseSize = $state(DEFAULT_FONT_SIZE);
|
#baseSize = $state(DEFAULT_FONT_SIZE);
|
||||||
|
|
||||||
constructor(configs: ControlModel<ControlId>[], storage: PersistentStore<TypographySettings>) {
|
constructor(configs: ControlModel<ControlId>[], storage: PersistentStore<TypographySettings>) {
|
||||||
@@ -105,7 +128,9 @@ export class TypographyControlManager {
|
|||||||
// This handles the "Multiplier" logic specifically for the Font Size Control
|
// This handles the "Multiplier" logic specifically for the Font Size Control
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
const ctrl = this.#controls.get('font_size')?.instance;
|
const ctrl = this.#controls.get('font_size')?.instance;
|
||||||
if (!ctrl) return;
|
if (!ctrl) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// If the user moves the slider/clicks buttons in the UI:
|
// If the user moves the slider/clicks buttons in the UI:
|
||||||
// We update the baseSize (User Intent)
|
// We update the baseSize (User Intent)
|
||||||
@@ -124,26 +149,35 @@ export class TypographyControlManager {
|
|||||||
* Gets initial value for a control from storage or defaults
|
* Gets initial value for a control from storage or defaults
|
||||||
*/
|
*/
|
||||||
#getInitialValue(id: string, saved: TypographySettings): number {
|
#getInitialValue(id: string, saved: TypographySettings): number {
|
||||||
if (id === 'font_size') return saved.fontSize * this.#multiplier;
|
if (id === 'font_size') {
|
||||||
if (id === 'font_weight') return saved.fontWeight;
|
return saved.fontSize * this.#multiplier;
|
||||||
if (id === 'line_height') return saved.lineHeight;
|
}
|
||||||
if (id === 'letter_spacing') return saved.letterSpacing;
|
if (id === 'font_weight') {
|
||||||
|
return saved.fontWeight;
|
||||||
|
}
|
||||||
|
if (id === 'line_height') {
|
||||||
|
return saved.lineHeight;
|
||||||
|
}
|
||||||
|
if (id === 'letter_spacing') {
|
||||||
|
return saved.letterSpacing;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Current multiplier for responsive scaling */
|
/**
|
||||||
|
* Active scaling factor for the rendered font size
|
||||||
|
*/
|
||||||
get multiplier() {
|
get multiplier() {
|
||||||
return this.#multiplier;
|
return this.#multiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the multiplier and update font size display
|
* Updates the multiplier and recalculates dependent control values
|
||||||
*
|
|
||||||
* When multiplier changes, the font size control's display value
|
|
||||||
* is updated to reflect the new scale while preserving base size.
|
|
||||||
*/
|
*/
|
||||||
set multiplier(value: number) {
|
set multiplier(value: number) {
|
||||||
if (this.#multiplier === value) return;
|
if (this.#multiplier === value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.#multiplier = value;
|
this.#multiplier = value;
|
||||||
|
|
||||||
// When multiplier changes, we must update the Font Size Control's display value
|
// When multiplier changes, we must update the Font Size Control's display value
|
||||||
@@ -154,14 +188,15 @@ export class TypographyControlManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The scaled size for CSS usage
|
* The actual pixel value for CSS font-size (baseSize * multiplier)
|
||||||
* Returns baseSize * multiplier for actual rendering
|
|
||||||
*/
|
*/
|
||||||
get renderedSize() {
|
get renderedSize() {
|
||||||
return this.#baseSize * this.#multiplier;
|
return this.#baseSize * this.#multiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The base size (User Preference) */
|
/**
|
||||||
|
* The raw font size preference before scaling
|
||||||
|
*/
|
||||||
get baseSize() {
|
get baseSize() {
|
||||||
return this.#baseSize;
|
return this.#baseSize;
|
||||||
}
|
}
|
||||||
@@ -169,49 +204,69 @@ export class TypographyControlManager {
|
|||||||
set baseSize(val: number) {
|
set baseSize(val: number) {
|
||||||
this.#baseSize = val;
|
this.#baseSize = val;
|
||||||
const ctrl = this.#controls.get('font_size')?.instance;
|
const ctrl = this.#controls.get('font_size')?.instance;
|
||||||
if (ctrl) ctrl.value = val * this.#multiplier;
|
if (ctrl) {
|
||||||
|
ctrl.value = val * this.#multiplier;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Getters for controls
|
* List of all managed typography controls
|
||||||
*/
|
*/
|
||||||
get controls() {
|
get controls() {
|
||||||
return Array.from(this.#controls.values());
|
return Array.from(this.#controls.values());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reactive instance for weight manipulation
|
||||||
|
*/
|
||||||
get weightControl() {
|
get weightControl() {
|
||||||
return this.#controls.get('font_weight')?.instance;
|
return this.#controls.get('font_weight')?.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reactive instance for size manipulation
|
||||||
|
*/
|
||||||
get sizeControl() {
|
get sizeControl() {
|
||||||
return this.#controls.get('font_size')?.instance;
|
return this.#controls.get('font_size')?.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reactive instance for line-height manipulation
|
||||||
|
*/
|
||||||
get heightControl() {
|
get heightControl() {
|
||||||
return this.#controls.get('line_height')?.instance;
|
return this.#controls.get('line_height')?.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reactive instance for letter-spacing manipulation
|
||||||
|
*/
|
||||||
get spacingControl() {
|
get spacingControl() {
|
||||||
return this.#controls.get('letter_spacing')?.instance;
|
return this.#controls.get('letter_spacing')?.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Getters for values (besides font-size)
|
* Current numeric font weight (reactive)
|
||||||
*/
|
*/
|
||||||
get weight() {
|
get weight() {
|
||||||
return this.#controls.get('font_weight')?.instance.value ?? DEFAULT_FONT_WEIGHT;
|
return this.#controls.get('font_weight')?.instance.value ?? DEFAULT_FONT_WEIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Current numeric line height (reactive)
|
||||||
|
*/
|
||||||
get height() {
|
get height() {
|
||||||
return this.#controls.get('line_height')?.instance.value ?? DEFAULT_LINE_HEIGHT;
|
return this.#controls.get('line_height')?.instance.value ?? DEFAULT_LINE_HEIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Current numeric letter spacing (reactive)
|
||||||
|
*/
|
||||||
get spacing() {
|
get spacing() {
|
||||||
return this.#controls.get('letter_spacing')?.instance.value ?? DEFAULT_LETTER_SPACING;
|
return this.#controls.get('letter_spacing')?.instance.value ?? DEFAULT_LETTER_SPACING;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset all controls to default values
|
* Reset all controls to project-defined defaults
|
||||||
*/
|
*/
|
||||||
reset() {
|
reset() {
|
||||||
this.#storage.clear();
|
this.#storage.clear();
|
||||||
@@ -227,9 +282,15 @@ export class TypographyControlManager {
|
|||||||
// Map storage key to control id
|
// Map storage key to control id
|
||||||
const key = c.id.replace('_', '') as keyof TypographySettings;
|
const key = c.id.replace('_', '') as keyof TypographySettings;
|
||||||
// Simplified for brevity, you'd map these properly:
|
// Simplified for brevity, you'd map these properly:
|
||||||
if (c.id === 'font_weight') c.instance.value = defaults.fontWeight;
|
if (c.id === 'font_weight') {
|
||||||
if (c.id === 'line_height') c.instance.value = defaults.lineHeight;
|
c.instance.value = defaults.fontWeight;
|
||||||
if (c.id === 'letter_spacing') c.instance.value = defaults.letterSpacing;
|
}
|
||||||
|
if (c.id === 'line_height') {
|
||||||
|
c.instance.value = defaults.lineHeight;
|
||||||
|
}
|
||||||
|
if (c.id === 'letter_spacing') {
|
||||||
|
c.instance.value = defaults.letterSpacing;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -242,7 +303,7 @@ export class TypographyControlManager {
|
|||||||
* @param storageId - Persistent storage identifier
|
* @param storageId - Persistent storage identifier
|
||||||
* @returns Typography control manager instance
|
* @returns Typography control manager instance
|
||||||
*/
|
*/
|
||||||
export function createTypographyControlManager(
|
export function createTypographySettingsManager(
|
||||||
configs: ControlModel<ControlId>[],
|
configs: ControlModel<ControlId>[],
|
||||||
storageId: string = 'glyphdiff:typography',
|
storageId: string = 'glyphdiff:typography',
|
||||||
) {
|
) {
|
||||||
@@ -252,5 +313,5 @@ export function createTypographyControlManager(
|
|||||||
lineHeight: DEFAULT_LINE_HEIGHT,
|
lineHeight: DEFAULT_LINE_HEIGHT,
|
||||||
letterSpacing: DEFAULT_LETTER_SPACING,
|
letterSpacing: DEFAULT_LETTER_SPACING,
|
||||||
});
|
});
|
||||||
return new TypographyControlManager(configs, storage);
|
return new TypographySettingsManager(configs, storage);
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,14 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
|
import {
|
||||||
|
DEFAULT_FONT_SIZE,
|
||||||
|
DEFAULT_FONT_WEIGHT,
|
||||||
|
DEFAULT_LETTER_SPACING,
|
||||||
|
DEFAULT_LINE_HEIGHT,
|
||||||
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
|
} from '$entities/Font';
|
||||||
import {
|
import {
|
||||||
afterEach,
|
|
||||||
beforeEach,
|
beforeEach,
|
||||||
describe,
|
describe,
|
||||||
expect,
|
expect,
|
||||||
@@ -8,21 +16,14 @@ import {
|
|||||||
vi,
|
vi,
|
||||||
} from 'vitest';
|
} from 'vitest';
|
||||||
import {
|
import {
|
||||||
DEFAULT_FONT_SIZE,
|
|
||||||
DEFAULT_FONT_WEIGHT,
|
|
||||||
DEFAULT_LETTER_SPACING,
|
|
||||||
DEFAULT_LINE_HEIGHT,
|
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
|
||||||
} from '../../model';
|
|
||||||
import {
|
|
||||||
TypographyControlManager,
|
|
||||||
type TypographySettings,
|
type TypographySettings,
|
||||||
} from './controlManager.svelte';
|
TypographySettingsManager,
|
||||||
|
} from './settingsManager.svelte';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test Strategy for TypographyControlManager
|
* Test Strategy for TypographySettingsManager
|
||||||
*
|
*
|
||||||
* This test suite validates the TypographyControlManager state management logic.
|
* This test suite validates the TypographySettingsManager state management logic.
|
||||||
* These are unit tests for the manager logic, separate from component rendering.
|
* These are unit tests for the manager logic, separate from component rendering.
|
||||||
*
|
*
|
||||||
* NOTE: Svelte 5's $effect runs in microtasks, so we need to flush effects
|
* NOTE: Svelte 5's $effect runs in microtasks, so we need to flush effects
|
||||||
@@ -45,7 +46,7 @@ async function flushEffects() {
|
|||||||
await Promise.resolve();
|
await Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('TypographyControlManager - Unit Tests', () => {
|
describe('TypographySettingsManager - Unit Tests', () => {
|
||||||
let mockStorage: TypographySettings;
|
let mockStorage: TypographySettings;
|
||||||
let mockPersistentStore: {
|
let mockPersistentStore: {
|
||||||
value: TypographySettings;
|
value: TypographySettings;
|
||||||
@@ -85,7 +86,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Initialization', () => {
|
describe('Initialization', () => {
|
||||||
it('creates manager with default values from storage', () => {
|
it('creates manager with default values from storage', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -105,7 +106,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
};
|
};
|
||||||
mockPersistentStore = createMockPersistentStore(mockStorage);
|
mockPersistentStore = createMockPersistentStore(mockStorage);
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -117,7 +118,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('initializes font size control with base size multiplied by current multiplier (1)', () => {
|
it('initializes font size control with base size multiplied by current multiplier (1)', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -126,7 +127,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('returns all controls via controls getter', () => {
|
it('returns all controls via controls getter', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -142,7 +143,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('returns individual controls via specific getters', () => {
|
it('returns individual controls via specific getters', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -160,7 +161,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('control instances have expected interface', () => {
|
it('control instances have expected interface', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -179,7 +180,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Multiplier System', () => {
|
describe('Multiplier System', () => {
|
||||||
it('has default multiplier of 1', () => {
|
it('has default multiplier of 1', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -188,7 +189,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates multiplier when set', () => {
|
it('updates multiplier when set', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -201,7 +202,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('does not update multiplier if set to same value', () => {
|
it('does not update multiplier if set to same value', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -217,7 +218,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
mockStorage = { fontSize: 48, fontWeight: 400, lineHeight: 1.5, letterSpacing: 0 };
|
mockStorage = { fontSize: 48, fontWeight: 400, lineHeight: 1.5, letterSpacing: 0 };
|
||||||
mockPersistentStore = createMockPersistentStore(mockStorage);
|
mockPersistentStore = createMockPersistentStore(mockStorage);
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -241,7 +242,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates font size control display value when multiplier increases', () => {
|
it('updates font size control display value when multiplier increases', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -262,7 +263,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Base Size Setter', () => {
|
describe('Base Size Setter', () => {
|
||||||
it('updates baseSize when set directly', () => {
|
it('updates baseSize when set directly', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -273,7 +274,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates size control value when baseSize is set', () => {
|
it('updates size control value when baseSize is set', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -284,7 +285,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('applies multiplier to size control when baseSize is set', () => {
|
it('applies multiplier to size control when baseSize is set', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -298,7 +299,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Rendered Size Calculation', () => {
|
describe('Rendered Size Calculation', () => {
|
||||||
it('calculates renderedSize as baseSize * multiplier', () => {
|
it('calculates renderedSize as baseSize * multiplier', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -307,7 +308,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates renderedSize when multiplier changes', () => {
|
it('updates renderedSize when multiplier changes', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -320,7 +321,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates renderedSize when baseSize changes', () => {
|
it('updates renderedSize when baseSize changes', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -340,7 +341,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
// proxy effect behavior should be tested in E2E tests.
|
// proxy effect behavior should be tested in E2E tests.
|
||||||
|
|
||||||
it('does NOT immediately update baseSize from control change (effect is async)', () => {
|
it('does NOT immediately update baseSize from control change (effect is async)', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -355,7 +356,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('updates baseSize via direct setter (synchronous)', () => {
|
it('updates baseSize via direct setter (synchronous)', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -380,7 +381,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
};
|
};
|
||||||
mockPersistentStore = createMockPersistentStore(mockStorage);
|
mockPersistentStore = createMockPersistentStore(mockStorage);
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -393,7 +394,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('syncs to storage after effect flush (async)', async () => {
|
it('syncs to storage after effect flush (async)', async () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -409,7 +410,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('syncs control changes to storage after effect flush (async)', async () => {
|
it('syncs control changes to storage after effect flush (async)', async () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -422,7 +423,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('syncs height control changes to storage after effect flush (async)', async () => {
|
it('syncs height control changes to storage after effect flush (async)', async () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -434,7 +435,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('syncs spacing control changes to storage after effect flush (async)', async () => {
|
it('syncs spacing control changes to storage after effect flush (async)', async () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -448,7 +449,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Control Value Getters', () => {
|
describe('Control Value Getters', () => {
|
||||||
it('returns current weight value', () => {
|
it('returns current weight value', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -460,7 +461,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('returns current height value', () => {
|
it('returns current height value', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -472,7 +473,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('returns current spacing value', () => {
|
it('returns current spacing value', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -485,7 +486,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
it('returns default value when control is not found', () => {
|
it('returns default value when control is not found', () => {
|
||||||
// Create a manager with empty configs (no controls)
|
// Create a manager with empty configs (no controls)
|
||||||
const manager = new TypographyControlManager([], mockPersistentStore);
|
const manager = new TypographySettingsManager([], mockPersistentStore);
|
||||||
|
|
||||||
expect(manager.weight).toBe(DEFAULT_FONT_WEIGHT);
|
expect(manager.weight).toBe(DEFAULT_FONT_WEIGHT);
|
||||||
expect(manager.height).toBe(DEFAULT_LINE_HEIGHT);
|
expect(manager.height).toBe(DEFAULT_LINE_HEIGHT);
|
||||||
@@ -503,7 +504,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
};
|
};
|
||||||
mockPersistentStore = createMockPersistentStore(mockStorage);
|
mockPersistentStore = createMockPersistentStore(mockStorage);
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -536,7 +537,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
clear: clearSpy,
|
clear: clearSpy,
|
||||||
};
|
};
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -547,7 +548,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('respects multiplier when resetting font size control', () => {
|
it('respects multiplier when resetting font size control', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -565,7 +566,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
|
|
||||||
describe('Complex Scenarios', () => {
|
describe('Complex Scenarios', () => {
|
||||||
it('handles changing multiplier then modifying baseSize', () => {
|
it('handles changing multiplier then modifying baseSize', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -586,7 +587,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('maintains correct renderedSize throughout changes', () => {
|
it('maintains correct renderedSize throughout changes', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -608,7 +609,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles multiple control changes in sequence', async () => {
|
it('handles multiple control changes in sequence', async () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -633,7 +634,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
mockStorage = { fontSize: 48, fontWeight: 400, lineHeight: 1.5, letterSpacing: 0 };
|
mockStorage = { fontSize: 48, fontWeight: 400, lineHeight: 1.5, letterSpacing: 0 };
|
||||||
mockPersistentStore = createMockPersistentStore(mockStorage);
|
mockPersistentStore = createMockPersistentStore(mockStorage);
|
||||||
|
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -645,7 +646,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles very small multiplier', () => {
|
it('handles very small multiplier', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -658,7 +659,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles large base size with multiplier', () => {
|
it('handles large base size with multiplier', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -671,7 +672,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles floating point precision in multiplier', () => {
|
it('handles floating point precision in multiplier', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -690,7 +691,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles control methods (increase/decrease)', () => {
|
it('handles control methods (increase/decrease)', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -704,7 +705,7 @@ describe('TypographyControlManager - Unit Tests', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('handles control boundary conditions', () => {
|
it('handles control boundary conditions', () => {
|
||||||
const manager = new TypographyControlManager(
|
const manager = new TypographySettingsManager(
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
mockPersistentStore,
|
mockPersistentStore,
|
||||||
);
|
);
|
||||||
@@ -1,24 +1 @@
|
|||||||
export {
|
export { typographySettingsStore } from './state/typographySettingsStore';
|
||||||
DEFAULT_FONT_SIZE,
|
|
||||||
DEFAULT_FONT_WEIGHT,
|
|
||||||
DEFAULT_LETTER_SPACING,
|
|
||||||
DEFAULT_LINE_HEIGHT,
|
|
||||||
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
|
||||||
FONT_SIZE_STEP,
|
|
||||||
FONT_WEIGHT_STEP,
|
|
||||||
LINE_HEIGHT_STEP,
|
|
||||||
MAX_FONT_SIZE,
|
|
||||||
MAX_FONT_WEIGHT,
|
|
||||||
MAX_LINE_HEIGHT,
|
|
||||||
MIN_FONT_SIZE,
|
|
||||||
MIN_FONT_WEIGHT,
|
|
||||||
MIN_LINE_HEIGHT,
|
|
||||||
MULTIPLIER_L,
|
|
||||||
MULTIPLIER_M,
|
|
||||||
MULTIPLIER_S,
|
|
||||||
} from './const/const';
|
|
||||||
|
|
||||||
export {
|
|
||||||
type ControlId,
|
|
||||||
controlManager,
|
|
||||||
} from './state/manager.svelte';
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import { createTypographyControlManager } from '../../lib';
|
|
||||||
import { DEFAULT_TYPOGRAPHY_CONTROLS_DATA } from '../const/const';
|
|
||||||
|
|
||||||
export type ControlId = 'font_size' | 'font_weight' | 'line_height' | 'letter_spacing';
|
|
||||||
|
|
||||||
export const controlManager = createTypographyControlManager(DEFAULT_TYPOGRAPHY_CONTROLS_DATA);
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { DEFAULT_TYPOGRAPHY_CONTROLS_DATA } from '$entities/Font';
|
||||||
|
import { createTypographySettingsManager } from '../../lib';
|
||||||
|
|
||||||
|
export const typographySettingsStore = createTypographySettingsManager(
|
||||||
|
DEFAULT_TYPOGRAPHY_CONTROLS_DATA,
|
||||||
|
'glyphdiff:comparison:typography',
|
||||||
|
);
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<script module>
|
||||||
|
import Providers from '$shared/lib/storybook/Providers.svelte';
|
||||||
|
import { defineMeta } from '@storybook/addon-svelte-csf';
|
||||||
|
import TypographyMenu from './TypographyMenu.svelte';
|
||||||
|
|
||||||
|
const { Story } = defineMeta({
|
||||||
|
title: 'Features/TypographyMenu',
|
||||||
|
component: TypographyMenu,
|
||||||
|
tags: ['autodocs'],
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
description: {
|
||||||
|
component:
|
||||||
|
'Floating typography controls. Mobile/tablet: settings button that opens a popover. Desktop: inline bar with combo controls.',
|
||||||
|
},
|
||||||
|
story: { inline: false },
|
||||||
|
},
|
||||||
|
layout: 'centered',
|
||||||
|
storyStage: { maxWidth: 'max-w-xl' },
|
||||||
|
},
|
||||||
|
argTypes: {
|
||||||
|
hidden: { control: 'boolean' },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Story name="Desktop">
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<div class="relative h-20 flex items-end justify-center p-4">
|
||||||
|
<TypographyMenu />
|
||||||
|
</div>
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
|
|
||||||
|
<Story name="Hidden">
|
||||||
|
{#snippet template()}
|
||||||
|
<Providers>
|
||||||
|
<div class="relative h-20 flex items-end justify-center p-4">
|
||||||
|
<TypographyMenu hidden={true} />
|
||||||
|
</div>
|
||||||
|
</Providers>
|
||||||
|
{/snippet}
|
||||||
|
</Story>
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
<!--
|
<!--
|
||||||
Component: TypographyMenu
|
Component: TypographyMenu
|
||||||
Floating controls bar for typography settings.
|
Floating controls bar for typography settings.
|
||||||
Warm surface, sharp corners, Settings icon header, dividers between units.
|
|
||||||
Mobile: popover with slider controls anchored to settings button.
|
Mobile: popover with slider controls anchored to settings button.
|
||||||
Desktop: inline bar with combo controls.
|
Desktop: inline bar with combo controls.
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import {
|
||||||
|
MULTIPLIER_L,
|
||||||
|
MULTIPLIER_M,
|
||||||
|
MULTIPLIER_S,
|
||||||
|
} from '$entities/Font';
|
||||||
import type { ResponsiveManager } from '$shared/lib';
|
import type { ResponsiveManager } from '$shared/lib';
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils';
|
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
ComboControl,
|
ComboControl,
|
||||||
@@ -17,15 +20,11 @@ import {
|
|||||||
import Settings2Icon from '@lucide/svelte/icons/settings-2';
|
import Settings2Icon from '@lucide/svelte/icons/settings-2';
|
||||||
import XIcon from '@lucide/svelte/icons/x';
|
import XIcon from '@lucide/svelte/icons/x';
|
||||||
import { Popover } from 'bits-ui';
|
import { Popover } from 'bits-ui';
|
||||||
|
import clsx from 'clsx';
|
||||||
import { getContext } from 'svelte';
|
import { getContext } from 'svelte';
|
||||||
import { cubicOut } from 'svelte/easing';
|
import { cubicOut } from 'svelte/easing';
|
||||||
import { fly } from 'svelte/transition';
|
import { fly } from 'svelte/transition';
|
||||||
import {
|
import { typographySettingsStore } from '../../model';
|
||||||
MULTIPLIER_L,
|
|
||||||
MULTIPLIER_M,
|
|
||||||
MULTIPLIER_S,
|
|
||||||
controlManager,
|
|
||||||
} from '../../model';
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
/**
|
/**
|
||||||
@@ -37,67 +36,62 @@ interface Props {
|
|||||||
* @default false
|
* @default false
|
||||||
*/
|
*/
|
||||||
hidden?: boolean;
|
hidden?: boolean;
|
||||||
|
/**
|
||||||
|
* Bindable popover open state
|
||||||
|
* @default false
|
||||||
|
*/
|
||||||
|
open?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { class: className, hidden = false }: Props = $props();
|
let { class: className, hidden = false, open = $bindable(false) }: Props = $props();
|
||||||
|
|
||||||
const responsive = getContext<ResponsiveManager>('responsive');
|
const responsive = getContext<ResponsiveManager>('responsive');
|
||||||
|
|
||||||
let isOpen = $state(false);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the common font size multiplier based on the current responsive state.
|
* Sets the common font size multiplier based on the current responsive state.
|
||||||
*/
|
*/
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (!responsive) return;
|
if (!responsive) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case responsive.isMobile:
|
case responsive.isMobile:
|
||||||
controlManager.multiplier = MULTIPLIER_S;
|
typographySettingsStore.multiplier = MULTIPLIER_S;
|
||||||
break;
|
break;
|
||||||
case responsive.isTablet:
|
case responsive.isTablet:
|
||||||
controlManager.multiplier = MULTIPLIER_M;
|
typographySettingsStore.multiplier = MULTIPLIER_M;
|
||||||
break;
|
break;
|
||||||
case responsive.isDesktop:
|
case responsive.isDesktop:
|
||||||
controlManager.multiplier = MULTIPLIER_L;
|
typographySettingsStore.multiplier = MULTIPLIER_L;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
controlManager.multiplier = MULTIPLIER_L;
|
typographySettingsStore.multiplier = MULTIPLIER_L;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if !hidden}
|
{#if !hidden}
|
||||||
{#if responsive.isMobile}
|
{#if responsive.isMobileOrTablet}
|
||||||
<Popover.Root bind:open={isOpen}>
|
<Popover.Root bind:open>
|
||||||
<Popover.Trigger>
|
<Popover.Trigger>
|
||||||
{#snippet child({ props })}
|
{#snippet child({ props })}
|
||||||
<button
|
<Button class={className} variant="primary" {...props}>
|
||||||
{...props}
|
{#snippet icon()}
|
||||||
class={cn(
|
|
||||||
'inline-flex items-center justify-center',
|
|
||||||
'size-8 p-0',
|
|
||||||
'border border-transparent rounded-none',
|
|
||||||
'transition-colors duration-150',
|
|
||||||
'hover:bg-white/50 dark:hover:bg-white/5',
|
|
||||||
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand/30',
|
|
||||||
isOpen && 'bg-paper dark:bg-dark-card border-black/5 dark:border-white/10 shadow-sm',
|
|
||||||
className,
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<Settings2Icon class="size-4" />
|
<Settings2Icon class="size-4" />
|
||||||
</button>
|
{/snippet}
|
||||||
|
</Button>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</Popover.Trigger>
|
</Popover.Trigger>
|
||||||
|
|
||||||
<Popover.Portal>
|
<Popover.Portal>
|
||||||
<Popover.Content
|
<Popover.Content
|
||||||
side="top"
|
side="top"
|
||||||
align="start"
|
align="end"
|
||||||
sideOffset={8}
|
sideOffset={8}
|
||||||
class={cn(
|
class={clsx(
|
||||||
'z-50 w-72',
|
'z-50 w-72',
|
||||||
'bg-surface dark:bg-dark-card',
|
'bg-surface dark:bg-dark-card',
|
||||||
'border border-black/5 dark:border-white/10',
|
'border border-subtle',
|
||||||
'shadow-[0_20px_40px_-10px_rgba(0,0,0,0.15)]',
|
'shadow-[0_20px_40px_-10px_rgba(0,0,0,0.15)]',
|
||||||
'rounded-none p-4',
|
'rounded-none p-4',
|
||||||
'data-[state=open]:animate-in data-[state=closed]:animate-out',
|
'data-[state=open]:animate-in data-[state=closed]:animate-out',
|
||||||
@@ -110,11 +104,11 @@ $effect(() => {
|
|||||||
escapeKeydownBehavior="close"
|
escapeKeydownBehavior="close"
|
||||||
>
|
>
|
||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
<div class="flex items-center justify-between mb-3 pb-3 border-b border-black/5 dark:border-white/10">
|
<div class="flex items-center justify-between mb-3 pb-3 border-b border-subtle">
|
||||||
<div class="flex items-center gap-1.5">
|
<div class="flex items-center gap-1.5">
|
||||||
<Settings2Icon size={12} class="text-swiss-red" />
|
<Settings2Icon size={12} class="text-swiss-red" />
|
||||||
<span
|
<span
|
||||||
class="text-[0.5625rem] font-mono uppercase tracking-widest font-bold text-swiss-black dark:text-neutral-200"
|
class="text-3xs font-mono uppercase tracking-widest font-bold text-swiss-black dark:text-neutral-200"
|
||||||
>
|
>
|
||||||
CONTROLS
|
CONTROLS
|
||||||
</span>
|
</span>
|
||||||
@@ -133,7 +127,7 @@ $effect(() => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Controls -->
|
<!-- Controls -->
|
||||||
{#each controlManager.controls as control (control.id)}
|
{#each typographySettingsStore.controls as control (control.id)}
|
||||||
<ControlGroup label={control.controlLabel ?? ''}>
|
<ControlGroup label={control.controlLabel ?? ''}>
|
||||||
<Slider
|
<Slider
|
||||||
bind:value={control.instance.value}
|
bind:value={control.instance.value}
|
||||||
@@ -148,33 +142,33 @@ $effect(() => {
|
|||||||
</Popover.Root>
|
</Popover.Root>
|
||||||
{:else}
|
{:else}
|
||||||
<div
|
<div
|
||||||
class={cn('w-full md:w-auto', className)}
|
class={clsx('w-full md:w-auto', className)}
|
||||||
transition:fly={{ y: 100, duration: 200, easing: cubicOut }}
|
transition:fly={{ y: 100, duration: 200, easing: cubicOut }}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class={cn(
|
class={clsx(
|
||||||
'flex items-center gap-1 md:gap-2 p-1.5 md:p-2',
|
'flex items-center gap-1 md:gap-2 p-1.5 md:p-2',
|
||||||
'bg-surface/95 dark:bg-dark-bg/95 backdrop-blur-xl',
|
'bg-surface/95 dark:bg-dark-bg/95 backdrop-blur-xl',
|
||||||
'border border-black/5 dark:border-white/10',
|
'border border-subtle',
|
||||||
'shadow-[0_20px_40px_-10px_rgba(0,0,0,0.1)]',
|
'shadow-[0_20px_40px_-10px_rgba(0,0,0,0.1)]',
|
||||||
'rounded-none ring-1 ring-black/5 dark:ring-white/5',
|
'rounded-none ring-1 ring-black/5 dark:ring-white/5',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<!-- Header: icon + label -->
|
<!-- Header: icon + label -->
|
||||||
<div class="px-2 md:px-3 flex items-center gap-1.5 md:gap-2 border-r border-black/5 dark:border-white/10 mr-1 text-swiss-black dark:text-neutral-200 shrink-0">
|
<div class="px-2 md:px-3 flex items-center gap-1.5 md:gap-2 border-r border-subtle mr-1 text-swiss-black dark:text-neutral-200 shrink-0">
|
||||||
<Settings2Icon
|
<Settings2Icon
|
||||||
size={14}
|
size={14}
|
||||||
class="text-swiss-red"
|
class="text-swiss-red"
|
||||||
/>
|
/>
|
||||||
<span
|
<span
|
||||||
class="text-[0.5625rem] md:text-[0.625rem] font-mono uppercase tracking-widest font-bold hidden sm:inline whitespace-nowrap"
|
class="text-3xs md:text-2xs font-mono uppercase tracking-widest font-bold hidden sm:inline whitespace-nowrap"
|
||||||
>
|
>
|
||||||
GLOBAL_CONTROLS
|
GLOBAL_CONTROLS
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Controls with dividers between each -->
|
<!-- Controls with dividers between each -->
|
||||||
{#each controlManager.controls as control, i (control.id)}
|
{#each typographySettingsStore.controls as control, i (control.id)}
|
||||||
{#if i > 0}
|
{#if i > 0}
|
||||||
<div class="w-px h-6 md:h-8 bg-black/5 dark:bg-white/10 mx-0.5 md:mx-1 shrink-0"></div>
|
<div class="w-px h-6 md:h-8 bg-black/5 dark:bg-white/10 mx-0.5 md:mx-1 shrink-0"></div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
/**
|
||||||
|
* Application entry point
|
||||||
|
*
|
||||||
|
* Mounts the main App component to the DOM and initializes
|
||||||
|
* global styles.
|
||||||
|
*/
|
||||||
import App from '$app/App.svelte';
|
import App from '$app/App.svelte';
|
||||||
import { mount } from 'svelte';
|
import { mount } from 'svelte';
|
||||||
import '$app/styles/app.css';
|
import '$app/styles/app.css';
|
||||||
|
|||||||
@@ -3,10 +3,7 @@
|
|||||||
Description: The main page component of the application.
|
Description: The main page component of the application.
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { scrollBreadcrumbsStore } from '$entities/Breadcrumb';
|
|
||||||
import { ComparisonView } from '$widgets/ComparisonView';
|
import { ComparisonView } from '$widgets/ComparisonView';
|
||||||
import { FontSearchSection } from '$widgets/FontSearch';
|
|
||||||
import { SampleListSection } from '$widgets/SampleList';
|
|
||||||
import { cubicIn } from 'svelte/easing';
|
import { cubicIn } from 'svelte/easing';
|
||||||
import { fade } from 'svelte/transition';
|
import { fade } from 'svelte/transition';
|
||||||
</script>
|
</script>
|
||||||
@@ -18,8 +15,4 @@ import { fade } from 'svelte/transition';
|
|||||||
<section class="w-auto">
|
<section class="w-auto">
|
||||||
<ComparisonView />
|
<ComparisonView />
|
||||||
</section>
|
</section>
|
||||||
<main class="w-full pt-0 pb-10 sm:px-6 sm:pt-16 sm:pb-12 md:px-8 md:pt-32 md:pb-16 lg:px-10 lg:pt-48 lg:pb-20 xl:px-16">
|
|
||||||
<FontSearchSection />
|
|
||||||
<SampleListSection index={1} />
|
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -41,10 +41,14 @@ export class ApiError extends Error {
|
|||||||
* @param response - Original fetch Response object
|
* @param response - Original fetch Response object
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
/** HTTP status code */
|
/**
|
||||||
|
* HTTP status code
|
||||||
|
*/
|
||||||
public status: number,
|
public status: number,
|
||||||
message: string,
|
message: string,
|
||||||
/** Original Response object for inspection */
|
/**
|
||||||
|
* Original Response object for inspection
|
||||||
|
*/
|
||||||
public response?: Response,
|
public response?: Response,
|
||||||
) {
|
) {
|
||||||
super(message);
|
super(message);
|
||||||
|
|||||||
@@ -15,15 +15,25 @@ import { QueryClient } from '@tanstack/query-core';
|
|||||||
export const queryClient = new QueryClient({
|
export const queryClient = new QueryClient({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
queries: {
|
queries: {
|
||||||
/** Data remains fresh for 5 minutes after fetch */
|
/**
|
||||||
|
* Data remains fresh for 5 minutes after fetch
|
||||||
|
*/
|
||||||
staleTime: 5 * 60 * 1000,
|
staleTime: 5 * 60 * 1000,
|
||||||
/** Unused cache entries are removed after 10 minutes */
|
/**
|
||||||
|
* Unused cache entries are removed after 10 minutes
|
||||||
|
*/
|
||||||
gcTime: 10 * 60 * 1000,
|
gcTime: 10 * 60 * 1000,
|
||||||
/** Don't refetch when window regains focus */
|
/**
|
||||||
|
* Don't refetch when window regains focus
|
||||||
|
*/
|
||||||
refetchOnWindowFocus: false,
|
refetchOnWindowFocus: false,
|
||||||
/** Refetch on mount if data is stale */
|
/**
|
||||||
|
* Refetch on mount if data is stale
|
||||||
|
*/
|
||||||
refetchOnMount: true,
|
refetchOnMount: true,
|
||||||
/** Retry failed requests up to 3 times */
|
/**
|
||||||
|
* Retry failed requests up to 3 times
|
||||||
|
*/
|
||||||
retry: 3,
|
retry: 3,
|
||||||
/**
|
/**
|
||||||
* Exponential backoff for retries
|
* Exponential backoff for retries
|
||||||
|
|||||||
@@ -3,21 +3,35 @@
|
|||||||
* Ensures consistent serialization for batch requests by sorting IDs.
|
* Ensures consistent serialization for batch requests by sorting IDs.
|
||||||
*/
|
*/
|
||||||
export const fontKeys = {
|
export const fontKeys = {
|
||||||
/** Base key for all font queries */
|
/**
|
||||||
|
* Base key for all font queries
|
||||||
|
*/
|
||||||
all: ['fonts'] as const,
|
all: ['fonts'] as const,
|
||||||
|
|
||||||
/** Keys for font list queries */
|
/**
|
||||||
|
* Keys for font list queries
|
||||||
|
*/
|
||||||
lists: () => [...fontKeys.all, 'list'] as const,
|
lists: () => [...fontKeys.all, 'list'] as const,
|
||||||
/** Specific font list key with filter parameters */
|
/**
|
||||||
|
* Specific font list key with filter parameters
|
||||||
|
*/
|
||||||
list: (params: object) => [...fontKeys.lists(), params] as const,
|
list: (params: object) => [...fontKeys.lists(), params] as const,
|
||||||
|
|
||||||
/** Keys for font batch queries */
|
/**
|
||||||
|
* Keys for font batch queries
|
||||||
|
*/
|
||||||
batches: () => [...fontKeys.all, 'batch'] as const,
|
batches: () => [...fontKeys.all, 'batch'] as const,
|
||||||
/** Specific batch key, sorted for stability */
|
/**
|
||||||
|
* Specific batch key, sorted for stability
|
||||||
|
*/
|
||||||
batch: (ids: string[]) => [...fontKeys.batches(), [...ids].sort()] as const,
|
batch: (ids: string[]) => [...fontKeys.batches(), [...ids].sort()] as const,
|
||||||
|
|
||||||
/** Keys for font detail queries */
|
/**
|
||||||
|
* Keys for font detail queries
|
||||||
|
*/
|
||||||
details: () => [...fontKeys.all, 'detail'] as const,
|
details: () => [...fontKeys.all, 'detail'] as const,
|
||||||
/** Specific font detail key by ID */
|
/**
|
||||||
|
* Specific font detail key by ID
|
||||||
|
*/
|
||||||
detail: (id: string) => [...fontKeys.details(), id] as const,
|
detail: (id: string) => [...fontKeys.details(), id] as const,
|
||||||
} as const;
|
} as const;
|
||||||
|
|||||||
@@ -12,20 +12,37 @@ import {
|
|||||||
* each font's actual advance widths independently.
|
* each font's actual advance widths independently.
|
||||||
*/
|
*/
|
||||||
export interface ComparisonLine {
|
export interface ComparisonLine {
|
||||||
/** Full text of this line as returned by pretext. */
|
/**
|
||||||
|
* Full text of this line as returned by pretext.
|
||||||
|
*/
|
||||||
text: string;
|
text: string;
|
||||||
/** Rendered width of this line in pixels — maximum across font A and font B. */
|
/**
|
||||||
|
* Rendered width of this line in pixels — maximum across font A and font B.
|
||||||
|
*/
|
||||||
width: number;
|
width: number;
|
||||||
|
/**
|
||||||
|
* Individual character metadata for both fonts in this line
|
||||||
|
*/
|
||||||
chars: Array<{
|
chars: Array<{
|
||||||
/** The grapheme cluster string (may be >1 code unit for emoji, etc.). */
|
/**
|
||||||
|
* The grapheme cluster string (may be >1 code unit for emoji, etc.).
|
||||||
|
*/
|
||||||
char: string;
|
char: string;
|
||||||
/** X offset from the start of the line in font A, in pixels. */
|
/**
|
||||||
|
* X offset from the start of the line in font A, in pixels.
|
||||||
|
*/
|
||||||
xA: number;
|
xA: number;
|
||||||
/** Advance width of this grapheme in font A, in pixels. */
|
/**
|
||||||
|
* Advance width of this grapheme in font A, in pixels.
|
||||||
|
*/
|
||||||
widthA: number;
|
widthA: number;
|
||||||
/** X offset from the start of the line in font B, in pixels. */
|
/**
|
||||||
|
* X offset from the start of the line in font B, in pixels.
|
||||||
|
*/
|
||||||
xB: number;
|
xB: number;
|
||||||
/** Advance width of this grapheme in font B, in pixels. */
|
/**
|
||||||
|
* Advance width of this grapheme in font B, in pixels.
|
||||||
|
*/
|
||||||
widthB: number;
|
widthB: number;
|
||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
@@ -34,9 +51,13 @@ export interface ComparisonLine {
|
|||||||
* Aggregated output of a dual-font layout pass.
|
* Aggregated output of a dual-font layout pass.
|
||||||
*/
|
*/
|
||||||
export interface ComparisonResult {
|
export interface ComparisonResult {
|
||||||
/** Per-line grapheme data for both fonts. Empty when input text is empty. */
|
/**
|
||||||
|
* Per-line grapheme data for both fonts. Empty when input text is empty.
|
||||||
|
*/
|
||||||
lines: ComparisonLine[];
|
lines: ComparisonLine[];
|
||||||
/** Total height in pixels. Equals `lines.length * lineHeight` (pretext guarantee). */
|
/**
|
||||||
|
* Total height in pixels. Equals `lines.length * lineHeight` (pretext guarantee).
|
||||||
|
*/
|
||||||
totalHeight: number;
|
totalHeight: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,7 +171,9 @@ export class CharacterComparisonEngine {
|
|||||||
|
|
||||||
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
|
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
|
||||||
const segmentText = this.#preparedA!.segments[sIdx];
|
const segmentText = this.#preparedA!.segments[sIdx];
|
||||||
if (segmentText === undefined) continue;
|
if (segmentText === undefined) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// PERFORMANCE: Reuse segmenter results if possible, but for now just optimize the loop
|
// PERFORMANCE: Reuse segmenter results if possible, but for now just optimize the loop
|
||||||
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
|
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
|
||||||
@@ -221,7 +244,9 @@ export class CharacterComparisonEngine {
|
|||||||
const line = this.#lastResult.lines[lineIndex];
|
const line = this.#lastResult.lines[lineIndex];
|
||||||
const char = line.chars[charIndex];
|
const char = line.chars[charIndex];
|
||||||
|
|
||||||
if (!char) return { proximity: 0, isPast: false };
|
if (!char) {
|
||||||
|
return { proximity: 0, isPast: false };
|
||||||
|
}
|
||||||
|
|
||||||
// Center the comparison on the unified width
|
// Center the comparison on the unified width
|
||||||
// In the UI, lines are centered. So we need to calculate the global X.
|
// In the UI, lines are centered. So we need to calculate the global X.
|
||||||
@@ -258,9 +283,15 @@ export class CharacterComparisonEngine {
|
|||||||
|
|
||||||
unified.breakableFitAdvances = intA.breakableFitAdvances.map((advA: number[] | null, i: number) => {
|
unified.breakableFitAdvances = intA.breakableFitAdvances.map((advA: number[] | null, i: number) => {
|
||||||
const advB = intB.breakableFitAdvances[i];
|
const advB = intB.breakableFitAdvances[i];
|
||||||
if (!advA && !advB) return null;
|
if (!advA && !advB) {
|
||||||
if (!advA) return advB;
|
return null;
|
||||||
if (!advB) return advA;
|
}
|
||||||
|
if (!advA) {
|
||||||
|
return advB;
|
||||||
|
}
|
||||||
|
if (!advB) {
|
||||||
|
return advA;
|
||||||
|
}
|
||||||
|
|
||||||
return advA.map((w: number, j: number) => Math.max(w, advB[j]));
|
return advA.map((w: number, j: number) => Math.max(w, advB[j]));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -28,8 +28,6 @@ describe('CharacterComparisonEngine', () => {
|
|||||||
engine = new CharacterComparisonEngine();
|
engine = new CharacterComparisonEngine();
|
||||||
});
|
});
|
||||||
|
|
||||||
// --- layout() ---
|
|
||||||
|
|
||||||
it('returns empty result for empty string', () => {
|
it('returns empty result for empty string', () => {
|
||||||
const result = engine.layout('', '400 16px "FontA"', '400 16px "FontB"', 500, 20);
|
const result = engine.layout('', '400 16px "FontA"', '400 16px "FontB"', 500, 20);
|
||||||
expect(result.lines).toHaveLength(0);
|
expect(result.lines).toHaveLength(0);
|
||||||
@@ -111,8 +109,6 @@ describe('CharacterComparisonEngine', () => {
|
|||||||
expect(r2).not.toBe(r1);
|
expect(r2).not.toBe(r1);
|
||||||
});
|
});
|
||||||
|
|
||||||
// --- getCharState() ---
|
|
||||||
|
|
||||||
it('getCharState returns proximity 1 when slider is exactly over char center', () => {
|
it('getCharState returns proximity 1 when slider is exactly over char center', () => {
|
||||||
// 'A' only: FontA width=10. Container=500px. Line centered.
|
// 'A' only: FontA width=10. Container=500px. Line centered.
|
||||||
// lineXOffset = (500 - maxWidth) / 2. maxWidth = max(10, 15) = 15 (FontB is wider).
|
// lineXOffset = (500 - maxWidth) / 2. maxWidth = max(10, 15) = 15 (FontB is wider).
|
||||||
|
|||||||
@@ -10,16 +10,29 @@ import {
|
|||||||
* sequences and combining characters each produce exactly one entry.
|
* sequences and combining characters each produce exactly one entry.
|
||||||
*/
|
*/
|
||||||
export interface LayoutLine {
|
export interface LayoutLine {
|
||||||
/** Full text of this line as returned by pretext. */
|
/**
|
||||||
|
* Full text of this line as returned by pretext.
|
||||||
|
*/
|
||||||
text: string;
|
text: string;
|
||||||
/** Rendered width of this line in pixels. */
|
/**
|
||||||
|
* Rendered width of this line in pixels.
|
||||||
|
*/
|
||||||
width: number;
|
width: number;
|
||||||
|
/**
|
||||||
|
* Individual character metadata for this line
|
||||||
|
*/
|
||||||
chars: Array<{
|
chars: Array<{
|
||||||
/** The grapheme cluster string (may be >1 code unit for emoji, etc.). */
|
/**
|
||||||
|
* The grapheme cluster string (may be >1 code unit for emoji, etc.).
|
||||||
|
*/
|
||||||
char: string;
|
char: string;
|
||||||
/** X offset from the start of the line, in pixels. */
|
/**
|
||||||
|
* X offset from the start of the line, in pixels.
|
||||||
|
*/
|
||||||
x: number;
|
x: number;
|
||||||
/** Advance width of this grapheme, in pixels. */
|
/**
|
||||||
|
* Advance width of this grapheme, in pixels.
|
||||||
|
*/
|
||||||
width: number;
|
width: number;
|
||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
@@ -28,9 +41,13 @@ export interface LayoutLine {
|
|||||||
* Aggregated output of a single-font layout pass.
|
* Aggregated output of a single-font layout pass.
|
||||||
*/
|
*/
|
||||||
export interface LayoutResult {
|
export interface LayoutResult {
|
||||||
/** Per-line grapheme data. Empty when input text is empty. */
|
/**
|
||||||
|
* Per-line grapheme data. Empty when input text is empty.
|
||||||
|
*/
|
||||||
lines: LayoutLine[];
|
lines: LayoutLine[];
|
||||||
/** Total height in pixels. Equals `lines.length * lineHeight` (pretext guarantee). */
|
/**
|
||||||
|
* Total height in pixels. Equals `lines.length * lineHeight` (pretext guarantee).
|
||||||
|
*/
|
||||||
totalHeight: number;
|
totalHeight: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +82,9 @@ export class TextLayoutEngine {
|
|||||||
*/
|
*/
|
||||||
#segmenter: Intl.Segmenter;
|
#segmenter: Intl.Segmenter;
|
||||||
|
|
||||||
/** @param locale BCP 47 language tag passed to Intl.Segmenter. Defaults to the runtime locale. */
|
/**
|
||||||
|
* @param locale BCP 47 language tag passed to Intl.Segmenter. Defaults to the runtime locale.
|
||||||
|
*/
|
||||||
constructor(locale?: string) {
|
constructor(locale?: string) {
|
||||||
this.#segmenter = new Intl.Segmenter(locale, { granularity: 'grapheme' });
|
this.#segmenter = new Intl.Segmenter(locale, { granularity: 'grapheme' });
|
||||||
}
|
}
|
||||||
@@ -108,7 +127,9 @@ export class TextLayoutEngine {
|
|||||||
// Both cursors are grapheme-level: start is inclusive, end is exclusive.
|
// Both cursors are grapheme-level: start is inclusive, end is exclusive.
|
||||||
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
|
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
|
||||||
const segmentText = prepared.segments[sIdx];
|
const segmentText = prepared.segments[sIdx];
|
||||||
if (segmentText === undefined) continue;
|
if (segmentText === undefined) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
|
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
|
||||||
const advances = breakableFitAdvances[sIdx];
|
const advances = breakableFitAdvances[sIdx];
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ export function createDebouncedState<T>(initialValue: T, wait: number = 300) {
|
|||||||
}, wait);
|
}, wait);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
/** Current value with immediate updates (for UI binding) */
|
/**
|
||||||
|
* Current value with immediate updates (for UI binding)
|
||||||
|
*/
|
||||||
get immediate() {
|
get immediate() {
|
||||||
return immediate;
|
return immediate;
|
||||||
},
|
},
|
||||||
@@ -41,7 +43,9 @@ export function createDebouncedState<T>(initialValue: T, wait: number = 300) {
|
|||||||
// Manually trigger the debounce on write
|
// Manually trigger the debounce on write
|
||||||
updateDebounced(value);
|
updateDebounced(value);
|
||||||
},
|
},
|
||||||
/** Current value with debounced updates (for logic/operations) */
|
/**
|
||||||
|
* Current value with debounced updates (for logic/operations)
|
||||||
|
*/
|
||||||
get debounced() {
|
get debounced() {
|
||||||
return debounced;
|
return debounced;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ import { SvelteMap } from 'svelte/reactivity';
|
|||||||
* Base entity interface requiring an ID field
|
* Base entity interface requiring an ID field
|
||||||
*/
|
*/
|
||||||
export interface Entity {
|
export interface Entity {
|
||||||
/** Unique identifier for the entity */
|
/**
|
||||||
|
* Unique identifier for the entity
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,7 +41,9 @@ export interface Entity {
|
|||||||
* triggers updates when entities are added, removed, or modified.
|
* triggers updates when entities are added, removed, or modified.
|
||||||
*/
|
*/
|
||||||
export class EntityStore<T extends Entity> {
|
export class EntityStore<T extends Entity> {
|
||||||
/** Reactive map of entities keyed by ID */
|
/**
|
||||||
|
* Reactive map of entities keyed by ID
|
||||||
|
*/
|
||||||
#entities = new SvelteMap<string, T>();
|
#entities = new SvelteMap<string, T>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -29,13 +29,21 @@
|
|||||||
* @template TValue - The type of the property value (typically string)
|
* @template TValue - The type of the property value (typically string)
|
||||||
*/
|
*/
|
||||||
export interface Property<TValue extends string> {
|
export interface Property<TValue extends string> {
|
||||||
/** Unique identifier for the property */
|
/**
|
||||||
|
* Unique string identifier for the filterable property
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
/** Human-readable display name */
|
/**
|
||||||
|
* Human-readable label for UI display
|
||||||
|
*/
|
||||||
name: string;
|
name: string;
|
||||||
/** Underlying value for filtering logic */
|
/**
|
||||||
|
* Underlying machine-readable value used for filtering logic
|
||||||
|
*/
|
||||||
value: TValue;
|
value: TValue;
|
||||||
/** Whether the property is currently selected */
|
/**
|
||||||
|
* Current selection status (reactive)
|
||||||
|
*/
|
||||||
selected?: boolean;
|
selected?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +53,9 @@ export interface Property<TValue extends string> {
|
|||||||
* @template TValue - The type of property values
|
* @template TValue - The type of property values
|
||||||
*/
|
*/
|
||||||
export interface FilterModel<TValue extends string> {
|
export interface FilterModel<TValue extends string> {
|
||||||
/** Array of filterable properties */
|
/**
|
||||||
|
* Collection of properties that can be toggled in this filter
|
||||||
|
*/
|
||||||
properties: Property<TValue>[];
|
properties: Property<TValue>[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import {
|
import {
|
||||||
afterEach,
|
afterEach,
|
||||||
beforeEach,
|
beforeEach,
|
||||||
|
|||||||
@@ -32,19 +32,33 @@ import { Spring } from 'svelte/motion';
|
|||||||
* Configuration options for perspective effects
|
* Configuration options for perspective effects
|
||||||
*/
|
*/
|
||||||
export interface PerspectiveConfig {
|
export interface PerspectiveConfig {
|
||||||
/** Z-axis translation per level in pixels */
|
/**
|
||||||
|
* Z-axis translation per level in pixels
|
||||||
|
*/
|
||||||
depthStep?: number;
|
depthStep?: number;
|
||||||
/** Scale reduction per level (0-1) */
|
/**
|
||||||
|
* Scale reduction per level (0-1)
|
||||||
|
*/
|
||||||
scaleStep?: number;
|
scaleStep?: number;
|
||||||
/** Blur amount per level in pixels */
|
/**
|
||||||
|
* Blur amount per level in pixels
|
||||||
|
*/
|
||||||
blurStep?: number;
|
blurStep?: number;
|
||||||
/** Opacity reduction per level (0-1) */
|
/**
|
||||||
|
* Opacity reduction per level (0-1)
|
||||||
|
*/
|
||||||
opacityStep?: number;
|
opacityStep?: number;
|
||||||
/** Parallax movement intensity per level */
|
/**
|
||||||
|
* Parallax movement intensity per level
|
||||||
|
*/
|
||||||
parallaxIntensity?: number;
|
parallaxIntensity?: number;
|
||||||
/** Horizontal offset - positive for right, negative for left */
|
/**
|
||||||
|
* Horizontal offset - positive for right, negative for left
|
||||||
|
*/
|
||||||
horizontalOffset?: number;
|
horizontalOffset?: number;
|
||||||
/** Layout mode: 'center' for centered, 'split' for side-by-side */
|
/**
|
||||||
|
* Layout mode: 'center' for centered, 'split' for side-by-side
|
||||||
|
*/
|
||||||
layoutMode?: 'center' | 'split';
|
layoutMode?: 'center' | 'split';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,15 +39,25 @@
|
|||||||
* Customize to match your design system's breakpoints.
|
* Customize to match your design system's breakpoints.
|
||||||
*/
|
*/
|
||||||
export interface Breakpoints {
|
export interface Breakpoints {
|
||||||
/** Mobile devices - default 640px */
|
/**
|
||||||
|
* Mobile devices - default 640px
|
||||||
|
*/
|
||||||
mobile: number;
|
mobile: number;
|
||||||
/** Tablet portrait - default 768px */
|
/**
|
||||||
|
* Tablet portrait - default 768px
|
||||||
|
*/
|
||||||
tabletPortrait: number;
|
tabletPortrait: number;
|
||||||
/** Tablet landscape - default 1024px */
|
/**
|
||||||
|
* Tablet landscape - default 1024px
|
||||||
|
*/
|
||||||
tablet: number;
|
tablet: number;
|
||||||
/** Desktop - default 1280px */
|
/**
|
||||||
|
* Desktop - default 1280px
|
||||||
|
*/
|
||||||
desktop: number;
|
desktop: number;
|
||||||
/** Large desktop - default 1536px */
|
/**
|
||||||
|
* Large desktop - default 1536px
|
||||||
|
*/
|
||||||
desktopLarge: number;
|
desktopLarge: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,7 +150,9 @@ export function createResponsiveManager(customBreakpoints?: Partial<Breakpoints>
|
|||||||
* @returns Cleanup function to remove listeners
|
* @returns Cleanup function to remove listeners
|
||||||
*/
|
*/
|
||||||
function init() {
|
function init() {
|
||||||
if (typeof window === 'undefined') return;
|
if (typeof window === 'undefined') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const handleResize = () => {
|
const handleResize = () => {
|
||||||
width = window.innerWidth;
|
width = window.innerWidth;
|
||||||
@@ -206,66 +218,108 @@ export function createResponsiveManager(customBreakpoints?: Partial<Breakpoints>
|
|||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
/** Viewport width in pixels */
|
/**
|
||||||
|
* Current viewport width in pixels (reactive)
|
||||||
|
*/
|
||||||
get width() {
|
get width() {
|
||||||
return width;
|
return width;
|
||||||
},
|
},
|
||||||
/** Viewport height in pixels */
|
/**
|
||||||
|
* Current viewport height in pixels (reactive)
|
||||||
|
*/
|
||||||
get height() {
|
get height() {
|
||||||
return height;
|
return height;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Standard breakpoints
|
/**
|
||||||
|
* True if viewport width is below the mobile threshold
|
||||||
|
*/
|
||||||
get isMobile() {
|
get isMobile() {
|
||||||
return isMobile;
|
return isMobile;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if viewport width is between mobile and tablet portrait thresholds
|
||||||
|
*/
|
||||||
get isTabletPortrait() {
|
get isTabletPortrait() {
|
||||||
return isTabletPortrait;
|
return isTabletPortrait;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if viewport width is between tablet portrait and desktop thresholds
|
||||||
|
*/
|
||||||
get isTablet() {
|
get isTablet() {
|
||||||
return isTablet;
|
return isTablet;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if viewport width is between desktop and large desktop thresholds
|
||||||
|
*/
|
||||||
get isDesktop() {
|
get isDesktop() {
|
||||||
return isDesktop;
|
return isDesktop;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if viewport width is at or above the large desktop threshold
|
||||||
|
*/
|
||||||
get isDesktopLarge() {
|
get isDesktopLarge() {
|
||||||
return isDesktopLarge;
|
return isDesktopLarge;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Convenience groupings
|
/**
|
||||||
|
* True if viewport width is below the desktop threshold
|
||||||
|
*/
|
||||||
get isMobileOrTablet() {
|
get isMobileOrTablet() {
|
||||||
return isMobileOrTablet;
|
return isMobileOrTablet;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if viewport width is at or above the tablet portrait threshold
|
||||||
|
*/
|
||||||
get isTabletOrDesktop() {
|
get isTabletOrDesktop() {
|
||||||
return isTabletOrDesktop;
|
return isTabletOrDesktop;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Orientation
|
/**
|
||||||
|
* Current screen orientation (portrait | landscape)
|
||||||
|
*/
|
||||||
get orientation() {
|
get orientation() {
|
||||||
return orientation;
|
return orientation;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if screen height is greater than width
|
||||||
|
*/
|
||||||
get isPortrait() {
|
get isPortrait() {
|
||||||
return isPortrait;
|
return isPortrait;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* True if screen width is greater than height
|
||||||
|
*/
|
||||||
get isLandscape() {
|
get isLandscape() {
|
||||||
return isLandscape;
|
return isLandscape;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Device capabilities
|
/**
|
||||||
|
* True if the device supports touch interaction
|
||||||
|
*/
|
||||||
get isTouchDevice() {
|
get isTouchDevice() {
|
||||||
return isTouchDevice;
|
return isTouchDevice;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Current breakpoint
|
/**
|
||||||
|
* Name of the currently active breakpoint (reactive)
|
||||||
|
*/
|
||||||
get currentBreakpoint() {
|
get currentBreakpoint() {
|
||||||
return currentBreakpoint;
|
return currentBreakpoint;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Methods
|
/**
|
||||||
|
* Initialization function to start event listeners
|
||||||
|
*/
|
||||||
init,
|
init,
|
||||||
|
/**
|
||||||
|
* Helper to check for custom width ranges
|
||||||
|
*/
|
||||||
matches,
|
matches,
|
||||||
|
|
||||||
// Breakpoint values (for custom logic)
|
/**
|
||||||
|
* Underlying breakpoint pixel values
|
||||||
|
*/
|
||||||
breakpoints,
|
breakpoints,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,13 +34,21 @@ import {
|
|||||||
* Defines the bounds and stepping behavior for a control
|
* Defines the bounds and stepping behavior for a control
|
||||||
*/
|
*/
|
||||||
export interface ControlDataModel {
|
export interface ControlDataModel {
|
||||||
/** Current numeric value */
|
/**
|
||||||
|
* Initial or current numeric value
|
||||||
|
*/
|
||||||
value: number;
|
value: number;
|
||||||
/** Minimum allowed value (inclusive) */
|
/**
|
||||||
|
* Lower inclusive bound
|
||||||
|
*/
|
||||||
min: number;
|
min: number;
|
||||||
/** Maximum allowed value (inclusive) */
|
/**
|
||||||
|
* Upper inclusive bound
|
||||||
|
*/
|
||||||
max: number;
|
max: number;
|
||||||
/** Step size for increment/decrement operations */
|
/**
|
||||||
|
* Precision for increment/decrement operations
|
||||||
|
*/
|
||||||
step: number;
|
step: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,13 +58,21 @@ export interface ControlDataModel {
|
|||||||
* @template T - Type for the control identifier
|
* @template T - Type for the control identifier
|
||||||
*/
|
*/
|
||||||
export interface ControlModel<T extends string = string> extends ControlDataModel {
|
export interface ControlModel<T extends string = string> extends ControlDataModel {
|
||||||
/** Unique identifier for the control */
|
/**
|
||||||
|
* Unique string identifier for the control
|
||||||
|
*/
|
||||||
id: T;
|
id: T;
|
||||||
/** ARIA label for the increase button */
|
/**
|
||||||
|
* Label used by screen readers for the increase button
|
||||||
|
*/
|
||||||
increaseLabel?: string;
|
increaseLabel?: string;
|
||||||
/** ARIA label for the decrease button */
|
/**
|
||||||
|
* Label used by screen readers for the decrease button
|
||||||
|
*/
|
||||||
decreaseLabel?: string;
|
decreaseLabel?: string;
|
||||||
/** ARIA label for the control area */
|
/**
|
||||||
|
* Overall label describing the control's purpose
|
||||||
|
*/
|
||||||
controlLabel?: string;
|
controlLabel?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,8 +125,7 @@ export function createTypographyControl<T extends ControlDataModel>(
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
/**
|
/**
|
||||||
* Current control value (getter/setter)
|
* Clamped and rounded control value (reactive)
|
||||||
* Setting automatically clamps to bounds and rounds to step precision
|
|
||||||
*/
|
*/
|
||||||
get value() {
|
get value() {
|
||||||
return value;
|
return value;
|
||||||
@@ -122,27 +137,37 @@ export function createTypographyControl<T extends ControlDataModel>(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Maximum allowed value */
|
/**
|
||||||
|
* Upper limit for the control value
|
||||||
|
*/
|
||||||
get max() {
|
get max() {
|
||||||
return max;
|
return max;
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Minimum allowed value */
|
/**
|
||||||
|
* Lower limit for the control value
|
||||||
|
*/
|
||||||
get min() {
|
get min() {
|
||||||
return min;
|
return min;
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Step increment size */
|
/**
|
||||||
|
* Configured step increment
|
||||||
|
*/
|
||||||
get step() {
|
get step() {
|
||||||
return step;
|
return step;
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Whether the value is at or exceeds the maximum */
|
/**
|
||||||
|
* True if current value is equal to or greater than max
|
||||||
|
*/
|
||||||
get isAtMax() {
|
get isAtMax() {
|
||||||
return isAtMax;
|
return isAtMax;
|
||||||
},
|
},
|
||||||
|
|
||||||
/** Whether the value is at or below the minimum */
|
/**
|
||||||
|
* True if current value is equal to or less than min
|
||||||
|
*/
|
||||||
get isAtMin() {
|
get isAtMin() {
|
||||||
return isAtMin;
|
return isAtMin;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -45,7 +45,9 @@ export interface VirtualItem {
|
|||||||
* Options are reactive - pass them through a function getter to enable updates.
|
* Options are reactive - pass them through a function getter to enable updates.
|
||||||
*/
|
*/
|
||||||
export interface VirtualizerOptions {
|
export interface VirtualizerOptions {
|
||||||
/** Total number of items in the data array */
|
/**
|
||||||
|
* Total number of items in the underlying data array
|
||||||
|
*/
|
||||||
count: number;
|
count: number;
|
||||||
/**
|
/**
|
||||||
* Function to estimate the size of an item at a given index.
|
* Function to estimate the size of an item at a given index.
|
||||||
@@ -60,7 +62,10 @@ export interface VirtualizerOptions {
|
|||||||
* as fonts finish loading, eliminating the DOM-measurement snap on load.
|
* as fonts finish loading, eliminating the DOM-measurement snap on load.
|
||||||
*/
|
*/
|
||||||
estimateSize: (index: number) => number;
|
estimateSize: (index: number) => number;
|
||||||
/** Number of extra items to render outside viewport for smoother scrolling (default: 5) */
|
/**
|
||||||
|
* Number of extra items to render outside viewport for smoother scrolling
|
||||||
|
* @default 5
|
||||||
|
*/
|
||||||
overscan?: number;
|
overscan?: number;
|
||||||
/**
|
/**
|
||||||
* Function to get the key of an item at a given index.
|
* Function to get the key of an item at a given index.
|
||||||
@@ -170,7 +175,9 @@ export function createVirtualizer<T>(
|
|||||||
const { count, data } = options;
|
const { count, data } = options;
|
||||||
// Implicit dependency
|
// Implicit dependency
|
||||||
const v = _version;
|
const v = _version;
|
||||||
if (count === 0 || containerHeight === 0 || !data) return [];
|
if (count === 0 || containerHeight === 0 || !data) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
const overscan = options.overscan ?? 5;
|
const overscan = options.overscan ?? 5;
|
||||||
|
|
||||||
@@ -259,7 +266,9 @@ export function createVirtualizer<T>(
|
|||||||
containerHeight = window.innerHeight;
|
containerHeight = window.innerHeight;
|
||||||
|
|
||||||
const handleScroll = () => {
|
const handleScroll = () => {
|
||||||
if (rafId !== null) return;
|
if (rafId !== null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
rafId = requestAnimationFrame(() => {
|
rafId = requestAnimationFrame(() => {
|
||||||
// Get current position of element relative to viewport
|
// Get current position of element relative to viewport
|
||||||
@@ -318,7 +327,9 @@ export function createVirtualizer<T>(
|
|||||||
};
|
};
|
||||||
|
|
||||||
const resizeObserver = new ResizeObserver(([entry]) => {
|
const resizeObserver = new ResizeObserver(([entry]) => {
|
||||||
if (entry) containerHeight = entry.contentRect.height;
|
if (entry) {
|
||||||
|
containerHeight = entry.contentRect.height;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
node.addEventListener('scroll', handleScroll, { passive: true });
|
node.addEventListener('scroll', handleScroll, { passive: true });
|
||||||
@@ -418,7 +429,9 @@ export function createVirtualizer<T>(
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
function scrollToIndex(index: number, align: 'start' | 'center' | 'end' | 'auto' = 'auto') {
|
function scrollToIndex(index: number, align: 'start' | 'center' | 'end' | 'auto' = 'auto') {
|
||||||
if (!elementRef || index < 0 || index >= options.count) return;
|
if (!elementRef || index < 0 || index >= options.count) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const itemStart = offsets[index];
|
const itemStart = offsets[index];
|
||||||
const itemSize = measuredSizes[index] ?? options.estimateSize(index);
|
const itemSize = measuredSizes[index] ?? options.estimateSize(index);
|
||||||
@@ -426,16 +439,24 @@ export function createVirtualizer<T>(
|
|||||||
const { useWindowScroll } = optionsGetter();
|
const { useWindowScroll } = optionsGetter();
|
||||||
|
|
||||||
if (useWindowScroll) {
|
if (useWindowScroll) {
|
||||||
if (align === 'center') target = itemStart - window.innerHeight / 2 + itemSize / 2;
|
if (align === 'center') {
|
||||||
if (align === 'end') target = itemStart - window.innerHeight + itemSize;
|
target = itemStart - window.innerHeight / 2 + itemSize / 2;
|
||||||
|
}
|
||||||
|
if (align === 'end') {
|
||||||
|
target = itemStart - window.innerHeight + itemSize;
|
||||||
|
}
|
||||||
|
|
||||||
// Add container offset to target to get absolute document position
|
// Add container offset to target to get absolute document position
|
||||||
const absoluteTarget = target + elementOffsetTop;
|
const absoluteTarget = target + elementOffsetTop;
|
||||||
|
|
||||||
window.scrollTo({ top: absoluteTarget, behavior: 'smooth' });
|
window.scrollTo({ top: absoluteTarget, behavior: 'smooth' });
|
||||||
} else {
|
} else {
|
||||||
if (align === 'center') target = itemStart - containerHeight / 2 + itemSize / 2;
|
if (align === 'center') {
|
||||||
if (align === 'end') target = itemStart - containerHeight + itemSize;
|
target = itemStart - containerHeight / 2 + itemSize / 2;
|
||||||
|
}
|
||||||
|
if (align === 'end') {
|
||||||
|
target = itemStart - containerHeight + itemSize;
|
||||||
|
}
|
||||||
|
|
||||||
elementRef.scrollTo({ top: target, behavior: 'smooth' });
|
elementRef.scrollTo({ top: target, behavior: 'smooth' });
|
||||||
}
|
}
|
||||||
@@ -464,27 +485,45 @@ export function createVirtualizer<T>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
/**
|
||||||
|
* Current vertical scroll position in pixels (reactive)
|
||||||
|
*/
|
||||||
get scrollOffset() {
|
get scrollOffset() {
|
||||||
return scrollOffset;
|
return scrollOffset;
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Measured height of the visible container area (reactive)
|
||||||
|
*/
|
||||||
get containerHeight() {
|
get containerHeight() {
|
||||||
return containerHeight;
|
return containerHeight;
|
||||||
},
|
},
|
||||||
/** Computed array of visible items to render (reactive) */
|
/**
|
||||||
|
* Computed array of visible items to render (reactive)
|
||||||
|
*/
|
||||||
get items() {
|
get items() {
|
||||||
return items;
|
return items;
|
||||||
},
|
},
|
||||||
/** Total height of all items in pixels (reactive) */
|
/**
|
||||||
|
* Total height of all items in pixels (reactive)
|
||||||
|
*/
|
||||||
get totalSize() {
|
get totalSize() {
|
||||||
return totalSize;
|
return totalSize;
|
||||||
},
|
},
|
||||||
/** Svelte action for the scrollable container element */
|
/**
|
||||||
|
* Svelte action for the scrollable container element
|
||||||
|
*/
|
||||||
container,
|
container,
|
||||||
/** Svelte action for measuring individual item elements */
|
/**
|
||||||
|
* Svelte action for measuring individual item elements
|
||||||
|
*/
|
||||||
measureElement,
|
measureElement,
|
||||||
/** Programmatic scroll method to scroll to a specific item */
|
/**
|
||||||
|
* Programmatic scroll method to scroll to a specific item
|
||||||
|
*/
|
||||||
scrollToIndex,
|
scrollToIndex,
|
||||||
/** Programmatic scroll method to scroll to a specific pixel offset */
|
/**
|
||||||
|
* Programmatic scroll method to scroll to a specific pixel offset
|
||||||
|
*/
|
||||||
scrollToOffset,
|
scrollToOffset,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import {
|
import {
|
||||||
afterEach,
|
afterEach,
|
||||||
describe,
|
describe,
|
||||||
|
|||||||
@@ -22,59 +22,178 @@
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filter management
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Reactive filter factory
|
||||||
|
*/
|
||||||
createFilter,
|
createFilter,
|
||||||
|
/**
|
||||||
|
* Filter instance type
|
||||||
|
*/
|
||||||
type Filter,
|
type Filter,
|
||||||
|
/**
|
||||||
|
* Initial state model
|
||||||
|
*/
|
||||||
type FilterModel,
|
type FilterModel,
|
||||||
|
/**
|
||||||
|
* Filterable property definition
|
||||||
|
*/
|
||||||
type Property,
|
type Property,
|
||||||
} from './createFilter/createFilter.svelte';
|
} from './createFilter/createFilter.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bounded numeric controls
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Base numeric configuration
|
||||||
|
*/
|
||||||
type ControlDataModel,
|
type ControlDataModel,
|
||||||
|
/**
|
||||||
|
* Extended model with labels
|
||||||
|
*/
|
||||||
type ControlModel,
|
type ControlModel,
|
||||||
|
/**
|
||||||
|
* Reactive control factory
|
||||||
|
*/
|
||||||
createTypographyControl,
|
createTypographyControl,
|
||||||
|
/**
|
||||||
|
* Control instance type
|
||||||
|
*/
|
||||||
type TypographyControl,
|
type TypographyControl,
|
||||||
} from './createTypographyControl/createTypographyControl.svelte';
|
} from './createTypographyControl/createTypographyControl.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List virtualization
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Reactive virtualizer factory
|
||||||
|
*/
|
||||||
createVirtualizer,
|
createVirtualizer,
|
||||||
|
/**
|
||||||
|
* Rendered item layout data
|
||||||
|
*/
|
||||||
type VirtualItem,
|
type VirtualItem,
|
||||||
|
/**
|
||||||
|
* Virtualizer instance type
|
||||||
|
*/
|
||||||
type Virtualizer,
|
type Virtualizer,
|
||||||
|
/**
|
||||||
|
* Configuration options
|
||||||
|
*/
|
||||||
type VirtualizerOptions,
|
type VirtualizerOptions,
|
||||||
} from './createVirtualizer/createVirtualizer.svelte';
|
} from './createVirtualizer/createVirtualizer.svelte';
|
||||||
|
|
||||||
export { createDebouncedState } from './createDebouncedState/createDebouncedState.svelte';
|
/**
|
||||||
|
* UI State
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Immediate/debounced state factory
|
||||||
|
*/
|
||||||
|
createDebouncedState,
|
||||||
|
} from './createDebouncedState/createDebouncedState.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Entity collections
|
||||||
|
*/
|
||||||
|
export {
|
||||||
|
/**
|
||||||
|
* Reactive entity store factory
|
||||||
|
*/
|
||||||
createEntityStore,
|
createEntityStore,
|
||||||
|
/**
|
||||||
|
* Base entity requirement
|
||||||
|
*/
|
||||||
type Entity,
|
type Entity,
|
||||||
|
/**
|
||||||
|
* Entity store instance type
|
||||||
|
*/
|
||||||
type EntityStore,
|
type EntityStore,
|
||||||
} from './createEntityStore/createEntityStore.svelte';
|
} from './createEntityStore/createEntityStore.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Comparison logic
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Character-by-character comparison utility
|
||||||
|
*/
|
||||||
CharacterComparisonEngine,
|
CharacterComparisonEngine,
|
||||||
|
/**
|
||||||
|
* Single line of comparison results
|
||||||
|
*/
|
||||||
type ComparisonLine,
|
type ComparisonLine,
|
||||||
|
/**
|
||||||
|
* Full comparison output
|
||||||
|
*/
|
||||||
type ComparisonResult,
|
type ComparisonResult,
|
||||||
} from './CharacterComparisonEngine/CharacterComparisonEngine.svelte';
|
} from './CharacterComparisonEngine/CharacterComparisonEngine.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Text layout
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Single line layout information
|
||||||
|
*/
|
||||||
type LayoutLine as TextLayoutLine,
|
type LayoutLine as TextLayoutLine,
|
||||||
|
/**
|
||||||
|
* Full multi-line layout information
|
||||||
|
*/
|
||||||
type LayoutResult as TextLayoutResult,
|
type LayoutResult as TextLayoutResult,
|
||||||
|
/**
|
||||||
|
* High-level text measurement engine
|
||||||
|
*/
|
||||||
TextLayoutEngine,
|
TextLayoutEngine,
|
||||||
} from './TextLayoutEngine/TextLayoutEngine.svelte';
|
} from './TextLayoutEngine/TextLayoutEngine.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persistence
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* LocalStorage-backed reactive store factory
|
||||||
|
*/
|
||||||
createPersistentStore,
|
createPersistentStore,
|
||||||
|
/**
|
||||||
|
* Persistent store instance type
|
||||||
|
*/
|
||||||
type PersistentStore,
|
type PersistentStore,
|
||||||
} from './createPersistentStore/createPersistentStore.svelte';
|
} from './createPersistentStore/createPersistentStore.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Responsive design
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Breakpoint tracking factory
|
||||||
|
*/
|
||||||
createResponsiveManager,
|
createResponsiveManager,
|
||||||
|
/**
|
||||||
|
* Responsive manager instance type
|
||||||
|
*/
|
||||||
type ResponsiveManager,
|
type ResponsiveManager,
|
||||||
|
/**
|
||||||
|
* Singleton manager for global usage
|
||||||
|
*/
|
||||||
responsiveManager,
|
responsiveManager,
|
||||||
} from './createResponsiveManager/createResponsiveManager.svelte';
|
} from './createResponsiveManager/createResponsiveManager.svelte';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 3D Perspectives
|
||||||
|
*/
|
||||||
export {
|
export {
|
||||||
|
/**
|
||||||
|
* Motion-aware perspective factory
|
||||||
|
*/
|
||||||
createPerspectiveManager,
|
createPerspectiveManager,
|
||||||
|
/**
|
||||||
|
* Perspective manager instance type
|
||||||
|
*/
|
||||||
type PerspectiveManager,
|
type PerspectiveManager,
|
||||||
} from './createPerspectiveManager/createPerspectiveManager.svelte';
|
} from './createPerspectiveManager/createPerspectiveManager.svelte';
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
correctly via the HTML element's class attribute.
|
correctly via the HTML element's class attribute.
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils';
|
import clsx from 'clsx';
|
||||||
import type {
|
import type {
|
||||||
Component,
|
Component,
|
||||||
Snippet,
|
Snippet,
|
||||||
@@ -32,7 +32,7 @@ let { icon: Icon, class: className, attrs = {} }: Props = $props();
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if Icon}
|
{#if Icon}
|
||||||
{@const __iconClass__ = cn('size-4', className)}
|
{@const __iconClass__ = clsx('size-4', className)}
|
||||||
<!-- Render icon component dynamically with class prop -->
|
<!-- Render icon component dynamically with class prop -->
|
||||||
<Icon
|
<Icon
|
||||||
class={__iconClass__}
|
class={__iconClass__}
|
||||||
|
|||||||
@@ -4,13 +4,11 @@
|
|||||||
|
|
||||||
Provides:
|
Provides:
|
||||||
- responsive: ResponsiveManager context for breakpoint tracking
|
- responsive: ResponsiveManager context for breakpoint tracking
|
||||||
- tooltip: Tooltip.Provider context for shadcn Tooltip components
|
|
||||||
- Additional Radix UI providers can be added here as needed
|
- Additional Radix UI providers can be added here as needed
|
||||||
-->
|
-->
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { createResponsiveManager } from '$shared/lib';
|
import { createResponsiveManager } from '$shared/lib';
|
||||||
import type { ResponsiveManager } from '$shared/lib';
|
import type { ResponsiveManager } from '$shared/lib';
|
||||||
import { Provider as TooltipProvider } from '$shared/shadcn/ui/tooltip';
|
|
||||||
import { setContext } from 'svelte';
|
import { setContext } from 'svelte';
|
||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
|
|
||||||
@@ -19,33 +17,9 @@ interface Props {
|
|||||||
* Content snippet
|
* Content snippet
|
||||||
*/
|
*/
|
||||||
children: Snippet;
|
children: Snippet;
|
||||||
/**
|
|
||||||
* Initial viewport width
|
|
||||||
* @default 1280
|
|
||||||
*/
|
|
||||||
initialWidth?: number;
|
|
||||||
/**
|
|
||||||
* Initial viewport height
|
|
||||||
* @default 720
|
|
||||||
*/
|
|
||||||
initialHeight?: number;
|
|
||||||
/**
|
|
||||||
* Tooltip delay duration
|
|
||||||
*/
|
|
||||||
tooltipDelayDuration?: number;
|
|
||||||
/**
|
|
||||||
* Tooltip skip delay duration
|
|
||||||
*/
|
|
||||||
tooltipSkipDelayDuration?: number;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let {
|
let { children }: Props = $props();
|
||||||
children,
|
|
||||||
initialWidth = 1280,
|
|
||||||
initialHeight = 720,
|
|
||||||
tooltipDelayDuration = 200,
|
|
||||||
tooltipSkipDelayDuration = 300,
|
|
||||||
}: Props = $props();
|
|
||||||
|
|
||||||
// Create a responsive manager with default breakpoints
|
// Create a responsive manager with default breakpoints
|
||||||
const responsiveManager = createResponsiveManager();
|
const responsiveManager = createResponsiveManager();
|
||||||
@@ -60,10 +34,5 @@ setContext<ResponsiveManager>('responsive', responsiveManager);
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="storybook-providers" style:width="100%" style:height="100%">
|
<div class="storybook-providers" style:width="100%" style:height="100%">
|
||||||
<TooltipProvider
|
|
||||||
delayDuration={tooltipDelayDuration}
|
|
||||||
skipDelayDuration={tooltipSkipDelayDuration}
|
|
||||||
>
|
|
||||||
{@render children()}
|
{@render children()}
|
||||||
</TooltipProvider>
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
/** @vitest-environment jsdom */
|
/**
|
||||||
|
* @vitest-environment jsdom
|
||||||
|
*/
|
||||||
import {
|
import {
|
||||||
afterEach,
|
afterEach,
|
||||||
beforeEach,
|
beforeEach,
|
||||||
|
|||||||
@@ -18,7 +18,9 @@ export function smoothScroll(node: HTMLAnchorElement) {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
const hash = node.getAttribute('href');
|
const hash = node.getAttribute('href');
|
||||||
if (!hash || hash === '#') return;
|
if (!hash || hash === '#') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const targetElement = document.querySelector(hash);
|
const targetElement = document.querySelector(hash);
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,9 @@ export function throttle<T extends (...args: any[]) => any>(
|
|||||||
fn(...args);
|
fn(...args);
|
||||||
} else {
|
} else {
|
||||||
// Schedule for end of wait period (trailing edge)
|
// Schedule for end of wait period (trailing edge)
|
||||||
if (timeoutId) clearTimeout(timeoutId);
|
if (timeoutId) {
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
}
|
||||||
timeoutId = setTimeout(() => {
|
timeoutId = setTimeout(() => {
|
||||||
lastCall = Date.now();
|
lastCall = Date.now();
|
||||||
fn(...args);
|
fn(...args);
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import { MediaQuery } from 'svelte/reactivity';
|
|
||||||
|
|
||||||
const DEFAULT_MOBILE_BREAKPOINT = 768;
|
|
||||||
|
|
||||||
export class IsMobile extends MediaQuery {
|
|
||||||
constructor(breakpoint: number = DEFAULT_MOBILE_BREAKPOINT) {
|
|
||||||
super(`max-width: ${breakpoint - 1}px`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import Close from './popover-close.svelte';
|
|
||||||
import Content from './popover-content.svelte';
|
|
||||||
import Portal from './popover-portal.svelte';
|
|
||||||
import Trigger from './popover-trigger.svelte';
|
|
||||||
import Root from './popover.svelte';
|
|
||||||
|
|
||||||
export {
|
|
||||||
Close,
|
|
||||||
Close as PopoverClose,
|
|
||||||
Content,
|
|
||||||
Content as PopoverContent,
|
|
||||||
Portal,
|
|
||||||
Portal as PopoverPortal,
|
|
||||||
Root,
|
|
||||||
//
|
|
||||||
Root as Popover,
|
|
||||||
Trigger,
|
|
||||||
Trigger as PopoverTrigger,
|
|
||||||
};
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { Popover as PopoverPrimitive } from 'bits-ui';
|
|
||||||
|
|
||||||
let { ref = $bindable(null), ...restProps }: PopoverPrimitive.CloseProps = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PopoverPrimitive.Close bind:ref data-slot="popover-close" {...restProps} />
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import {
|
|
||||||
type WithoutChildrenOrChild,
|
|
||||||
cn,
|
|
||||||
} from '$shared/shadcn/utils/shadcn-utils.js';
|
|
||||||
import { Popover as PopoverPrimitive } from 'bits-ui';
|
|
||||||
import type { ComponentProps } from 'svelte';
|
|
||||||
import PopoverPortal from './popover-portal.svelte';
|
|
||||||
|
|
||||||
let {
|
|
||||||
ref = $bindable(null),
|
|
||||||
class: className,
|
|
||||||
sideOffset = 4,
|
|
||||||
align = 'center',
|
|
||||||
portalProps,
|
|
||||||
...restProps
|
|
||||||
}: PopoverPrimitive.ContentProps & {
|
|
||||||
portalProps?: WithoutChildrenOrChild<ComponentProps<typeof PopoverPortal>>;
|
|
||||||
} = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PopoverPortal {...portalProps}>
|
|
||||||
<PopoverPrimitive.Content
|
|
||||||
bind:ref
|
|
||||||
data-slot="popover-content"
|
|
||||||
{sideOffset}
|
|
||||||
{align}
|
|
||||||
class={cn(
|
|
||||||
'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden',
|
|
||||||
className,
|
|
||||||
)}
|
|
||||||
{...restProps}
|
|
||||||
/>
|
|
||||||
</PopoverPortal>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { Popover as PopoverPrimitive } from 'bits-ui';
|
|
||||||
|
|
||||||
let { ...restProps }: PopoverPrimitive.PortalProps = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PopoverPrimitive.Portal {...restProps} />
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils.js';
|
|
||||||
import { Popover as PopoverPrimitive } from 'bits-ui';
|
|
||||||
|
|
||||||
let {
|
|
||||||
ref = $bindable(null),
|
|
||||||
class: className,
|
|
||||||
...restProps
|
|
||||||
}: PopoverPrimitive.TriggerProps = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PopoverPrimitive.Trigger
|
|
||||||
bind:ref
|
|
||||||
data-slot="popover-trigger"
|
|
||||||
class={cn('', className)}
|
|
||||||
{...restProps}
|
|
||||||
/>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { Popover as PopoverPrimitive } from 'bits-ui';
|
|
||||||
|
|
||||||
let { open = $bindable(false), ...restProps }: PopoverPrimitive.RootProps = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PopoverPrimitive.Root bind:open {...restProps} />
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import Content from './tooltip-content.svelte';
|
|
||||||
import Portal from './tooltip-portal.svelte';
|
|
||||||
import Provider from './tooltip-provider.svelte';
|
|
||||||
import Trigger from './tooltip-trigger.svelte';
|
|
||||||
import Root from './tooltip.svelte';
|
|
||||||
|
|
||||||
export {
|
|
||||||
Content,
|
|
||||||
Content as TooltipContent,
|
|
||||||
Portal,
|
|
||||||
Portal as TooltipPortal,
|
|
||||||
Provider,
|
|
||||||
Provider as TooltipProvider,
|
|
||||||
Root,
|
|
||||||
//
|
|
||||||
Root as Tooltip,
|
|
||||||
Trigger,
|
|
||||||
Trigger as TooltipTrigger,
|
|
||||||
};
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { cn } from '$shared/shadcn/utils/shadcn-utils.js';
|
|
||||||
import type { WithoutChildrenOrChild } from '$shared/shadcn/utils/shadcn-utils.js';
|
|
||||||
import { Tooltip as TooltipPrimitive } from 'bits-ui';
|
|
||||||
import type { ComponentProps } from 'svelte';
|
|
||||||
import TooltipPortal from './tooltip-portal.svelte';
|
|
||||||
|
|
||||||
let {
|
|
||||||
ref = $bindable(null),
|
|
||||||
class: className,
|
|
||||||
sideOffset = 0,
|
|
||||||
side = 'top',
|
|
||||||
children,
|
|
||||||
arrowClasses,
|
|
||||||
portalProps,
|
|
||||||
...restProps
|
|
||||||
}: TooltipPrimitive.ContentProps & {
|
|
||||||
arrowClasses?: string;
|
|
||||||
portalProps?: WithoutChildrenOrChild<ComponentProps<typeof TooltipPortal>>;
|
|
||||||
} = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<TooltipPortal {...portalProps}>
|
|
||||||
<TooltipPrimitive.Content
|
|
||||||
bind:ref
|
|
||||||
data-slot="tooltip-content"
|
|
||||||
{sideOffset}
|
|
||||||
{side}
|
|
||||||
class={cn(
|
|
||||||
'bg-foreground text-background animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-end-2 data-[side=right]:slide-in-from-start-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--bits-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance',
|
|
||||||
className,
|
|
||||||
)}
|
|
||||||
{...restProps}
|
|
||||||
>
|
|
||||||
{@render children?.()}
|
|
||||||
<TooltipPrimitive.Arrow>
|
|
||||||
{#snippet child({ props })}
|
|
||||||
<div
|
|
||||||
class={cn(
|
|
||||||
'bg-primary z-50 size-2.5 rotate-45 rounded-[2px]',
|
|
||||||
'data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]',
|
|
||||||
'data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]',
|
|
||||||
'data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2',
|
|
||||||
'data-[side=left]:-translate-y-[calc(50%_-_3px)]',
|
|
||||||
arrowClasses,
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
{/snippet}
|
|
||||||
</TooltipPrimitive.Arrow>
|
|
||||||
</TooltipPrimitive.Content>
|
|
||||||
</TooltipPortal>
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user