chore: purge shadcn from codebase. Replace with bits-ui components and other tools

This commit is contained in:
Ilia Mashkov
2026-04-17 13:37:44 +03:00
parent 0004b81e40
commit 8a93c7b545
55 changed files with 90 additions and 351 deletions

View File

@@ -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

View File

@@ -4,7 +4,7 @@
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';

View File

@@ -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)

View File

@@ -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"
}

View File

@@ -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}"

View File

@@ -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",

View File

@@ -17,7 +17,7 @@
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 { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import { import {
type Snippet, type Snippet,
onDestroy, onDestroy,
@@ -78,7 +78,7 @@ 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' : '',
)} )}

View File

@@ -6,7 +6,7 @@
- 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 {
@@ -64,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

View File

@@ -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',
@@ -77,7 +77,7 @@ function handleReset() {
variant="ghost" variant="ghost"
size={isMobileOrTabletPortrait ? 'xs' : 'sm'} size={isMobileOrTabletPortrait ? 'xs' : 'sm'}
onclick={handleReset} onclick={handleReset}
class={cn('group font-mono tracking-widest text-neutral-400', isMobileOrTabletPortrait && 'px-0')} class={clsx('group font-mono tracking-widest text-neutral-400', isMobileOrTabletPortrait && 'px-0')}
iconPosition="left" iconPosition="left"
> >
{#snippet icon()} {#snippet icon()}

View File

@@ -12,7 +12,6 @@ import {
MULTIPLIER_S, MULTIPLIER_S,
} from '$entities/Font'; } 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 {
ComboControl, ComboControl,
ControlGroup, ControlGroup,
@@ -21,6 +20,7 @@ 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';
@@ -74,7 +74,7 @@ $effect(() => {
{#snippet child({ props })} {#snippet child({ props })}
<button <button
{...props} {...props}
class={cn( class={clsx(
'inline-flex items-center justify-center', 'inline-flex items-center justify-center',
'size-8 p-0', 'size-8 p-0',
'border border-transparent rounded-none', 'border border-transparent rounded-none',
@@ -95,7 +95,7 @@ $effect(() => {
side="top" side="top"
align="start" align="start"
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-subtle', 'border border-subtle',
@@ -149,11 +149,11 @@ $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-subtle', 'border border-subtle',

View File

@@ -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__}

View File

@@ -4,7 +4,6 @@
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">

View File

@@ -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`);
}
}

View File

@@ -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,
};

View File

@@ -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} />

View File

@@ -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>

View File

@@ -1,7 +0,0 @@
<script lang="ts">
import { Popover as PopoverPrimitive } from 'bits-ui';
let { ...restProps }: PopoverPrimitive.PortalProps = $props();
</script>
<PopoverPrimitive.Portal {...restProps} />

View File

@@ -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}
/>

View File

@@ -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} />

View File

@@ -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,
};

View File

@@ -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>

View File

@@ -1,7 +0,0 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { ...restProps }: TooltipPrimitive.PortalProps = $props();
</script>
<TooltipPrimitive.Portal {...restProps} />

View File

@@ -1,7 +0,0 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { ...restProps }: TooltipPrimitive.ProviderProps = $props();
</script>
<TooltipPrimitive.Provider {...restProps} />

View File

@@ -1,7 +0,0 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { ref = $bindable(null), ...restProps }: TooltipPrimitive.TriggerProps = $props();
</script>
<TooltipPrimitive.Trigger bind:ref data-slot="tooltip-trigger" {...restProps} />

View File

@@ -1,7 +0,0 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
</script>
<TooltipPrimitive.Root bind:open {...restProps} />

View File

@@ -1,40 +0,0 @@
import {
type ClassValue,
clsx,
} from 'clsx';
import { twMerge } from 'tailwind-merge';
/**
* Utility function to merge Tailwind CSS classes
* Combines clsx for conditional classes and tailwind-merge to handle conflicts
*/
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
/**
* Type utility to add a ref property to HTML element attributes
* Used in shadcn-svelte components to support element references
* @template T - The attributes type (e.g., HTMLAttributes<HTMLDivElement>)
* @template E - The element type (e.g., HTMLDivElement)
*/
export type WithElementRef<T, E extends HTMLElement = HTMLElement> = T & {
/**
* Reference to the DOM element
*/
ref?: E | null;
};
/**
* Type utility to remove 'children' and 'child' properties from a type
* Used in shadcn-svelte components that use Snippets instead of children
* @template T - The type to remove children from
*/
export type WithoutChildren<T> = Omit<T, 'children'>;
/**
* Type utility to remove 'children' and 'child' properties from a type
* Used in shadcn-svelte components that use Snippets instead of children
* @template T - The type to remove children and child from
*/
export type WithoutChildrenOrChild<T> = Omit<T, 'children' | 'child'>;

View File

@@ -3,11 +3,11 @@
Pill badge with border and optional status dot. Pill badge with border and optional status dot.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { import {
type LabelSize, type LabelSize,
labelSizeConfig, labelSizeConfig,
} from '$shared/ui/Label/config'; } from '$shared/ui/Label/config';
import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import type { HTMLAttributes } from 'svelte/elements'; import type { HTMLAttributes } from 'svelte/elements';
@@ -64,7 +64,7 @@ let {
</script> </script>
<span <span
class={cn( class={clsx(
'inline-flex items-center gap-1 px-2 py-0.5 border rounded-full', 'inline-flex items-center gap-1 px-2 py-0.5 border rounded-full',
'font-mono uppercase tracking-wide', 'font-mono uppercase tracking-wide',
labelSizeConfig[size], labelSizeConfig[size],

View File

@@ -3,7 +3,7 @@
design-system button. Uppercase, zero border-radius, Space Grotesk. design-system button. Uppercase, zero border-radius, Space Grotesk.
--> -->
<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 type { HTMLButtonAttributes } from 'svelte/elements'; import type { HTMLButtonAttributes } from 'svelte/elements';
import type { import type {
@@ -71,7 +71,7 @@ let {
const isIconOnly = $derived(!!icon && !children); const isIconOnly = $derived(!!icon && !children);
const variantStyles: Record<ButtonVariant, string> = { const variantStyles: Record<ButtonVariant, string> = {
primary: cn( primary: clsx(
'bg-swiss-red text-white', 'bg-swiss-red text-white',
'hover:bg-swiss-red/90', 'hover:bg-swiss-red/90',
'active:bg-swiss-red/80', 'active:bg-swiss-red/80',
@@ -87,7 +87,7 @@ const variantStyles: Record<ButtonVariant, string> = {
'disabled:cursor-not-allowed', 'disabled:cursor-not-allowed',
'disabled:transform-none', 'disabled:transform-none',
), ),
secondary: cn( secondary: clsx(
'bg-surface dark:bg-paper', 'bg-surface dark:bg-paper',
'text-swiss-black dark:text-neutral-200', 'text-swiss-black dark:text-neutral-200',
'border border-black/10 dark:border-white/10', 'border border-black/10 dark:border-white/10',
@@ -98,7 +98,7 @@ const variantStyles: Record<ButtonVariant, string> = {
'disabled:text-neutral-400 dark:disabled:text-neutral-600', 'disabled:text-neutral-400 dark:disabled:text-neutral-600',
'disabled:cursor-not-allowed', 'disabled:cursor-not-allowed',
), ),
outline: cn( outline: clsx(
'bg-transparent', 'bg-transparent',
'text-swiss-black dark:text-neutral-200', 'text-swiss-black dark:text-neutral-200',
'border border-black/20 dark:border-white/20', 'border border-black/20 dark:border-white/20',
@@ -109,7 +109,7 @@ const variantStyles: Record<ButtonVariant, string> = {
'disabled:text-neutral-400 dark:disabled:text-neutral-600', 'disabled:text-neutral-400 dark:disabled:text-neutral-600',
'disabled:cursor-not-allowed', 'disabled:cursor-not-allowed',
), ),
ghost: cn( ghost: clsx(
'bg-transparent', 'bg-transparent',
'text-secondary', 'text-secondary',
'border border-transparent', 'border border-transparent',
@@ -119,7 +119,7 @@ const variantStyles: Record<ButtonVariant, string> = {
'disabled:text-neutral-400 dark:disabled:text-neutral-600', 'disabled:text-neutral-400 dark:disabled:text-neutral-600',
'disabled:cursor-not-allowed', 'disabled:cursor-not-allowed',
), ),
icon: cn( icon: clsx(
'bg-surface dark:bg-dark-bg', 'bg-surface dark:bg-dark-bg',
'text-secondary', 'text-secondary',
'border border-transparent', 'border border-transparent',
@@ -130,8 +130,8 @@ const variantStyles: Record<ButtonVariant, string> = {
'disabled:text-neutral-400 dark:disabled:text-neutral-600', 'disabled:text-neutral-400 dark:disabled:text-neutral-600',
'disabled:cursor-not-allowed', 'disabled:cursor-not-allowed',
), ),
tertiary: cn( tertiary: clsx(
// Font override — must come after base in cn() to win via tailwind-merge // Font override — must come after base in clsx() to win via tailwind-merge
'font-secondary font-medium normal-case tracking-normal', 'font-secondary font-medium normal-case tracking-normal',
// Inactive state // Inactive state
'bg-transparent', 'bg-transparent',
@@ -175,7 +175,7 @@ const activeStyles: Partial<Record<ButtonVariant, string>> = {
icon: 'bg-paper dark:bg-paper text-brand border-subtle', icon: 'bg-paper dark:bg-paper text-brand border-subtle',
}; };
const classes = $derived(cn( const classes = $derived(clsx(
// Base // Base
'inline-flex items-center justify-center', 'inline-flex items-center justify-center',
'font-primary font-bold tracking-tight uppercase', 'font-primary font-bold tracking-tight uppercase',

View File

@@ -4,7 +4,7 @@
Use for segmented controls, view toggles, or any mutually exclusive button set. Use for segmented controls, view toggles, or any mutually exclusive button set.
--> -->
<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 type { HTMLAttributes } from 'svelte/elements'; import type { HTMLAttributes } from 'svelte/elements';
@@ -23,7 +23,7 @@ let { children, class: className, ...rest }: Props = $props();
</script> </script>
<div <div
class={cn( class={clsx(
'flex items-center gap-1 p-1', 'flex items-center gap-1 p-1',
'bg-surface dark:bg-dark-bg', 'bg-surface dark:bg-dark-bg',
'border border-subtle', 'border border-subtle',

View File

@@ -5,12 +5,12 @@
--> -->
<script lang="ts"> <script lang="ts">
import type { TypographyControl } from '$shared/lib'; import type { TypographyControl } from '$shared/lib';
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Slider } from '$shared/ui'; import { Slider } from '$shared/ui';
import { Button } from '$shared/ui/Button'; import { Button } from '$shared/ui/Button';
import MinusIcon from '@lucide/svelte/icons/minus'; import MinusIcon from '@lucide/svelte/icons/minus';
import PlusIcon from '@lucide/svelte/icons/plus'; import PlusIcon from '@lucide/svelte/icons/plus';
import { Popover } from 'bits-ui'; import { Popover } from 'bits-ui';
import clsx from 'clsx';
import TechText from '../TechText/TechText.svelte'; import TechText from '../TechText/TechText.svelte';
interface Props { interface Props {
@@ -78,7 +78,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
--> -->
{#if reduced} {#if reduced}
<div <div
class={cn( class={clsx(
'flex gap-4 items-end w-full', 'flex gap-4 items-end w-full',
className, className,
)} )}
@@ -98,7 +98,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
<!-- ── FULL MODE ──────────────────────────────────────────────────────────────── --> <!-- ── FULL MODE ──────────────────────────────────────────────────────────────── -->
{:else} {:else}
<div class={cn('flex items-center px-1 relative', className)}> <div class={clsx('flex items-center px-1 relative', className)}>
<!-- Decrease button --> <!-- Decrease button -->
<Button <Button
variant="icon" variant="icon"
@@ -119,7 +119,7 @@ const displayLabel = $derived(label ?? controlLabel ?? '');
{#snippet child({ props })} {#snippet child({ props })}
<button <button
{...props} {...props}
class={cn( class={clsx(
'flex flex-col items-center justify-center w-14 py-1', 'flex flex-col items-center justify-center w-14 py-1',
'select-none rounded-none transition-all duration-150', 'select-none rounded-none transition-all duration-150',
'border border-transparent', 'border border-transparent',

View File

@@ -3,7 +3,7 @@
Labeled container for form controls Labeled container for form controls
--> -->
<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';
interface Props { interface Props {
@@ -24,7 +24,7 @@ interface Props {
const { label, children, class: className }: Props = $props(); const { label, children, class: className }: Props = $props();
</script> </script>
<div class={cn('flex flex-col gap-3 py-6 border-b border-subtle last:border-0', className)}> <div class={clsx('flex flex-col gap-3 py-6 border-b border-subtle last:border-0', className)}>
<div class="flex justify-between items-center text-xs font-primary font-bold tracking-tight text-neutral-900 dark:text-neutral-100 uppercase leading-none"> <div class="flex justify-between items-center text-xs font-primary font-bold tracking-tight text-neutral-900 dark:text-neutral-100 uppercase leading-none">
{label} {label}
</div> </div>

View File

@@ -3,7 +3,7 @@
1px separator line, horizontal or vertical. 1px separator line, horizontal or vertical.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
interface Props { interface Props {
/** /**
@@ -24,7 +24,7 @@ let {
</script> </script>
<div <div
class={cn( class={clsx(
'bg-black/10 dark:bg-white/10', 'bg-black/10 dark:bg-white/10',
orientation === 'horizontal' ? 'w-full h-px' : 'w-px h-full', orientation === 'horizontal' ? 'w-full h-px' : 'w-px h-full',
className, className,

View File

@@ -4,11 +4,11 @@
--> -->
<script lang="ts"> <script lang="ts">
import type { Filter } from '$shared/lib'; import type { Filter } 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 ChevronUpIcon from '@lucide/svelte/icons/chevron-up'; import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
import EllipsisIcon from '@lucide/svelte/icons/ellipsis'; import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import clsx from 'clsx';
import { cubicOut } from 'svelte/easing'; import { cubicOut } from 'svelte/easing';
import { import {
draw, draw,
@@ -68,7 +68,7 @@ $effect(() => {
</svg> </svg>
{/snippet} {/snippet}
<div class={cn('flex flex-col', className)}> <div class={clsx('flex flex-col', className)}>
<Label <Label
variant="default" variant="default"
size="sm" size="sm"

View File

@@ -3,7 +3,7 @@
Provides classes for styling footnotes Provides classes for styling footnotes
--> -->
<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';
interface Props { interface Props {
@@ -26,14 +26,14 @@ const { children, class: className, render }: Props = $props();
{#if render} {#if render}
{@render render({ {@render render({
class: cn( class: clsx(
'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft', 'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft',
className, className,
), ),
})} })}
{:else if children} {:else if children}
<span <span
class={cn( class={clsx(
'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft', 'font-mono text-3xs sm:text-2xs lowercase tracking-wider-mono text-text-soft',
className, className,
)} )}

View File

@@ -3,8 +3,8 @@
design-system input. Zero border-radius, Space Grotesk, precise states. design-system input. Zero border-radius, Space Grotesk, precise states.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import XIcon from '@lucide/svelte/icons/x'; import XIcon from '@lucide/svelte/icons/x';
import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import { cubicOut } from 'svelte/easing'; import { cubicOut } from 'svelte/easing';
import type { HTMLInputAttributes } from 'svelte/elements'; import type { HTMLInputAttributes } from 'svelte/elements';
@@ -90,7 +90,7 @@ const hasRightSlot = $derived(!!rightIcon || showClearButton);
const cfg = $derived(inputSizeConfig[size]); const cfg = $derived(inputSizeConfig[size]);
const styles = $derived(inputVariantConfig[variant]); const styles = $derived(inputVariantConfig[variant]);
const inputClasses = $derived(cn( const inputClasses = $derived(clsx(
'font-primary rounded-none outline-none transition-all duration-200', 'font-primary rounded-none outline-none transition-all duration-200',
'text-neutral-900 dark:text-neutral-100', 'text-neutral-900 dark:text-neutral-100',
'placeholder:text-neutral-400 dark:placeholder:text-neutral-600', 'placeholder:text-neutral-400 dark:placeholder:text-neutral-600',
@@ -107,8 +107,8 @@ const inputClasses = $derived(cn(
)); ));
</script> </script>
<div class={cn('flex flex-col gap-1', fullWidth && 'w-full')}> <div class={clsx('flex flex-col gap-1', fullWidth && 'w-full')}>
<div class={cn('relative group', fullWidth && 'w-full')}> <div class={clsx('relative group', fullWidth && 'w-full')}>
<!-- Left icon slot --> <!-- Left icon slot -->
{#if leftIcon} {#if leftIcon}
<div class="absolute left-3 top-1/2 -translate-y-1/2 text-neutral-400 dark:text-neutral-600 pointer-events-none z-10 flex items-center"> <div class="absolute left-3 top-1/2 -translate-y-1/2 text-neutral-400 dark:text-neutral-600 pointer-events-none z-10 flex items-center">
@@ -147,7 +147,7 @@ const inputClasses = $derived(cn(
<!-- Helper / error text --> <!-- Helper / error text -->
{#if helperText} {#if helperText}
<span <span
class={cn( class={clsx(
'text-2xs font-mono tracking-wide px-1', 'text-2xs font-mono tracking-wide px-1',
error ? 'text-brand ' : 'text-secondary', error ? 'text-brand ' : 'text-secondary',
)} )}

View File

@@ -3,7 +3,7 @@
Inline monospace label. The base primitive for all micrographic text. Inline monospace label. The base primitive for all micrographic text.
--> -->
<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 { import {
type LabelFont, type LabelFont,
@@ -72,7 +72,7 @@ let {
</script> </script>
<span <span
class={cn( class={clsx(
'font-mono tracking-widest leading-none', 'font-mono tracking-widest leading-none',
'inline-flex items-center gap-1.5', 'inline-flex items-center gap-1.5',
font === 'primary' && 'font-primary tracking-tight', font === 'primary' && 'font-primary tracking-tight',

View File

@@ -3,8 +3,8 @@
Project logo with apropriate styles Project logo with apropriate styles
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Badge } from '$shared/ui'; import { Badge } from '$shared/ui';
import clsx from 'clsx';
interface Props { interface Props {
/** /**
@@ -18,7 +18,7 @@ const { class: className }: Props = $props();
const title = 'GLYPHDIFF'; const title = 'GLYPHDIFF';
</script> </script>
<div class={cn('flex items-center gap-2 md:gap-3 select-none', className)}> <div class={clsx('flex items-center gap-2 md:gap-3 select-none', className)}>
<h1 class="font-logo font-extrabold text-base md:text-xl tracking-tight text-swiss-black dark:text-neutral-200"> <h1 class="font-logo font-extrabold text-base md:text-xl tracking-tight text-swiss-black dark:text-neutral-200">
{title} {title}
</h1> </h1>

View File

@@ -5,7 +5,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import type { PerspectiveManager } from '$shared/lib'; import type { PerspectiveManager } from '$shared/lib';
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import { type Snippet } from 'svelte'; import { type Snippet } from 'svelte';
interface Props { interface Props {
@@ -73,7 +73,7 @@ const isVisible = $derived(manager.isFront);
</script> </script>
<div <div
class={cn('will-change-transform', className)} class={clsx('will-change-transform', className)}
style:transform-style="preserve-3d" style:transform-style="preserve-3d"
style:transform={style?.transform} style:transform={style?.transform}
style:filter={style?.filter} style:filter={style?.filter}

View File

@@ -3,8 +3,8 @@
Numbered section heading with optional subtitle and pulse dot. Numbered section heading with optional subtitle and pulse dot.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Label } from '$shared/ui'; import { Label } from '$shared/ui';
import clsx from 'clsx';
interface Props { interface Props {
/** /**
@@ -41,7 +41,7 @@ let {
const indexStr = $derived(String(index).padStart(2, '0')); const indexStr = $derived(String(index).padStart(2, '0'));
</script> </script>
<div class={cn('flex items-center gap-3 md:gap-4 mb-2', className)}> <div class={clsx('flex items-center gap-3 md:gap-4 mb-2', className)}>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
{#if pulse} {#if pulse}
<span class="w-1.5 h-1.5 bg-brand rounded-full animate-pulse"></span> <span class="w-1.5 h-1.5 bg-brand rounded-full animate-pulse"></span>

View File

@@ -3,7 +3,7 @@
A horizontal separator line used to visually separate sections within a page. A horizontal separator line used to visually separate sections within a page.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
interface Props { interface Props {
/** /**
@@ -15,4 +15,4 @@ interface Props {
const { class: className = '' }: Props = $props(); const { class: className = '' }: Props = $props();
</script> </script>
<div class={cn('w-full h-px bg-swiss-black/5 dark:bg-white/10 my-8 md:my-12', className)}></div> <div class={clsx('w-full h-px bg-swiss-black/5 dark:bg-white/10 my-8 md:my-12', className)}></div>

View File

@@ -4,7 +4,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import type { ResponsiveManager } from '$shared/lib'; import type { ResponsiveManager } from '$shared/lib';
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import { getContext } from 'svelte'; import { getContext } from 'svelte';
import { cubicOut } from 'svelte/easing'; import { cubicOut } from 'svelte/easing';
@@ -79,7 +79,7 @@ function close() {
The inner div stays w-80 so Sidebar layout never reflows mid-animation. The inner div stays w-80 so Sidebar layout never reflows mid-animation.
--> -->
<div <div
class={cn( class={clsx(
'shrink-0 z-30 h-full relative', 'shrink-0 z-30 h-full relative',
'overflow-hidden', 'overflow-hidden',
'will-change-[width]', 'will-change-[width]',

View File

@@ -3,7 +3,7 @@
Generic loading placeholder with shimmer animation. Generic loading placeholder with shimmer animation.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import type { HTMLAttributes } from 'svelte/elements'; import type { HTMLAttributes } from 'svelte/elements';
interface Props extends HTMLAttributes<HTMLDivElement> { interface Props extends HTMLAttributes<HTMLDivElement> {
@@ -18,7 +18,7 @@ let { class: className, animate = true, ...rest }: Props = $props();
</script> </script>
<div <div
class={cn( class={clsx(
'rounded-md bg-background-subtle/50 backdrop-blur-sm', 'rounded-md bg-background-subtle/50 backdrop-blur-sm',
animate && 'animate-pulse', animate && 'animate-pulse',
className, className,

View File

@@ -3,8 +3,8 @@
A single key:value pair in Space Mono. Optional trailing divider. A single key:value pair in Space Mono. Optional trailing divider.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Label } from '$shared/ui'; import { Label } from '$shared/ui';
import clsx from 'clsx';
import type { ComponentProps } from 'svelte'; import type { ComponentProps } from 'svelte';
interface Props extends Pick<ComponentProps<typeof Label>, 'variant'> { interface Props extends Pick<ComponentProps<typeof Label>, 'variant'> {
@@ -36,7 +36,7 @@ let {
}: Props = $props(); }: Props = $props();
</script> </script>
<div class={cn('flex items-center gap-1', className)}> <div class={clsx('flex items-center gap-1', className)}>
<Label variant="muted" size="xs">{label}:</Label> <Label variant="muted" size="xs">{label}:</Label>
<Label {variant} size="xs" bold>{value}</Label> <Label {variant} size="xs" bold>{value}</Label>
</div> </div>

View File

@@ -3,8 +3,8 @@
Renders multiple Stat components in a row with auto-separators. Renders multiple Stat components in a row with auto-separators.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Stat } from '$shared/ui'; import { Stat } from '$shared/ui';
import clsx from 'clsx';
import type { ComponentProps } from 'svelte'; import type { ComponentProps } from 'svelte';
interface StatItem extends Partial<Pick<ComponentProps<typeof Stat>, 'variant'>> { interface StatItem extends Partial<Pick<ComponentProps<typeof Stat>, 'variant'>> {
@@ -26,7 +26,7 @@ interface Props {
let { stats, class: className }: Props = $props(); let { stats, class: className }: Props = $props();
</script> </script>
<div class={cn('flex items-center gap-4', className)}> <div class={clsx('flex items-center gap-4', className)}>
{#each stats as stat, i} {#each stats as stat, i}
<Stat <Stat
label={stat.label} label={stat.label}

View File

@@ -3,13 +3,13 @@
Monospace <code> element for technical values, measurements, identifiers. Monospace <code> element for technical values, measurements, identifiers.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { import {
type LabelSize, type LabelSize,
type LabelVariant, type LabelVariant,
labelSizeConfig, labelSizeConfig,
labelVariantConfig, labelVariantConfig,
} from '$shared/ui/Label/config'; } from '$shared/ui/Label/config';
import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
interface Props { interface Props {
@@ -42,7 +42,7 @@ let {
</script> </script>
<code <code
class={cn( class={clsx(
'font-mono tracking-tight tabular-nums', 'font-mono tracking-tight tabular-nums',
labelSizeConfig[size], labelSizeConfig[size],
labelVariantConfig[variant], labelVariantConfig[variant],

View File

@@ -11,7 +11,7 @@
<script lang="ts" generics="T"> <script lang="ts" generics="T">
import { createVirtualizer } from '$shared/lib'; import { createVirtualizer } from '$shared/lib';
import { throttle } from '$shared/lib/utils'; import { throttle } from '$shared/lib/utils';
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import type { HTMLAttributes } from 'svelte/elements'; import type { HTMLAttributes } from 'svelte/elements';
@@ -295,13 +295,13 @@ $effect(() => {
{/snippet} {/snippet}
{#if useWindowScroll} {#if useWindowScroll}
<div class={cn('relative w-full', className)} bind:this={viewportRef} {...rest}> <div class={clsx('relative w-full', className)} bind:this={viewportRef} {...rest}>
{@render content()} {@render content()}
</div> </div>
{:else} {:else}
<div <div
bind:this={viewportRef} bind:this={viewportRef}
class={cn( class={clsx(
'relative overflow-y-auto overflow-x-hidden', 'relative overflow-y-auto overflow-x-hidden',
'rounded-md bg-background', 'rounded-md bg-background',
'w-full', 'w-full',

View File

@@ -4,7 +4,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import { typographySettingsStore } from '$features/SetupFont'; import { typographySettingsStore } from '$features/SetupFont';
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import { comparisonStore } from '../../model'; import { comparisonStore } from '../../model';
interface Props { interface Props {
@@ -52,7 +52,7 @@ $effect(() => {
> >
{#each [0, 1] as s (s)} {#each [0, 1] as s (s)}
<span <span
class={cn( class={clsx(
'char-inner', 'char-inner',
'transition-colors duration-300', 'transition-colors duration-300',
isPast isPast

View File

@@ -5,7 +5,6 @@
<script lang="ts"> <script lang="ts">
import { ThemeSwitch } from '$features/ChangeAppTheme'; import { ThemeSwitch } from '$features/ChangeAppTheme';
import type { ResponsiveManager } from '$shared/lib'; import type { ResponsiveManager } from '$shared/lib';
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { import {
Badge, Badge,
Divider, Divider,
@@ -17,6 +16,7 @@ import {
} from '$shared/ui'; } from '$shared/ui';
import PanelLeftClose from '@lucide/svelte/icons/panel-left-close'; import PanelLeftClose from '@lucide/svelte/icons/panel-left-close';
import PanelLeftOpen from '@lucide/svelte/icons/panel-left-open'; import PanelLeftOpen from '@lucide/svelte/icons/panel-left-open';
import clsx from 'clsx';
import { getContext } from 'svelte'; import { getContext } from 'svelte';
import { comparisonStore } from '../../model'; import { comparisonStore } from '../../model';
@@ -49,7 +49,7 @@ const fontBName = $derived(comparisonStore.fontB?.name ?? '');
</script> </script>
<header <header
class={cn( class={clsx(
'flex items-center justify-between', 'flex items-center justify-between',
'px-4 md:px-8 py-4 md:py-6', 'px-4 md:px-8 py-4 md:py-6',
'h-16 md:h-20 z-20', 'h-16 md:h-20 z-20',

View File

@@ -5,12 +5,12 @@
Content (font list, controls) is injected via snippets. Content (font list, controls) is injected via snippets.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { import {
ButtonGroup, ButtonGroup,
Label, Label,
ToggleButton, ToggleButton,
} from '$shared/ui'; } from '$shared/ui';
import clsx from 'clsx';
import type { Snippet } from 'svelte'; import type { Snippet } from 'svelte';
import { import {
type Side, type Side,
@@ -40,7 +40,7 @@ let {
</script> </script>
<div <div
class={cn( class={clsx(
'flex flex-col h-full', 'flex flex-col h-full',
'w-80', 'w-80',
'bg-surface dark:bg-dark-bg', 'bg-surface dark:bg-dark-bg',

View File

@@ -17,8 +17,8 @@ import {
import { import {
CharacterComparisonEngine, CharacterComparisonEngine,
} from '$shared/lib/helpers/CharacterComparisonEngine/CharacterComparisonEngine.svelte'; } from '$shared/lib/helpers/CharacterComparisonEngine/CharacterComparisonEngine.svelte';
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Loader } from '$shared/ui'; import { Loader } from '$shared/ui';
import clsx from 'clsx';
import { getContext } from 'svelte'; import { getContext } from 'svelte';
import { Spring } from 'svelte/motion'; import { Spring } from 'svelte/motion';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
@@ -186,10 +186,10 @@ const scaleClass = $derived(
Outer flex container — fills parent. Outer flex container — fills parent.
The paper div inside scales down when the sidebar opens on desktop. The paper div inside scales down when the sidebar opens on desktop.
--> -->
<div class={cn('flex-1 relative flex items-center justify-center p-0 overflow-hidden bg-surface dark:bg-dark-bg', className)}> <div class={clsx('flex-1 relative flex items-center justify-center p-0 overflow-hidden bg-surface dark:bg-dark-bg', className)}>
<!-- Paper surface --> <!-- Paper surface -->
<div <div
class={cn( class={clsx(
'w-full h-full flex flex-col items-center justify-center relative', 'w-full h-full flex flex-col items-center justify-center relative',
'bg-paper dark:bg-dark-card', 'bg-paper dark:bg-dark-card',
'shadow-2xl shadow-black/5 dark:shadow-black/20', 'shadow-2xl shadow-black/5 dark:shadow-black/20',
@@ -253,7 +253,7 @@ const scaleClass = $derived(
</div> </div>
<TypographyMenu <TypographyMenu
class={cn( class={clsx(
'absolute bottom-4 sm:bottom-5 right-4 sm:left-1/2 sm:right-[unset] sm:-translate-x-1/2 z-50', 'absolute bottom-4 sm:bottom-5 right-4 sm:left-1/2 sm:right-[unset] sm:-translate-x-1/2 z-50',
)} )}
/> />

View File

@@ -4,7 +4,7 @@
1px red vertical rule with square handles at top and bottom. 1px red vertical rule with square handles at top and bottom.
--> -->
<script lang="ts"> <script lang="ts">
import { cn } from '$shared/shadcn/utils/shadcn-utils'; import clsx from 'clsx';
import { cubicOut } from 'svelte/easing'; import { cubicOut } from 'svelte/easing';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
@@ -31,7 +31,7 @@ let { sliderPos, isDragging }: Props = $props();
> >
<!-- Top handle --> <!-- Top handle -->
<div <div
class={cn( class={clsx(
'w-5 h-5 md:w-6 md:h-6', 'w-5 h-5 md:w-6 md:h-6',
'-ml-2.5 md:-ml-3', '-ml-2.5 md:-ml-3',
'mt-2 md:mt-4', 'mt-2 md:mt-4',
@@ -47,7 +47,7 @@ let { sliderPos, isDragging }: Props = $props();
<!-- Bottom handle --> <!-- Bottom handle -->
<div <div
class={cn( class={clsx(
'w-5 h-5 md:w-6 md:h-6', 'w-5 h-5 md:w-6 md:h-6',
'-ml-2.5 md:-ml-3', '-ml-2.5 md:-ml-3',
'mb-2 md:mb-4', 'mb-2 md:mb-4',

View File

@@ -5,8 +5,8 @@
<script lang="ts"> <script lang="ts">
import { NavigationWrapper } from '$entities/Breadcrumb'; import { NavigationWrapper } from '$entities/Breadcrumb';
import type { ResponsiveManager } from '$shared/lib'; import type { ResponsiveManager } from '$shared/lib';
import { cn } from '$shared/shadcn/utils/shadcn-utils';
import { Section } from '$shared/ui'; import { Section } from '$shared/ui';
import clsx from 'clsx';
import { import {
getContext, getContext,
untrack, untrack,
@@ -38,7 +38,7 @@ $effect(() => {
headerAction={registerAction} headerAction={registerAction}
> >
{#snippet content({ className })} {#snippet content({ className })}
<div class={cn(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}> <div class={clsx(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
<FontSearch bind:showFilters={isExpanded} /> <FontSearch bind:showFilters={isExpanded} />
</div> </div>
{/snippet} {/snippet}

View File

@@ -6,11 +6,11 @@
import { NavigationWrapper } from '$entities/Breadcrumb'; import { NavigationWrapper } from '$entities/Breadcrumb';
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 { import {
Label, Label,
Section, Section,
} from '$shared/ui'; } from '$shared/ui';
import clsx from 'clsx';
import { getContext } from 'svelte'; import { getContext } from 'svelte';
import { layoutManager } from '../../model'; import { layoutManager } from '../../model';
import LayoutSwitch from '../LayoutSwitch/LayoutSwitch.svelte'; import LayoutSwitch from '../LayoutSwitch/LayoutSwitch.svelte';
@@ -50,7 +50,7 @@ const responsive = getContext<ResponsiveManager>('responsive');
{/snippet} {/snippet}
{#snippet content({ className })} {#snippet content({ className })}
<div class={cn(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}> <div class={clsx(className, !responsive.isDesktopLarge && 'col-start-0 col-span-2')}>
<SampleList /> <SampleList />
</div> </div>
{/snippet} {/snippet}

View File

@@ -43,7 +43,6 @@
"exclude": [ "exclude": [
"node_modules", "node_modules",
"dist", "dist",
"src/shared/shadcn/**/*",
"node_modules/**/*" "node_modules/**/*"
] ]
} }

View File

@@ -20,7 +20,6 @@ export default defineConfig({
'dist', 'dist',
'e2e', 'e2e',
'.storybook', '.storybook',
'src/shared/shadcn/**/*',
], ],
restoreMocks: true, restoreMocks: true,
coverage: { coverage: {
@@ -38,7 +37,6 @@ export default defineConfig({
'**/*.spec.ts', '**/*.spec.ts',
'**/*.d.ts', '**/*.d.ts',
'**/*.stories.svelte', '**/*.stories.svelte',
'src/shared/shadcn/**/*',
'vitest.config.ts', 'vitest.config.ts',
], ],
thresholds: { thresholds: {