mirror of
https://github.com/Studio-Saelix/sencho.git
synced 2026-08-30 03:59:41 +00:00
622af7e0b3
* fix(theme): make sheets and dialogs track the active theme Portaled panels (scan-history and other sheets, dialogs, confirm modals) only partially followed the theme: their popover surface was a flat per-theme literal, so OLED mode never reached true black inside them and the contrast control did not move their fill. The accent stopped at the thin rail because the ambient glow was painted only on the main app shell, never inside a portaled panel, and the overlay scrim was a hardcoded black. - Derive the popover surface from per-theme lightness and alpha plus the contrast spread, the same way the page background is derived, so every floating surface tones with the active theme (including OLED true black) and deepens with contrast. Dim and Light are unchanged at the default contrast. - Add an accent wash to sheets and large dialogs so the chosen accent reads inside them, matching the page. Small dropdowns and tooltips keep the themed tone without the wash. - Replace the hardcoded modal and sheet scrim with a theme-aware token that softens to a light dim in the Light theme. Tested across Dim, OLED, and Light with multiple accents and contrast levels. * fix(theme): keep the command palette token-only (no accent wash) The command palette renders through DialogContent, so it picked up the accent wash meant for content sheets and dialogs. It is a command menu, so it should stay token-only like dropdowns and tooltips. Add an optional panelGlow flag to DialogContent (on by default, so every other dialog is unchanged) and turn it off for the palette.
130 lines
4.2 KiB
TypeScript
130 lines
4.2 KiB
TypeScript
import * as React from 'react';
|
|
import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
|
|
|
|
import { cn } from '@/lib/utils';
|
|
import { buttonVariants } from '@/components/ui/button';
|
|
|
|
const AlertDialog = AlertDialogPrimitive.Root;
|
|
const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
|
|
const AlertDialogPortal = AlertDialogPrimitive.Portal;
|
|
|
|
const AlertDialogOverlay = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
|
|
>(({ className, ...props }, ref) => (
|
|
<AlertDialogPrimitive.Overlay
|
|
className={cn(
|
|
'fixed inset-0 z-50 bg-[var(--scrim)] backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
|
|
className
|
|
)}
|
|
{...props}
|
|
ref={ref}
|
|
/>
|
|
));
|
|
AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
|
|
|
|
const AlertDialogContent = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Content>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
|
|
>(({ className, children, ...props }, ref) => (
|
|
<AlertDialogPortal>
|
|
<AlertDialogOverlay />
|
|
<AlertDialogPrimitive.Content
|
|
ref={ref}
|
|
className={cn(
|
|
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-glass-border bg-popover panel-glow p-6 shadow-lg backdrop-blur-[10px] backdrop-saturate-[1.15] sm:rounded-lg',
|
|
'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',
|
|
className
|
|
)}
|
|
{...props}
|
|
>
|
|
{children}
|
|
</AlertDialogPrimitive.Content>
|
|
</AlertDialogPortal>
|
|
));
|
|
AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
|
|
|
|
const AlertDialogHeader = ({
|
|
className,
|
|
...props
|
|
}: React.HTMLAttributes<HTMLDivElement>) => (
|
|
<div
|
|
className={cn('flex flex-col space-y-2 text-center sm:text-left', className)}
|
|
{...props}
|
|
/>
|
|
);
|
|
AlertDialogHeader.displayName = 'AlertDialogHeader';
|
|
|
|
const AlertDialogFooter = ({
|
|
className,
|
|
...props
|
|
}: React.HTMLAttributes<HTMLDivElement>) => (
|
|
<div
|
|
className={cn('flex flex-col-reverse gap-2 sm:flex-row sm:justify-end', className)}
|
|
{...props}
|
|
/>
|
|
);
|
|
AlertDialogFooter.displayName = 'AlertDialogFooter';
|
|
|
|
const AlertDialogTitle = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Title>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
|
|
>(({ className, ...props }, ref) => (
|
|
<AlertDialogPrimitive.Title
|
|
ref={ref}
|
|
className={cn('text-lg font-medium', className)}
|
|
{...props}
|
|
/>
|
|
));
|
|
AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
|
|
|
|
const AlertDialogDescription = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Description>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
|
|
>(({ className, ...props }, ref) => (
|
|
<AlertDialogPrimitive.Description
|
|
ref={ref}
|
|
className={cn('text-sm text-muted-foreground', className)}
|
|
{...props}
|
|
/>
|
|
));
|
|
AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName;
|
|
|
|
const AlertDialogAction = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Action>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
|
|
>(({ className, ...props }, ref) => (
|
|
<AlertDialogPrimitive.Action
|
|
ref={ref}
|
|
className={cn(buttonVariants(), className)}
|
|
{...props}
|
|
/>
|
|
));
|
|
AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
|
|
|
|
const AlertDialogCancel = React.forwardRef<
|
|
React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
|
|
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
|
|
>(({ className, ...props }, ref) => (
|
|
<AlertDialogPrimitive.Cancel
|
|
ref={ref}
|
|
className={cn(buttonVariants({ variant: 'outline' }), className)}
|
|
{...props}
|
|
/>
|
|
));
|
|
AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
|
|
|
|
export {
|
|
AlertDialog,
|
|
AlertDialogPortal,
|
|
AlertDialogOverlay,
|
|
AlertDialogTrigger,
|
|
AlertDialogContent,
|
|
AlertDialogHeader,
|
|
AlertDialogFooter,
|
|
AlertDialogTitle,
|
|
AlertDialogDescription,
|
|
AlertDialogAction,
|
|
AlertDialogCancel,
|
|
};
|