Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: add Builder dark theme and rebuild colors
Oleg Isonenf6c524572d24
diff --git a/.github/workflows/main.yml b/.github/workflows/main.ymlindex fb6873cae4..32c7a04ce1 100644--- a/.github/workflows/main.yml+++ b/.github/workflows/main.yml@@ -211,9 +211,6 @@ jobs:environment:name: development- outputs:- shards: ${{ steps.shards.outputs.value }}-steps:- uses: actions/checkout@v5with:@@ -228,10 +225,6 @@ jobs:with:run-scripts: "true"- - name: Discover builder e2e shards- id: shards- run: echo "value=$(pnpm --dir apps/builder exec tsx ./e2e/print-shards.ts)" >> "$GITHUB_OUTPUT"-- name: Build builder and generated preview dependenciesrun: pnpm e2e:builder:build@@ -267,7 +260,7 @@ jobs:strategy:fail-fast: falsematrix:- shard: ${{ fromJSON(needs.builder-e2e-build.outputs.shards) }}+ shard: [1, 2, 3, 4, 5, 6]environment:name: development@@ -304,21 +297,31 @@ jobs:- name: Run builder e2eenv:E2E_SKIP_BUILDER_BUILD: true- E2E_TEST_SHARD: ${{ matrix.shard }}+ E2E_TEST_COMMAND_TIMEOUT_SECONDS: 900run: |run_builder_e2e() {- E2E_TEST_COMMAND_TIMEOUT_SECONDS=300 pnpm e2e:builder+ pnpm e2e:builder -- --shard=${{ matrix.shard }}/6}run_builder_e2e_keep_logs() {- E2E_SKIP_CLEANUP=true E2E_TEST_COMMAND_TIMEOUT_SECONDS=300 pnpm e2e:builder+ E2E_SKIP_CLEANUP=true pnpm e2e:builder -- --shard=${{ matrix.shard }}/6}run_builder_e2e || {- echo "::warning::Builder e2e shard ${E2E_TEST_SHARD} failed; retrying once"+ echo "::warning::Builder e2e shard ${{ matrix.shard }} failed; retrying once with a clean backend"run_builder_e2e_keep_logs}+ - name: Upload Builder e2e report+ if: failure()+ uses: actions/upload-artifact@v6+ with:+ name: builder-e2e-report-${{ matrix.shard }}+ retention-days: 7+ path: |+ apps/builder/playwright-report+ apps/builder/test-results/e2e+- name: Print e2e service logsif: failure()run: docker compose $BUILDER_E2E_COMPOSE_ARGS logsdiff --git a/.gitignore b/.gitignoreindex df2fd3a014..2f986d3505 100644--- a/.gitignore+++ b/.gitignore@@ -8,6 +8,8 @@ yarn.lock# testingcoverage+playwright-report+test-results# remixbuilddiff --git a/.storybook/main.ts b/.storybook/main.tsindex 7a5aecb14f..a0dd4eadea 100644--- a/.storybook/main.ts+++ b/.storybook/main.ts@@ -16,6 +16,7 @@ export default {"@storybook/addon-controls","@storybook/addon-actions","@storybook/addon-backgrounds",+ "@storybook/addon-toolbars",],async viteFinal(config) {return {diff --git a/.storybook/preview.tsx b/.storybook/preview.tsxindex 77e6f9d5e5..81be7d65d9 100644--- a/.storybook/preview.tsx+++ b/.storybook/preview.tsx@@ -1,15 +1,132 @@import type { Preview } from "@storybook/react";import * as React from "react";-import { useEffect } from "react";+import { useEffect, useLayoutEffect, type ReactNode } from "react";import { TooltipProvider } from "@radix-ui/react-tooltip";import { setEnv } from "../packages/feature-flags/src/index";-import { theme, globalCss } from "../packages/design-system/src/index";-import { color } from "../packages/design-system/src/design-tokens";+import {+ cssVar,+ globalCss,+ theme,+ type ThemeVariableName,+} from "../packages/design-system/src/index";// this adds <style> tags to the <head> of the documentimport "@fontsource-variable/inter";import "@fontsource-variable/manrope";import "@fontsource/roboto-mono";+import "../packages/design-system/src/colors/colors.css";++const themeTestCases = {+ default: {},+ monochrome: {+ "--theme-color-neutral": "oklch(50% 0 0)",+ "--theme-color-accent": "oklch(50% 0 0)",+ "--theme-color-positive": "oklch(50% 0.14 152)",+ "--theme-color-negative": "oklch(50% 0.19 27)",+ "--theme-color-warning": "oklch(50% 0.14 75)",+ "--theme-color-informative": "oklch(50% 0.14 225)",+ "--theme-contrast-content": "100%",+ "--theme-contrast-surface": "70%",+ "--theme-contrast-border": "100%",+ },+ warm: {+ "--theme-color-neutral": "oklch(55% 0.02 70)",+ "--theme-color-accent": "oklch(60% 0.18 35)",+ "--theme-color-positive": "oklch(55% 0.14 135)",+ "--theme-color-negative": "oklch(55% 0.19 25)",+ "--theme-color-warning": "oklch(55% 0.14 85)",+ "--theme-color-informative": "oklch(55% 0.14 210)",+ "--theme-contrast-content": "15%",+ "--theme-contrast-surface": "0%",+ "--theme-contrast-border": "0%",+ },+ vivid: {+ "--theme-color-neutral": "oklch(45% 0.02 300)",+ "--theme-color-accent": "oklch(65% 0.3 300)",+ "--theme-color-positive": "oklch(60% 0.3 145)",+ "--theme-color-negative": "oklch(60% 0.3 20)",+ "--theme-color-warning": "oklch(65% 0.3 80)",+ "--theme-color-informative": "oklch(60% 0.3 225)",+ "--theme-contrast-content": "100%",+ "--theme-contrast-surface": "100%",+ "--theme-contrast-border": "100%",+ },+} satisfies Record<string, Partial<Record<ThemeVariableName, string>>>;++const themeVariableNames = new Set(+ Object.values(themeTestCases).flatMap((testCase) => Object.keys(testCase))+);++type ThemeTestCase = keyof typeof themeTestCases;+type ColorScheme = "light" | "dark";++const isThemeTestCase = (value: unknown): value is ThemeTestCase =>+ typeof value === "string" && value in themeTestCases;++const ThemeGlobals = ({+ children,+ themeTestCase,+ colorScheme,+}: {+ children: ReactNode;+ themeTestCase: ThemeTestCase;+ colorScheme: ColorScheme;+}) => {+ useLayoutEffect(() => {+ const root = document.documentElement;+ const previousScheme = root.getAttribute("data-color-scheme");+ const previousBodyBackground = document.body.style.backgroundColor;+ const previousBodyBackgroundPriority =+ document.body.style.getPropertyPriority("background-color");+ const previousBodyColor = document.body.style.color;+ const previousTheme = new Map(+ Array.from(themeVariableNames, (name) => [+ name,+ root.style.getPropertyValue(name),+ ])+ );++ for (const name of themeVariableNames) {+ root.style.removeProperty(name);+ }+ for (const [name, value] of Object.entries(themeTestCases[themeTestCase])) {+ root.style.setProperty(name, value);+ }+ root.setAttribute("data-color-scheme", colorScheme);++ if (themeTestCase !== "default" || colorScheme === "dark") {+ document.body.style.setProperty(+ "background-color",+ "var(--background-primary)",+ "important"+ );+ document.body.style.color = "var(--foreground-primary)";+ }++ return () => {+ for (const [name, value] of previousTheme) {+ if (value === "") {+ root.style.removeProperty(name);+ } else {+ root.style.setProperty(name, value);+ }+ }+ if (previousScheme === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousScheme);+ }+ document.body.style.setProperty(+ "background-color",+ previousBodyBackground,+ previousBodyBackgroundPriority+ );+ document.body.style.color = previousBodyColor;+ };+ }, [colorScheme, themeTestCase]);++ return children;+};const WaitForFonts = ({ children }) => {const [isFontsLoaded, setIsFontsLoaded] = React.useState(false);@@ -40,26 +157,68 @@ const WaitForFonts = ({ children }) => {const globalStyles = globalCss({body: {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),fontFamily: theme.fonts.sans,},});-export const decorators: Preview["decorators"] = [- (Story) => {+const decorators: Preview["decorators"] = [+ (Story, { globals }) => {globalStyles();setEnv("*");+ const themeTestCase = isThemeTestCase(globals.themeTestCase)+ ? globals.themeTestCase+ : "default";+ const colorScheme = globals.colorScheme === "dark" ? "dark" : "light";return (// waiting for fonts makes screenshot tests more stable- <WaitForFonts>- <TooltipProvider>- <Story />- </TooltipProvider>- </WaitForFonts>+ <ThemeGlobals themeTestCase={themeTestCase} colorScheme={colorScheme}>+ <WaitForFonts>+ <TooltipProvider>+ <Story />+ </TooltipProvider>+ </WaitForFonts>+ </ThemeGlobals>);},];+const globalTypes: Preview["globalTypes"] = {+ themeTestCase: {+ name: "Theme test case",+ description: "Apply a bounded theme configuration to every story.",+ toolbar: {+ title: "Theme",+ icon: "paintbrush",+ items: [+ { value: "default", title: "Default" },+ { value: "monochrome", title: "Monochrome high contrast" },+ { value: "warm", title: "Warm and soft" },+ { value: "vivid", title: "Vivid and structured" },+ ],+ dynamicTitle: true,+ },+ },+ colorScheme: {+ name: "Color scheme",+ description: "Render semantic colors in the light or dark scheme.",+ toolbar: {+ title: "Color scheme",+ icon: "mirror",+ items: [+ { value: "light", title: "Light" },+ { value: "dark", title: "Dark" },+ ],+ dynamicTitle: true,+ },+ },+};++const initialGlobals: Preview["initialGlobals"] = {+ themeTestCase: "default",+ colorScheme: "light",+};+const parameters: Preview["parameters"] = {actions: { argTypesRegex: "^on[A-Z].*" },controls: {@@ -71,17 +230,18 @@ const parameters: Preview["parameters"] = {backgrounds: {default: "White",values: [+ { name: "Primary", value: cssVar("--background-primary") },+ { name: "Secondary", value: cssVar("--background-secondary") },+ { name: "Inverse", value: cssVar("--background-inverse") },{ name: "White", value: "#ffffff" },{ name: "Black", value: "#000000" },- { name: "Panel", value: color.backgroundPanel },- { name: "Maintenance Dark", value: color.maintenanceDark },- { name: "Maintenance Medium", value: color.maintenanceMedium },- { name: "Maintenance Light", value: color.maintenanceLight },],},};export default {decorators,+ globalTypes,+ initialGlobals,parameters,} satisfies Preview;diff --git a/apps/builder/app/auth/login.tsx b/apps/builder/app/auth/login.tsxindex 4105b2253e..f4f03559e7 100644--- a/apps/builder/app/auth/login.tsx+++ b/apps/builder/app/auth/login.tsx@@ -6,11 +6,13 @@ import {rawTheme,Text,theme,+ cssVar,} from "@webstudio-is/design-system";import { GithubIcon, GoogleIcon, WebstudioIcon } from "@webstudio-is/icons";import { Form } from "@remix-run/react";import { authPath } from "~/shared/router-utils";import { SecretLogin } from "./secret-login";+import { brandColors } from "~/shared/brand-colors";const globalStyles = globalCss({body: {@@ -41,7 +43,11 @@ export const Login = ({justify="center"css={{height: "100vh",- background: theme.colors.brandBackgroundDashboard,+ color: cssVar("--foreground-primary"),+ background: `linear-gradient(+ light-dark(transparent, ${cssVar("--overlay-scrim")}),+ light-dark(transparent, ${cssVar("--overlay-scrim")})+ ), ${brandColors.dashboard}`,}}><Flex@@ -54,7 +60,10 @@ export const Login = ({padding: theme.spacing[17],borderRadius: theme.spacing[5],[`@media (min-width: ${rawTheme.spacing[35]})`]: {- backgroundColor: `rgba(255, 255, 255, 0.5)`,+ backgroundColor: `light-dark(+ ${brandColors.panelTranslucent},+ ${cssVar("--background-primary")}+ )`,},}}>@@ -80,7 +89,7 @@ export const Login = ({prefix={<GithubIcon size={22} fill="currentColor" />}color="ghost"css={{- border: `1px solid ${theme.colors.borderDark}`,+ border: `1px solid ${cssVar("--border-default")}`,height: theme.spacing[15],}}formAction={authPath({ provider: "github" })}diff --git a/apps/builder/app/auth/secret-login.tsx b/apps/builder/app/auth/secret-login.tsxindex 0859a9fa49..a9a996eada 100644--- a/apps/builder/app/auth/secret-login.tsx+++ b/apps/builder/app/auth/secret-login.tsx@@ -37,19 +37,19 @@ export const SecretLogin = ({ devPlanNames }: SecretLoginProps) => {</option>))}</select>- <Button type="submit">Login</Button>+ <Button color="primary" type="submit">+ Login+ </Button></Flex></form>);}return (- <Button- onClick={() => setShow(true)}- color="neutral"- css={{ height: theme.spacing[15] }}- >+ <Button onClick={() => setShow(true)} css={{ height: theme.spacing[15] }}>Login with Secret</Button>);};++undefined;diff --git a/apps/builder/app/builder/builder.css b/apps/builder/app/builder/builder.cssindex de9d18b8e4..6e3e66fc01 100644--- a/apps/builder/app/builder/builder.css+++ b/apps/builder/app/builder/builder.css@@ -6,11 +6,7 @@ body {overflow: hidden;overscroll-behavior: contain;-webkit-font-smoothing: antialiased;- /*- This is the top bar and loading screen color (--colors-backgroundTopbar).- We are setting it to avoid a white screen flash when opening project from the dashboard.- */- background-color: #2d2d2d;+ background-color: var(--background-primary);}[data-radix-scroll-area-viewport] {@@ -25,5 +21,10 @@ body {* {scrollbar-width: thin;- scrollbar-color: var(--colors-foregroundScrollBar) transparent;+ scrollbar-color: color-mix(+ in oklab,+ var(--foreground-secondary) 60%,+ transparent+ )+ transparent;}diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 4a8553b124..600d146bae 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -9,6 +9,7 @@ import {Flex,Grid,rawTheme,+ cssVar,} from "@webstudio-is/design-system";import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";import type { Role } from "@webstudio-is/project";@@ -121,7 +122,7 @@ const SidePanel = ({fg: 0,// Left sidebar tabs won't be able to pop out to the right if we set overflowX to auto.//overflowY: "auto",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),height: "100%",...css,}}@@ -475,7 +476,7 @@ export const Builder = (props: BuilderProps) => {left: 0,bottom: 0,width: 1,- background: theme.colors.borderMain,+ background: cssVar("--border-default"),},}}>diff --git a/apps/builder/app/builder/features/address-bar.stories.tsx b/apps/builder/app/builder/features/address-bar.stories.tsxindex afba910d6f..3bfac9a58a 100644--- a/apps/builder/app/builder/features/address-bar.stories.tsx+++ b/apps/builder/app/builder/features/address-bar.stories.tsx@@ -1,8 +1,7 @@import { useStore } from "@nanostores/react";import type { Meta, StoryFn } from "@storybook/react";-import { StorySection, Text } from "@webstudio-is/design-system";-import { ToolbarButton } from "@webstudio-is/design-system";-import { WebstudioIcon } from "@webstudio-is/icons";+import { IconButton, StorySection, Text } from "@webstudio-is/design-system";+import { MenuIcon } from "@webstudio-is/icons";import { TopbarLayout } from "~/builder/shared/topbar";import { AddressBarPopover } from "./address-bar";import { $dataSources, $pages } from "~/shared/sync/data-stores";@@ -88,9 +87,9 @@ export const AddressBar: StoryFn = () => {<StorySection title="Address Bar"><TopbarLayoutmenu={- <ToolbarButton aria-label="Menu">- <WebstudioIcon size={22} />- </ToolbarButton>+ <IconButton type="button" size="large" aria-label="Menu">+ <MenuIcon size={22} />+ </IconButton>}left={<AddressBarPopover />}/>diff --git a/apps/builder/app/builder/features/address-bar.tsx b/apps/builder/app/builder/features/address-bar.tsxindex a6e31b2eac..c94aa28215 100644--- a/apps/builder/app/builder/features/address-bar.tsx+++ b/apps/builder/app/builder/features/address-bar.tsx@@ -18,7 +18,6 @@ import {theme,textVariants,InputErrorsTooltip,- ToolbarButton,Popover,PopoverTrigger,PopoverContent,@@ -369,11 +368,7 @@ export const AddressBarPopover = () => {if (isPathnamePattern(path) === false) {return (<Tooltip {...tooltipProps}>- <ToolbarButton- {...buttonProps}- aria-label="Copy page URL"- tabIndex={0}- />+ <IconButton {...buttonProps} type="button" aria-label="Copy page URL" /></Tooltip>);}@@ -387,11 +382,11 @@ export const AddressBarPopover = () => {}}><PopoverTrigger asChild>- <ToolbarButton aria-label="Toggle dynamic page address" tabIndex={0}>+ <IconButton type="button" aria-label="Toggle dynamic page address"><DynamicPageIcon />- </ToolbarButton>+ </IconButton></PopoverTrigger>- <PopoverContent sideOffset={0} collisionPadding={4} align="start">+ <PopoverContent collisionPadding={4} align="start"><AddressBar ref={formRef} onSubmit={() => setIsOpen(false)} /></PopoverContent></Popover>diff --git a/apps/builder/app/builder/features/blocking-alerts/alert.tsx b/apps/builder/app/builder/features/blocking-alerts/alert.tsxindex ce7068fef6..3ba49bcbc3 100644--- a/apps/builder/app/builder/features/blocking-alerts/alert.tsx+++ b/apps/builder/app/builder/features/blocking-alerts/alert.tsx@@ -4,6 +4,7 @@ import type { ReactNode } from "react";import {Button,css,+ cssVar,Flex,Popover,PopoverContent,@@ -18,14 +19,19 @@ const containerStyle = css({left: 0,width: "100vw",height: "100vh",- background: "rgba(0, 0, 0, 0.9)",+ background: `oklch(from ${cssVar("--overlay-scrim")} l c h / 90%)`,});const contentStyle = css({width: theme.spacing[33],- color: theme.colors.foregroundDestructive,+ color: cssVar("--foreground-negative"),});+const scrimForeground = `light-dark(+ ${cssVar("--foreground-on-inverse")},+ ${cssVar("--foreground-primary")}+)`;+const $isAlertDismissed = atom(false);export const Alert = ({@@ -50,7 +56,7 @@ export const Alert = ({className={contentStyle()}><AlertIcon size={22} />- <Text color="contrast" align="center">+ <Text align="center" css={{ color: scrimForeground }}>{message}</Text>{isDismissable && (diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsxindex bace730670..1ebbdb0d64 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx@@ -1,6 +1,6 @@import { useState } from "react";import { useStore } from "@nanostores/react";-import { Flex } from "@webstudio-is/design-system";+import { Flex, rawTheme, theme } from "@webstudio-is/design-system";import { $breakpoints } from "~/shared/sync/data-stores";import {$selectedBreakpoint,@@ -57,31 +57,33 @@ export const BreakpointsContainer = () => {};return (- <Flex>- <Flex justify="end" css={hideOnMobile}>- <CanvasSettingsPopover />+ <Flex align="center">+ <Flex align="center" css={{ gap: theme.spacing[5] }}>+ <Flex justify="end" css={hideOnMobile}>+ <CanvasSettingsPopover />+ </Flex>+ <Flex align="center" justify="center" css={hideOnMobile}>+ <BreakpointsSelector />+ </Flex>+ {selectedBreakpoint && (+ <BreakpointsMenu+ breakpoints={breakpoints}+ selectedBreakpoint={selectedBreakpoint}+ open={breakpointsMenuView === "initial"}+ triggerOpen={breakpointsMenuView !== undefined}+ onOpenChange={(open) => {+ if (open) {+ $breakpointsMenuView.set("initial");+ return;+ }+ if ($breakpointsMenuView.get() === "initial") {+ $breakpointsMenuView.set(undefined);+ }+ }}+ onEditClick={() => $breakpointsMenuView.set("editor")}+ />+ )}</Flex>- <Flex align="center" justify="center" css={hideOnMobile}>- <BreakpointsSelector />- </Flex>- {selectedBreakpoint && (- <BreakpointsMenu- breakpoints={breakpoints}- selectedBreakpoint={selectedBreakpoint}- open={breakpointsMenuView === "initial"}- triggerOpen={breakpointsMenuView !== undefined}- onOpenChange={(open) => {- if (open) {- $breakpointsMenuView.set("initial");- return;- }- if ($breakpointsMenuView.get() === "initial") {- $breakpointsMenuView.set(undefined);- }- }}- onEditClick={() => $breakpointsMenuView.set("editor")}- />- )}<BreakpointsEditoropen={breakpointsMenuView === "editor"}onOpenChange={(open) => {@@ -92,7 +94,7 @@ export const BreakpointsContainer = () => {$breakpointsMenuView.set("confirmation");}}>- <div style={{ height: "100%", width: 0 }} />+ <div style={{ height: rawTheme.sizes.controlHeight, width: 0 }} /></BreakpointsEditor>{breakpointToDelete && (<ConfirmationDialogdiff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxindex ebb874d142..c2ad0e39f0 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx@@ -140,7 +140,7 @@ const BreakpointEditorItem = ({css={{ width: theme.spacing[28] }}options={["maxWidth", "minWidth"]}getLabel={(option) =>- option === "maxWidth" ? "Max Width" : "Min Width"+ option === "maxWidth" ? "Max width" : "Min width"}value={type}onChange={(value) => {diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsxindex 77f711721c..07c1e8cffc 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx@@ -1,15 +1,14 @@import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";import {Flex,+ Button,Text,- ToolbarButton,theme,DropdownMenu,DropdownMenuContent,DropdownMenuTrigger,DropdownMenuCheckboxItem,DropdownMenuSeparator,- Button,} from "@webstudio-is/design-system";import { EllipsesIcon } from "@webstudio-is/icons";import { groupBreakpoints } from "@webstudio-is/project-build/runtime";@@ -41,17 +40,21 @@ export const BreakpointsMenu = ({return (<DropdownMenu open={open} onOpenChange={onOpenChange}><DropdownMenuTrigger asChild>- <ToolbarButton- variant="subtle"+ <Button+ type="button"+ color="ghost"aria-label="Breakpoints with custom conditions"- data-state={triggerOpen ? "open" : selectedCustom ? "on" : "off"}+ state={+ triggerOpen || selectedCustom !== undefined ? "pressed" : "auto"+ }+ prefix={selectedCustom ? undefined : <EllipsesIcon />}>- {selectedCustom ? selectedCustom.label : <EllipsesIcon />}- </ToolbarButton>+ {selectedCustom?.label}+ </Button></DropdownMenuTrigger>- <DropdownMenuContent sideOffset={4} css={{ width: theme.spacing[30] }}>+ <DropdownMenuContent css={{ width: theme.spacing[30] }}>{grouped.widthBased.map((breakpoint) => {- let description = "All Sizes";+ let description = "All sizes";if (breakpoint.minWidth !== undefined) {description = `≥ ${breakpoint.minWidth} PX`;} else if (breakpoint.maxWidth !== undefined) {@@ -109,7 +112,6 @@ export const BreakpointsMenu = ({css={{ padding: theme.panel.padding }}><Button- color="neutral"onClick={() => {onEditClick();}}@@ -122,3 +124,5 @@ export const BreakpointsMenu = ({</DropdownMenu>);};++undefined;diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsxindex a8ff1c1ac5..204797b6b5 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx@@ -3,10 +3,10 @@ import type { Breakpoint } from "@webstudio-is/sdk";import {Flex,Text,- Toolbar,- ToolbarToggleGroup,- ToolbarToggleItem,+ ToggleGroup,+ ToggleGroupButton,Tooltip,+ cssVar,theme,} from "@webstudio-is/design-system";import { AlertIcon, AsteriskIcon } from "@webstudio-is/icons";@@ -143,7 +143,7 @@ const ZoomWarning = () => {css={{px: theme.spacing[5],height: "100%",- color: theme.colors.backgroundAlertMain,+ color: cssVar("--foreground-warning"),}}><AlertIcon />@@ -163,20 +163,24 @@ export const BreakpointsSelector = () => {}return (- <Toolbar>- <ToolbarToggleGroup+ <Flex align="center" css={{ height: theme.spacing[15] }}>+ <ToggleGroup+ variant="frameless"type="single"value={selectedBreakpoint.id}onValueChange={(breakpointId: string) => {- // onValueChange gives empty string when unselected- // which is not part of breakpoints so do nothing in this caseif (breakpoints.has(breakpointId) === false) {return;}$selectedBreakpointId.set(breakpointId);setCanvasWidth(breakpointId);}}- css={{ position: "relative" }}+ aria-label="Breakpoints"+ css={{+ position: "relative",+ alignSelf: "stretch",+ alignItems: "center",+ }}>{(() => {const grouped = groupBreakpoints(Array.from(breakpoints.values()));@@ -189,8 +193,24 @@ export const BreakpointsSelector = () => {variant="wrapped"disableHoverableContent>- <ToolbarToggleItem- variant="subtle"+ <ToggleGroupButton+ value={breakpoint.id}+ css={{+ color: cssVar("--foreground-secondary"),+ fontWeight: 500,+ "&:hover": {+ color: cssVar("--foreground-primary"),+ backgroundColor: cssVar("--overlay-interaction-hover"),+ },+ "&[aria-checked=true]": {+ color: cssVar("--foreground-primary"),+ fontWeight: 600,+ backgroundColor: "transparent",+ "&:hover": {+ backgroundColor: cssVar("--overlay-interaction-hover"),+ },+ },+ }}ref={(node) => {if (node) {refs.current.set(breakpoint.id, node);@@ -198,12 +218,11 @@ export const BreakpointsSelector = () => {}refs.current.delete(breakpoint.id);}}- value={breakpoint.id}>{breakpoint.minWidth ?? breakpoint.maxWidth ?? (- <AsteriskIcon size={22} />+ <AsteriskIcon size={19} />)}- </ToolbarToggleItem>+ </ToggleGroupButton></Tooltip>));})()}@@ -214,8 +233,8 @@ export const BreakpointsSelector = () => {breakpoints={breakpoints}/>)}- </ToolbarToggleGroup>+ </ToggleGroup><ZoomWarning />- </Toolbar>+ </Flex>);};diff --git a/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx b/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsxindex bd15470aff..7071d1fa4b 100644--- a/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx@@ -7,7 +7,7 @@ import {PopoverContent,PopoverTrigger,InputField,- ToolbarButton,+ Button,Text,} from "@webstudio-is/design-system";import { WidthInput } from "./width-input";@@ -29,21 +29,21 @@ export const CanvasSettingsPopover = () => {return (<Popover open={isOpen} onOpenChange={setIsOpen}>- <PopoverTrigger aria-label="Canvas Settings" asChild>- <ToolbarButton>+ <PopoverTrigger aria-label="Canvas settings" asChild>+ <Button type="button" color="ghost"><Textcss={{display: "flex",gap: "1ch",fontVariantNumeric: "tabular-nums",}}- color={isOpen ? "contrast" : "moreSubtle"}+ color={isOpen ? "main" : "subtle"}>{Math.round(canvasWidth)}px{roundedScale !== 100 && <span>{`${roundedScale}%`}</span>}<ChevronDownIcon /></Text>- </ToolbarButton>+ </Button></PopoverTrigger><PopoverContentcollisionPadding={4}diff --git a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsxindex d8997db9a5..1010bcdfcc 100644--- a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx+++ b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx@@ -1,10 +1,14 @@import { useEffect, useState } from "react";import { useStore } from "@nanostores/react";-import { css, theme } from "@webstudio-is/design-system";+import { css } from "@webstudio-is/design-system";import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";import { $breakpoints } from "~/shared/sync/data-stores";import { isBaseBreakpoint } from "@webstudio-is/project-build/runtime";+// Fixed Webstudio visualization, intentionally independent of the UI theme.+const gradientLeft = "linear-gradient(90deg, #4a4efa 0%, #bd2fdb 100%)";+const gradientRight = "linear-gradient(90deg, #bd2fdb 0%, #4a4efa 100%)";+const cascadeIndicatorStyle = css({position: "absolute",bottom: 0,@@ -12,10 +16,10 @@ const cascadeIndicatorStyle = css({borderRadius: 2,transition: "150ms width, 150ms left, 150ms right",'&[data-direction="left"]': {- background: theme.colors.backgroundGradientHorizontal,+ background: gradientLeft,},'&[data-direction="right"]': {- background: theme.colors.backgroundGradientHorizontalReverse,+ background: gradientRight,},});diff --git a/apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsx b/apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsxindex 0154dbaa10..0d4507d5ff 100644--- a/apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsx+++ b/apps/builder/app/builder/features/breakpoints/confirmation-dialog.tsx@@ -38,9 +38,7 @@ export const ConfirmationDialog = ({<Button autoFocus onClick={onConfirm} color="destructive">Delete</Button>- <Button color="neutral" onClick={onAbort}>- Cancel- </Button>+ <Button onClick={onAbort}>Cancel</Button></DialogActions></DialogContent></Dialog>diff --git a/apps/builder/app/builder/features/builder-mode.stories.tsx b/apps/builder/app/builder/features/builder-mode.stories.tsxindex 7478090db2..a4549174f7 100644--- a/apps/builder/app/builder/features/builder-mode.stories.tsx+++ b/apps/builder/app/builder/features/builder-mode.stories.tsx@@ -1,4 +1,4 @@-import { StorySection, Toolbar } from "@webstudio-is/design-system";+import { Flex, StorySection } from "@webstudio-is/design-system";import { BuilderModeDropDown } from "./builder-mode";import {$builderMode,@@ -11,8 +11,8 @@ export default {title: "Builder mode",};-export const BuilderMode = () => {- $builderMode.set("design");+const renderBuilderMode = (mode: "design" | "preview") => {+ $builderMode.set(mode);$authPermit.set("own");$authToken.set(undefined);$planFeatures.set({@@ -20,19 +20,17 @@ export const BuilderMode = () => {allowContentMode: true,});- return (- <>- <StorySection title="Design mode">- <Toolbar>- <BuilderModeDropDown />- </Toolbar>- </StorySection>-- <StorySection title="Preview mode">- <Toolbar>- <BuilderModeDropDown />- </Toolbar>- </StorySection>- </>- );+ return <BuilderModeDropDown />;};++export const DesignMode = () => (+ <StorySection title="Design mode">+ <Flex align="center">{renderBuilderMode("design")}</Flex>+ </StorySection>+);++export const PreviewMode = () => (+ <StorySection title="Preview mode">+ <Flex align="center">{renderBuilderMode("preview")}</Flex>+ </StorySection>+);diff --git a/apps/builder/app/builder/features/builder-mode.tsx b/apps/builder/app/builder/features/builder-mode.tsxindex 33c1e4e293..972e990d3b 100644--- a/apps/builder/app/builder/features/builder-mode.tsx+++ b/apps/builder/app/builder/features/builder-mode.tsx@@ -17,9 +17,9 @@ import {MenuCheckedIcon,menuItemCss,theme,- ToolbarButton,- ToolbarToggleGroup,- ToolbarToggleItem,+ IconToggleButton,+ SplitButton,+ SplitButtonMenuButton,Tooltip,Text,DropdownMenu,@@ -70,7 +70,7 @@ export const BuilderModeDropDown = () => {};return (- <Flex align="center">+ <SplitButton><Tooltipcontent={<Flex gap="1">@@ -79,36 +79,25 @@ export const BuilderModeDropDown = () => {</Flex>}>- <ToolbarToggleGroup- type="single"- value={builderMode}- onValueChange={() => {+ <IconToggleButton+ aria-label="Toggle preview"+ pressed={builderMode === "preview"}+ onPressedChange={() => {emitCommand("togglePreviewMode");}}>- <ToolbarToggleItem variant="preview" value="preview">- <PlayIcon />- </ToolbarToggleItem>- </ToolbarToggleGroup>+ <PlayIcon />+ </IconToggleButton></Tooltip><DropdownMenu><Tooltip content={"Choose mode"}><DropdownMenuTrigger asChild>- <ToolbarButton- tabIndex={0}- aria-label="Choose mode"- variant="chevron"- >+ <SplitButtonMenuButton type="button" aria-label="Choose mode"><ChevronDownIcon />- </ToolbarButton>+ </SplitButtonMenuButton></DropdownMenuTrigger></Tooltip>- <DropdownMenuContent- sideOffset={4}- collisionPadding={16}- side="bottom"- loop- >+ <DropdownMenuContent collisionPadding={16} side="bottom" loop><DropdownMenuRadioGroupvalue={builderMode}onValueChange={(value) => {@@ -149,6 +138,6 @@ export const BuilderModeDropDown = () => {</div></DropdownMenuContent></DropdownMenu>- </Flex>+ </SplitButton>);};diff --git a/apps/builder/app/builder/features/clone.tsx b/apps/builder/app/builder/features/clone.tsxindex 2c50201f7b..91094168d5 100644--- a/apps/builder/app/builder/features/clone.tsx+++ b/apps/builder/app/builder/features/clone.tsx@@ -1,5 +1,5 @@import { useStore } from "@nanostores/react";-import { buttonStyle, Link } from "@webstudio-is/design-system";+import { LinkButton } from "@webstudio-is/design-system";import { $authToken, $authTokenPermissions } from "~/shared/nano-states";import { cloneProjectUrl } from "~/shared/router-utils/path-utils";@@ -12,19 +12,15 @@ export const CloneButton = () => {}return (- <Link- data-state="auto"- className={buttonStyle({- color: "positive",- })}- color="contrast"+ <LinkButtonhref={cloneProjectUrl({origin: window.origin,sourceAuthToken: authToken,})}- underline="none">Clone- </Link>+ </LinkButton>);};++undefined;diff --git a/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx b/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsxindex 7b642c7dac..c202e11c9d 100644--- a/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx@@ -68,7 +68,7 @@ const getBreakpointLabel = (breakpoint: Breakpoint) => {return `${breakpoint.label}: ${breakpoint.condition}`;}- let label = "All Sizes";+ let label = "All sizes";if (breakpoint.minWidth !== undefined) {label = `≥ ${breakpoint.minWidth} PX`;}diff --git a/apps/builder/app/builder/features/command-panel/groups/css-variables-group.tsx b/apps/builder/app/builder/features/command-panel/groups/css-variables-group.tsxindex 4cfb77414d..2d6fc8c072 100644--- a/apps/builder/app/builder/features/command-panel/groups/css-variables-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/css-variables-group.tsx@@ -101,7 +101,7 @@ export const CssVariablesGroup = ({name="cssVariable"heading={<CommandGroupHeading>- CSS Variables ({options.length})+ CSS variables ({options.length})</CommandGroupHeading>}actions={[diff --git a/apps/builder/app/builder/features/footer/breadcrumbs.tsx b/apps/builder/app/builder/features/footer/breadcrumbs.tsxindex 9e21c93c14..d0e4fe69a4 100644--- a/apps/builder/app/builder/features/footer/breadcrumbs.tsx+++ b/apps/builder/app/builder/features/footer/breadcrumbs.tsx@@ -22,8 +22,7 @@ export const Breadcrumbs = () => {return (<Fragment key={index}><Button- color="dark-ghost"- css={{ color: "inherit" }}+ color="ghost"key={instance.id}onClick={() => {selectInstance(instanceSelector);diff --git a/apps/builder/app/builder/features/footer/footer.tsx b/apps/builder/app/builder/features/footer/footer.tsxindex 1b986b233f..3964601428 100644--- a/apps/builder/app/builder/features/footer/footer.tsx+++ b/apps/builder/app/builder/features/footer/footer.tsx@@ -1,4 +1,4 @@-import { Flex, theme } from "@webstudio-is/design-system";+import { cssVar, Flex, theme } from "@webstudio-is/design-system";import { Breadcrumbs } from "./breadcrumbs";export const Footer = () => {@@ -10,8 +10,9 @@ export const Footer = () => {isolation: "isolate",gridArea: "footer",height: theme.spacing[11],- background: theme.colors.backgroundTopbar,- color: theme.colors.foregroundContrastMain,+ background: cssVar("--background-primary"),+ borderTop: `1px solid ${cssVar("--border-default")}`,+ color: cssVar("--foreground-primary"),}}><Breadcrumbs />diff --git a/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx b/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsxindex cfe81c0632..028040b699 100644--- a/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx+++ b/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx@@ -10,6 +10,7 @@ import {ScrollArea,theme,Box,+ cssVar,} from "@webstudio-is/design-system";import { atom } from "nanostores";import { Fragment } from "react";@@ -286,7 +287,7 @@ export const KeyboardShortcutsDialog = () => {as="span"css={{paddingInline: 4,- border: `1px solid ${theme.colors.borderNeutral}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[2],}}>diff --git a/apps/builder/app/builder/features/marketplace/about.tsx b/apps/builder/app/builder/features/marketplace/about.tsxindex afca4a79dd..2bc7e74c56 100644--- a/apps/builder/app/builder/features/marketplace/about.tsx+++ b/apps/builder/app/builder/features/marketplace/about.tsx@@ -2,11 +2,11 @@ import {DialogClose,Flex,Link,+ LinkButton,PanelTitle,Separator,Text,Tooltip,- buttonStyle,theme,truncate,} from "@webstudio-is/design-system";@@ -50,7 +50,7 @@ export const About = ({ item }: { item?: MarketplaceOverviewItem }) => {</Flex>{item.issues && (<Flex gap="1">- <Text css={{ flexShrink: 0 }}>Issues Tracker:</Text>+ <Text css={{ flexShrink: 0 }}>Issues tracker:</Text><Link href={item.issues} target="_blank" css={truncate()}>{item.issues}</Link>@@ -68,14 +68,8 @@ export const About = ({ item }: { item?: MarketplaceOverviewItem }) => {: 'The project does not have a shared link with "View" permission.'}>- <Link- className={buttonStyle({- color: "neutral",- css: {- gap: theme.spacing[3],- },- })}- underline="none"+ <LinkButton+ css={{ gap: theme.spacing[3] }}href={hasAuthToken? builderUrl({@@ -89,9 +83,11 @@ export const About = ({ item }: { item?: MarketplaceOverviewItem }) => {aria-disabled={hasAuthToken ? undefined : "true"}><ExternalLinkIcon aria-hidden /> Open project- </Link>+ </LinkButton></Tooltip></Flex></>);};++undefined;diff --git a/apps/builder/app/builder/features/marketplace/card.stories.tsx b/apps/builder/app/builder/features/marketplace/card.stories.tsxindex f2e6e3b2dd..831c5bcd85 100644--- a/apps/builder/app/builder/features/marketplace/card.stories.tsx+++ b/apps/builder/app/builder/features/marketplace/card.stories.tsx@@ -14,7 +14,7 @@ export default {const placeholderImage = `data:image/svg+xml,${encodeURIComponent(`<svg xmlns="http://www.w3.org/2000/svg" width="400" height="210">- <rect width="400" height="210" fill="#c0d0e0"/>+ <rect width="400" height="210" fill="transparent"/><text x="200" y="105" text-anchor="middle" dominant-baseline="central"font-family="sans-serif" font-size="24" fill="#4a6a8a">400 × 210</text></svg>`diff --git a/apps/builder/app/builder/features/marketplace/card.tsx b/apps/builder/app/builder/features/marketplace/card.tsxindex e527c43e34..c47589898e 100644--- a/apps/builder/app/builder/features/marketplace/card.tsx+++ b/apps/builder/app/builder/features/marketplace/card.tsx@@ -5,6 +5,7 @@ import {theme,focusRingStyle,css,+ cssVar,rawTheme,} from "@webstudio-is/design-system";import { getImageAttributes, wsImageLoader } from "@webstudio-is/image";@@ -25,7 +26,7 @@ const spinnerStyle = css({display: "flex",alignItems: "center",justifyContent: "center",- backgroundColor: "rgba(255, 255, 255, 0.5)",+ backgroundColor: `color-mix(in oklab, ${cssVar("--background-primary")} 50%, transparent)`,backdropFilter: "blur(8px)",});@@ -44,7 +45,7 @@ const imageStyle = css({objectFit: "cover",},false: {- background: theme.colors.white,+ background: cssVar("--background-primary"),padding: rawTheme.spacing[5],},},diff --git a/apps/builder/app/builder/features/marketplace/overview.tsx b/apps/builder/app/builder/features/marketplace/overview.tsxindex 0661bd386b..63c936a4ce 100644--- a/apps/builder/app/builder/features/marketplace/overview.tsx+++ b/apps/builder/app/builder/features/marketplace/overview.tsx@@ -47,7 +47,11 @@ const GalleryOverviewItem = ({state={isOpen ? "selected" : isLoading ? "loading" : undefined}suffix={<Flex shrink={false} align="center">- <IconButton {...pressProps} state={isOpen ? "open" : undefined}>+ <IconButton+ {...pressProps}+ state={isOpen ? "open" : undefined}+ aria-label={`More actions for ${item.name}`}+ ><EllipsesIcon /></IconButton></Flex>diff --git a/apps/builder/app/builder/features/marketplace/templates.tsx b/apps/builder/app/builder/features/marketplace/templates.tsxindex 6e3f33cad7..48cf4af32f 100644--- a/apps/builder/app/builder/features/marketplace/templates.tsx+++ b/apps/builder/app/builder/features/marketplace/templates.tsx@@ -202,7 +202,6 @@ export const Templates = ({onClick={() => {onOpenChange(false);}}- color="neutral">{name}</Button>@@ -287,3 +286,5 @@ export const Templates = ({</Flex>);};++undefined;diff --git a/apps/builder/app/builder/features/menu/menu-button.tsx b/apps/builder/app/builder/features/menu/menu-button.tsxindex afa48557dd..16bdab779b 100644--- a/apps/builder/app/builder/features/menu/menu-button.tsx+++ b/apps/builder/app/builder/features/menu/menu-button.tsx@@ -1,65 +1,12 @@-import {- css,- DropdownMenuTrigger,- rawTheme,- ToolbarButton,-} from "@webstudio-is/design-system";-import { MenuIcon, WebstudioIcon } from "@webstudio-is/icons";--const size = rawTheme.spacing[9];--const containerTransformVar = "--ws-menu-button-container-transform";--const triggerStyle = css({- position: "relative",- [containerTransformVar]: `translateZ(-${size}) rotateY(0deg)`,- "&[data-state=open], &:hover": {- [containerTransformVar]: `translateZ(-${size}) rotateY(-90deg)`,- },-});--const innerContainerStyle = css({- width: "100%",- height: "100%",- transformStyle: "preserve-3d",- transition: "transform 200ms",- transform: `var(${containerTransformVar})`,-});--const faceStyle = css({- display: "flex",- alignItems: "center",- justifyContent: "center",- position: "absolute",- width: "100%",- height: "100%",- variants: {- front: {- true: {- transform: `rotateY(0deg) translateZ(${size})`,- },- },- back: {- true: {- transform: `rotateY(90deg) translateZ(${size})`,- },- },- },-});+import { DropdownMenuTrigger, IconButton } from "@webstudio-is/design-system";+import { MenuIcon } from "@webstudio-is/icons";export const MenuButton = () => {return (- <ToolbarButton asChild className={triggerStyle()} aria-label="Menu Button">- <DropdownMenuTrigger>- <span className={innerContainerStyle()}>- <span className={faceStyle({ front: true })}>- <WebstudioIcon size={22} />- </span>- <span className={faceStyle({ back: true })}>- <MenuIcon size={22} />- </span>- </span>- </DropdownMenuTrigger>- </ToolbarButton>+ <DropdownMenuTrigger asChild>+ <IconButton type="button" aria-label="Menu" size="large">+ <MenuIcon size={22} />+ </IconButton>+ </DropdownMenuTrigger>);};diff --git a/apps/builder/app/builder/features/menu/menu.stories.tsx b/apps/builder/app/builder/features/menu/menu.stories.tsxindex 04adf64572..806e9ca096 100644--- a/apps/builder/app/builder/features/menu/menu.stories.tsx+++ b/apps/builder/app/builder/features/menu/menu.stories.tsx@@ -1,4 +1,4 @@-import { Flex, StorySection, Text, Toolbar } from "@webstudio-is/design-system";+import { Flex, StorySection, Text } from "@webstudio-is/design-system";import { Menu } from "./menu";import {$authPermit,@@ -28,9 +28,9 @@ const OwnerDesignModeVariant = () => {});$purchases.set([{ planName: "Pro" }]);return (- <Toolbar>+ <Flex align="center"><Menu defaultOpen />- </Toolbar>+ </Flex>);};@@ -44,9 +44,9 @@ const ViewerFreePlanVariant = () => {canPublish: false,});return (- <Toolbar>+ <Flex align="center"><Menu defaultOpen />- </Toolbar>+ </Flex>);};@@ -65,9 +65,9 @@ const AdminContentModeVariant = () => {});$purchases.set([{ planName: "Pro" }]);return (- <Toolbar>+ <Flex align="center"><Menu defaultOpen />- </Toolbar>+ </Flex>);};diff --git a/apps/builder/app/builder/features/menu/menu.tsx b/apps/builder/app/builder/features/menu/menu.tsxindex 441ab4028a..01fea1fed4 100644--- a/apps/builder/app/builder/features/menu/menu.tsx+++ b/apps/builder/app/builder/features/menu/menu.tsx@@ -33,11 +33,12 @@ import { emitCommand } from "~/builder/shared/commands";import { MenuButton } from "./menu-button";import { $openProjectSettings } from "~/shared/nano-states/project-settings";import { UpgradeIcon } from "@webstudio-is/icons";-import { getSetting, setSetting } from "~/builder/shared/client-settings";+import { $settings, setSetting } from "~/builder/shared/client-settings";import { help } from "~/shared/help";+import { ColorSchemeMenu } from "~/shared/color-scheme-menu";const ViewMenuItem = () => {- const navigatorLayout = getSetting("navigatorLayout");+ const { navigatorLayout } = useStore($settings);const isUiHidden = useStore($isUiHidden);return (@@ -63,6 +64,8 @@ const ViewMenuItem = () => {>Undock navigator</DropdownMenuCheckboxItem>+ <DropdownMenuSeparator />+ <ColorSchemeMenu withIndicator /></DropdownMenuSubContent></DropdownMenuSub>);@@ -93,7 +96,7 @@ export const Menu = ({ defaultOpen }: { defaultOpen?: boolean } = {}) => {return (<DropdownMenu modal={false} defaultOpen={defaultOpen}><MenuButton />- <DropdownMenuContent sideOffset={4} collisionPadding={4} width="regular">+ <DropdownMenuContent collisionPadding={4} width="regular"><DropdownMenuItemonSelect={() => {window.location.href = dashboardUrl({ origin: window.origin });diff --git a/apps/builder/app/builder/features/navigator/css-preview.tsx b/apps/builder/app/builder/features/navigator/css-preview.tsxindex 7736025bf4..2313a00f7e 100644--- a/apps/builder/app/builder/features/navigator/css-preview.tsx+++ b/apps/builder/app/builder/features/navigator/css-preview.tsx@@ -91,7 +91,7 @@ export const CssPreview = () => {return null;}return (- <CollapsibleSection label="CSS preview" fullWidth>+ <CollapsibleSection label="CSS preview" fullWidth showSeparator={false}><ScrollArea css={{ padding: theme.panel.padding }}><pre tabIndex={0} className={preStyle()}><divdiff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex 3ff1bb7169..37e7473344 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -8,8 +8,8 @@ import { mergeRefs } from "@react-aria/utils";import { useStore } from "@nanostores/react";import {Box,+ cssVar,keyframes,- rawTheme,ScrollArea,SmallIconButton,styled,@@ -485,7 +485,7 @@ const ShowToggle = ({{isAnimating && value && (<><br />- <Text css={{ color: theme.colors.foregroundPrimary }}>+ <Text css={{ color: cssVar("--foreground-accent") }}>Animation is running on canvas.</Text></>@@ -499,9 +499,9 @@ const ShowToggle = ({css={value && isAnimating? {- color: theme.colors.foregroundPrimary,+ color: cssVar("--foreground-accent"),"&:hover": {- color: theme.colors.foregroundPrimary,+ color: cssVar("--foreground-accent"),filter: "brightness(80%)",},}@@ -520,10 +520,10 @@ const EditableTreeNodeLabel = styled("div", {variants: {isEditing: {true: {- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),padding: theme.spacing[3],borderRadius: theme.spacing[3],- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),outline: "none",cursor: "auto",textOverflow: "clip",@@ -532,7 +532,7 @@ const EditableTreeNodeLabel = styled("div", {},hasError: {true: {- outline: `1px solid ${theme.colors.borderDestructiveMain}`,+ outline: `1px solid ${cssVar("--border-negative")}`,},},},@@ -1132,7 +1132,7 @@ export const NavigatorTree = () => {style: {opacity: item.isHidden ? 0.4 : undefined,color: item.isReusable- ? rawTheme.colors.foregroundReusable+ ? cssVar("--foreground-accent"): undefined,},}}diff --git a/apps/builder/app/builder/features/pages/custom-metadata.tsx b/apps/builder/app/builder/features/pages/custom-metadata.tsxindex 6201b2fc59..752167bb4b 100644--- a/apps/builder/app/builder/features/pages/custom-metadata.tsx+++ b/apps/builder/app/builder/features/pages/custom-metadata.tsx@@ -8,6 +8,7 @@ import {Label,SmallIconButton,Text,+ cssVar,theme,} from "@webstudio-is/design-system";import { TrashIcon, PlusIcon } from "@webstudio-is/icons";@@ -105,7 +106,7 @@ const MetadataItem = (props: {gridArea: "button",justifyItems: "center",gap: "2px",- color: theme.colors.foregroundIconSecondary,+ color: cssVar("--foreground-secondary"),}}><svg@@ -182,7 +183,6 @@ export const CustomMetadata = (props: CustomMetadataProps) => {<Buttontype="button"- color="neutral"css={{justifySelf: "center",}}@@ -202,3 +202,5 @@ export const CustomMetadata = (props: CustomMetadataProps) => {</Grid>);};++undefined;diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsxindex d7b0da18a4..bc868b0d33 100644--- a/apps/builder/app/builder/features/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx@@ -1,6 +1,7 @@import { useStore } from "@nanostores/react";import {Button,+ cssVar,DialogClose,DialogTitle,Flex,@@ -12,7 +13,6 @@ import {ScrollArea,TitleSuffixSpacer,Tooltip,- rawTheme,theme,} from "@webstudio-is/design-system";import { InfoCircleIcon, TrashIcon } from "@webstudio-is/icons";@@ -109,7 +109,7 @@ const FormFields = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={0}/></Tooltip>@@ -193,6 +193,7 @@ export const NewFolderSettings = ({)}<TitleSuffixSpacer /><Button+ color="primary"state={isSubmitting ? "pending" : "auto"}onClick={handleSubmit}tabIndex={2}diff --git a/apps/builder/app/builder/features/pages/form.stories.tsx b/apps/builder/app/builder/features/pages/form.stories.tsxindex 5f1440211c..0e9c2faaa8 100644--- a/apps/builder/app/builder/features/pages/form.stories.tsx+++ b/apps/builder/app/builder/features/pages/form.stories.tsx@@ -19,7 +19,9 @@ export const Form = () => (<Flex direction="column" gap="3" css={{ padding: 16 }}><Text variant="labels">Page name</Text><InputField defaultValue="Home" />- <Button type="submit">Save</Button>+ <Button color="primary" type="submit">+ Save+ </Button></Flex></FormComponent></Flex>diff --git a/apps/builder/app/builder/features/pages/image-info.tsx b/apps/builder/app/builder/features/pages/image-info.tsxindex 716db637e2..330103137d 100644--- a/apps/builder/app/builder/features/pages/image-info.tsx+++ b/apps/builder/app/builder/features/pages/image-info.tsx@@ -1,4 +1,5 @@import {+ cssVar,IconButton,Text,Grid,@@ -35,8 +36,8 @@ export const ImageInfo = ({justify={"start"}css={{borderRadius: theme.borderRadius[4],- border: `1px solid ${theme.colors.borderMain}`,- backgroundColor: theme.colors.white,+ border: `1px solid ${cssVar("--border-default")}`,+ backgroundColor: cssVar("--background-primary"),padding: theme.spacing[4],justifySelf: "start",pr: theme.spacing[5],diff --git a/apps/builder/app/builder/features/pages/page-settings.stories.tsx b/apps/builder/app/builder/features/pages/page-settings.stories.tsxindex 3e043e8544..05bc163cba 100644--- a/apps/builder/app/builder/features/pages/page-settings.stories.tsx+++ b/apps/builder/app/builder/features/pages/page-settings.stories.tsx@@ -2,6 +2,7 @@ import { $pages } from "~/shared/sync/data-stores";import { PageSettings as PageSettingsComponent } from "./page-settings/page-settings";import {Grid,+ cssVar,theme,Dialog,DialogContent,@@ -91,9 +92,9 @@ export const PageSettings = () => {css={{width: theme.spacing[35],margin: "auto",- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,boxShadow: theme.shadows.menuDropShadow,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),borderRadius: theme.borderRadius[4],}}>diff --git a/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings/page-settings.tsxindex 819f3ea7e5..708515cffc 100644--- a/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx@@ -372,6 +372,7 @@ const NewPageSettingsView = ({<DialogTitleActions><TitleSuffixSpacer /><Button+ color="primary"state={isSubmitting ? "pending" : "auto"}onClick={onSubmit}tabIndex={2}diff --git a/apps/builder/app/builder/features/pages/page-settings/section-auth.tsx b/apps/builder/app/builder/features/pages/page-settings/section-auth.tsxindex aaf9f52be2..c264d051da 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-auth.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-auth.tsx@@ -2,16 +2,15 @@ import { useId, useState } from "react";import {Checkbox,CheckboxAndLabel,+ cssVar,Grid,InputErrorsTooltip,InputField,Label,- Link,+ LinkButton,ProChip,Text,Tooltip,- buttonStyle,- rawTheme,theme,} from "@webstudio-is/design-system";import { InfoCircleIcon } from "@webstudio-is/icons";@@ -85,16 +84,14 @@ export const AuthSection = ({staging for free; upgrade to Pro to publish to customdomains.</Text>- <Link- className={buttonStyle({ color: "gradient" })}+ <LinkButton+ color="primary"css={{ marginTop: theme.spacing[5], width: "100%" }}- color="contrast"- underline="none"target="_blank"href="https://webstudio.is/pricing">Upgrade- </Link>+ </LinkButton></>)}</>@@ -102,7 +99,7 @@ export const AuthSection = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={-1}/></Tooltip>diff --git a/apps/builder/app/builder/features/pages/page-settings/section-general.tsx b/apps/builder/app/builder/features/pages/page-settings/section-general.tsxindex 8687535517..c5a0f38675 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-general.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-general.tsx@@ -2,18 +2,18 @@ import { type FocusEventHandler, useId } from "react";import { useStore } from "@nanostores/react";import {Checkbox,+ cssVar,Flex,Grid,InputErrorsTooltip,InputField,Label,Link,+ LinkButton,ProChip,Select,Text,Tooltip,- buttonStyle,- rawTheme,theme,} from "@webstudio-is/design-system";import { isLiteralExpression } from "@webstudio-is/expression";@@ -66,16 +66,14 @@ const PathField = ({parameters and other features. You can publish to stagingfor free; upgrade to Pro to publish to custom domains.</Text>- <Link- className={buttonStyle({ color: "gradient" })}+ <LinkButton+ color="primary"css={{ marginTop: theme.spacing[5], width: "100%" }}- color="contrast"- underline="none"target="_blank"href="https://webstudio.is/pricing">Upgrade- </Link>+ </LinkButton></>)}</>@@ -83,7 +81,7 @@ const PathField = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={-1}/></Tooltip>@@ -146,7 +144,7 @@ const StatusField = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={-1}/></Tooltip>@@ -222,16 +220,14 @@ const RedirectField = ({staging for free; upgrade to Pro to publish to customdomains.</Text>- <Link- className={buttonStyle({ color: "gradient" })}+ <LinkButton+ color="primary"css={{ marginTop: theme.spacing[5], width: "100%" }}- color="contrast"- underline="none"target="_blank"href="https://webstudio.is/pricing">Upgrade- </Link>+ </LinkButton></>)}</>@@ -239,7 +235,7 @@ const RedirectField = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={-1}/></Tooltip>@@ -347,14 +343,14 @@ export const GeneralSection = ({</>) : canSetHomePage === false ? (<>- <HomeIcon color={rawTheme.colors.foregroundSubtle} />+ <HomeIcon color={cssVar("--foreground-secondary")} /><Text color="subtle">Stage this page for publish before setting it as the home page</Text></>) : values.parentFolderId !== pages.rootFolderId ? (<>- <HomeIcon color={rawTheme.colors.foregroundSubtle} />+ <HomeIcon color={cssVar("--foreground-secondary")} /><Textcss={{overflowWrap: "anywhere",@@ -369,7 +365,7 @@ export const GeneralSection = ({</>) : values.documentType !== "html" ? (<>- <HomeIcon color={rawTheme.colors.foregroundSubtle} />+ <HomeIcon color={cssVar("--foreground-secondary")} /><Textcss={{overflowWrap: "anywhere",diff --git a/apps/builder/app/builder/features/pages/page-settings/section-marketplace.tsx b/apps/builder/app/builder/features/pages/page-settings/section-marketplace.tsxindex 697b8524c7..388a57f156 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-marketplace.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-marketplace.tsx@@ -3,6 +3,7 @@ import { useStore } from "@nanostores/react";import {Box,Button,+ cssVar,Grid,InputField,Label,@@ -81,7 +82,7 @@ export const MarketplaceSection = ({})}>- <Button color="neutral" css={{ justifySelf: "start" }}>+ <Button css={{ justifySelf: "start" }}>Choose thumbnail from assets</Button></ImageControl>@@ -103,7 +104,7 @@ export const MarketplaceSection = ({css={{padding: theme.spacing[5],borderRadius: theme.borderRadius[4],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,justifySelf: "start",}}>diff --git a/apps/builder/app/builder/features/pages/page-settings/section-search.tsx b/apps/builder/app/builder/features/pages/page-settings/section-search.tsxindex 1c8b09aebe..ca9e03a9c9 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-search.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-search.tsx@@ -23,6 +23,10 @@ import { $pageRootScope } from "../page-utils";import { SearchPreview } from "../search-preview";import { computePageSettingsText, usePageUrl, type OnChange } from "./shared";+// Search-engine previews represent an external light surface, not Builder UI.+const searchPreviewBackground = "#ffffff";+const searchPreviewBorder = "#e6e6e6";+const LanguageField = ({errors,value,@@ -115,9 +119,9 @@ export const SearchSection = ({<Boxcss={{padding: theme.spacing[5],- background: theme.colors.white,+ background: searchPreviewBackground,borderRadius: theme.borderRadius[4],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${searchPreviewBorder}`,}}><Boxdiff --git a/apps/builder/app/builder/features/pages/page-settings/section-social-image.tsx b/apps/builder/app/builder/features/pages/page-settings/section-social-image.tsxindex 2994ddfdaa..e325da446d 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-social-image.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-social-image.tsx@@ -100,7 +100,6 @@ export const SocialImageSection = ({<Buttonid={socialImageAssetButtonId}css={{ justifySelf: "start" }}- color="neutral"disabled={disabled}>Choose image from assets@@ -134,3 +133,5 @@ export const SocialImageSection = ({</Grid>);};++undefined;diff --git a/apps/builder/app/builder/features/pages/search-preview.tsx b/apps/builder/app/builder/features/pages/search-preview.tsxindex 2d43e76f6f..f5306b18ff 100644--- a/apps/builder/app/builder/features/pages/search-preview.tsx+++ b/apps/builder/app/builder/features/pages/search-preview.tsx@@ -2,6 +2,15 @@ import { Box, Flex, Grid } from "@webstudio-is/design-system";import { getImageAttributes, wsImageLoader } from "@webstudio-is/image";import { formatUrl, truncateByWords, truncate } from "./social-utils";+// Search previews reproduce Google's light result surface rather than Builder UI.+const searchPreviewColors = {+ faviconBackground: "#f1f3f4",+ faviconBorder: "#ecedef",+ foreground: "#202124",+ foregroundSecondary: "#4d5156",+ link: "#1a0dab",+} as const;+/*** Full description with links https://developers.google.com/search/docs/appearance/visual-elements-gallery*/@@ -86,8 +95,8 @@ export const SearchPreview = (props: SearchPreviewProps) => {width: 28,height: 28,borderRadius: "50%",- backgroundColor: "#f1f3f4",- border: "1px solid #ecedef",+ backgroundColor: searchPreviewColors.faviconBackground,+ border: `1px solid ${searchPreviewColors.faviconBorder}`,}}justify={"center"}align={"center"}@@ -104,7 +113,7 @@ export const SearchPreview = (props: SearchPreviewProps) => {<Grid><Flexcss={{- color: "#202124",+ color: searchPreviewColors.foreground,fontSize: "14px",lineHeight: "20px",whiteSpace: "nowrap",@@ -116,7 +125,7 @@ export const SearchPreview = (props: SearchPreviewProps) => {css={{fontSize: "12px",lineHeight: "18px",- color: "#4d5156",+ color: searchPreviewColors.foregroundSecondary,gap: 8,}}align={"center"}@@ -131,7 +140,7 @@ export const SearchPreview = (props: SearchPreviewProps) => {css={{fontSize: "20px",fontWeight: 400,- color: "#1a0dab",+ color: searchPreviewColors.link,overflow: "hidden",textOverflow: "ellipsis",whiteSpace: "nowrap",@@ -144,7 +153,7 @@ export const SearchPreview = (props: SearchPreviewProps) => {css={{lineHeight: 1.58,fontSize: 14,- color: "#4d5156",+ color: searchPreviewColors.foregroundSecondary,"-webkit-line-clamp": 2,display: "-webkit-box","-webkit-box-orient": "vertical",diff --git a/apps/builder/app/builder/features/pages/social-preview.tsx b/apps/builder/app/builder/features/pages/social-preview.tsxindex d4b514cc6d..a95d35198e 100644--- a/apps/builder/app/builder/features/pages/social-preview.tsx+++ b/apps/builder/app/builder/features/pages/social-preview.tsx@@ -9,13 +9,22 @@ type SocialPreviewProps = {ogDescription: string;};+// Social previews represent an external light surface, not Builder UI.+const socialPreviewColors = {+ background: "#fff",+ imagePlaceholder: "#dfe3e6",+ border: "#e6e6e6",+ foreground: "#18283e",+ foregroundSecondary: "#4d5156",+} as const;+const imgStyle = css({borderTopLeftRadius: theme.borderRadius[4],borderTopRightRadius: theme.borderRadius[4],width: "100%",aspectRatio: "1.91",- background: "#DFE3E6",- borderBottom: `1px solid ${theme.colors.borderMain}`,+ background: socialPreviewColors.imagePlaceholder,+ borderBottom: `1px solid ${socialPreviewColors.border}`,variants: {hasImage: {true: {@@ -39,8 +48,8 @@ export const SocialPreview = ({gap={1}css={{borderRadius: theme.borderRadius[4],- border: `1px solid ${theme.colors.borderMain}`,- backgroundColor: theme.colors.white,+ border: `1px solid ${socialPreviewColors.border}`,+ backgroundColor: socialPreviewColors.background,}}><img@@ -63,7 +72,7 @@ export const SocialPreview = ({><Boxcss={{- color: "#4D5156",+ color: socialPreviewColors.foregroundSecondary,fontFamily: "Arial",fontSize: "12px",lineHeight: "16px",@@ -73,7 +82,7 @@ export const SocialPreview = ({</Box><Boxcss={{- color: "#18283E",+ color: socialPreviewColors.foreground,fontFamily: "Arial",fontSize: "14px",fontWeight: 700,@@ -87,7 +96,7 @@ export const SocialPreview = ({</Box><Boxcss={{- color: "#4D5156",+ color: socialPreviewColors.foregroundSecondary,fontFamily: "Arial",fontSize: "12px",fontWeight: 400,diff --git a/apps/builder/app/builder/features/pages/template-settings.tsx b/apps/builder/app/builder/features/pages/template-settings.tsxindex 701d286adb..520737d35f 100644--- a/apps/builder/app/builder/features/pages/template-settings.tsx+++ b/apps/builder/app/builder/features/pages/template-settings.tsx@@ -50,7 +50,7 @@ const validateTemplateValues = (const templateFieldDefaultValues: PageSettingsValues = {...pageSettingsDefaultValues,- name: "Untitled Template",+ name: "Untitled template",path: "",excludePageFromSearch: "false",};@@ -148,6 +148,7 @@ const NewTemplateSettingsView = ({<DialogTitleActions><TitleSuffixSpacer /><Button+ color="primary"state={isSubmitting ? "pending" : "auto"}onClick={onSubmit}tabIndex={2}@@ -443,7 +444,7 @@ export const CreatePageFromTemplateSettings = ({suffix={<DialogTitleActions><TitleSuffixSpacer />- <Button onClick={handleSubmit} tabIndex={2}>+ <Button color="primary" onClick={handleSubmit} tabIndex={2}>Create page</Button><DialogClose />diff --git a/apps/builder/app/builder/features/publish/add-domain.tsx b/apps/builder/app/builder/features/publish/add-domain.tsxindex e2de69130d..cd3b614244 100644--- a/apps/builder/app/builder/features/publish/add-domain.tsx+++ b/apps/builder/app/builder/features/publish/add-domain.tsx@@ -140,7 +140,6 @@ export const AddDomain = ({</Button><Button- color={"dark"}prefix={<TerminalIcon />}type="button"onClick={onExportClick}@@ -153,3 +152,5 @@ export const AddDomain = ({</>);};++undefined;diff --git a/apps/builder/app/builder/features/publish/collapsible-domain-section.stories.tsx b/apps/builder/app/builder/features/publish/collapsible-domain-section.stories.tsxindex cc01ac3171..d30cec39cc 100644--- a/apps/builder/app/builder/features/publish/collapsible-domain-section.stories.tsx+++ b/apps/builder/app/builder/features/publish/collapsible-domain-section.stories.tsx@@ -12,12 +12,12 @@ import {ScrollArea,PanelBanner,Link,+ LinkButton,Select,TextArea,Checkbox,theme,- rawTheme,- buttonStyle,+ cssVar,Popover,PopoverTitle,PopoverTitleActions,@@ -47,10 +47,10 @@ const StatusIcon = ({ status }: { status: "ok" | "error" | "pending" }) => (height: theme.sizes.controlHeight,color:status === "error"- ? theme.colors.foregroundDestructive+ ? cssVar("--foreground-negative"): status === "pending"- ? theme.colors.foregroundSubtle- : theme.colors.foregroundSuccessText,+ ? cssVar("--foreground-secondary")+ : cssVar("--foreground-positive"),}}>{status === "error" ? <AlertIcon /> : <CheckCircleIcon />}@@ -94,7 +94,7 @@ export const StagingDomain = () => (<InfoCircleIcontabIndex={0}style={{ flexShrink: 0 }}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}/></Tooltip></Flex>@@ -114,7 +114,7 @@ export const StagingDomain = () => (<InfoCircleIcontabIndex={0}style={{ flexShrink: 0 }}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}/></Tooltip></Flex>@@ -181,7 +181,7 @@ export const CustomDomains = () => (><Grid gap={2}><Flex align="center" gap={1}>- <CheckCircleIcon color={rawTheme.colors.foregroundSuccessText} />+ <CheckCircleIcon color={cssVar("--foreground-positive")} /><Text>Published 2 hours ago</Text></Flex><Grid gap={1}>@@ -205,7 +205,7 @@ export const CustomDomains = () => (</Grid></Grid><Grid flow="column" gap={2}>- <Button color="neutral">Verify DNS</Button>+ <Button>Verify DNS</Button><Button color="destructive">Remove</Button></Grid></Grid>@@ -220,7 +220,7 @@ export const CustomDomains = () => (><Grid gap={2}><Flex align="center" gap={1}>- <AlertIcon color={rawTheme.colors.foregroundDestructive} />+ <AlertIcon color={cssVar("--foreground-negative")} /><Text color="destructive">DNS records not found. Add these records at your registrar:</Text>@@ -240,7 +240,7 @@ export const CustomDomains = () => (<Text variant="mono">webstudio-verify=xyz789</Text></Grid><Grid flow="column" gap={2}>- <Button color="neutral">Check status</Button>+ <Button>Check status</Button><Button color="destructive">Remove</Button></Grid></Grid>@@ -255,10 +255,10 @@ export const CustomDomains = () => (><Grid gap={2}><Flex align="center" gap={1}>- <InfoCircleIcon color={rawTheme.colors.foregroundSubtle} />+ <InfoCircleIcon color={cssVar("--foreground-secondary")} /><Text color="subtle">Setting up SSL certificate...</Text></Flex>- <Button color="neutral">Check status</Button>+ <Button>Check status</Button></Grid></CollapsibleDomainSection>@@ -271,14 +271,14 @@ export const CustomDomains = () => (><Grid gap={2}><Flex align="center" gap={1}>- <AlertIcon color={rawTheme.colors.foregroundDestructive} />+ <AlertIcon color={cssVar("--foreground-negative")} /><Text color="destructive">SSL provisioning failed. Please verify your DNS records and tryagain.</Text></Flex><Grid flow="column" gap={2}>- <Button color="neutral">Verify DNS</Button>+ <Button>Verify DNS</Button><Button color="destructive">Remove</Button></Grid></Grid>@@ -292,29 +292,29 @@ export const PublishButton = () => (<StorySection title="Publish Button"><Flex direction="column" gap="3" css={{ width: theme.spacing[33] }}><Text variant="labels">Ready to publish</Text>- <Button color="positive" css={{ width: "100%" }}>+ <Button color="primary" css={{ width: "100%" }}>Publish</Button><Text variant="labels">Publishing with countdown</Text>- <Button color="positive" css={{ width: "100%" }}>+ <Button color="primary" css={{ width: "100%" }}>Publishing (45s)</Button><Text variant="labels">Publishing (pending)</Text>- <Button color="positive" state="pending" css={{ width: "100%" }}>+ <Button color="primary" state="pending" css={{ width: "100%" }}>Publish</Button><Text variant="labels">No domains selected</Text><Tooltip content="Select at least one domain to publish">- <Button color="positive" disabled css={{ width: "100%" }}>+ <Button color="primary" disabled css={{ width: "100%" }}>Publish</Button></Tooltip><Text variant="labels">Disabled (restricted features)</Text>- <Button color="positive" disabled css={{ width: "100%" }}>+ <Button color="primary" disabled css={{ width: "100%" }}>Publish</Button>@@ -323,7 +323,7 @@ export const PublishButton = () => (<Text color="destructive">Build timed out after 3 minutes. Please try again.</Text>- <Button color="positive" css={{ width: "100%" }}>+ <Button color="primary" css={{ width: "100%" }}>Publish</Button></Flex>@@ -340,14 +340,9 @@ export const UpgradeBanners = () => (<Text variant="regularBold">Upgrade to publish more than 1 time per day:</Text>- <Link- className={buttonStyle({ color: "gradient" })}- color="contrast"- underline="none"- href="#"- >+ <LinkButton color="primary" href="#">Upgrade- </Link>+ </LinkButton></PanelBanner><Text variant="labels">Restricted pro features</Text>@@ -412,7 +407,7 @@ export const UpgradeBanners = () => (<Text variant="labels">Unpublished domain reminder</Text><PanelBanner><Flex align="center" gap="1">- <InfoCircleIcon color={rawTheme.colors.foregroundMain} />+ <InfoCircleIcon color={cssVar("--foreground-primary")} /><Text variant="regularBold">Don't forget to publish</Text></Flex><Text>@@ -431,7 +426,7 @@ export const PublishDialogLayout = () => (direction="column"css={{width: theme.spacing[33],- border: `1px solid ${rawTheme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],}}>@@ -490,7 +485,7 @@ export const PublishDialogLayout = () => (</Flex><Flex direction="column" gap="2" css={{ padding: theme.panel.padding }}>- <Button color="positive">Publish</Button>+ <Button color="primary">Publish</Button></Flex></Flex></StorySection>@@ -504,7 +499,7 @@ export const ExportDialogLayout = () => (direction="column"css={{width: theme.spacing[33],- border: `1px solid ${rawTheme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],}}>@@ -558,7 +553,7 @@ export const ExportDialogLayout = () => (readOnlyvalue="npx webstudio@latest"/>- <Button type="button" color="neutral" prefix={<CopyIcon />}>+ <Button type="button" prefix={<CopyIcon />}>Copy</Button></Flex>@@ -579,7 +574,6 @@ export const ExportDialogLayout = () => (<Buttontype="button"css={{ flexShrink: 0 }}- color="neutral"prefix={<CopyIcon />}>Copy@@ -600,7 +594,7 @@ export const ExportStaticLayout = () => (direction="column"css={{width: theme.spacing[33],- border: `1px solid ${rawTheme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],}}>@@ -619,7 +613,7 @@ export const ExportStaticLayout = () => (/></Grid>- <Button color="positive">Build and download static site</Button>+ <Button color="primary">Build and download static site</Button><Text color="subtle">Learn about deploying static sites{" "}<Link variant="inherit" color="inherit" href="#">@@ -631,3 +625,5 @@ export const ExportStaticLayout = () => (</Popover></StorySection>);++undefined;diff --git a/apps/builder/app/builder/features/publish/domain-checkbox.tsx b/apps/builder/app/builder/features/publish/domain-checkbox.tsxindex a8f92671d8..756ee15ae9 100644--- a/apps/builder/app/builder/features/publish/domain-checkbox.tsx+++ b/apps/builder/app/builder/features/publish/domain-checkbox.tsx@@ -4,8 +4,7 @@ import {Tooltip,Text,theme,- Link,- buttonStyle,+ LinkButton,Checkbox,} from "@webstudio-is/design-system";@@ -66,15 +65,13 @@ export const DomainCheckbox = (props: DomainCheckboxProps) => {<br />Upgrade to Pro account to publish to each domain individually.<br /> <br />- <Link- className={buttonStyle({ color: "gradient" })}- color="contrast"- underline="none"+ <LinkButton+ color="primary"href="https://webstudio.is/pricing"target="_blank">Upgrade- </Link>+ </LinkButton></></Flex></Text>diff --git a/apps/builder/app/builder/features/publish/domains.tsx b/apps/builder/app/builder/features/publish/domains.tsxindex 59768e04a4..50eb1e675c 100644--- a/apps/builder/app/builder/features/publish/domains.tsx+++ b/apps/builder/app/builder/features/publish/domains.tsx@@ -1,5 +1,6 @@import {Button,+ cssVar,theme,Text,Tooltip,@@ -158,10 +159,10 @@ const StatusIcon = (props: { projectDomain: Domain; isLoading: boolean }) => {width: theme.sizes.controlHeight,height: theme.sizes.controlHeight,color: props.isLoading- ? theme.colors.foregroundDisabled+ ? cssVar("--foreground-secondary"): isVerifiedActive- ? theme.colors.foregroundSuccessText- : theme.colors.foregroundDestructive,+ ? cssVar("--foreground-positive")+ : cssVar("--foreground-negative"),}}><Icon />@@ -372,7 +373,6 @@ const DomainItem = ({// oxlint-disable-next-line react-hooks/rules-of-hooks -- our useEffectEvent is a stable callbackformAction={handleVerify}state={isCheckStateInProgress ? "pending" : undefined}- color="neutral"css={{ width: "100%", flexShrink: 0, mt: theme.spacing[3] }}>Check status@@ -389,7 +389,6 @@ const DomainItem = ({// oxlint-disable-next-line react-hooks/rules-of-hooks -- our useEffectEvent is a stable callbackformAction={handleUpdateStatus}state={isCheckStateInProgress ? "pending" : undefined}- color="neutral"css={{ width: "100%", flexShrink: 0, mt: theme.spacing[3] }}>Check status@@ -525,7 +524,7 @@ const DomainItem = ({}}><Separator css={{ alignSelf: "unset" }} />- <Text color="main">OR</Text>+ <Text color="main">or</Text><Separator css={{ alignSelf: "unset" }} /></Grid>@@ -582,3 +581,6 @@ export const Domains = ({</>);};++undefined;+undefined;diff --git a/apps/builder/app/builder/features/publish/publish.tsx b/apps/builder/app/builder/features/publish/publish.tsxindex 594370b2f7..5dc67f1936 100644--- a/apps/builder/app/builder/features/publish/publish.tsx+++ b/apps/builder/app/builder/features/publish/publish.tsx@@ -12,6 +12,7 @@ import {import { useStore } from "@nanostores/react";import {Button,+ cssVar,Tooltip,IconButton,Grid,@@ -26,8 +27,8 @@ import {theme,TextArea,Link,+ LinkButton,PanelBanner,- buttonStyle,toast,RadioGroup,Popover,@@ -292,8 +293,8 @@ const ChangeProjectDomain = ({height: theme.sizes.controlHeight,color:error !== undefined || status === "FAILED"- ? theme.colors.foregroundDestructive- : theme.colors.foregroundSuccessText,+ ? cssVar("--foreground-negative")+ : cssVar("--foreground-positive"),}}>{error !== undefined || status === "FAILED" ? (@@ -326,7 +327,7 @@ const ChangeProjectDomain = ({<InfoCircleIcontabIndex={0}style={{ flexShrink: 0 }}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}/></Tooltip></Flex>@@ -385,7 +386,7 @@ const ChangeProjectDomain = ({<InfoCircleIcontabIndex={0}style={{ flexShrink: 0 }}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}/></Tooltip></Flex>@@ -712,7 +713,7 @@ const Publish = ({handlePublish(new FormData(form));}}}- color="positive"+ color="primary"state={showPendingState ? "pending" : undefined}disabled={hasSelectedDomains === false ||@@ -802,7 +803,7 @@ const PublishStatic = ({><Buttontype="button"- color="positive"+ color="primary"state={isPublishInProgress ? "pending" : undefined}onClick={() => {setPublishError(undefined);@@ -970,15 +971,13 @@ const UpgradeBanner = ({ hasCustomDomains }: { hasCustomDomains: boolean }) => {<Text variant="regularBold">Upgrade to publish more than {maxDailyPublishesPerUser} times per day:</Text>- <Link- className={buttonStyle({ color: "gradient" })}- color="contrast"- underline="none"+ <LinkButton+ color="primary"href="https://webstudio.is/pricing"target="_blank">Upgrade- </Link>+ </LinkButton></PanelBanner>);}@@ -1132,7 +1131,7 @@ const Content = (props: {{hasUnpublishedDomains && (<PanelBanner><Flex align="center" gap="1">- <InfoCircleIcon color={rawTheme.colors.foregroundMain} />+ <InfoCircleIcon color={cssVar("--foreground-primary")} /><Text variant="regularBold">Don't forget to publish</Text></Flex><Text>@@ -1300,7 +1299,7 @@ const ExportContent = (props: { projectId: Project["id"] }) => {value={npxCommand}/><CopyToClipboard text={npxCommand}>- <Button type="button" color="neutral" prefix={<CopyIcon />}>+ <Button type="button" prefix={<CopyIcon />}>Copy</Button></CopyToClipboard>@@ -1338,7 +1337,6 @@ const ExportContent = (props: { projectId: Project["id"] }) => {<Buttontype="button"css={{ flexShrink: 0 }}- color="neutral"prefix={<CopyIcon />}>Copy@@ -1402,18 +1400,13 @@ export const PublishButton = ({ projectId }: PublishProps) => {sideOffset={Number.parseFloat(rawTheme.spacing[5])}><PopoverTrigger asChild>- <Button- type="button"- disabled={isPublishEnabled === false}- color="positive"- >+ <Button type="button" disabled={isPublishEnabled === false}>Publish</Button></PopoverTrigger></Tooltip><PopoverContent- sideOffset={Number.parseFloat(rawTheme.spacing[8])}css={{width: theme.spacing[33],maxWidth: theme.spacing[33],@@ -1453,3 +1446,5 @@ export const PublishButton = ({ projectId }: PublishProps) => {</Popover>);};++undefined;diff --git a/apps/builder/app/builder/features/safe-mode.tsx b/apps/builder/app/builder/features/safe-mode.tsxindex e798a033f3..e22d3d0a51 100644--- a/apps/builder/app/builder/features/safe-mode.tsx+++ b/apps/builder/app/builder/features/safe-mode.tsx@@ -2,14 +2,14 @@ import { useState } from "react";import { ShieldIcon } from "@webstudio-is/icons";import {Popover,+ cssVar,PopoverTrigger,PopoverContent,theme,- ToolbarButton,+ IconButton,Button,Text,Flex,- rawTheme,} from "@webstudio-is/design-system";import { builderApi } from "~/shared/builder-api";@@ -29,9 +29,9 @@ export const SafeModeButton = () => {return (<Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild>- <ToolbarButton variant="subtle" tabIndex={0}>- <ShieldIcon stroke={rawTheme.colors.foregroundDestructive} />- </ToolbarButton>+ <IconButton type="button" aria-label="Safe mode active">+ <ShieldIcon stroke={cssVar("--foreground-negative")} />+ </IconButton></PopoverTrigger><PopoverContent><Flexdiff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsxindex 6a83436a41..ff100bf82c 100644--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx@@ -6,6 +6,7 @@ import {import { languages } from "@codemirror/language-data";import {Button,+ cssVar,DialogClose,DialogMaximize,DialogTitle,@@ -14,7 +15,6 @@ import {SmallIconButton,Text,Tooltip,- rawTheme,theme,} from "@webstudio-is/design-system";import { InfoCircleIcon } from "@webstudio-is/icons";@@ -129,8 +129,8 @@ const ErrorInfo = ({<InfoCircleIconcolor={error.severity === "warning"- ? rawTheme.colors.foregroundSubtle- : rawTheme.colors.foregroundDestructive+ ? cssVar("--foreground-warning")+ : cssVar("--foreground-negative")}/>}diff --git a/apps/builder/app/builder/features/settings-panel/controls/content-block-source.tsx b/apps/builder/app/builder/features/settings-panel/controls/content-block-source.tsxindex 912c0b3c1e..56584ced28 100644--- a/apps/builder/app/builder/features/settings-panel/controls/content-block-source.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/content-block-source.tsx@@ -12,7 +12,7 @@ import {Grid,Text,Tooltip,- rawTheme,+ cssVar,theme,} from "@webstudio-is/design-system";import { AlertIcon } from "@webstudio-is/icons";@@ -277,7 +277,7 @@ export const ContentBlockSourceControl = ({tabIndex={0}aria-label={`MDX source warning: ${formatContentBlockDiagnostic(uniqueDiagnostics[0])}${uniqueDiagnostics.length > 1 ? ` ${uniqueDiagnostics.length - 1} more diagnostic${uniqueDiagnostics.length === 2 ? "" : "s"}.` : ""}`}css={{- color: rawTheme.colors.backgroundAlertMain,+ color: cssVar("--foreground-warning"),flexShrink: 0,}}>diff --git a/apps/builder/app/builder/features/settings-panel/controls/controls.stories.tsx b/apps/builder/app/builder/features/settings-panel/controls/controls.stories.tsxindex 0155293505..1c26521f79 100644--- a/apps/builder/app/builder/features/settings-panel/controls/controls.stories.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/controls.stories.tsx@@ -1,4 +1,10 @@-import { Flex, StorySection, Text, theme } from "@webstudio-is/design-system";+import {+ Flex,+ StorySection,+ Text,+ cssVar,+ theme,+} from "@webstudio-is/design-system";import { BooleanControl } from "./boolean";import { NumberControl } from "./number";import { TextControl } from "./text";@@ -22,7 +28,7 @@ const Section = ({variant="labels"css={{paddingBottom: theme.spacing[3],- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,}}>{label}diff --git a/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx b/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsxindex 34aeb81b15..d33ac54825 100644--- a/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx@@ -74,8 +74,8 @@ const ResourceButton = forwardRef<ComponentProps<typeof NestedInputButton>>((props, ref) => {return (- <EnhancedTooltip content="Edit Resource">- <NestedInputButton {...props} ref={ref} aria-label="Edit Resource">+ <EnhancedTooltip content="Edit resource">+ <NestedInputButton {...props} ref={ref} aria-label="Edit resource"><GearIcon /></NestedInputButton></EnhancedTooltip>@@ -156,7 +156,7 @@ const ResourceControlPanel = ({const form = useRef<HTMLFormElement>(null);return (<FloatingPanel- title="Edit Resource"+ title="Edit resource"open={isResourceOpen}onOpenChange={(isOpen) => {if (isOpen) {diff --git a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsxindex 9f0d94eae6..d16f22f9fd 100644--- a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx@@ -69,7 +69,7 @@ export const SelectAsset = ({/>}>- <Button color="neutral" css={{ flex: 1 }} disabled={disabled}>+ <Button css={{ flex: 1 }} disabled={disabled}>{triggerLabel ?? (asset ? formatAssetName(asset) : "Choose source")}</Button></FloatingPanel>diff --git a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsxindex 40e544a0f7..d72f37cd9f 100644--- a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx@@ -2,12 +2,12 @@ import { useMemo } from "react";import { useStore } from "@nanostores/react";import { computed } from "nanostores";import {+ cssVar,DialogClose,DialogMaximize,DialogTitle,DialogTitleActions,Flex,- rawTheme,Text,toast,} from "@webstudio-is/design-system";@@ -144,7 +144,7 @@ export const TextContent = ({{binding.bindingState.overwritable === false && (<Flex gap="1"><AlertIcon- color={rawTheme.colors.backgroundAlertMain}+ color={cssVar("--foreground-warning")}style={{ flexShrink: 0 }}/><Text>@@ -174,7 +174,7 @@ export const TextContent = ({<BindableExpressionControl{...binding}value={localValue.value}- validate={(value) => validatePrimitiveValue(value, "Text Content")}+ validate={(value) => validatePrimitiveValue(value, "Text content")}onChangeValue={(value) => updateChild("text", value)}onChangeExpression={(value) =>updateChild("expression", value, binding.getExpressionMode(value))diff --git a/apps/builder/app/builder/features/settings-panel/property-label.tsx b/apps/builder/app/builder/features/settings-panel/property-label.tsxindex c11822cb75..adbad1497b 100644--- a/apps/builder/app/builder/features/settings-panel/property-label.tsx+++ b/apps/builder/app/builder/features/settings-panel/property-label.tsx@@ -4,12 +4,12 @@ import { computed } from "nanostores";import { useStore } from "@nanostores/react";import {Button,+ cssVar,Flex,Kbd,Label,Text,Tooltip,- rawTheme,theme,} from "@webstudio-is/design-system";import { AlertIcon } from "@webstudio-is/icons";@@ -155,7 +155,7 @@ export const PropertyLabel = ({{readOnly && (<Flex gap="1"><AlertIcon- color={rawTheme.colors.backgroundAlertMain}+ color={cssVar("--foreground-warning")}style={{ flexShrink: 0 }}/><Text>@@ -166,7 +166,7 @@ export const PropertyLabel = ({)}{canDelete && (<Button- color="dark"+ color="neutral-destructive"// to align button text in the middleprefix={<div></div>}suffix={<Kbd value={["alt", "click"]} color="moreSubtle" />}@@ -255,7 +255,7 @@ export const FieldLabel = ({{description}{canReset && (<Button- color="dark"+ color="neutral-destructive"// to align button text in the middleprefix={<div></div>}suffix={<Kbd value={["alt", "click"]} color="moreSubtle" />}diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-panel-content.stories.tsx b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-panel-content.stories.tsxindex c0ee270eff..e44c43eafd 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-panel-content.stories.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-panel-content.stories.tsx@@ -1,5 +1,5 @@import { AnimationPanelContent } from "./animation-panel-content";-import { StorySection, theme } from "@webstudio-is/design-system";+import { StorySection, cssVar, theme } from "@webstudio-is/design-system";import { useState } from "react";import type { ScrollAnimation, ViewAnimation } from "@webstudio-is/sdk";@@ -13,7 +13,7 @@ export default {(Story: React.ComponentType) => (<divstyle={{- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),padding: 16,width: theme.sizes.sidebarWidth,}}diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsxindex bd15fbc96a..26d6c529ad 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx@@ -296,13 +296,13 @@ const AnimationConfig = ({<Grid gap={1} align={"center"} css={{ gridTemplateColumns: "1fr 1fr" }}><FieldLabel description={insetDescription}>{value.axis === "inline" || value.axis === "x"- ? "Left Inset"- : "Top Inset"}+ ? "Left inset"+ : "Top inset"}</FieldLabel><FieldLabel description={insetDescription}>{value.axis === "inline" || value.axis === "x"- ? "Right Inset"- : "Bottom Inset"}+ ? "Right inset"+ : "Bottom inset"}</FieldLabel><InsetValueInputvalue={value.insetStart ?? { type: "keyword", value: "auto" }}@@ -431,7 +431,7 @@ export const AnimationSection = ({<AnimationsSelectaction={<FloatingPanel- title="Advanced Animation"+ title="Advanced animation"placement="bottom-within"content={<AnimationConfig value={value} onChange={handleChange} />diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/new-scroll-animations.ts b/apps/builder/app/builder/features/settings-panel/props-section/animation/new-scroll-animations.tsindex 33aaa3a201..1b5dc6daed 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/new-scroll-animations.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/new-scroll-animations.ts@@ -2,7 +2,7 @@ import { parseCssValue } from "@webstudio-is/css-data";import type { ScrollAnimation } from "@webstudio-is/sdk";const newScrollAnimation: ScrollAnimation = {- name: "New Animation",+ name: "New animation",description: "Create a new animation.",timing: {@@ -21,7 +21,7 @@ const newScrollAnimation: ScrollAnimation = {// @todo: visit https://github.com/argyleink/open-props/blob/main/src/props.animations.cssconst newFadeInScrollAnimation: ScrollAnimation = {- name: "Fade In",+ name: "Fade in",description: "Fade in the element as it scrolls into view.",timing: {@@ -41,7 +41,7 @@ const newFadeInScrollAnimation: ScrollAnimation = {};const newFadeOutScrollAnimation: ScrollAnimation = {- name: "Fade Out",+ name: "Fade out",description: "Fade out the element as it scrolls out of view.",timing: {diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/new-view-animations.ts b/apps/builder/app/builder/features/settings-panel/props-section/animation/new-view-animations.tsindex 4ca0beacb2..f467c31e74 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/new-view-animations.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/new-view-animations.ts@@ -2,7 +2,7 @@ import { parseCssValue } from "@webstudio-is/css-data";import type { ViewAnimation } from "@webstudio-is/sdk";const newViewAnimation: ViewAnimation = {- name: "New Animation",+ name: "New animation",description: "Create a new animation.",timing: {@@ -21,7 +21,7 @@ const newViewAnimation: ViewAnimation = {// @todo: visit https://github.com/argyleink/open-props/blob/main/src/props.animations.cssconst newFadeInViewAnimation: ViewAnimation = {- name: "Fade In",+ name: "Fade in",description: "Fade in the element as it scrolls into view.",timing: {@@ -41,7 +41,7 @@ const newFadeInViewAnimation: ViewAnimation = {};const newFadeOutViewAnimation: ViewAnimation = {- name: "Fade Out",+ name: "Fade out",description: "Fade out the element as it scrolls out of view.",timing: {@@ -61,7 +61,7 @@ const newFadeOutViewAnimation: ViewAnimation = {};const newFlyInViewAnimation: ViewAnimation = {- name: "Fly In",+ name: "Fly in",description: "A fly in animation moves an element as it scrolls into view.",timing: {@@ -81,7 +81,7 @@ const newFlyInViewAnimation: ViewAnimation = {};const newFlyOutViewAnimation: ViewAnimation = {- name: "Fly Out",+ name: "Fly out",description:"A fly out animation moves an element as it scrolls out of view.",@@ -102,7 +102,7 @@ const newFlyOutViewAnimation: ViewAnimation = {};const newWipeInViewAnimation: ViewAnimation = {- name: "Wipe In",+ name: "Wipe in",description:"A wipe in is an animation where one scene gradually replaces another as it scrolls into the view.",@@ -129,7 +129,7 @@ const newWipeInViewAnimation: ViewAnimation = {};const newWipeOutViewAnimation: ViewAnimation = {- name: "Wipe Out",+ name: "Wipe out",description:"A wipe out is an animation where one scene gradually replaces another as it scrolls out of view.",@@ -157,7 +157,7 @@ const newWipeOutViewAnimation: ViewAnimation = {};const newParallaxInAnimation: ViewAnimation = {- name: "Parallax In",+ name: "Parallax in",description: "Parallax the element as it scrolls into the view.",timing: {@@ -177,7 +177,7 @@ const newParallaxInAnimation: ViewAnimation = {};const newParallaxOutAnimation: ViewAnimation = {- name: "Parallax Out",+ name: "Parallax out",description: "Parallax the element as it scrolls out of view.",timing: {diff --git a/apps/builder/app/builder/features/settings-panel/request-inspector.tsx b/apps/builder/app/builder/features/settings-panel/request-inspector.tsxindex e598e57cec..cbc4df9b11 100644--- a/apps/builder/app/builder/features/settings-panel/request-inspector.tsx+++ b/apps/builder/app/builder/features/settings-panel/request-inspector.tsx@@ -1,5 +1,6 @@import type { ComponentProps, ReactNode, Ref } from "react";import {+ cssVar,Flex,Grid,PanelTabs,@@ -44,7 +45,7 @@ export const RequestDiagnosticsTable = ({}) => (<Gridcss={{- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],overflow: "hidden",}}@@ -78,7 +79,7 @@ export const RequestDiagnosticsRow = ({gap={2}css={{padding: theme.spacing[5],- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,"&:last-child": { borderBottom: 0 },}}>@@ -122,7 +123,7 @@ export const RequestInspector = ({aria-label="Request details"css={{flexShrink: 0,- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,}}>{queryContainerRef !== undefined && (diff --git a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx b/apps/builder/app/builder/features/settings-panel/resource-panel.tsxindex 578e14a37e..bfe1c7265c 100644--- a/apps/builder/app/builder/features/settings-panel/resource-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/resource-panel.tsx@@ -1115,7 +1115,7 @@ export const GraphqlResourceForm = forwardRef<onChange={setQuery}/><EditorDialog- title="GraphQL Query"+ title="GraphQL query"content={<TextArea grow={true} value={query} onChange={setQuery} />}diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsxindex 2b47b0e6ac..16c5d0d79c 100644--- a/apps/builder/app/builder/features/settings-panel/shared.tsx+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx@@ -26,6 +26,7 @@ import { getContentModePropNamesByTag } from "@webstudio-is/project-build/runtimimport type { PropMeta, Prop, Asset } from "@webstudio-is/sdk";import { InfoCircleIcon } from "@webstudio-is/icons";import {+ cssVar,Label as BaseLabel,useIsTruncated,Tooltip,@@ -34,7 +35,6 @@ import {Grid,Text,theme,- rawTheme,} from "@webstudio-is/design-system";import {$registeredComponentMetas,@@ -152,7 +152,7 @@ export const Label = ({variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={0}/></Tooltip>diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsxindex 7c84e09341..005af9a25e 100644--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx@@ -776,7 +776,6 @@ const VariablePreview = ({><Buttontype="button"- color="neutral"disabled={hasPendingResources}onClick={onLoadData}>@@ -1040,7 +1039,7 @@ const VariablePopoverContent = ({</DialogTitleActions>}>- {variable ? "Edit Variable" : "New Variable"}+ {variable ? "Edit variable" : "New variable"}</DialogTitle></>);@@ -1116,3 +1115,5 @@ export const VariablePopoverTrigger = ({};VariablePopoverTrigger.displayName = "VariablePopoverTrigger";++undefined;diff --git a/apps/builder/app/builder/features/settings-panel/variables-section.tsx b/apps/builder/app/builder/features/settings-panel/variables-section.tsxindex 7837574d6f..e7aec8d327 100644--- a/apps/builder/app/builder/features/settings-panel/variables-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/variables-section.tsx@@ -107,7 +107,7 @@ const EmptyVariables = () => (</Flex><Flex justify="center" align="center"><VariablePopoverTrigger>- <Button type="button" prefix={<PlusIcon />}>+ <Button color="primary" type="button" prefix={<PlusIcon />}>Create data variable</Button></VariablePopoverTrigger>diff --git a/apps/builder/app/builder/features/share.tsx b/apps/builder/app/builder/features/share.tsxindex d8669d883f..27859d5806 100644--- a/apps/builder/app/builder/features/share.tsx+++ b/apps/builder/app/builder/features/share.tsx@@ -35,15 +35,12 @@ export const ShareButton = ({ projectId }: { projectId: string }) => {sideOffset={Number.parseFloat(rawTheme.spacing[5])}><PopoverTrigger asChild>- <Button disabled={isShareDisabled} color="gradient">+ <Button color="ghost" disabled={isShareDisabled}>Share</Button></PopoverTrigger></Tooltip>- <PopoverContent- sideOffset={Number.parseFloat(rawTheme.spacing[8])}- css={{ marginRight: theme.spacing[3] }}- >+ <PopoverContent css={{ marginRight: theme.spacing[3] }}><ShareProjectContainer projectId={projectId} /><PopoverTitle>Share</PopoverTitle></PopoverContent>diff --git a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxindex 9431e8d12f..2a94b384c4 100644--- a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx@@ -125,7 +125,7 @@ const FontsManagerButton = forwardRef<ComponentProps<typeof NestedInputButton>>((props, ref) => {return (- <EnhancedTooltip content="Open Font Manager">+ <EnhancedTooltip content="Open font manager"><NestedInputButton {...props} ref={ref} tabIndex={-1}><UploadIcon /></NestedInputButton>diff --git a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsxindex 9d2df55a97..4cb5291056 100644--- a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx@@ -125,7 +125,6 @@ export const ImageControl = ({}><Button- color="neutral"disabled={disabled}css={{ maxWidth: "100%", justifySelf: "right" }}>@@ -135,3 +134,5 @@ export const ImageControl = ({</Flex>);};++undefined;diff --git a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsxindex b9bee17f64..5b05dcc82b 100644--- a/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/toggle-group/toggle-group-control.tsx@@ -6,7 +6,7 @@ import {import { AlertIcon } from "@webstudio-is/icons";import {Flex,- rawTheme,+ cssVar,ToggleGroup,ToggleGroupButton,Tooltip,@@ -74,7 +74,7 @@ export const ToggleGroupTooltip = ({{description}{isAdvanced && (<Flex gap="1">- <AlertIcon color={rawTheme.colors.backgroundAlertMain} /> This+ <AlertIcon color={cssVar("--foreground-warning")} /> Thisvalue was defined in the Advanced section.</Flex>)}diff --git a/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx b/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsxindex 374b62bf9d..71ff81123f 100644--- a/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/toggle/toggle-control.tsx@@ -1,4 +1,4 @@-import { ToggleButton } from "@webstudio-is/design-system";+import { IconToggleButton } from "@webstudio-is/design-system";import {camelCaseProperty,declarationDescriptions,@@ -45,7 +45,8 @@ export const ToggleControl = ({properties={[property]}isAdvanced={isAdvanced}>- <ToggleButton+ <IconToggleButton+ aria-label={currentItem?.label ?? humanizeString(property)}disabled={readonly}aria-disabled={isAdvanced}variant={computedStyleDecl.source.name}@@ -64,7 +65,7 @@ export const ToggleControl = ({}}><Icon />- </ToggleButton>+ </IconToggleButton></PropertyValueTooltip>);};diff --git a/apps/builder/app/builder/features/style-panel/property-label.tsx b/apps/builder/app/builder/features/style-panel/property-label.tsxindex 1e2f44d2d8..ef1f49aa02 100644--- a/apps/builder/app/builder/features/style-panel/property-label.tsx+++ b/apps/builder/app/builder/features/style-panel/property-label.tsx@@ -6,10 +6,10 @@ import { toValue, type CssProperty } from "@webstudio-is/css-engine";import { propertiesData } from "@webstudio-is/css-data";import {Button,+ cssVar,Flex,Kbd,Label,- rawTheme,SectionTitleLabel,Text,theme,@@ -189,7 +189,7 @@ export const PropertyInfo = ({)}{resettable && readonly === false && (<Button- color="dark"+ color="neutral-destructive"prefix={<Flex justify="end"><ResetIcon />@@ -479,7 +479,7 @@ export const PropertyValueTooltip = ({{description}{isAdvanced && (<Flex gap="1">- <AlertIcon color={rawTheme.colors.backgroundAlertMain} /> This+ <AlertIcon color={cssVar("--foreground-warning")} /> Thisvalue was defined in the Advanced section.</Flex>)}diff --git a/apps/builder/app/builder/features/style-panel/property-status.tsx b/apps/builder/app/builder/features/style-panel/property-status.tsxindex b4c2098a9a..bc0e17aa80 100644--- a/apps/builder/app/builder/features/style-panel/property-status.tsx+++ b/apps/builder/app/builder/features/style-panel/property-status.tsx@@ -1,12 +1,6 @@import { AlertIcon } from "@webstudio-is/icons";import { propertiesData, propertyStatuses } from "@webstudio-is/css-data";-import {- Flex,- Link,- rawTheme,- Text,- Tooltip,-} from "@webstudio-is/design-system";+import { cssVar, Flex, Link, Text, Tooltip } from "@webstudio-is/design-system";type PropertyStatus = (typeof propertyStatuses)[keyof typeof propertyStatuses];@@ -70,7 +64,7 @@ export const PropertyStatusIcon = ({ property }: { property: string }) => {as="span"align="center"aria-label={`${property} is ${details.status}`}- css={{ color: rawTheme.colors.backgroundAlertMain }}+ css={{ color: cssVar("--foreground-warning") }}><AlertIcon size={12} /></Flex>diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsxindex cc6a26462d..2ee3ec2a3e 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx@@ -17,6 +17,7 @@ import {} from "@webstudio-is/icons";import { type StyleValue, toValue } from "@webstudio-is/css-engine";import {+ cssVar,theme,Flex,Grid,@@ -58,8 +59,8 @@ const ColorSwatchIcon = styled("div", {width: theme.spacing[7],height: theme.spacing[7],borderRadius: theme.borderRadius[3],- backgroundColor: theme.colors.foregroundMain,- boxShadow: `inset 0 0 0 1px ${theme.colors.borderMain}`,+ backgroundColor: cssVar("--foreground-primary"),+ boxShadow: `inset 0 0 0 1px ${cssVar("--border-default")}`,});type BackgroundTypeOption = {@@ -272,7 +273,7 @@ const BackgroundRepeat = ({setActiveTooltip(isOpen ? item.value : undefined)}isSelected={false}- label="Background Repeat"+ label="Background repeat"code={`background-repeat: ${item.value};`}description={item.description}properties={["background-repeat"]}diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsxindex e1f9e2d575..512fe1285d 100644--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx@@ -1,7 +1,7 @@import { type ReactNode } from "react";import type { CssProperty } from "@webstudio-is/css-engine";import { toValue } from "@webstudio-is/css-engine";-import { Box, Grid, ToggleButton } from "@webstudio-is/design-system";+import { Box, Grid, IconToggleButton } from "@webstudio-is/design-system";import { keywordValues } from "@webstudio-is/css-data";import { CssValueInputContainer } from "../../shared/css-value-input";import { rowCss } from "./utils";@@ -107,13 +107,14 @@ export const BorderProperty = ({</Box>{individualModeIcon && (- <ToggleButton+ <IconToggleButton+ aria-label={`Toggle individual ${label.toLowerCase()} values`}disabled={readonly}pressed={showIndividualMode}onPressedChange={setShowIndividualMode}>{individualModeIcon}- </ToggleButton>+ </IconToggleButton>)}</Grid>{showIndividualMode && (diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsxindex 2ed72c9861..7c547e919c 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/layout.tsx@@ -443,12 +443,12 @@ const AlignmentControls = ({},{name: "space-between",- label: "Space Between",+ label: "Space between",icon: AlignHorizontalSpaceBetweenIcon,},{name: "space-around",- label: "Space Around",+ label: "Space around",icon: AlignHorizontalSpaceAroundIcon,},]}@@ -475,12 +475,12 @@ const AlignmentControls = ({},{name: "space-between",- label: "Space Between",+ label: "Space between",icon: AlignContentSpaceBetweenIcon,},{name: "space-around",- label: "Space Around",+ label: "Space around",icon: AlignContentSpaceAroundIcon,},]}@@ -516,13 +516,13 @@ const LayoutSectionFlex = () => {{ name: "row", label: "Row", icon: ArrowRightIcon },{name: "row-reverse",- label: "Row Reverse",+ label: "Row reverse",icon: ArrowLeftIcon,},{ name: "column", label: "Column", icon: ArrowDownIcon },{name: "column-reverse",- label: "Column Reverse",+ label: "Column reverse",icon: ArrowUpIcon,},]}@@ -530,7 +530,7 @@ const LayoutSectionFlex = () => {<ToggleControlproperty="flex-wrap"items={[- { name: "nowrap", label: "No Wrap", icon: NoWrapIcon },+ { name: "nowrap", label: "No wrap", icon: NoWrapIcon },{ name: "wrap", label: "Wrap", icon: WrapIcon },]}/>@@ -621,10 +621,10 @@ const LayoutSectionGrid = () => {items={[{ name: "row", label: "Row", icon: ArrowRightIcon },{ name: "column", label: "Column", icon: ArrowDownIcon },- { name: "row dense", label: "Row Dense", icon: RepeatGridIcon },+ { name: "row dense", label: "Row dense", icon: RepeatGridIcon },{name: "column dense",- label: "Column Dense",+ label: "Column dense",icon: RepeatGridIcon,},]}@@ -650,12 +650,12 @@ const LayoutSectionGrid = () => {},{name: "space-between",- label: "Space Between",+ label: "Space between",icon: AlignContentSpaceBetweenIcon,},{name: "space-around",- label: "Space Around",+ label: "Space around",icon: AlignContentSpaceAroundIcon,},]}@@ -734,12 +734,12 @@ const LayoutSectionGrid = () => {},{name: "space-between",- label: "Space Between",+ label: "Space between",icon: AlignHorizontalSpaceBetweenIcon,},{name: "space-around",- label: "Space Around",+ label: "Space around",icon: AlignHorizontalSpaceAroundIcon,},]}diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.stories.tsxindex d82fada834..5bbec3ca93 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.stories.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.stories.tsx@@ -3,7 +3,7 @@ import {Flex,StorySection,Text,- theme,+ cssVar,} from "@webstudio-is/design-system";import { AlignmentUi } from "./alignment-ui";@@ -72,7 +72,7 @@ const CombinationGrid = ({css={{width: 64,height: 62,- color: theme.colors.foregroundFlexUiMain,+ color: cssVar("--foreground-secondary"),}}><AlignmentUidiff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.tsxindex 67797dea6a..031ef3fa42 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/alignment-ui.tsx@@ -1,6 +1,12 @@-import { Box, Flex, Grid, IconButton } from "@webstudio-is/design-system";+import {+ Box,+ cssVar,+ Flex,+ Grid,+ IconButton,+ theme,+} from "@webstudio-is/design-system";import { DotIcon } from "@webstudio-is/icons";-import { theme } from "@webstudio-is/design-system";// Hide dots where indicator bars overlap to avoid sub-pixel artifacts.// Bars have a cross-axis position (from alignItems) and main-axis position@@ -116,14 +122,14 @@ export const AlignmentUi = ({css={{padding: theme.spacing[3],borderRadius: theme.borderRadius[4],- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),alignItems: "center",gap: 0,gridTemplateColumns: "repeat(3, 1fr)",gridTemplateRows: "repeat(3, 1fr)",color,"&:focus-within": {- outline: `1px solid ${theme.colors.borderLocalFlexUi}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},}}>@@ -153,9 +159,9 @@ export const AlignmentUi = ({width: "90%",height: "90%",minWidth: "auto",- color: theme.colors.foregroundFlexUiMain,+ color: cssVar("--foreground-secondary"),"&:hover": {- background: theme.colors.foregroundFlexUiHover,+ background: cssVar("--overlay-interaction-hover"),},"&:focus": {background: "none",diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-alignment.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-alignment.tsxindex ae1df3611f..2d50415906 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-alignment.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/flex-alignment.tsx@@ -1,9 +1,9 @@import { toValue } from "@webstudio-is/css-engine";-import { theme } from "@webstudio-is/design-system";import { useComputedStyles } from "../../../shared/model";import { getPriorityStyleValueSource } from "../../../property-label";import { createBatchUpdate } from "../../../shared/use-style-data";import { AlignmentUi } from "./alignment-ui";+import { getStyleSourceForeground } from "../../../style-source/color-recipes";export const FlexAlignment = () => {const styles = useComputedStyles([@@ -21,16 +21,7 @@ export const FlexAlignment = () => {const isColumnDirection =flexDirectionValue === "column" || flexDirectionValue === "column-reverse";- let color = theme.colors.foregroundFlexUiMain;- if (styleValueSourceColor === "local") {- color = theme.colors.foregroundLocalFlexUi;- }- if (styleValueSourceColor === "overwritten") {- color = theme.colors.foregroundOverwrittenFlexUi;- }- if (styleValueSourceColor === "remote") {- color = theme.colors.foregroundRemoteFlexUi;- }+ const color = getStyleSourceForeground(styleValueSourceColor);const alignment = ["start", "center", "end"];diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-alignment.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-alignment.tsxindex 978eb0c253..89dc2df632 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-alignment.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-alignment.tsx@@ -1,9 +1,9 @@-import { theme } from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import { useComputedStyles } from "../../../shared/model";import { getPriorityStyleValueSource } from "../../../property-label";import { createBatchUpdate } from "../../../shared/use-style-data";import { AlignmentUi } from "./alignment-ui";+import { getStyleSourceForeground } from "../../../style-source/color-recipes";export const GridAlignment = () => {const styles = useComputedStyles([@@ -29,16 +29,7 @@ export const GridAlignment = () => {const itemStretchHeight =isColumnDirection && justifyItemsValue === "stretch";- let color = theme.colors.foregroundFlexUiMain;- if (styleValueSourceColor === "local") {- color = theme.colors.foregroundLocalFlexUi;- }- if (styleValueSourceColor === "overwritten") {- color = theme.colors.foregroundOverwrittenFlexUi;- }- if (styleValueSourceColor === "remote") {- color = theme.colors.foregroundRemoteFlexUi;- }+ const color = getStyleSourceForeground(styleValueSourceColor);const alignment = ["start", "center", "end"];diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-area-picker.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-area-picker.tsxindex 7072b671bd..d09f3ead26 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-area-picker.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-area-picker.tsx@@ -1,5 +1,5 @@import { useRef, useMemo } from "react";-import { theme, Grid, Tooltip, css } from "@webstudio-is/design-system";+import { cssVar, theme, Grid, Tooltip, css } from "@webstudio-is/design-system";import type { AreaInfo } from "@webstudio-is/css-data";/**@@ -137,11 +137,11 @@ const freeCellStyle = css({minHeight: 20,border: "none",padding: 0,- backgroundColor: theme.colors.backgroundControls,+ backgroundColor: cssVar("--background-secondary"),transition: "background-color 0.1s ease",cursor: "pointer","&:hover": {- backgroundColor: theme.colors.backgroundPrimary,+ backgroundColor: cssVar("--background-accent"),},});@@ -152,7 +152,9 @@ const selectedCellStyle = css({backgroundColor: "transparent",cursor: "pointer","&:hover": {- backgroundColor: "rgba(255, 255, 255, 0.15)",+ backgroundColor: `oklch(from ${cssVar(+ "--foreground-on-accent"+ )} l c h / 15%)`,},});@@ -161,7 +163,7 @@ const occupiedAreaStyle = css({border: "none",padding: 0,borderRadius: theme.borderRadius[3],- backgroundColor: theme.colors.backgroundDestructiveMain,+ backgroundColor: cssVar("--background-negative"),cursor: "not-allowed",opacity: 0.6,});@@ -169,7 +171,7 @@ const occupiedAreaStyle = css({const selectedAreaBgStyle = css({border: "none",borderRadius: theme.borderRadius[3],- backgroundColor: theme.colors.backgroundPrimary,+ backgroundColor: cssVar("--background-accent"),pointerEvents: "none",});@@ -296,7 +298,7 @@ export const GridAreaPicker = ({gridTemplateColumns: `repeat(${gridColumns}, minmax(20px, 1fr))`,gridTemplateRows: `repeat(${gridRows}, 20px)`,gap: 1,- backgroundColor: theme.colors.borderMain,+ backgroundColor: cssVar("--border-default"),borderRadius: theme.borderRadius[4],overflow: "hidden",}}diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-generator.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-generator.tsxindex 37d6b5e07b..9025061fd7 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-generator.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-generator.tsx@@ -3,6 +3,7 @@ import { useStore } from "@nanostores/react";import {Box,Button,+ cssVar,Flex,Grid,theme,@@ -63,17 +64,17 @@ const selectorCellStyle = css({width: 16,height: 16,borderRadius: theme.borderRadius[3],- backgroundColor: theme.colors.backgroundControls,- border: `1px solid ${theme.colors.borderMain}`,+ backgroundColor: cssVar("--background-secondary"),+ border: `1px solid ${cssVar("--border-default")}`,transition: "all 0.1s ease","&:hover": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},variants: {highlighted: {true: {- backgroundColor: theme.colors.backgroundHover,- borderColor: theme.colors.borderFocus,+ backgroundColor: cssVar("--overlay-interaction-hover"),+ borderColor: cssVar("--border-focus"),},},},@@ -214,10 +215,10 @@ const presetButtonStyle = css({padding: theme.spacing[3],boxSizing: "border-box","&:hover": {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},"&:focus-visible": {- outline: `2px solid ${theme.colors.borderFocus}`,+ outline: `2px solid ${cssVar("--border-focus")}`,},});@@ -225,7 +226,7 @@ const presetPreviewStyle = css({width: "100%",aspectRatio: "3 / 2",borderRadius: theme.borderRadius[2],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,overflow: "hidden",});@@ -264,9 +265,9 @@ const GridPresetsPicker = ({ onSelect }: GridPresetsPickerProps) => {<Boxkey={i}css={{- backgroundColor: theme.colors.backgroundControls,+ backgroundColor: cssVar("--background-secondary"),borderRadius: theme.borderRadius[1],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,}}/>))}@@ -303,15 +304,15 @@ const gridGeneratorButtonStyle = css({display: "grid",width: "100%",height: 60,- outline: `1px solid ${theme.colors.borderMain}`,+ outline: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[3],overflow: "hidden",cursor: "pointer","&:focus-within, &[data-state=open]": {- outline: `1px solid ${theme.colors.borderLocalFlexUi}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},"&:hover": {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},});@@ -471,11 +472,11 @@ export const GridGenerator = ({ open, onOpenChange }: GridGeneratorProps) => {height: "100%",borderRight:col < displayColumnCount - 1 && !mergedRight- ? `1px solid ${theme.colors.borderMain}`+ ? `1px solid ${cssVar("--border-default")}`: undefined,borderBottom:row < displayRowCount - 1 && !mergedBottom- ? `1px solid ${theme.colors.borderMain}`+ ? `1px solid ${cssVar("--border-default")}`: undefined,}}/>@@ -511,11 +512,7 @@ export const GridGenerator = ({ open, onOpenChange }: GridGeneratorProps) => {</Flex><Separator /><Flex css={{ padding: theme.panel.padding }}>- <Button- color="neutral"- css={{ width: "100%" }}- onClick={handleFillGrid}- >+ <Button css={{ width: "100%" }} onClick={handleFillGrid}>Fill grid</Button></Flex>@@ -561,3 +558,5 @@ export const __testing__ = {gridPresets,computeFillGridItemsCount,};++undefined;diff --git a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-settings.tsx b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-settings.tsxindex f83f58ee31..286f09e1fd 100644--- a/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/layout/shared/grid-settings.tsx@@ -490,7 +490,7 @@ export const GridSettings = ({ open, onOpenChange }: GridSettingsProps) => {const isRowsEditable = isEditableGridMode(rowsMode);const editGridButton = (- <Button disabled={readonly} color="neutral" css={{ width: "100%" }}>+ <Button disabled={readonly} css={{ width: "100%" }}>Configure grid</Button>);diff --git a/apps/builder/app/builder/features/style-panel/sections/list-item.tsx b/apps/builder/app/builder/features/style-panel/sections/list-item.tsxindex 2fbeab00d1..b515040864 100644--- a/apps/builder/app/builder/features/style-panel/sections/list-item.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/list-item.tsx@@ -9,10 +9,10 @@ export const properties = ["list-style-type"] satisfies CssProperty[];export const Section = () => {return (- <StyleSection label="List Item" properties={properties}>+ <StyleSection label="List item" properties={properties}><Grid gap={2} css={{ gridTemplateColumns: `1fr ${theme.spacing[21]}` }}><PropertyLabel- label="List Style Type"+ label="List style type"description={propertyDescriptions.listStyleType}properties={["list-style-type"]}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsxindex b92b786f58..1cf0dc7efc 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-control.tsx@@ -1,5 +1,5 @@import { useRef, useState } from "react";-import { Grid, theme } from "@webstudio-is/design-system";+import { cssVar, Grid, theme } from "@webstudio-is/design-system";import type { CssProperty, StyleValue } from "@webstudio-is/css-engine";import { useKeyboardNavigation } from "../shared/keyboard";import { createBatchUpdate, deleteProperty } from "../../shared/use-style-data";@@ -151,7 +151,7 @@ export const InsetControl = () => {height: theme.spacing[18],"&:focus-visible": {borderRadius: theme.borderRadius[3],- outline: `1px solid ${theme.colors.backgroundPrimary}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: -1,},...(readonly ? { opacity: 0.5, pointerEvents: "none" } : undefined),diff --git a/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx b/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsxindex f9f75ce845..72f350782e 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/inset-layout.tsx@@ -1,5 +1,5 @@import type { MouseEvent } from "react";-import { Grid, Box, theme, styled } from "@webstudio-is/design-system";+import { Grid, Box, cssVar, theme, styled } from "@webstudio-is/design-system";import type { CssProperty } from "@webstudio-is/css-engine";import type { Modifiers } from "../../shared/modifier-keys";@@ -15,12 +15,12 @@ const Trapezoid = styled("div", {justifyContent: "center","&:hover": {- backgroundColor: theme.colors.backgroundSpacingHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},variants: {isActive: {true: {- backgroundColor: theme.colors.backgroundSpacingHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},},},@@ -28,12 +28,12 @@ const Trapezoid = styled("div", {const TopBottom = styled(Trapezoid, {zIndex: 0,- backgroundColor: theme.colors.backgroundSpacingTopBottom,+ backgroundColor: cssVar("--background-secondary"),});const LeftRight = styled(Trapezoid, {zIndex: 1,- backgroundColor: theme.colors.backgroundSpacingLeftRight,+ backgroundColor: cssVar("--background-secondary"),});export type InsetProperty = "top" | "right" | "bottom" | "left";@@ -81,7 +81,7 @@ export const InsetLayout = ({css={{borderRadius: OUTER_BORDER_RADIUS,- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),borderWidth: 1,borderStyle: "solid",@@ -98,10 +98,10 @@ export const InsetLayout = ({css={{borderRadius: RECT_BORDER_RADIUS,gridArea: "2/2/3/5",- backgroundColor: theme.colors.backgroundControls,+ backgroundColor: cssVar("--background-secondary"),borderWidth: 1,borderStyle: "solid",- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),zIndex: 2,}}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx b/apps/builder/app/builder/features/style-panel/sections/position/position.tsxindex fab2b92da2..132ec3e643 100644--- a/apps/builder/app/builder/features/style-panel/sections/position/position.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/position/position.tsx@@ -50,7 +50,7 @@ export const Section = () => {{showZindexControl && showInsetControl === false && (<><PropertyLabel- label="Z Index"+ label="Z index"description={propertyDescriptions.zIndex}properties={["z-index"]}/>@@ -63,7 +63,7 @@ export const Section = () => {<InsetControl /><Grid gap={1}><PropertyLabel- label="Z Index"+ label="Z index"description={propertyDescriptions.zIndex}properties={["z-index"]}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsxindex 7eb769cff8..78235130da 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx@@ -1,5 +1,6 @@import { useState } from "react";import {+ cssVar,keyframes,styled,Popover,@@ -128,9 +129,9 @@ const PopoverContentStyled = styled(PopoverContent, {gap: theme.spacing[5],minWidth: 0,minHeight: 0,- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[7],- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),padding: theme.spacing[5],boxShadow: theme.shadows.menuDropShadow,animationDuration: "200ms",diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsxindex a3551f979e..6178ab78f5 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/value-text.tsx@@ -1,9 +1,9 @@-import { styled, Text } from "@webstudio-is/design-system";+import { cssVar, styled, Text, theme } from "@webstudio-is/design-system";import type { StyleValue } from "@webstudio-is/css-engine";import { useEffect, useMemo, type ComponentProps } from "react";-import { theme } from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import { scrollByPointer } from "../../shared/scroll-by-pointer";+import { styleSourceColors } from "../../style-source/color-recipes";const Container = styled("button", {// fit-content is not needed for the "button" element,@@ -35,30 +35,27 @@ const Container = styled("button", {variants: {source: {default: {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-secondary"),backgroundColor: "transparent",},local: {- color: theme.colors.foregroundLocalMain,- backgroundColor: theme.colors.backgroundLocalMain,+ color: styleSourceColors.local.foreground,+ backgroundColor: styleSourceColors.local.subtleBackground,},overwritten: {- color: theme.colors.foregroundOverwrittenMain,- backgroundColor: theme.colors.backgroundOverwrittenMain,+ color: styleSourceColors.overwritten.foreground,+ backgroundColor: styleSourceColors.overwritten.subtleBackground,},preset: {- color: theme.colors.foregroundMain,- backgroundColor: theme.colors.backgroundPresetMain,+ color: cssVar("--foreground-primary"),+ backgroundColor: cssVar("--border-default"),},remote: {- color: theme.colors.foregroundRemoteMain,- backgroundColor: theme.colors.backgroundRemoteMain,+ color: styleSourceColors.remote.foreground,+ backgroundColor: styleSourceColors.remote.subtleBackground,},},},- compoundVariants: [- { source: "default", css: { color: theme.colors.foregroundTextSubtle } },- ],});export const ValueText = ({diff --git a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx b/apps/builder/app/builder/features/style-panel/sections/size/size.tsxindex 5806e6cbce..24ca1ab460 100644--- a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/size/size.tsx@@ -47,7 +47,7 @@ const ObjectPosition = () => {return (<Flex justify="end"><FloatingPanel- title="Object Position"+ title="Object position"placement="bottom-within"content={<Flex css={{ padding: theme.panel.padding }}>@@ -103,7 +103,7 @@ export const Section = () => {<SizeProperty property="max-width" /><SizeProperty property="max-height" /><PropertyLabel- label="Aspect Ratio"+ label="Aspect ratio"description={propertyDescriptions.aspectRatio}properties={["aspect-ratio"]}/>@@ -143,13 +143,13 @@ export const Section = () => {]}/><PropertyLabel- label="Object Fit"+ label="Object fit"description={propertyDescriptions.objectFit}properties={["object-fit"]}/><SelectControl property="object-fit" /><PropertyLabel- label="Object Position"+ label="Object position"description={propertyDescriptions.objectPosition}properties={["object-position"]}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx b/apps/builder/app/builder/features/style-panel/sections/space/layout.tsxindex 1eb3bd0fb5..9291fe8d88 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/space/layout.tsx@@ -1,6 +1,6 @@import { forwardRef, useId } from "react";import type { ComponentProps, Ref } from "react";-import { styled, theme } from "@webstudio-is/design-system";+import { cssVar, styled, theme } from "@webstudio-is/design-system";import type { CssProperty } from "@webstudio-is/css-engine";import {spaceProperties,@@ -23,6 +23,16 @@ const INNER_HEIGHT = MOST_INNER_HEIGHT + (VALUE_HEIGHT + BORDER) * 2;const TOTAL_WIDTH = INNER_WIDTH + (INNER_MARGIN + VALUE_WIDTH + BORDER) * 2;const TOTAL_HEIGHT = INNER_HEIGHT + (INNER_MARGIN + VALUE_HEIGHT + BORDER) * 2;+const verticalBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 96%, ${cssVar("--foreground-primary")})`;+const horizontalBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 93%, ${cssVar("--foreground-primary")})`;+const activeBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 88%, ${cssVar("--foreground-primary")})`;+// in SVG stroke is always in the middle of the lineconst emulateInnerStroke = ({width,@@ -44,23 +54,23 @@ const emulateInnerStroke = ({});const ValueArea = styled("path", {- fill: theme.colors.backgroundSpacingTopBottom,+ fill: verticalBackground,variants: {side: {top: { cursor: "n-resize" },bottom: { cursor: "s-resize" },right: {cursor: "e-resize",- fill: theme.colors.backgroundSpacingLeftRight,+ fill: horizontalBackground,},left: {cursor: "w-resize",- fill: theme.colors.backgroundSpacingLeftRight,+ fill: horizontalBackground,},},isActive: {true: {- fill: theme.colors.backgroundSpacingHover,+ fill: activeBackground,},},},@@ -79,7 +89,7 @@ const OuterRect = styled({...props}/>),- { stroke: theme.colors.borderMain }+ { stroke: cssVar("--border-default") });const InnerOuterRect = styled(@@ -99,7 +109,10 @@ const InnerOuterRect = styled(/>);},- { stroke: theme.colors.borderMain, fill: theme.colors.backgroundControls }+ {+ stroke: cssVar("--border-default"),+ fill: horizontalBackground,+ });const InnerRect = styled(@@ -115,7 +128,7 @@ const InnerRect = styled({...props}/>),- { stroke: theme.colors.borderMain }+ { stroke: cssVar("--border-default") });const MostInnerRect = styled(@@ -133,7 +146,10 @@ const MostInnerRect = styled(/>);},- { stroke: theme.colors.borderMain, fill: theme.colors.backgroundControls }+ {+ stroke: cssVar("--border-default"),+ fill: horizontalBackground,+ });const gap = `${INNER_MARGIN + BORDER}px`;@@ -163,7 +179,7 @@ const Container = styled("div", {// (both in z-order and in top/left)[`&:focus-visible > ${Grid}`]: {borderRadius: theme.borderRadius[3],- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},});@@ -188,7 +204,7 @@ const Cell = styled("div", {});const Label = styled("div", {- color: theme.colors.foregroundTextSubtle,+ color: cssVar("--foreground-secondary"),textTransform: "uppercase",fontSize: theme.deprecatedFontSize[1],lineHeight: 1,diff --git a/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx b/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsxindex e855c47bee..23af391094 100644--- a/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/space/tooltip.tsx@@ -24,14 +24,14 @@ const propertyContents: {// Padding{properties: ["padding-top", "padding-bottom"],- label: "Vertical Padding",+ label: "Vertical padding",description:"Defines the space between the content of an element and its top and bottom border. Can affect layout height.",},{properties: ["padding-left", "padding-right"],- label: "Horizontal Padding",+ label: "Horizontal padding",description:"Defines the space between the content of an element and its left and right border. Can affect layout width.",},@@ -50,13 +50,13 @@ const propertyContents: {// Margin{properties: ["margin-top", "margin-bottom"],- label: "Vertical Margin",+ label: "Vertical margin",description: "Sets the margin at the top and bottom of an element.",},{properties: ["margin-left", "margin-right"],- label: "Horizontal Margin",+ label: "Horizontal margin",description: "Sets the margin at the left and right of an element.",},diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsxindex 803958f803..d063bf4f0a 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transform-and-perspective-origin.tsx@@ -177,7 +177,7 @@ export const TransformAndPerspectiveOrigin = ({<PropertyInlineLabellabel="X"title={- property === "transform-origin" ? "X Offset" : "X Position"+ property === "transform-origin" ? "X offset" : "X position"}description={property === "transform-origin"@@ -205,7 +205,7 @@ export const TransformAndPerspectiveOrigin = ({<PropertyInlineLabellabel="Y"title={- property === "transform-origin" ? "Y Offset" : "Y Position"+ property === "transform-origin" ? "Y offset" : "Y position"}description={property === "transform-origin"@@ -233,7 +233,7 @@ export const TransformAndPerspectiveOrigin = ({><PropertyInlineLabellabel="Z"- title="Z Offset"+ title="Z offset"description={propertySyntaxes.transformOriginZ}/><CssValueInputContainerdiff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsxindex ff28495121..337188ab66 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx@@ -153,7 +153,7 @@ const TransformAdvancedPopover = ({const readonly = useReadonly();return (<FloatingPanel- title="Advanced Transform"+ title="Advanced transform"placement="bottom-within"content={<Grid@@ -164,7 +164,7 @@ const TransformAdvancedPopover = ({><Grid css={{ gridTemplateColumns: `2fr 1fr` }}><PropertyLabel- label="Backface Visibility"+ label="Backface visibility"description={propertyDescriptions.backfaceVisibility}properties={["backface-visibility"]}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsxindex 22b60b6cca..32459971fc 100644--- a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx@@ -280,7 +280,7 @@ AdvancedOptionsButton.displayName = "AdvancedOptionsButton";const TypographySectionAdvancedPopover = () => {return (<FloatingPanel- title="Advanced Typography"+ title="Advanced typography"placement="bottom-within"content={<Grid@@ -292,19 +292,19 @@ const TypographySectionAdvancedPopover = () => {><Grid css={{ gridTemplateColumns: "5fr 5fr" }} gap={2}><PropertyLabel- label="White Space Collapse"+ label="White space collapse"description={propertyDescriptions.whiteSpaceCollapse}properties={["white-space-collapse"]}/><SelectControl property="white-space-collapse" /><PropertyLabel- label="Text Wrap Mode"+ label="Text wrap mode"description={propertyDescriptions.textWrapMode}properties={["text-wrap-mode"]}/><SelectControl property="text-wrap-mode" /><PropertyLabel- label="Text Wrap Style"+ label="Text wrap style"description={propertyDescriptions.textWrapStyle}properties={["text-wrap-style"]}/>@@ -358,7 +358,7 @@ const TypographySectionAdvancedPopover = () => {/></Box><PropertyLabel- label="Text Overflow"+ label="Text overflow"description={propertyDescriptions.textOverflow}properties={["text-overflow"]}/>diff --git a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsxindex 5714a77d22..295d5d2947 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx@@ -140,7 +140,7 @@ export const CssFragmentEditor = ({{content}<EditorDialogonOpenChange={onOpenChange}- title="CSS Value"+ title="CSS value"content={content}><EditorDialogButton />diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsxindex 3df9150416..04c38fdb93 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx@@ -18,6 +18,7 @@ import {Flex,styled,ColorThumb,+ declareCssVar,} from "@webstudio-is/design-system";import type {CssProperty,@@ -52,14 +53,14 @@ import { convertUnits } from "./convert-units";import { mergeRefs } from "@react-aria/utils";import { composeEventHandlers } from "~/shared/event-utils";import type { StyleValueSourceColor } from "~/shared/style-object-model";-import {- cssButtonDisplay,- isComplexValue,- ValueEditorDialog,-} from "./value-editor-dialog";+import { isComplexValue, ValueEditorDialog } from "./value-editor-dialog";import { useEffectEvent } from "~/shared/hook-utils/effect-event";import { scrollByPointer } from "../scroll-by-pointer";+const cssButtonDisplay = declareCssVar(+ "--css-value-input-maximize-button-display"+);+// Subjective adjust ment based on how it feels on macbook/trackpad.// It won't be ideal for everyone with different input devices and preferences.// Ideally we also need some kind of acceleration setting with 1 value.diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsxindex e15ff20a7b..9e89b6e1d7 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx@@ -1,8 +1,8 @@import { useEffect, useState } from "react";import {+ cssVar,NestedInputButton,rawTheme,- theme,} from "@webstudio-is/design-system";import { MaximizeIcon } from "@webstudio-is/icons";import type {@@ -18,8 +18,6 @@ import type {} from "./css-value-input";import { parseIntermediateOrInvalidValue } from "./parse-intermediate-or-invalid-value";-export const cssButtonDisplay = "--ws-css-value-input-maximize-button-display";-// Hand-picking values that are considered complex and should get a maximize button for the dialog.// Not showing the maximize everywhere because most values don't need that and it takes space.export const isComplexValue = (value: CssValueInputValue) => {@@ -89,7 +87,7 @@ export const ValueEditorDialog = ({return (<EditorDialog- title="CSS Value"+ title="CSS value"placement="bottom-within"height={200}width={Number.parseFloat(rawTheme.sizes.sidebarWidth)}@@ -107,8 +105,8 @@ export const ValueEditorDialog = ({<NestedInputButtontabIndex={-1}css={{- display: `var(${cssButtonDisplay}, none)`,- background: theme.colors.backgroundControls,+ display: cssVar("--css-value-input-maximize-button-display", "none"),+ background: cssVar("--background-secondary"),'&[data-state="open"]': {display: "block",},diff --git a/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx b/apps/builder/app/builder/features/style-panel/shared/filter-content.tsxindex 98491671ba..3683504527 100644--- a/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/filter-content.tsx@@ -186,7 +186,7 @@ export const FilterSectionContent = ({<Selectdisabled={readonly}name="filterFunction"- placeholder="Select Filter"+ placeholder="Select filter"options={Object.keys(filterFunctions) as FilterFunction[]}value={filterFunction ?? "blur"}onChange={handleFilterFunctionChange}diff --git a/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx b/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsxindex 2efaa88f8a..2562f20dcb 100644--- a/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx@@ -274,7 +274,7 @@ export const ShadowContent = ({<Flex direction="column" gap="1"><PropertyInlineLabellabel="Blur"- title="Blur Radius"+ title="Blur radius"description={shadowPropertySyntaxes[property].blur}/><CssValueInputContainer@@ -299,7 +299,7 @@ export const ShadowContent = ({<Flex direction="column" gap="1"><PropertyInlineLabellabel="Spread"- title="Spread Radius"+ title="Spread radius"description={shadowPropertySyntaxes["box-shadow"].spread}/><CssValueInputContainerdiff --git a/apps/builder/app/builder/features/style-panel/shared/show-more.tsx b/apps/builder/app/builder/features/style-panel/shared/show-more.tsxindex 8e5f777edb..d090829aec 100644--- a/apps/builder/app/builder/features/style-panel/shared/show-more.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/show-more.tsx@@ -16,6 +16,7 @@ export const ShowMore = ({<Flex direction="column" gap="3"><Collapsible.Trigger asChild><Button+ color="primary"css={{ width: "100%" }}prefix={isOpen ? <ChevronDownIcon /> : <ChevronRightIcon />}>diff --git a/apps/builder/app/builder/features/style-panel/style-source/color-recipes.ts b/apps/builder/app/builder/features/style-panel/style-source/color-recipes.tsnew file mode 100644index 0000000000..9079887390--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/style-source/color-recipes.ts@@ -0,0 +1,74 @@+import {+ cssVar,+ styleSourceColor,+ rotateBoundedBackgroundHue,+} from "@webstudio-is/design-system";++const gradient = (color: string) =>+ `linear-gradient(90deg, oklch(from ${color} l c h / 0) 0%, ${color} 31.87%)`;++const accentBackground = cssVar("--background-accent");+const instanceBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 86%, ${cssVar("--foreground-primary")})`;+const tagBackground = rotateBoundedBackgroundHue(accentBackground, 150);+const tagForeground = tagBackground;+const breakpointBackground = rotateBoundedBackgroundHue(accentBackground, 60);+const neutralBackground = `light-dark(+ ${cssVar("--foreground-secondary")},+ color-mix(+ in oklab,+ ${cssVar("--background-primary")} 67%,+ ${cssVar("--foreground-primary")}+ )+)`;+const neutralForeground = `light-dark(+ ${cssVar("--foreground-on-inverse")},+ ${cssVar("--foreground-primary")}+)`;++export const styleSourceColors = {+ local: {+ background: styleSourceColor.local.solid,+ foreground: styleSourceColor.local.foreground,+ subtleBackground: styleSourceColor.local.background,+ gradient: gradient(styleSourceColor.local.solid),+ },+ tag: {+ background: tagBackground,+ foreground: tagForeground,+ gradient: gradient(tagBackground),+ },+ breakpoint: {+ background: breakpointBackground,+ },+ overwritten: {+ foreground: styleSourceColor.overwritten.foreground,+ subtleBackground: styleSourceColor.overwritten.background,+ },+ remote: {+ foreground: styleSourceColor.remote.foreground,+ subtleBackground: styleSourceColor.remote.background,+ },+ neutral: {+ background: neutralBackground,+ foreground: neutralForeground,+ gradient: gradient(neutralBackground),+ },+ instance: {+ background: instanceBackground,+ },+} as const;++export const getStyleSourceForeground = (source: string) => {+ if (source === "local") {+ return styleSourceColors.local.foreground;+ }+ if (source === "overwritten") {+ return styleSourceColors.overwritten.foreground;+ }+ if (source === "remote") {+ return styleSourceColors.remote.foreground;+ }+ return cssVar("--foreground-secondary");+};diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsxindex 34d8e55d00..e9f22e4218 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx@@ -1,12 +1,12 @@-import { styled, Text } from "@webstudio-is/design-system";-import { theme } from "@webstudio-is/design-system";+import { cssVar, styled, Text, theme } from "@webstudio-is/design-system";+import { styleSourceColors } from "./color-recipes";export const StyleSourceBadge = styled(Text, {display: "inline-flex",borderRadius: theme.borderRadius[2],px: theme.spacing[3],height: theme.spacing[9],- color: theme.colors.foregroundContrastMain,+ color: cssVar("--foreground-on-accent"),alignItems: "center",maxWidth: "100%",whiteSpace: "nowrap",@@ -16,20 +16,20 @@ export const StyleSourceBadge = styled(Text, {variants: {source: {local: {- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: styleSourceColors.local.background,},token: {- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: styleSourceColors.local.background,},tag: {- backgroundColor: theme.colors.backgroundStyleSourceTag,+ backgroundColor: styleSourceColors.tag.background,},breakpoint: {- backgroundColor: theme.colors.backgroundStyleSourceBreakpoint,+ backgroundColor: styleSourceColors.breakpoint.background,},instance: {- backgroundColor: theme.colors.backgroundNeutralMain,- color: theme.colors.foregroundMain,+ backgroundColor: styleSourceColors.instance.background,+ color: cssVar("--foreground-primary"),},},},diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsxindex 2f7316e6fc..d98c350908 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx@@ -2,6 +2,8 @@ import {Text,styled,Box,+ cssVar,+ declareCssVar,theme,Flex,Tooltip,@@ -10,11 +12,17 @@ import { LockIcon } from "@webstudio-is/icons";import type { StyleSource } from "@webstudio-is/sdk";import { type ReactNode } from "react";import { useContentEditable } from "~/shared/dom-hooks";+import { styleSourceColors } from "./color-recipes";-const menuTriggerVisibilityVar = "--ws-style-source-menu-trigger-visibility";-const menuTriggerVisibilityOverrideVar =- "--ws-style-source-menu-trigger-visibility-override";-const menuTriggerGradientVar = "--ws-style-source-menu-trigger-gradient";+const menuTriggerVisibilityVar = declareCssVar(+ "--style-source-menu-trigger-visibility"+);+const menuTriggerVisibilityOverrideVar = declareCssVar(+ "--style-source-menu-trigger-visibility-override"+);+const menuTriggerGradientVar = declareCssVar(+ "--style-source-menu-trigger-gradient"+);export const menuCssVars = ({show,@@ -89,48 +97,47 @@ const StyleSourceContainer = styled(Box, {position: "relative",overflow: "hidden",alignItems: "center",- color: theme.colors.foregroundContrastMain,+ color: cssVar("--foreground-on-accent"),...menuCssVars({ show: false }),"&:hover": menuCssVars({ show: true }),variants: {source: {local: {order: 1,- backgroundColor: theme.colors.backgroundStyleSourceSelected,- [menuTriggerGradientVar]:- theme.colors.backgroundStyleSourceGradientSelected,+ backgroundColor: styleSourceColors.local.background,+ [menuTriggerGradientVar]: styleSourceColors.local.gradient,},token: {- backgroundColor: theme.colors.backgroundStyleSourceSelected,- [menuTriggerGradientVar]:- theme.colors.backgroundStyleSourceGradientSelected,+ backgroundColor: styleSourceColors.local.background,+ [menuTriggerGradientVar]: styleSourceColors.local.gradient,},tag: {- backgroundColor: theme.colors.backgroundStyleSourceTag,- [menuTriggerGradientVar]: theme.colors.backgroundStyleSourceGradientTag,+ backgroundColor: styleSourceColors.tag.background,+ [menuTriggerGradientVar]: styleSourceColors.tag.gradient,},},selected: {true: {},false: {"&:not(:hover)": {- backgroundColor: theme.colors.backgroundStyleSourceNeutral,- [menuTriggerGradientVar]:- theme.colors.backgroundStyleSourceGradientUnselected,+ color: styleSourceColors.neutral.foreground,+ backgroundColor: styleSourceColors.neutral.background,+ [menuTriggerGradientVar]: styleSourceColors.neutral.gradient,},},},disabled: {true: {"&:not(:hover)": {- backgroundColor: theme.colors.backgroundStyleSourceDisabled,+ opacity: 0.55,},},false: {},},hasError: {true: {- backgroundColor: theme.colors.backgroundDestructiveMain,+ color: cssVar("--foreground-on-negative"),+ backgroundColor: cssVar("--background-negative"),},},},@@ -145,8 +152,8 @@ const StyleSourceButton = styled("button", {variants: {isEditing: {true: {- color: theme.colors.foregroundMain,- backgroundColor: theme.colors.backgroundControls,+ color: cssVar("--foreground-primary"),+ backgroundColor: cssVar("--background-secondary"),},false: {},},@@ -161,13 +168,13 @@ const StyleSourceState = styled(Text, {variants: {source: {local: {- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: styleSourceColors.local.background,},token: {- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: styleSourceColors.local.background,},tag: {- backgroundColor: theme.colors.backgroundStyleSourceTag,+ backgroundColor: styleSourceColors.tag.background,},},},diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsxindex 7b236bdecf..17ced58140 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx@@ -15,6 +15,7 @@ import { useFocusWithin } from "@react-aria/interactions";import { useStore } from "@nanostores/react";import {Box,+ cssVar,ComboboxListbox,ComboboxListboxItem,ComboboxRoot,@@ -71,17 +72,17 @@ const TextFieldContainer = styled("div", {display: "flex",flexWrap: "wrap",alignItems: "center",- backgroundColor: theme.colors.backgroundControls,+ backgroundColor: cssVar("--background-secondary"),gap: theme.spacing[2],padding: theme.spacing[2],borderRadius: theme.borderRadius[4],minWidth: 0,border: `1px solid transparent`,"&:hover": {- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),},"&:focus-within": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},});@@ -252,7 +253,7 @@ const TextFieldBase: ForwardRefRenderFunction<onClick={onClick}inputRef={mergeRefs(internalInputRef, inputRef)}spellCheck={false}- aria-label="New Style Source Input"+ aria-label="New style source input"/>{value.map((item) => (<StyleSourceControlWithMenudiff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-menu.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-menu.tsxindex 2bc0f25c4f..b3ad5bdc85 100644--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-menu.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-menu.tsx@@ -2,6 +2,7 @@ import { Fragment, useState } from "react";import {Box,Combobox,+ cssVar,DropdownMenu,DropdownMenuContent,DropdownMenuItem,@@ -10,7 +11,6 @@ import {DropdownMenuTrigger,Flex,InputErrorsTooltip,- rawTheme,styled,Text,theme,@@ -45,11 +45,10 @@ type IntermediateItem = {states: string[];};-const menuTriggerVisibilityVar = "--ws-style-source-menu-trigger-visibility";-const menuTriggerVisibilityOverrideVar =- "--ws-style-source-menu-trigger-visibility-override";-const visibility = `var(${menuTriggerVisibilityOverrideVar}, var(${menuTriggerVisibilityVar}))`;-const menuTriggerGradientVar = "--ws-style-source-menu-trigger-gradient";+const visibility = cssVar(+ "--style-source-menu-trigger-visibility-override",+ cssVar("--style-source-menu-trigger-visibility")+);const MenuTrigger = styled("button", {display: "inline-flex",@@ -64,7 +63,7 @@ const MenuTrigger = styled("button", {padding: 0,borderTopRightRadius: theme.borderRadius[4],borderBottomRightRadius: theme.borderRadius[4],- color: theme.colors.foregroundContrastMain,+ color: "inherit",visibility,"&:hover, &[data-state=open]": {...menuCssVars({ show: true }),@@ -77,7 +76,7 @@ const MenuTrigger = styled("button", {width: "100%",height: "100%",visibility,- backgroundColor: theme.colors.backgroundButtonHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),borderTopRightRadius: theme.borderRadius[4],borderBottomRightRadius: theme.borderRadius[4],pointerEvents: "none",@@ -92,7 +91,7 @@ const MenuTriggerGradient = styled(Box, {width: theme.sizes.controlHeight,height: "100%",visibility,- background: `var(${menuTriggerGradientVar})`,+ background: cssVar("--style-source-menu-trigger-gradient"),borderTopRightRadius: theme.borderRadius[4],borderBottomRightRadius: theme.borderRadius[4],pointerEvents: "none",@@ -312,7 +311,7 @@ export const StyleSourceMenu = (props: StyleSourceMenuProps) => {{props.item.label}</Text>{props.hasStyles && (- <DotIcon size="12" color={rawTheme.colors.foregroundPrimary} />+ <DotIcon size="12" color={cssVar("--foreground-accent")} />)}</Flex></DropdownMenuLabel>@@ -441,8 +440,8 @@ export const StyleSourceMenu = (props: StyleSourceMenuProps) => {<CheckMarkIconcolor={props.item.states.includes(selector)- ? rawTheme.colors.foregroundPrimary- : rawTheme.colors.foregroundIconMain+ ? cssVar("--foreground-accent")+ : cssVar("--foreground-primary")}size={12}/>@@ -465,7 +464,7 @@ export const StyleSourceMenu = (props: StyleSourceMenuProps) => {{props.item.states.includes(selector) && (<DotIconsize="12"- color={rawTheme.colors.foregroundPrimary}+ color={cssVar("--foreground-accent")}/>)}</Flex>diff --git a/apps/builder/app/builder/features/sync-status.tsx b/apps/builder/app/builder/features/sync-status.tsxindex 7f7c429308..96b2206d63 100644--- a/apps/builder/app/builder/features/sync-status.tsx+++ b/apps/builder/app/builder/features/sync-status.tsx@@ -3,9 +3,9 @@ import { atom } from "nanostores";import { useEffect, useRef, useState } from "react";import {Box,+ cssVar,Flex,keyframes,- rawTheme,Text,theme,Tooltip,@@ -14,7 +14,7 @@ import { OfflineIcon } from "@webstudio-is/icons";import { $hasUnsavedSyncChanges, $syncStatus } from "@webstudio-is/sync-client";const syncStatusDotSavedDuration = 2000;-const syncStatusDotPendingColor = theme.colors.backgroundStatusAttention;+const syncStatusDotPendingColor = cssVar("--foreground-warning");const $isOnline = atom(false);const syncStatusDotConfig = {idle: {@@ -27,11 +27,11 @@ const syncStatusDotConfig = {},saved: {label: "Sync status: saved",- color: theme.colors.foregroundSuccess,+ color: cssVar("--foreground-positive"),},error: {label: "Sync status: error",- color: theme.colors.foregroundDestructive,+ color: cssVar("--foreground-negative"),},} satisfies Record<string, { label: string; color: string }>;@@ -167,7 +167,7 @@ export const SyncStatus = () => {<Flex {...containerProps}><OfflineIconaria-label={`Sync status: failed`}- color={rawTheme.colors.foregroundDestructive}+ color={cssVar("--foreground-negative")}/></Flex></Tooltip>@@ -180,7 +180,7 @@ export const SyncStatus = () => {<Tooltip variant="wrapped" content={<>{statusObject.error}</>}><OfflineIconaria-label={`Sync status: fatal`}- color={rawTheme.colors.foregroundDestructive}+ color={cssVar("--foreground-negative")}/></Tooltip></Flex>diff --git a/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.tsx b/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.tsxindex c2a87ab687..36de22dfff 100644--- a/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.tsx+++ b/apps/builder/app/builder/features/text-file-editor/create-text-file-dialog.tsx@@ -196,6 +196,7 @@ export const CreateTextFileDialog = ({</Grid><Flex justify="end"><Button+ color="primary"disabled={creating || disabled}onClick={() => void submit()}>diff --git a/apps/builder/app/builder/features/text-file-editor/markdown-preview.tsx b/apps/builder/app/builder/features/text-file-editor/markdown-preview.tsxindex 7fefea6008..1d8d6be392 100644--- a/apps/builder/app/builder/features/text-file-editor/markdown-preview.tsx+++ b/apps/builder/app/builder/features/text-file-editor/markdown-preview.tsx@@ -1,5 +1,5 @@import { useMemo, type ReactNode } from "react";-import { css, SplitView, theme } from "@webstudio-is/design-system";+import { css, cssVar, SplitView, theme } from "@webstudio-is/design-system";import { renderMarkdownHtml } from "@webstudio-is/sdk-components-react/markdown";import { discoverNamedMarkdownAssetReferenceRanges } from "@webstudio-is/content-engine/markdown-assets";import { rewriteMarkdownAssetReferenceRanges } from "@webstudio-is/content-engine/markdown-references";@@ -18,8 +18,8 @@ const previewStyle = css({overflow: "auto",boxSizing: "border-box",padding: theme.spacing[9],- color: theme.colors.foregroundMain,- background: theme.colors.backgroundPanel,+ color: cssVar("--foreground-primary"),+ background: cssVar("--background-primary"),fontFamily: theme.fonts.sans,fontSize: 14,lineHeight: 1.5,@@ -43,30 +43,30 @@ const previewStyle = css({"& blockquote": {marginInline: 0,paddingLeft: theme.spacing[5],- color: theme.colors.foregroundSubtle,- borderLeft: `3px solid ${theme.colors.borderMain}`,+ color: cssVar("--foreground-secondary"),+ borderLeft: `3px solid ${cssVar("--border-default")}`,},"& code": {padding: "0.125em 0.25em",borderRadius: theme.borderRadius[3],- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),fontFamily: theme.fonts.mono,},"& pre": {overflowX: "auto",padding: theme.spacing[5],borderRadius: theme.borderRadius[4],- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),},"& pre code": { padding: 0, background: "transparent" },"& table": { width: "100%", borderCollapse: "collapse" },"& th, & td": {padding: theme.spacing[3],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,textAlign: "left",},"& img": { maxWidth: "100%" },- "& a": { color: theme.colors.foregroundPrimary },+ "& a": { color: cssVar("--foreground-accent") },});const renderMarkdownPreview = ({diff --git a/apps/builder/app/builder/features/text-file-editor/text-file-editor.tsx b/apps/builder/app/builder/features/text-file-editor/text-file-editor.tsxindex 507c52fe03..6ed5cf378c 100644--- a/apps/builder/app/builder/features/text-file-editor/text-file-editor.tsx+++ b/apps/builder/app/builder/features/text-file-editor/text-file-editor.tsx@@ -10,6 +10,7 @@ import { useStore } from "@nanostores/react";import {Box,Button,+ cssVar,DropdownMenu,DropdownMenuContent,DropdownMenuItem,@@ -337,6 +338,7 @@ const MarkdownLinkPicker = ({/><Flex justify="end"><Button+ color="primary"type="button"onClick={() => {const href = getMarkdownHref(valueRef.current);@@ -389,10 +391,10 @@ const MarkdownToolbar = ({gap={2}css={{padding: theme.spacing[3],- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,overflow: "hidden",flexShrink: 0,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),}}><Flexdiff --git a/apps/builder/app/builder/features/view-mode.tsx b/apps/builder/app/builder/features/view-mode.tsxindex f825ad6a82..1245e80049 100644--- a/apps/builder/app/builder/features/view-mode.tsx+++ b/apps/builder/app/builder/features/view-mode.tsx@@ -1,5 +1,5 @@import { useStore } from "@nanostores/react";-import { Flex, rawTheme, Tooltip, theme } from "@webstudio-is/design-system";+import { cssVar, Flex, Tooltip, theme } from "@webstudio-is/design-system";import { CloudIcon } from "@webstudio-is/icons";import { $authPermit } from "~/shared/nano-states";@@ -19,7 +19,7 @@ export const ViewMode = () => {shrink={false}><CloudIcon- color={rawTheme.colors.backgroundAlertMain}+ color={cssVar("--foreground-warning")}aria-label="View mode. Your changes will not be saved"/></Flex>diff --git a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsxindex db87c56e37..5bc5ce154e 100644--- a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx@@ -1,8 +1,5 @@import { forwardRef, useMemo, useRef, type JSX, type RefObject } from "react";-import {- css,- canvasPointerEventsPropertyName,-} from "@webstudio-is/design-system";+import { css, cssVar } from "@webstudio-is/design-system";import { useUnmount } from "~/shared/hook-utils/use-mount";import { $canvasIframeState } from "~/shared/nano-states";import { useCallback, useEffect, useState } from "react";@@ -16,9 +13,11 @@ import { mergeRefs } from "@react-aria/utils";const iframeStyle = css({border: "none",- pointerEvents: `var(${canvasPointerEventsPropertyName})`,+ pointerEvents: cssVar("--canvas-pointer-events"),height: "100%",width: "100%",+ // The canvas displays the authored page, whose initial canvas is white and+ // independent of the Builder chrome color scheme.backgroundColor: "#fff",});diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/color-recipes.ts b/apps/builder/app/builder/features/workspace/canvas-tools/color-recipes.tsnew file mode 100644index 0000000000..4698c23d29--- /dev/null+++ b/apps/builder/app/builder/features/workspace/canvas-tools/color-recipes.ts@@ -0,0 +1,16 @@+import {+ cssVar,+ rotateBoundedBackgroundHue,+} from "@webstudio-is/design-system";++const accent = cssVar("--background-accent");++// Canvas overlays visualize editing state rather than application UI intent.+// Keep their small palette relative to the theme accent and local to the canvas.+export const canvasToolColors = {+ selection: accent,+ selectionTranslucent: `oklch(from ${accent} l c h / 0.7)`,+ selectionSubtle: `color-mix(in oklab, ${accent} 12%, transparent)`,+ slot: rotateBoundedBackgroundHue(accent, 55),+ onSelection: cssVar("--foreground-on-accent"),+} as const;diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/grid-guides.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/grid-guides.tsxindex 2b834f8997..9adfe3b2f8 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/grid-guides.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/grid-guides.tsx@@ -1,7 +1,6 @@import { useMemo, useLayoutEffect, useRef } from "react";import { useStore } from "@nanostores/react";-import { css } from "@webstudio-is/design-system";-import { theme, textVariants } from "@webstudio-is/design-system";+import { css, cssVar, textVariants } from "@webstudio-is/design-system";import { $gridCellData } from "~/shared/nano-states";import {$scale,@@ -10,6 +9,7 @@ import {} from "~/builder/shared/nano-states";import { $ephemeralStyles } from "~/canvas/stores";import { parseGridAreas } from "@webstudio-is/css-data";+import { canvasToolColors } from "./color-recipes";// Compute the AABB offset that CSS transforms cause, by letting the browser// do all parsing and matrix composition via a hidden probe element.@@ -91,7 +91,7 @@ const getAreaSpans = (cssText: string) => {const cellStyle = css({pointerEvents: "none",- outline: `1px dashed ${theme.colors.borderMain}`,+ outline: `1px dashed ${cssVar("--border-default")}`,outlineOffset: "-0.5px",// Area cells suppress their per-cell outline; a merged area outline// div renders a single border around the whole area instead.@@ -102,7 +102,7 @@ const cellStyle = css({const areaOutlineStyle = css({pointerEvents: "none",- outline: `1px solid ${theme.colors.borderMain}`,+ outline: `1px solid ${cssVar("--border-default")}`,outlineOffset: "-0.5px",});@@ -110,7 +110,7 @@ const areaLabelStyle = css(textVariants.regular, {position: "absolute",top: 2,left: 4,- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),pointerEvents: "none",whiteSpace: "nowrap",overflow: "hidden",@@ -120,7 +120,7 @@ const areaLabelStyle = css(textVariants.regular, {const highlightStyle = css({pointerEvents: "none",- backgroundColor: "oklch(94.8% 0.027 246.4 / 0.6)",+ backgroundColor: canvasToolColors.selectionSubtle,});export const GridGuides = () => {diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsxindex b51b1d72d6..923ed59e0f 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx@@ -1,5 +1,5 @@import { useStore } from "@nanostores/react";-import { Flex, Text, css, theme } from "@webstudio-is/design-system";+import { cssVar, Flex, Text, css, theme } from "@webstudio-is/design-system";import { $selectedBreakpoint } from "~/shared/nano-states";const labelStyle = css({@@ -10,7 +10,8 @@ const labelStyle = css({});const badgeStyle = css({- background: theme.colors.backgroundTopbarHover,+ background: cssVar("--background-primary"),+ color: cssVar("--foreground-primary"),px: theme.spacing[3],py: theme.spacing[2],borderRadius: theme.borderRadius[3],@@ -32,7 +33,7 @@ export const MediaBadge = () => {}return (<Flex gap="2" className={labelStyle()} align="center">- <Text variant="labels" color="contrast" className={badgeStyle()}>+ <Text variant="labels" className={badgeStyle()}>{breakpoint.maxWidth ?? breakpoint.minWidth}</Text><Text variant="labels">{media}</Text>diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsxindex b5ed327455..b3fc938ad3 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx@@ -42,6 +42,7 @@ import { useEffectEvent } from "~/shared/hook-utils/effect-event";import { insertTemplateAt } from "./block-utils";import { Outline } from "./outline";import { applyScale } from "../apply-scale";+import { canvasToolColors } from "../color-recipes";import {getInstanceLabel,InstanceIcon,@@ -224,7 +225,7 @@ export const TemplatesMenu = ({) : (<div className={menuItemCss({ hint: true })}><Grid css={{ width: theme.spacing[25] }}>- <Text>No Results</Text>+ <Text>No results</Text></Grid></div>)}@@ -411,7 +412,7 @@ export const BlockChildHoveredInstanceOutline = () => {},borderStyle: "solid",borderColor: isAddMode- ? `oklch(from ${theme.colors.backgroundPrimary} l c h / 0.7)`+ ? canvasToolColors.selectionTranslucent: undefined,borderRadius: theme.borderRadius[4],...(controlPosition === "top"diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsxindex d81adaa308..a3961dd8d1 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx@@ -1,11 +1,11 @@-import { styled, type Rect } from "@webstudio-is/design-system";+import { styled, theme, type Rect } from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/sdk";-import { theme } from "@webstudio-is/design-system";import {InstanceIcon,getInstanceLabel,} from "~/builder/shared/instance-label";import { useOutlineControlPosition } from "./use-outline-control-position";+import { canvasToolColors } from "../color-recipes";const LabelContainer = styled("div",@@ -14,7 +14,7 @@ const LabelContainer = styled(display: "flex",padding: `0 ${theme.spacing[3]}`,height: theme.spacing[10],- color: "white",+ color: canvasToolColors.onSelection,alignItems: "center",justifyContent: "center",gap: theme.spacing[3],@@ -47,10 +47,10 @@ const LabelContainer = styled(},variant: {default: {- backgroundColor: theme.colors.backgroundPrimary,+ backgroundColor: canvasToolColors.selection,},slot: {- backgroundColor: theme.colors.foregroundReusable,+ backgroundColor: canvasToolColors.slot,},},},diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxindex 2a02751a99..838dcd8f4f 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx@@ -1,8 +1,14 @@import { useMemo, type ReactNode } from "react";-import { css, keyframes, type Rect } from "@webstudio-is/design-system";-import { theme } from "@webstudio-is/design-system";+import {+ css,+ cssVar,+ declareCssVar,+ keyframes,+ type Rect,+} from "@webstudio-is/design-system";+import { canvasToolColors } from "../color-recipes";-const angleVar = `--ws-outline-angle`;+const angleVar = declareCssVar("--outline-angle");// Won't work in current FF/Safari, but outline will still work, just no animation.const propertyStyle = (@@ -27,17 +33,19 @@ const baseOutlineStyle = css({variant: {default: {borderStyle: "solid",- borderColor: `oklch(from ${theme.colors.backgroundPrimary} l c h / 0.7)`,+ borderColor: canvasToolColors.selectionTranslucent,},collaboration: {[angleVar]: `0deg`,borderStyle: "solid",- borderImage: `conic-gradient(from var(${angleVar}), #39FBBB 0%, #4A4EFA 12.5%, #E63CFE 25%, #FFAE3C 37.5%, #39FBBB 50%, #4A4EFA 62.5%, #E63CFE 75%, #FFAE3C 87.5%) 1`,+ borderImage: `conic-gradient(from ${cssVar(+ angleVar+ )}, #39FBBB 0%, #4A4EFA 12.5%, #E63CFE 25%, #FFAE3C 37.5%, #39FBBB 50%, #4A4EFA 62.5%, #E63CFE 75%, #FFAE3C 87.5%) 1`,animation: `2s ${angleKeyframes} linear infinite`,},slot: {borderStyle: "solid",- borderColor: theme.colors.foregroundReusable,+ borderColor: canvasToolColors.slot,},},@@ -136,7 +144,13 @@ export const Outline = ({{propertyStyle}<divdata-ws-outline={variant ?? "default"}- className={`${baseStyle()} ${baseOutlineStyle({ variant, isLeftClamped, isRightClamped, isBottomClamped, isTopClamped })}`}+ className={`${baseStyle()} ${baseOutlineStyle({+ variant,+ isLeftClamped,+ isRightClamped,+ isBottomClamped,+ isTopClamped,+ })}`}style={style}>{children}diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsxindex 8f2c7529f0..75a413ca91 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx@@ -2,9 +2,9 @@ import { useStore } from "@nanostores/react";import { findApplicableMedia } from "@webstudio-is/css-engine";import {css,+ cssVar,disableCanvasPointerEvents,numericScrubControl,- theme,} from "@webstudio-is/design-system";import { useEffect, useRef } from "react";import { $canvasWidth } from "~/builder/shared/nano-states";@@ -31,7 +31,7 @@ const handlesContainerStyle = css({top: "50%",right: 0,transform: "translateX(100%)",- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),},"&[data-align=left]": {left: 0,@@ -44,12 +44,12 @@ const handlesContainerStyle = css({},"&:hover, &:has(+ &:hover), &:hover+&": {"&::before, & svg": {- color: theme.colors.backgroundPrimaryLight,+ color: cssVar("--background-accent"),},},// A little specificity hack to override the previou selector"&&[data-state=resizing] svg": {- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),},});@@ -69,13 +69,13 @@ const handleIcon = (fillRule="evenodd"clipRule="evenodd"d="M4.5 8C4.77614 8 5 8.22386 5 8.5L5 31.5C5 31.7761 4.77614 32 4.5 32C4.22386 32 4 31.7761 4 31.5L4 8.5C4 8.22386 4.22386 8 4.5 8Z"- fill="#C1C8CD"+ fill={cssVar("--foreground-on-accent")}/><pathfillRule="evenodd"clipRule="evenodd"d="M8.5 8C8.77614 8 9 8.22386 9 8.5L9 31.5C9 31.7761 8.77614 32 8.5 32C8.22386 32 8 31.7761 8 31.5L8 8.5C8 8.22386 8.22386 8 8.5 8Z"- fill="#C1C8CD"+ fill={cssVar("--foreground-on-accent")}/></svg>);diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsxindex b0d3f51478..6dc5eb98ab 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx@@ -2,7 +2,13 @@ import { useRef, useEffect } from "react";import { computed } from "nanostores";import { useStore } from "@nanostores/react";import { computePosition, flip, offset, shift } from "@floating-ui/dom";-import { theme, Flex, IconButton, Tooltip } from "@webstudio-is/design-system";+import {+ cssVar,+ theme,+ Flex,+ IconButton,+ Tooltip,+} from "@webstudio-is/design-system";import {SuperscriptIcon,SubscriptIcon,@@ -105,10 +111,10 @@ const Toolbar = ({ state, scale }: ToolbarProps) => {top: 0,left: 0,pointerEvents: "auto",- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),padding: theme.spacing[3],borderRadius: theme.borderRadius[6],- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,filter:"drop-shadow(0px 2px 7px rgba(0, 0, 0, 0.1)) drop-shadow(0px 5px 17px rgba(0, 0, 0, 0.15))",}}diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxindex 0ad3c16529..cbcbe490f9 100644--- a/apps/builder/app/builder/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -1,6 +1,6 @@import { useEffect, useRef, type ReactNode } from "react";import { useStore } from "@nanostores/react";-import { theme, css } from "@webstudio-is/design-system";+import { css, cssVar } from "@webstudio-is/design-system";import {$canvasWidth,$scale,@@ -15,7 +15,14 @@ import { useSetCanvasWidth } from "~/builder/shared/calc-canvas-width";const workspaceStyle = css({flexGrow: 1,- background: theme.colors.backgroundCanvas,+ background: `light-dark(+ color-mix(in oklab, ${cssVar("--background-secondary")} 94%, ${cssVar(+ "--foreground-primary"+ )}),+ color-mix(in oklab, ${cssVar("--background-primary")} 96%, ${cssVar(+ "--foreground-primary"+ )})+ )`,position: "relative",// Prevent scrollIntoView from scrolling the whole page// Commented to see what it will breakdiff --git a/apps/builder/app/builder/shared/asset-manager/asset-folder-dialogs.tsx b/apps/builder/app/builder/shared/asset-manager/asset-folder-dialogs.tsxindex 91c0bf04d0..647424994f 100644--- a/apps/builder/app/builder/shared/asset-manager/asset-folder-dialogs.tsx+++ b/apps/builder/app/builder/shared/asset-manager/asset-folder-dialogs.tsx@@ -158,6 +158,7 @@ const AssetFolderForm = ({<Flex justify="end" gap={2}>{secondaryAction}<Button+ color="primary"autoFocus={autoFocusSubmit}disabled={canSubmit === false}onClick={submit}@@ -343,6 +344,7 @@ export const MoveAssetManagerItemsDialog = ({/><Flex justify="end"><Button+ color="primary"autoFocusdisabled={canMove(folderId) === false}onClick={() => {diff --git a/apps/builder/app/builder/shared/asset-manager/asset-manager.tsx b/apps/builder/app/builder/shared/asset-manager/asset-manager.tsxindex c71cdcffe7..3bf39dd3d4 100644--- a/apps/builder/app/builder/shared/asset-manager/asset-manager.tsx+++ b/apps/builder/app/builder/shared/asset-manager/asset-manager.tsx@@ -25,6 +25,7 @@ import {findNextListItemIndex,theme,useSearchFieldKeys,+ cssVar,} from "@webstudio-is/design-system";import { TrashIcon } from "@webstudio-is/icons";import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";@@ -929,8 +930,10 @@ export const AssetManager = ({width: marqueeRect.width,height: marqueeRect.height,pointerEvents: "none",- backgroundColor: `color-mix(in srgb, ${theme.colors.backgroundPrimary} 12%, transparent)`,- border: `1px solid ${theme.colors.borderFocus}`,+ backgroundColor: `color-mix(in srgb, ${cssVar(+ "--foreground-accent"+ )} 12%, transparent)`,+ border: `1px solid ${cssVar("--border-focus")}`,zIndex: 1,}}/>diff --git a/apps/builder/app/builder/shared/asset-manager/asset-settings.tsx b/apps/builder/app/builder/shared/asset-manager/asset-settings.tsxindex 182b4b939a..49fa67e9d9 100644--- a/apps/builder/app/builder/shared/asset-manager/asset-settings.tsx+++ b/apps/builder/app/builder/shared/asset-manager/asset-settings.tsx@@ -36,6 +36,7 @@ import {theme,toast,Tooltip,+ cssVar,} from "@webstudio-is/design-system";import {AspectRatioIcon,@@ -258,7 +259,7 @@ const AssetUsagesList = ({ usages }: { usages: AssetUsage[] }) => {const AssetUsageIndicator = styled(Box, {width: 4,height: 4,- backgroundColor: theme.colors.backgroundStatusAttention,+ backgroundColor: cssVar("--foreground-warning"),borderRadius: "50%",pointerEvents: "none",});@@ -583,7 +584,9 @@ const AssetSettingsContent = ({Delete</Button>) : (- <Button onClick={onDelete}>Review & delete</Button>+ <Button color="primary" onClick={onDelete}>+ Review & delete+ </Button>)}<Flex gap="1">diff --git a/apps/builder/app/builder/shared/asset-manager/asset-thumbnail-card.tsx b/apps/builder/app/builder/shared/asset-manager/asset-thumbnail-card.tsxindex 7f307bf3de..7108b32138 100644--- a/apps/builder/app/builder/shared/asset-manager/asset-thumbnail-card.tsx+++ b/apps/builder/app/builder/shared/asset-manager/asset-thumbnail-card.tsx@@ -14,16 +14,23 @@ import {styled,Text,theme,+ cssVar,+ declareCssVar,} from "@webstudio-is/design-system";-const thumbnailActionVisibility = "--ws-thumbnail-action-visibility";+const thumbnailActionVisibility = declareCssVar(+ "--thumbnail-action-visibility"+);const showThumbnailAction = { [thumbnailActionVisibility]: "visible" };const focusOutline = {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: -1,};-const thumbnailActionVisibilityValue = `var(${thumbnailActionVisibility}, hidden)`;+const thumbnailActionVisibilityValue = cssVar(+ thumbnailActionVisibility,+ "hidden"+);const ThumbnailGroup = styled(Box, {position: "relative",@@ -35,7 +42,7 @@ const ThumbnailGroup = styled(Box, {},"&:hover, &:focus-within": showThumbnailAction,"&:hover > [data-asset-thumbnail]": {- backgroundColor: theme.colors.backgroundAssetcardHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},});@@ -124,7 +131,7 @@ const Root = styled("div", {padding: 2,"&:hover, &:focus-visible": {...showThumbnailAction,- backgroundColor: theme.colors.backgroundAssetcardHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},"&:focus-visible": {...focusOutline,@@ -133,14 +140,14 @@ const Root = styled("div", {selected: {true: {...focusOutline,- backgroundColor: theme.colors.backgroundAssetcardHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),...showThumbnailAction,},},dropTarget: {true: {- outline: `2px solid ${theme.colors.borderFocus}`,- backgroundColor: theme.colors.backgroundAssetcardHover,+ outline: `2px solid ${cssVar("--border-focus")}`,+ backgroundColor: cssVar("--overlay-interaction-hover"),},},clickable: {diff --git a/apps/builder/app/builder/shared/assets/asset-panel-state.tsx b/apps/builder/app/builder/shared/assets/asset-panel-state.tsxindex beee0c6c05..81071dc9da 100644--- a/apps/builder/app/builder/shared/assets/asset-panel-state.tsx+++ b/apps/builder/app/builder/shared/assets/asset-panel-state.tsx@@ -1,4 +1,4 @@-import { Flex, Text, theme } from "@webstudio-is/design-system";+import { Flex, Text, cssVar, theme } from "@webstudio-is/design-system";import { UploadIcon } from "@webstudio-is/icons";export const AssetPanelState = ({@@ -25,9 +25,9 @@ export const AssetPanelState = ({: {}),margin: theme.spacing[4],color: active- ? theme.colors.foregroundMain- : theme.colors.foregroundSubtle,- border: `1px dashed ${active ? theme.colors.foregroundMain : "transparent"}`,+ ? cssVar("--foreground-primary")+ : cssVar("--foreground-secondary"),+ border: `1px dashed ${active ? cssVar("--foreground-primary") : "transparent"}`,}}><Flex align="center" gap={1} shrink={false}>diff --git a/apps/builder/app/builder/shared/assets/asset-upload.tsx b/apps/builder/app/builder/shared/assets/asset-upload.tsxindex a8a9178fff..88e60024a3 100644--- a/apps/builder/app/builder/shared/assets/asset-upload.tsx+++ b/apps/builder/app/builder/shared/assets/asset-upload.tsx@@ -178,7 +178,12 @@ export const AssetUpload = forwardRef<AssetUploadHandle, AssetUploadProps>(return (<Flex><Tooltip side="bottom" content="View mode. You can't upload assets.">- <Button css={{ flexGrow: 1 }} prefix={<UploadIcon />} disabled={true}>+ <Button+ color="primary"+ css={{ flexGrow: 1 }}+ prefix={<UploadIcon />}+ disabled={true}+ >Upload</Button></Tooltip>diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsxindex dfde137443..75f82b2a91 100644--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx@@ -14,6 +14,7 @@ import {SearchField,theme,toast,+ cssVar,} from "@webstudio-is/design-system";import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";import {@@ -358,11 +359,11 @@ export const AssetsShell = ({position: "absolute",inset: 0,display: dragState !== IDLE && isEmpty === false ? "flex" : "none",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),color:dragState === OVER- ? theme.colors.foregroundMain- : theme.colors.foregroundSubtle,+ ? cssVar("--foreground-primary")+ : cssVar("--foreground-secondary"),}}><AssetPanelStatediff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsxindex 368bdc6305..25f969457b 100644--- a/apps/builder/app/builder/shared/binding-popover.tsx+++ b/apps/builder/app/builder/shared/binding-popover.tsx@@ -16,6 +16,8 @@ import {import {Box,Button,+ cssVar,+ declareCssVar,CssValueListArrowFocus,CssValueListItem,DialogTitleActions,@@ -195,7 +197,9 @@ const BindingPanel = ({);};-const bindingOpacityProperty = "--ws-binding-opacity";+const bindingOpacityProperty = declareCssVar("--binding-opacity");+const dotDisplay = declareCssVar("--dot-display");+const plusDisplay = declareCssVar("--plus-display");export const BindingControl = ({ children }: { children: ReactNode }) => {return (@@ -231,7 +235,7 @@ const BindingButton = forwardRef<bleed={false}css={{// hide by default- opacity: `var(${bindingOpacityProperty}, 0)`,+ opacity: cssVar(bindingOpacityProperty, "0"),position: "absolute",top: 0,left: 0,@@ -243,8 +247,8 @@ const BindingButton = forwardRef<transition: "transform 60ms, opacity 0ms 60ms",// https://easings.net/#easeInOutSinetransitionTimingFunction: "cubic-bezier(0.37, 0, 0.63, 1)",- "--dot-display": "block",- "--plus-display": "none",+ [dotDisplay]: "block",+ [plusDisplay]: "none","&[data-variant=bound]": {opacity: 1,},@@ -252,8 +256,8 @@ const BindingButton = forwardRef<// always show when interacted withopacity: 1,transform: `translate(-50%, -50%) scale(1.5)`,- "--dot-display": "none",- "--plus-display": "block",+ [dotDisplay]: "none",+ [plusDisplay]: "block",},"&:disabled": {display: "none",@@ -266,26 +270,34 @@ const BindingButton = forwardRef<width: 12,height: 12,borderRadius: "50%",- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: cssVar("--background-accent"),+ color: cssVar("--foreground-on-accent"),display: "flex",justifyContent: "center",alignItems: "center","&[data-variant=bound]": {- backgroundColor: theme.colors.backgroundStyleSourceSelected,+ backgroundColor: cssVar("--background-accent"),},"&[data-variant=error]": {- backgroundColor: theme.colors.backgroundDestructiveMain,+ backgroundColor: cssVar("--background-negative"),+ color: cssVar("--foreground-on-negative"),},}}data-variant={error ? "error" : variant}><DotIconsize={7}- style={{ display: `var(--dot-display)`, color: "white" }}+ style={{+ display: cssVar(dotDisplay),+ color: "currentColor",+ }}/><PlusIconsize={8}- style={{ display: `var(--plus-display)`, color: "white" }}+ style={{+ display: cssVar(plusDisplay),+ color: "currentColor",+ }}/></Box>}diff --git a/apps/builder/app/builder/shared/client-settings/settings.server.test.ts b/apps/builder/app/builder/shared/client-settings/settings.server.test.tsnew file mode 100644index 0000000000..0e801f9466--- /dev/null+++ b/apps/builder/app/builder/shared/client-settings/settings.server.test.ts@@ -0,0 +1,8 @@+import { describe, expect, test } from "vitest";+import { getSetting } from "./settings";++describe("client settings server import", () => {+ test("does not access browser globals during SSR", () => {+ expect(getSetting("colorScheme")).toBe("system");+ });+});diff --git a/apps/builder/app/builder/shared/client-settings/settings.ts b/apps/builder/app/builder/shared/client-settings/settings.tsindex 03229ea346..18a7551e76 100644--- a/apps/builder/app/builder/shared/client-settings/settings.ts+++ b/apps/builder/app/builder/shared/client-settings/settings.ts@@ -1,6 +1,11 @@import { atom } from "nanostores";import { z } from "zod";import { sidebarPanelNames } from "~/builder/sidebar-left/types";+import {+ clientSettingsStorageKey,+ colorSchemePreferences,+ parseColorSchemeCookie,+} from "~/shared/color-scheme";const userSettings = z.object({navigatorLayout: z.enum(["docked", "undocked"]).default("undocked"),@@ -9,43 +14,52 @@ const userSettings = z.object({.partialRecord(z.enum(sidebarPanelNames), z.number()).default({}),lastDashboardSearch: z.string().default(""),+ colorScheme: z.enum(colorSchemePreferences).default("system"),});+const persistedUserSettings = userSettings.omit({ colorScheme: true });export type Settings = z.infer<typeof userSettings>;const defaultSettings = userSettings.parse({});-const namespace = "__webstudio_user_settings__";-const read = (): Settings => {+ let settings = defaultSettings;let settingsString;try {- settingsString = localStorage.getItem(namespace);+ settingsString = localStorage.getItem(clientSettingsStorageKey);} catch {// We don't need to handle this one.}- if (settingsString == null) {- return defaultSettings;- }-- try {- return userSettings.parse(JSON.parse(settingsString));- } catch (error) {- if (error instanceof Error) {- console.error({- message: "Bad user settings in local storage",- extras: {- error: error.message,- },- });+ if (settingsString != null) {+ try {+ settings = userSettings.parse(JSON.parse(settingsString));+ } catch (error) {+ if (error instanceof Error) {+ console.error({+ message: "Bad user settings in local storage",+ extras: {+ error: error.message,+ },+ });+ }}}- return defaultSettings;++ const sharedColorScheme =+ typeof document === "undefined"+ ? undefined+ : parseColorSchemeCookie(document.cookie);+ return sharedColorScheme === undefined+ ? settings+ : { ...settings, colorScheme: sharedColorScheme };};const write = (settings: Settings) => {- localStorage.setItem(namespace, JSON.stringify(settings));+ localStorage.setItem(+ clientSettingsStorageKey,+ JSON.stringify(persistedUserSettings.parse(settings))+ );};const initialSettings = read();@@ -68,3 +82,10 @@ export const setSetting = <Name extends keyof Settings>(export const getSetting = <Name extends keyof Settings>(name: Name) => {return $settings.get()[name];};++export const synchronizeColorScheme = () => {+ const colorScheme = parseColorSchemeCookie(document.cookie);+ if (colorScheme !== undefined) {+ setSetting("colorScheme", colorScheme);+ }+};diff --git a/apps/builder/app/builder/shared/collapsible-section.tsx b/apps/builder/app/builder/shared/collapsible-section.tsxindex 6d1376bf38..24eb191272 100644--- a/apps/builder/app/builder/shared/collapsible-section.tsx+++ b/apps/builder/app/builder/shared/collapsible-section.tsx@@ -117,6 +117,7 @@ type CollapsibleSectionBaseProps = {trigger?: ReactNode;children: ReactNode;fullWidth?: boolean;+ showSeparator?: boolean;label?: string;isOpen?: boolean;onOpenChange?: (value: boolean) => void;@@ -127,6 +128,7 @@ export const CollapsibleSectionRoot = ({trigger,children,fullWidth = false,+ showSeparator = true,isOpen,onOpenChange,}: CollapsibleSectionBaseProps) => {@@ -154,7 +156,7 @@ export const CollapsibleSectionRoot = ({{children}</Flex></Collapsible.Content>- <Separator />+ {showSeparator && <Separator />}</Collapsible.Root>);};@@ -166,13 +168,14 @@ type CollapsibleSectionProps = Simplify<>;export const CollapsibleSection = (props: CollapsibleSectionProps) => {- const { label, trigger, children, fullWidth } = props;+ const { label, trigger, children, fullWidth, showSeparator } = props;const [isOpen, setIsOpen] = useOpenState(label, props.isOpen);return (<CollapsibleSectionRootlabel={label}trigger={trigger}fullWidth={fullWidth}+ showSeparator={showSeparator}isOpen={isOpen}onOpenChange={setIsOpen}>@@ -207,6 +210,7 @@ export const CollapsibleSectionWithAddButton = ({<CollapsibleSectionRootlabel={label}fullWidth={false}+ showSeparator={props.showSeparator}isOpen={isOpenFinal}onOpenChange={(nextIsOpen) => {setIsOpen(nextIsOpen);diff --git a/apps/builder/app/builder/shared/css-editor/css-editor.tsx b/apps/builder/app/builder/shared/css-editor/css-editor.tsxindex 5e97900cfa..0d55ce210c 100644--- a/apps/builder/app/builder/shared/css-editor/css-editor.tsx+++ b/apps/builder/app/builder/shared/css-editor/css-editor.tsx@@ -20,6 +20,7 @@ import {theme,toast,Tooltip,+ cssVar,} from "@webstudio-is/design-system";import {camelCaseProperty,@@ -90,7 +91,7 @@ const AdvancedPropertyLabel = ({<PropertyInfotitle={styleDecl.property.startsWith("--")- ? "CSS Variable"+ ? "CSS variable": styleDecl.property}description={description}@@ -547,7 +548,7 @@ export const CssEditor = ({padding: theme.panel.padding,position: "sticky",top: 0,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),zIndex: 1,}}>diff --git a/apps/builder/app/builder/shared/css-variable-utils.tsx b/apps/builder/app/builder/shared/css-variable-utils.tsxindex bffbf2dd85..dd4d58d5d2 100644--- a/apps/builder/app/builder/shared/css-variable-utils.tsx+++ b/apps/builder/app/builder/shared/css-variable-utils.tsx@@ -13,6 +13,7 @@ import {theme,InputField,toast,+ cssVar,} from "@webstudio-is/design-system";import type { CustomProperty } from "@webstudio-is/css-engine";import {@@ -254,7 +255,7 @@ export const RenameCssVariableDialog = ({}}}>- <DialogTitle>Rename CSS Variable</DialogTitle>+ <DialogTitle>Rename CSS variable</DialogTitle><Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}><Flex direction="column" gap="1"><InputField@@ -311,7 +312,7 @@ const DeleteUnusedCssVariablesDialogContent = ({css={{maxHeight: 200,overflowY: "auto",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),borderRadius: theme.borderRadius[4],wordBreak: "break-word",}}diff --git a/apps/builder/app/builder/shared/data-variable-utils.tsx b/apps/builder/app/builder/shared/data-variable-utils.tsxindex 3ad850415d..14091594a7 100644--- a/apps/builder/app/builder/shared/data-variable-utils.tsx+++ b/apps/builder/app/builder/shared/data-variable-utils.tsx@@ -13,6 +13,7 @@ import {Button,theme,InputField,+ cssVar,} from "@webstudio-is/design-system";import type { DataSource, Instance } from "@webstudio-is/sdk";import { $pages } from "~/shared/sync/data-stores";@@ -284,7 +285,7 @@ export const DeleteUnusedDataVariablesDialog = () => {css={{maxHeight: 200,overflowY: "auto",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),borderRadius: theme.borderRadius[4],wordBreak: "break-word",}}diff --git a/apps/builder/app/builder/shared/expression-editor.tsx b/apps/builder/app/builder/shared/expression-editor.tsxindex 7bc2c26bed..fef23ce97b 100644--- a/apps/builder/app/builder/shared/expression-editor.tsx+++ b/apps/builder/app/builder/shared/expression-editor.tsx@@ -27,7 +27,7 @@ import {pickedCompletion,} from "@codemirror/autocomplete";import { javascript } from "@codemirror/lang-javascript";-import { css } from "@webstudio-is/design-system";+import { css, cssVar } from "@webstudio-is/design-system";import {lintExpression,allowedStringMethods,@@ -467,7 +467,9 @@ class VariableWidget extends WidgetType {}toDOM(): HTMLElement {const span = document.createElement("span");- span.style.backgroundColor = "rgba(24, 119, 232, 0.2)";+ span.style.backgroundColor = `color-mix(in oklab, ${cssVar(+ "--foreground-accent"+ )} 20%, transparent)`;span.textContent = this.text;return span;}@@ -527,7 +529,7 @@ const wrapperStyle = css({size: {default: {// 1 line is 16px; show at most 20 lines.- "--ws-code-editor-max-height": "320px",+ ...getCodeEditorCssVars({ minHeight: "auto", maxHeight: "320px" }),},full: {...getCodeEditorCssVars({ minHeight: "100%", maxHeight: "100%" }),diff --git a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsxindex 7136a5bcc7..b6d06e789b 100644--- a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx+++ b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx@@ -7,9 +7,9 @@ import {findNextListItemIndex,Tooltip,Text,- rawTheme,Link,Flex,+ cssVar,} from "@webstudio-is/design-system";import {AssetsShell,@@ -165,7 +165,7 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {><InfoCircleIcontabIndex={0}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}/></Tooltip>) : undefined@@ -221,7 +221,7 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {><InfoCircleIcontabIndex={0}- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}style={{ pointerEvents: "auto" }}/></Tooltip>diff --git a/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx b/apps/builder/app/builder/shared/fonts-manager/item-menu.tsxindex e3cbdf75a8..7fa2ed6b95 100644--- a/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx+++ b/apps/builder/app/builder/shared/fonts-manager/item-menu.tsx@@ -8,15 +8,15 @@ import {styled,Tooltip,SmallIconButton,+ cssVar,} from "@webstudio-is/design-system";import { EllipsesIcon } from "@webstudio-is/icons";import { type FocusEventHandler, useState, useRef, useEffect } from "react";-import { theme } from "@webstudio-is/design-system";import { $authPermit } from "~/shared/nano-states";const MenuButton = styled(SmallIconButton, {"&:hover, &:focus-visible": {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),},});diff --git a/apps/builder/app/builder/shared/loading.stories.tsx b/apps/builder/app/builder/shared/loading.stories.tsxindex 030f26b8b7..2b6856a143 100644--- a/apps/builder/app/builder/shared/loading.stories.tsx+++ b/apps/builder/app/builder/shared/loading.stories.tsx@@ -1,4 +1,4 @@-import { Flex, StorySection, Text, theme } from "@webstudio-is/design-system";+import { Flex, StorySection, Text, cssVar } from "@webstudio-is/design-system";import { Loading as LoadingComponent, LoadingBackground } from "./loading";export default {@@ -14,7 +14,7 @@ export const Loading = () => (css={{position: "relative",height: 200,- background: theme.colors.backgroundTopbar,+ background: cssVar("--background-inverse"),}}><LoadingComponent@@ -35,7 +35,7 @@ export const Loading = () => (css={{position: "relative",height: 200,- background: theme.colors.backgroundTopbar,+ background: cssVar("--background-inverse"),}}><LoadingComponentdiff --git a/apps/builder/app/builder/shared/loading.tsx b/apps/builder/app/builder/shared/loading.tsxindex 56072b20ba..edbb8484d4 100644--- a/apps/builder/app/builder/shared/loading.tsx+++ b/apps/builder/app/builder/shared/loading.tsx@@ -1,7 +1,14 @@import { useState } from "react";-import { Box, Flex, Progress, theme } from "@webstudio-is/design-system";+import {+ Box,+ cssVar,+ Flex,+ Progress,+ theme,+} from "@webstudio-is/design-system";import { WebstudioIcon } from "@webstudio-is/icons";import { useInterval } from "~/shared/hook-utils/use-interval";+import { brandColors } from "~/shared/brand-colors";export const LoadingBackground = ({show,@@ -24,7 +31,7 @@ export const LoadingBackground = ({transitionDuration: "300ms",pointerEvents: "none",transitionProperty: "opacity",- backgroundColor: theme.colors.backgroundTopbar,+ backgroundColor: cssVar("--background-primary"),opacity: show ? 1 : 0,isolation: "isolate",}}@@ -74,7 +81,6 @@ export const Loading = ({ state }: { state: LoadingState }) => {css={{position: "absolute",inset: 0,- top: theme.spacing[15],pointerEvents: "none",zIndex: 0,}}@@ -86,16 +92,37 @@ export const Loading = ({ state }: { state: LoadingState }) => {}}/>{state.state !== "ready" && (- <Flex- direction="column"- align="center"- justify="center"- gap="3"- css={{ isolation: "isolate" }}+ <Box+ css={{+ isolation: "isolate",+ position: "absolute",+ inset: 0,+ }}>- <WebstudioIcon size={60} />- <Progress value={fakeProgress} />- </Flex>+ <Box+ css={{+ position: "absolute",+ bottom: `calc(50% + ${theme.spacing[10]})`,+ left: "50%",+ display: "flex",+ transform: "translateX(-50%)",+ }}+ >+ <WebstudioIcon size={60} />+ </Box>+ <Progress+ value={fakeProgress}+ css={{+ position: "absolute",+ top: "50%",+ left: "50%",+ transform: "translate(-50%, -50%)",+ background: cssVar("--background-primary"),+ boxShadow: brandColors.progressGlow,+ }}+ indicatorCss={{ background: brandColors.progress }}+ />+ </Box>)}</Flex>);diff --git a/apps/builder/app/builder/shared/style-source-actions.tsx b/apps/builder/app/builder/shared/style-source-actions.tsxindex 8ef08604ed..734c8f9218 100644--- a/apps/builder/app/builder/shared/style-source-actions.tsx+++ b/apps/builder/app/builder/shared/style-source-actions.tsx@@ -13,6 +13,7 @@ import {theme,InputField,toast,+ cssVar,} from "@webstudio-is/design-system";import type { StyleSource } from "@webstudio-is/sdk";import type { RenameStyleSourceError } from "@webstudio-is/project-build/runtime";@@ -304,7 +305,7 @@ export const DeleteUnusedTokensDialog = () => {css={{maxHeight: 200,overflowY: "auto",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),borderRadius: theme.borderRadius[4],wordBreak: "break-word",}}diff --git a/apps/builder/app/builder/shared/topbar.stories.tsx b/apps/builder/app/builder/shared/topbar.stories.tsxindex bd0d7305fd..25f21875e2 100644--- a/apps/builder/app/builder/shared/topbar.stories.tsx+++ b/apps/builder/app/builder/shared/topbar.stories.tsx@@ -1,19 +1,18 @@import {Button,Flex,- rawTheme,+ cssVar,StorySection,theme,- ToolbarButton,Text,- buttonStyle,- Link,+ LinkButton,+ IconButton,} from "@webstudio-is/design-system";import {CloudIcon,OfflineIcon,ShieldIcon,- WebstudioIcon,+ MenuIcon,} from "@webstudio-is/icons";import { $syncStatus } from "@webstudio-is/sync-client";import { $authPermit } from "~/shared/nano-states";@@ -27,22 +26,22 @@ export default {};const MenuPlaceholder = () => (- <ToolbarButton aria-label="Menu">- <WebstudioIcon size={22} />- </ToolbarButton>+ <IconButton type="button" size="large" aria-label="Menu">+ <MenuIcon size={22} />+ </IconButton>);const PagePlaceholder = () => (- <ToolbarButton css={{ paddingInline: theme.panel.paddingInline }}>+ <Button color="ghost" css={{ paddingInline: theme.panel.paddingInline }}><Text truncate css={{ maxWidth: theme.spacing[24] }}>Home</Text>- </ToolbarButton>+ </Button>);const BreakpointsPlaceholder = () => (<Flex align="center" gap="1">- <ToolbarButton>Base</ToolbarButton>+ <Button color="ghost">Base</Button></Flex>);@@ -53,7 +52,7 @@ const SyncErrorIndicator = () => (css={{ height: theme.spacing["15"] }}shrink={false}>- <OfflineIcon color={rawTheme.colors.foregroundDestructive} />+ <OfflineIcon color={cssVar("--foreground-negative")} /></Flex>);@@ -64,14 +63,14 @@ const ViewModeIndicator = () => (css={{ height: theme.spacing["15"] }}shrink={false}>- <CloudIcon color={rawTheme.colors.backgroundAlertMain} />+ <CloudIcon color={cssVar("--foreground-warning")} /></Flex>);const SafeModeIndicator = () => (- <ToolbarButton variant="subtle">- <ShieldIcon stroke={rawTheme.colors.foregroundDestructive} />- </ToolbarButton>+ <IconButton type="button" aria-label="Safe mode active">+ <ShieldIcon stroke={cssVar("--foreground-negative")} />+ </IconButton>);export const TopbarLayouts = () => {@@ -87,8 +86,8 @@ export const TopbarLayouts = () => {center={<BreakpointsPlaceholder />}right={<>- <Button color="gradient">Share</Button>- <Button color="positive">Publish</Button>+ <Button>Share</Button>+ <Button color="primary">Publish</Button></>}/>@@ -102,17 +101,9 @@ export const TopbarLayouts = () => {<SafeModeIndicator /><ViewModeIndicator /><SyncErrorIndicator />- <Button color="gradient">Share</Button>- <Button color="positive">Publish</Button>- <Link- data-state="auto"- className={buttonStyle({ color: "positive" })}- color="contrast"- href="#"- underline="none"- >- Clone- </Link>+ <Button>Share</Button>+ <Button color="primary">Publish</Button>+ <LinkButton href="#">Clone</LinkButton></>}/>@@ -126,8 +117,8 @@ export const TopbarLayouts = () => {right={<><SyncStatus />- <Button color="gradient">Share</Button>- <Button color="positive">Publish</Button>+ <Button>Share</Button>+ <Button color="primary">Publish</Button></>}/>@@ -139,8 +130,8 @@ export const TopbarLayouts = () => {right={<><ViewMode />- <Button color="gradient">Share</Button>- <Button color="positive">Publish</Button>+ <Button>Share</Button>+ <Button color="primary">Publish</Button></>}/>diff --git a/apps/builder/app/builder/shared/topbar.tsx b/apps/builder/app/builder/shared/topbar.tsxindex 71e4edb2ae..92552e8db0 100644--- a/apps/builder/app/builder/shared/topbar.tsx+++ b/apps/builder/app/builder/shared/topbar.tsx@@ -2,15 +2,15 @@ import { useStore } from "@nanostores/react";import {Box,Flex,+ IconButton,+ ToggleButton,theme,- ToolbarButton,- Toolbar,- ToolbarToggleGroup,Text,css,type CSS,Tooltip,Kbd,+ cssVar,} from "@webstudio-is/design-system";import type { Project } from "@webstudio-is/project";import { isPage, isPageTemplate } from "@webstudio-is/sdk";@@ -24,7 +24,10 @@ import { Menu } from "~/builder/features/menu";import { BreakpointsContainer } from "~/builder/features/breakpoints";import { ViewMode } from "~/builder/features/view-mode";import { AddressBarPopover } from "~/builder/features/address-bar";-import { toggleActiveSidebarPanel } from "~/builder/shared/nano-states";+import {+ $activeSidebarPanel,+ toggleActiveSidebarPanel,+} from "~/builder/shared/nano-states";import {useEffect,useState,@@ -39,15 +42,16 @@ import { SafeModeButton } from "~/builder/features/safe-mode";import { NotificationPopover } from "~/shared/notifications/notification-popover";import { $notifications } from "~/shared/notifications/subscription";import { getPageDisplayName } from "~/builder/features/pages/page-utils";-const topbarContainerStyle = css({+ boxSizing: "border-box",position: "relative",display: "flex",justifyContent: "space-between",- background: theme.colors.backgroundTopbar,+ background: cssVar("--background-primary"),+ borderBottom: `1px solid ${cssVar("--border-default")}`,height: theme.spacing[15],paddingRight: theme.panel.paddingInline,- color: theme.colors.foregroundContrastMain,+ color: cssVar("--foreground-primary"),});type TopbarLayoutProps = Omit<ComponentProps<"nav">, "className"> & {@@ -70,25 +74,32 @@ export const TopbarLayout = ({}: TopbarLayoutProps) => (<nav {...navProps} className={topbarContainerStyle({ css })}><Flex css={{ flexBasis: "20%" }}>- <Flex grow={false} shrink={false}>+ <Flex+ grow={false}+ shrink={false}+ align="center"+ css={{ paddingInline: theme.spacing[3] }}+ >{menu}</Flex>- {left && <Flex align="center">{left}</Flex>}+ {left && (+ <Flex align="center" css={{ gap: theme.spacing[5] }}>+ {left}+ </Flex>+ )}</Flex><Flex justify="center">{center}</Flex>- <Toolbar>- <ToolbarToggleGroup- type="single"- css={{- isolation: "isolate",- justifyContent: "flex-end",- gap: theme.spacing[5],- flexShrink: 0,- }}- >- {right}- </ToolbarToggleGroup>- </Toolbar>+ <Flex+ align="center"+ css={{+ isolation: "isolate",+ justifyContent: "flex-end",+ gap: theme.spacing[5],+ flexShrink: 0,+ }}+ >+ {right}+ </Flex>{loading}</nav>);@@ -111,6 +122,7 @@ const TopbarRevealTrigger = ({ onReveal }: { onReveal: () => void }) => (const PagesButton = () => {const page = useStore($selectedPage);+ const activeSidebarPanel = useStore($activeSidebarPanel);if (page === undefined) {return;}@@ -124,9 +136,15 @@ const PagesButton = () => {</Text>}>- <ToolbarButton- css={{ paddingInline: theme.panel.paddingInline }}- aria-label="Toggle Pages"+ <ToggleButton+ type="button"+ color="ghost"+ pressed={activeSidebarPanel === "pages"}+ css={{+ paddingInline: theme.panel.paddingInline,+ "& > span": { maxWidth: theme.spacing[24] },+ }}+ aria-label="Toggle pages"onClick={(event) => {$editingPageId.set(event.altKey && isPage(page) ? page.id : undefined@@ -136,12 +154,9 @@ const PagesButton = () => {);toggleActiveSidebarPanel("pages");}}- tabIndex={0}>- <Text truncate css={{ maxWidth: theme.spacing[24] }}>- {isPage(page) ? getPageDisplayName(page) : page.name}- </Text>- </ToolbarButton>+ {isPage(page) ? getPageDisplayName(page) : page.name}+ </ToggleButton></Tooltip>);};@@ -234,7 +249,7 @@ export const Topbar = ({ project, css, loading, isUiHidden }: TopbarProps) => {<>{notifications.length > 0 && (<NotificationPopover- renderTrigger={(props) => <ToolbarButton {...props} />}+ renderTrigger={(props) => <IconButton {...props} />}/>)}<SafeModeButton />diff --git a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/sidebar-left/sidebar-left.tsxindex afb448a7ab..7f996c926f 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-left.tsx@@ -1,5 +1,11 @@-import { useRef, useState, type ReactNode } from "react";-import { Kbd, rawTheme, Text } from "@webstudio-is/design-system";+import { useRef, type ReactNode } from "react";+import {+ cssVar,+ declareCssVar,+ Kbd,+ rawTheme,+ Text,+} from "@webstudio-is/design-system";import { useSubscribe, type Publish } from "~/shared/pubsub";import {$dragAndDropState,@@ -48,16 +54,13 @@ import { MarketplacePanel } from "~/builder/features/marketplace";import type { SidebarPanelName } from "./types";const none = { Panel: () => null };+const sidebarLeftPanelWidth = declareCssVar("--sidebar-left-panel-width");const HelpTabTrigger = () => {- const [helpIsOpen, setHelpIsOpen] = useState(false);return (- <HelpCenter onOpenChange={setHelpIsOpen}>+ <HelpCenter><HelpCenter.Trigger asChild>- <SidebarButton- label="Learn Webstudio or ask for help"- data-state={helpIsOpen ? "active" : undefined}- >+ <SidebarButton label="Learn Webstudio or ask for help"><HelpIcon size={rawTheme.spacing[10]} /></SidebarButton></HelpCenter.Trigger>@@ -257,7 +260,7 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {<Flexgrowdirection="column"- css={{ borderRight: `1px solid ${theme.colors.borderMain}` }}+ css={{ borderRight: `1px solid ${cssVar("--border-default")}` }}><ExternalDragDropMonitor /><div ref={tabsWrapperRef} style={{ display: "contents" }}>@@ -302,8 +305,8 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {}}resizablecss={{- "--sidebar-left-panel-width": `${getSidebarPanelWidth(activePanel)}`,- width: "var(--sidebar-left-panel-width)",+ [sidebarLeftPanelWidth]: `${getSidebarPanelWidth(activePanel)}`,+ width: cssVar(sidebarLeftPanelWidth),minWidth: theme.sizes.sidebarWidth,maxWidth: theme.spacing[35],// We need the node to be rendered but hidden@@ -321,7 +324,7 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {position: "relative",height: "100%",flexGrow: 1,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),}}direction="column">diff --git a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsxindex bb58f57517..ab30307acb 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx@@ -1,12 +1,13 @@import {Box,+ IconButton,Tabs,TabsContent,TabsList,TabsTrigger,Tooltip,css,- focusRingStyle,+ cssVar,styled,theme,useResize,@@ -29,50 +30,21 @@ export const SidebarTabs = styled(Tabs, {flexGrow: 1,});-const triggerFocusRing = focusRingStyle();--const buttonStyle = css({- position: "relative",- boxSizing: "border-box",- flexShrink: 0,- display: "flex",- size: theme.spacing[15],- m: 0,- userSelect: "none",- outline: "none",- alignItems: "center",- justifyContent: "center",- color: theme.colors.foregroundIconMain,- backgroundColor: theme.colors.backgroundPanel,- border: "none",- "&:disabled": {- opacity: 0.4,- cursor: "not-allowed",- },- "&:focus-visible": triggerFocusRing,- "@hover": {- "&:hover": {- backgroundColor: theme.colors.backgroundHover,- },- },-- '&[data-state="active"]': {- backgroundColor: theme.colors.backgroundHover,- },-});-export const SidebarButton = forwardRef<HTMLButtonElement,- ComponentProps<"button"> & { label: string }+ ComponentProps<typeof IconButton> & { label: string }>(({ label, ...props }, ref) => {return (<Tooltip side="right" content={label}>- <button- {...props}- ref={ref}- aria-label={label}- className={buttonStyle()}- ></button>+ <Box>+ <IconButton+ {...props}+ ref={ref}+ aria-label={label}+ size="large"+ css={{ m: theme.spacing[3] }}+ />+ </Box></Tooltip>);});@@ -87,13 +59,10 @@ export const SidebarTabsTrigger = forwardRef<return (<Tooltip side="right" content={label}><Box>- <TabsTrigger- {...props}- ref={ref}- aria-label={ariaLabel}- className={buttonStyle()}- >- {children}+ <TabsTrigger {...props} ref={ref} aria-label={ariaLabel} asChild>+ <IconButton size="large" css={{ m: theme.spacing[3] }}>+ {children}+ </IconButton></TabsTrigger></Box></Tooltip>@@ -108,7 +77,7 @@ export const SidebarTabsList = styled(TabsList, {alignItems: "center",outline: "none",flexGrow: 1,- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),});const sidebarTabsContentStyle = css({@@ -117,7 +86,7 @@ const sidebarTabsContentStyle = css({top: 0,left: "100%",height: "100%",- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),outline: "none",// Drawing border this way to ensure content still has full width, avoid subpixels and give layout round numbers"&::after": {@@ -127,7 +96,7 @@ const sidebarTabsContentStyle = css({right: 0,bottom: 0,width: 1,- background: theme.colors.borderMain,+ background: cssVar("--border-default"),},variants: {resizable: {diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsxindex f1b40b7364..98ee6e9974 100644--- a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx@@ -207,6 +207,7 @@ export const CursorPositioning: StoryFn<typeof TextEditor> = () => {</div>{textEditingInstanceSelector && (<Button+ color="primary"onClick={() => {$textEditingInstanceSelector.set(undefined);}}diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsxindex 544137345c..ef2359b000 100644--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx@@ -82,6 +82,7 @@ import {$textEditorContextMenuCommand,execTextEditorContextMenuCommand,} from "~/shared/nano-states";+import { $instances } from "~/shared/sync/data-stores";import {findBlockChildSelector,@@ -106,6 +107,14 @@ import {} from "~/builder/features/workspace/canvas-tools/outline/block-utils";import { richTextPlaceholders } from "@webstudio-is/project-build/runtime";+// These overlays render inside arbitrary authored pages where Builder theme+// variables are unavailable. Neutral values remain visible across page colors.+const textEditorOverlayColors = {+ caretDark: "#666",+ caretLight: "#999",+ pendingCommand: "rgb(127 127 127 / 20%)",+} as const;+const BindInstanceToNodePlugin = ({refs,rootInstanceSelector,@@ -168,8 +177,8 @@ const CaretColorPlugin = () => {sheet.addPlaintextRule(`@keyframes ${caretClassName}-keyframes {- from {caret-color: #666;}- to {caret-color: #999;}+ from {caret-color: ${textEditorOverlayColors.caretDark};}+ to {caret-color: ${textEditorOverlayColors.caretLight};}}.${caretClassName} {@@ -1346,8 +1355,12 @@ const RichTextContentPluginInternal = ({slashNodeKey = slashNode.getKey();menuState = "opening";- slashNode.setStyle("background-color: rgba(127, 127, 127, 0.2);");- selection.setStyle("background-color: rgba(127, 127, 127, 0.2);");+ slashNode.setStyle(+ `background-color: ${textEditorOverlayColors.pendingCommand};`+ );+ selection.setStyle(+ `background-color: ${textEditorOverlayColors.pendingCommand};`+ );selection.insertNodes([slashNode]);event.preventDefault();diff --git a/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx b/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsxindex 80e5483ad8..476e7f53a0 100644--- a/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx+++ b/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx@@ -18,6 +18,7 @@ import { LinkNode } from "@lexical/link";import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";import { $textToolbar } from "~/shared/nano-states";import { subscribeScrollState } from "~/canvas/shared/scroll-state";+import { declareCssVar } from "@webstudio-is/design-system";let activeEditor: undefined | LexicalEditor;@@ -28,7 +29,8 @@ export const getActiveEditor = () => {export const TOGGLE_SPAN_COMMAND = createCommand<void>();export const CLEAR_FORMAT_COMMAND = createCommand<void>();-const spanTriggerName = "--style-node-trigger";+const spanTriggerName = declareCssVar("--style-node-trigger");+const clearSelectionTrigger = declareCssVar("--clear-selection-trigger");export const $isSpanNode = (node: TextNode) => {return node.getStyle().includes(spanTriggerName);@@ -73,7 +75,7 @@ const $clearText = () => {if ($isRangeSelection(selection)) {// split nodes by selection and mark with style$patchStyleText(selection, {- "--clear-selection-trigger": "1",+ [clearSelectionTrigger]: "1",});// recompute selection to get new splitted nodesconst newSelection = $getSelection();diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex fb347292f1..00b3da929a 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -41,7 +41,7 @@ import {standardAttributesToReactProps,getCollectionEntries,} from "@webstudio-is/react-sdk";-import { rawTheme, toast } from "@webstudio-is/design-system";+import { cssVar, rawTheme, toast } from "@webstudio-is/design-system";import {Input,Link,@@ -80,10 +80,7 @@ import {import { Block } from "../build-mode/block";import { BlockBody } from "../build-mode/block-body";import { BlockTemplate } from "../build-mode/block-template";-import {- editablePlaceholderAttribute,- editingPlaceholderVariable,-} from "~/canvas/shared/styles";+import { editablePlaceholderAttribute } from "~/canvas/shared/styles";import { richTextPlaceholders } from "@webstudio-is/project-build/runtime";import {acquireExternalContentRoot,@@ -238,7 +235,7 @@ const ContentEditable = ({if (placeholder !== undefined) {rootElement.style.setProperty(- editingPlaceholderVariable,+ "--editing-placeholder",`'${placeholder.replaceAll("'", "\\'")}'`);}@@ -263,8 +260,8 @@ const ErrorStub = forwardRef<ref={ref}style={{padding: rawTheme.spacing[5],- border: `1px solid ${rawTheme.colors.borderDestructiveMain}`,- color: rawTheme.colors.foregroundDestructive,+ border: `1px solid ${cssVar("--border-negative")}`,+ color: cssVar("--foreground-negative"),}}/>);diff --git a/apps/builder/app/canvas/inflator.ts b/apps/builder/app/canvas/inflator.tsindex 74dcf03215..728a915429 100644--- a/apps/builder/app/canvas/inflator.ts+++ b/apps/builder/app/canvas/inflator.ts@@ -359,8 +359,6 @@ const applyInflation = () => {el.removeAttribute(inflatedAttribute);el.removeAttribute(gridInflatedAttribute);if (el instanceof HTMLElement) {- el.style.removeProperty("--ws-inflate-h");- el.style.removeProperty("--ws-inflate-w");if (wasInflated || wasGridInflated) {el.style.removeProperty("grid-template-columns");el.style.removeProperty("grid-template-rows");diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 3786e663cf..dd5033b54e 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -55,6 +55,7 @@ import {} from "@webstudio-is/project-build/runtime";import { getAllElementsByInstanceSelector } from "~/shared/dom-utils";import { createComputedStyleDeclStore } from "~/builder/features/style-panel/shared/model";+import { cssVar, declareCssVar } from "@webstudio-is/design-system";const userSheet = createRegularStyleSheet({ name: "user-styles" });const stateSheet = createRegularStyleSheet({ name: "state-styles" });@@ -80,7 +81,7 @@ export const editablePlaceholderAttribute = "data-ws-editable-placeholder";// @todo replace with modern typed attr() when supported in all browsers// see the second edge case// https://developer.mozilla.org/en-US/docs/Web/CSS/attr#backwards_compatibility-export const editingPlaceholderVariable = "--ws-editing-placeholder";+const editingPlaceholderVariable = declareCssVar("--editing-placeholder");const helperStylesShared = [// Display a placeholder text for elements that are editable but currently empty@@ -95,7 +96,7 @@ const helperStylesShared = [position: relative;display: block;&:after {- content: var(${editingPlaceholderVariable});+ content: ${cssVar(editingPlaceholderVariable)};position: absolute;left: 0;right: 0;diff --git a/apps/builder/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsxindex d96e0b9010..119507c4ed 100644--- a/apps/builder/app/dashboard/dashboard.stories.tsx+++ b/apps/builder/app/dashboard/dashboard.stories.tsx@@ -7,6 +7,7 @@ import {StorySection,Text,theme,+ cssVar,} from "@webstudio-is/design-system";import { Dashboard, DashboardSetup } from "./dashboard";import { Card as CardComponent, CardContent, CardFooter } from "./shared/card";@@ -156,9 +157,7 @@ export const Card = () => (<Flex gap="3" wrap="wrap" align="start"><Box css={{ width: theme.spacing[30] }}><CardComponent>- <CardContent- css={{ background: theme.colors.brandBackgroundProjectCardFront }}- />+ <CardContent css={{ background: cssVar("--background-secondary") }} /><CardFooter><Text truncate>My project</Text></CardFooter>@@ -166,9 +165,7 @@ export const Card = () => (</Box><Box css={{ width: theme.spacing[30] }}><CardComponent aria-selected={true}>- <CardContent- css={{ background: theme.colors.brandBackgroundProjectCardFront }}- />+ <CardContent css={{ background: cssVar("--background-secondary") }} /><CardFooter><Text truncate>Selected project</Text></CardFooter>@@ -178,7 +175,7 @@ export const Card = () => (<Box key={title} css={{ width: theme.spacing[30] }}><CardComponent><CardContent- css={{ background: theme.colors.brandBackgroundProjectCardFront }}+ css={{ background: cssVar("--background-secondary") }}/><CardFooter><Text truncate>{title}</Text>diff --git a/apps/builder/app/dashboard/dashboard.tsx b/apps/builder/app/dashboard/dashboard.tsxindex 65f3ac60b2..4107090d13 100644--- a/apps/builder/app/dashboard/dashboard.tsx+++ b/apps/builder/app/dashboard/dashboard.tsx@@ -12,10 +12,12 @@ import {theme,PanelBanner,Link,- buttonStyle,+ LinkButton,Separator,Grid,IconButton,+ cssVar,+ selectionBackground,} from "@webstudio-is/design-system";import { BodyIcon } from "@webstudio-is/icons";import {@@ -105,11 +107,11 @@ const sidebarLinkStyle = css({paddingInline: theme.panel.paddingInline,outline: "none","&:focus-visible, &:hover": {- background: theme.colors.backgroundHover,+ background: cssVar("--overlay-interaction-hover"),},"&[aria-current=page]": {- background: theme.colors.backgroundItemCurrent,- color: theme.colors.foregroundMain,+ background: selectionBackground,+ color: cssVar("--foreground-primary"),},});@@ -262,7 +264,7 @@ export const Dashboard = () => {as="aside"css={{width: theme.sizes.sidebarWidth,- borderRight: `1px solid ${theme.colors.borderMain}`,+ borderRight: `1px solid ${cssVar("--border-default")}`,position: "sticky",top: 0,gridTemplateRows: `auto auto auto 1fr`,@@ -310,26 +312,22 @@ export const Dashboard = () => {</CollapsibleSection>)}</nav>- <div>+ <Box css={{ paddingTop: theme.spacing[5] }}><PanelBanner variant="neutral"><Text variant="titles">Inception is live</Text><Text color="subtle">An AI-powered design tool to explore ideas and instantlygenerate HTML/CSS for Webstudio Builder or any other platform.</Text>- <Link- className={buttonStyle({- color: "gradient",- })}- underline="none"+ <LinkButton+ color="primary"href="https://wstd.us/inception"target="_blank"- color="contrast">Get started with Inception- </Link>+ </LinkButton></PanelBanner>- </div>+ </Box><CollapsibleSection label="Help & support" fullWidth><NavigationItemsitems={help.map((item) => ({diff --git a/apps/builder/app/dashboard/profile-menu.tsx b/apps/builder/app/dashboard/profile-menu.tsxindex d25127301e..4015432d01 100644--- a/apps/builder/app/dashboard/profile-menu.tsx+++ b/apps/builder/app/dashboard/profile-menu.tsx@@ -19,6 +19,7 @@ import { useStore } from "@nanostores/react";import { logoutPath, planSubscriptionPath } from "~/shared/router-utils";import type { User } from "~/shared/db/user.server";import { $purchases } from "~/shared/nano-states";+import { ColorSchemeMenu } from "~/shared/color-scheme-menu";const getAvatarLetter = (title?: string) => {return (title || "X").charAt(0).toLocaleUpperCase();@@ -38,7 +39,7 @@ const ProfileButton = forwardRef<<Flex gap="2" align="center"><Buttoncolor="ghost"- aria-label="Profile Menu"+ aria-label="Profile menu"{...rest}ref={forwardedRef}prefix={@@ -76,7 +77,7 @@ export const ProfileMenu = ({ user }: { user: User }) => {hasPurchases={purchases.length > 0}/></DropdownMenuTrigger>- <DropdownMenuContent align="start" width="regular">+ <DropdownMenuContent align="start" sideOffset={4} width="regular"><DropdownMenuLabel>{user.username ?? defaultUserName}<Text>{user.email}</Text>@@ -100,7 +101,7 @@ export const ProfileMenu = ({ user }: { user: User }) => {{purchase.planName}</DropdownMenuItem>) : (- <DropdownMenuLabel key={index}>+ <DropdownMenuLabel key={index} css={{ fontWeight: "normal" }}>{purchase.planName}</DropdownMenuLabel>)@@ -117,8 +118,10 @@ export const ProfileMenu = ({ user }: { user: User }) => {</DropdownMenuItem>)}<DropdownMenuSeparator />+ <ColorSchemeMenu />+ <DropdownMenuSeparator /><DropdownMenuItem onSelect={() => navigate(logoutPath())}>- Sign Out+ Sign out</DropdownMenuItem></DropdownMenuContent></DropdownMenu>diff --git a/apps/builder/app/dashboard/projects/project-card.tsx b/apps/builder/app/dashboard/projects/project-card.tsxindex 86ec835468..17adcb1302 100644--- a/apps/builder/app/dashboard/projects/project-card.tsx+++ b/apps/builder/app/dashboard/projects/project-card.tsx@@ -6,9 +6,10 @@ import {truncate,theme,Tooltip,- rawTheme,Link,Box,+ cssVar,+ declareCssVar,} from "@webstudio-is/design-system";import { InfoCircleIcon } from "@webstudio-is/icons";import type { DashboardProject } from "@webstudio-is/dashboard";@@ -17,14 +18,19 @@ import { ProjectDialogs, type DialogType } from "./project-dialogs";import {ThumbnailLinkWithAbbr,ThumbnailLinkWithImage,+ thumbnailSurface,} from "../shared/thumbnail";import { Spinner } from "../shared/spinner";import { Card, CardContent, CardFooter } from "../shared/card";import type { User } from "~/shared/db/user.server";import { ProjectMenu } from "./project-menu";import { formatDate } from "./utils";+import { brandColors } from "~/shared/brand-colors";-const infoIconStyle = css({ flexShrink: 0 });+const infoIconStyle = css({ flexShrink: 0, opacity: 0.8 });+const prefetchImageBackground = declareCssVar(+ "--project-card-prefetch-image-background"+);const PublishedLink = ({domain,@@ -116,16 +122,16 @@ export const ProjectCard = ({<Card hidden={isHidden} {...props}><CardContentcss={{- background: theme.colors.brandBackgroundProjectCardBack,+ background: thumbnailSurface,[`&:hover`]: {- "--ws-project-card-prefetch-image-background": `url(${linkPath}cgi/empty.gif)`,+ [prefetchImageBackground]: `url(${linkPath}cgi/empty.gif)`,},}}>{/* This div with backgorundImage on card hover is used to prefetch DNS of the project domain on hover. */}<Boxcss={{- backgroundImage: `var(--ws-project-card-prefetch-image-background, none)`,+ backgroundImage: cssVar(prefetchImageBackground, "none"),visibility: "hidden",position: "absolute",width: 1,@@ -153,7 +159,7 @@ export const ProjectCard = ({color="contrast"key={tag.id}css={{- background: "oklch(0 0 0 / 0.3)",+ background: brandColors.scrim,borderRadius: theme.borderRadius[3],paddingInline: theme.spacing[3],}}@@ -200,11 +206,7 @@ export const ProjectCard = ({</Text>}>- <InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}- tabIndex={-1}- className={infoIconStyle()}- />+ <InfoCircleIcon tabIndex={-1} className={infoIconStyle()} /></Tooltip></Flex>{isPublished ? (diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsxindex e565b37455..1c45e6b264 100644--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx@@ -183,17 +183,22 @@ export const CreateProject = ({return (<Dialog- title="New Project"- trigger={<Button prefix={<PlusIcon size={12} />}>{buttonText}</Button>}+ title="New project"+ trigger={+ <Button color="primary" prefix={<PlusIcon size={12} />}>+ {buttonText}+ </Button>+ }onOpenChange={handleOpenChange}><DialogContentonSubmit={handleSubmit}- placeholder="My Project"- label="Project Title"+ placeholder="My project"+ label="Project title"errors={errors}primaryButton={<Button+ color="primary"state={state === "idle" ? undefined : "pending"}type="submit">@@ -259,9 +264,10 @@ export const RenameProjectDialog = ({onSubmit={handleSubmit}errors={errors}title={title}- label="Project Title"+ label="Project title"primaryButton={<Button+ color="primary"type="submit"state={state === "idle" ? undefined : "pending"}>@@ -343,7 +349,7 @@ export const DeleteProjectDialog = ({});return (<Dialog- title="Delete Confirmation"+ title="Delete confirmation"isOpen={isOpen}onOpenChange={onOpenChange}>@@ -403,7 +409,7 @@ export const ShareProjectDialog = ({projectId: string;}) => {return (- <Dialog title="Share Project" isOpen={isOpen} onOpenChange={onOpenChange}>+ <Dialog title="Share project" isOpen={isOpen} onOpenChange={onOpenChange}><ShareProjectContainer projectId={projectId} /></Dialog>);diff --git a/apps/builder/app/dashboard/projects/project-menu.tsx b/apps/builder/app/dashboard/projects/project-menu.tsxindex 5ff8c579d2..bf8b7cfbd1 100644--- a/apps/builder/app/dashboard/projects/project-menu.tsx+++ b/apps/builder/app/dashboard/projects/project-menu.tsx@@ -36,14 +36,18 @@ export const ProjectMenu = ({ projectId, onOpenChange }: ProjectMenuProps) => {<DropdownMenu open={isOpen} onOpenChange={setIsOpen}><DropdownMenuTrigger asChild><IconButton- aria-label="Menu Button"+ aria-label="Menu"tabIndex={-1}css={{ alignSelf: "center", position: "relative", zIndex: 1 }}><EllipsesIcon width={15} height={15} /></IconButton></DropdownMenuTrigger>- <DropdownMenuContent align="end" css={{ width: theme.spacing[24] }}>+ <DropdownMenuContent+ align="end"+ sideOffset={4}+ css={{ width: theme.spacing[24] }}+ >{permissions.canDuplicate && (<DropdownMenuItem onSelect={handleDuplicateProject}>Duplicatediff --git a/apps/builder/app/dashboard/projects/projects-list.tsx b/apps/builder/app/dashboard/projects/projects-list.tsxindex bd03c4b482..b078fa2eda 100644--- a/apps/builder/app/dashboard/projects/projects-list.tsx+++ b/apps/builder/app/dashboard/projects/projects-list.tsx@@ -8,6 +8,7 @@ import {List,ListItem,IconButton,+ cssVar,} from "@webstudio-is/design-system";import { ChevronUpIcon, ChevronDownIcon } from "@webstudio-is/icons";import type { DashboardProject } from "@webstudio-is/dashboard";@@ -35,10 +36,10 @@ const tableStyles = css({display: "table-row",position: "relative","&:focus-visible": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},'&:has([role="cell"]):hover': {- background: theme.colors.backgroundHover,+ background: cssVar("--overlay-interaction-hover"),},},@@ -47,7 +48,7 @@ const tableStyles = css({padding: theme.spacing[5],paddingBottom: theme.spacing[3],textAlign: "left",- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,"&:first-child": {width: "35%",},diff --git a/apps/builder/app/dashboard/projects/projects.tsx b/apps/builder/app/dashboard/projects/projects.tsxindex 37025d3a9b..9370f99d46 100644--- a/apps/builder/app/dashboard/projects/projects.tsx+++ b/apps/builder/app/dashboard/projects/projects.tsx@@ -10,8 +10,7 @@ import {ToggleGroupButton,PanelBanner,panelBannerIconColor,- Link,- buttonStyle,+ LinkButton,} from "@webstudio-is/design-system";import { RepeatGridIcon, ListViewIcon } from "@webstudio-is/icons";import type { DashboardProject } from "@webstudio-is/dashboard";@@ -147,15 +146,12 @@ export const Projects = (props: ProjectsProps) => {</ToggleGroupButton></ToggleGroup><SortSelect value={sortState} onValueChange={handleSortChange} />- <Link- className={buttonStyle({ color: "dark" })}- underline="none"+ <LinkButtonhref="https://webstudio.is/marketplace/templates/"target="_blank"- color="contrast">Use template- </Link>+ </LinkButton>{permissions.canCreateProject && (<CreateProject workspaceId={props.currentWorkspaceId} />)}@@ -178,7 +174,7 @@ export const Projects = (props: ProjectsProps) => {tag={tag}key={tag.id}index={index}- state={selectedTags.includes(tag.id) ? "pressed" : "auto"}+ pressed={selectedTags.includes(tag.id)}>{tag.label}</Tag>@@ -233,3 +229,5 @@ export const Projects = (props: ProjectsProps) => {</Main>);};++undefined;diff --git a/apps/builder/app/dashboard/projects/sort.tsx b/apps/builder/app/dashboard/projects/sort.tsxindex dc11a8e64a..da12f5d1c9 100644--- a/apps/builder/app/dashboard/projects/sort.tsx+++ b/apps/builder/app/dashboard/projects/sort.tsx@@ -137,7 +137,7 @@ export const SortSelect = ({ value, onValueChange }: SortSelectProps) => {{sortLabel}</Button></DropdownMenuTrigger>- <DropdownMenuContent align="end">+ <DropdownMenuContent align="end" sideOffset={4}><DropdownMenuLabel>Sort</DropdownMenuLabel><DropdownMenuRadioGroupvalue={sortBy}diff --git a/apps/builder/app/dashboard/projects/tags.tsx b/apps/builder/app/dashboard/projects/tags.tsxindex c347335b69..9e7a1d9c8b 100644--- a/apps/builder/app/dashboard/projects/tags.tsx+++ b/apps/builder/app/dashboard/projects/tags.tsx@@ -7,6 +7,7 @@ import {DialogContent,DialogTitle,Button,+ ToggleButton,DialogActions,DialogClose,Checkbox,@@ -23,6 +24,7 @@ import {SmallIconButton,DropdownMenuContent,DropdownMenuItem,+ cssVar,} from "@webstudio-is/design-system";import { nativeClient } from "~/shared/trpc/trpc-client";import type { User } from "~/shared/db/user.server";@@ -30,10 +32,10 @@ import { nanoid } from "nanoid";import { EllipsesIcon, SpinnerIcon } from "@webstudio-is/icons";const tagColorPalette = Array.from({ length: 50 }, (_, index) => {- const lightness = 55 + (index % 3) * 3;- const chroma = 0.14 + (index % 2) * 0.02;- const hue = (index * 137.5) % 360;- return `oklch(${lightness}% ${chroma.toFixed(2)} ${hue.toFixed(1)})`;+ const hueOffset = (index * 137.5) % 360;+ return `oklch(from ${cssVar(+ "--background-accent"+ )} l c calc(h + ${hueOffset}))`;});type DeleteConfirmationDialogProps = {@@ -129,7 +131,7 @@ const TagsList = ({gap="2"css={{paddingInline: theme.panel.paddingInline,- outlineColor: theme.colors.borderFocus,+ outlineColor: cssVar("--border-focus"),outlineOffset: -2,paddingBlock: theme.spacing[2],}}@@ -260,7 +262,7 @@ const TagEdit = ({/></Grid><DialogActions>- <Button type="submit">+ <Button color="primary" type="submit">{isExisting ? "Update tag" : "Create tag"}</Button><Button@@ -319,6 +321,7 @@ export const TagsDialog = ({/><DialogActions><Button+ color="primary"onClick={() => setEditingTag({ id: nanoid(5), label: "" })}>Create tag@@ -343,18 +346,17 @@ export const Tag = ({tag,...props}: { index: number; tag: User["projectsTags"][number] } & ComponentProps<- typeof Button+ typeof ToggleButton>) => {const [searchParams, setSearchParams] = useSearchParams();const selectedTagsIds = searchParams.getAll("tag");- const color = tagColorPalette[index] ?? theme.colors.backgroundNeutralDark;+ const color = tagColorPalette[index] ?? cssVar("--background-inverse");return (- <Button- color="neutral"+ <ToggleButtoncss={{"&:hover[data-state='auto'], &[data-state='pressed']": {backgroundColor: color,- color: theme.colors.white,+ color: cssVar("--foreground-on-accent"),},"&[data-state='pressed']:hover": {backgroundColor: `oklch(from ${color} l c h / 0.8)`,@@ -377,3 +379,5 @@ export const Tag = ({/>);};++undefined;diff --git a/apps/builder/app/dashboard/projects/transfer-dialog.tsx b/apps/builder/app/dashboard/projects/transfer-dialog.tsxdeleted file mode 100644index 0e5b446378..0000000000--- a/apps/builder/app/dashboard/projects/transfer-dialog.tsx+++ /dev/null@@ -1,324 +0,0 @@-import { useEffect, useRef, useState } from "react";-import { useRevalidator, useSearchParams } from "@remix-run/react";-import {- Button,- Flex,- Label,- Text,- SearchField,- DialogActions,- Dialog,- DialogContent,- DialogTitle,- DialogClose,- DialogDescription,- css,- theme,- toast,-} from "@webstudio-is/design-system";-import { useStore } from "@nanostores/react";-import { $workspaces, $user } from "~/shared/nano-states";-import { nativeClient } from "~/shared/trpc/trpc-client";-import {- WorkspaceDropdown,- type WorkspaceDropdownGroup,-} from "~/dashboard/workspace/workspace-dropdown";--const sortWorkspaces = <T extends { name: string }>(workspaces: Array<T>) =>- [...workspaces].sort((a, b) => a.name.localeCompare(b.name));--const orSeparatorStyle = css({- display: "flex",- alignItems: "center",- gap: theme.spacing[5],- "&::before, &::after": {- content: "''",- flexGrow: 1,- height: theme.spacing[1],- backgroundColor: theme.colors.borderMain,- },-});--const SEARCH_DEBOUNCE_MS = 300;--export const TransferProjectDialog = ({- isOpen,- onOpenChange,- projectId,- title,-}: {- isOpen: boolean;- onOpenChange: (open: boolean) => void;- projectId: string;- title: string;-}) => {- const workspaces = useStore($workspaces);- const user = useStore($user);- const userEmail = user?.email ?? "";- const revalidator = useRevalidator();- const [searchParams] = useSearchParams();-- const [email, setEmail] = useState("");- const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<string>();- const [filteredWorkspaces, setFilteredWorkspaces] = useState<- Array<{ id: string; name: string }>- >([]);- const [isFiltered, setIsFiltered] = useState(false);- const [isSubmitting, setIsSubmitting] = useState(false);- const [error, setError] = useState<string>();- const debounceTimerRef = useRef<ReturnType<typeof setTimeout>>();- const requestCounterRef = useRef(0);-- // Group and sort workspaces by ownership- const ownedWorkspaces = sortWorkspaces(- workspaces.filter((w) => w.role === "own")- );- // Determine the current workspace from URL or fall back to default- const getCurrentWorkspaceId = () => {- const urlWorkspaceId = searchParams.get("workspaceId");- if (urlWorkspaceId !== null) {- return urlWorkspaceId;- }- // When no workspaceId in URL, the user is on the default workspace- return (- ownedWorkspaces.find((w) => w.isDefault)?.id ?? ownedWorkspaces[0]?.id- );- };-- // Reset state when dialog opens — pre-select the current workspace- useEffect(() => {- if (isOpen) {- setSelectedWorkspaceId(getCurrentWorkspaceId());- } else {- setEmail("");- setSelectedWorkspaceId(undefined);- setFilteredWorkspaces([]);- setIsFiltered(false);- setError(undefined);- clearTimeout(debounceTimerRef.current);- }-- return () => clearTimeout(debounceTimerRef.current);- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [isOpen]);-- const handleEmailChange = (searchEmail: string) => {- setEmail(searchEmail);- setError(undefined);-- if (searchEmail.trim() === "") {- setIsFiltered(false);- setSelectedWorkspaceId(getCurrentWorkspaceId());- clearTimeout(debounceTimerRef.current);- return;- }-- // Basic email validation- if (searchEmail.includes("@") === false) {- setIsFiltered(false);- clearTimeout(debounceTimerRef.current);- return;- }-- clearTimeout(debounceTimerRef.current);- debounceTimerRef.current = setTimeout(() => {- const requestId = ++requestCounterRef.current;- nativeClient.workspace.findSharedWorkspacesByOwnerEmail- .query({ email: searchEmail.trim() })- .then((result) => {- // Ignore stale responses- if (requestCounterRef.current !== requestId) {- return;- }- if (result.success) {- setFilteredWorkspaces(result.data);- setIsFiltered(true);- setSelectedWorkspaceId(undefined);- }- })- .catch(() => {- // Silently fail — keep showing all workspaces- });- }, SEARCH_DEBOUNCE_MS);- };-- const handleClearEmail = () => {- setEmail("");- setIsFiltered(false);- setSelectedWorkspaceId(getCurrentWorkspaceId());- setError(undefined);- clearTimeout(debounceTimerRef.current);- };-- const handleSubmit = async () => {- setError(undefined);- setIsSubmitting(true);-- try {- const trimmedEmail = email.trim();-- // Case 1: No email entered — move to the selected workspace (same-owner move)- if (trimmedEmail === "" && selectedWorkspaceId !== undefined) {- const result = await nativeClient.workspace.moveProject.mutate({- projectId,- targetWorkspaceId: selectedWorkspaceId,- });- if ("error" in result) {- setError(result.error);- return;- }- toast.info(`"${title}" moved successfully`);- onOpenChange(false);- revalidator.revalidate();- return;- }-- // Case 2: Email entered — transfer to another user- if (trimmedEmail !== "") {- const result = await nativeClient.workspace.transferProject.mutate({- projectId,- recipientEmail: trimmedEmail,- targetWorkspaceId: selectedWorkspaceId,- });- if ("error" in result) {- setError(result.error);- return;- }- toast.info("Transfer request sent");- onOpenChange(false);- revalidator.revalidate();- return;- }-- setError("Select a workspace or enter an email address");- } catch {- setError("Something went wrong");- } finally {- setIsSubmitting(false);- }- };-- const hasEmail = email.trim() !== "";- const hasWorkspace = selectedWorkspaceId !== undefined;- const isSelfTransfer =- hasEmail &&- userEmail !== "" &&- email.trim().toLowerCase() === userEmail.toLowerCase();- const canSubmit = (hasEmail || hasWorkspace) && isSelfTransfer === false;-- // Build groups for the dropdown.- // In filtered mode (email entered): show the recipient's workspaces.- // In unfiltered mode (no email): only show own workspaces — moving to- // another user's workspace requires the transfer flow with a notification.- const dropdownGroups: Array<WorkspaceDropdownGroup> = isFiltered- ? filteredWorkspaces.length > 0- ? [- {- label: "Their workspaces you have access to",- items: sortWorkspaces(filteredWorkspaces),- },- ]- : []- : [- ...(ownedWorkspaces.length > 0- ? [{ label: "My workspaces", items: ownedWorkspaces }]- : []),- ];-- return (- <Dialog open={isOpen} onOpenChange={onOpenChange}>- <DialogContent>- <Flex direction="column" css={{ width: theme.spacing[32] }}>- <Flex- direction="column"- gap="3"- css={{ padding: theme.panel.padding }}- >- <DialogDescription asChild>- <Text as="p">- Move “{title}” to another workspace, or transfer it- to another user by entering their email.- </Text>- </DialogDescription>-- <Flex direction="column" gap="1" align="start">- <Label>- {isFiltered- ? "Their workspaces you have access to"- : "Workspace"}- </Label>- {dropdownGroups.length > 0 ? (- <WorkspaceDropdown- groups={dropdownGroups}- selectedId={selectedWorkspaceId}- onSelectedChange={setSelectedWorkspaceId}- color="ghost"- />- ) : isFiltered && hasEmail ? (- <Text color="subtle" variant="labels">- No shared workspaces found. The project will be transferred- without a target workspace — the recipient will choose where- to place it.- </Text>- ) : undefined}- </Flex>- </Flex>-- <div className={orSeparatorStyle()}>- <Text color="subtle" variant="tiny">- OR- </Text>- </div>-- <Flex- direction="column"- gap="3"- css={{ padding: theme.panel.padding }}- >- <Flex direction="column" gap="1">- <Label htmlFor="transfer-email">Recipient</Label>- <SearchField- id="transfer-email"- placeholder="[email protected]"- value={email}- onChange={(event) => handleEmailChange(event.target.value)}- onKeyDown={(event) => {- if (event.key === "Enter") {- event.preventDefault();- if (canSubmit) {- handleSubmit();- }- }- }}- onAbort={handleClearEmail}- />- </Flex>-- {error !== undefined && <Text color="destructive">{error}</Text>}-- {isSelfTransfer && (- <Text color="destructive">- You can't transfer a project to yourself. Use the workspace- selector above to move it.- </Text>- )}- </Flex>- </Flex>-- <DialogTitle>Transfer project</DialogTitle>- <DialogActions>- <Button- disabled={canSubmit === false}- state={isSubmitting ? "pending" : undefined}- onClick={handleSubmit}- >- {hasEmail ? "Transfer" : "Move"}- </Button>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- </DialogContent>- </Dialog>- );-};diff --git a/apps/builder/app/dashboard/shared/card.tsx b/apps/builder/app/dashboard/shared/card.tsxindex 31a4401b82..1c8a13f768 100644--- a/apps/builder/app/dashboard/shared/card.tsx+++ b/apps/builder/app/dashboard/shared/card.tsx@@ -7,10 +7,12 @@ import {css,Slot,type SlotProps,+ cssVar,+ declareCssVar,} from "@webstudio-is/design-system";import { forwardRef, type ComponentProps } from "react";-const borderColorVar = "--ws-dashboard-card-border-color";+const borderColorVar = declareCssVar("--dashboard-card-border-color");const cardStyle = css({position: "relative",@@ -23,7 +25,7 @@ const cardStyle = css({flexShrink: 0,outline: "none","&:focus-within, &[aria-selected=true]": {- [borderColorVar]: theme.colors.borderFocus,+ [borderColorVar]: cssVar("--border-focus"),},});@@ -49,7 +51,7 @@ export const CardContent = styled(Grid, {content: '""',position: "absolute",inset: 0,- border: `1px solid var(${borderColorVar}, transparent)`,+ border: `1px solid ${cssVar(borderColorVar, "transparent")}`,borderRadius: theme.borderRadius[5],pointerEvents: "none",},@@ -60,7 +62,7 @@ export const CardFooter = styled(Flex, {flexShrink: 0,alignSelf: "stretch",flexGap: theme.spacing[3],- background: theme.colors.brandBackgroundProjectCardTextArea,+ background: cssVar("--background-primary"),height: theme.spacing[17],paddingBlock: theme.panel.paddingBlock,});diff --git a/apps/builder/app/dashboard/shared/layout.tsx b/apps/builder/app/dashboard/shared/layout.tsxindex a5744f4c1d..f5c37c5ae0 100644--- a/apps/builder/app/dashboard/shared/layout.tsx+++ b/apps/builder/app/dashboard/shared/layout.tsx@@ -1,5 +1,5 @@import type { ComponentProps } from "react";-import { Flex, theme } from "@webstudio-is/design-system";+import { Flex, cssVar, theme } from "@webstudio-is/design-system";export const Header = ({variant,@@ -17,7 +17,7 @@ export const Header = ({height: theme.spacing[19],position: "sticky",top: 0,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),zIndex: 1,}}{...props}diff --git a/apps/builder/app/dashboard/shared/spinner.tsx b/apps/builder/app/dashboard/shared/spinner.tsxindex 7dd5a8b133..3153252ce5 100644--- a/apps/builder/app/dashboard/shared/spinner.tsx+++ b/apps/builder/app/dashboard/shared/spinner.tsx@@ -1,4 +1,4 @@-import { css } from "@webstudio-is/design-system";+import { css, cssVar } from "@webstudio-is/design-system";import { useDebounce } from "use-debounce";import { SpinnerIcon } from "@webstudio-is/icons";import { useEffect } from "react";@@ -6,8 +6,11 @@ import { useEffect } from "react";const containerStyle = css({position: "absolute",inset: 0,- background:- "radial-gradient(34.37% 50% at 50% 50%, rgba(255, 255, 255, 0.5) 0%, rgba(248, 248, 248, 0.5) 100%);",+ background: `radial-gradient(+ 34.37% 50% at 50% 50%,+ oklch(from ${cssVar("--background-primary")} l c h / 50%) 0%,+ oklch(from ${cssVar("--background-disabled")} l c h / 50%) 100%+ )`,backdropFilter: "blur(8px)",display: "flex",alignItems: "center",diff --git a/apps/builder/app/dashboard/shared/thumbnail.tsx b/apps/builder/app/dashboard/shared/thumbnail.tsxindex 246c376ef6..79fd5d0cd8 100644--- a/apps/builder/app/dashboard/shared/thumbnail.tsx+++ b/apps/builder/app/dashboard/shared/thumbnail.tsx@@ -1,13 +1,36 @@import { forwardRef } from "react";import { getImageAttributes, wsImageLoader } from "@webstudio-is/image";-import { css, theme, textVariants } from "@webstudio-is/design-system";+import { css, cssVar, textVariants } from "@webstudio-is/design-system";++const darkThumbnailSurface = `color-mix(+ in oklab,+ ${cssVar("--background-primary")} 96%,+ ${cssVar("--foreground-primary")}+)`;+const darkThumbnailForeground = `color-mix(+ in oklab,+ ${cssVar("--background-primary")} 86%,+ ${cssVar("--foreground-primary")}+)`;++export const thumbnailSurface = `linear-gradient(+ 0deg,+ light-dark(#fbf8ff, ${darkThumbnailSurface}) 0%,+ light-dark(#c7c7c7, ${darkThumbnailSurface}) 100%+)`;++const thumbnailForeground = `linear-gradient(+ 0deg,+ light-dark(#fbf8ff, ${darkThumbnailForeground}) 0%,+ light-dark(#e2e2e2, ${darkThumbnailForeground}) 100%+)`;const abbrStyle = css(textVariants.brandThumbnailLargeDefault, {display: "flex",alignItems: "center",alignSelf: "center",minHeight: 0,- background: theme.colors.brandBackgroundProjectCardFront,+ background: thumbnailForeground,WebkitBackgroundClip: "text",backgroundClip: "text",color: "transparent",@@ -51,7 +74,7 @@ ThumbnailWithAbbr.displayName = "ThumbnailWithAbbr";const imageContainerStyle = css({position: "relative",- background: theme.colors.brandBackgroundProjectCardFront,+ background: thumbnailSurface,outline: "none",overflow: "hidden",transition: "scale 100ms",diff --git a/apps/builder/app/dashboard/welcome/welcome.tsx b/apps/builder/app/dashboard/welcome/welcome.tsxindex 0e0e0a8618..da5627703d 100644--- a/apps/builder/app/dashboard/welcome/welcome.tsx+++ b/apps/builder/app/dashboard/welcome/welcome.tsx@@ -1,4 +1,4 @@-import { Flex, Text, Link, buttonStyle } from "@webstudio-is/design-system";+import { Flex, LinkButton, Text } from "@webstudio-is/design-system";import { useStore } from "@nanostores/react";import { Main } from "../shared/layout";import { CreateProject } from "../projects/project-dialogs";@@ -24,15 +24,12 @@ export const Welcome = ({</Text><Flex align="center" gap="3">- <Link- className={buttonStyle({ color: "dark" })}- underline="none"+ <LinkButtonhref="https://webstudio.is/marketplace/templates/"target="_blank"- color="contrast">Start from a template- </Link>+ </LinkButton>{permissions.canCreateProject && (<CreateProjectworkspaceId={currentWorkspaceId}@@ -55,3 +52,5 @@ export const Welcome = ({</Main>);};++undefined;diff --git a/apps/builder/app/dashboard/workspace-dialogs.tsx b/apps/builder/app/dashboard/workspace-dialogs.tsxdeleted file mode 100644index ec3062681c..0000000000--- a/apps/builder/app/dashboard/workspace-dialogs.tsx+++ /dev/null@@ -1,809 +0,0 @@-import { useEffect, useState } from "react";-import { useRevalidator } from "@remix-run/react";-import {- Button,- Box,- Flex,- Label,- List,- ListItem,- Text,- InputField,- DialogActions,- Dialog,- DialogContent,- DialogTitle,- DialogClose,- DialogDescription,- IconButton,- InputErrorsTooltip,- ScrollAreaNative,- Select,- Tooltip,- css,- theme,-} from "@webstudio-is/design-system";-import { TrashIcon } from "@webstudio-is/icons";-import {- type Workspace,- type Role,- roles,- roleLabels,-} from "@webstudio-is/project";-import { nativeClient, trpcClient } from "~/shared/trpc/trpc-client";--// ----------------------------------------------------------------------------// Create workspace-// -----------------------------------------------------------------------------export const CreateWorkspaceDialog = ({- isOpen,- onOpenChange,- onCreated,-}: {- isOpen: boolean;- onOpenChange: (open: boolean) => void;- onCreated?: (workspaceId: string) => void;-}) => {- const { send, state } = trpcClient.workspace.create.useMutation();- const revalidator = useRevalidator();- const [errors, setErrors] = useState<string>();-- const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {- event.preventDefault();- const formData = new FormData(event.currentTarget);- const name = String(formData.get("name") ?? "").trim();-- if (name.length < 2) {- setErrors("Workspace name must be at least 2 characters");- return;- }-- setErrors(undefined);- send({ name }, (result) => {- if (result && "error" in result) {- setErrors(result.error);- return;- }- onOpenChange(false);- revalidator.revalidate();- if (result && "data" in result) {- onCreated?.(result.data.id);- }- });- };-- return (- <Dialog- open={isOpen}- onOpenChange={(open) => {- onOpenChange(open);- if (open === false) {- setErrors(undefined);- }- }}- >- <DialogContent>- <form onSubmit={handleSubmit}>- <Flex- direction="column"- gap="1"- css={{- paddingInline: theme.spacing[7],- paddingTop: theme.spacing[5],- }}- >- <Label htmlFor="workspace-name">Workspace name</Label>- <InputField- id="workspace-name"- name="name"- placeholder="My workspace"- autoFocus- color={errors ? "error" : undefined}- />- {errors && <Text color="destructive">{errors}</Text>}- </Flex>- <DialogActions>- <Button- type="submit"- state={state === "idle" ? undefined : "pending"}- >- Create- </Button>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- </form>- <DialogTitle>New workspace</DialogTitle>- </DialogContent>- </Dialog>- );-};--// ----------------------------------------------------------------------------// Workspace settings (rename, members, delete)-// -----------------------------------------------------------------------------const memberItemStyle = css({- paddingInline: theme.spacing[5],- paddingBlock: theme.spacing[3],- borderRadius: theme.borderRadius[4],- outline: "none",- "&:hover, &:focus-within": {- backgroundColor: theme.colors.backgroundHover,- },- "& [data-action]": {- visibility: "hidden",- },- "&:hover [data-action], &:focus-within [data-action]": {- visibility: "visible",- },-});--type MemberRowProps = {- email: string;- index: number;-} & (- | { role: "owner" }- | {- role: "member";- userId: string;- workspaceId: string;- relation: Role;- canRemove: boolean;- onRefresh: () => void;- }- | {- role: "pending";- relation: Role;- canRemove: boolean;- onRemove: () => void;- onChangeRole: (role: Role) => void;- }-);--const MemberRow = (props: MemberRowProps) => {- const { email, index, role } = props;- const removeMutation = trpcClient.workspace.removeMember.useMutation();- const updateMutation = trpcClient.workspace.updateRole.useMutation();- const revalidator = useRevalidator();- const [error, setError] = useState<string>();- const [localRole, setLocalRole] = useState<Role>(- role !== "owner" ? props.relation : "administrators"- );-- const selectElement = (() => {- if (role === "owner") {- return (- <Select color="ghost" options={["Owner"]} value="Owner" disabled />- );- }-- const value = role === "pending" ? props.relation : localRole;-- const handleChange =- role === "pending"- ? props.onChangeRole- : (newRole: Role) => {- setError(undefined);- setLocalRole(newRole);- updateMutation.send(- {- workspaceId: props.workspaceId,- memberUserId: props.userId,- relation: newRole,- },- (result) => {- if (result && "error" in result) {- setError(result.error);- setLocalRole(props.relation);- return;- }- props.onRefresh();- revalidator.revalidate();- }- );- };-- return (- <Select- color="ghost"- options={[...roles]}- value={value}- getLabel={(option: Role) => roleLabels[option]}- onChange={handleChange}- disabled={!props.canRemove || role === "pending"}- />- );- })();-- const deleteElement = (() => {- if (role === "owner") {- return (- <IconButton aria-label="Remove member" tabIndex={-1} disabled>- <TrashIcon />- </IconButton>- );- }-- if (props.canRemove) {- return (- <Tooltip- content={error ?? "Remove member"}- variant={error ? "wrapped" : undefined}- open={error ? true : undefined}- >- <IconButton- data-action- tabIndex={-1}- aria-label="Remove member"- onClick={() => {- if (role === "pending") {- props.onRemove();- return;- }- setError(undefined);- removeMutation.send(- {- workspaceId: props.workspaceId,- memberUserId: props.userId,- },- (result) => {- if (result && "error" in result) {- setError(result.error);- return;- }- props.onRefresh();- revalidator.revalidate();- }- );- }}- disabled={- role === "member" ? removeMutation.state !== "idle" : false- }- >- <TrashIcon />- </IconButton>- </Tooltip>- );- }-- return (- <IconButton- aria-label="Remove member"- tabIndex={-1}- disabled- css={{ visibility: "hidden" }}- >- <TrashIcon />- </IconButton>- );- })();-- return (- <ListItem index={index} asChild>- <Flex- align="center"- gap="2"- justify="between"- className={memberItemStyle()}- >- <Flex direction="column" css={{ minWidth: 0, flexGrow: 1 }}>- <Text truncate>{email}</Text>- </Flex>- <Flex align="center" gap="1" css={{ flexShrink: 0 }}>- {selectElement}- {deleteElement}- </Flex>- </Flex>- </ListItem>- );-};--const MemberList = ({- workspaceId,- canRemove,- refreshKey,- invitedEmails,- onRefresh,- onRemoveInvited,- onChangeInvitedRole,-}: {- workspaceId: string;- canRemove: boolean;- refreshKey: number;- invitedEmails: Map<string, { relation: Role; notificationId: string }>;- onRefresh: () => void;- onRemoveInvited: (email: string) => void;- onChangeInvitedRole: (email: string, relation: Role) => void;-}) => {- const { load, data } = trpcClient.workspace.listMembers.useQuery();-- useEffect(() => {- load({ workspaceId });- }, [load, workspaceId, refreshKey]);-- const result = data && "data" in data ? data.data : undefined;-- if (result === undefined) {- return (- <Text color="subtle" align="center">- Loading members…- </Text>- );- }-- const { owner, members } = result;-- // Show invited emails that aren't already in the real member list.- // This makes behavior identical for existing vs non-existing emails,- // preventing email enumeration.- const knownEmails = new Set(members.map((m) => m.email));- const pendingEntries = [...invitedEmails].filter(- ([email]) => knownEmails.has(email) === false- );-- let index = 0;-- return (- <List asChild>- <Box>- <MemberRow email={owner.email} role="owner" index={index++} />- {members.map((member) => (- <MemberRow- key={member.userId}- email={member.email ?? ""}- role="member"- userId={member.userId}- workspaceId={workspaceId}- relation={member.relation as Role}- canRemove={canRemove}- index={index++}- onRefresh={onRefresh}- />- ))}- {pendingEntries.map(([email, { relation }]) => (- <MemberRow- key={email}- email={email}- role="pending"- relation={relation}- canRemove={canRemove}- index={index++}- onRemove={() => onRemoveInvited(email)}- onChangeRole={(newRole) => onChangeInvitedRole(email, newRole)}- />- ))}- </Box>- </List>- );-};--export const RenameWorkspaceDialog = ({- workspace,- isOpen,- onOpenChange,-}: {- workspace: Workspace;- isOpen: boolean;- onOpenChange: (open: boolean) => void;-}) => {- const { send, state } = trpcClient.workspace.rename.useMutation();- const revalidator = useRevalidator();- const [errors, setErrors] = useState<string>();-- return (- <Dialog- open={isOpen}- onOpenChange={(open) => {- onOpenChange(open);- if (open === false) {- setErrors(undefined);- }- }}- >- <DialogContent>- <form- onSubmit={(event) => {- event.preventDefault();- const formData = new FormData(event.currentTarget);- const name = String(formData.get("name") ?? "").trim();-- if (name.length < 2) {- setErrors("Workspace name must be at least 2 characters");- return;- }-- setErrors(undefined);- send({ workspaceId: workspace.id, name }, (result) => {- if (result && "error" in result) {- setErrors(result.error);- return;- }- onOpenChange(false);- revalidator.revalidate();- });- }}- >- <Flex- direction="column"- css={{- px: theme.spacing[7],- paddingTop: theme.spacing[5],- }}- gap="1"- >- <Label>Workspace name</Label>- <InputField- name="name"- defaultValue={workspace.name}- color={errors ? "error" : undefined}- />- <Box css={{ minHeight: theme.spacing[10] }}>- {errors && <Text color="destructive">{errors}</Text>}- </Box>- </Flex>- <DialogActions>- <Button- type="submit"- state={state === "idle" ? undefined : "pending"}- >- Rename- </Button>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- </form>- <DialogTitle>Rename</DialogTitle>- </DialogContent>- </Dialog>- );-};--export const ManageMembersDialog = ({- workspace,- userId,- isOpen,- onOpenChange,-}: {- workspace: Workspace;- userId: string;- isOpen: boolean;- onOpenChange: (open: boolean) => void;-}) => {- const isOwner = workspace.userId === userId;- const revalidator = useRevalidator();- const [errors, setErrors] = useState<string[]>();- const [membersKey, setMembersKey] = useState(0);- const [inviting, setInviting] = useState(false);- const [inviteRelation, setInviteRelation] = useState<Role>("viewers");- const [invitedEmails, setInvitedEmails] = useState<- Map<string, { relation: Role; notificationId: string }>- >(new Map());- const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {- event.preventDefault();- const formData = new FormData(event.currentTarget);- const raw = String(formData.get("emails") ?? "").trim();-- const emails = raw- .split(",")- .map((e) => e.trim())- .filter(Boolean);-- if (emails.length === 0) {- return;- }-- setErrors(undefined);- setInviting(true);-- const failed: string[] = [];- const succeeded: { email: string; notificationId: string }[] = [];- for (const email of emails) {- try {- const result = await nativeClient.workspace.addMember.mutate({- workspaceId: workspace.id,- email,- relation: inviteRelation,- });- if (result.success) {- succeeded.push({ email, notificationId: result.notificationId });- } else {- failed.push(`${email}: ${result.error}`);- }- } catch (error) {- const message =- error instanceof Error ? error.message : "Unknown error";- failed.push(`${email}: ${message}`);- }- }-- setInviting(false);-- if (succeeded.length > 0) {- setInvitedEmails((prev) => {- const next = new Map(prev);- for (const { email, notificationId } of succeeded) {- next.set(email, { relation: inviteRelation, notificationId });- }- return next;- });- }-- if (failed.length > 0) {- setErrors(failed);- } else {- (event.target as HTMLFormElement).reset();- }-- setMembersKey((key) => key + 1);- revalidator.revalidate();- };-- return (- <Dialog- open={isOpen}- onOpenChange={(open) => {- onOpenChange(open);- if (open === false) {- setErrors(undefined);- }- }}- >- <DialogContent css={{ width: theme.spacing[34] }}>- <Flex as="form" direction="column" gap="3" onSubmit={handleSubmit}>- {isOwner && (- <Flex- gap="1"- direction="column"- css={{- px: theme.spacing[7],- paddingTop: theme.spacing[5],- }}- >- <Label>Invite members</Label>- <Flex gap="2">- <Box css={{ flexGrow: 1 }}>- <InputErrorsTooltip errors={errors}>- <InputField- name="emails"- placeholder="[email protected], [email protected]"- color={errors ? "error" : undefined}- />- </InputErrorsTooltip>- </Box>- <Select- options={[...roles]}- value={inviteRelation}- getLabel={(option: Role) => roleLabels[option]}- onChange={setInviteRelation}- />- <Button type="submit" state={inviting ? "pending" : undefined}>- Invite- </Button>- </Flex>- </Flex>- )}- <ScrollAreaNative- css={{- maxHeight: 300,- paddingTop: isOwner ? undefined : theme.spacing[5],- }}- >- <Flex direction="column" gap="2" css={{ px: theme.spacing[7] }}>- <Text variant="labels">Members</Text>- <MemberList- workspaceId={workspace.id}- canRemove={isOwner}- refreshKey={membersKey}- invitedEmails={invitedEmails}- onRefresh={() => setMembersKey((key) => key + 1)}- onRemoveInvited={(email) => {- const entry = invitedEmails.get(email);- if (entry) {- // Fire-and-forget: cancel the server-side notification.- // For fake IDs (non-existent users) this fails silently,- // preserving anti-enumeration.- nativeClient.notification.cancel- .mutate({ notificationId: entry.notificationId })- .catch(() => {});- }- setInvitedEmails((prev) => {- const next = new Map(prev);- next.delete(email);- return next;- });- }}- onChangeInvitedRole={(email, relation) => {- setInvitedEmails((prev) => {- const existing = prev.get(email);- if (existing === undefined) {- return prev;- }- const next = new Map(prev);- next.set(email, { ...existing, relation });- return next;- });- }}- />- </Flex>- </ScrollAreaNative>- </Flex>- <DialogActions>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- <DialogTitle>Members</DialogTitle>- </DialogContent>- </Dialog>- );-};--export const DeleteWorkspaceDialog = ({- workspace,- isOpen,- onOpenChange,- onDeleted,-}: {- workspace: Workspace;- isOpen: boolean;- onOpenChange: (open: boolean) => void;- onDeleted: () => void;-}) => {- const { send, state } = trpcClient.workspace.delete.useMutation();- const revalidator = useRevalidator();- const [error, setError] = useState<string>();-- if (workspace.isDefault) {- return;- }-- return (- <Dialog- open={isOpen}- onOpenChange={(open) => {- onOpenChange(open);- if (open === false) {- setError(undefined);- }- }}- >- <DialogContent>- <Flex- direction="column"- gap="2"- css={{- paddingInline: theme.spacing[9],- paddingTop: theme.spacing[5],- }}- >- <DialogDescription asChild>- <Text as="p">- Are you sure you want to delete{" "}- <Text as="span" variant="titles">- {workspace.name}- </Text>- ?{" "}- <Text as="span" color="destructive">- All projects- </Text>{" "}- in this workspace will be deleted. This action cannot be undone.- </Text>- </DialogDescription>- {error && <Text color="destructive">{error}</Text>}- </Flex>- <DialogActions>- <Button- color="destructive"- state={state === "idle" ? undefined : "pending"}- onClick={() => {- send(- { workspaceId: workspace.id, deleteProjects: true },- (result) => {- if (result && "error" in result) {- setError(result.error);- return;- }- onOpenChange(false);- onDeleted();- revalidator.revalidate();- }- );- }}- >- Delete forever- </Button>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- <DialogTitle>Delete workspace</DialogTitle>- </DialogContent>- </Dialog>- );-};--// ----------------------------------------------------------------------------// Leave workspace (non-owner members)-// -----------------------------------------------------------------------------export const LeaveWorkspaceDialog = ({- workspace,- userId,- isOpen,- onOpenChange,- onLeft,-}: {- workspace: Workspace;- userId: string;- isOpen: boolean;- onOpenChange: (open: boolean) => void;- onLeft: () => void;-}) => {- const { send, state } = trpcClient.workspace.removeMember.useMutation();- const revalidator = useRevalidator();- const [error, setError] = useState<string>();-- return (- <Dialog- open={isOpen}- onOpenChange={(open) => {- onOpenChange(open);- if (open === false) {- setError(undefined);- }- }}- >- <DialogContent>- <Flex- direction="column"- gap="2"- css={{- paddingInline: theme.spacing[9],- paddingTop: theme.spacing[5],- }}- >- <DialogDescription asChild>- <Text as="p">- Are you sure you want to leave{" "}- <Text as="span" variant="titles">- {workspace.name}- </Text>- ? You will lose access to all projects in this workspace.- </Text>- </DialogDescription>- {error && <Text color="destructive">{error}</Text>}- </Flex>- <DialogActions>- <Button- color="destructive"- state={state === "idle" ? undefined : "pending"}- onClick={() => {- send(- { workspaceId: workspace.id, memberUserId: userId },- (result) => {- if (result && "error" in result) {- setError(result.error);- return;- }- onOpenChange(false);- onLeft();- revalidator.revalidate();- }- );- }}- >- Leave- </Button>- <DialogClose>- <Button color="ghost">Cancel</Button>- </DialogClose>- </DialogActions>- <DialogTitle>Leave workspace</DialogTitle>- </DialogContent>- </Dialog>- );-};diff --git a/apps/builder/app/dashboard/workspace/create-workspace-dialog.tsx b/apps/builder/app/dashboard/workspace/create-workspace-dialog.tsxindex 3c313b9124..12d2ea2d3f 100644--- a/apps/builder/app/dashboard/workspace/create-workspace-dialog.tsx+++ b/apps/builder/app/dashboard/workspace/create-workspace-dialog.tsx@@ -84,6 +84,7 @@ export const CreateWorkspaceDialog = ({</Flex><DialogActions><Button+ color="primary"type="submit"state={state === "idle" ? undefined : "pending"}>diff --git a/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx b/apps/builder/app/dashboard/workspace/manage-members-dialog.tsxindex 8b38293d7d..2e6383c36e 100644--- a/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx+++ b/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx@@ -22,6 +22,7 @@ import {PanelBanner,css,theme,+ cssVar,} from "@webstudio-is/design-system";import { TrashIcon } from "@webstudio-is/icons";import { type Workspace, type Role } from "@webstudio-is/project";@@ -71,7 +72,7 @@ const memberItemStyle = css({borderRadius: theme.borderRadius[4],outline: "none","&:hover, &:focus-within": {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},"& [data-action]": {visibility: "hidden",@@ -396,12 +397,10 @@ const ExtraSeatsConfirmDialog = ({</Text></Flex><DialogActions>- <Button autoFocus onClick={onConfirm}>+ <Button color="primary" autoFocus onClick={onConfirm}>Confirm</Button>- <Button color="neutral" onClick={onCancel}>- Cancel- </Button>+ <Button onClick={onCancel}>Cancel</Button></DialogActions></DialogContent></Dialog>@@ -594,6 +593,7 @@ export const ManageMembersDialog = ({onChange={setInviteRelation}/><Button+ color="primary"type="submit"state={inviting ? "pending" : undefined}>@@ -606,11 +606,13 @@ export const ManageMembersDialog = ({<PanelBanner variant="warning"><Flex direction="column" gap="2"><Text>- {`Your workspace has ${overCapacity} more member${overCapacity === 1 ? "" : "s"} than your plan covers. Non-owner members won't be able to access the workspace until this is resolved.`}+ {`Your workspace has ${overCapacity} more member${+ overCapacity === 1 ? "" : "s"+ } than your plan covers. Non-owner members won't be able to access the workspace until this is resolved.`}</Text><Flex gap="2"><Button- color="dark"+ color="primary"onClick={handleSyncSeats}state={syncSeatsMutation.state !== "idle"@@ -618,10 +620,14 @@ export const ManageMembersDialog = ({: undefined}>- {`Buy ${overCapacity} extra seat${overCapacity === 1 ? "" : "s"}`}+ {`Buy ${overCapacity} extra seat${+ overCapacity === 1 ? "" : "s"+ }`}</Button><Text color="subtle" css={{ alignSelf: "center" }}>- {`or remove ${overCapacity} member${overCapacity === 1 ? "" : "s"}`}+ {`or remove ${overCapacity} member${+ overCapacity === 1 ? "" : "s"+ }`}</Text></Flex></Flex>@@ -656,7 +662,9 @@ export const ManageMembersDialog = ({<Text color={availableSeats <= 0 ? "destructive" : "subtle"}>{availableSeats >= 0? `${availableSeats} more seats included`- : `${-availableSeats} extra seat${-availableSeats === 1 ? "" : "s"} will be charged`}+ : `${-availableSeats} extra seat${+ -availableSeats === 1 ? "" : "s"+ } will be charged`}</Text>) : (<div />diff --git a/apps/builder/app/dashboard/workspace/rename-workspace-dialog.tsx b/apps/builder/app/dashboard/workspace/rename-workspace-dialog.tsxindex d3fcabe5e0..33c0ad4e4c 100644--- a/apps/builder/app/dashboard/workspace/rename-workspace-dialog.tsx+++ b/apps/builder/app/dashboard/workspace/rename-workspace-dialog.tsx@@ -83,6 +83,7 @@ export const RenameWorkspaceDialog = ({</Flex><DialogActions><Button+ color="primary"type="submit"state={state === "idle" ? undefined : "pending"}>diff --git a/apps/builder/app/dashboard/workspace/selector.test.ts b/apps/builder/app/dashboard/workspace/selector.test.tsdeleted file mode 100644index ba4abbad4e..0000000000--- a/apps/builder/app/dashboard/workspace/selector.test.ts+++ /dev/null@@ -1,189 +0,0 @@-import { describe, test, expect } from "vitest";-import { __testing__ } from "./selector";-import type { WorkspaceWithRelation } from "@webstudio-is/project";--const { sortWorkspaces, groupWorkspaces } = __testing__;--const createWorkspace = (- overrides: Partial<WorkspaceWithRelation>-): WorkspaceWithRelation => ({- id: "ws-1",- name: "Workspace",- isDefault: false,- isDeleted: false,- createdAt: "2024-01-01T00:00:00.000Z",- userId: "user-1",- role: "own",- isDowngraded: false,- ...overrides,-});--describe("sortWorkspaces", () => {- test("places default workspace first", () => {- const workspaces = [- createWorkspace({ id: "ws-2", name: "Zeta", isDefault: false }),- createWorkspace({ id: "ws-1", name: "Alpha", isDefault: true }),- createWorkspace({ id: "ws-3", name: "Beta", isDefault: false }),- ];-- const sorted = sortWorkspaces(workspaces);- expect(sorted.map((w) => w.name)).toEqual(["Alpha", "Beta", "Zeta"]);- expect(sorted[0].isDefault).toBe(true);- });-- test("sorts non-default workspaces alphabetically", () => {- const workspaces = [- createWorkspace({ id: "ws-3", name: "Zebra" }),- createWorkspace({ id: "ws-1", name: "Apple" }),- createWorkspace({ id: "ws-2", name: "Mango" }),- ];-- const sorted = sortWorkspaces(workspaces);- expect(sorted.map((w) => w.name)).toEqual(["Apple", "Mango", "Zebra"]);- });-- test("does not mutate the original array", () => {- const workspaces = [- createWorkspace({ id: "ws-2", name: "Beta" }),- createWorkspace({ id: "ws-1", name: "Alpha" }),- ];- const original = [...workspaces];-- sortWorkspaces(workspaces);- expect(workspaces.map((w) => w.name)).toEqual(original.map((w) => w.name));- });-- test("handles empty array", () => {- expect(sortWorkspaces([])).toEqual([]);- });-- test("handles single workspace", () => {- const workspaces = [createWorkspace({ name: "Only one" })];- const sorted = sortWorkspaces(workspaces);- expect(sorted).toHaveLength(1);- expect(sorted[0].name).toBe("Only one");- });-- test("handles multiple default workspaces from different users", () => {- // Edge case: list might contain defaults from different users- const workspaces = [- createWorkspace({- id: "ws-3",- name: "Charlie",- isDefault: false,- }),- createWorkspace({- id: "ws-1",- name: "Alice default",- isDefault: true,- userId: "user-1",- }),- createWorkspace({- id: "ws-2",- name: "Bob default",- isDefault: true,- userId: "user-2",- }),- ];-- const sorted = sortWorkspaces(workspaces);- // Both defaults come first (stable sort), then non-defaults- expect(sorted[2].name).toBe("Charlie");- expect(sorted[0].isDefault).toBe(true);- expect(sorted[1].isDefault).toBe(true);- });-});--describe("groupWorkspaces", () => {- test("separates owned and shared workspaces", () => {- const workspaces = [- createWorkspace({- id: "ws-1",- name: "My workspace",- isDefault: true,- role: "own",- }),- createWorkspace({- id: "ws-2",- name: "Team workspace",- userId: "other-user",- role: "editors",- }),- createWorkspace({- id: "ws-3",- name: "Client workspace",- role: "own",- }),- ];-- const { owned, shared } = groupWorkspaces(workspaces);- expect(owned.map((w) => w.name)).toEqual([- "My workspace",- "Client workspace",- ]);- expect(shared.map((w) => w.name)).toEqual(["Team workspace"]);- });-- test("returns empty shared when all workspaces are owned", () => {- const workspaces = [- createWorkspace({ id: "ws-1", name: "Alpha", role: "own" }),- createWorkspace({ id: "ws-2", name: "Beta", role: "own" }),- ];-- const { owned, shared } = groupWorkspaces(workspaces);- expect(owned).toHaveLength(2);- expect(shared).toHaveLength(0);- });-- test("returns empty owned when all workspaces are shared", () => {- const workspaces = [- createWorkspace({- id: "ws-1",- name: "Shared A",- userId: "other",- role: "viewers",- }),- ];-- const { owned, shared } = groupWorkspaces(workspaces);- expect(owned).toHaveLength(0);- expect(shared).toHaveLength(1);- });-- test("sorts within each group", () => {- const workspaces = [- createWorkspace({- id: "ws-3",- name: "Zebra",- role: "own",- }),- createWorkspace({- id: "ws-2",- name: "Apple",- role: "own",- }),- createWorkspace({- id: "ws-4",- name: "Mango shared",- userId: "other",- role: "editors",- }),- createWorkspace({- id: "ws-5",- name: "Alpha shared",- userId: "other",- role: "viewers",- }),- ];-- const { owned, shared } = groupWorkspaces(workspaces);- expect(owned.map((w) => w.name)).toEqual(["Apple", "Zebra"]);- expect(shared.map((w) => w.name)).toEqual(["Alpha shared", "Mango shared"]);- });-- test("handles empty array", () => {- const { owned, shared } = groupWorkspaces([]);- expect(owned).toEqual([]);- expect(shared).toEqual([]);- });-});diff --git a/apps/builder/app/dashboard/workspace/selector.tsx b/apps/builder/app/dashboard/workspace/selector.tsxdeleted file mode 100644index ab35949711..0000000000--- a/apps/builder/app/dashboard/workspace/selector.tsx+++ /dev/null@@ -1,291 +0,0 @@-import { useState } from "react";-import type { ComponentProps, ReactNode } from "react";-import {- Avatar,- Button,- DropdownMenu,- DropdownMenuTrigger,- DropdownMenuContent,- DropdownMenuRadioGroup,- DropdownMenuRadioItem,- DropdownMenuLabel,- DropdownMenuGroup,- MenuCheckedIcon,- DropdownMenuSeparator,- DropdownMenuItem,- Flex,- theme,- Text,- ProChip,-} from "@webstudio-is/design-system";-import { ChevronDownIcon, UpgradeIcon } from "@webstudio-is/icons";-import type { WorkspaceWithRelation } from "@webstudio-is/project";-import { useNavigate, useLocation } from "@remix-run/react";-import { useStore } from "@nanostores/react";-import { $permissions } from "~/shared/nano-states";-import { CreateWorkspaceDialog } from "./create-workspace-dialog";-import { RenameWorkspaceDialog } from "./rename-workspace-dialog";-import { ManageMembersDialog } from "./manage-members-dialog";-import { DeleteWorkspaceDialog } from "./delete-workspace-dialog";-import { LeaveWorkspaceDialog } from "./leave-workspace-dialog";--export type WorkspaceDropdownItem = {- id: string;- name: string;- disabled?: boolean;- suffix?: ReactNode;-};--export type WorkspaceDropdownGroup = {- label: string;- items: Array<WorkspaceDropdownItem>;-};--export const WorkspaceDropdown = ({- groups,- selectedId,- onSelectedChange,- color,- children,-}: {- groups: Array<WorkspaceDropdownGroup>;- selectedId: string | undefined;- onSelectedChange: (id: string) => void;- color?: ComponentProps<typeof Button>["color"];- children?: ReactNode;-}) => {- const selectedItem = groups- .flatMap((group) => group.items)- .find((item) => item.id === selectedId);-- const triggerLabel = selectedItem?.name ?? "Select workspace";-- return (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button- color={color}- prefix={- <Avatar- size="small"- fallback={triggerLabel.charAt(0).toLocaleUpperCase()}- alt={triggerLabel}- css={{ borderRadius: theme.borderRadius[4] }}- />- }- suffix={<ChevronDownIcon />}- >- {triggerLabel}- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="start">- <DropdownMenuRadioGroup- value={selectedId ?? ""}- onValueChange={onSelectedChange}- >- {groups.map((group) => (- <DropdownMenuGroup key={group.label}>- <DropdownMenuLabel>{group.label}</DropdownMenuLabel>- {group.items.map((item) => (- <DropdownMenuRadioItem- key={item.id}- value={item.id}- icon={<MenuCheckedIcon />}- disabled={item.disabled}- >- {item.name}- {item.suffix}- </DropdownMenuRadioItem>- ))}- </DropdownMenuGroup>- ))}- </DropdownMenuRadioGroup>- {children}- </DropdownMenuContent>- </DropdownMenu>- );-};--const sortWorkspaces = (workspaces: Array<WorkspaceWithRelation>) =>- [...workspaces].sort((a, b) => {- if (a.isDefault) {- return -1;- }- if (b.isDefault) {- return 1;- }- return a.name.localeCompare(b.name);- });--const groupWorkspaces = (workspaces: Array<WorkspaceWithRelation>) => {- const sorted = sortWorkspaces(workspaces);- const owned: Array<WorkspaceWithRelation> = [];- const shared: Array<WorkspaceWithRelation> = [];- for (const workspace of sorted) {- if (workspace.role === "own") {- owned.push(workspace);- } else {- shared.push(workspace);- }- }- return { owned, shared };-};--export const __testing__ = { sortWorkspaces, groupWorkspaces };--export const WorkspaceSelector = ({- workspaces,- currentWorkspaceId,- userId,- onDeleted,-}: {- workspaces: Array<WorkspaceWithRelation>;- currentWorkspaceId: string;- userId: string;- onDeleted: () => void;-}) => {- const navigate = useNavigate();- const location = useLocation();- const permissions = useStore($permissions);- const { owned, shared } = groupWorkspaces(workspaces);- const currentWorkspace = workspaces.find((w) => w.id === currentWorkspaceId);- const [createOpen, setCreateOpen] = useState(false);- const [renameOpen, setRenameOpen] = useState(false);- const [inviteOpen, setInviteOpen] = useState(false);- const [deleteOpen, setDeleteOpen] = useState(false);- const [leaveOpen, setLeaveOpen] = useState(false);-- const isOwner = currentWorkspace?.userId === userId;-- const toDropdownItem = (workspace: WorkspaceWithRelation) => ({- id: workspace.id,- name: workspace.name,- disabled: workspace.isDowngraded,- suffix: workspace.isDowngraded ? (- <>- {" "}- <ProChip>Suspended</ProChip>- </>- ) : undefined,- });-- const groups: Array<WorkspaceDropdownGroup> = [- { label: "My workspaces", items: owned.map(toDropdownItem) },- ...(shared.length > 0- ? [{ label: "Shared with me", items: shared.map(toDropdownItem) }]- : []),- ];-- const handleWorkspaceChange = (workspaceId: string) => {- const defaultWorkspace = workspaces.find((w) => w.isDefault);-- if (workspaceId === defaultWorkspace?.id) {- navigate(location.pathname);- return;- }-- navigate(`${location.pathname}?workspaceId=${workspaceId}`);- };-- return (- <Flex- grow- css={{- paddingBlock: theme.spacing[5],- minWidth: 0,- }}- >- <WorkspaceDropdown- groups={groups}- selectedId={currentWorkspaceId}- onSelectedChange={handleWorkspaceChange}- color="ghost"- >- <DropdownMenuSeparator />- {permissions.canCreateWorkspace && (- <DropdownMenuItem withIndicator onSelect={() => setCreateOpen(true)}>- Create new- </DropdownMenuItem>- )}- <DropdownMenuItem- withIndicator- disabled={currentWorkspace?.userId !== userId}- onSelect={() => setRenameOpen(true)}- >- Rename- </DropdownMenuItem>- <DropdownMenuItem- withIndicator- disabled={permissions.canInviteMembers === false}- onSelect={() => setInviteOpen(true)}- >- Members- </DropdownMenuItem>- {isOwner ? (- <DropdownMenuItem- withIndicator- disabled={currentWorkspace?.isDefault === true}- onSelect={() => setDeleteOpen(true)}- >- Delete- </DropdownMenuItem>- ) : (- <DropdownMenuItem withIndicator onSelect={() => setLeaveOpen(true)}>- Leave- </DropdownMenuItem>- )}- {permissions.canCreateWorkspace === false && (- <>- <DropdownMenuSeparator />- <DropdownMenuItem- onSelect={() => {- window.open("https://webstudio.is/pricing");- }}- >- <Flex align="center" gap="1">- <UpgradeIcon />- <Text truncate>Upgrade</Text>- </Flex>- </DropdownMenuItem>- </>- )}- </WorkspaceDropdown>- <CreateWorkspaceDialog- isOpen={createOpen}- onOpenChange={setCreateOpen}- onCreated={(workspaceId) => {- navigate(`${location.pathname}?workspaceId=${workspaceId}`);- }}- />- {currentWorkspace && (- <>- <RenameWorkspaceDialog- workspace={currentWorkspace}- isOpen={renameOpen}- onOpenChange={setRenameOpen}- />- <ManageMembersDialog- key={currentWorkspace.id}- workspace={currentWorkspace}- userId={userId}- isOpen={inviteOpen}- onOpenChange={setInviteOpen}- />- <DeleteWorkspaceDialog- workspace={currentWorkspace}- isOpen={deleteOpen}- onOpenChange={setDeleteOpen}- onDeleted={onDeleted}- />- <LeaveWorkspaceDialog- workspace={currentWorkspace}- userId={userId}- isOpen={leaveOpen}- onOpenChange={setLeaveOpen}- onLeft={onDeleted}- />- </>- )}- </Flex>- );-};diff --git a/apps/builder/app/dashboard/workspace/transfer-project-dialog.tsx b/apps/builder/app/dashboard/workspace/transfer-project-dialog.tsxindex 0e5b446378..63a938bf94 100644--- a/apps/builder/app/dashboard/workspace/transfer-project-dialog.tsx+++ b/apps/builder/app/dashboard/workspace/transfer-project-dialog.tsx@@ -15,6 +15,7 @@ import {css,theme,toast,+ cssVar,} from "@webstudio-is/design-system";import { useStore } from "@nanostores/react";import { $workspaces, $user } from "~/shared/nano-states";@@ -35,7 +36,7 @@ const orSeparatorStyle = css({content: "''",flexGrow: 1,height: theme.spacing[1],- backgroundColor: theme.colors.borderMain,+ backgroundColor: cssVar("--border-default"),},});@@ -308,6 +309,7 @@ export const TransferProjectDialog = ({<DialogTitle>Transfer project</DialogTitle><DialogActions><Button+ color="primary"disabled={canSubmit === false}state={isSubmitting ? "pending" : undefined}onClick={handleSubmit}diff --git a/apps/builder/app/routes/_ui.$.tsx b/apps/builder/app/routes/_ui.$.tsxindex ac92fd860b..12b3807c63 100644--- a/apps/builder/app/routes/_ui.$.tsx+++ b/apps/builder/app/routes/_ui.$.tsx@@ -49,7 +49,7 @@ export default function NotFound() {// Without this, an <Outlet /> with a null value would render an empty page.return (<div>- <h1>Not Found</h1>+ <h1>Not found</h1><p>The page you requested could not be found.</p></div>);diff --git a/apps/builder/app/routes/_ui.error.tsx b/apps/builder/app/routes/_ui.error.tsxindex b942548471..34222505ca 100644--- a/apps/builder/app/routes/_ui.error.tsx+++ b/apps/builder/app/routes/_ui.error.tsx@@ -17,7 +17,7 @@ const sessionError = z.object({export const meta: MetaFunction<typeof loader> = () => {const metas: ReturnType<MetaFunction> = [];- metas.push({ title: "Webstudio Error" });+ metas.push({ title: "Webstudio error" });return metas;};diff --git a/apps/builder/app/routes/_ui.login._index.tsx b/apps/builder/app/routes/_ui.login._index.tsxindex f90ed4e4b3..2f9ecf3030 100644--- a/apps/builder/app/routes/_ui.login._index.tsx+++ b/apps/builder/app/routes/_ui.login._index.tsx@@ -37,7 +37,7 @@ export const meta: MetaFunction<typeof loader> = () => {const metas: ReturnType<MetaFunction> = [{name: "title",- content: "Webstudio Login",+ content: "Webstudio login",},{name: "description",@@ -46,7 +46,7 @@ export const meta: MetaFunction<typeof loader> = () => {{ name: "robots", content: "index, follow" },];- metas.push({ title: "Webstudio Login" });+ metas.push({ title: "Webstudio login" });return metas;};diff --git a/apps/builder/app/routes/_ui.logout.tsx b/apps/builder/app/routes/_ui.logout.tsxindex 9010b0642d..7e44010708 100644--- a/apps/builder/app/routes/_ui.logout.tsx+++ b/apps/builder/app/routes/_ui.logout.tsx@@ -20,7 +20,7 @@ const debug = createDebug(import.meta.url);export const meta: MetaFunction<typeof loader> = () => {const metas: ReturnType<MetaFunction> = [];- metas.push({ title: "Webstudio Logout" });+ metas.push({ title: "Webstudio logout" });return metas;};diff --git a/apps/builder/app/routes/_ui.tsx b/apps/builder/app/routes/_ui.tsxindex 3fc1a6e906..5ed6ebe068 100644--- a/apps/builder/app/routes/_ui.tsx+++ b/apps/builder/app/routes/_ui.tsx@@ -4,12 +4,14 @@ import {Outlet,Scripts,ScrollRestoration,+ useLoaderData,type ClientLoaderFunctionArgs,type ShouldRevalidateFunction,} from "@remix-run/react";import interFont from "@fontsource-variable/inter/index.css?url";import manropeVariableFont from "@fontsource-variable/manrope/index.css?url";import robotoMonoFont from "@fontsource/roboto-mono/index.css?url";+import designSystemColors from "@webstudio-is/design-system/colors.css?url";import appCss from "../shared/app.css?url";import {json,@@ -27,6 +29,12 @@ import {createPrivateNoStoreHeaders,privateNoStoreResponseHeaders,} from "~/services/cache-control.server";+import { ColorSchemeController } from "~/shared/color-scheme-controller";+import {+ createColorSchemeBootstrapScript,+ parseColorSchemeCookie,+ type ColorSchemePreference,+} from "~/shared/color-scheme";export const links: LinksFunction = () => {// `links` returns an array of objects whose@@ -35,20 +43,30 @@ export const links: LinksFunction = () => {{ rel: "stylesheet", href: interFont },{ rel: "stylesheet", href: manropeVariableFont },{ rel: "stylesheet", href: robotoMonoFont },+ { rel: "stylesheet", href: designSystemColors },{ rel: "stylesheet", href: appCss },];};-const Document = (props: { children: React.ReactNode }) => {+const Document = (props: {+ children: React.ReactNode;+ colorScheme?: ColorSchemePreference;+}) => {return (- <html lang="en">+ <html lang="en" suppressHydrationWarning><head><meta charSet="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />+ <script+ dangerouslySetInnerHTML={{+ __html: createColorSchemeBootstrapScript(props.colorScheme),+ }}+ /><Meta /><Links /></head><body>+ <ColorSchemeController />{props.children}<ScrollRestoration /><Scripts />@@ -61,7 +79,13 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {const [csrfToken, setCookieValue] = await getCsrfTokenAndCookie(request);if (request.headers.get("sec-fetch-mode") !== "navigate") {- return json({ csrfToken: "" }, { headers: privateNoStoreResponseHeaders });+ return json(+ {+ csrfToken: "",+ colorScheme: parseColorSchemeCookie(request.headers.get("Cookie")),+ },+ { headers: privateNoStoreResponseHeaders }+ );}const headers = createPrivateNoStoreHeaders();@@ -71,7 +95,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {}return json(- { csrfToken },+ {+ csrfToken,+ colorScheme: parseColorSchemeCookie(request.headers.get("Cookie")),+ },{headers,}@@ -105,8 +132,9 @@ export const ErrorBoundary = () => {};export default function Layout() {+ const { colorScheme } = useLoaderData<typeof loader>();return (- <Document>+ <Document colorScheme={colorScheme}><Outlet /></Document>);diff --git a/apps/builder/app/shared/brand-colors.ts b/apps/builder/app/shared/brand-colors.tsnew file mode 100644index 0000000000..4d457b366b--- /dev/null+++ b/apps/builder/app/shared/brand-colors.ts@@ -0,0 +1,13 @@+// Webstudio identity artwork is intentionally fixed and is not part of the+// user-selectable application theme.+export const brandColors = {+ dashboard:+ "radial-gradient(65.88% 47.48% at 50% 50%, #fff 0%, #fff0 100%), linear-gradient(0deg, #fff0 49.46%, #ffffff54 100%), linear-gradient(180deg, #ffae3c00 0%, #e63cfe54 100%), radial-gradient(211.58% 161.63% at 3.13% 100%, #ffae3c4d 0%, #e335ff00 100%), radial-gradient(107.1% 32.15% at 92.96% 5.04%, #35ffb633 0%, #4a4efa33 100%), #ebfffc",+ foreground: "#000",+ panel: "#fff",+ panelTranslucent: "rgba(255, 255, 255, 0.5)",+ scrim: "#0000004d",+ progress:+ "linear-gradient(90deg, #39fbbb00 0%, #39fbbb 20%, #4a4efa 40.03%, #e63cfe 60.02%, #ffae3c 80.04%, #ffae3c00 100%)",+ progressGlow: "0 0 32px #4a4efa80",+} as const;diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsxindex 061b919831..f3e632cf88 100644--- a/apps/builder/app/shared/clone-project.tsx+++ b/apps/builder/app/shared/clone-project.tsx@@ -102,7 +102,7 @@ const CloneProjectView = ({}}gap="1">- <Label>Project Title</Label>+ <Label>Project title</Label><InputFieldname="title"defaultValue={title}@@ -114,6 +114,7 @@ const CloneProjectView = ({</Flex><DialogActions><Button+ color="primary"type="submit"state={state === "idle" ? undefined : "pending"}>diff --git a/apps/builder/app/shared/code-editor-base.tsx b/apps/builder/app/shared/code-editor-base.tsxindex 2e4b5dbf05..fa76b89a71 100644--- a/apps/builder/app/shared/code-editor-base.tsx+++ b/apps/builder/app/shared/code-editor-base.tsx@@ -31,6 +31,8 @@ import {theme,textVariants,css,+ cssVar,+ declareCssVar,SmallIconButton,Grid,Flex,@@ -42,7 +44,7 @@ import {} from "@webstudio-is/design-system";import { MaximizeIcon } from "@webstudio-is/icons";import { ChevronDownIcon, ChevronRightIcon } from "@webstudio-is/icons/svg";-import { solarizedLight } from "./code-highlight";+import { codeHighlightStyle } from "./code-highlight";// This undocumented flag is required to keep contenteditable fields editable after the first activation of EditorView.// To reproduce the issue, open any Binding dialog and then try to edit a Navigation Item in the Navigation menu.@@ -52,9 +54,11 @@ EditorView.EDIT_CONTEXT = false;const ExternalChange = Annotation.define<boolean>();-const minHeightVar = "--ws-code-editor-min-height";-const maxHeightVar = "--ws-code-editor-max-height";-const maximizeIconVisibilityVar = "--ws-code-editor-maximize-icon-visibility";+const minHeightVar = declareCssVar("--code-editor-min-height");+const maxHeightVar = declareCssVar("--code-editor-max-height");+const maximizeIconVisibilityVar = declareCssVar(+ "--code-editor-maximize-icon-visibility"+);export const clampEditorSelection = (selection: EditorSelection,@@ -97,10 +101,10 @@ const editorContentStyle = css({position: "relative",minHeight: 0,boxSizing: "border-box",- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),borderRadius: theme.borderRadius[4],border: `1px solid transparent`,- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),paddingTop: 4,paddingBottom: 2,paddingRight: theme.spacing[2],@@ -108,10 +112,10 @@ const editorContentStyle = css({// required to support copying selected textuserSelect: "text","&:hover": {- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),},"&:focus-within": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},'&[data-chromeless="true"]': {borderRadius: 0,@@ -121,12 +125,18 @@ const editorContentStyle = css({borderColor: "transparent",},'&[data-invalid="true"]': {- borderColor: theme.colors.borderDestructiveMain,- outlineColor: theme.colors.borderDestructiveMain,+ borderColor: cssVar("--border-negative"),+ outlineColor: cssVar("--border-negative"),},"& .cm-focused": {outline: "none",},+ "& .cm-cursor, & .cm-dropCursor": {+ borderLeftColor: "currentColor",+ },+ "& .cm-activeLine": {+ backgroundColor: cssVar("--overlay-interaction-hover"),+ },// fix scrolls appear on mount"& .cm-scroller": {overflowX: "hidden",@@ -143,16 +153,16 @@ const editorContentStyle = css({width: "100%",// avoid modifying height in .cm-content// because it breaks scroll events and makes scrolling laggy- minHeight: `var(${minHeightVar}, auto)`,- maxHeight: `var(${maxHeightVar}, none)`,+ minHeight: cssVar(minHeightVar, "auto"),+ maxHeight: cssVar(maxHeightVar, "none"),},".cm-lintRange-error": {- textDecoration: "underline wavy red",- backgroundColor: "rgba(255, 0, 0, 0.1)",+ textDecoration: `underline wavy ${cssVar("--foreground-negative")}`,+ backgroundColor: cssVar("--background-negative-subtle"),},".cm-lintRange-warning": {- textDecoration: "underline wavy orange",- backgroundColor: "rgba(255, 0, 0, 0.1)",+ textDecoration: `underline wavy ${cssVar("--foreground-warning")}`,+ backgroundColor: cssVar("--background-warning-subtle"),},".cm-gutters": {backgroundColor: "transparent",@@ -166,7 +176,7 @@ const shortcutStyle = css({bottom: 0,width: "100%",paddingInline: theme.spacing[3],- background: "oklch(100% 0 0 / 50%)",+ background: `oklch(from ${cssVar("--background-primary")} l c h / 50%)`,zIndex: 1,pointerEvents: "none",});@@ -185,9 +195,11 @@ const autocompletionTooltipTheme = EditorView.theme({width: "max-content",boxSizing: "border-box",borderRadius: rawTheme.borderRadius[6],- backgroundColor: rawTheme.colors.backgroundMenu,- border: `1px solid ${rawTheme.colors.borderMain}`,- boxShadow: `${rawTheme.shadows.menuDropShadow}, inset 0 0 0 1px ${rawTheme.colors.borderMenuInner}`,+ backgroundColor: cssVar("--background-primary"),+ border: `1px solid ${cssVar("--border-default")}`,+ boxShadow: `${rawTheme.shadows.menuDropShadow}, inset 0 0 0 1px ${cssVar(+ "--border-default"+ )}`,padding: rawTheme.spacing[3],},".cm-tooltip.cm-tooltip-autocomplete ul li": {@@ -196,14 +208,14 @@ const autocompletionTooltipTheme = EditorView.theme({position: "relative",display: "flex",alignItems: "center",- color: rawTheme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),padding: rawTheme.spacing[3],borderRadius: rawTheme.borderRadius[3],},".cm-tooltip.cm-tooltip-autocomplete li[aria-selected], .cm-tooltip.cm-tooltip-autocomplete li:hover":{- color: rawTheme.colors.foregroundMain,- backgroundColor: rawTheme.colors.backgroundItemMenuItemHover,+ color: cssVar("--foreground-primary"),+ backgroundColor: cssVar("--overlay-interaction-hover"),},".cm-tooltip.cm-tooltip-autocomplete .cm-completionLabel": {flexGrow: 1,@@ -212,7 +224,7 @@ const autocompletionTooltipTheme = EditorView.theme({overflow: "hidden",textOverflow: "ellipsis",fontStyle: "normal",- color: rawTheme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),},});@@ -245,8 +257,8 @@ export const linterTooltipTheme = EditorView.theme({pointerEvents: "none",},".cm-tooltip-lint": {- backgroundColor: rawTheme.colors.backgroundTooltipMain,- color: rawTheme.colors.foregroundContrastMain,+ backgroundColor: cssVar("--background-inverse"),+ color: cssVar("--foreground-on-inverse"),borderRadius: rawTheme.borderRadius[7],padding: rawTheme.spacing[5],},@@ -392,7 +404,7 @@ export const EditorContent = ({history(),drawSelection(),dropCursor(),- syntaxHighlighting(solarizedLight, { fallback: true }),+ syntaxHighlighting(codeHighlightStyle, { fallback: true }),keymap.of([...keyBindings,{@@ -536,8 +548,10 @@ export const EditorDialogButton = forwardRef<position: "absolute",top: 4,right: 4,- visibility: `var(${maximizeIconVisibilityVar}, hidden)`,- background: "oklch(100% 0 0 / 50%)",+ visibility: cssVar(maximizeIconVisibilityVar, "hidden"),+ background: `color-mix(in oklab, ${cssVar(+ "--background-primary"+ )} 50%, transparent)`,}}/>);diff --git a/apps/builder/app/shared/code-highlight.ts b/apps/builder/app/shared/code-highlight.tsindex e9722f7c9e..f7ea94c487 100644--- a/apps/builder/app/shared/code-highlight.ts+++ b/apps/builder/app/shared/code-highlight.ts@@ -1,75 +1,92 @@import { HighlightStyle } from "@codemirror/language";import { highlightCode, tags } from "@lezer/highlight";import { parser } from "@lezer/css";+import { cssVar } from "@webstudio-is/design-system";-// inspired by https://thememirror.net/solarized-light-export const solarizedLight = HighlightStyle.define([+// Syntax categories are a visualization layer. Compose them from the shared+// semantic palette so they adapt to both schemes without adding theme knobs.+const syntaxColor = (hueRotation: number) =>+ `color-mix(+ in oklab,+ color(+ from oklch(from ${cssVar("--foreground-accent")} l c calc(h + ${hueRotation}))+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ ) 80%,+ ${cssVar("--foreground-primary")}+ )`;++const syntaxGreen = syntaxColor(-120);+const syntaxRed = syntaxColor(125);+const syntaxYellow = syntaxColor(-155);+const syntaxPurple = syntaxColor(55);++export const codeHighlightStyle = HighlightStyle.define([{tag: tags.comment,- color: "#93A1A1",+ color: cssVar("--foreground-secondary"),},{tag: tags.string,- color: "#2AA198",+ color: syntaxGreen,},{tag: tags.regexp,- color: "#D30102",+ color: syntaxRed,},{tag: tags.number,- color: "#D33682",+ color: syntaxPurple,},{tag: tags.variableName,- color: "#268BD2",+ color: cssVar("--foreground-accent"),},{tag: [tags.keyword, tags.operator, tags.punctuation],- color: "#859900",+ color: syntaxGreen,},{tag: [tags.definitionKeyword, tags.modifier],- color: "#073642",+ color: cssVar("--foreground-primary"),},{tag: [tags.self, tags.definition(tags.propertyName)],- color: "#268BD2",+ color: cssVar("--foreground-accent"),},{tag: tags.function(tags.variableName),- color: "#268BD2",+ color: cssVar("--foreground-accent"),},{tag: [tags.bool, tags.null],- color: "#B58900",+ color: syntaxYellow,},{tag: tags.tagName,- color: "#268BD2",+ color: cssVar("--foreground-accent"),},{tag: tags.angleBracket,- color: "#93A1A1",+ color: cssVar("--foreground-secondary"),},{tag: tags.attributeName,- color: "#93A1A1",+ color: cssVar("--foreground-secondary"),},{tag: tags.typeName,- color: "#859900",+ color: syntaxGreen,},]);export const highlightCss = (code: string) => {- const styles = solarizedLight.module?.getRules();+ const styles = codeHighlightStyle.module?.getRules();// generated classes are scoped to parentlet highlightedCode = `<style>@scope {${styles}}</style>`;highlightCode(code,parser.parse(code),- solarizedLight,+ codeHighlightStyle,(text, classes) => {if (classes) {highlightedCode += `<span class="${classes}">${text}</span>`;diff --git a/apps/builder/app/shared/color-scheme-controller.tsx b/apps/builder/app/shared/color-scheme-controller.tsxnew file mode 100644index 0000000000..13364b028f--- /dev/null+++ b/apps/builder/app/shared/color-scheme-controller.tsx@@ -0,0 +1,66 @@+import { useStore } from "@nanostores/react";+import { useEffect } from "react";+import {+ $settings,+ synchronizeColorScheme,+} from "~/builder/shared/client-settings";+import { getAuthorizationServerOrigin } from "./router-utils/origins";+import {+ applyColorScheme,+ colorSchemeMediaQuery,+ serializeColorSchemeCookie,+} from "./color-scheme";++export const ColorSchemeController = () => {+ const { colorScheme: preference } = useStore($settings);++ useEffect(() => {+ const mediaQuery = window.matchMedia(colorSchemeMediaQuery);+ const cookieDomain = new URL(+ getAuthorizationServerOrigin(window.location.origin)+ ).hostname;+ const updateColorScheme = () => {+ applyColorScheme({+ preference,+ prefersDark: mediaQuery.matches,+ root: document.documentElement,+ });+ };++ document.cookie = serializeColorSchemeCookie({+ preference,+ domain: cookieDomain,+ secure: window.location.protocol === "https:",+ });+ updateColorScheme();++ if (preference !== "system") {+ return;+ }++ mediaQuery.addEventListener("change", updateColorScheme);+ return () => {+ mediaQuery.removeEventListener("change", updateColorScheme);+ };+ }, [preference]);++ useEffect(() => {+ const synchronizeVisibleDocument = () => {+ if (document.visibilityState === "visible") {+ synchronizeColorScheme();+ }+ };++ window.addEventListener("focus", synchronizeColorScheme);+ document.addEventListener("visibilitychange", synchronizeVisibleDocument);+ return () => {+ window.removeEventListener("focus", synchronizeColorScheme);+ document.removeEventListener(+ "visibilitychange",+ synchronizeVisibleDocument+ );+ };+ }, []);++ return null;+};diff --git a/apps/builder/app/shared/color-scheme-menu.tsx b/apps/builder/app/shared/color-scheme-menu.tsxnew file mode 100644index 0000000000..467fdf2b9b--- /dev/null+++ b/apps/builder/app/shared/color-scheme-menu.tsx@@ -0,0 +1,53 @@+import { useStore } from "@nanostores/react";+import {+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ MenuCheckedIcon,+} from "@webstudio-is/design-system";+import { $settings, setSetting } from "~/builder/shared/client-settings";++const colorSchemeOptions = [+ { value: "system", label: "System" },+ { value: "light", label: "Light" },+ { value: "dark", label: "Dark" },+] as const;++export const ColorSchemeMenu = ({+ withIndicator = false,+}: {+ withIndicator?: boolean;+}) => {+ const { colorScheme } = useStore($settings);++ return (+ <DropdownMenuSub>+ <DropdownMenuSubTrigger withIndicator={withIndicator}>+ Theme+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent width="regular">+ <DropdownMenuRadioGroup+ value={colorScheme}+ onValueChange={(value) => {+ setSetting(+ "colorScheme",+ value as (typeof colorSchemeOptions)[number]["value"]+ );+ }}+ >+ {colorSchemeOptions.map(({ value, label }) => (+ <DropdownMenuRadioItem+ key={value}+ value={value}+ icon={<MenuCheckedIcon />}+ >+ {label}+ </DropdownMenuRadioItem>+ ))}+ </DropdownMenuRadioGroup>+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ );+};diff --git a/apps/builder/app/shared/color-scheme.test.ts b/apps/builder/app/shared/color-scheme.test.tsnew file mode 100644index 0000000000..7169cf1bf8--- /dev/null+++ b/apps/builder/app/shared/color-scheme.test.ts@@ -0,0 +1,163 @@+import { describe, expect, test, vi } from "vitest";+import {+ applyColorScheme,+ colorSchemeCookieName,+ createColorSchemeBootstrapScript,+ clientSettingsStorageKey,+ initializeStoredColorScheme,+ parseColorSchemeCookie,+ serializeColorSchemeCookie,+} from "./color-scheme";++describe("applyColorScheme", () => {+ test.each([+ { preference: "light", prefersDark: false, expected: "light" },+ { preference: "light", prefersDark: true, expected: "light" },+ { preference: "dark", prefersDark: false, expected: "dark" },+ { preference: "dark", prefersDark: true, expected: "dark" },+ { preference: "system", prefersDark: false, expected: "light" },+ { preference: "system", prefersDark: true, expected: "dark" },+ ] as const)(+ "applies $expected for $preference when prefersDark is $prefersDark",+ ({ preference, prefersDark, expected }) => {+ const root = document.createElement("html");++ applyColorScheme({ preference, prefersDark, root });++ expect(root.dataset.colorScheme).toBe(expected);+ }+ );+});++describe("initializeStoredColorScheme", () => {+ test("prefers the shared cookie over origin-local settings", () => {+ const root = document.createElement("html");+ const storage = {+ getItem: vi.fn(() => JSON.stringify({ colorScheme: "light" })),+ };++ initializeStoredColorScheme({+ root,+ storage,+ storageKey: clientSettingsStorageKey,+ storedPreference: "dark",+ prefersDark: false,+ });++ expect(root.dataset.colorScheme).toBe("dark");+ });++ test("applies the stored preference before the application renders", () => {+ const root = document.createElement("html");+ const storage = {+ getItem: vi.fn(() => JSON.stringify({ colorScheme: "dark" })),+ };++ initializeStoredColorScheme({+ root,+ storage,+ storageKey: clientSettingsStorageKey,+ prefersDark: false,+ });++ expect(root.dataset.colorScheme).toBe("dark");+ });++ test("falls back to the system scheme when storage is unavailable or invalid", () => {+ const unavailableRoot = document.createElement("html");+ const unavailableStorage = {+ getItem: vi.fn(() => {+ throw new Error("Storage unavailable");+ }),+ };++ initializeStoredColorScheme({+ root: unavailableRoot,+ storage: unavailableStorage,+ storageKey: clientSettingsStorageKey,+ prefersDark: true,+ });++ expect(unavailableRoot.dataset.colorScheme).toBe("dark");++ const invalidRoot = document.createElement("html");+ const invalidStorage = {+ getItem: vi.fn(() => JSON.stringify({ colorScheme: "sepia" })),+ };++ initializeStoredColorScheme({+ root: invalidRoot,+ storage: invalidStorage,+ storageKey: clientSettingsStorageKey,+ prefersDark: true,+ });++ expect(invalidRoot.dataset.colorScheme).toBe("dark");+ });++ test("resolves a stored system preference from the operating system", () => {+ const root = document.createElement("html");+ const storage = {+ getItem: vi.fn(() => JSON.stringify({ colorScheme: "system" })),+ };++ initializeStoredColorScheme({+ root,+ storage,+ storageKey: clientSettingsStorageKey,+ prefersDark: true,+ });++ expect(root.dataset.colorScheme).toBe("dark");+ });++ test("the document bootstrap applies the shared scheme synchronously", () => {+ localStorage.setItem(+ clientSettingsStorageKey,+ JSON.stringify({ colorScheme: "light" })+ );+ const originalMatchMedia = window.matchMedia;+ const mediaQueryList = {+ matches: true,+ media: "(prefers-color-scheme: dark)",+ onchange: null,+ addListener: vi.fn(),+ removeListener: vi.fn(),+ addEventListener: vi.fn(),+ removeEventListener: vi.fn(),+ dispatchEvent: vi.fn(),+ } satisfies MediaQueryList;+ window.matchMedia = vi.fn(() => mediaQueryList);++ Function(createColorSchemeBootstrapScript("dark"))();++ expect(document.documentElement.dataset.colorScheme).toBe("dark");++ window.matchMedia = originalMatchMedia;+ localStorage.clear();+ delete document.documentElement.dataset.colorScheme;+ });+});++describe("shared color scheme cookie", () => {+ test("round-trips a preference across subdomains", () => {+ const serialized = serializeColorSchemeCookie({+ preference: "dark",+ domain: "apps.webstudio.is",+ secure: true,+ });++ expect(serialized).toContain(`${colorSchemeCookieName}=dark`);+ expect(serialized).toContain("Domain=apps.webstudio.is");+ expect(serialized).toContain("Path=/");+ expect(serialized).toContain("Secure");+ expect(parseColorSchemeCookie(serialized)).toBe("dark");+ });++ test("ignores missing and invalid preferences", () => {+ expect(parseColorSchemeCookie(undefined)).toBeUndefined();+ expect(+ parseColorSchemeCookie(`${colorSchemeCookieName}=sepia`)+ ).toBeUndefined();+ });+});diff --git a/apps/builder/app/shared/color-scheme.ts b/apps/builder/app/shared/color-scheme.tsnew file mode 100644index 0000000000..44982950b3--- /dev/null+++ b/apps/builder/app/shared/color-scheme.ts@@ -0,0 +1,116 @@+import { parse, serialize } from "cookie";++export const colorSchemePreferences = ["system", "light", "dark"] as const;++export type ColorSchemePreference = (typeof colorSchemePreferences)[number];+export type ColorScheme = Exclude<ColorSchemePreference, "system">;++export const colorSchemeMediaQuery = "(prefers-color-scheme: dark)";+export const clientSettingsStorageKey = "__webstudio_user_settings__";+export const colorSchemeCookieName = "__webstudio_color_scheme__";++const isColorSchemePreference = (+ value: unknown+): value is ColorSchemePreference =>+ value === "system" || value === "light" || value === "dark";++export const parseColorSchemeCookie = (cookie: string | null | undefined) => {+ if (cookie === null || cookie === undefined) {+ return;+ }+ const preference = parse(cookie)[colorSchemeCookieName];+ return isColorSchemePreference(preference) ? preference : undefined;+};++export const serializeColorSchemeCookie = ({+ preference,+ domain,+ secure,+}: {+ preference: ColorSchemePreference;+ domain: string;+ secure: boolean;+}) =>+ serialize(colorSchemeCookieName, preference, {+ domain,+ maxAge: 60 * 60 * 24 * 365,+ path: "/",+ sameSite: "lax",+ secure,+ });++export const applyColorScheme = ({+ preference,+ prefersDark,+ root,+}: {+ preference: ColorSchemePreference;+ prefersDark: boolean;+ root: HTMLElement;+}) => {+ const colorScheme: ColorScheme =+ preference === "system" ? (prefersDark ? "dark" : "light") : preference;++ root.dataset.colorScheme = colorScheme;+};++export const initializeStoredColorScheme = ({+ root,+ storage,+ storageKey,+ storedPreference,+ prefersDark,+}: {+ root: HTMLElement;+ storage: Pick<Storage, "getItem">;+ storageKey: string;+ storedPreference?: unknown;+ prefersDark: boolean;+}) => {+ const hasStoredPreference =+ storedPreference === "system" ||+ storedPreference === "light" ||+ storedPreference === "dark";+ let preference: ColorSchemePreference = hasStoredPreference+ ? storedPreference+ : "system";++ if (hasStoredPreference === false) {+ try {+ const storedSettings = JSON.parse(+ storage.getItem(storageKey) ?? "{}"+ ) as {+ colorScheme?: unknown;+ };++ if (+ storedSettings.colorScheme === "system" ||+ storedSettings.colorScheme === "light" ||+ storedSettings.colorScheme === "dark"+ ) {+ preference = storedSettings.colorScheme;+ }+ } catch {+ // Invalid or unavailable storage leaves the interface on the system scheme.+ }+ }++ const colorScheme: ColorScheme =+ preference === "system" ? (prefersDark ? "dark" : "light") : preference;++ root.dataset.colorScheme = colorScheme;+};++export const createColorSchemeBootstrapScript = (+ storedPreference?: ColorSchemePreference+) => `try { (${initializeStoredColorScheme.toString()})({+ root: document.documentElement,+ storage: window.localStorage,+ storageKey: ${JSON.stringify(clientSettingsStorageKey)},+ storedPreference: ${JSON.stringify(storedPreference)},+ prefersDark: window.matchMedia(${JSON.stringify(colorSchemeMediaQuery)}).matches+}); } catch {+ document.documentElement.dataset.colorScheme = window.matchMedia(${JSON.stringify(+ colorSchemeMediaQuery+ )}).matches ? "dark" : "light";+}`;diff --git a/apps/builder/app/shared/conflict-resolution-dialog.tsx b/apps/builder/app/shared/conflict-resolution-dialog.tsxindex 316988f320..895be1c65f 100644--- a/apps/builder/app/shared/conflict-resolution-dialog.tsx+++ b/apps/builder/app/shared/conflict-resolution-dialog.tsx@@ -64,7 +64,7 @@ export const ConflictResolutionDialog = <Resolution extends string>({</Flex></Flex><DialogActions>- <Button autoFocus color="positive" onClick={onResolve}>+ <Button autoFocus color="primary" onClick={onResolve}>Continue</Button><Button color="ghost" onClick={onCancel}>diff --git a/apps/builder/app/shared/copy-to-clipboard.stories.tsx b/apps/builder/app/shared/copy-to-clipboard.stories.tsxindex e770d1436c..0d56fc020c 100644--- a/apps/builder/app/shared/copy-to-clipboard.stories.tsx+++ b/apps/builder/app/shared/copy-to-clipboard.stories.tsx@@ -10,14 +10,14 @@ export const CopyToClipboard = () => (<StorySection title="Copy To Clipboard"><Flex gap="3"><CopyToClipboardComponent text="Hello, world!">- <Button>Click to copy</Button>+ <Button color="primary">Click to copy</Button></CopyToClipboardComponent><CopyToClipboardComponenttext="some-secret-token-123"copyText="Copy token"copiedText="Token copied!">- <Button>Copy token</Button>+ <Button color="primary">Copy token</Button></CopyToClipboardComponent></Flex></StorySection>diff --git a/apps/builder/app/shared/design-token-import-dialog.tsx b/apps/builder/app/shared/design-token-import-dialog.tsxindex b4e7ee15e5..8380743cfa 100644--- a/apps/builder/app/shared/design-token-import-dialog.tsx+++ b/apps/builder/app/shared/design-token-import-dialog.tsx@@ -93,7 +93,7 @@ export const DesignTokenImportDialog = () => {/></Flex><DialogActions>- <Button autoFocus color="positive" onClick={() => finish(target)}>+ <Button autoFocus color="primary" onClick={() => finish(target)}>Import</Button><Button color="ghost" onClick={() => finish("cancel")}>diff --git a/apps/builder/app/shared/dialog-radio-options.tsx b/apps/builder/app/shared/dialog-radio-options.tsxindex acab61e702..84a8bf12d8 100644--- a/apps/builder/app/shared/dialog-radio-options.tsx+++ b/apps/builder/app/shared/dialog-radio-options.tsx@@ -4,6 +4,7 @@ import {Radio,RadioGroup,Text,+ cssVar,theme,} from "@webstudio-is/design-system";@@ -36,7 +37,7 @@ export const DialogRadioOptions = <Value extends string>({cursor: "pointer",borderRadius: theme.borderRadius[4],"&:hover": {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},}}>diff --git a/apps/builder/app/shared/error/error-message.client.tsx b/apps/builder/app/shared/error/error-message.client.tsxindex ef6ec76b80..8f0291593b 100644--- a/apps/builder/app/shared/error/error-message.client.tsx+++ b/apps/builder/app/shared/error/error-message.client.tsx@@ -2,22 +2,22 @@ import {AccessibleIcon,css,Grid,- Link,+ LinkButton,Text,theme,- buttonStyle,} from "@webstudio-is/design-system";import { WebstudioIcon } from "@webstudio-is/icons";+import { brandColors } from "~/shared/brand-colors";const pageStyle = css({position: "fixed",justifyItems: "center",alignContent: "start",inset: 0,- background: theme.colors.brandBackgroundDashboard,+ background: brandColors.dashboard,paddingTop: "10vh",// prevent global root styles override error color- color: theme.colors.black,+ color: brandColors.foreground,});export const ErrorMessage = ({@@ -57,7 +57,7 @@ export const ErrorMessage = ({><Gridcss={{- background: theme.colors.backgroundPanel,+ background: brandColors.panel,padding: theme.spacing[7],borderRadius: theme.spacing[5],minWidth: theme.spacing[34],@@ -89,14 +89,9 @@ export const ErrorMessage = ({</Text>)}</Grid>- <Link- href="/"- className={buttonStyle()}- color="contrast"- underline="none"- >- Go Home- </Link>+ <LinkButton color="primary" href="/">+ Go home+ </LinkButton></Grid></Grid>);diff --git a/apps/builder/app/shared/notifications/notification-popover.tsx b/apps/builder/app/shared/notifications/notification-popover.tsxindex 6eaef396c2..fa74e1301c 100644--- a/apps/builder/app/shared/notifications/notification-popover.tsx+++ b/apps/builder/app/shared/notifications/notification-popover.tsx@@ -16,6 +16,7 @@ import {Text,Tooltip,css,+ cssVar,keyframes,theme,toast,@@ -46,7 +47,7 @@ const notificationRowStyle = css({paddingBlock: theme.spacing[5],paddingInline: theme.spacing[7],"&:not(:last-child)": {- borderBottom: `1px solid ${theme.colors.borderMain}`,+ borderBottom: `1px solid ${cssVar("--border-default")}`,},});@@ -75,7 +76,7 @@ const NotificationRow = ({{notification.description}</Text><Flex gap="1" shrink={false}>- <Button color="neutral" onClick={onAccept} disabled={isLoading}>+ <Button onClick={onAccept} disabled={isLoading}>Accept</Button><Tooltip content="Decline">diff --git a/apps/builder/app/shared/project-settings/data-row.tsx b/apps/builder/app/shared/project-settings/data-row.tsxnew file mode 100644index 0000000000..ecfce5f9c6--- /dev/null+++ b/apps/builder/app/shared/project-settings/data-row.tsx@@ -0,0 +1,20 @@+import { Grid, cssVar, styled, theme } from "@webstudio-is/design-system";++export const ProjectSettingsDataRow = styled(Grid, {+ p: theme.spacing[3],+ overflow: "hidden",+ position: "relative",+ "& > button": {+ opacity: 0,+ position: "absolute",+ right: 0,+ top: 0,+ bottom: 0,+ height: "auto",+ borderRadius: 0,+ background: cssVar("--background-primary"),+ },+ "&:hover > button, &:focus-within > button": {+ opacity: 1,+ },+});diff --git a/apps/builder/app/shared/project-settings/import-redirects-dialog.tsx b/apps/builder/app/shared/project-settings/import-redirects-dialog.tsxindex c63948c0bd..a80c72d47b 100644--- a/apps/builder/app/shared/project-settings/import-redirects-dialog.tsx+++ b/apps/builder/app/shared/project-settings/import-redirects-dialog.tsx@@ -18,6 +18,7 @@ import {TextArea,theme,toast,+ cssVar,} from "@webstudio-is/design-system";import { UploadIcon } from "@webstudio-is/icons";import type { PageRedirect } from "@webstudio-is/sdk";@@ -213,7 +214,9 @@ export const ImportRedirectsDialog = ({const skippedMessage =skippedParts.length > 0 ? ` (${skippedParts.join(", ")} skipped)` : "";toast.success(- `Imported ${valid.length} redirect${valid.length !== 1 ? "s" : ""}${skippedMessage}`+ `Imported ${valid.length} redirect${+ valid.length !== 1 ? "s" : ""+ }${skippedMessage}`);} else {// Replace all - detect loops within the new set@@ -229,7 +232,9 @@ export const ImportRedirectsDialog = ({const skippedMessage =skippedParts.length > 0 ? ` (${skippedParts.join(", ")} skipped)` : "";toast.success(- `Replaced all redirects with ${valid.length} new redirect${valid.length !== 1 ? "s" : ""}${skippedMessage}`+ `Replaced all redirects with ${valid.length} new redirect${+ valid.length !== 1 ? "s" : ""+ }${skippedMessage}`);}@@ -285,7 +290,11 @@ export const ImportRedirectsDialog = ({<DialogActions>{step === "input" && (<>- <Button onClick={handleParse} disabled={!textContent.trim()}>+ <Button+ color="primary"+ onClick={handleParse}+ disabled={!textContent.trim()}+ >Parse</Button><DialogClose>@@ -297,6 +306,7 @@ export const ImportRedirectsDialog = ({{step === "preview" && (<><Button+ color="primary"onClick={handleImport}disabled={parsedRedirects.length === 0}>@@ -358,12 +368,14 @@ const InputStep = ({onDragLeave={onDragLeave}onDrop={onDrop}css={{- border: `2px dashed ${isDragOver ? theme.colors.borderFocus : theme.colors.borderMain}`,+ border: `2px dashed ${+ isDragOver ? cssVar("--border-focus") : cssVar("--border-default")+ }`,borderRadius: theme.borderRadius[6],padding: theme.spacing[9],textAlign: "center",backgroundColor: isDragOver- ? theme.colors.backgroundHover+ ? cssVar("--overlay-interaction-hover"): "transparent",transition: "all 0.2s ease",cursor: "pointer",@@ -379,11 +391,19 @@ const InputStep = ({<Flex align="center" gap="2"><Box- css={{ flex: 1, height: 1, backgroundColor: theme.colors.borderMain }}+ css={{+ flex: 1,+ height: 1,+ backgroundColor: cssVar("--border-default"),+ }}/>- <Text color="subtle">OR</Text>+ <Text color="subtle">or</Text><Box- css={{ flex: 1, height: 1, backgroundColor: theme.colors.borderMain }}+ css={{+ flex: 1,+ height: 1,+ backgroundColor: cssVar("--border-default"),+ }}/></Flex>@@ -430,7 +450,7 @@ const PreviewStep = ({<ScrollAreacss={{- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],maxHeight: 200,overflow: "auto",@@ -482,7 +502,7 @@ const PreviewStep = ({<Label>Unsupported ({skippedLines.length})</Label><ScrollAreacss={{- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],maxHeight: 120,overflow: "auto",@@ -512,7 +532,7 @@ const PreviewStep = ({<Label>Duplicates ({duplicateRedirects.length})</Label><ScrollAreacss={{- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[4],maxHeight: 120,overflow: "auto",@@ -573,7 +593,9 @@ const PreviewStep = ({<Label htmlFor="import-mode-add">Add to existing ({uniqueCount} new{duplicateCount > 0- ? `, ${duplicateCount} duplicate${duplicateCount !== 1 ? "s" : ""} skipped`+ ? `, ${duplicateCount} duplicate${+ duplicateCount !== 1 ? "s" : ""+ } skipped`: ""})</Label>diff --git a/apps/builder/app/shared/project-settings/project-settings.tsx b/apps/builder/app/shared/project-settings/project-settings.tsxindex f078214649..b1ca55330b 100644--- a/apps/builder/app/shared/project-settings/project-settings.tsx+++ b/apps/builder/app/shared/project-settings/project-settings.tsx@@ -12,6 +12,8 @@ import {ListItem,Text,rawTheme,+ cssVar,+ selectionBackground,} from "@webstudio-is/design-system";import { SpinnerIcon } from "@webstudio-is/icons";import {@@ -86,7 +88,7 @@ export const ProjectSettingsDialog = ({shrink={false}css={{width: leftPanelWidth,- borderRight: `1px solid ${theme.colors.borderMain}`,+ borderRight: `1px solid ${cssVar("--border-default")}`,}}>{Array.from(sections.keys()).map((name, index) => {@@ -107,11 +109,11 @@ export const ProjectSettingsDialog = ({paddingInline: theme.panel.paddingInline,outline: "none","&:focus-visible, &:hover": {- background: theme.colors.backgroundHover,+ background: cssVar("--overlay-interaction-hover"),},"&[aria-current=true]": {- background: theme.colors.backgroundItemCurrent,- color: theme.colors.foregroundMain,+ background: selectionBackground,+ color: cssVar("--foreground-primary"),},}}align="center"diff --git a/apps/builder/app/shared/project-settings/section-auth.tsx b/apps/builder/app/shared/project-settings/section-auth.tsxindex 9789004140..d766c8dd75 100644--- a/apps/builder/app/shared/project-settings/section-auth.tsx+++ b/apps/builder/app/shared/project-settings/section-auth.tsx@@ -6,18 +6,17 @@ import {Grid,InputErrorsTooltip,InputField,- Link,+ LinkButton,List,ListItem,ProChip,- rawTheme,ScrollArea,SearchField,SmallIconButton,Text,theme,Tooltip,- buttonStyle,+ cssVar,} from "@webstudio-is/design-system";import { InfoCircleIcon, TrashIcon } from "@webstudio-is/icons";import { useStore } from "@nanostores/react";@@ -35,6 +34,7 @@ import {parseProjectAuthRoutes,validateProjectAuthRoute,} from "@webstudio-is/project-build/contracts";+import { ProjectSettingsDataRow } from "./data-row";const saveAuthRoutes = (authRoutes: WsAuthRoute[]) => {executeRuntimeMutation({@@ -168,16 +168,14 @@ export const SectionAuth = () => {Authentication is a Pro feature. You can publish to stagingfor free; upgrade to Pro to publish to custom domains.</Text>- <Link- className={buttonStyle({ color: "gradient" })}+ <LinkButton+ color="primary"css={{ marginTop: theme.spacing[5], width: "100%" }}- color="contrast"- underline="none"target="_blank"href="https://webstudio.is/pricing">Upgrade- </Link>+ </LinkButton></>)}</>@@ -185,7 +183,7 @@ export const SectionAuth = () => {variant="wrapped"><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={-1}/></Tooltip>@@ -280,6 +278,7 @@ export const SectionAuth = () => {</InputErrorsTooltip><Button+ color="primary"disabled={routeErrors.length > 0 ||loginErrors.length > 0 ||@@ -301,27 +300,11 @@ export const SectionAuth = () => {const index = authRoutes.indexOf(authRoute);return (<ListItem asChild key={authRoute.route}>- <Grid+ <ProjectSettingsDataRowalign="center"gap="2"css={{- p: theme.spacing[3],- overflow: "hidden",gridTemplateColumns: "1fr 1fr",- position: "relative",- "& > button": {- opacity: 0,- position: "absolute",- right: 0,- top: 0,- bottom: 0,- height: "auto",- borderRadius: 0,- background: theme.colors.backgroundPanel,- },- "&:hover > button, &:focus-within > button": {- opacity: 1,- },}}><Tooltip content={authRoute.route}>@@ -343,7 +326,7 @@ export const SectionAuth = () => {aria-label={`Delete authentication for ${authRoute.route}`}onClick={() => handleDeleteAuthRoute(index)}/>- </Grid>+ </ProjectSettingsDataRow></ListItem>);})}diff --git a/apps/builder/app/shared/project-settings/section-backups.tsx b/apps/builder/app/shared/project-settings/section-backups.tsxindex 6b96220ba8..67a87781d5 100644--- a/apps/builder/app/shared/project-settings/section-backups.tsx+++ b/apps/builder/app/shared/project-settings/section-backups.tsx@@ -91,6 +91,7 @@ export const SectionBackups = ({<Dialog><DialogTrigger asChild><Button+ color="primary"css={{ justifySelf: "start" }}disabled={canRestoreBackups === false || options.length === 0}>diff --git a/apps/builder/app/shared/project-settings/section-general.tsx b/apps/builder/app/shared/project-settings/section-general.tsxindex 237eb6d109..17aa94ebe4 100644--- a/apps/builder/app/shared/project-settings/section-general.tsx+++ b/apps/builder/app/shared/project-settings/section-general.tsx@@ -15,6 +15,7 @@ import {ProChip,TextArea,IconButton,+ cssVar,} from "@webstudio-is/design-system";import { CopyIcon, InfoCircleIcon } from "@webstudio-is/icons";import { getImageAttributes, wsImageLoader } from "@webstudio-is/image";@@ -36,7 +37,7 @@ const imgStyle = css({borderRadius: theme.borderRadius[4],borderWidth: 1,borderStyle: "solid",- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),});const defaultMetaSettings: ProjectMeta = {@@ -124,7 +125,7 @@ export const SectionGeneral = ({ projectId }: { projectId?: string }) => {</Flex><InputFieldid={siteNameId}- placeholder="Current Site Name"+ placeholder="Current site name"autoFocus={true}value={meta.siteName ?? ""}onChange={(event) => {@@ -187,7 +188,9 @@ export const SectionGeneral = ({ projectId }: { projectId?: string }) => {Upload a square image to display in browser tabs.</Text><ImageControl onAssetIdChange={handleSave("faviconAssetId")}>- <Button css={{ justifySelf: "start" }}>Upload</Button>+ <Button color="primary" css={{ justifySelf: "start" }}>+ Upload+ </Button></ImageControl></Grid></Grid>diff --git a/apps/builder/app/shared/project-settings/section-marketplace.tsx b/apps/builder/app/shared/project-settings/section-marketplace.tsxindex e345077f81..320a0596eb 100644--- a/apps/builder/app/shared/project-settings/section-marketplace.tsx+++ b/apps/builder/app/shared/project-settings/section-marketplace.tsx@@ -15,6 +15,7 @@ import {PanelBanner,Select,Box,+ cssVar,} from "@webstudio-is/design-system";import { getImageAttributes, wsImageLoader } from "@webstudio-is/image";import { useState } from "react";@@ -39,10 +40,10 @@ const thumbnailStyle = css({borderRadius: theme.borderRadius[4],outlineWidth: 1,outlineStyle: "solid",- outlineColor: theme.colors.borderMain,+ outlineColor: cssVar("--border-default"),width: theme.spacing[28],aspectRatio: "1.91",- background: "#DFE3E6",+ background: cssVar("--background-secondary"),});const thumbnailImageStyle = css({@@ -235,7 +236,9 @@ export const SectionMarketplace = () => {with a 1.91:1 aspect ratio.</Text><ImageControl onAssetIdChange={handleSave("thumbnailAssetId")}>- <Button css={{ justifySelf: "start" }}>Upload</Button>+ <Button color="primary" css={{ justifySelf: "start" }}>+ Upload+ </Button></ImageControl></Grid></Grid>diff --git a/apps/builder/app/shared/project-settings/section-redirects.tsx b/apps/builder/app/shared/project-settings/section-redirects.tsxindex ae7c2679d7..d0d0f3d4a7 100644--- a/apps/builder/app/shared/project-settings/section-redirects.tsx+++ b/apps/builder/app/shared/project-settings/section-redirects.tsx@@ -14,7 +14,6 @@ import {Link,List,ListItem,- rawTheme,ScrollArea,SearchField,Select,@@ -22,6 +21,7 @@ import {Text,theme,Tooltip,+ cssVar,} from "@webstudio-is/design-system";import {AlertIcon,@@ -46,6 +46,7 @@ import {validateRedirectSource,validateRedirectTarget,} from "@webstudio-is/project-build/runtime";+import { ProjectSettingsDataRow } from "./data-row";const statusCodeOptions = ["301", "302"] as const;@@ -231,7 +232,7 @@ export const SectionRedirects = () => {}><InfoCircleIcon- color={rawTheme.colors.foregroundSubtle}+ color={cssVar("--foreground-secondary")}tabIndex={0}/></Tooltip>@@ -348,6 +349,7 @@ export const SectionRedirects = () => {</InputErrorsTooltip><Button+ color="primary"disabled={isValidRedirects === false || fromPath === toPath}onClick={handleAddRedirect}css={{ flexShrink: 0 }}@@ -358,7 +360,7 @@ export const SectionRedirects = () => {{fromPathWarnings.length > 0 && (<Flex gap="1" align="center"><AlertIcon- color={rawTheme.colors.backgroundAlertMain}+ color={cssVar("--foreground-warning")}style={{ flexShrink: 0 }}/><Text color="subtle">{fromPathWarnings.join(". ")}</Text>@@ -373,27 +375,11 @@ export const SectionRedirects = () => {{filteredRedirects.map((redirect) => {return (<ListItem asChild key={redirect.old}>- <Grid+ <ProjectSettingsDataRowalign="center"gap="2"css={{- p: theme.spacing[3],- overflow: "hidden",gridTemplateColumns: `1fr auto auto 1fr`,- position: "relative",- "& > button": {- opacity: 0,- position: "absolute",- right: 0,- top: 0,- bottom: 0,- height: "auto",- borderRadius: 0,- background: theme.colors.backgroundPanel,- },- "&:hover > button, &:focus-within > button": {- opacity: 1,- },}}><Tooltip content={redirect.old}>@@ -438,7 +424,7 @@ export const SectionRedirects = () => {aria-label={`Delete redirect from ${redirect.old}`}onClick={() => handleDeleteRedirect(redirect)}/>- </Grid>+ </ProjectSettingsDataRow></ListItem>);})}diff --git a/apps/builder/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsxindex 2ad148996a..e90e43c8f5 100644--- a/apps/builder/app/shared/share-project/share-project.stories.tsx+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx@@ -14,7 +14,7 @@ import {} from "./share-project";export default {- title: "Share Project",+ title: "Share project",component: ShareProjectComponent,};@@ -111,7 +111,7 @@ const ShareProjectPopover = ({return (<Popover modal open><PopoverTrigger asChild>- <Button>{label}</Button>+ <Button color="primary">{label}</Button></PopoverTrigger><PopoverContent><ShareProjectComponent@@ -127,7 +127,7 @@ const ShareProjectPopover = ({};export const ShareProject = () => (- <StorySection title="Share Project">+ <StorySection title="Share project"><Flex gap="9" css={{ padding: 100 }}><ShareProjectPopover label="Empty" /><ShareProjectPopover label="With Links" linkOptions={initialLinks} />diff --git a/apps/builder/app/shared/share-project/share-project.test.tsx b/apps/builder/app/shared/share-project/share-project.test.tsxindex 197516d7d7..d508095055 100644--- a/apps/builder/app/shared/share-project/share-project.test.tsx+++ b/apps/builder/app/shared/share-project/share-project.test.tsx@@ -176,7 +176,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);expect(hasLabel("Can publish")).toBe(false);@@ -203,7 +203,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- click(getElement('[aria-label="Menu Button for options"]'));+ click(getElement('[aria-label="Options menu"]'));expect(getControlByLabel<HTMLButtonElement>("Can clone")).toBeInstanceOf(HTMLButtonElement@@ -226,7 +226,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);const apiCheckbox = getControlByLabel<HTMLButtonElement>("API");@@ -247,7 +247,7 @@ describe("ShareProject", () => {onChange,});- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);const apiCheckbox = getControlByLabel<HTMLButtonElement>("API");@@ -269,7 +269,7 @@ describe("ShareProject", () => {onChange,});- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);const apiCheckbox = getControlByLabel<HTMLButtonElement>("API");@@ -291,7 +291,7 @@ describe("ShareProject", () => {onChange,});- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);const apiCheckbox = getControlByLabel<HTMLButtonElement>("API");@@ -315,7 +315,7 @@ describe("ShareProject", () => {onChange,});- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);click(getControlByLabel("Builder"));click(optionsButton);@@ -331,7 +331,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- click(getElement('[aria-label="Menu Button for options"]'));+ click(getElement('[aria-label="Options menu"]'));const nameInput = getElement<HTMLInputElement>('input[name="Name"]');const editorSwitch = getControlByLabel("Editor");@@ -345,7 +345,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- const optionsButton = getElement('[aria-label="Menu Button for options"]');+ const optionsButton = getElement('[aria-label="Options menu"]');click(optionsButton);const nameInput = getElement<HTMLInputElement>('input[name="Name"]');@@ -362,7 +362,7 @@ describe("ShareProject", () => {const onChange = vi.fn();renderShareProject({ onChange });- click(getElement('[aria-label="Menu Button for options"]'));+ click(getElement('[aria-label="Options menu"]'));const nameInput = getElement<HTMLInputElement>('input[name="Name"]');input(nameInput, "Renamed link");diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsxindex 69557872b4..6037bc71f0 100644--- a/apps/builder/app/shared/share-project/share-project.tsx+++ b/apps/builder/app/shared/share-project/share-project.tsx@@ -19,7 +19,6 @@ import {Popover,PopoverContent,PopoverTrigger,- rawTheme,Separator,Switch,theme,@@ -33,6 +32,8 @@ import {Checkbox,Grid,PanelBanner,+ cssVar,+ declareCssVar,} from "@webstudio-is/design-system";import {CopyIcon,@@ -89,7 +90,7 @@ const PermissionTooltip = ({}variant="wrapped">- <InfoCircleIcon color={rawTheme.colors.foregroundSubtle} tabIndex={0} />+ <InfoCircleIcon color={cssVar("--foreground-secondary")} tabIndex={0} /></Tooltip>);@@ -323,7 +324,7 @@ const Menu = ({<Buttonprefix={<EllipsesIcon />}color="ghost"- aria-label="Menu Button for options"+ aria-label="Options menu"></Button></PopoverTrigger><PopoverContent@@ -350,7 +351,7 @@ const Menu = ({setIsOpen(false);}}}- placeholder="Share Project"+ placeholder="Share project"name="Name"autoFocus/>@@ -471,7 +472,7 @@ const itemStyle = css({alignItems: "center",gap: theme.spacing[3],padding: theme.panel.padding,- backgroundColor: theme.colors.backgroundPanel,+ backgroundColor: cssVar("--background-primary"),});export type LinkOptions = {@@ -569,6 +570,10 @@ type ShareProjectProps = {isFreePlan: boolean;};+const collapsibleContentHeight = declareCssVar(+ "--radix-collapsible-content-height"+);+const animateCollapsibleHeight = keyframes({"0%": {height: 0,@@ -576,7 +581,7 @@ const animateCollapsibleHeight = keyframes({opacity: 0,},"100%": {- height: "var(--radix-collapsible-content-height)",+ height: cssVar(collapsibleContentHeight),overflow: "hidden",opacity: 1,},@@ -616,7 +621,6 @@ export const ShareProject = ({const create = (<Box className={itemStyle({ css: { py: theme.spacing["7"] } })}><Button- color="neutral"state={isPending ? "pending" : undefined}prefix={isPending ? <Flex css={{ width: theme.spacing[7] }} /> : <PlusIcon />@@ -655,3 +659,5 @@ export const ShareProject = ({</Flex>);};++undefined;diff --git a/apps/builder/e2e/README.md b/apps/builder/e2e/README.mdindex d2ce1b57f9..91217dae0b 100644--- a/apps/builder/e2e/README.md+++ b/apps/builder/e2e/README.md@@ -1,6 +1,10 @@-# Builder e2e+# Builder E2E tests-## Fast local reruns+Builder E2E workflows run with Playwright Test. The Playwright setup project+waits for PostgREST, resets the disposable database, and warms the login route+before Chromium runs the selected tests.++## Run the suiteUse the full command for CI-like validation:@@ -8,18 +12,28 @@ Use the full command for CI-like validation:pnpm e2e:builder```-The first run after the migrations change applies the regular migration-pipeline and writes an ignored schema cache under `.cache/builder-e2e`.-Subsequent runs in the same checkout restore that cache. CI does not preserve-it between runs. Refresh it explicitly with:+The first run after migrations change applies the regular migration pipeline+and writes an ignored schema cache under `.cache/builder-e2e`. Refresh it+explicitly with:```shpnpm e2e:builder:refresh-schema-cache```-For local test authoring, keep the e2e backend and Builder dev server running-and rerun only the matching test. This avoids rebuilding Builder and avoids-restarting Docker for every edit.+Pass normal Playwright Test arguments after `--`. For example:++```sh+pnpm e2e:builder -- --grep "Builder can copy, duplicate, and delete a page"+pnpm e2e:builder -- apps/builder/e2e/tests/pages-actions.e2e.ts+pnpm e2e:builder -- --debug --grep "Builder can copy"+```++A filter that matches no tests fails before the test environment runs.++## Fast local reruns++Keep the E2E backend and Builder development server running to avoid rebuilding+Builder and restarting Docker for each edit.Terminal 1:@@ -36,69 +50,47 @@ pnpm devTerminal 3:```sh-E2E_TEST_FILTER="Builder can copy, duplicate, and delete a page" pnpm e2e:builder:dev+pnpm e2e:builder:dev -- --grep "Builder can copy, duplicate, and delete a page"```-`E2E_TEST_FILTER` is a substring match against the test name. It is not a-regular expression. If the filter matches no tests, the runner fails and prints-the available test names before starting Docker or building Builder.+`pnpm e2e:builder:dev` defaults to+`E2E_BUILDER_URL=https://127.0.0.1:3000`. Override it when the development+server uses another port. Chromium maps `wstd.dev` and its project subdomains+to loopback for local Builder URLs, so host-file changes are unnecessary.-Use `E2E_TEST_FILTERS` for a newline-separated list of exact or substring-matches. Each entry is matched against both the test name and-`<suite> › <test>`.+The development backend uses `E2E_DB_BOOTSTRAP=if-empty` and keeps Docker+containers running. The Playwright setup project still resets test data before+each invocation.-```sh-E2E_TEST_FILTERS='Builder can insert through the engine bridge-Builder-created data variables and resources persist' pnpm e2e:builder-```--CI shards the full e2e suite by file name tags such as-`pages-actions.[shard-3].e2e.ts`. Use `E2E_TEST_SHARD=shard-3` to run one shard.-The goal is to keep all coverage while preventing one long serial e2e command-from hitting the command timeout.+## Test organization-When adding a new e2e file, include one shard tag in the filename:--```txt-my-workflow.[shard-1].e2e.ts-my-workflow.[shard-2].e2e.ts-my-workflow.[shard-3].e2e.ts-```+- Put workflows in `e2e/tests/*.e2e.ts` and import `test` from `e2e/test.ts`.+- Use Playwright's built-in `browser`, `page`, and hook APIs.+- Use the built-in `context` fixture for test-local authenticated state.+- Use `withBrowserContext(browser, callback)` for setup that must run in+ `beforeAll`. If cookies must survive from `beforeAll` into the tests, create+ an explicit context with `newBrowserContext(browser)` and close it in+ `afterAll`.+- Use `newIsolatedPage(browser)` for identities that must not share cookies.+- Keep tests in a file independent even though Playwright runs them in+ declaration order by default.-If one workflow file grows too slow, split it by scenario into files with the-same base name and different shard tags:+CI uses Playwright's standard six-way file sharding:-```txt-large-workflow.[shard-1].e2e.ts-large-workflow.[shard-2].e2e.ts-large-workflow.[shard-3].e2e.ts+```sh+pnpm e2e:builder -- --shard=1/6```-Choose the shard by current CI timing, not by feature ownership. Put new or-expensive files into the fastest shard, and rebalance later by renaming files.-CI retries a failed shard once because a single shard rerun is cheap enough to-absorb occasional browser/backend flakes.--CI discovers its shard matrix directly from these filename tags. When one test-file contains enough serial work to dominate a shard, add more shard tags to-that filename. Its tests are distributed deterministically across those shards-without duplicating the file or its helpers:--```txt-large-workflow.[shard-2].[shard-5].[shard-6].e2e.ts-```+Test filenames do not encode shard ownership. Playwright balances files across+the configured shards.-`pnpm e2e:builder:dev` defaults to `E2E_BUILDER_URL=https://127.0.0.1:3000`,-so it runs against the already-running Vite dev server instead of building and-serving the production bundle. Override `E2E_BUILDER_URL` when the dev server is-running on another port. The E2E harness maps `wstd.dev` and project subdomains-to loopback for Chromium when this URL is loopback, so focused local runs do not-require machine-level host-file edits.+## Failures-The dev backend uses `E2E_DB_BOOTSTRAP=if-empty` and keeps Docker containers-running. The e2e runner still resets test data before each run.+CI retries a failed shard once against a clean disposable database. Failed+shard jobs upload the Playwright HTML report, traces, screenshots, and videos,+along with the backend service logs.-When you need a clean backend:+When you need a completely clean backend locally:```shE2E_SKIP_CLEANUP=false pnpm e2e:builderdiff --git a/apps/builder/e2e/fixtures/builder-project.ts b/apps/builder/e2e/fixtures/builder-project.tsindex 841dd45217..da30955b6e 100644--- a/apps/builder/e2e/fixtures/builder-project.ts+++ b/apps/builder/e2e/fixtures/builder-project.ts@@ -1,22 +1,24 @@+import type { BrowserContext } from "@playwright/test";import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";import { loginAndCreateBlankProject } from "../flows/dashboard";-import { newPage } from "../harness";type Build = Awaited<ReturnType<typeof loadDevBuild>>;type BuildUpdate = Omit<Parameters<typeof updateBuild>[1], "version">;export const createSeededBuilderProject = async ({+ context,email,title,builderToken,createBuildUpdate,}: {+ context: BrowserContext;email: string;title: string;builderToken: string;createBuildUpdate: (build: Build) => BuildUpdate | Promise<BuildUpdate>;}) => {- const page = await newPage();+ const page = await context.newPage();try {const projectId = await loginAndCreateBlankProject({ page, email, title });const build = await loadDevBuild({ projectId });diff --git a/apps/builder/e2e/fixtures/content-mode-suite.ts b/apps/builder/e2e/fixtures/content-mode-suite.tsindex ba21daa1a5..fc3a16c1bb 100644--- a/apps/builder/e2e/fixtures/content-mode-suite.ts+++ b/apps/builder/e2e/fixtures/content-mode-suite.ts@@ -1,12 +1,10 @@+import type { BrowserContext } from "@playwright/test";import { loginAndCreateBlankProject } from "../flows/dashboard";-import { getBrowserScopeKey, newPage } from "../harness";import { measure } from "../perf";-import {- prepareExistingContentModeProject,- type SeededContentModeProject,-} from "./content-mode-project";+import { prepareExistingContentModeProject } from "./content-mode-project";type ContentModeProjectOptions = {+ context: BrowserContext;email?: string;title?: string;devPlan?: string;@@ -15,17 +13,16 @@ type ContentModeProjectOptions = {builderToken?: string;};-const sharedProjects = new WeakMap<object, SeededContentModeProject>();-export const createContentModeProject = async ({+ context,email = "[email protected]",title = "Content Mode E2E",devPlan,assetNamePrefix,editorToken,builderToken,-}: ContentModeProjectOptions = {}) => {- const ownerPage = await newPage();+}: ContentModeProjectOptions) => {+ const ownerPage = await context.newPage();try {const projectId = await measure(@@ -51,20 +48,3 @@ export const createContentModeProject = async ({await ownerPage.close();}};--export const setupSharedContentModeProject = async (- options?: ContentModeProjectOptions-) => {- const project = await createContentModeProject(options);- sharedProjects.set(getBrowserScopeKey(), project);- return project;-};--export const getSharedContentModeProject = () => {- const sharedProject = sharedProjects.get(getBrowserScopeKey());- if (sharedProject === undefined) {- throw new Error("Expected shared content-mode project to be initialized");- }-- return sharedProject;-};diff --git a/apps/builder/e2e/fixtures/drag-project.ts b/apps/builder/e2e/fixtures/drag-project.tsindex fe9936e002..3836532538 100644--- a/apps/builder/e2e/fixtures/drag-project.ts+++ b/apps/builder/e2e/fixtures/drag-project.ts@@ -108,8 +108,12 @@ const seedBuild = (serializedPages: string) => {};};-export const createDragProject = async (name: string) => {+export const createDragProject = async (+ context: BrowserContext,+ name: string+) => {return await createSeededBuilderProject({+ context,email: `drag-${name}@webstudio.test`,title: `Drag ${name}`,builderToken: `drag-${name}-builder-token`,@@ -141,3 +145,4 @@ export const loadPages = async (projectId: string) => {const build = await loadDevBuild({ projectId });return JSON.parse(build.pages) as SerializedPages;};+import type { BrowserContext } from "@playwright/test";diff --git a/apps/builder/e2e/fixtures/slot-keyboard-project.ts b/apps/builder/e2e/fixtures/slot-keyboard-project.tsindex b50d188066..b698468796 100644--- a/apps/builder/e2e/fixtures/slot-keyboard-project.ts+++ b/apps/builder/e2e/fixtures/slot-keyboard-project.ts@@ -1,3 +1,4 @@+import type { BrowserContext } from "@playwright/test";import { createSeededBuilderProject } from "./builder-project";export type SeededSlotKeyboardProject = {@@ -163,15 +164,18 @@ const createSlotKeyboardBuildData = ({};export const createSlotKeyboardProject = async ({+ context,email = "[email protected]",title = "Slot Keyboard E2E",builderToken = "slot-keyboard-e2e-builder-token",}: {+ context: BrowserContext;email?: string;title?: string;builderToken?: string;-} = {}): Promise<SeededSlotKeyboardProject> => {+}): Promise<SeededSlotKeyboardProject> => {return await createSeededBuilderProject({+ context,email,title,builderToken,diff --git a/apps/builder/e2e/flows/assertions.ts b/apps/builder/e2e/flows/assertions.tsindex 5c34493f06..694f1ad701 100644--- a/apps/builder/e2e/flows/assertions.ts+++ b/apps/builder/e2e/flows/assertions.ts@@ -1,4 +1,4 @@-import type { Locator, Page } from "playwright";+import type { Locator, Page } from "@playwright/test";export const expectLocatorHidden = async ({locator,diff --git a/apps/builder/e2e/flows/assets-panel.ts b/apps/builder/e2e/flows/assets-panel.tsindex c96f6d3fd3..68bd5bf1fa 100644--- a/apps/builder/e2e/flows/assets-panel.ts+++ b/apps/builder/e2e/flows/assets-panel.ts@@ -1,5 +1,5 @@import path from "node:path";-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { waitForChangeToBeSaved } from "./sync-status";import { dragPointer } from "./drag";diff --git a/apps/builder/e2e/flows/block-outline.ts b/apps/builder/e2e/flows/block-outline.tsindex deffe669e0..c281c0c7cb 100644--- a/apps/builder/e2e/flows/block-outline.ts+++ b/apps/builder/e2e/flows/block-outline.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { waitForCanvasFrame } from "./builder";import { waitForChangeToBeSaved, waitForSyncStatus } from "./sync-status";diff --git a/apps/builder/e2e/flows/builder.ts b/apps/builder/e2e/flows/builder.tsindex 84f5e7f986..cc8731baaa 100644--- a/apps/builder/e2e/flows/builder.ts+++ b/apps/builder/e2e/flows/builder.ts@@ -1,5 +1,5 @@-import type { Frame, Page } from "playwright";-import { getProjectBuilderUrl } from "../harness";+import type { Frame, Page } from "@playwright/test";+import { getProjectBuilderUrl } from "../test";const delay = (ms: number) =>new Promise<void>((resolve) => setTimeout(resolve, ms));diff --git a/apps/builder/e2e/flows/canvas-media.ts b/apps/builder/e2e/flows/canvas-media.tsindex 2a3849622e..2fa6b5fd1b 100644--- a/apps/builder/e2e/flows/canvas-media.ts+++ b/apps/builder/e2e/flows/canvas-media.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { waitForCanvasFrame } from "./builder";export const waitForCanvasImage = async ({diff --git a/apps/builder/e2e/flows/canvas-selection.ts b/apps/builder/e2e/flows/canvas-selection.tsindex 4e34ae3060..1a2d9d57c1 100644--- a/apps/builder/e2e/flows/canvas-selection.ts+++ b/apps/builder/e2e/flows/canvas-selection.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { waitForCanvasFrame } from "./builder";const delay = (ms: number) =>diff --git a/apps/builder/e2e/flows/canvas-style.ts b/apps/builder/e2e/flows/canvas-style.tsindex 321587778d..a26a9186b4 100644--- a/apps/builder/e2e/flows/canvas-style.ts+++ b/apps/builder/e2e/flows/canvas-style.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { getCanvasFrame } from "./builder";const delay = (ms: number) =>diff --git a/apps/builder/e2e/flows/content-block-source.ts b/apps/builder/e2e/flows/content-block-source.tsindex 525a39e978..30c95256d4 100644--- a/apps/builder/e2e/flows/content-block-source.ts+++ b/apps/builder/e2e/flows/content-block-source.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { chooseAssetByFilename } from "./assets-panel";import { selectNavigatorItem } from "./navigator";diff --git a/apps/builder/e2e/flows/content-editing.ts b/apps/builder/e2e/flows/content-editing.tsindex cd55625a1c..bd64cad726 100644--- a/apps/builder/e2e/flows/content-editing.ts+++ b/apps/builder/e2e/flows/content-editing.ts@@ -1,4 +1,4 @@-import type { Locator, Page } from "playwright";+import type { Locator, Page } from "@playwright/test";import {getCanvasFrame,waitForCanvasFrame,diff --git a/apps/builder/e2e/flows/dashboard.ts b/apps/builder/e2e/flows/dashboard.tsindex 82d4566f94..4ece5b6ac4 100644--- a/apps/builder/e2e/flows/dashboard.ts+++ b/apps/builder/e2e/flows/dashboard.ts@@ -1,5 +1,5 @@-import { dashboardUrl, getProjectIdFromBuilderUrl } from "../harness";-import type { Page } from "playwright";+import { dashboardUrl, getProjectIdFromBuilderUrl } from "../test";+import type { Page } from "@playwright/test";import env from "../../app/env/env.server";const loginReadyTimeout = 30_000;diff --git a/apps/builder/e2e/flows/data-variables.ts b/apps/builder/e2e/flows/data-variables.tsindex 93705cdfb2..eb19acdadb 100644--- a/apps/builder/e2e/flows/data-variables.ts+++ b/apps/builder/e2e/flows/data-variables.ts@@ -1,5 +1,5 @@import { createServer } from "node:http";-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { selectCanvasTextInstance } from "./canvas-selection";import { waitForChangeToBeSaved, waitForSyncStatus } from "./sync-status";@@ -14,7 +14,7 @@ const closeVariablePanelAndWaitForSave = async ({ page }: { page: Page }) => {await page.getByRole("button", { name: "Close" }).last().click();await save;await page- .getByText("New Variable", { exact: true })+ .getByText("New variable", { exact: true }).waitFor({ state: "hidden" });await waitForSyncStatus({ page, status: "idle" });};@@ -22,7 +22,7 @@ const closeVariablePanelAndWaitForSave = async ({ page }: { page: Page }) => {const openNewVariablePanel = async ({ page }: { page: Page }) => {await page.getByRole("tab", { name: "Settings" }).click();await page.getByRole("button", { name: "Add data variable" }).click();- await page.getByText("New Variable", { exact: true }).waitFor();+ await page.getByText("New variable", { exact: true }).waitFor();};const selectVariableType = async ({diff --git a/apps/builder/e2e/flows/drag.ts b/apps/builder/e2e/flows/drag.tsindex 4f1d915ff8..c1e6eecfaa 100644--- a/apps/builder/e2e/flows/drag.ts+++ b/apps/builder/e2e/flows/drag.ts@@ -1,4 +1,4 @@-import type { Frame, Locator, Page } from "playwright";+import type { Frame, Locator, Page } from "@playwright/test";import { waitForChangeToBeSaved } from "./sync-status";type Bounds = { x: number; y: number; width: number; height: number };diff --git a/apps/builder/e2e/flows/generated-app.ts b/apps/builder/e2e/flows/generated-app.tsindex 36be46e9f8..473ebd92cf 100644--- a/apps/builder/e2e/flows/generated-app.ts+++ b/apps/builder/e2e/flows/generated-app.ts@@ -5,7 +5,7 @@ import { tmpdir } from "node:os";import { join } from "node:path";import { fileURLToPath } from "node:url";import { promisify } from "node:util";-import type { Page as PlaywrightPage } from "playwright";+import type { Page as PlaywrightPage } from "@playwright/test";import { bundleVersion } from "@webstudio-is/protocol";import { getStyleDeclKey, type Page } from "@webstudio-is/sdk";import { loadDevBuild } from "../db";diff --git a/apps/builder/e2e/flows/navigator.ts b/apps/builder/e2e/flows/navigator.tsindex e05c2b88f9..b064ed5b1c 100644--- a/apps/builder/e2e/flows/navigator.ts+++ b/apps/builder/e2e/flows/navigator.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";export const openNavigatorPanel = async ({ page }: { page: Page }) => {const tab = page.getByRole("tab", { name: "Navigator" });diff --git a/apps/builder/e2e/flows/pages-panel.ts b/apps/builder/e2e/flows/pages-panel.tsindex eb6d4b8d95..495f11bfca 100644--- a/apps/builder/e2e/flows/pages-panel.ts+++ b/apps/builder/e2e/flows/pages-panel.ts@@ -1,4 +1,4 @@-import type { Locator, Page } from "playwright";+import type { Locator, Page } from "@playwright/test";import { expectLocatorHidden, expectTextHidden } from "./assertions";import { waitForCanvasText } from "./builder";import { waitForChangeToBeSaved, waitForSyncStatus } from "./sync-status";diff --git a/apps/builder/e2e/flows/props-panel.ts b/apps/builder/e2e/flows/props-panel.tsindex 4f171b664a..038336ad0c 100644--- a/apps/builder/e2e/flows/props-panel.ts+++ b/apps/builder/e2e/flows/props-panel.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { chooseAssetByFilename } from "./assets-panel";import { waitForChangeToBeSaved, waitForSyncStatus } from "./sync-status";diff --git a/apps/builder/e2e/flows/share-dialog.ts b/apps/builder/e2e/flows/share-dialog.tsindex 0e710b53d7..6f796f4979 100644--- a/apps/builder/e2e/flows/share-dialog.ts+++ b/apps/builder/e2e/flows/share-dialog.ts@@ -1,4 +1,4 @@-import type { Locator, Page } from "playwright";+import type { Locator, Page } from "@playwright/test";type ShareRole = "Viewer" | "Editor" | "Builder" | "Admin";@@ -107,18 +107,14 @@ export const createShareLink = async ({const customLink = getShareLinkGroup({ page, name: "Custom link" });await customLink.waitFor({ state: "visible", timeout: 10_000 });- await customLink- .getByRole("button", { name: "Menu Button for options" })- .click();+ await customLink.getByRole("button", { name: "Options menu" }).click();const customLinkOptions = getShareLinkOptions({page,name: "Custom link",});const nameInput = customLinkOptions.getByLabel("Name");await nameInput.fill(name);- await customLink- .getByRole("button", { name: "Menu Button for options" })- .click();+ await customLink.getByRole("button", { name: "Options menu" }).click();await waitForShareLinkMutation({ page });const renamedLink = getShareLinkGroup({ page, name });@@ -136,14 +132,10 @@ export const createShareLink = async ({{ cause: error });}- await renamedLink- .getByRole("button", { name: "Menu Button for options" })- .click();+ await renamedLink.getByRole("button", { name: "Options menu" }).click();const renamedLinkOptions = getShareLinkOptions({ page, name });const roleChanged = await selectRole({ options: renamedLinkOptions, role });- await renamedLink- .getByRole("button", { name: "Menu Button for options" })- .click();+ await renamedLink.getByRole("button", { name: "Options menu" }).click();if (roleChanged) {await waitForShareLinkMutation({ page });}@@ -175,10 +167,10 @@ export const updateShareLinkRole = async ({role: ShareRole;}) => {const group = getShareLinkGroup({ page, name });- await group.getByRole("button", { name: "Menu Button for options" }).click();+ await group.getByRole("button", { name: "Options menu" }).click();const options = getShareLinkOptions({ page, name });const roleChanged = await selectRole({ options, role });- await group.getByRole("button", { name: "Menu Button for options" }).click();+ await group.getByRole("button", { name: "Options menu" }).click();if (roleChanged) {await waitForShareLinkMutation({ page });}diff --git a/apps/builder/e2e/flows/sync-status.ts b/apps/builder/e2e/flows/sync-status.tsindex bb2301924e..a1d4426b70 100644--- a/apps/builder/e2e/flows/sync-status.ts+++ b/apps/builder/e2e/flows/sync-status.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";type SyncStatusDotStatus = "idle" | "pending" | "saved" | "error";diff --git a/apps/builder/e2e/flows/template-insertion.ts b/apps/builder/e2e/flows/template-insertion.tsindex 031b4b5702..5473bacf0f 100644--- a/apps/builder/e2e/flows/template-insertion.ts+++ b/apps/builder/e2e/flows/template-insertion.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { waitForCanvasFrame } from "./builder";import { waitForSyncStatus } from "./sync-status";diff --git a/apps/builder/e2e/harness.test.ts b/apps/builder/e2e/harness.test.tsdeleted file mode 100644index dd31cebd5a..0000000000--- a/apps/builder/e2e/harness.test.ts+++ /dev/null@@ -1,65 +0,0 @@-import type { Browser, BrowserContext, Page } from "playwright";-import { expect, test, vi } from "vitest";-import {- createBrowserScopeForBrowser,- getBrowserLaunchOptions,- newPage,-} from "./harness";--test("maps Builder and project wstd.dev hosts to loopback for local browser runs", () => {- expect(getBrowserLaunchOptions("https://127.0.0.1:5174")).toMatchObject({- args: [- "--host-resolver-rules=MAP wstd.dev 127.0.0.1,MAP *.wstd.dev 127.0.0.1",- ],- });-});--test("does not override host resolution for non-loopback Builder URLs", () => {- expect(getBrowserLaunchOptions("https://builder.example.com")).toEqual({});-});--test("keeps timed-out work on its closed context after a scope reset", async () => {- const contexts: Array<{- closed: boolean;- context: BrowserContext;- page: Page;- }> = [];- const browser = {- newContext: vi.fn(async () => {- const record = {- closed: false,- page: {} as Page,- context: undefined as unknown as BrowserContext,- };- record.context = {- newPage: vi.fn(async () => {- if (record.closed) {- throw new Error("context closed");- }- return record.page;- }),- close: vi.fn(async () => {- record.closed = true;- }),- } as unknown as BrowserContext;- contexts.push(record);- return record.context;- }),- } as Pick<Browser, "newContext">;- const scope = await createBrowserScopeForBrowser(browser);- let continueTimedOutWork: (() => void) | undefined;- const timedOutWork = scope.run(async () => {- await new Promise<void>((resolve) => {- continueTimedOutWork = resolve;- });- return await newPage();- });-- await scope.reset();- continueTimedOutWork?.();-- await expect(timedOutWork).rejects.toThrow("context closed");- await expect(scope.run(newPage)).resolves.toBe(contexts[1]?.page);- expect(contexts[0]?.closed).toBe(true);- await scope.close();-});diff --git a/apps/builder/e2e/harness.ts b/apps/builder/e2e/harness.tsdeleted file mode 100644index 5c5d1f0954..0000000000--- a/apps/builder/e2e/harness.ts+++ /dev/null@@ -1,267 +0,0 @@-import { parseBuilderUrl } from "@webstudio-is/protocol";-import { basename } from "node:path";-import { AsyncLocalStorage } from "node:async_hooks";-import {- chromium,- type Browser,- type BrowserContext,- type BrowserContextOptions,- type LaunchOptions,-} from "playwright";-import env from "../app/env/env.server";-import { getE2eSuiteName } from "./test-modules";--const builderPort = process.env.PORT ?? "3000";--export const builderUrl =- process.env.E2E_BUILDER_URL ?? `https://127.0.0.1:${builderPort}`;--const builderUrlObject = new URL(builderUrl);--export const dashboardUrl = `${builderUrlObject.protocol}//wstd.dev:${builderUrlObject.port}`;--export const postgrestUrl = env.POSTGREST_URL;--export type Test = {- name: string;- run: () => Promise<void>;-};--export type Suite = {- name: string;- fileName: string;- filePath: string;- beforeAll?: () => Promise<void>;- beforeEach?: () => Promise<void>;- afterAll?: () => Promise<void>;- tests: Test[];-};--type TestApi = ((name: string, run: () => Promise<void>) => void) & {- beforeAll: (run: () => Promise<void>) => void;- beforeEach: (run: () => Promise<void>) => void;- afterAll: (run: () => Promise<void>) => void;-};--const suites: Suite[] = [];-const suitesByFile = new Map<string, Suite>();--const getCallerFile = () => {- const stack = new Error().stack ?? "";- const callerLine = stack- .split("\n")- .find(- (line) =>- line.includes("/e2e/tests/") &&- line.includes(".e2e.ts") &&- line.includes("/harness.ts") === false- );- const filePath = callerLine?.match(/(\/[^():]+\.e2e\.ts)/)?.[1];- if (filePath === undefined) {- throw new Error("Expected e2e test to be registered from an .e2e.ts file");- }- return filePath;-};--const getFileSuite = () => {- const filePath = getCallerFile();- let suite = suitesByFile.get(filePath);- if (suite !== undefined) {- return suite;- }-- const fileName = basename(filePath);- suite = {- name: getE2eSuiteName(fileName),- fileName,- filePath,- tests: [],- };- suitesByFile.set(filePath, suite);- suites.push(suite);- return suite;-};--export const test: TestApi = Object.assign(- (name: string, run: () => Promise<void>) => {- getFileSuite().tests.push({ name, run });- },- {- beforeAll: (run: () => Promise<void>) => {- getFileSuite().beforeAll = run;- },- beforeEach: (run: () => Promise<void>) => {- getFileSuite().beforeEach = run;- },- afterAll: (run: () => Promise<void>) => {- getFileSuite().afterAll = run;- },- }-);--export const getSuites = () => suites;--let browser: Browser | undefined;-let context: BrowserContext | undefined;--export type BrowserScope = {- run: <Result>(task: () => Promise<Result>) => Promise<Result>;- reset: () => Promise<void>;- close: () => Promise<void>;-};--type BrowserScopeState = {- scopeKey: object;- context: BrowserContext;- isolatedContexts: Set<BrowserContext>;-};--const browserScopeStorage = new AsyncLocalStorage<BrowserScopeState>();--export const getBrowserScopeKey = () => {- const scopeKey = browserScopeStorage.getStore()?.scopeKey;- if (scopeKey === undefined) {- throw new Error("Expected an active browser scope");- }- return scopeKey;-};--const browserContextOptions: BrowserContextOptions = {- ignoreHTTPSErrors: true,- permissions: ["clipboard-read", "clipboard-write"],-};--const isLoopbackHost = (hostname: string) =>- hostname === "127.0.0.1" || hostname === "localhost" || hostname === "::1";--export const getBrowserLaunchOptions = (url = builderUrl): LaunchOptions => {- const hostname = new URL(url).hostname;- if (isLoopbackHost(hostname) === false) {- return {};- }- return {- // Builder tests use project subdomains such as p-project-id.wstd.dev.- args: [- "--host-resolver-rules=MAP wstd.dev 127.0.0.1,MAP *.wstd.dev 127.0.0.1",- ],- };-};--export const startBrowser = async () => {- browser = await chromium.launch(getBrowserLaunchOptions());- context = await browser.newContext(browserContextOptions);-};--export const stopBrowser = async () => {- await context?.close();- await browser?.close();- context = undefined;- browser = undefined;-};--export const createBrowserScopeForBrowser = async (- browserInstance: Pick<Browser, "newContext">-): Promise<BrowserScope> => {- const scopeKey = {};- const createState = async (): Promise<BrowserScopeState> => {- return {- scopeKey,- context: await browserInstance.newContext(browserContextOptions),- isolatedContexts: new Set(),- };- };- let state = await createState();- const closeState = async (target: BrowserScopeState) => {- await Promise.allSettled(- [...target.isolatedContexts].map((isolatedContext) =>- isolatedContext.close()- )- );- target.isolatedContexts.clear();- await target.context.close().catch(() => undefined);- };- return {- run: async (task) => {- const activeState = state;- return await browserScopeStorage.run(activeState, task);- },- reset: async () => {- const previousState = state;- await closeState(previousState);- state = await createState();- },- close: async () => await closeState(state),- };-};--export const createBrowserScope = async (): Promise<BrowserScope> => {- if (browser === undefined) {- throw new Error("Browser is not initialized");- }- return await createBrowserScopeForBrowser(browser);-};--export const newPage = async () => {- const activeContext = browserScopeStorage.getStore()?.context ?? context;- if (activeContext === undefined) {- throw new Error("Browser context is not initialized");- }-- return await activeContext.newPage();-};--export const newIsolatedPage = async () => {- if (browser === undefined) {- throw new Error("Browser is not initialized");- }-- const isolatedContext = await browser.newContext(browserContextOptions);- const scope = browserScopeStorage.getStore();- scope?.isolatedContexts.add(isolatedContext);-- return {- page: await isolatedContext.newPage(),- close: async () => {- scope?.isolatedContexts.delete(isolatedContext);- await isolatedContext.close();- },- };-};--export const getProjectBuilderUrl = ({- projectId,- authToken,- mode,- features,-}: {- projectId: string;- authToken?: string;- mode?: "content" | "preview";- features?: string[];-}) => {- const url = new URL(dashboardUrl);- url.hostname = `p-${projectId}.wstd.dev`;- if (authToken !== undefined) {- url.searchParams.set("authToken", authToken);- }- if (mode !== undefined) {- url.searchParams.set("mode", mode);- }- if (features !== undefined && features.length > 0) {- url.searchParams.set("features", features.join(","));- }- return url.href;-};--export const getProjectIdFromBuilderUrl = (url: string) => {- return parseBuilderUrl(url).projectId;-};--export const assert = (- condition: unknown,- message: string-): asserts condition => {- if (condition === false || condition === undefined || condition === null) {- throw new Error(message);- }-};diff --git a/apps/builder/e2e/print-shards.ts b/apps/builder/e2e/print-shards.tsdeleted file mode 100644index 1563be127f..0000000000--- a/apps/builder/e2e/print-shards.ts+++ /dev/null@@ -1,6 +0,0 @@-import { readdir } from "node:fs/promises";-import { fileURLToPath } from "node:url";-import { getE2eShards } from "./test-modules";--const testDirectory = fileURLToPath(new URL("./tests", import.meta.url));-console.info(JSON.stringify(getE2eShards(await readdir(testDirectory))));diff --git a/apps/builder/e2e/run-local.sh b/apps/builder/e2e/run-local.shindex ce27dea67f..7e402e8bc8 100644--- a/apps/builder/e2e/run-local.sh+++ b/apps/builder/e2e/run-local.sh@@ -3,6 +3,10 @@ set -euo pipefailROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"COMPOSE_OVERRIDE_FILE="$ROOT_DIR/apps/builder/docker-compose.e2e.yaml"+PLAYWRIGHT_ARGS=("$@")+if [ "${PLAYWRIGHT_ARGS[0]:-}" = "--" ]; then+ PLAYWRIGHT_ARGS=("${PLAYWRIGHT_ARGS[@]:1}")+fi# Keep the disposable E2E backend independent from the persistent local# development backend. In particular, E2E cleanup must never remove the local@@ -62,7 +66,7 @@ bootstrap_database() {install_playwright_chromium() {chromium_executable_exists() {pnpm --dir "$ROOT_DIR" --filter=@webstudio-is/builder exec node -e '- const { chromium } = require("playwright");+ const { chromium } = require("@playwright/test");const { existsSync } = require("node:fs");process.exit(existsSync(chromium.executablePath()) ? 0 : 1);' >/dev/null 2>&1@@ -106,25 +110,14 @@ verify_e2e_apps_built() {run_builder_e2e_tests() {(cd "$ROOT_DIR/apps/builder"- pnpm exec tsx --env-file .env --env-file-if-exists .env.development --conditions=webstudio ./e2e/run.ts- )-}--validate_test_filter() {- if [ "${E2E_TEST_FILTER:-}" = "" ] && [ "${E2E_TEST_FILTERS:-}" = "" ] && [ "${E2E_TEST_SHARD:-}" = "" ]; then- return- fi- (- cd "$ROOT_DIR/apps/builder"- E2E_VALIDATE_TEST_FILTER_ONLY=true pnpm exec tsx --env-file .env --env-file-if-exists .env.development --conditions=webstudio ./e2e/run.ts+ if [ "${#PLAYWRIGHT_ARGS[@]}" -eq 0 ]; then+ pnpm e2e:ci+ else+ pnpm e2e:ci "${PLAYWRIGHT_ARGS[@]}"+ fi)}-if [ "$E2E_RUN_TESTS" = "true" ]; then- run_step "validate e2e test filter" "$E2E_TEST_COMMAND_TIMEOUT_SECONDS" \- validate_test_filter-fi-run_step "pull e2e database image" "$E2E_DOCKER_PULL_TIMEOUT_SECONDS" \builder_backend_pull_dbdiff --git a/apps/builder/e2e/run.ts b/apps/builder/e2e/run.tsdeleted file mode 100644index 91f15e9009..0000000000--- a/apps/builder/e2e/run.ts+++ /dev/null@@ -1,343 +0,0 @@-import { spawn, type ChildProcess } from "node:child_process";-import { setTimeout as delay } from "node:timers/promises";-import { readdir } from "node:fs/promises";-import { fileURLToPath } from "node:url";-import {- builderUrl,- createBrowserScope,- dashboardUrl,- getSuites,- newPage,- postgrestUrl,- startBrowser,- stopBrowser,- type BrowserScope,-} from "./harness";-import { resetDatabase } from "./db";-import { logPerf, measure, printPerfSummary } from "./perf";-import { getE2eTestModules, isE2eTestInShard } from "./test-modules";-import { stopChildProcess } from "./process";-import { runWithTimeout } from "./timeout";--const testTimeoutMs =- Number.parseInt(process.env.E2E_TEST_TIMEOUT_MS ?? "", 10) || 120_000;-const testShard = process.env.E2E_TEST_SHARD?.trim();-const testFilters = [- ...(process.env.E2E_TEST_FILTERS ?? "")- .split("\n")- .map((filter) => filter.trim())- .filter(Boolean),- ...(process.env.E2E_TEST_FILTER === undefined- ? []- : [process.env.E2E_TEST_FILTER]),-];--// Shard ownership lives in filenames, so adding a test file requires no second-// registry update and focused shards avoid unrelated fixture setup.-const testModules = getE2eTestModules(- await readdir(fileURLToPath(new URL("./tests", import.meta.url))),- testShard-);--for (const module of testModules) {- await import(module);-}--process.env.NODE_TLS_REJECT_UNAUTHORIZED ??= "0";--const waitForHttp = async ({- url,- timeoutMs,- isReady = (response) => response.status < 500,- consecutiveResponses = 1,-}: {- url: string;- timeoutMs: number;- isReady?: (response: Response) => boolean;- consecutiveResponses?: number;-}) => {- const startedAt = Date.now();- let lastError: unknown;- let readyResponses = 0;-- while (Date.now() - startedAt < timeoutMs) {- try {- const response = await fetch(url);- await response.arrayBuffer();- if (isReady(response)) {- readyResponses += 1;- } else {- readyResponses = 0;- lastError = new Error(`Received HTTP ${response.status}`);- }- if (readyResponses === consecutiveResponses) {- return;- }- } catch (error) {- lastError = error;- readyResponses = 0;- }- await delay(250);- }-- throw new Error(`Timed out waiting for ${url}: ${String(lastError)}`);-};--const waitForPostgrest = async () => {- const url = new URL("/User?select=*", postgrestUrl);- await waitForHttp({- url: url.href,- timeoutMs: 30_000,- isReady: (response) => response.ok,- consecutiveResponses: 3,- });-};--const waitForBuilder = async (child: ChildProcess) => {- await Promise.race([- waitForHttp({ url: builderUrl, timeoutMs: 60_000 }),- new Promise<never>((_, reject) => {- child.once("exit", (code, signal) => {- reject(- new Error(- `Builder server exited before becoming ready: code=${code}, signal=${signal}`- )- );- });- }),- ]);-};--const warmLoginRoute = async () => {- const page = await newPage();- try {- await page.goto(`${dashboardUrl}/login`);- await page- .getByRole("button", { name: "Login with Secret" })- .waitFor({ state: "visible", timeout: 60_000 });- } finally {- await page.close();- }-};--const pipeBuilderOutput = (child: ChildProcess) => {- child.stdout?.on("data", (chunk) => {- process.stdout.write(`[builder] ${chunk}`);- });- child.stderr?.on("data", (chunk) => {- process.stderr.write(`[builder] ${chunk}`);- });-};--const runSuiteTests = async ({- suite,- tests,- browserScope,- onTimeout,-}: {- suite: ReturnType<typeof getSuites>[number];- tests: ReturnType<typeof getSuites>[number]["tests"];- browserScope: BrowserScope;- onTimeout: () => Promise<void>;-}) => {- try {- for (const test of tests) {- const startedAt = Date.now();- await runWithTimeout({- name: `${suite.name} › ${test.name}`,- timeoutMs: testTimeoutMs,- onTimeout,- task: async () =>- await browserScope.run(async () => {- await suite.beforeEach?.();- await test.run();- }),- });- const duration = Date.now() - startedAt;- console.info(`✓ ${suite.name} › ${test.name} (${duration}ms)`);- }- } finally {- const afterAllStartedAt = Date.now();- await runWithTimeout({- name: `${suite.name} afterAll`,- timeoutMs: testTimeoutMs,- onTimeout,- task: async () => {- await browserScope.run(async () => await suite.afterAll?.());- },- });- logPerf(`${suite.name} afterAll`, afterAllStartedAt);- }-};--const startBuiltBuilder = async () => {- const child = spawn(- "pnpm",- ["exec", "tsx", "--conditions=webstudio", "./e2e/serve-built-remix.ts"],- {- cwd: new URL("..", import.meta.url),- env: process.env,- stdio: ["ignore", "pipe", "pipe"],- }- );-- pipeBuilderOutput(child);- return child;-};--const startBuilder = async (): Promise<ChildProcess | undefined> => {- if (process.env.E2E_BUILDER_URL !== undefined) {- return undefined;- }-- const server = await startBuiltBuilder();- try {- await waitForBuilder(server);- } catch (error) {- await stopBuilder(server);- throw error;- }- return server;-};--const stopBuilder = async (child: ChildProcess | undefined) => {- if (child === undefined) {- return;- }- await stopChildProcess(child);-};--const getRunnableSuites = () => {- const suites = getSuites().map((suite, suiteIndex) => ({- suite,- tests: suite.tests.filter((test, testIndex) => {- // Offset each suite so odd test counts do not always give the extra- // test to the same worker.- if (- isE2eTestInShard({- fileName: suite.fileName,- shard: testShard,- distributionIndex: testIndex + suiteIndex,- }) === false- ) {- return false;- }- if (testFilters.length === 0) {- return true;- }- const fullName = `${suite.name} › ${test.name}`;- return testFilters.some(- (filter) => test.name.includes(filter) || fullName.includes(filter)- );- }),- }));-- const runnableSuites = suites.filter(({ tests }) => tests.length > 0);-- if (testShard !== undefined && testShard !== "" && suites.length === 0) {- const availableFiles = getSuites().map((suite) => suite.fileName);- throw new Error(- [- `E2E_TEST_SHARD did not match any test files: ${JSON.stringify(testShard)}`,- "Available test files:",- ...availableFiles.map((file) => `- ${file}`),- ].join("\n")- );- }-- if (testFilters.length > 0 && runnableSuites.length === 0) {- const availableTests = suites.flatMap(({ suite }) =>- suite.tests.map((test) => `${suite.name} › ${test.name}`)- );- throw new Error(- [- `E2E_TEST_FILTERS did not match any tests: ${JSON.stringify(testFilters)}`,- "Available tests:",- ...availableTests.map((name) => `- ${name}`),- ].join("\n")- );- }-- return runnableSuites;-};--const run = async () => {- const totalStartedAt = Date.now();- const bootStartedAt = Date.now();- let builder: ChildProcess | undefined;- const browserScopes: BrowserScope[] = [];-- try {- const runnableSuites = getRunnableSuites();- if (process.env.E2E_VALIDATE_TEST_FILTER_ONLY === "true") {- return;- }- const postgrestReady = measure("wait for postgrest", async () => {- await waitForPostgrest();- });- const builderReady = measure("start builder", startBuilder);- const browserReady = measure("start browser", startBrowser);- builder = await builderReady;- await postgrestReady;- await browserReady;- await measure("warm login route", warmLoginRoute);- logPerf("boot builder/browser", bootStartedAt);- const testsStartedAt = Date.now();-- await measure("reset database", resetDatabase);-- const scopedSuites = await Promise.all(- runnableSuites.map(async (runnableSuite) => {- const browserScope = await createBrowserScope();- browserScopes.push(browserScope);- return { ...runnableSuite, browserScope };- })- );- let resetAllBrowserScopesPromise: Promise<void> | undefined;- const resetAllBrowserScopes = () => {- resetAllBrowserScopesPromise ??= Promise.allSettled(- browserScopes.map((scope) => scope.reset())- ).then(() => undefined);- return resetAllBrowserScopesPromise;- };-- for (const { suite, browserScope } of scopedSuites) {- const beforeAllStartedAt = Date.now();- await runWithTimeout({- name: `${suite.name} beforeAll`,- timeoutMs: testTimeoutMs,- onTimeout: resetAllBrowserScopes,- task: async () => {- await browserScope.run(async () => await suite.beforeAll?.());- },- });- logPerf(`${suite.name} beforeAll`, beforeAllStartedAt);- }-- await Promise.all(- scopedSuites.map(async ({ suite, tests, browserScope }) => {- const suiteStartedAt = Date.now();- await runSuiteTests({- suite,- tests,- browserScope,- onTimeout: resetAllBrowserScopes,- });- const suiteDuration = Date.now() - suiteStartedAt;- console.info(`✓ ${suite.name} completed (${suiteDuration}ms)`);- })- );- logPerf("tests", testsStartedAt);- } finally {- await Promise.allSettled(browserScopes.map((scope) => scope.close()));- await stopBrowser();- await stopBuilder(builder);- logPerf("runner total", totalStartedAt);- printPerfSummary();- }-};--run().catch(async (error) => {- console.error(error);- process.exit(1);-});diff --git a/apps/builder/e2e/setup.ts b/apps/builder/e2e/setup.tsnew file mode 100644index 0000000000..261f2beef1--- /dev/null+++ b/apps/builder/e2e/setup.ts@@ -0,0 +1,43 @@+import { setTimeout as delay } from "node:timers/promises";+import { resetDatabase } from "./db";+import { dashboardUrl, postgrestUrl, test } from "./test";++process.env.NODE_TLS_REJECT_UNAUTHORIZED ??= "0";++const waitForPostgrest = async () => {+ const url = new URL("/User?select=*", postgrestUrl);+ const startedAt = Date.now();+ let lastError: unknown;+ let readyResponses = 0;++ while (Date.now() - startedAt < 30_000) {+ try {+ const response = await fetch(url);+ await response.arrayBuffer();+ if (response.ok) {+ readyResponses += 1;+ } else {+ readyResponses = 0;+ lastError = new Error(`Received HTTP ${response.status}`);+ }+ if (readyResponses === 3) {+ return;+ }+ } catch (error) {+ lastError = error;+ readyResponses = 0;+ }+ await delay(250);+ }++ throw new Error(`Timed out waiting for ${url.href}: ${String(lastError)}`);+};++test("prepare Builder E2E environment", async ({ page }) => {+ await waitForPostgrest();+ await resetDatabase();+ await page.goto(`${dashboardUrl}/login`);+ await page+ .getByRole("button", { name: "Login with Secret" })+ .waitFor({ state: "visible", timeout: 60_000 });+});diff --git a/apps/builder/e2e/test-modules.test.ts b/apps/builder/e2e/test-modules.test.tsdeleted file mode 100644index 397491308d..0000000000--- a/apps/builder/e2e/test-modules.test.ts+++ /dev/null@@ -1,76 +0,0 @@-import { expect, test } from "vitest";-import {- getE2eFileShards,- getE2eShards,- getE2eSuiteName,- getE2eTestModules,- isE2eTestInShard,-} from "./test-modules";--test("formats suite names using the shared shard filename syntax", () => {- expect(- getE2eSuiteName("pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts")- ).toBe("pages actions");- expect(getE2eSuiteName("asset-canvas-drag.[shard-4].e2e.ts")).toBe(- "asset canvas drag"- );-});--test("discovers every e2e module and filters ownership by shard tag", () => {- const files = [- "asset-folders-selection-actions.[shard-4].e2e.ts",- "pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts",- "pages-drag.[shard-3].e2e.ts",- "navigator-drag.[shard-1].e2e.ts",- "helper.ts",- ];-- expect(getE2eTestModules(files)).toEqual([- "./tests/asset-folders-selection-actions.[shard-4].e2e.ts",- "./tests/navigator-drag.[shard-1].e2e.ts",- "./tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts",- "./tests/pages-drag.[shard-3].e2e.ts",- ]);- expect(getE2eTestModules(files, "shard-3")).toEqual([- "./tests/pages-drag.[shard-3].e2e.ts",- ]);- expect(getE2eTestModules(files, "shard-4")).toEqual([- "./tests/asset-folders-selection-actions.[shard-4].e2e.ts",- ]);- expect(getE2eTestModules(files, "shard-5")).toEqual([- "./tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts",- ]);-});--test("discovers the shard matrix from e2e filenames", () => {- expect(- getE2eShards([- "second.[shard-2].[shard-10].e2e.ts",- "first.[shard-1].e2e.ts",- "helper.ts",- ])- ).toEqual(["shard-1", "shard-2", "shard-10"]);- expect(() => getE2eShards(["unassigned.e2e.ts"])).toThrow(- "Every e2e file must have a shard tag"- );-});--test("partitions a multi-shard file by test registration order", () => {- const fileName = "pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts";- expect(getE2eFileShards(fileName)).toEqual(["shard-2", "shard-5", "shard-6"]);- expect(- [0, 1, 2, 3, 4].filter((distributionIndex) =>- isE2eTestInShard({ fileName, shard: "shard-2", distributionIndex })- )- ).toEqual([0, 3]);- expect(- [0, 1, 2, 3, 4].filter((distributionIndex) =>- isE2eTestInShard({ fileName, shard: "shard-5", distributionIndex })- )- ).toEqual([1, 4]);- expect(- [0, 1, 2, 3, 4].filter((distributionIndex) =>- isE2eTestInShard({ fileName, shard: "shard-6", distributionIndex })- )- ).toEqual([2]);-});diff --git a/apps/builder/e2e/test-modules.ts b/apps/builder/e2e/test-modules.tsdeleted file mode 100644index 776e13a9d6..0000000000--- a/apps/builder/e2e/test-modules.ts+++ /dev/null@@ -1,63 +0,0 @@-const e2eFileSuffix = ".e2e.ts";-const shardNamePattern = "shard-\\d+";-const shardTagPattern = new RegExp(`\\[(${shardNamePattern})\\]`, "g");-const trailingShardTagsPattern = new RegExp(`(\\.\\[${shardNamePattern}\\])+$`);--export const getE2eFileShards = (fileName: string) =>- [...fileName.matchAll(shardTagPattern)].map((match) => match[1]);--export const getE2eSuiteName = (fileName: string) => {- const name = fileName.endsWith(e2eFileSuffix)- ? fileName.slice(0, -e2eFileSuffix.length)- : fileName;- return name.replace(trailingShardTagsPattern, "").replaceAll("-", " ");-};--export const getE2eShards = (fileNames: readonly string[]) => {- const e2eFiles = fileNames- .filter((fileName) => fileName.endsWith(e2eFileSuffix))- .map((fileName) => ({ fileName, shards: getE2eFileShards(fileName) }));- const unassignedFiles = e2eFiles- .filter(({ shards }) => shards.length === 0)- .map(({ fileName }) => fileName);- if (unassignedFiles.length > 0) {- throw new Error(- `Every e2e file must have a shard tag: ${unassignedFiles.join(", ")}`- );- }- return [...new Set(e2eFiles.flatMap(({ shards }) => shards))].sort(- (left, right) => left.localeCompare(right, undefined, { numeric: true })- );-};--export const getE2eTestModules = (- fileNames: readonly string[],- shard?: string-) =>- fileNames- .filter((fileName) => fileName.endsWith(e2eFileSuffix))- .filter(- (fileName) =>- shard === undefined ||- shard === "" ||- getE2eFileShards(fileName).includes(shard)- )- .sort()- .map((fileName) => `./tests/${fileName}`);--export const isE2eTestInShard = ({- fileName,- shard,- distributionIndex,-}: {- fileName: string;- shard: string | undefined;- distributionIndex: number;-}) => {- if (shard === undefined || shard === "") {- return true;- }- const shards = getE2eFileShards(fileName);- const shardIndex = shards.indexOf(shard);- return shardIndex !== -1 && distributionIndex % shards.length === shardIndex;-};diff --git a/apps/builder/e2e/test.test.ts b/apps/builder/e2e/test.test.tsnew file mode 100644index 0000000000..357fc5993a--- /dev/null+++ b/apps/builder/e2e/test.test.ts@@ -0,0 +1,14 @@+import { expect, test } from "vitest";+import { getBrowserLaunchOptions } from "./test";++test("maps Builder and project wstd.dev hosts to loopback for local runs", () => {+ expect(getBrowserLaunchOptions("https://127.0.0.1:3000")).toEqual({+ args: [+ "--host-resolver-rules=MAP wstd.dev 127.0.0.1,MAP *.wstd.dev 127.0.0.1",+ ],+ });+});++test("does not override host resolution for remote Builder URLs", () => {+ expect(getBrowserLaunchOptions("https://builder.example.com")).toEqual({});+});diff --git a/apps/builder/e2e/test.ts b/apps/builder/e2e/test.tsnew file mode 100644index 0000000000..a5a26ae5a7--- /dev/null+++ b/apps/builder/e2e/test.ts@@ -0,0 +1,103 @@+import { parseBuilderUrl } from "@webstudio-is/protocol";+import {+ test as base,+ type Browser,+ type BrowserContextOptions,+} from "@playwright/test";+import env from "../app/env/env.server";++const builderPort = process.env.PORT ?? "3000";++export const builderUrl =+ process.env.E2E_BUILDER_URL ?? `https://127.0.0.1:${builderPort}`;++const builderUrlObject = new URL(builderUrl);++export const dashboardUrl = `${builderUrlObject.protocol}//wstd.dev:${builderUrlObject.port}`;++export const postgrestUrl = env.POSTGREST_URL;++const browserContextOptions: BrowserContextOptions = {+ ignoreHTTPSErrors: true,+ permissions: ["clipboard-read", "clipboard-write"],+};++const isLoopbackHost = (hostname: string) =>+ hostname === "127.0.0.1" || hostname === "localhost" || hostname === "::1";++export const getBrowserLaunchOptions = (url = builderUrl) => {+ const hostname = new URL(url).hostname;+ if (isLoopbackHost(hostname) === false) {+ return {};+ }+ return {+ args: [+ "--host-resolver-rules=MAP wstd.dev 127.0.0.1,MAP *.wstd.dev 127.0.0.1",+ ],+ };+};++export const test = base;++export const newBrowserContext = (browser: Browser) =>+ browser.newContext(browserContextOptions);++export const withBrowserContext = async <Result>(+ browser: Browser,+ run: (+ context: Awaited<ReturnType<typeof newBrowserContext>>+ ) => Promise<Result> | Result+) => {+ const context = await newBrowserContext(browser);+ try {+ return await run(context);+ } finally {+ await context.close();+ }+};++export const newIsolatedPage = async (browser: Browser) => {+ const context = await newBrowserContext(browser);+ return {+ page: await context.newPage(),+ close: async () => await context.close(),+ };+};++export const getProjectBuilderUrl = ({+ projectId,+ authToken,+ mode,+ features,+}: {+ projectId: string;+ authToken?: string;+ mode?: "content" | "preview";+ features?: string[];+}) => {+ const url = new URL(dashboardUrl);+ url.hostname = `p-${projectId}.wstd.dev`;+ if (authToken !== undefined) {+ url.searchParams.set("authToken", authToken);+ }+ if (mode !== undefined) {+ url.searchParams.set("mode", mode);+ }+ if (features !== undefined && features.length > 0) {+ url.searchParams.set("features", features.join(","));+ }+ return url.href;+};++export const getProjectIdFromBuilderUrl = (url: string) => {+ return parseBuilderUrl(url).projectId;+};++export const assert = (+ condition: unknown,+ message: string+): asserts condition => {+ if (condition === false || condition === undefined || condition === null) {+ throw new Error(message);+ }+};diff --git a/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts b/apps/builder/e2e/tests/animation-runtime.e2e.tssimilarity index 95%rename from apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.tsrename to apps/builder/e2e/tests/animation-runtime.e2e.tsindex f249bf1481..2792ebd94a 100644--- a/apps/builder/e2e/tests/animation-runtime.[shard-1].e2e.ts+++ b/apps/builder/e2e/tests/animation-runtime.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { loadDevBuild } from "../db";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { selectCanvasTextInstance } from "../flows/canvas-selection";@@ -9,7 +9,7 @@ import {waitForSyncStatus,} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";const openCommandPanel = async ({ page }: { page: Page }) => {@@ -143,19 +143,23 @@ const waitForPersistedAnimation = async ({throw lastError;};-test("Builder animation UI creates supported animation props that persist and build", async () => {+test("Builder animation UI creates supported animation props that persist and build", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Animation Runtime",assetNamePrefix: "animation-runtime-",editorToken: "animation-runtime-editor-token",builderToken: "animation-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";const wrapperName = "Animation Group";- const presetName = "Fade In";+ const presetName = "Fade in";try {await measure("animation runtime open builder", async () => {diff --git a/apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.ts b/apps/builder/e2e/tests/asset-canvas-drag.e2e.tssimilarity index 88%rename from apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.tsrename to apps/builder/e2e/tests/asset-canvas-drag.e2e.tsindex 1f224c78a0..77dc512f90 100644--- a/apps/builder/e2e/tests/asset-canvas-drag.[shard-4].e2e.ts+++ b/apps/builder/e2e/tests/asset-canvas-drag.e2e.ts@@ -7,11 +7,14 @@ import {import { openAssetsPanel, uploadAsset } from "../flows/assets-panel";import { getCanvasInstance, openProjectBuilder } from "../flows/builder";import { dragToCanvas, ensureInteractiveCanvas } from "../flows/drag";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";-test("Dragging an image asset onto canvas inserts a bound Image", async () => {- const fixture = await createDragProject("asset-canvas");- const { page, close } = await newIsolatedPage();+test("Dragging an image asset onto canvas inserts a bound Image", async ({+ browser,+ context,+}) => {+ const fixture = await createDragProject(context, "asset-canvas");+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await openProjectBuilder({page,diff --git a/apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.ts b/apps/builder/e2e/tests/asset-folders-selection-actions.e2e.tssimilarity index 95%rename from apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.tsrename to apps/builder/e2e/tests/asset-folders-selection-actions.e2e.tsindex 6e8beb1fd7..52b64f07a4 100644--- a/apps/builder/e2e/tests/asset-folders-selection-actions.[shard-4].e2e.ts+++ b/apps/builder/e2e/tests/asset-folders-selection-actions.e2e.ts@@ -10,15 +10,19 @@ import {waitForSyncStatus,} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";-test("Assets can be selected by dragging across the panel", async () => {+test("Assets can be selected by dragging across the panel", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Lasso Select E2E",builderToken: "asset-folder-lasso-select-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -82,13 +86,17 @@ test("Assets can be selected by dragging across the panel", async () => {}});-test("Multiselected folders can be dragged into a folder", async () => {+test("Multiselected folders can be dragged into a folder", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Multifolder Drag E2E",builderToken: "asset-folder-multifolder-drag-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -140,13 +148,17 @@ test("Multiselected folders can be dragged into a folder", async () => {}});-test("Dragging an asset auto-scrolls a long folder list", async () => {+test("Dragging an asset auto-scrolls a long folder list", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Autoscroll E2E",builderToken: "asset-folder-autoscroll-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -259,13 +271,17 @@ test("Dragging an asset auto-scrolls a long folder list", async () => {}});-test("Multiselected assets can be moved from the context menu", async () => {+test("Multiselected assets can be moved from the context menu", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Menu Move E2E",builderToken: "asset-folder-menu-move-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -316,13 +332,17 @@ test("Multiselected assets can be moved from the context menu", async () => {}});-test("Folders can be multiselected and deleted as one operation", async () => {+test("Folders can be multiselected and deleted as one operation", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Multiselect E2E",builderToken: "asset-folder-multiselect-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const folderNames = ["Alpha", "Bravo", "Charlie"];try {diff --git a/apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/asset-folders.e2e.tssimilarity index 93%rename from apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/asset-folders.e2e.tsindex 48f1420afe..bf308b7c7f 100644--- a/apps/builder/e2e/tests/asset-folders.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/asset-folders.e2e.ts@@ -12,18 +12,21 @@ import {waitForSyncStatus,} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { dashboardUrl, newIsolatedPage, newPage, test } from "../harness";+import { dashboardUrl, newIsolatedPage, test } from "../test";-test("Cloning a project preserves nested asset folders", async () => {+test("Cloning a project preserves nested asset folders", async ({+ context,+}) => {const email = "[email protected]";const sourceTitle = "Asset Folder Clone Source";const cloneTitle = "Asset Folder Clone Result";const fixture = await createContentModeProject({+ context: context,email,title: sourceTitle,builderToken: "asset-folder-clone-e2e-builder-token",});- const page = await newPage();+ const page = await context.newPage();try {await openProjectBuilder({@@ -72,13 +75,14 @@ test("Cloning a project preserves nested asset folders", async () => {}});-test("Asset can be dragged into a folder", async () => {+test("Asset can be dragged into a folder", async ({ browser, context }) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Drag E2E",builderToken: "asset-folder-drag-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const filename = "upload-image.svg";const folderName = "Images";@@ -113,13 +117,17 @@ test("Asset can be dragged into a folder", async () => {}});-test("Dragging over Back navigates to parent folders before dropping", async () => {+test("Dragging over Back navigates to parent folders before dropping", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Back Drag E2E",builderToken: "asset-folder-back-drag-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -205,13 +213,17 @@ test("Dragging over Back navigates to parent folders before dropping", async ()}});-test("Asset folder changes wait until the nested selector loses focus", async () => {+test("Asset folder changes wait until the nested selector loses focus", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Selector E2E",builderToken: "asset-folder-selector-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({@@ -266,13 +278,17 @@ test("Asset folder changes wait until the nested selector loses focus", async ()}});-test("Multiselected assets can be dragged into a folder", async () => {+test("Multiselected assets can be dragged into a folder", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Folder Multidrag E2E",builderToken: "asset-folder-multidrag-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const folderName = "Selected assets";try {diff --git a/apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/canvas-drag.e2e.tssimilarity index 85%rename from apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/canvas-drag.e2e.tsindex a851cbfca9..ccca225277 100644--- a/apps/builder/e2e/tests/canvas-drag.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/canvas-drag.e2e.ts@@ -7,16 +7,20 @@ import {} from "../fixtures/drag-project";import { getCanvasInstance, openProjectBuilder } from "../flows/builder";import { dragToCanvas, ensureInteractiveCanvas } from "../flows/drag";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";let fixture: Awaited<ReturnType<typeof createDragProject>>;-test.beforeAll(async () => {- fixture = await createDragProject("canvas");+test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createDragProject(context, "canvas")+ );});-test("Canvas pointer drag reparents a heading and inserts a component", async () => {- const { page, close } = await newIsolatedPage();+test("Canvas pointer drag reparents a heading and inserts a component", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await openProjectBuilder({page,diff --git a/apps/builder/e2e/tests/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/content-mode-assets.e2e.tssimilarity index 93%rename from apps/builder/e2e/tests/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/content-mode-assets.e2e.tsindex 7b463ac66e..6bec864ea0 100644--- a/apps/builder/e2e/tests/content-mode-assets.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/content-mode-assets.e2e.ts@@ -23,21 +23,23 @@ import {waitForSyncStatus,} from "../flows/sync-status";import { insertTemplateAfterCanvasText } from "../flows/template-insertion";-import {- getSharedContentModeProject,- setupSharedContentModeProject,- createContentModeProject,-} from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { createContentModeProject } from "../fixtures/content-mode-suite";+import type { SeededContentModeProject } from "../fixtures/content-mode-project";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";-test.beforeAll(async () => {- await setupSharedContentModeProject();+let fixture: SeededContentModeProject;++test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createContentModeProject({ context })+ );});-test("Editor can insert content templates with assets and styles", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can insert content templates with assets and styles", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await measure("content mode open editor for asset template", async () => {@@ -164,9 +166,10 @@ test("Editor can insert content templates with assets and styles", async () => {}});-test("Editor can upload, replace, and delete asset in content mode", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can upload, replace, and delete asset in content mode", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const uploadFilename = "upload-image.svg";const replacementFilename = "replacement-image.svg";@@ -235,9 +238,10 @@ test("Editor can upload, replace, and delete asset in content mode", async () =>}});-test("Editor can replace image source with asset in content mode", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can replace image source with asset in content mode", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const uploadFilename = "upload-image.svg";const replacementFilename = "replacement-image.svg";@@ -329,15 +333,19 @@ test("Editor can replace image source with asset in content mode", async () => {}});-test("Builder copy/paste preserves image asset references after reload", async () => {+test("Builder copy/paste preserves image asset references after reload", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Asset Copy E2E",assetNamePrefix: "asset-copy-",editorToken: "asset-copy-e2e-editor-token",builderToken: "asset-copy-e2e-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const getImageAssetReferenceCount = async () => {const build = await loadDevBuild({ projectId: fixture.projectId });diff --git a/apps/builder/e2e/tests/content-mode-editing.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/content-mode-content-editing.e2e.tssimilarity index 95%rename from apps/builder/e2e/tests/content-mode-editing.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/content-mode-content-editing.e2e.tsindex e1f803cb6f..60611eb51e 100644--- a/apps/builder/e2e/tests/content-mode-editing.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/content-mode-content-editing.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { deleteContentBlockChildAfterCanvasText } from "../flows/block-outline";import {openProjectBuilder,@@ -30,11 +30,9 @@ import {} from "../flows/pages-panel";import { waitForSyncStatus } from "../flows/sync-status";import { insertTemplateAfterCanvasText } from "../flows/template-insertion";-import {- getSharedContentModeProject,- setupSharedContentModeProject,-} from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { createContentModeProject } from "../fixtures/content-mode-suite";+import type { SeededContentModeProject } from "../fixtures/content-mode-project";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";@@ -151,12 +149,17 @@ const redoShortcut = async ({ page }: { page: Page }) => {await waitForSyncStatus({ page, status: "idle" });};-test.beforeAll(async () => {- await setupSharedContentModeProject();+let fixture: SeededContentModeProject;++test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createContentModeProject({ context })+ );});-test("Editor can delete direct children but not protected containers", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can delete direct children but not protected containers", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await measure(@@ -259,15 +262,16 @@ test("Editor can delete direct children but not protected containers", async ()}});-test("Editor can edit text and content props but not design props", async () => {- const fixture = getSharedContentModeProject();+test("Editor can edit text and content props but not design props", async ({+ browser,+}) => {const editedHref = "/edited-link";const editedImageSrc ="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='80'%3E%3Crect width='120' height='80' fill='%23dff7e8'/%3E%3C/svg%3E";const editedImageAlt = "Edited image alt";const editedVideoSrc = "https://example.com/edited-video.mp4";const editedContent = "Edited isolated content";- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await measure("content mode open editor for props", async () => {@@ -438,10 +442,11 @@ test("Editor can edit text and content props but not design props", async () =>}});-test("Editor can paste text while editing canvas content", async () => {- const fixture = getSharedContentModeProject();+test("Editor can paste text while editing canvas content", async ({+ browser,+}) => {const pastedContent = "Pasted editable content";- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await measure("content mode open editor for text paste", async () => {@@ -478,11 +483,12 @@ test("Editor can paste text while editing canvas content", async () => {}});-test("Editor rich text formatting persists after reload", async () => {- const fixture = getSharedContentModeProject();+test("Editor rich text formatting persists after reload", async ({+ browser,+}) => {const formattedText = "Rich editor formatted copy";const editedHref = "/rich-text-editor-link";- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await measure(diff --git a/apps/builder/e2e/tests/content-mode-editing.[shard-3].e2e.ts b/apps/builder/e2e/tests/content-mode-pages.e2e.tssimilarity index 92%rename from apps/builder/e2e/tests/content-mode-editing.[shard-3].e2e.tsrename to apps/builder/e2e/tests/content-mode-pages.e2e.tsindex a18baa931b..463badf841 100644--- a/apps/builder/e2e/tests/content-mode-editing.[shard-3].e2e.ts+++ b/apps/builder/e2e/tests/content-mode-pages.e2e.ts@@ -17,19 +17,22 @@ import {} from "../flows/pages-panel";import { waitForSyncStatus } from "../flows/sync-status";import { insertTemplateAfterCanvasText } from "../flows/template-insertion";-import {- getSharedContentModeProject,- setupSharedContentModeProject,-} from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { createContentModeProject } from "../fixtures/content-mode-suite";+import type { SeededContentModeProject } from "../fixtures/content-mode-project";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";-test.beforeAll(async () => {- await setupSharedContentModeProject();+let fixture: SeededContentModeProject;++test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createContentModeProject({ context })+ );});-test("Editor can create styled page from template in content mode", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can create styled page from template in content mode", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const pageName = "Created content page";try {@@ -116,9 +119,8 @@ test("Editor can create styled page from template in content mode", async () =>}});-test("Editor can edit allowed page settings", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor can edit allowed page settings", async ({ browser }) => {+ const { page, close } = await newIsolatedPage(browser);const pageName = "Settings content page";const editedName = "Edited settings content page";const editedPath = "/edited-settings-content-page";@@ -238,9 +240,10 @@ test("Editor can edit allowed page settings", async () => {}});-test("Editor is blocked from invalid paths and restricted page settings", async () => {- const fixture = getSharedContentModeProject();- const { page, close } = await newIsolatedPage();+test("Editor is blocked from invalid paths and restricted page settings", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const pageName = "Blocked settings content page";const invalidPaths = ["/posts/:slug", "/docs/*", "https://x.com"];@@ -281,10 +284,11 @@ test("Editor is blocked from invalid paths and restricted page settings", async}});-test("Edit-only and build-capable users can collaborate in content mode", async () => {- const fixture = getSharedContentModeProject();- const editor = await newIsolatedPage();- const builder = await newIsolatedPage();+test("Edit-only and build-capable users can collaborate in content mode", async ({+ browser,+}) => {+ const editor = await newIsolatedPage(browser);+ const builder = await newIsolatedPage(browser);try {await measure("open editor and builder sessions", async () => {diff --git a/apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/data-variables-generated.e2e.tssimilarity index 90%rename from apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/data-variables-generated.e2e.tsindex 98840c79b7..2993ba8b66 100644--- a/apps/builder/e2e/tests/data-variables-generated.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/data-variables-generated.e2e.ts@@ -1,3 +1,4 @@+import type { BrowserContext } from "@playwright/test";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import {bindSelectedTextContentToExpression,@@ -11,21 +12,24 @@ import {import { loginWithSecret } from "../flows/dashboard";import { expectGeneratedAppToRender } from "../flows/generated-app";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";const openGeneratedResourceProject = async ({+ context,page,email,title,assetNamePrefix,}: {+ context: BrowserContext;page: Awaited<ReturnType<typeof newIsolatedPage>>["page"];email: string;title: string;assetNamePrefix: string;}) => {const fixture = await createContentModeProject({+ context,email,title,assetNamePrefix,@@ -65,8 +69,11 @@ const reloadAndSelectContent = async ({});};-test("Generated app fetches and renders a Builder-created HTTP resource", async () => {- const { page, close } = await newIsolatedPage();+test("Generated app fetches and renders a Builder-created HTTP resource", async ({+ browser,+ context,+}) => {+ const { page, close } = await newIsolatedPage(browser);const resource = await startJsonResourceServer({title: "Rendered from local HTTP resource",});@@ -74,6 +81,7 @@ test("Generated app fetches and renders a Builder-created HTTP resource", asynctry {const fixture = await openGeneratedResourceProject({+ context: context,page,email: "[email protected]",title: "Generated HTTP Resource",@@ -109,8 +117,11 @@ test("Generated app fetches and renders a Builder-created HTTP resource", async}});-test("Generated app fetches and renders a Builder-created GraphQL resource", async () => {- const { page, close } = await newIsolatedPage();+test("Generated app fetches and renders a Builder-created GraphQL resource", async ({+ browser,+ context,+}) => {+ const { page, close } = await newIsolatedPage(browser);const resource = await startGraphqlResourceServer({title: "Rendered from local GraphQL resource",});@@ -118,6 +129,7 @@ test("Generated app fetches and renders a Builder-created GraphQL resource", asytry {const fixture = await openGeneratedResourceProject({+ context: context,page,email: "[email protected]",title: "Generated GraphQL Resource",@@ -152,13 +164,17 @@ test("Generated app fetches and renders a Builder-created GraphQL resource", asy}});-test("Generated app renders a Builder-created current-date system resource", async () => {- const { page, close } = await newIsolatedPage();+test("Generated app renders a Builder-created current-date system resource", async ({+ browser,+ context,+}) => {+ const { page, close } = await newIsolatedPage(browser);const resourceName = "e2eGeneratedCurrentDate";const expectedYear = String(new Date().getUTCFullYear());try {const fixture = await openGeneratedResourceProject({+ context: context,page,email: "[email protected]",title: "Generated System Resource",diff --git a/apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/data-variables-runtime.e2e.tssimilarity index 97%rename from apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/data-variables-runtime.e2e.tsindex 000ff08420..90ca4d4196 100644--- a/apps/builder/e2e/tests/data-variables-runtime.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/data-variables-runtime.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import {bindSelectedTextContentToExpression,@@ -14,7 +14,7 @@ import {import { createContentModeProject } from "../fixtures/content-mode-suite";import { loginWithSecret } from "../flows/dashboard";import { expectGeneratedAppToRender } from "../flows/generated-app";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";@@ -87,7 +87,7 @@ const closeVariablePanelAndWaitForSave = async ({ page }: { page: Page }) => {await page.getByRole("button", { name: "Close" }).last().click();await save;await page- .getByText("New Variable", { exact: true })+ .getByText("New variable", { exact: true }).waitFor({ state: "hidden" });await waitForSyncStatus({ page, status: "idle" });};@@ -95,7 +95,7 @@ const closeVariablePanelAndWaitForSave = async ({ page }: { page: Page }) => {const openNewVariablePanel = async ({ page }: { page: Page }) => {await page.getByRole("tab", { name: "Settings" }).click();await page.getByRole("button", { name: "Add data variable" }).click();- await page.getByText("New Variable", { exact: true }).waitFor();+ await page.getByText("New variable", { exact: true }).waitFor();};const createStringVariable = async ({@@ -334,16 +334,20 @@ const expectPersistedDataVariables = async ({}};-test("Builder-created data variables and resources persist after reload", async () => {+test("Builder-created data variables and resources persist after reload", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Data Variables Runtime",assetNamePrefix: "data-variables-runtime-",editorToken: "data-variables-runtime-editor-token",builderToken: "data-variables-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const staticName = "e2eStaticLabel";const staticValue = "Created from Builder UI";const editedStaticValue = "Edited from Builder UI";@@ -540,16 +544,20 @@ test("Builder-created data variables and resources persist after reload", async}});-test("Text Content can bind to a Builder-created variable and persist after reload", async () => {+test("Text Content can bind to a Builder-created variable and persist after reload", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Text Content Binding",assetNamePrefix: "text-content-binding-",editorToken: "text-content-binding-editor-token",builderToken: "text-content-binding-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const staticName = "e2eTextBindingLabel";const staticValue = "Bound Text Content";diff --git a/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts b/apps/builder/e2e/tests/mdx-content-block.e2e.tssimilarity index 96%rename from apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.tsrename to apps/builder/e2e/tests/mdx-content-block.e2e.tsindex 340adaa903..d0fa8624d3 100644--- a/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts+++ b/apps/builder/e2e/tests/mdx-content-block.e2e.ts@@ -1,4 +1,4 @@-import type { Page, Response } from "playwright";+import type { Page, Response } from "@playwright/test";import { parseMdxDocument } from "@webstudio-is/content-engine/mdx";import {configureDynamicDetailContentBlock,@@ -31,7 +31,7 @@ import { insertTemplateAfterCanvasText } from "../flows/template-insertion";import { openNavigatorPanel } from "../flows/navigator";import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";import { fillSelectedStringProperty } from "../flows/props-panel";-import { getProjectBuilderUrl, newIsolatedPage, test } from "../harness";+import { getProjectBuilderUrl, newIsolatedPage, test } from "../test";const sourceFilename = "content-source.mdx";const alternateFilename = "alternate-source.mdx";@@ -145,13 +145,17 @@ const openFixture = async ({await waitForSyncStatus({ page, status: "idle" });};-test("Content Block MDX source lifecycle persists edits and resets to empty", async () => {+test("Content Block MDX source lifecycle persists edits and resets to empty", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "MDX Content Source E2E",});await configureRepresentableContentBlockBody(fixture.projectId);- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({@@ -409,13 +413,17 @@ test("Content Block MDX source lifecycle persists edits and resets to empty", as}});-test("Empty MDX content supports insertion and keeps the next paragraph focused", async () => {+test("Empty MDX content supports insertion and keeps the next paragraph focused", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Empty MDX Content Source E2E",});await configureEmptyHeadingTemplate(fixture.projectId);- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({@@ -510,12 +518,16 @@ test("Empty MDX content supports insertion and keeps the next paragraph focused"}});-test("Content Block requires a Builder reload after a stale file revision", async () => {+test("Content Block requires a Builder reload after a stale file revision", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "MDX Content Conflict E2E",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({@@ -591,12 +603,16 @@ test("Content Block requires a Builder reload after a stale file revision", asyn}});-test("Unresolved MDX templates are selectable only in the Builder canvas", async () => {+test("Unresolved MDX templates are selectable only in the Builder canvas", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "MDX Content Warning E2E",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({@@ -646,12 +662,16 @@ test("Unresolved MDX templates are selectable only in the Builder canvas", async}});-test("Dynamic detail source follows the selected route parameter", async () => {+test("Dynamic detail source follows the selected route parameter", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "MDX Content Detail E2E",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({@@ -704,12 +724,16 @@ test("Dynamic detail source follows the selected route parameter", async () => {}});-test("Repeated Content Block scopes edit distinct MDX files without leakage", async () => {+test("Repeated Content Block scopes edit distinct MDX files without leakage", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "MDX Content Repeated E2E",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await openFixture({diff --git a/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts b/apps/builder/e2e/tests/navigator-drag.e2e.tssimilarity index 87%rename from apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.tsrename to apps/builder/e2e/tests/navigator-drag.e2e.tsindex 4d6103234b..efdf5adae9 100644--- a/apps/builder/e2e/tests/navigator-drag.[shard-1].e2e.ts+++ b/apps/builder/e2e/tests/navigator-drag.e2e.ts@@ -11,16 +11,20 @@ import {getTreeRowByButton,} from "../flows/drag";import { openNavigatorPanel } from "../flows/navigator";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";let fixture: Awaited<ReturnType<typeof createDragProject>>;-test.beforeAll(async () => {- fixture = await createDragProject("navigator");+test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createDragProject(context, "navigator")+ );});-test("Navigator pointer drag reorders and reparents instances", async () => {- const { page, close } = await newIsolatedPage();+test("Navigator pointer drag reorders and reparents instances", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await openProjectBuilder({page,diff --git a/apps/builder/e2e/tests/pages-actions-bridge.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/pages-actions-bridge.e2e.tssimilarity index 94%rename from apps/builder/e2e/tests/pages-actions-bridge.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/pages-actions-bridge.e2e.tsindex 3521e854a9..288af5023c 100644--- a/apps/builder/e2e/tests/pages-actions-bridge.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/pages-actions-bridge.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import {openProjectBuilder,waitForCanvasText,@@ -13,7 +13,7 @@ import {import { insertTemplateAfterCanvasText } from "../flows/template-insertion";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";@@ -58,7 +58,7 @@ const selectAppMenuItem = async ({name: string;}) => {await page.bringToFront();- await page.getByRole("button", { name: "Menu Button" }).click();+ await page.getByRole("button", { name: "Menu", exact: true }).click();const menuItem = page.getByRole("menuitem", { name });await menuItem.waitFor();await menuItem.click();@@ -193,18 +193,23 @@ const selectNavigatorContextAction = async ({await waitForChangeToBeSaved({ page });};-test.beforeAll(async () => {- fixture = await createContentModeProject({- email: "[email protected]",- title: "Pages Actions E2E",- assetNamePrefix: "pages-actions-",- editorToken: "pages-actions-e2e-editor-token",- builderToken: "pages-actions-e2e-builder-token",- });+test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createContentModeProject({+ context,+ email: "[email protected]",+ title: "Pages Actions E2E",+ assetNamePrefix: "pages-actions-",+ editorToken: "pages-actions-e2e-editor-token",+ builderToken: "pages-actions-e2e-builder-token",+ })+ );});-test("Builder can insert through the engine bridge, undo, redo, and reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can insert through the engine bridge, undo, redo, and reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await measure("pages actions open builder for engine bridge", async () => {@@ -263,8 +268,10 @@ test("Builder can insert through the engine bridge, undo, redo, and reload", asy}});-test("Builder Components panel filters catalog-only entries and inserts a persisted component", async () => {- const { page, close } = await newIsolatedPage();+test("Builder Components panel filters catalog-only entries and inserts a persisted component", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const insertedButtonText = "Button";try {@@ -312,8 +319,10 @@ test("Builder Components panel filters catalog-only entries and inserts a persis}});-test("Builder can duplicate a component through the engine bridge, undo, redo, and reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can duplicate a component through the engine bridge, undo, redo, and reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const componentName = "Image";try {@@ -410,8 +419,10 @@ test("Builder can duplicate a component through the engine bridge, undo, redo, a}});-test("Builder can duplicate and delete a component from Navigator context menu", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can duplicate and delete a component from Navigator context menu", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const componentName = "Image";try {diff --git a/apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/pages-actions-pages.e2e.tssimilarity index 94%rename from apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/pages-actions-pages.e2e.tsindex 154b5d196a..e3e8e7e847 100644--- a/apps/builder/e2e/tests/pages-actions-pages.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/pages-actions-pages.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { expectTextHidden } from "../flows/assertions";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { expectGeneratedAppBuild } from "../flows/generated-app";@@ -17,7 +17,7 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";@@ -198,25 +198,31 @@ const confirmDialogAction = async ({await button.waitFor({ state: "hidden" });};-test.beforeAll(async () => {- fixture = await createContentModeProject({- email: "[email protected]",- title: "Pages Actions E2E",- assetNamePrefix: "pages-actions-",- editorToken: "pages-actions-e2e-editor-token",- builderToken: "pages-actions-e2e-builder-token",- });- pasteFixture = await createContentModeProject({- email: "[email protected]",- title: "Pages Actions Paste E2E",- assetNamePrefix: "pages-actions-paste-",- editorToken: "pages-actions-paste-e2e-editor-token",- builderToken: "pages-actions-paste-e2e-builder-token",+test.beforeAll(async ({ browser }) => {+ await withBrowserContext(browser, async (context) => {+ fixture = await createContentModeProject({+ context,+ email: "[email protected]",+ title: "Pages Actions E2E",+ assetNamePrefix: "pages-actions-",+ editorToken: "pages-actions-e2e-editor-token",+ builderToken: "pages-actions-e2e-builder-token",+ });+ pasteFixture = await createContentModeProject({+ context,+ email: "[email protected]",+ title: "Pages Actions Paste E2E",+ assetNamePrefix: "pages-actions-paste-",+ editorToken: "pages-actions-paste-e2e-editor-token",+ builderToken: "pages-actions-paste-e2e-builder-token",+ });});});-test("Builder can draft, stage, copy, duplicate, and delete a page from the header menu", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can draft, stage, copy, duplicate, and delete a page from the header menu", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const pageName = "Actions Menu Page";const renamedPageName = "Renamed Actions Menu Page";const copiedPageName = `${renamedPageName} (1)`;@@ -369,8 +375,10 @@ test("Builder can draft, stage, copy, duplicate, and delete a page from the head}});-test("Builder can copy, duplicate, and delete a folder from the context menu", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can copy, duplicate, and delete a folder from the context menu", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const folderName = "Actions Menu Folder";const renamedFolderName = "Renamed Actions Menu Folder";const copiedFolderName = `${renamedFolderName} (1)`;@@ -448,8 +456,10 @@ test("Builder can copy, duplicate, and delete a folder from the context menu", a}});-test("Builder can copy, duplicate, and delete a page template from actions menus", async () => {- const { page, close } = await newIsolatedPage();+test("Builder can copy, duplicate, and delete a page template from actions menus", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const templateName = fixture.pageTemplateName;const renamedTemplateName = "Renamed Content Page Template";const copiedTemplateName = `${renamedTemplateName} (1)`;@@ -633,8 +643,10 @@ const countBuildInstancesWithText = async (text: string) => {return instances.filter((instance) => containsText(instance.id)).length;};-test("Builder runs paste plugins through generic browser paste events", async () => {- const { page, close } = await newIsolatedPage();+test("Builder runs paste plugins through generic browser paste events", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const entries = [["application/json",diff --git a/apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/pages-actions.e2e.tssimilarity index 95%rename from apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/pages-actions.e2e.tsindex f67d50119c..81b99879cc 100644--- a/apps/builder/e2e/tests/pages-actions.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/pages-actions.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import {openProjectBuilder,waitForCanvasText,@@ -13,7 +13,7 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";@@ -528,25 +528,31 @@ const editSelectedNavigatorLabel = async ({await waitForChangeToBeSaved({ page });};-test.beforeAll(async () => {- fixture = await createContentModeProject({- email: "[email protected]",- title: "Pages Actions E2E",- assetNamePrefix: "pages-actions-",- editorToken: "pages-actions-e2e-editor-token",- builderToken: "pages-actions-e2e-builder-token",- });- navigatorStructuralFixture = await createContentModeProject({- email: "[email protected]",- title: "Pages Actions Navigator Structural E2E",- assetNamePrefix: "pages-actions-navigator-structural-",- editorToken: "pages-actions-navigator-structural-e2e-editor-token",- builderToken: "pages-actions-navigator-structural-e2e-builder-token",+test.beforeAll(async ({ browser }) => {+ await withBrowserContext(browser, async (context) => {+ fixture = await createContentModeProject({+ context,+ email: "[email protected]",+ title: "Pages Actions E2E",+ assetNamePrefix: "pages-actions-",+ editorToken: "pages-actions-e2e-editor-token",+ builderToken: "pages-actions-e2e-builder-token",+ });+ navigatorStructuralFixture = await createContentModeProject({+ context,+ email: "[email protected]",+ title: "Pages Actions Navigator Structural E2E",+ assetNamePrefix: "pages-actions-navigator-structural-",+ editorToken: "pages-actions-navigator-structural-e2e-editor-token",+ builderToken: "pages-actions-navigator-structural-e2e-builder-token",+ });});});-test("Builder Navigator keyboard move, reparent, and reorder persist after reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder Navigator keyboard move, reparent, and reorder persist after reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const sectionText = "Navigator move section";const asideText = "Navigator move aside";const html = `@@ -676,8 +682,10 @@ test("Builder Navigator keyboard move, reparent, and reorder persist after reloa}});-test("Builder command panel structural mutations persist after reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder command panel structural mutations persist after reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const anchorText = "Initial content";const componentName = "Image";@@ -800,8 +808,10 @@ test("Builder command panel structural mutations persist after reload", async ()}});-test("Builder Navigator label and command unwrap persist after reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder Navigator label and command unwrap persist after reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const anchorText = "Initial content";const componentName = "Image";const renamedLabel = "Hero media";@@ -939,8 +949,10 @@ test("Builder Navigator label and command unwrap persist after reload", async ()}});-test("Builder command panel tag insertion persists after reload", async () => {- const { page, close } = await newIsolatedPage();+test("Builder command panel tag insertion persists after reload", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const anchorText = "Initial content";const tag = "aside";@@ -1004,8 +1016,10 @@ test("Builder command panel tag insertion persists after reload", async () => {}});-test("Builder pastes external HTML fragments through clipboard and reloads them", async () => {- const { page, close } = await newIsolatedPage();+test("Builder pastes external HTML fragments through clipboard and reloads them", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const pastedHeading = "External paste heading";const pastedLink = "External paste link";const html = `@@ -1102,8 +1116,10 @@ test("Builder pastes external HTML fragments through clipboard and reloads them"}});-test("Builder copies, pastes, and cuts instances through browser shortcuts", async () => {- const { page, close } = await newIsolatedPage();+test("Builder copies, pastes, and cuts instances through browser shortcuts", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";try {@@ -1151,8 +1167,10 @@ test("Builder copies, pastes, and cuts instances through browser shortcuts", asy}});-test("Builder pastes instance data into page templates", async () => {- const { page, close } = await newIsolatedPage();+test("Builder pastes instance data into page templates", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const templatePasteText = "Template instance paste heading";try {@@ -1196,8 +1214,10 @@ test("Builder pastes instance data into page templates", async () => {}});-test("Builder does not insert malformed Webstudio paste data as text", async () => {- const { page, close } = await newIsolatedPage();+test("Builder does not insert malformed Webstudio paste data as text", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const malformedData ='{"@webstudio/instance/v0.1":{"instanceSelector":["missing","body"]';@@ -1234,8 +1254,10 @@ test("Builder does not insert malformed Webstudio paste data as text", async ()}});-test("Builder allows native paste inside focused builder inputs", async () => {- const { page, close } = await newIsolatedPage();+test("Builder allows native paste inside focused builder inputs", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);const pastedText = "<section>Native input paste</section>";try {diff --git a/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts b/apps/builder/e2e/tests/pages-drag.e2e.tssimilarity index 82%rename from apps/builder/e2e/tests/pages-drag.[shard-3].e2e.tsrename to apps/builder/e2e/tests/pages-drag.e2e.tsindex 1af056f1ea..43c59a66f9 100644--- a/apps/builder/e2e/tests/pages-drag.[shard-3].e2e.ts+++ b/apps/builder/e2e/tests/pages-drag.e2e.ts@@ -7,16 +7,20 @@ import {import { openProjectBuilder } from "../flows/builder";import { dragTreeRow, getTreeRowByButton } from "../flows/drag";import { openPagesPanel } from "../flows/pages-panel";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";let fixture: Awaited<ReturnType<typeof createDragProject>>;-test.beforeAll(async () => {- fixture = await createDragProject("pages");+test.beforeAll(async ({ browser }) => {+ fixture = await withBrowserContext(browser, (context) =>+ createDragProject(context, "pages")+ );});-test("Pages panel pointer drag reorders and nests pages", async () => {- const { page, close } = await newIsolatedPage();+test("Pages panel pointer drag reorders and nests pages", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await openProjectBuilder({page,diff --git a/apps/builder/e2e/tests/preview-links.[shard-1].e2e.ts b/apps/builder/e2e/tests/preview-links.e2e.tssimilarity index 92%rename from apps/builder/e2e/tests/preview-links.[shard-1].e2e.tsrename to apps/builder/e2e/tests/preview-links.e2e.tsindex a270b45915..d1b2a27be1 100644--- a/apps/builder/e2e/tests/preview-links.[shard-1].e2e.ts+++ b/apps/builder/e2e/tests/preview-links.e2e.ts@@ -1,4 +1,4 @@-import type { Locator } from "playwright";+import type { Locator } from "@playwright/test";import { openBuilderUrl, waitForCanvasFrame } from "../flows/builder";import {expectGeneratedAppNavigation,@@ -6,7 +6,12 @@ import {} from "../flows/generated-app";import { createContentModeProject } from "../fixtures/content-mode-suite";import { insertAuthorizationToken, loadDevBuild, updateBuild } from "../db";-import { getProjectBuilderUrl, newIsolatedPage, test } from "../harness";+import {+ getProjectBuilderUrl,+ newIsolatedPage,+ test,+ withBrowserContext,+} from "../test";import type { SeededContentModeProject } from "../fixtures/content-mode-project";type PageData = {@@ -298,19 +303,24 @@ const preparePreviewLinksProject = async () => {});};-test.beforeAll(async () => {- fixture = await createContentModeProject({- email: "[email protected]",- title: "Preview Links E2E",- assetNamePrefix: "preview-links-",- editorToken: "preview-links-e2e-editor-token",- builderToken: "preview-links-e2e-builder-token",+test.beforeAll(async ({ browser }) => {+ await withBrowserContext(browser, async (context) => {+ fixture = await createContentModeProject({+ context,+ email: "[email protected]",+ title: "Preview Links E2E",+ assetNamePrefix: "preview-links-",+ editorToken: "preview-links-e2e-editor-token",+ builderToken: "preview-links-e2e-builder-token",+ });+ await preparePreviewLinksProject();});- await preparePreviewLinksProject();});-test("Preview links expose current page state for components and element anchors", async () => {- const { page, close } = await newIsolatedPage();+test("Preview links expose current page state for components and element anchors", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await openBuilderUrl({ page, url: getPreviewUrl({}) });@@ -409,8 +419,10 @@ test("Preview links expose current page state for components and element anchors}});-test("Generated preview renders and navigates linked routes", async () => {- const { page, close } = await newIsolatedPage();+test("Generated preview renders and navigates linked routes", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {await expectGeneratedAppToRender({projectId: fixture.projectId,diff --git a/apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/project-settings-runtime.e2e.tssimilarity index 96%rename from apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/project-settings-runtime.e2e.tsindex ac90c31420..a148859e06 100644--- a/apps/builder/e2e/tests/project-settings-runtime.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/project-settings-runtime.e2e.ts@@ -1,4 +1,4 @@-import type { Page as PlaywrightPage } from "playwright";+import type { Page as PlaywrightPage } from "@playwright/test";import type { Page as WebstudioPage } from "@webstudio-is/sdk";import { parseProjectAuthRoutes } from "@webstudio-is/project-build/contracts";import { loadDevBuild, updateProject } from "../db";@@ -18,7 +18,7 @@ import {expectGeneratedRedirects,} from "../flows/generated-app";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";type PersistedPages = {@@ -65,7 +65,7 @@ const getPersistedPageByName = async ({};const openProjectSettings = async ({ page }: { page: PlaywrightPage }) => {- await page.getByRole("button", { name: "Menu Button" }).click();+ await page.getByRole("button", { name: "Menu", exact: true }).click();await page.getByRole("menuitem", { name: "Project settings" }).click();await page.getByRole("dialog", { name: "Project settings" }).waitFor();};@@ -249,16 +249,20 @@ const expectPersistedProjectSettings = async ({}};-test("Project settings site name and redirects persist after reload", async () => {+test("Project settings site name and redirects persist after reload", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Project Settings Runtime",assetNamePrefix: "project-settings-runtime-",editorToken: "project-settings-runtime-editor-token",builderToken: "project-settings-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const siteName = "Runtime Settings Site";const redirect = {from: "/e2e-old-route",@@ -381,16 +385,20 @@ test("Project settings site name and redirects persist after reload", async () =}});-test("Marketplace page settings persist after reload", async () => {+test("Marketplace page settings persist after reload", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Marketplace Page Settings Runtime",assetNamePrefix: "marketplace-page-settings-runtime-",editorToken: "marketplace-page-settings-runtime-editor-token",builderToken: "marketplace-page-settings-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const pageName = "Marketplace Runtime Page";const category = "Runtime Examples";@@ -495,16 +503,20 @@ test("Marketplace page settings persist after reload", async () => {}});-test("Project authentication routes persist after reload and deletion", async () => {+test("Project authentication routes persist after reload and deletion", async ({+ browser,+ context,+}) => {const email = "[email protected]";const fixture = await createContentModeProject({+ context: context,email,title: "Project Auth Runtime",assetNamePrefix: "project-auth-runtime-",editorToken: "project-auth-runtime-editor-token",builderToken: "project-auth-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const route = "/private";const login = "editor";const password = "e2e-secret";diff --git a/apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/props-runtime.e2e.tssimilarity index 97%rename from apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/props-runtime.e2e.tsindex 822e2cfeb3..0066140378 100644--- a/apps/builder/e2e/tests/props-runtime.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/props-runtime.e2e.ts@@ -1,5 +1,5 @@import { createServer } from "node:http";-import type { Page } from "playwright";+import type { Page } from "@playwright/test";import { loadDevBuild } from "../db";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { selectCanvasTextInstance } from "../flows/canvas-selection";@@ -15,7 +15,7 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import { withGeneratedPreview } from "../flows/generated-app";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";const openComponentsPanel = async ({ page }: { page: Page }) => {@@ -387,15 +387,19 @@ const expectBooleanPropDeleted = async ({}};-test("Webhook Form action submits once and persists after reload", async () => {+test("Webhook Form action submits once and persists after reload", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Props Runtime",assetNamePrefix: "props-runtime-",editorToken: "props-runtime-editor-token",builderToken: "props-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const webhook = await startWebhookServer();const text = "Initial content";const actionUrl = webhook.url;@@ -478,15 +482,19 @@ test("Webhook Form action submits once and persists after reload", async () => {}});-test("Props panel expression binding persists after reload", async () => {+test("Props panel expression binding persists after reload", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Props Expression Runtime",assetNamePrefix: "props-expression-runtime-",editorToken: "props-expression-runtime-editor-token",builderToken: "props-expression-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);const anchorText = "Expression-bound link";const expression = '"/props-expression-link"';@@ -546,15 +554,19 @@ test("Props panel expression binding persists after reload", async () => {}});-test("Props panel boolean prop persists after reload", async () => {+test("Props panel boolean prop persists after reload", async ({+ browser,+ context,+}) => {const fixture = await createContentModeProject({+ context: context,email: "[email protected]",title: "Props Boolean Runtime",assetNamePrefix: "props-boolean-runtime-",editorToken: "props-boolean-runtime-editor-token",builderToken: "props-boolean-runtime-builder-token",});- const { page, close } = await newIsolatedPage();+ const { page, close } = await newIsolatedPage(browser);try {await measure("props boolean runtime open builder", async () => {diff --git a/apps/builder/e2e/tests/share-link-permissions.[shard-1].e2e.ts b/apps/builder/e2e/tests/share-link-permissions.e2e.tssimilarity index 92%rename from apps/builder/e2e/tests/share-link-permissions.[shard-1].e2e.tsrename to apps/builder/e2e/tests/share-link-permissions.e2e.tsindex 99195e4696..83975b2843 100644--- a/apps/builder/e2e/tests/share-link-permissions.[shard-1].e2e.ts+++ b/apps/builder/e2e/tests/share-link-permissions.e2e.ts@@ -19,12 +19,13 @@ import {} from "../flows/share-dialog";import { waitForSyncStatus } from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";-import { newIsolatedPage, newPage, test } from "../harness";+import { newBrowserContext, newIsolatedPage, test } from "../test";import { measure } from "../perf";import { e2ePaidPlanName } from "../plans";const ownerEmail = "[email protected]";const baselineText = "Initial content";+let ownerContext: BrowserContext;type ShareLinkFixtures = {projectId: string;@@ -76,8 +77,10 @@ const expectCurrentMode = ({}};-test.beforeAll(async () => {+test.beforeAll(async ({ browser }) => {+ ownerContext = await newBrowserContext(browser);const fixture = await createContentModeProject({+ context: ownerContext,email: ownerEmail,title: "Share Link E2E",devPlan: e2ePaidPlanName,@@ -85,7 +88,7 @@ test.beforeAll(async () => {editorToken: "share-link-e2e-editor-token",builderToken: "share-link-e2e-builder-token",});- const ownerPage = await newPage();+ const ownerPage = await ownerContext.newPage();try {await measure("share link open owner project", async () => {@@ -151,7 +154,12 @@ test.beforeAll(async () => {await ownerPage.close();}});-test("Share links enforce viewer, editor, builder, admin, and owner permissions", async () => {+test.afterAll(async () => {+ await ownerContext.close();+});+test("Share links enforce viewer, editor, builder, admin, and owner permissions", async ({+ browser,+}) => {const {projectId,viewerUrl,@@ -160,12 +168,12 @@ test("Share links enforce viewer, editor, builder, admin, and owner permissions"adminUrl,shareLinkEditableText,} = getShareLinkFixtures();- const viewer = await newIsolatedPage();- const editor = await newIsolatedPage();- const builderPage = await newIsolatedPage();- const admin = await newIsolatedPage();- const ownerPage = await newPage();- const visitor = await newIsolatedPage();+ const viewer = await newIsolatedPage(browser);+ const editor = await newIsolatedPage(browser);+ const builderPage = await newIsolatedPage(browser);+ const admin = await newIsolatedPage(browser);+ const ownerPage = await ownerContext.newPage();+ const visitor = await newIsolatedPage(browser);const editedText = "Share-link editor text";try {@@ -300,3 +308,4 @@ test("Share links enforce viewer, editor, builder, admin, and owner permissions"await visitor.close();}});+import type { BrowserContext } from "@playwright/test";diff --git a/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts b/apps/builder/e2e/tests/slot-keyboard.e2e.tssimilarity index 85%rename from apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.tsrename to apps/builder/e2e/tests/slot-keyboard.e2e.tsindex 7d8264a0e1..5dc3137693 100644--- a/apps/builder/e2e/tests/slot-keyboard.[shard-3].e2e.ts+++ b/apps/builder/e2e/tests/slot-keyboard.e2e.ts@@ -1,4 +1,4 @@-import type { Frame, Page } from "playwright";+import type { Frame, Page } from "@playwright/test";import {getCanvasInstance,getCanvasInstanceSelector,@@ -10,7 +10,7 @@ import {createSlotKeyboardProject,type SeededSlotKeyboardProject,} from "../fixtures/slot-keyboard-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test, withBrowserContext } from "../test";import { measure } from "../perf";let fixture: SeededSlotKeyboardProject;@@ -42,47 +42,57 @@ const expectCanvasInstanceVisible = async ({});};-test.beforeAll(async () => {- fixture = await createSlotKeyboardProject();- detachFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Detach E2E",- builderToken: "slot-keyboard-detach-e2e-builder-token",- });- navigatorFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Navigator E2E",- builderToken: "slot-keyboard-navigator-e2e-builder-token",- });- navigatorOutdentFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Navigator Outdent E2E",- builderToken: "slot-keyboard-navigator-outdent-e2e-builder-token",- });- topChildFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Top Child E2E",- builderToken: "slot-keyboard-top-child-e2e-builder-token",- });- bottomChildFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Bottom Child E2E",- builderToken: "slot-keyboard-bottom-child-e2e-builder-token",- });- navigatorTopChildFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Navigator Top Child E2E",- builderToken: "slot-keyboard-navigator-top-child-e2e-builder-token",- });- navigatorBottomChildFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Navigator Bottom Child E2E",- builderToken: "slot-keyboard-navigator-bottom-child-e2e-builder-token",- });- multiSelectFixture = await createSlotKeyboardProject({- email: "[email protected]",- title: "Slot Keyboard Multi Select E2E",- builderToken: "slot-keyboard-navigator-multi-select-e2e-builder-token",+test.beforeAll(async ({ browser }) => {+ await withBrowserContext(browser, async (context) => {+ fixture = await createSlotKeyboardProject({ context });+ detachFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Detach E2E",+ builderToken: "slot-keyboard-detach-e2e-builder-token",+ });+ navigatorFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Navigator E2E",+ builderToken: "slot-keyboard-navigator-e2e-builder-token",+ });+ navigatorOutdentFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Navigator Outdent E2E",+ builderToken: "slot-keyboard-navigator-outdent-e2e-builder-token",+ });+ topChildFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Top Child E2E",+ builderToken: "slot-keyboard-top-child-e2e-builder-token",+ });+ bottomChildFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Bottom Child E2E",+ builderToken: "slot-keyboard-bottom-child-e2e-builder-token",+ });+ navigatorTopChildFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Navigator Top Child E2E",+ builderToken: "slot-keyboard-navigator-top-child-e2e-builder-token",+ });+ navigatorBottomChildFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Navigator Bottom Child E2E",+ builderToken: "slot-keyboard-navigator-bottom-child-e2e-builder-token",+ });+ multiSelectFixture = await createSlotKeyboardProject({+ context,+ email: "[email protected]",+ title: "Slot Keyboard Multi Select E2E",+ builderToken: "slot-keyboard-navigator-multi-select-e2e-builder-token",+ });});});@@ -166,8 +176,10 @@ const expectSelectedTreeButtonTexts = async ({);};-test("Keyboard shortcut moves a shared slot child into the previous sibling", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves a shared slot child into the previous sibling", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure("slot keyboard open builder", async () => {@@ -224,8 +236,10 @@ test("Keyboard shortcut moves a shared slot child into the previous sibling", as}});-test("Keyboard shortcut keeps Navigator arrows working after outdenting a row", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut keeps Navigator arrows working after outdenting a row", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -278,8 +292,10 @@ test("Keyboard shortcut keeps Navigator arrows working after outdenting a row",}});-test("Shift+ArrowDown in Navigator selects exactly one additional row", async () => {- const { page, close } = await newIsolatedPage();+test("Shift+ArrowDown in Navigator selects exactly one additional row", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -328,8 +344,10 @@ test("Shift+ArrowDown in Navigator selects exactly one additional row", async ()}});-test("Control/Command+A after canvas selection selects sibling rows", async () => {- const { page, close } = await newIsolatedPage();+test("Control/Command+A after canvas selection selects sibling rows", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -374,8 +392,10 @@ test("Control/Command+A after canvas selection selects sibling rows", async () =}});-test("Keyboard shortcut moves a direct shared slot child out of all slot occurrences", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves a direct shared slot child out of all slot occurrences", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -436,8 +456,10 @@ test("Keyboard shortcut moves a direct shared slot child out of all slot occurre}});-test("Keyboard shortcut moves the first shared slot child above all slot occurrences", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves the first shared slot child above all slot occurrences", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -515,8 +537,10 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre}});-test("Keyboard shortcut moves the last shared slot child below all slot occurrences", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves the last shared slot child below all slot occurrences", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -594,8 +618,10 @@ test("Keyboard shortcut moves the last shared slot child below all slot occurren}});-test("Keyboard shortcut reorders a shared slot child from navigator focus", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut reorders a shared slot child from navigator focus", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -662,8 +688,10 @@ test("Keyboard shortcut reorders a shared slot child from navigator focus", asyn}});-test("Keyboard shortcut moves the first shared slot child above all slot occurrences from navigator focus", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves the first shared slot child above all slot occurrences from navigator focus", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(@@ -739,8 +767,10 @@ test("Keyboard shortcut moves the first shared slot child above all slot occurre}});-test("Keyboard shortcut moves the last shared slot child below all slot occurrences from navigator focus", async () => {- const { page, close } = await newIsolatedPage();+test("Keyboard shortcut moves the last shared slot child below all slot occurrences from navigator focus", async ({+ browser,+}) => {+ const { page, close } = await newIsolatedPage(browser);try {const canvas = await measure(diff --git a/apps/builder/e2e/tests/style-panel-runtime.[shard-2].[shard-5].[shard-6].e2e.ts b/apps/builder/e2e/tests/style-panel-layout.e2e.tssimilarity index 92%rename from apps/builder/e2e/tests/style-panel-runtime.[shard-2].[shard-5].[shard-6].e2e.tsrename to apps/builder/e2e/tests/style-panel-layout.e2e.tsindex 995be9e48e..8ff506d896 100644--- a/apps/builder/e2e/tests/style-panel-runtime.[shard-2].[shard-5].[shard-6].e2e.ts+++ b/apps/builder/e2e/tests/style-panel-layout.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { BrowserContext, Page } from "@playwright/test";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { selectCanvasTextInstance } from "../flows/canvas-selection";import { waitForCanvasTextStyle } from "../flows/canvas-style";@@ -9,12 +9,16 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";-const createStylePanelRuntimeProject = async (name: string) => {+const createStylePanelRuntimeProject = async (+ context: BrowserContext,+ name: string+) => {return await createContentModeProject({+ context,email: `style-panel-runtime-${name}@webstudio.test`,title: `Style Panel Runtime ${name}`,assetNamePrefix: `style-panel-runtime-${name}-`,@@ -109,9 +113,15 @@ const expectBuildStylesToContain = async ({}};-test("Builder grid generator fills selected grid and persists after reload", async () => {- const fixture = await createStylePanelRuntimeProject("grid-generator");- const { page, close } = await newIsolatedPage();+test("Builder grid generator fills selected grid and persists after reload", async ({+ browser,+ context,+}) => {+ const fixture = await createStylePanelRuntimeProject(+ context,+ "grid-generator"+ );+ const { page, close } = await newIsolatedPage(browser);const bodyInstanceId = "body";try {@@ -192,9 +202,12 @@ test("Builder grid generator fills selected grid and persists after reload", asy}});-test("Builder breakpoint styles persist after create, update, reload, and delete", async () => {- const fixture = await createStylePanelRuntimeProject("breakpoints");- const { page, close } = await newIsolatedPage();+test("Builder breakpoint styles persist after create, update, reload, and delete", async ({+ browser,+ context,+}) => {+ const fixture = await createStylePanelRuntimeProject(context, "breakpoints");+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";const breakpointName = "E2E Tablet";const updatedBreakpointName = "E2E Tablet Updated";@@ -299,9 +312,12 @@ test("Builder breakpoint styles persist after create, update, reload, and delete}});-test("Builder design token styles persist after create and reload", async () => {- const fixture = await createStylePanelRuntimeProject("tokens");- const { page, close } = await newIsolatedPage();+test("Builder design token styles persist after create and reload", async ({+ browser,+ context,+}) => {+ const fixture = await createStylePanelRuntimeProject(context, "tokens");+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";const tokenName = "E2E Brand Token";@@ -321,7 +337,7 @@ test("Builder design token styles persist after create and reload", async () =>await selectCanvasTextInstance({ page, text });await page.getByRole("tab", { name: "Style" }).click();- const styleSourceInput = page.getByLabel("New Style Source Input");+ const styleSourceInput = page.getByLabel("New style source input");await styleSourceInput.fill(tokenName);const createSave = waitForChangeToBeSaved({ page });await page.getByText(`Create ${tokenName}`, { exact: false }).click();diff --git a/apps/builder/e2e/tests/style-panel-runtime.[shard-1].e2e.ts b/apps/builder/e2e/tests/style-panel-properties.e2e.tssimilarity index 93%rename from apps/builder/e2e/tests/style-panel-runtime.[shard-1].e2e.tsrename to apps/builder/e2e/tests/style-panel-properties.e2e.tsindex 1a56430949..733062457f 100644--- a/apps/builder/e2e/tests/style-panel-runtime.[shard-1].e2e.ts+++ b/apps/builder/e2e/tests/style-panel-properties.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { BrowserContext, Page } from "@playwright/test";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { selectCanvasTextInstance } from "../flows/canvas-selection";import {@@ -11,12 +11,16 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";-const createStylePanelRuntimeProject = async (name: string) => {+const createStylePanelRuntimeProject = async (+ context: BrowserContext,+ name: string+) => {return await createContentModeProject({+ context,email: `style-panel-runtime-${name}@webstudio.test`,title: `Style Panel Runtime ${name}`,assetNamePrefix: `style-panel-runtime-${name}-`,@@ -105,9 +109,12 @@ const expectBuildStylesNotToContain = async ({}};-test("Builder style panel edits representative styles and persists after reload", async () => {- const fixture = await createStylePanelRuntimeProject("styles");- const { page, close } = await newIsolatedPage();+test("Builder style panel edits representative styles and persists after reload", async ({+ browser,+ context,+}) => {+ const fixture = await createStylePanelRuntimeProject(context, "styles");+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";try {diff --git a/apps/builder/e2e/tests/style-panel-runtime.[shard-3].e2e.ts b/apps/builder/e2e/tests/style-panel-variables.e2e.tssimilarity index 92%rename from apps/builder/e2e/tests/style-panel-runtime.[shard-3].e2e.tsrename to apps/builder/e2e/tests/style-panel-variables.e2e.tsindex a244001352..a0327ef0a9 100644--- a/apps/builder/e2e/tests/style-panel-runtime.[shard-3].e2e.ts+++ b/apps/builder/e2e/tests/style-panel-variables.e2e.ts@@ -1,4 +1,4 @@-import type { Page } from "playwright";+import type { BrowserContext, Page } from "@playwright/test";import { openProjectBuilder, waitForCanvasText } from "../flows/builder";import { selectCanvasTextInstance } from "../flows/canvas-selection";import { waitForCanvasTextStyle } from "../flows/canvas-style";@@ -8,12 +8,16 @@ import {} from "../flows/sync-status";import { createContentModeProject } from "../fixtures/content-mode-suite";import type { SeededContentModeProject } from "../fixtures/content-mode-project";-import { newIsolatedPage, test } from "../harness";+import { newIsolatedPage, test } from "../test";import { measure } from "../perf";import { loadDevBuild } from "../db";-const createStylePanelRuntimeProject = async (name: string) => {+const createStylePanelRuntimeProject = async (+ context: BrowserContext,+ name: string+) => {return await createContentModeProject({+ context,email: `style-panel-runtime-${name}@webstudio.test`,title: `Style Panel Runtime ${name}`,assetNamePrefix: `style-panel-runtime-${name}-`,@@ -77,7 +81,7 @@ const runCssVariableCommandAction = async ({variable: string;action: "Rename" | "Delete";}) => {- await page.getByRole("button", { name: "Menu Button" }).click();+ await page.getByRole("button", { name: "Menu", exact: true }).click();await page.getByRole("menuitem", { name: "Search & commands" }).click();const input = page.getByPlaceholder("Type a command or search...", { exact: true })@@ -96,9 +100,15 @@ const runCssVariableCommandAction = async ({.click();};-test("Builder CSS variables persist across create, bind, rename, delete, and reload", async () => {- const fixture = await createStylePanelRuntimeProject("css-variables");- const { page, close } = await newIsolatedPage();+test("Builder CSS variables persist across create, bind, rename, delete, and reload", async ({+ browser,+ context,+}) => {+ const fixture = await createStylePanelRuntimeProject(+ context,+ "css-variables"+ );+ const { page, close } = await newIsolatedPage(browser);const text = "Initial content";const variableName = "--e2e-brand-color";const renamedVariableName = "--e2e-brand-color-renamed";@@ -171,7 +181,7 @@ test("Builder CSS variables persist across create, bind, rename, delete, and relvariable: variableName,action: "Rename",});- const dialog = page.getByRole("dialog", { name: "Rename CSS Variable" });+ const dialog = page.getByRole("dialog", { name: "Rename CSS variable" });await dialog.getByRole("textbox").fill(renamedVariableName);const save = waitForChangeToBeSaved({ page });await dialog.getByRole("button", { name: "Rename" }).click();diff --git a/apps/builder/e2e/timeout.test.ts b/apps/builder/e2e/timeout.test.tsdeleted file mode 100644index 6deb905847..0000000000--- a/apps/builder/e2e/timeout.test.ts+++ /dev/null@@ -1,72 +0,0 @@-import { expect, test, vi } from "vitest";-import { runWithTimeout } from "./timeout";--test("aborts, cleans up, and waits for timed-out work to settle", async () => {- const events: string[] = [];- let releaseTask: (() => void) | undefined;- const cleanup = vi.fn(async () => {- events.push("cleanup");- releaseTask?.();- });-- await expect(- runWithTimeout({- name: "slow test",- timeoutMs: 1,- onTimeout: cleanup,- task: async () => {- await new Promise<void>((resolve) => {- releaseTask = () => {- events.push("settled");- resolve();- };- });- },- })- ).rejects.toThrow("Timed out after 1ms: slow test");-- expect(cleanup).toHaveBeenCalledOnce();- expect(events).toEqual(["cleanup", "settled"]);-});--test("preserves timeout semantics when cleanup rejects", async () => {- const cleanupError = new Error("cleanup failed");- let releaseTask: (() => void) | undefined;-- const result = runWithTimeout({- name: "cleanup failure",- timeoutMs: 1,- settleTimeoutMs: 50,- onTimeout: async () => {- releaseTask?.();- throw cleanupError;- },- task: async () => {- await new Promise<void>((resolve) => {- releaseTask = resolve;- });- },- });-- await expect(result).rejects.toMatchObject({- message: "Timed out after 1ms: cleanup failure",- cause: cleanupError,- });-});--test("fails within the settlement grace period when work ignores cancellation", async () => {- const startedAt = Date.now();-- await expect(- runWithTimeout({- name: "uncooperative test",- timeoutMs: 1,- settleTimeoutMs: 1,- task: async () => await new Promise<never>(() => undefined),- })- ).rejects.toThrow(- "Timed out after 1ms: uncooperative test; task did not settle within 1ms"- );-- expect(Date.now() - startedAt).toBeLessThan(100);-});diff --git a/apps/builder/e2e/timeout.ts b/apps/builder/e2e/timeout.tsdeleted file mode 100644index 0b0897f6de..0000000000--- a/apps/builder/e2e/timeout.ts+++ /dev/null@@ -1,60 +0,0 @@-const delay = (milliseconds: number) =>- new Promise<void>((resolve) => setTimeout(resolve, milliseconds));--export const runWithTimeout = async <Result>({- name,- timeoutMs,- settleTimeoutMs = 5_000,- task,- onTimeout,-}: {- name: string;- timeoutMs: number;- settleTimeoutMs?: number;- task: (signal: AbortSignal) => Promise<Result>;- onTimeout?: () => Promise<void>;-}) => {- const controller = new AbortController();- const taskPromise = task(controller.signal);- let timeout: NodeJS.Timeout | undefined;- const timeoutPromise = new Promise<{ type: "timeout" }>((resolve) => {- timeout = setTimeout(() => resolve({ type: "timeout" }), timeoutMs);- });-- try {- const outcome = await Promise.race([- taskPromise.then(- (value) => ({ type: "success" as const, value }),- (error: unknown) => ({ type: "failure" as const, error })- ),- timeoutPromise,- ]);- if (outcome.type === "success") {- return outcome.value;- }- if (outcome.type === "failure") {- throw outcome.error;- }- controller.abort();- let cleanupError: unknown;- try {- await onTimeout?.();- } catch (error) {- cleanupError = error;- }- const settled = await Promise.race([- taskPromise.then(- () => true,- () => true- ),- delay(settleTimeoutMs).then(() => false),- ]);- const error = new Error(- `Timed out after ${timeoutMs}ms: ${name}${settled ? "" : `; task did not settle within ${settleTimeoutMs}ms`}`,- cleanupError === undefined ? undefined : { cause: cleanupError }- );- throw error;- } finally {- clearTimeout(timeout);- }-};diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 7c016e23e4..8f5a6ebc72 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -14,7 +14,7 @@"start": "remix-serve build/server/index.js","dev": "remix vite:dev","dev:auth": "DEBUG=ws:* remix vite:dev",- "e2e:ci": "tsx --env-file .env --env-file-if-exists .env.development --conditions=webstudio ./e2e/run.ts",+ "e2e:ci": "node --env-file=.env --env-file-if-exists=.env.development --conditions=webstudio ./node_modules/@playwright/test/cli.js test --config=playwright.config.ts","e2e:local": "bash ./e2e/run-local.sh","e2e:dev:backend": "E2E_SKIP_CLEANUP=true E2E_RUN_TESTS=false E2E_START_POSTGREST=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false bash ./e2e/run-local.sh","e2e:dev": "E2E_SKIP_CLEANUP=true E2E_DB_BOOTSTRAP=if-empty E2E_INSTALL_PLAYWRIGHT=false E2E_BUILDER_URL=${E2E_BUILDER_URL:-https://127.0.0.1:3000} bash ./e2e/run-local.sh",@@ -147,6 +147,7 @@},"devDependencies": {"@remix-run/dev": "^2.16.5",+ "@playwright/test": "1.50.1","@types/debug": "^4.1.12","@types/dom-navigation": "^1.0.5","@types/express": "^4.17.21",@@ -159,7 +160,6 @@"css.escape": "^1.5.1","fast-glob": "^3.3.2","msw": "^2.13.2",- "playwright": "^1.50.1","react-router-dom": "^6.30.0","react-test-renderer": "18.3.0-canary-14898b6a9-20240318","type-fest": "^4.37.0",diff --git a/apps/builder/playwright.config.ts b/apps/builder/playwright.config.tsnew file mode 100644index 0000000000..2b899b76a2--- /dev/null+++ b/apps/builder/playwright.config.ts@@ -0,0 +1,49 @@+import { defineConfig } from "@playwright/test";+import { builderUrl, getBrowserLaunchOptions } from "./e2e/test";++const testTimeout =+ Number.parseInt(process.env.E2E_TEST_TIMEOUT_MS ?? "", 10) || 120_000;++export default defineConfig({+ testDir: "./e2e",+ outputDir: "./test-results/e2e",+ timeout: testTimeout,+ expect: { timeout: 10_000 },+ fullyParallel: false,+ forbidOnly: process.env.CI !== undefined,+ retries: 0,+ reporter: process.env.CI ? [["line"], ["html", { open: "never" }]] : "line",+ use: {+ ignoreHTTPSErrors: true,+ permissions: ["clipboard-read", "clipboard-write"],+ launchOptions: getBrowserLaunchOptions(),+ trace: "retain-on-failure",+ screenshot: "only-on-failure",+ video: "retain-on-failure",+ },+ projects: [+ {+ name: "setup",+ testMatch: /setup\.ts/,+ },+ {+ name: "chromium",+ testMatch: /tests\/.*\.e2e\.ts/,+ dependencies: ["setup"],+ use: { browserName: "chromium" },+ },+ ],+ webServer:+ process.env.E2E_BUILDER_URL === undefined+ ? {+ command:+ "pnpm exec tsx --conditions=webstudio ./e2e/serve-built-remix.ts",+ url: builderUrl,+ reuseExistingServer: false,+ ignoreHTTPSErrors: true,+ timeout: 60_000,+ stdout: "pipe",+ stderr: "pipe",+ }+ : undefined,+});diff --git a/docs/SUMMARY.md b/docs/SUMMARY.mdindex 4dbf88467e..9e78d34445 100644--- a/docs/SUMMARY.md+++ b/docs/SUMMARY.md@@ -144,6 +144,8 @@* [How to integrate Webhook Form with N8N](university/integrations/n8n.md)* [How to integrate Flotiq with Webstudio](university/integrations/flotiq.md)* [Craft](university/craft.md)+ * [Use Craft](university/craft-guide.md)+ * [Craft changelog](university/craft-changelog.md)## Contributingdiff --git a/docs/university/craft-changelog.md b/docs/university/craft-changelog.mdnew file mode 100644index 0000000000..86667a79a7--- /dev/null+++ b/docs/university/craft-changelog.md@@ -0,0 +1,35 @@+---+description: Review changes to the Craft specification.+---++# Craft changelog++## Next++- Defined the Craft architecture, naming grammar, color semantics,+ accessibility requirements, extension rules, and conformance criteria.+- Defined Webstudio Tokens as composite Tokens and aligned component, utility,+ semantic, variant, and size naming.+- Replaced `--foreground-border` with the correctly categorized+ `--border-default` variable.+- Replaced the color variable `--focus-color` with `--border-focus`.++## 1.2++- Changed `container` to use flex for compatibility with Craft Library. Set+ `display` to `flex`, `flex-direction` to `column`, and `gap` to+ `var(--gap-m)`. Apply horizontal layout changes on Local where needed.++## 1.1++- Added `--spacing-default` for shared container and card padding.++## 1.0++- Released Craft.++## Related++- [Craft](craft.md) – Follow the current specification+- [Use Craft](craft-guide.md) – Apply the specification in a Webstudio project+- [CSS variables](foundations/css-variables.md) – Define reusable valuesdiff --git a/docs/university/craft-guide.md b/docs/university/craft-guide.mdnew file mode 100644index 0000000000..5285457f5a--- /dev/null+++ b/docs/university/craft-guide.md@@ -0,0 +1,82 @@+---+description: Apply the Craft specification in a Webstudio project.+---++# Use Craft++Use the Craft Style Guide as a starting point, then map its semantic variables+and composite Tokens to your project.++## Get started++1. Go to **Marketplace → Pages → Craft**.+2. Insert the **Style Guide** page.+3. Customize the theme or palette variables on **Global Root**.+4. Map Craft semantic variables to the theme.+5. Build with semantic variables and composite Tokens.+6. Document project extensions in the Style Guide.++## Use the page template++The Craft Style Guide includes a page template with navigation, a main region,+sections, containers, and a footer:++1. Copy the template structure when creating a page.+2. Duplicate the template section and name it for its content, such as `Hero`.+3. Design the section using Craft variables and Tokens.+4. Duplicate the clean template section for the next section.++## Maintain the Style Guide++Use `Style Guide` as the page name. Prefix Tokens used only to present the+Style Guide with two underscores, such as `__badge` or `__outline`. Do not use+these presentation Tokens on the published site.++## Name Navigator items++Use title case and semantic labels in the Navigator.++- Give Box, Slot, HTML Embed, and Collection instances names that describe+ their purpose.+- Name containers after their content rather than position or appearance.+- Use a plural parent and singular children for repeated content, such as+ `Cards` containing several `Card` items.+- Prefix a Box using the `section` element with `Section`, such as+ `Section Hero`.+- Keep one HTML Embed instance responsible for one purpose, and begin its code+ with a comment describing that purpose.++Recommended page structure:++```text+Page Wrapper+├── Slot+│ ├── Global Styles+│ └── Nav+├── Main+│ └── Section+│ └── Container+└── Slot+ └── Footer+```++## Use Craft Library++Craft Library is a collection of section templates built to Craft standards+and available in the [Marketplace](marketplace.md).++Templates must avoid unexplained hardcoded design values. They must consume+documented Craft variables or documented extensions so that a section adapts+when inserted into another conforming project.++<figure><img src="../.gitbook/assets/craft-library.png" alt="Craft Library in the Webstudio Marketplace"><figcaption><p>Craft Library in the Marketplace</p></figcaption></figure>++{% embed url="https://x.com/getwebstudio/status/1895213059251011768" %}++## Related++- [Craft](craft.md) – Follow the universal specification+- [Craft changelog](craft-changelog.md) – Review changes to the standard+- [Marketplace](marketplace.md) – Access Craft Library and other resources+- [Contributing to the Marketplace](../contributing/marketplace.md) – Submit Craft resources+- [Anatomy of the Webstudio builder](foundations/anatomy-of-the-webstudio-builder.md) – Understand the Builder interfacediff --git a/docs/university/craft.md b/docs/university/craft.mdindex 8b1936c89b..f7613e53eb 100644--- a/docs/university/craft.md+++ b/docs/university/craft.md@@ -1,203 +1,420 @@----description: Craft is the standard for building with Webstudio.+description: Craft is the standard for building maintainable and reusable projects with Webstudio.icon: ruler-triangle---# Craft+Craft is the universal standard for building maintainable, reusable, and+portable projects with Webstudio. It defines how to name and use CSS variables,+Tokens, and Local styles so that people and shared Marketplace resources can+work together without introducing incompatible conventions.++Craft is recommended, but not mandatory. A project can extend Craft for its+domain without turning those extensions into requirements for every Craft+project.+{% hint style="info" %}Contribute changes to Craft by commenting on this [GitHub Discussion](https://wstd.us/discuss-craft).{% endhint %}-When building highly maintainable and scaleable websites, some conventions prove to work well. Plus, when collaborating with team members and other creators, a standardized system results in a smoother learning curve and easier sharing, such as through the [Marketplace](marketplace.md).+{% embed url="https://youtu.be/EeLoBZvlygI" %}-**Craft contains a set of standards, CSS variables, and Tokens that make building websites fast, maintainable, and reusable.** It also enables sharing Projects without mixing different naming conventions.+## Specification language-While Craft is not mandatory, it’s the recommended way to build in Webstudio.+Craft uses the following terms to distinguish requirements from guidance:-{% embed url="https://youtu.be/EeLoBZvlygI" %}+- **Must** identifies a requirement for Craft conformance.+- **Should** identifies a recommendation that may be ignored when a project+ has a documented reason.+- **May** identifies an optional feature or extension.-Here are the standards and guidelines of Craft.+## Architecture-## Getting Started with Craft+Craft has three layers:-1. Go to **Marketplace → Pages → Craft**-2. Insert the Style Guide page-3. Customize your color palette variables on Global Root-4. Map semantic variables (`--foreground-primary`, `--background-primary`, etc.) to your brand colors-5. Start building pages using the predefined variables+```text+Theme variables+ ↓+Semantic variables+ ↓+Composite Tokens+```-## Switching Between Light and Dark Themes+### Theme variables-Because Craft uses semantic variables like `--foreground-primary` and `--background-primary`, you can switch an entire site from light to dark mode by changing just \~6 variable values.+Theme variables contain the values that make one theme different from another.+They may contain literal values or reference palette variables such as those+provided by Open Props.-**Example:** Swap `--foreground-primary` from a dark color to light, and `--background-primary` from light to dark.+A theme implementation may use private derivation variables to normalize,+bound, or transform its public theme inputs. These variables are implementation+details of the theme layer: composite Tokens must not consume them directly,+and reusable resources must not require them.-{% hint style="info" %}-Webstudio supports pasting CSS, so you can prepare your theme variables in a text editor and paste them into Global Root.-{% endhint %}+Craft does not require every project to use the same number of theme variables.+A project must document its theme variables when it publishes reusable+resources or a theme for other projects.++### Semantic variables-## Page Template Workflow+Semantic variables describe why a value is used rather than what the value+looks like. For example, use `--foreground-negative` for an error message+instead of consuming a red palette value directly.-The Craft style guide includes a page template at the bottom (Nav, Main with Section/Container, Footer structure):+Semantic variables must reference public theme variables, private derivation+variables within the theme layer, or other semantic variables. They should not+contain standalone literal design values.-1. When creating a new page, copy this template structure-2. When building sections, duplicate the template section, rename it (e.g., "Hero", "Logos"), design it-3. Duplicate again for the next section-4. This keeps a clean template always available at the bottom+### Composite tokens++A Webstudio Token packages multiple style declarations. Craft calls these+**composite Tokens** to distinguish them from individual values stored in CSS+variables.++Composite Tokens must consume semantic variables when a suitable variable+exists. They should not consume palette or theme variables directly.++Components, utilities, variants, and sizes are purposes of composite Tokens,+not additional layers in the architecture.++### Local styles++Use **Local** for values and declarations that belong to one instance. Move a+decision into a CSS variable or composite Token when it becomes reusable.## CSS variables-Craft uses [Open Props](https://open-props.style/), an MIT-licensed library of CSS variables that helps accelerate adaptive and consistent design.+Craft projects may use [Open Props](https://open-props.style/), an MIT-licensed+collection of CSS variables, for palettes and scales. Open Props variables are+optional theme inputs and utilities; they are not replacements for Craft+semantic variables.++Define variables that are shared across a project on **Global Root**. Define a+variable on a closer common ancestor when its meaning is intentionally local to+one page, section, or component subtree.++### Naming variables-In addition to the Open Props variables, Craft includes the following CSS variables:+CSS variable names must:+- Use kebab-case.+- Use complete words unless an abbreviation is part of the approved Craft+ vocabulary.+- Describe purpose rather than visual appearance at the semantic layer.++Semantic color variables use this grammar:++```text+--{category}-{purpose}[-{state}]```++- **Category** is exactly one of `foreground`, `background`, `border`, or+ `overlay`.+- **Purpose** is one or more kebab-case terms that describe the color's reusable+ meaning. Compound purposes place a variation after its base purpose, such as+ `negative-subtle`.+- **State** is an optional final `hover`, `pressed`, `selected`, `disabled`, or+ `focus` suffix. Treat the final term as a state only when the project's+ documented registry declares that name as a state variable. For example,+ `--overlay-interaction-pressed` is a pressed interaction overlay, while+ `--foreground-disabled` is a registered purpose.++The core color variable list is the registry of universal purposes. Extensions+must document their additional names and whether the final term is a purpose or+state. An extension may introduce a compound purpose but must not reinterpret a+registered core name.++Examples:++```css--foreground-primary---foreground-secondary---foreground-accent---foreground-muted---foreground-border+--overlay-interaction-hover+--border-negative+--overlay-scrim+```---background-primary---background-secondary+Palette and scale variables use numbers:++```css+--blue-10+--size-4+```++Do not encode a literal value in a semantic name:++```css+/* Avoid */+--foreground-gray+--background-blue-hover++/* Prefer */+--foreground-muted--background-accent---background-card+```---gap-xs---gap-s---gap-m---gap-l+## Semantic colors---focus-color---focus-width---focus-offset+Craft organizes interface colors into four categories:---duration-default---easing-default+- **Foreground** for text, icons, and other marks drawn over a background.+- **Background** for canvases, surfaces, controls, and filled states.+- **Border** for boundaries, separators, and focus indicators.+- **Overlay** for translucent interaction layers and scrims.++Common purpose and state terms include:++```text+Emphasis purposes: primary, secondary, muted, disabled, inverse+Intent purposes: accent, positive, negative, warning, informative+Purpose variation: subtle+State: hover, pressed, selected, disabled, focus```-{% hint style="info" %}-Insert Craft from the Marketplace, and it will add the CSS variables to your Global Root. To match your branding, you can customize the values, such as colors, gradients, and more. You can also add custom variables.-{% endhint %}+This vocabulary is not a matrix. Define a semantic variable only for a reusable+decision that multiple composite Tokens consume or for an explicit+accessibility pairing. Do not generate every combination of category, intent,+variation, and state.-{% hint style="success" %}-CSS Props doesn't impose style opinions on your site. This library contains variables like `--size-4` and `--gradient-5`. Then, it's up to you to customize their values or use the defaults.-{% endhint %}+### Core color variables-| Type | Rule | Examples |-| ----------------------- | ------------ | ---------------------- |-| Size and color palettes | Use numbers. | `--size-4` `--blue-10` |+The universal baseline is intentionally small:-## Tokens+```css+/* Foreground */+--foreground-primary+--foreground-secondary+--foreground-disabled-| Type | Casing | Examples | Purpose | Help |-| -------------- | ------ | ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |-| Utility | Kebab | `margin-auto` `container` `button` | Used for layout and styling purposes without conveying any inherent meaning about the content it contains. | |-| Semantic | Title | `Card` `Pricing Table` | Conveys meaning and context about the content it contains. | |-| Semantic Child | Title | | Indicates that the Token is a child of a parent semantic Token. | What should we do here? Some examples/options: `Card Header` `Card - Header` `Card / Header`. What happens if it’s multiple levels deep? Maybe we only reference the top-most Token such as `Card` or the most relevant? |-| Variant | Kebab | `is-button-secondary` `is-pricing-table-small` | This indicates that the Token is intended to be used with another Token. For example, `button` is the “base” Token that carries the default styles and `is-button-secondary` uses some of the base styles and modifies or adds others. The variant should never be used without the base. | |-| Size | Kebab | `button-x-small\|small\|medium\|large` | Appending a size modifier to the end of a Token. “T-shirt” sizing is the accepted naming convention. Abbreviations are allowed here. | |+/* Background */+--background-primary+--background-secondary+--background-disabled-### When to use Tokens vs Local?+/* Border */+--border-default+--border-focus-**Use** [**Tokens**](craft.md#tokens) **for the following scenarios:**+/* Overlay */+--overlay-scrim+```-- There are multiple styles and at least one of which has many options for the value (e.g., size and colors) as opposed to something like text alignment.-- When there is a common use case that takes more time to select Local and apply manually than using a Token, such as setting the margin left and right to auto.+Projects extend this baseline as their composite Tokens establish reusable+needs. Shared Marketplace resources must declare which variables they require+and must not silently depend on undocumented project-specific variables.-**Don't use Tokens for the following scenarios:**+Intent extensions commonly use matching foreground, background, border, and+paired foreground names:-- When you can click an item in the Style Panel, such as text alignment or display flex.-- When there is only one style (use [CSS variables](craft.md#css-variables)).+```css+--foreground-negative+--background-negative+--background-negative-subtle+--border-negative+--foreground-on-negative+```-**More info:**+Use paired `foreground-on-*` variables for content placed on a strong semantic+background. The pair remains explicit even when several pairings resolve to+the same value because each pairing defines an independently verifiable+contrast contract.-Tokens are great for reusing styles, so you don't have to remember values. They shouldn't be used for simple tasks like centering text since that can be done with a button, and when switching between breakpoints, you may want to adjust the alignment.+Compose component states from existing semantic variables inside the composite+Token. Shared translucent overlays can express hover and pressed states without+creating a resolved state color for every background:-However, Tokens can be helpful for flex layouts, for example, when they fall into this rule:+```css+--overlay-interaction-hover+--overlay-interaction-pressed+--overlay-on-inverse-hover+--overlay-on-inverse-pressed+```-> Common use case that takes more time to select Local and apply manually than using a Token.+Promote a state color to the semantic layer only when it is independently+reusable and composition cannot express the decision. Component-specific color+variables are not part of the default Craft architecture. Introduce one only+when a component intentionally exposes it as a public theming contract.++For example, `checked`, `on`, and `current` commonly compose a selected+presentation; `invalid` commonly composes negative foreground and border+colors. These component states do not require new global colors by themselves.++### Deriving colors++Semantic colors should remain connected to the theme. Prefer aliases and+relative color expressions over duplicated literals:++```css+:root {+ color-scheme: light dark;++ --seed-neutral: oklch(50% 0.01 250);+ --seed-accent: oklch(50% 0.2 255);++ --theme-background: light-dark(+ oklch(from var(--seed-neutral) 98% 0.002 h),+ oklch(from var(--seed-neutral) 17% 0.012 h)+ );+ --theme-foreground: light-dark(+ oklch(from var(--seed-neutral) 20% 0.015 h),+ oklch(from var(--seed-neutral) 94% 0.006 h)+ );+ --theme-accent: light-dark(+ oklch(from var(--seed-accent) 54% c h),+ oklch(from var(--seed-accent) 72% calc(c * 0.82) h)+ );++ --background-primary: var(--theme-background);+ --foreground-primary: var(--theme-foreground);+ --background-accent: var(--theme-accent);+ --overlay-interaction-hover: oklch(+ from var(--theme-foreground) l c h / 6%+ );+}+```-For example, it's common to use a flex wrapper to add a gap to the content, which typically requires setting display to flex, direction to vertical, and adding a gap. It's faster to create a utility token like `flex-gap-small` that handles all this in one go.+Define a hue seed once and derive its scheme-specific result. `light-dark()` may+select between derived expressions when the project supports native+`color-scheme`. A project may instead override a small shared transformation+profile for each scheme. Do not maintain independent light and dark copies of+the semantic layer.-## Internal Style Guide+The example does not prescribe a fixed number of seeds or theme variables. It+demonstrates the required separation between authoring inputs, theme colors,+and semantic outputs.-The page on the site is used to display and design the various HTML elements like headings, components, brand elements, and more.+### Other core variables-| Type | Rule | Casing | Examples | Purpose |-| ------------------------ | ------------------------------ | ------ | --------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |-| Tokens (for style guide) | Prefix with double underscore. | Kebab | `__badge` `__outline` | A convention for indicating that the Token is merely for the purpose of dressing up the style guide and _not_ to be used on the actual site. |-| Page Name | Style Guide | Title | | |+Craft retains a small vocabulary for reusable layout, focus, and motion values:-## Navigator+```css+--gap-xs+--gap-s+--gap-m+--gap-l+--spacing-default-- **Casing**: Title+--focus-width+--focus-offset-| Item | Rule | Examples | Why |-| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |-| Labels | If using a custom name, use semantic names. | `Page Wrapper` `Cards` `Team Member` | Default components are title case and the navigator is for humans to understand the structure and purpose. |-| Box, Slot, HTML Embed, and Collection | <ul><li>Always create a custom name.</li><li>For Boxes, avoid layout-oriented naming such as 1/2 or left. Instead, use a name based on the content like Image Wrapper.</li></ul> | `Wrapper` `Card` `Animation Script` | The purpose of these components are not clear without a custom name. |-| Parent > Child | Use plural for parent and singular for children when they are related. | <p><code>Cards</code><br> <code>Card</code><br> <code>Card</code></p> | Helps indicate the relationship of instances. |-| Sections | Prefix Boxes that have the section tag with "Section ". | `Section Hero` | Indicatees where the section is at without digging into settings. |+--duration-default+--easing-default+```-### Structure+These variables follow the same architecture: their semantic values should+derive from documented theme or scale inputs where appropriate.++## Interaction states++Use these semantic states consistently:++| State | Meaning |+| ---------- | -------------------------------------------------------------- |+| `hover` | A pointing device is over an interactive target. |+| `pressed` | A target is being activated. CSS `:active` maps to `pressed`. |+| `selected` | An option or item is chosen, current, checked, or switched on. |+| `disabled` | An interaction is unavailable. |+| `focus` | A target has visible keyboard focus. |-- Page Wrapper- - Slot- - Global Styles- - Nav- - Main- - Section (generally, but not always)- - Container- - Slot- - Footer+States such as `open`, `pending`, `invalid`, and application-specific statuses+may affect several properties. Express them with composite Token variants and+reuse the closest semantic colors rather than automatically creating a global+color for each state name.-## Misc+## Accessibility-### Abbreviations+Craft conformance requires WCAG 2.2 Level AA. Themes and extensions must+preserve accessible semantic pairings.-Avoid abbreviations unless otherwise noted. Universal clarity is a priority, and abbreviations may be counterproductive.+- Normal text must have a contrast ratio of at least 4.5:1 against its+ background.+- Large text must have a contrast ratio of at least 3:1 against its background.+- Meaningful non-text interface graphics must have a contrast ratio of at least+ 3:1 against adjacent colors.+- Keyboard focus must remain visible.+- Color must not be the only way to communicate status or state.+- Disabled styling may be subtle, but must not obscure information required to+ understand the interface.+- Every supported theme must satisfy the same requirements.-### HTML Embed+Craft additionally recommends meeting the WCAG 2.2 Level AAA Focus Appearance+criterion: a custom focus indicator should provide at least a 3:1 change of+contrast and an area at least equivalent to a 2 CSS pixel perimeter.-- 1 instance = 1 purpose-- Start the code with a comment about its purpose+See the WCAG 2.2 criteria for+[text contrast](https://www.w3.org/TR/WCAG22/#contrast-minimum),+[non-text contrast](https://www.w3.org/TR/WCAG22/#non-text-contrast),+[use of color](https://www.w3.org/TR/WCAG22/#use-of-color),+[focus visibility](https://www.w3.org/TR/WCAG22/#focus-visible), and+[focus appearance](https://www.w3.org/TR/WCAG22/#focus-appearance).-## Changelog+## Composite tokens-### 1.2+Composite Tokens combine reusable declarations. Their values should reference+CSS variables so a theme can change without editing the Token.-- Changed `container` token to use flex for proper compatibility with Craft Library. To adopt this change, go to any container token and set display flex, flex-direction column, and gap to `var(--gap-m)` . Any containers that need a horizontal layout will need to be manually set on Local, such as the style guide navigation.+| Purpose | Naming | Examples |+| --------- | ------------------ | ------------------------------- |+| Utility | Kebab-case | `margin-auto`, `flex-gap-small` |+| Component | Kebab-case | `button`, `input`, `card` |+| Semantic | Title case | `Pricing Card`, `Team Member` |+| Variant | `is-{base}-{name}` | `is-button-secondary` |+| Size | `{base}-{size}` | `button-small`, `button-large` |- +A variant must be used with its base Token. A size Token should contain only+the declarations needed to change size.-### 1.1+Prefer a composite Token when a reusable decision needs multiple declarations+or coordinated states. Prefer a CSS variable for one reusable value. Use Local+for an instance-specific exception.-- Added `—spacing-default`. Common use cases include left/right padding on containers and card padding. Improves consistency within the site and enables marketplace sections to adapt to our default spacing rather than introducing random spacing that deviates from the preferred.+When multiple Tokens set the same property, the rightmost style source wins.+Place Local last when an instance needs to override a Token.-### 1.0+## Extensions and exceptions-- Release+A project may extend Craft when the core vocabulary cannot express a reusable+domain concept.-## Craft Library+An extension must:-Craft Library is a collection of pre-built section templates built to Craft standards, available in the [Marketplace](marketplace.md).+1. Follow the same naming grammar.+2. Describe purpose rather than a specific visual value.+3. Reuse or derive from existing theme and semantic variables when possible.+4. Introduce a new theme value only when an existing value cannot preserve the+ intended distinction.+5. Document its meaning, supported states, accessibility pairings, and theme+ behavior when it is shared outside the project.-<figure><img src="../.gitbook/assets/craft-library.png" alt=""><figcaption><p>Craft Library in the Marketplace</p></figcaption></figure>+Literal colors are appropriate when the color belongs to user content, an+external representation, data visualization, or a functional preview that+must not change with the interface theme. Document shared exceptions so they+are not mistaken for missing semantic variables.-Templates contain no hardcoded values such as colors or sizes. They rely entirely on [Craft CSS variables](craft.md#css-variables), so each section adapts to your site’s design system.+Project-specific extensions do not become Craft core automatically. Promote an+extension only when the same semantic need is reusable across unrelated+projects.-The library speeds up development while keeping your project clean and fully customizable.+## Conformance-This post demonstrates Craft Library getting inserted on two completely different sites:+A project conforms to Craft when:-{% embed url="https://x.com/getwebstudio/status/1895213059251011768" %}+- Shared composite Tokens use semantic variables where suitable.+- Semantic variables derive from the theme layer or other semantic variables.+- Theme changes do not require editing composite Tokens.+- Variable and Token names follow the Craft grammar.+- Required foreground and background pairings meet the accessibility rules.+- Shared extensions and literal exceptions are documented.+- Reusable resources declare their required Craft variables and extensions.++Conformance does not require every project to define every variable in the+reference list. It requires every consumed variable and extension to follow the+contract.## Related-- [Design tokens](foundations/design-tokens.md) – Create and manage reusable style tokens-- [CSS variables](foundations/css-variables.md) – Use CSS custom properties in Webstudio-- [Anatomy of the Webstudio builder](foundations/anatomy-of-the-webstudio-builder.md) – Understand the builder interface-- [Marketplace](marketplace.md) – Access Craft Library and other templates-- [Contributing to the Marketplace](../contributing/marketplace.md) – Submit templates built with Craft+- [Use Craft](craft-guide.md) – Apply the specification in a Webstudio project+- [Craft changelog](craft-changelog.md) – Review changes to the standard+- [Design tokens](foundations/design-tokens.md) – Create and manage reusable composite Tokens+- [CSS variables](foundations/css-variables.md) – Define and scope reusable values+- [States and selectors](foundations/states-and-selectors.md) – Style interaction statesdiff --git a/docs/university/foundations/css-variables.md b/docs/university/foundations/css-variables.mdindex 01e661bc9d..0fceaef9fc 100644--- a/docs/university/foundations/css-variables.md+++ b/docs/university/foundations/css-variables.md@@ -22,18 +22,21 @@ Why Use CSS variables?The concept of “reusability” is present in both CSS variables and [Tokens](design-tokens.md), but they are different and complement each other exceptionally well.-Let’s think of these two concepts as layers or building blocks.### Layer 1: CSS variables-**CSS variables are the bottom layer. They comprise individual variable names and values** often used for sizes, colors, and other styles with many input options.+**CSS variables are the bottom layer. They comprise individual variable names and values** often used for sizes, colors, and other styles with many input options. Craft distinguishes theme variables, which contain theme-specific inputs, from semantic variables, which describe how a value is used.-For example, you can create one variable per color in your design system. Those colors are going to be used throughout your site and in Tokens.+For colors, define a small set of theme variables and derive semantic variables+from them. For example, `--theme-accent` can control+`--background-accent`, `--border-focus`, and their interaction states. Tokens+consume the semantic variables, so changing a theme input updates the complete+system without editing each color independently.### Layer 2: Tokens-[**Tokens**](design-tokens.md) **are the next layer. They package up **_**multiple**_** styles.** A `Card` Token may include padding, color, and gap styles, for example.+[**Tokens**](design-tokens.md) **are the next layer. They package up **_**multiple**_** styles.** Craft calls these composite Tokens. A `Card` Token may include padding, color, and gap styles, for example.The values you enter for each style should be defined as variables. This approach ensures consistent designs and allows you to update a value in one place, with the change automatically reflected wherever the variable is used.@@ -46,7 +49,9 @@ With CSS variables, Tokens now often take a more semantic approach, such as call## Creating variables{% hint style="warning" %}-Before you create custom variables, be sure to check out [Craft](../craft.md) — the standard guideline for building with Webstudio. It contains a library of expertly crafted CSS variables.+Before you create custom variables, review [Craft](../craft.md), Webstudio's+public specification for theme variables, semantic variables, composite+Tokens, and reusable project architecture.{% endhint %}A CSS variable is defined in the Advanced section by using two dashes followed by the variable name, like this:diff --git a/docs/university/foundations/design-tokens.md b/docs/university/foundations/design-tokens.mdindex 5d648afa10..1ba8d801a7 100644--- a/docs/university/foundations/design-tokens.md+++ b/docs/university/foundations/design-tokens.md@@ -1,8 +1,7 @@---description: >-- Design tokens enable the creation of consistent designs by packaging up- multiple styles so that on any instance you add that Token, those styles will- show up and stay in sync.+ Tokens package reusable style declarations that stay synchronized across+ every instance where they are applied.---# 🖌️ Design tokens@@ -20,12 +19,20 @@ Scenario: You’re building a website with Webflow. You have two separate elemenThere’s a better way. It’s Design tokens.-## What are Design tokens? <a href="#what-are-design-tokens" id="what-are-design-tokens"></a>+## What are Tokens? <a href="#what-are-design-tokens" id="what-are-design-tokens"></a>-Design tokens are everything that you wish classes would be - a way to reuse styles without limitations.+A Webstudio **Token** is a reusable style source that can contain multiple+declarations and states. [Craft](../craft.md) calls it a **composite Token** to+distinguish it from individual values stored in CSS variables.++The Design Tokens Community Group also uses _design token_ for values in its+portable data format. Webstudio imports that format and represents its values+as CSS variables or Webstudio Tokens according to their type and intended use.- **Mix-and-match Tokens freely**: You can apply as many Tokens as you want to an instance in any order. There is no combo class silliness and no limitations with breakpoints.-- **Universal format:** We didn’t invent Design tokens. There is an independent spec (by the [Design Tokens Community Group](https://design-tokens.github.io/community-group/format/)) that defines a data format for Tokens, meaning you can potentially import and export tokens between multiple apps. Soon you’ll be able to sync tokens between Webstudio and Figma through the [Tokens Studio for Figma](https://tokens.studio/) plugin!+- **Portable input:** The [Design Tokens Community Group format](https://design-tokens.github.io/community-group/format/)+ provides a format that tools can exchange. Webstudio can import DTCG data and+ Figma Variables API exports.## Import design tokens@@ -76,22 +83,24 @@ See [Atomic CSS](project-settings.md#atomic-css) for more info.## Advanced Token Techniques-### Token Composition+### Token compositionCombine multiple tokens to create flexible, modular designs:-1. **Base token**: Contains core styles (e.g., "card" with padding, background, border-radius)-2. **Modifier tokens**: Contains variations (e.g., "small" for smaller padding, "featured" for highlight border)+1. **Base Token**: Contains core styles, such as `card` with padding,+ background, and border radius.+2. **Variant or size Tokens**: Contain only the declarations needed for a+ variation, such as `is-card-featured` or `card-small`.Apply both to an instance: The styles merge, with later tokens overriding earlier ones for conflicting properties.**Example:** A card system-- "card" token: padding, background, border-radius-- "card-small" token: smaller padding-- "card-featured" token: accent border color+- `card` Token: padding, background, and border radius+- `card-small` Token: smaller padding+- `is-card-featured` Token: accent border color-Apply "card" + "card-featured" for a featured card variant.+Apply `card` and `is-card-featured` for a featured card variant.### Token Priority (Cascading)diff --git a/package.json b/package.jsonindex de0fdd9856..9e8494fe8e 100644--- a/package.json+++ b/package.json@@ -57,6 +57,7 @@"@storybook/addon-actions": "^8.6.4","@storybook/addon-backgrounds": "^8.6.4","@storybook/addon-controls": "^8.6.4",+ "@storybook/addon-toolbars": "^8.6.4","@storybook/react": "^8.6.4","@storybook/react-vite": "^8.6.4","@types/node": "^22.13.10",@@ -92,6 +93,8 @@"@types/react-dom": "^18.2.25","react": "18.3.0-canary-14898b6a9-20240318","react-dom": "18.3.0-canary-14898b6a9-20240318",+ "playwright": "1.50.1",+ "@playwright/test": "1.50.1","vite@<7": "6.3.4"},"patchedDependencies": {diff --git a/packages/css-data/src/parse-css-value.test.ts b/packages/css-data/src/parse-css-value.test.tsindex 5f9c94bda5..852034f85b 100644--- a/packages/css-data/src/parse-css-value.test.ts+++ b/packages/css-data/src/parse-css-value.test.ts@@ -1764,12 +1764,10 @@ describe("keyword-only properties via parseCssValue", () => {});test("white-space-collapse: var() is accepted and returned as VarValue", () => {- expect(parseCssValue("white-space-collapse", "var(--ws-collapse)")).toEqual(- {- type: "var",- value: "ws-collapse",- }- );+ expect(parseCssValue("white-space-collapse", "var(--collapse)")).toEqual({+ type: "var",+ value: "collapse",+ });});test("text-wrap-mode: valid keyword", () => {diff --git a/packages/design-system/README.md b/packages/design-system/README.mdnew file mode 100644index 0000000000..25ebf6dff6--- /dev/null+++ b/packages/design-system/README.md@@ -0,0 +1,38 @@+# Webstudio design system++This package implements Webstudio's internal design system. It follows the+public [Craft specification](https://docs.webstudio.is/university/craft), which+defines the universal contract for reusable Webstudio projects and design+systems.++Craft and this package have different responsibilities:++- **Craft defines the architecture:** theme variables, semantic variables,+ composite Tokens, Local styles, naming, states, accessibility, extensions,+ and conformance.+- **This package implements that architecture for Webstudio:** it chooses the+ color seeds and scheme profiles, derives theme and semantic colors, and+ consumes those semantics in composite component styles.++The implementation defines each color seed once. A shared light or dark profile+transforms six theme colors into a deliberately+small semantic vocabulary. Components load the CSS directly and compose those+semantics without component-specific color variables. These implementation+choices are not requirements for other Craft projects.++See [Color tokens](src/colors/README.md) for the CSS source format, validation,+type-only generation workflow, and naming rules.++## Tests++Vitest runs pure calculations and server-rendering assertions in Node. Name+tests that require DOM layout, browser APIs, or component interaction+`*.browser.test.ts` or `*.browser.test.tsx`; Vitest Browser Mode runs those in+Chromium through Playwright.++```sh+pnpm --filter @webstudio-is/design-system test+```++Do not use jsdom for design-system tests. Keep pure logic in regular test files+and use Browser Mode whenever browser behavior is part of the contract.diff --git a/packages/design-system/package.json b/packages/design-system/package.jsonindex 00cc34e63c..d883a9c46a 100644--- a/packages/design-system/package.json+++ b/packages/design-system/package.json@@ -6,16 +6,21 @@"homepage": "https://webstudio.is","type": "module","scripts": {- "typecheck": "tsc --noEmit -p tsconfig.typecheck.json",+ "generate:color-types": "tsx src/colors/generate-color-types.ts",+ "typecheck": "tsx src/colors/generate-color-types.ts --check && tsc --noEmit -p tsconfig.typecheck.json","test": "vitest run"},"devDependencies": {+ "@babel/parser": "^7.29.7","@types/react": "^18.2.70","@types/react-dom": "^18.2.25",+ "@vitest/browser": "^3.1.2","@webstudio-is/image": "workspace:*","@webstudio-is/tsconfig": "workspace:*",+ "css-tree": "^3.2.1","react": "18.3.0-canary-14898b6a9-20240318","react-dom": "18.3.0-canary-14898b6a9-20240318",+ "playwright": "1.50.1","vitest": "^3.1.2","zod": "^4.4.3"},@@ -78,9 +83,12 @@"./colors": {"webstudio": "./src/colors.ts"},+ "./colors.css": "./src/colors/colors.css","./test-setup": "./src/test-setup.ts"},"license": "AGPL-3.0-or-later","private": true,- "sideEffects": false+ "sideEffects": [+ "**/*.css"+ ]}diff --git a/packages/design-system/src/color-utils.ts b/packages/design-system/src/color-utils.tsnew file mode 100644index 0000000000..e32cfeb45c--- /dev/null+++ b/packages/design-system/src/color-utils.ts@@ -0,0 +1,15 @@+export const rotateBoundedBackgroundHue = (color: string, degrees: number) => {+ const rotatedColor = `color(+ from oklch(from ${color} l c calc(h + ${degrees}))+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ )`;+ const luminanceScale = "min(1, 0.18 / max(y, 0.000001))";++ return `color(+ from ${rotatedColor}+ xyz-d65+ calc(x * ${luminanceScale})+ calc(y * ${luminanceScale})+ calc(z * ${luminanceScale})+ )`;+};diff --git a/packages/design-system/src/colors/README.md b/packages/design-system/src/colors/README.mdnew file mode 100644index 0000000000..6945f74856--- /dev/null+++ b/packages/design-system/src/colors/README.md@@ -0,0 +1,195 @@+# Color tokens++[`colors.css`](colors.css) is the runtime and source of truth for design-system+colors. Do not edit files in `__generated__/` directly; generated files contain+types only.++Each application must load `@webstudio-is/design-system/colors.css` once at its+UI root. Design-system component imports do not inject global styles.++The implementation follows the public+[Craft specification](https://docs.webstudio.is/university/craft): bounded theme+parameters flow through a relative color recipe into semantic colors and+finally composite component styles.++## Architecture++The CSS source implements Craft's three conceptual layers:++1. The theme layer contains nine public `--theme-*` parameters and private+ `--color-*` derivations that normalize them for the active color scheme.+2. Semantic foreground, background, border, and overlay colors describe the+ reusable decisions consumed by components.+3. Components compose those semantic colors into reusable styles.++Components consume only semantic colors with `cssVar()`. Colors are not copied+into the Stitches theme, and components cannot access theme parameters or+derivation values through the generated public type. The legacy Stitches color+scale has been removed rather than retained through compatibility aliases.++Changing a theme parameter updates both color schemes. Dark mode changes+scheme derivation bounds rather than maintaining a second theme or semantic+color set. Cross-hue variants mix in `oklab`, so the neutral family cannot+rotate an intent into another color family.++Chromatic fills keep the same bounded luminance in both schemes. Dark mode+derives lighter foreground and focus variants from the same color family and+uses light content on strong chromatic fills. This keeps accent buttons stable+between schemes without making dark-mode accent text unreadable.++## Theme parameters++Theme authors set colors and relationships, not semantic outputs. Every public+parameter is commented at its declaration in [`colors.css`](colors.css).++| Parameter | Meaning |+| --------------------------- | ------------------------------------------------------- |+| `--theme-color-neutral` | Surfaces, content, borders, and shadows |+| `--theme-color-accent` | Interactive emphasis and keyboard focus |+| `--theme-color-positive` | Successful or positive outcomes |+| `--theme-color-negative` | Errors, danger, and destructive actions |+| `--theme-color-warning` | Caution and warning states |+| `--theme-color-informative` | Neutral information |+| `--theme-contrast-content` | Content contrast from the readable minimum to strongest |+| `--theme-contrast-surface` | Separation between primary and secondary surfaces |+| `--theme-contrast-border` | Separation between decorative borders and surfaces |++Theme colors accept any CSS color. The recipe converts chromatic inputs into+the display gamut, limits their OKLCH source to `0.2–0.8` lightness and `0.3`+chroma, then bounds luminance for the active scheme by mixing toward black or+white. Neutral chroma is limited to `0.02`. These bounds preserve the selected+color family while keeping required text and focus relationships safe.++The default parameters reproduce the design system's established light palette+within small per-channel tolerances. Decorative subtle backgrounds and borders+are allowed a wider tolerance because their legacy relationships do not meet a+meaningful 3:1 contrast threshold.++Contrast parameters are percentages. `0%` selects the soft end and `100%`+selects the strong end. CSS clamps values outside that range, so the recipe+preserves its relative hierarchy regardless of the authoring UI. Content and+focus contracts are tested for accessibility; surface and decorative border+contrast remain visual theme choices.++```css+.custom-theme {+ --theme-color-neutral: oklch(55% 0.02 285);+ --theme-color-accent: oklch(60% 0.2 295);+ --theme-color-positive: oklch(55% 0.14 152);+ --theme-color-negative: oklch(55% 0.19 27);+ --theme-color-warning: oklch(55% 0.14 75);+ --theme-color-informative: oklch(55% 0.14 225);++ --theme-contrast-content: 70%;+ --theme-contrast-surface: 35%;+ --theme-contrast-border: 40%;+}+```++Set `data-color-scheme` on the document root. Scheme bounds are deliberately+root-scoped; nested light and dark theme islands are not part of this contract.++## Semantic colors++Semantic names follow Craft's+`--{foreground|background|border|overlay}-{purpose}[-{state}]` grammar and use+kebab-case without a project prefix.++Components compose states instead of requiring a semantic color for every+component, intent, and state combination:++```ts+styled("button", {+ color: cssVar("--foreground-on-accent"),+ background: cssVar("--background-accent"),+ "&:hover": {+ backgroundImage: `linear-gradient(+ ${cssVar("--overlay-interaction-hover")},+ ${cssVar("--overlay-interaction-hover")}+ )`,+ },+});+```++## Semantic extensions++The package extends Craft's core registry only for reusable component needs:++| Family | Meaning and required pairing |+| ------------- | --------------------------------------------------------------------------------------------------- |+| `inverse` | A surface with reversed polarity; pair `--background-inverse` with `--foreground-on-inverse`. |+| `accent` | Interactive emphasis; pair a strong accent background with `--foreground-on-accent`. |+| `positive` | Successful outcomes; pair strong or subtle backgrounds with their registered foreground. |+| `negative` | Errors and destructive actions; pair strong or subtle backgrounds with their registered foreground. |+| `warning` | Caution; pair the subtle background with the warning foreground and border. |+| `informative` | Neutral information; pair the subtle background with the informative foreground and border. |+| `interaction` | Translucent hover and pressed feedback composed over regular surfaces. |+| `on-inverse` | Translucent hover and pressed feedback composed over inverse surfaces. |++`--overlay-scrim` always derives from a dark version of the neutral theme+color, so it dims content in both schemes rather than following foreground+polarity. Interaction overlays follow scheme polarity: dark overlays in light+mode and light overlays in dark mode.++`cssVar(name, fallback?)` follows the arguments of native `var()`. The first+argument is type-checked against public semantic variables parsed from this CSS+source:++```ts+cssVar("--foreground-primary");+cssVar("--foreground-primary", "currentColor");+```++Component-owned and third-party variables stay with their component instead of+entering the color manifest. Declare each name once in its owning source file:++```ts+declareCssVar("--panel-banner-icon-color");++cssVar("--panel-banner-icon-color");+cssVar("--panel-banner-icon-color", "currentColor");+```++The generator collects `declareCssVar()` calls into the global name type. It+rejects duplicate declarations and conflicts with every variable in+`colors.css`. An unregistered string is rejected by `cssVar()` without requiring+component variable constants to be exported or imported.++## Validation and type generation++Type generation parses CSS structurally and rejects:++- Empty color layers or mismatched light and dark scheme bounds.+- Missing variable references.+- References across forbidden architectural layers.+- Unused theme parameters, scheme bounds, or derived colors.+- Standalone semantic color literals.+- Circular color references.+- Semantic names outside the Craft grammar.+- Duplicate component variable declarations or conflicts with color variables.++TypeScript rejects unknown public variable names passed to `cssVar()`.++Browser tests load the real stylesheet and sweep theme color and contrast+boundaries in both schemes. They reject foreground/background text pairs below+4.5:1 contrast and focus borders below 3:1 contrast. They also compare every+default light semantic color with the established design-system palette and+protect the dark neutral hierarchy, stable chromatic fills, light on-color+content, and light interaction overlays.++The generator emits `ThemeVariableName` for public theme inputs and+`CssVariableName` for semantic colors and declared component variables in+`__generated__/css-variable-names.d.ts`. It does not generate JavaScript or+duplicate color values. CSS is imported directly and performs all runtime+derivation and scheme switching.++Run `pnpm generate:color-types` after changing a color or `declareCssVar()`+declaration. The package `typecheck` verifies that generated declarations are+current, and the normal workspace CI runs that command. Run `pnpm test` to+verify structural contracts and browser-computed contrast.++The Storybook **Foundations/Colors** story loads the runtime stylesheet directly+and parses the same file only for names and source declarations. It renders+theme parameters, derived colors, browser-computed contrast pairs, and every+semantic color. The global **Theme test case** and **Color scheme** toolbar+controls switch the entire Storybook, including this overview.diff --git a/packages/design-system/src/colors/__generated__/css-variable-names.d.ts b/packages/design-system/src/colors/__generated__/css-variable-names.d.tsnew file mode 100644index 0000000000..7f97863c27--- /dev/null+++ b/packages/design-system/src/colors/__generated__/css-variable-names.d.ts@@ -0,0 +1,87 @@+// Generated by generate-color-types.ts from colors.css and declareCssVar() calls. Do not edit directly.++export type ThemeVariableName =+ | "--theme-color-neutral"+ | "--theme-color-accent"+ | "--theme-color-positive"+ | "--theme-color-negative"+ | "--theme-color-warning"+ | "--theme-color-informative"+ | "--theme-contrast-content"+ | "--theme-contrast-surface"+ | "--theme-contrast-border";++export type CssVariableName =+ | "--background-primary"+ | "--background-secondary"+ | "--background-disabled"+ | "--background-inverse"+ | "--background-accent"+ | "--background-positive"+ | "--background-positive-subtle"+ | "--background-negative"+ | "--background-negative-subtle"+ | "--background-warning-subtle"+ | "--background-informative-subtle"+ | "--foreground-primary"+ | "--foreground-secondary"+ | "--foreground-disabled"+ | "--foreground-on-inverse"+ | "--foreground-on-accent"+ | "--foreground-on-positive"+ | "--foreground-on-negative"+ | "--foreground-accent"+ | "--foreground-positive"+ | "--foreground-negative"+ | "--foreground-warning"+ | "--foreground-informative"+ | "--border-default"+ | "--border-focus"+ | "--border-negative"+ | "--border-warning"+ | "--border-informative"+ | "--overlay-interaction-hover"+ | "--overlay-interaction-pressed"+ | "--overlay-on-inverse-hover"+ | "--overlay-on-inverse-pressed"+ | "--overlay-scrim"+ | "--binding-opacity"+ | "--canvas-pointer-events"+ | "--clear-selection-trigger"+ | "--code-editor-max-height"+ | "--code-editor-maximize-icon-visibility"+ | "--code-editor-min-height"+ | "--command-input-border-bottom-width"+ | "--contrast"+ | "--css-value-input-maximize-button-display"+ | "--dashboard-card-border-color"+ | "--dot-display"+ | "--editing-placeholder"+ | "--outline-angle"+ | "--panel-banner-icon-color"+ | "--plus-display"+ | "--project-card-prefetch-image-background"+ | "--radix-collapsible-content-height"+ | "--radix-popper-anchor-width"+ | "--radix-scroll-area-thumb-height"+ | "--radix-select-trigger-width"+ | "--radix-toast-swipe-end-x"+ | "--radix-toast-swipe-move-x"+ | "--section-title-button-content-color"+ | "--section-title-chevron-display"+ | "--section-title-label-content-color"+ | "--select-button-chevron-color"+ | "--sidebar-left-panel-width"+ | "--style-node-trigger"+ | "--style-source-menu-trigger-gradient"+ | "--style-source-menu-trigger-visibility"+ | "--style-source-menu-trigger-visibility-override"+ | "--thumb-border-color"+ | "--thumbnail-action-visibility"+ | "--tree-action-opacity"+ | "--tree-action-width"+ | "--tree-node-background-color"+ | "--tree-node-level"+ | "--tree-node-outline"+ | "--tree-node-selection-background-color"+ | "--value";diff --git a/packages/design-system/src/colors/color-contrast.browser.test.ts b/packages/design-system/src/colors/color-contrast.browser.test.tsnew file mode 100644index 0000000000..c4879e5425--- /dev/null+++ b/packages/design-system/src/colors/color-contrast.browser.test.ts@@ -0,0 +1,529 @@+import { describe, expect, test } from "vitest";+import "./colors.css";+import { getColorContrast } from "./color-contrast";+import type { ColorMode } from "./color-source-utils";++const readColor = (name: string) => {+ const sample = document.createElement("span");+ sample.style.color = `var(${name})`;+ document.body.append(sample);++ const canvas = document.createElement("canvas");+ canvas.width = 1;+ canvas.height = 1;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ sample.remove();+ throw new Error("Canvas color evaluation is unavailable");+ }+ context.fillStyle = getComputedStyle(sample).color;+ context.fillRect(0, 0, 1, 1);+ const color = context.getImageData(0, 0, 1, 1).data;+ sample.remove();+ return color;+};++const expectedLightColors = {+ "--background-primary": "#ffffff",+ "--background-secondary": "#e8eaeb",+ "--background-disabled": "#f8f8f8",+ "--background-inverse": "#11181c",+ "--background-accent": "#096cff",+ "--background-positive": "#00894a",+ "--background-positive-subtle": "#e9f9ee",+ "--background-negative": "#dc2929",+ "--background-negative-subtle": "#ffe9e9",+ "--background-warning-subtle": "#f8edad",+ "--background-informative-subtle": "#e1f0ff",+ "--foreground-primary": "#11181c",+ "--foreground-secondary": "#595f63",+ "--foreground-disabled": "#898d90",+ "--foreground-on-inverse": "#ffffff",+ "--foreground-on-accent": "#ffffff",+ "--foreground-on-positive": "#ffffff",+ "--foreground-on-negative": "#ffffff",+ "--foreground-accent": "#096cff",+ // Darkened from the legacy green so positive text remains accessible on its subtle background.+ "--foreground-positive": "#0b7b45",+ "--foreground-negative": "#d13a3a",+ // Darkened from the legacy yellow so warning text meets 4.5:1 contrast.+ "--foreground-warning": "#6f6100",+ "--foreground-informative": "#016ccc",+ "--border-default": "#e6e6e6",+ "--border-focus": "#3c86ff",+ "--border-negative": "#d13a3a",+ "--border-warning": "#f5d90a",+ "--border-informative": "#b7d9f8",+ "--overlay-interaction-hover": "#00000010",+ "--overlay-interaction-pressed": "#0000001c",+ "--overlay-on-inverse-hover": "#ffffff10",+ "--overlay-on-inverse-pressed": "#ffffff1c",+ "--overlay-scrim": "#11181ca8",+} as const;++const parseHex = (hex: string) => {+ const channels = hex.slice(1).match(/.{2}/g);+ if (channels === null) {+ throw new Error(`Invalid expected color: ${hex}`);+ }+ if (channels.length === 3) {+ channels.push("ff");+ }+ return channels.map((channel) => Number.parseInt(channel, 16));+};++const getRelativeLuminance = (color: Uint8ClampedArray) => {+ const channels = Array.from(color.slice(0, 3), (channel) => {+ const value = channel / 255;+ return value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;+ });+ return 0.2126 * channels[0] + 0.7152 * channels[1] + 0.0722 * channels[2];+};++const getContrastRatio = (+ first: Uint8ClampedArray,+ second: Uint8ClampedArray+) => {+ const firstLuminance = getRelativeLuminance(first);+ const secondLuminance = getRelativeLuminance(second);+ return (+ (Math.max(firstLuminance, secondLuminance) + 0.05) /+ (Math.min(firstLuminance, secondLuminance) + 0.05)+ );+};++describe("Craft color contrast", () => {+ test("default secondary colors preserve a clear visual hierarchy", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");++ try {+ for (const mode of ["light", "dark"] as const) {+ root.dataset.colorScheme = mode;+ const background = readColor("--background-primary");+ const surface = readColor("--background-secondary");+ const primaryForeground = readColor("--foreground-primary");+ const secondaryForeground = readColor("--foreground-secondary");+ const primaryContrast = getContrastRatio(primaryForeground, background);+ const secondaryContrast = getContrastRatio(+ secondaryForeground,+ background+ );++ expect(+ getContrastRatio(surface, background),+ `${mode} secondary surface`+ ).toBeGreaterThanOrEqual(1.15);+ expect(+ secondaryContrast,+ `${mode} secondary foreground`+ ).toBeGreaterThanOrEqual(4.5);+ expect(+ secondaryContrast,+ `${mode} secondary foreground remains subordinate`+ ).toBeLessThanOrEqual(primaryContrast * 0.55);+ }+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("light warning surfaces remain visibly distinct", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "light";++ try {+ const background = readColor("--background-primary");+ const warning = readColor("--background-warning-subtle");+ const ratio = getContrastRatio(warning, background);+ expect(ratio).toBeGreaterThanOrEqual(1.15);+ expect(ratio).toBeLessThanOrEqual(1.3);+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("disabled content remains legible but subordinate", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");++ try {+ for (const mode of ["light", "dark"] as const) {+ root.dataset.colorScheme = mode;+ const primary = readColor("--background-primary");+ const disabledBackground = readColor("--background-disabled");+ const disabled = readColor("--foreground-disabled");+ const secondary = readColor("--foreground-secondary");++ for (const background of [primary, disabledBackground]) {+ expect(+ getContrastRatio(disabled, background),+ `${mode} disabled content`+ ).toBeGreaterThanOrEqual(3);+ }+ expect(getContrastRatio(disabled, primary), mode).toBeLessThan(+ getContrastRatio(secondary, primary)+ );+ }+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("default light semantics resolve to the expected palette", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "light";++ try {+ for (const [name, expectedHex] of Object.entries(expectedLightColors)) {+ const actual = Array.from(readColor(name));+ const expected = parseHex(expectedHex);+ let tolerance = 9;+ if (name === "--background-negative-subtle") {+ tolerance = 4;+ } else if (+ name !== "--background-warning-subtle" &&+ (name.includes("subtle") ||+ name.startsWith("--border-") ||+ name === "--foreground-negative")+ ) {+ tolerance = 24;+ }++ for (const [index, expectedChannel] of expected.entries()) {+ expect+ .soft(+ Math.abs(actual[index] - expectedChannel),+ `${name} channel ${index}: ${actual.join(", ")} versus ${expected.join(", ")}`+ )+ .toBeLessThanOrEqual(index === 3 ? 1 : tolerance);+ }+ }+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("dark focus borders preserve accent color instead of using accent text", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "dark";++ try {+ expect(Array.from(readColor("--border-focus"))).not.toEqual(+ Array.from(readColor("--foreground-accent"))+ );+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("default focus borders stay close to the required contrast", () => {+ for (const mode of ["light", "dark"] as const) {+ const focus = getColorContrast(mode).find(+ ({ foreground }) => foreground === "--border-focus"+ );+ expect(focus?.ratio, mode).toBeLessThanOrEqual(3.5);+ }+ });++ for (const mode of ["light", "dark"] as const) {+ test(`${mode} mode satisfies every contrast contract`, () => {+ for (const result of getColorContrast(mode)) {+ expect(+ result.ratio,+ `${result.foreground} on ${result.background}`+ ).toBeGreaterThanOrEqual(result.minimum);+ }+ });+ }++ test("theme color hue and chroma control derived semantic colors", () => {+ const root = document.documentElement;+ const sample = document.createElement("span");+ sample.style.color = "var(--background-accent)";+ document.body.append(sample);++ const accentBefore = getComputedStyle(sample).color;+ root.style.setProperty("--theme-color-accent", "oklch(50% 0.18 300)");+ const accentAfter = getComputedStyle(sample).color;++ sample.style.color = "var(--background-primary)";+ const neutralBefore = getComputedStyle(sample).color;+ root.style.setProperty("--theme-color-neutral", "oklch(50% 0.02 300)");+ const neutralAfter = getComputedStyle(sample).color;++ expect.soft(accentAfter).not.toBe(accentBefore);+ expect.soft(neutralAfter).not.toBe(neutralBefore);++ root.style.removeProperty("--theme-color-accent");+ root.style.removeProperty("--theme-color-neutral");+ sample.remove();+ });++ test("theme contrast parameters are effective and clamp to their range", () => {+ const root = document.documentElement;+ const relationships = {+ content: "--foreground-primary",+ surface: "--background-secondary",+ border: "--border-default",+ } as const;++ try {+ for (const [relationship, semanticColor] of Object.entries(+ relationships+ )) {+ const parameter = `--theme-contrast-${relationship}`;+ root.style.setProperty(parameter, "0%");+ const soft = Array.from(readColor(semanticColor));+ root.style.setProperty(parameter, "100%");+ const strong = Array.from(readColor(semanticColor));++ expect(strong, relationship).not.toEqual(soft);++ root.style.setProperty(parameter, "-100%");+ expect(Array.from(readColor(semanticColor)), relationship).toEqual(+ soft+ );+ root.style.setProperty(parameter, "200%");+ expect(Array.from(readColor(semanticColor)), relationship).toEqual(+ strong+ );+ }+ } finally {+ for (const relationship of Object.keys(relationships)) {+ root.style.removeProperty(`--theme-contrast-${relationship}`);+ }+ }+ });++ test("intent variants retain their semantic color family", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ try {+ root.dataset.colorScheme = "light";+ const positive = readColor("--background-positive-subtle");+ const negative = readColor("--background-negative-subtle");+ const warning = readColor("--background-warning-subtle");+ const informative = readColor("--background-informative-subtle");++ expect(positive[1]).toBeGreaterThan(positive[0]);+ expect(negative[0]).toBeGreaterThan(negative[2]);+ expect(warning[0]).toBeGreaterThan(warning[2]);+ expect(informative[2]).toBeGreaterThan(informative[0]);+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("default dark negative foreground remains distinctly red", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "dark";++ try {+ const negative = readColor("--foreground-negative");+ expect(negative[0] - Math.max(negative[1], negative[2])).toBeGreaterThan(+ 100+ );+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("default dark informative surface remains distinct from the panel", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "dark";++ try {+ const background = readColor("--background-primary");+ const informative = readColor("--background-informative-subtle");+ expect(getContrastRatio(informative, background)).toBeGreaterThanOrEqual(+ 1.2+ );+ expect(informative[2] - informative[0]).toBeGreaterThanOrEqual(25);+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("scrim remains dark in both color schemes", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ try {+ for (const mode of ["light", "dark"] as const) {+ root.dataset.colorScheme = mode;+ const scrim = readColor("--overlay-scrim");++ expect(Math.max(scrim[0], scrim[1], scrim[2]), mode).toBeLessThan(100);+ }+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("dark scheme preserves dark neutral hierarchy and chromatic fills", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");++ try {+ root.dataset.colorScheme = "light";+ const lightAccent = readColor("--background-accent");++ root.dataset.colorScheme = "dark";+ const primary = readColor("--background-primary");+ const secondary = readColor("--background-secondary");+ const disabled = readColor("--background-disabled");+ const darkAccent = readColor("--background-accent");+ const onAccent = readColor("--foreground-on-accent");+ const hoverOverlay = readColor("--overlay-interaction-hover");++ expect(Math.max(...primary.slice(0, 3))).toBeLessThanOrEqual(36);+ expect(Math.max(...primary.slice(0, 3))).toBeGreaterThanOrEqual(12);+ expect(+ Math.max(...primary.slice(0, 3)) - Math.min(...primary.slice(0, 3))+ ).toBeLessThanOrEqual(6);+ for (const channel of [0, 1, 2]) {+ expect(secondary[channel]).toBeGreaterThan(disabled[channel]);+ expect(disabled[channel]).toBeGreaterThan(primary[channel]);+ expect(+ Math.abs(darkAccent[channel] - lightAccent[channel])+ ).toBeLessThanOrEqual(1);+ expect(onAccent[channel]).toBeGreaterThanOrEqual(248);+ expect(hoverOverlay[channel]).toBe(255);+ }+ expect(hoverOverlay[3]).toBe(16);+ } finally {+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+ });++ test("supported theme parameter range preserves every contrast contract", () => {+ const root = document.documentElement;+ const chromaticColors = [+ "accent",+ "positive",+ "negative",+ "warning",+ "informative",+ ];+ const contrasts = ["content", "surface", "border"];+ const violations = new Map<string, { ratio: number; message: string }>();++ const recordFailures = (scenario: string, mode: ColorMode) => {+ const failures = getColorContrast(mode).filter(+ ({ ratio, minimum }) => ratio < minimum+ );+ for (const failure of failures) {+ const relationship = `${failure.foreground} on ${failure.background}`;+ const previous = violations.get(relationship);+ const message = `${scenario}: ${relationship} is ${failure.ratio.toFixed(2)}:1, expected ${failure.minimum}:1`;+ if (previous === undefined || previous.ratio > failure.ratio) {+ violations.set(relationship, { ratio: failure.ratio, message });+ }+ }+ };++ try {+ for (const mode of ["light", "dark"] as const) {+ for (const content of [0, 100]) {+ for (const surface of [0, 100]) {+ for (const border of [0, 100]) {+ root.style.setProperty("--theme-contrast-content", `${content}%`);+ root.style.setProperty("--theme-contrast-surface", `${surface}%`);+ root.style.setProperty("--theme-contrast-border", `${border}%`);+ for (const lightness of [0, 100]) {+ for (const chroma of [0, 0.4]) {+ for (let hue = 0; hue < 360; hue += 15) {+ for (const color of chromaticColors) {+ root.style.setProperty(+ `--theme-color-${color}`,+ `oklch(${lightness}% ${chroma} ${hue})`+ );+ }+ recordFailures(+ `${mode}, contrast ${content}/${surface}/${border}, ${lightness}%, ${chroma} chroma, ${hue}deg`,+ mode+ );+ }+ }+ }+ for (const color of chromaticColors) {+ root.style.removeProperty(`--theme-color-${color}`);+ }+ for (const lightness of [0, 100]) {+ for (const chroma of [0, 0.2]) {+ for (let hue = 0; hue < 360; hue += 15) {+ root.style.setProperty(+ "--theme-color-neutral",+ `oklch(${lightness}% ${chroma} ${hue})`+ );+ recordFailures(+ `${mode} neutral, contrast ${content}/${surface}/${border}, ${lightness}%, ${chroma} chroma, ${hue}deg`,+ mode+ );+ }+ }+ }+ }+ }+ }+ }+ } finally {+ for (const color of chromaticColors) {+ root.style.removeProperty(`--theme-color-${color}`);+ }+ for (const contrast of contrasts) {+ root.style.removeProperty(`--theme-contrast-${contrast}`);+ }+ root.style.removeProperty("--theme-color-neutral");+ }++ expect(Array.from(violations.values(), ({ message }) => message)).toEqual(+ []+ );+ }, 30_000);+});diff --git a/packages/design-system/src/colors/color-contrast.ts b/packages/design-system/src/colors/color-contrast.tsnew file mode 100644index 0000000000..6c28b89322--- /dev/null+++ b/packages/design-system/src/colors/color-contrast.ts@@ -0,0 +1,118 @@+import type { CssVariableName } from "./__generated__/css-variable-names";+import type { ColorMode } from "./color-source-utils";+import { cssVar } from "../css-var";++export type ColorContrastResult = {+ foreground: CssVariableName;+ background: CssVariableName;+ minimum: number;+ ratio: number;+};++const contrastContracts = [+ ["--foreground-primary", "--background-primary", 4.5],+ ["--foreground-secondary", "--background-primary", 4.5],+ ["--foreground-primary", "--background-secondary", 4.5],+ ["--foreground-secondary", "--background-secondary", 4.5],+ ["--foreground-accent", "--background-primary", 4.5],+ ["--foreground-positive", "--background-primary", 4.5],+ ["--foreground-negative", "--background-primary", 4.5],+ ["--foreground-warning", "--background-primary", 4.5],+ ["--foreground-informative", "--background-primary", 4.5],+ ["--foreground-on-inverse", "--background-inverse", 4.5],+ ["--foreground-on-accent", "--background-accent", 4.5],+ ["--foreground-on-positive", "--background-positive", 4.5],+ ["--foreground-on-negative", "--background-negative", 4.5],+ ["--foreground-positive", "--background-positive-subtle", 4.5],+ ["--foreground-negative", "--background-negative-subtle", 4.5],+ ["--foreground-warning", "--background-warning-subtle", 4.5],+ ["--foreground-informative", "--background-informative-subtle", 4.5],+ ["--foreground-primary", "--background-informative-subtle", 4.5],+ ["--foreground-secondary", "--background-informative-subtle", 4.5],+ ["--foreground-negative", "--background-informative-subtle", 4.5],+ ["--border-focus", "--background-secondary", 3],+] as const satisfies readonly (readonly [+ CssVariableName,+ CssVariableName,+ number,+])[];++export const colorContrastContractCount = contrastContracts.length;++const toLinearChannel = (channel: number) => {+ const value = channel / 255;+ return value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;+};++const getLuminance = (color: Uint8ClampedArray) =>+ 0.2126 * toLinearChannel(color[0]) ++ 0.7152 * toLinearChannel(color[1]) ++ 0.0722 * toLinearChannel(color[2]);++const createColorReader = () => {+ const sample = document.createElement("span");+ sample.hidden = true;+ document.body.append(sample);++ const canvas = document.createElement("canvas");+ canvas.width = 1;+ canvas.height = 1;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ sample.remove();+ throw new Error("Canvas color evaluation is unavailable");+ }++ const read = (name: CssVariableName) => {+ sample.style.color = cssVar(name);+ context.clearRect(0, 0, 1, 1);+ context.fillStyle = getComputedStyle(sample).color;+ context.fillRect(0, 0, 1, 1);+ const color = context.getImageData(0, 0, 1, 1).data;+ if (color[3] !== 255) {+ throw new Error(`${name} must resolve to an opaque color`);+ }+ return color;+ };++ return { read, dispose: () => sample.remove() };+};++export const getColorContrast = (mode: ColorMode): ColorContrastResult[] => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.setAttribute("data-color-scheme", mode);+ const reader = createColorReader();+ const luminances = new Map<CssVariableName, number>();+ const readLuminance = (name: CssVariableName) => {+ const cached = luminances.get(name);+ if (cached !== undefined) {+ return cached;+ }+ const value = getLuminance(reader.read(name));+ luminances.set(name, value);+ return value;+ };++ try {+ return contrastContracts.map(([foreground, background, minimum]) => {+ const foregroundLuminance = readLuminance(foreground);+ const backgroundLuminance = readLuminance(background);+ const lighter = Math.max(foregroundLuminance, backgroundLuminance);+ const darker = Math.min(foregroundLuminance, backgroundLuminance);+ return {+ foreground,+ background,+ minimum,+ ratio: (lighter + 0.05) / (darker + 0.05),+ };+ });+ } finally {+ reader.dispose();+ if (previousMode === null) {+ root.removeAttribute("data-color-scheme");+ } else {+ root.setAttribute("data-color-scheme", previousMode);+ }+ }+};diff --git a/packages/design-system/src/colors/color-source-utils.test.ts b/packages/design-system/src/colors/color-source-utils.test.tsnew file mode 100644index 0000000000..5aa46fd223--- /dev/null+++ b/packages/design-system/src/colors/color-source-utils.test.ts@@ -0,0 +1,170 @@+import { readFileSync } from "node:fs";+import { resolve } from "node:path";+import * as csstree from "css-tree";+import { describe, expect, test } from "vitest";+import {+ getCssVariableReferences,+ parseColorSource,+} from "./color-source-utils";++const source = readFileSync(resolve("src/colors/colors.css"), "utf8");++const replaceDeclaration = ({+ css,+ selector,+ property,+ value,+}: {+ css: string;+ selector?: string;+ property: string;+ value: string;+}) => {+ const stylesheet = csstree.parse(css);+ let replacementCount = 0;+ csstree.walk(stylesheet, {+ visit: "Rule",+ enter(node) {+ if (+ node.type !== "Rule" ||+ (selector !== undefined && csstree.generate(node.prelude) !== selector)+ ) {+ return;+ }+ node.block.children.forEach((child) => {+ if (child.type !== "Declaration" || child.property !== property) {+ return;+ }+ child.value = csstree.parse(value, { context: "value" });+ replacementCount += 1;+ });+ },+ });+ expect(replacementCount).toBe(1);+ return csstree.generate(stylesheet);+};++const addRootDeclarations = (+ css: string,+ declarations: Record<string, string>+) => {+ const stylesheet = csstree.parse(css);+ let rootCount = 0;+ csstree.walk(stylesheet, {+ visit: "Rule",+ enter(node) {+ if (node.type !== "Rule" || csstree.generate(node.prelude) !== ":root") {+ return;+ }+ rootCount += 1;+ for (const [property, value] of Object.entries(declarations)) {+ node.block.children.appendData(+ csstree.parse(`${property}:${value}`, { context: "declaration" })+ );+ }+ },+ });+ expect(rootCount).toBe(1);+ return csstree.generate(stylesheet);+};++describe("Craft color CSS source", () => {+ test("parses CSS variable references with native fallback syntax", () => {+ expect(+ getCssVariableReferences(+ "linear-gradient(var(--overlay-interaction-hover), var(--overlay-interaction-hover)), var(--background-primary, oklch(50% 0 0))"+ )+ ).toEqual([+ "--overlay-interaction-hover",+ "--overlay-interaction-hover",+ "--background-primary",+ ]);+ });++ test("parses theme parameters, scheme bounds, and semantic categories", () => {+ const colors = parseColorSource(source);++ expect(Object.keys(colors.theme.color)).toHaveLength(6);+ expect(Object.keys(colors.theme.contrast)).toHaveLength(3);+ expect(Object.keys(colors.scheme.light)).toEqual(+ Object.keys(colors.scheme.dark)+ );+ expect(Object.keys(colors.derived)).toHaveLength(28);+ expect(colors.derived).toHaveProperty("focus");+ expect(Object.keys(colors.semantic)).toEqual([+ "background",+ "foreground",+ "border",+ "overlay",+ ]);+ expect(+ Object.values(colors.semantic).reduce(+ (count, category) => count + Object.keys(category).length,+ 0+ )+ ).toBe(33);+ expect(colors.semantic.background).toHaveProperty("positive-subtle");+ expect(colors.semantic.background).not.toHaveProperty("accent-hover");+ expect(colors.semantic.overlay).toHaveProperty("interaction-hover");+ });++ test("derives structural groups from the CSS source", () => {+ const extendedSource = addRootDeclarations(source, {+ "--theme-color-custom": "oklch(50% 0.1 300)",+ "--color-custom":+ "oklch(from var(--theme-color-custom) var(--scheme-chromatic-luminance-max) c h)",+ "--foreground-custom":+ "color-mix(in oklab, var(--color-custom) 86%, var(--color-foreground))",+ });+ const colors = parseColorSource(extendedSource);++ expect(colors.theme.color.custom).toBe("oklch(50% 0.1 300)");+ expect(colors.derived.custom).toContain("var(--theme-color-custom)");+ expect(colors.semantic.foreground.custom).toContain("var(--color-custom)");+ });++ test("rejects standalone semantic color literals", () => {+ const invalidSource = replaceDeclaration({+ css: source,+ property: "--background-primary",+ value: "oklch(50% 0.2 250)",+ });++ expect(() => parseColorSource(invalidSource)).toThrow(+ "--background-primary must derive from another color variable"+ );+ });++ test("rejects circular semantic references", () => {+ const firstCycle = replaceDeclaration({+ css: source,+ property: "--background-primary",+ value: "var(--background-secondary)",+ });+ const cycle = replaceDeclaration({+ css: firstCycle,+ property: "--background-secondary",+ value: "var(--background-primary)",+ });++ expect(() => parseColorSource(cycle)).toThrow(+ "Circular color reference: --background-primary -> --background-secondary -> --background-primary"+ );+ });++ test.each([+ { selector: ":root", mode: "light" },+ { selector: ':root[data-color-scheme="dark"]', mode: "dark" },+ ])("rejects missing references in $mode scheme bounds", ({ selector }) => {+ const invalidSource = replaceDeclaration({+ css: source,+ selector,+ property: "--scheme-background-lightness",+ value: "var(--scheme-missing)",+ });++ expect(() => parseColorSource(invalidSource)).toThrow(+ `--scheme-background-lightness references missing variable --scheme-missing`+ );+ });+});diff --git a/packages/design-system/src/colors/color-source-utils.ts b/packages/design-system/src/colors/color-source-utils.tsnew file mode 100644index 0000000000..9dc9f86db9--- /dev/null+++ b/packages/design-system/src/colors/color-source-utils.ts@@ -0,0 +1,380 @@+import * as csstree from "css-tree";++const colorCategories = [+ "background",+ "foreground",+ "border",+ "overlay",+] as const;++type ColorCategory = (typeof colorCategories)[number];++export type ColorSource = {+ theme: {+ color: Record<string, string>;+ contrast: Record<string, string>;+ };+ scheme: {+ light: Record<string, string>;+ dark: Record<string, string>;+ };+ derived: Record<string, string>;+ semantic: Record<ColorCategory, Record<string, string>>;+};++export type ColorMode = "light" | "dark";++const generateValue = (value: csstree.CssNode) =>+ csstree.generate(value).trim();++const getDeclarations = (rule: csstree.Rule) => {+ const declarations: Record<string, string> = {};+ rule.block.children.forEach((node) => {+ if (+ node.type !== "Declaration" ||+ node.property.startsWith("--") === false+ ) {+ return;+ }+ if (node.property in declarations) {+ throw new Error(`Duplicate color declaration: ${node.property}`);+ }+ declarations[node.property] = generateValue(node.value);+ });+ return declarations;+};++const selectDeclarations = (stylesheet: csstree.CssNode, selector: string) => {+ let declarations: Record<string, string> | undefined;+ csstree.walk(stylesheet, {+ visit: "Rule",+ enter(node) {+ if (node.type !== "Rule") {+ return;+ }+ if (csstree.generate(node.prelude) !== selector) {+ return;+ }+ if (declarations !== undefined) {+ throw new Error(`Duplicate color selector: ${selector}`);+ }+ declarations = getDeclarations(node);+ },+ });+ if (declarations === undefined) {+ throw new Error(`Missing color selector: ${selector}`);+ }+ return declarations;+};++const getGroup = (declarations: Record<string, string>, prefix: string) =>+ Object.fromEntries(+ Object.entries(declarations)+ .filter(([name]) => name.startsWith(prefix))+ .map(([name, value]) => [name.slice(prefix.length), value])+ );++const expectValues = (label: string, values: Record<string, string>) => {+ if (Object.keys(values).length === 0) {+ throw new Error(`${label} must define at least one value`);+ }+};++const expectSameNames = (+ label: string,+ first: Record<string, string>,+ second: Record<string, string>+) => {+ const firstNames = Object.keys(first).sort();+ const secondNames = Object.keys(second).sort();+ if (+ firstNames.length !== secondNames.length ||+ firstNames.some((name, index) => name !== secondNames[index])+ ) {+ throw new Error(+ `${label} must define the same values; received ${firstNames.join(", ")} and ${secondNames.join(", ")}`+ );+ }+};++export const getCssVariableReferences = (value: string) => {+ const references: string[] = [];+ const ast = csstree.parse(value, { context: "value" });+ csstree.walk(ast, {+ visit: "Function",+ enter(node) {+ if (node.type !== "Function") {+ return;+ }+ if (node.name !== "var") {+ return;+ }+ const first = node.children.first;+ if (+ first?.type !== "Identifier" ||+ first.name.startsWith("--") === false+ ) {+ throw new Error(`Invalid color variable reference in: ${value}`);+ }+ references.push(first.name);+ },+ });+ return references;+};++const validateReferences = ({+ declarations,+ names,+ allowedPrefixes,+ requireReference,+}: {+ declarations: Record<string, string>;+ names: ReadonlySet<string>;+ allowedPrefixes: readonly string[];+ requireReference?: boolean;+}) => {+ for (const [name, value] of Object.entries(declarations)) {+ const references = getCssVariableReferences(value);+ if (requireReference && references.length === 0) {+ throw new Error(`${name} must derive from another color variable`);+ }+ for (const reference of references) {+ if (+ allowedPrefixes.some((prefix) => reference.startsWith(prefix)) === false+ ) {+ throw new Error(`${name} cannot reference ${reference}`);+ }+ if (names.has(reference) === false) {+ throw new Error(`${name} references missing variable ${reference}`);+ }+ }+ }+};++const validateCycles = (declarations: Record<string, string>) => {+ const visited = new Set<string>();+ const visiting: string[] = [];++ const visit = (name: string) => {+ if (visited.has(name)) {+ return;+ }+ const cycleStart = visiting.indexOf(name);+ if (cycleStart !== -1) {+ throw new Error(+ `Circular color reference: ${[...visiting.slice(cycleStart), name].join(" -> ")}`+ );+ }+ visiting.push(name);+ for (const reference of getCssVariableReferences(declarations[name])) {+ if (reference in declarations) {+ visit(reference);+ }+ }+ visiting.pop();+ visited.add(name);+ };++ for (const name of Object.keys(declarations)) {+ visit(name);+ }+};++const validateConsumed = ({+ label,+ declarations,+ consumers,+}: {+ label: string;+ declarations: Record<string, string>;+ consumers: Record<string, string>;+}) => {+ const consumed = new Set(+ Object.values(consumers).flatMap(getCssVariableReferences)+ );+ const unused = Object.keys(declarations).filter(+ (name) => consumed.has(name) === false+ );+ if (unused.length > 0) {+ throw new Error(`Unused ${label}: ${unused.join(", ")}`);+ }+};++const validateSemanticName = (name: string) => {+ if (/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/.test(name) === false) {+ throw new Error(`Invalid Craft semantic color name: ${name}`);+ }+};++export const parseColorSource = (css: string): ColorSource => {+ const stylesheet = csstree.parse(css, { positions: true });+ const lightDeclarations = selectDeclarations(stylesheet, ":root");+ const darkDeclarations = selectDeclarations(+ stylesheet,+ ':root[data-color-scheme="dark"]'+ );++ const themeColor = getGroup(lightDeclarations, "--theme-color-");+ const themeContrast = getGroup(lightDeclarations, "--theme-contrast-");+ const lightScheme = getGroup(lightDeclarations, "--scheme-");+ const darkScheme = getGroup(darkDeclarations, "--scheme-");+ const derived = getGroup(lightDeclarations, "--color-");+ const semantic = Object.fromEntries(+ colorCategories.map((category) => [+ category,+ getGroup(lightDeclarations, `--${category}-`),+ ])+ ) as ColorSource["semantic"];++ expectValues("Theme color parameters", themeColor);+ expectValues("Theme contrast parameters", themeContrast);+ expectValues("Light scheme bounds", lightScheme);+ expectValues("Dark scheme bounds", darkScheme);+ expectValues("Derived colors", derived);+ for (const [category, colors] of Object.entries(semantic)) {+ expectValues(`${category} semantic colors`, colors);+ }+ expectSameNames("Light and dark scheme bounds", lightScheme, darkScheme);++ const allDeclarations = {+ ...Object.fromEntries(+ Object.entries(themeColor).map(([name, value]) => [+ `--theme-color-${name}`,+ value,+ ])+ ),+ ...Object.fromEntries(+ Object.entries(themeContrast).map(([name, value]) => [+ `--theme-contrast-${name}`,+ value,+ ])+ ),+ ...Object.fromEntries(+ Object.entries(lightScheme).map(([name, value]) => [+ `--scheme-${name}`,+ value,+ ])+ ),+ ...Object.fromEntries(+ Object.entries(derived).map(([name, value]) => [`--color-${name}`, value])+ ),+ ...Object.fromEntries(+ Object.entries(semantic).flatMap(([category, values]) =>+ Object.entries(values).map(([name, value]) => [+ `--${category}-${name}`,+ value,+ ])+ )+ ),+ };+ const names = new Set(Object.keys(allDeclarations));+ const uncategorized = Object.keys(lightDeclarations).filter(+ (name) => names.has(name) === false+ );+ if (uncategorized.length > 0) {+ throw new Error(+ `Uncategorized color variables: ${uncategorized.join(", ")}`+ );+ }+ const darkNonScheme = Object.keys(darkDeclarations).filter(+ (name) => name.startsWith("--scheme-") === false+ );+ if (darkNonScheme.length > 0) {+ throw new Error(+ `Dark mode may override only scheme bounds: ${darkNonScheme.join(", ")}`+ );+ }++ const themeDeclarations = Object.fromEntries(+ Object.entries(themeColor)+ .map(([name, value]) => [`--theme-color-${name}`, value])+ .concat(+ Object.entries(themeContrast).map(([name, value]) => [+ `--theme-contrast-${name}`,+ value,+ ])+ )+ );+ const schemeDeclarations = Object.fromEntries(+ Object.entries(lightScheme).map(([name, value]) => [+ `--scheme-${name}`,+ value,+ ])+ );+ const darkSchemeDeclarations = Object.fromEntries(+ Object.entries(darkScheme).map(([name, value]) => [+ `--scheme-${name}`,+ value,+ ])+ );+ const derivedDeclarations = Object.fromEntries(+ Object.entries(derived).map(([name, value]) => [`--color-${name}`, value])+ );++ for (const declarations of [schemeDeclarations, darkSchemeDeclarations]) {+ validateReferences({+ declarations,+ names,+ allowedPrefixes: ["--theme-color-", "--theme-contrast-", "--scheme-"],+ });+ }++ validateReferences({+ declarations: derivedDeclarations,+ names,+ allowedPrefixes: [+ "--theme-color-",+ "--theme-contrast-",+ "--scheme-",+ "--color-",+ ],+ requireReference: true,+ });++ const semanticDeclarations = Object.fromEntries(+ Object.entries(semantic).flatMap(([category, values]) =>+ Object.entries(values).map(([name, value]) => [+ `--${category}-${name}`,+ value,+ ])+ )+ );+ for (const name of Object.keys(semanticDeclarations)) {+ validateSemanticName(name.slice(2));+ }+ validateReferences({+ declarations: semanticDeclarations,+ names,+ allowedPrefixes: [+ "--color-",+ "--background-",+ "--foreground-",+ "--border-",+ "--overlay-",+ ],+ requireReference: true,+ });+ validateCycles(allDeclarations);+ validateCycles({ ...allDeclarations, ...darkSchemeDeclarations });+ validateConsumed({+ label: "theme parameters",+ declarations: themeDeclarations,+ consumers: derivedDeclarations,+ });+ validateConsumed({+ label: "light scheme bounds",+ declarations: schemeDeclarations,+ consumers: derivedDeclarations,+ });+ validateConsumed({+ label: "derived colors",+ declarations: derivedDeclarations,+ consumers: { ...derivedDeclarations, ...semanticDeclarations },+ });+ return {+ theme: { color: themeColor, contrast: themeContrast },+ scheme: { light: lightScheme, dark: darkScheme },+ derived,+ semantic,+ };+};diff --git a/packages/design-system/src/colors/color-theme.test.ts b/packages/design-system/src/colors/color-theme.test.tsnew file mode 100644index 0000000000..1f64e6df83--- /dev/null+++ b/packages/design-system/src/colors/color-theme.test.ts@@ -0,0 +1,9 @@+import { describe, expect, test } from "vitest";+import { rawTheme, theme } from "../stitches.config";++describe("CSS-native Craft colors", () => {+ test("keeps colors out of the Stitches theme", () => {+ expect(theme).not.toHaveProperty("colors");+ expect(rawTheme).not.toHaveProperty("colors");+ });+});diff --git a/packages/design-system/src/colors/colors.css b/packages/design-system/src/colors/colors.cssnew file mode 100644index 0000000000..7e2ac2168b--- /dev/null+++ b/packages/design-system/src/colors/colors.css@@ -0,0 +1,544 @@+/*+ * Craft color source of truth.+ *+ * Theme authors set only --theme-* parameters. Components consume only+ * foreground, background, border, and overlay semantic variables.+ */++:root {+ color-scheme: light;++ /* Sets the color family shared by surfaces, content, borders, and shadows. */+ --theme-color-neutral: #11181c;+ /* Sets the color family used for interactive emphasis and keyboard focus. */+ --theme-color-accent: #096cff;+ /* Sets the color family used to communicate successful outcomes. */+ --theme-color-positive: #00894a;+ /* Sets the color family used for errors, danger, and destructive actions. */+ --theme-color-negative: #dc2929;+ /* Sets the color family used to communicate caution and warnings. */+ --theme-color-warning: #f5d90a;+ /* Sets the color family used to communicate neutral information. */+ --theme-color-informative: #0175dc;++ /* Sets content contrast: 0% is softest accessible; 100% is strongest. */+ --theme-contrast-content: 0%;+ /* Sets surface separation: 0% is subtle; 100% is strongest. */+ --theme-contrast-surface: 0%;+ /* Sets border contrast: 0% is subtle; 100% is strongest. */+ --theme-contrast-border: 0%;++ /* Light-scheme derivation bounds. */+ --scheme-background-lightness: 1;+ --scheme-background-chroma-scale: 0.1;+ --scheme-foreground-soft-lightness: 0.203788;+ --scheme-foreground-strong-lightness: 0.1;+ --scheme-foreground-chroma-scale: 1;+ --scheme-chromatic-luminance-min: 0;+ --scheme-chromatic-luminance-max: 0.18;+ --scheme-chromatic-foreground-mix: 100%;++ /* Colors derived from the bounded theme parameters. */+ --color-background: oklch(+ from var(--theme-color-neutral) var(--scheme-background-lightness)+ calc(min(c, 0.02) * var(--scheme-background-chroma-scale)) h+ );+ --color-foreground-soft: oklch(+ from var(--theme-color-neutral) var(--scheme-foreground-soft-lightness)+ calc(min(c, 0.02) * var(--scheme-foreground-chroma-scale)) h+ );+ --color-foreground-strong: oklch(+ from var(--theme-color-neutral) var(--scheme-foreground-strong-lightness)+ calc(min(c, 0.02) * var(--scheme-foreground-chroma-scale)) h+ );+ --color-foreground: color-mix(+ in oklab,+ var(--color-foreground-soft) calc(100% - var(--theme-contrast-content)),+ var(--color-foreground-strong)+ );+ --color-accent-source: color(+ from oklch(from var(--theme-color-accent) clamp(0.2, l, 0.8) min(c, 0.3) h)+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-positive-source: color(+ from+ oklch(from var(--theme-color-positive) clamp(0.2, l, 0.8) min(c, 0.3) h)+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-negative-source: color(+ from+ oklch(from var(--theme-color-negative) clamp(0.2, l, 0.8) min(c, 0.3) h)+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-warning-source: color(+ from+ oklch(from var(--theme-color-warning) clamp(0.2, l, 0.95) min(c, 0.3) h)+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-informative-source: color(+ from+ oklch(+ from var(--theme-color-informative) clamp(0.2, l, 0.8) min(c, 0.3) h+ )+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-accent: color(+ from var(--color-accent-source) xyz-d65+ calc(+ x *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (0.95047 - x) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ )+ calc(+ z *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (1.08883 - z) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ );+ --color-positive: color(+ from var(--color-positive-source) xyz-d65+ calc(+ x *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (0.95047 - x) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ )+ calc(+ z *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (1.08883 - z) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ );+ --color-negative: color(+ from var(--color-negative-source) xyz-d65+ calc(+ x *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (0.95047 - x) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ )+ calc(+ z *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (1.08883 - z) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ );+ --color-warning: color(+ from var(--color-warning-source) xyz-d65+ calc(+ x *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (0.95047 - x) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ )+ calc(+ z *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (1.08883 - z) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ );+ --color-informative: color(+ from var(--color-informative-source) xyz-d65+ calc(+ x *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (0.95047 - x) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ )+ calc(+ z *+ min(+ 1,+ clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) /+ max(y, 0.000001)+ ) ++ (1.08883 - z) *+ max(+ 0,+ (clamp(+ var(--scheme-chromatic-luminance-min),+ y,+ var(--scheme-chromatic-luminance-max)+ ) -+ y) /+ max(1 - y, 0.000001)+ )+ )+ );+ --color-shadow: oklch(+ from var(--theme-color-neutral) 0.203788 min(c, 0.02) h+ );+ --color-surface-soft: color-mix(+ in oklab,+ var(--color-background) 92%,+ var(--color-foreground)+ );+ --color-surface-strong: color-mix(+ in oklab,+ var(--color-background) 88%,+ var(--color-foreground)+ );+ --color-surface-secondary: color-mix(+ in oklab,+ var(--color-surface-soft) calc(100% - var(--theme-contrast-surface)),+ var(--color-surface-strong)+ );+ --color-border-soft: color-mix(+ in oklab,+ var(--color-background) 90.58%,+ var(--color-foreground)+ );+ --color-border-strong: color-mix(+ in oklab,+ var(--color-background) 40%,+ var(--color-foreground)+ );+ --color-border: color-mix(+ in oklab,+ var(--color-border-soft) calc(100% - var(--theme-contrast-border)),+ var(--color-border-strong)+ );+ --color-focus: light-dark(+ color-mix(+ in oklab,+ var(--color-accent) calc(92% + var(--theme-contrast-surface) * 0.08),+ var(--color-background)+ ),+ color-mix(+ in oklab,+ oklch(from var(--color-accent) max(l, 0.6) c h)+ calc(92% + var(--theme-contrast-surface) * 0.08),+ var(--color-background)+ )+ );+ --color-on-chromatic: light-dark(+ var(--color-background),+ var(--color-foreground-strong)+ );+ --color-accent-foreground: color-mix(+ in oklab,+ var(--color-accent) var(--scheme-chromatic-foreground-mix),+ var(--color-foreground)+ );+ --color-positive-foreground: color-mix(+ in oklab,+ color-mix(in oklab, var(--color-positive) 90%, var(--color-foreground))+ var(--scheme-chromatic-foreground-mix),+ var(--color-foreground)+ );+ --color-negative-foreground: light-dark(+ oklch(from var(--color-negative) calc(l - 0.04) calc(c * 0.9) h),+ oklch(from var(--color-negative) max(l, 0.7) c h)+ );+ --color-warning-foreground: color-mix(+ in oklab,+ oklch(+ from+ color-mix(in oklab, var(--color-warning) 88%, var(--color-foreground))+ calc(l - 0.03) calc(c * 1.12) h+ )+ var(--scheme-chromatic-foreground-mix),+ var(--color-foreground)+ );+ --color-informative-foreground: color-mix(+ in oklab,+ color-mix(in oklab, var(--color-informative) 90%, var(--color-foreground))+ var(--scheme-chromatic-foreground-mix),+ var(--color-foreground)+ );++ /* Background */+ --background-primary: var(--color-background);+ --background-secondary: var(--color-surface-secondary);+ --background-disabled: color-mix(+ in oklab,+ var(--color-background) 97.38%,+ var(--color-foreground)+ );+ --background-inverse: var(--color-foreground);+ --background-accent: var(--color-accent);+ --background-positive: var(--color-positive);+ --background-positive-subtle: color-mix(+ in oklab,+ var(--color-positive) 12%,+ var(--color-background)+ );+ --background-negative: var(--color-negative);+ --background-negative-subtle: color-mix(+ in oklab,+ var(--color-negative) 12%,+ var(--color-background)+ );+ --background-warning-subtle: light-dark(+ oklch(from var(--color-warning-source) 0.94 calc(c * 0.45) h),+ color-mix(+ in oklab,+ var(--color-warning-source) 13.02%,+ var(--color-background)+ )+ );+ --background-informative-subtle: light-dark(+ color-mix(+ in oklab,+ var(--color-informative) 12.24%,+ var(--color-background)+ ),+ color-mix(in oklab, var(--color-informative) 20%, var(--color-background))+ );++ /* Foreground */+ --foreground-primary: var(--color-foreground);+ --foreground-secondary: color-mix(+ in oklab,+ var(--color-foreground) 65%,+ var(--color-background)+ );+ --foreground-disabled: color-mix(+ in oklab,+ var(--color-foreground) 45%,+ var(--color-background)+ );+ --foreground-on-inverse: var(--color-background);+ --foreground-on-accent: var(--color-on-chromatic);+ --foreground-on-positive: var(--color-on-chromatic);+ --foreground-on-negative: var(--color-on-chromatic);+ --foreground-accent: var(--color-accent-foreground);+ --foreground-positive: var(--color-positive-foreground);+ --foreground-negative: var(--color-negative-foreground);+ --foreground-warning: var(--color-warning-foreground);+ --foreground-informative: var(--color-informative-foreground);++ /* Border */+ --border-default: var(--color-border);+ --border-focus: var(--color-focus);+ --border-negative: var(--foreground-negative);+ --border-warning: var(--color-warning-source);+ --border-informative: color-mix(+ in oklab,+ var(--color-informative) 29.97%,+ var(--color-background)+ );++ /* Overlay */+ --overlay-interaction-hover: light-dark(+ oklch(from var(--color-foreground) 0 0 h / 6.2745%),+ oklch(from var(--color-foreground) 1 0 h / 6.2745%)+ );+ --overlay-interaction-pressed: light-dark(+ oklch(from var(--color-foreground) 0 0 h / 10.9804%),+ oklch(from var(--color-foreground) 1 0 h / 10.9804%)+ );+ --overlay-on-inverse-hover: light-dark(+ oklch(from var(--color-background) 1 0 h / 6.2745%),+ oklch(from var(--color-background) 0 0 h / 6.2745%)+ );+ --overlay-on-inverse-pressed: light-dark(+ oklch(from var(--color-background) 1 0 h / 10.9804%),+ oklch(from var(--color-background) 0 0 h / 10.9804%)+ );+ --overlay-scrim: oklch(from var(--color-shadow) l c h / 66%);+}++/* Dark mode changes derivation bounds, not theme parameters or semantic colors. */+:root[data-color-scheme="dark"] {+ color-scheme: dark;+ --scheme-background-lightness: 0.2;+ --scheme-background-chroma-scale: 0.2;+ --scheme-foreground-soft-lightness: 0.93;+ --scheme-foreground-strong-lightness: 1;+ --scheme-foreground-chroma-scale: 0.2;+ --scheme-chromatic-luminance-min: 0;+ --scheme-chromatic-luminance-max: 0.18;+ --scheme-chromatic-foreground-mix: 35%;+}++:root[data-color-scheme="light"] {+ color-scheme: light;+}diff --git a/packages/design-system/src/colors/css-variable-source-utils.test.ts b/packages/design-system/src/colors/css-variable-source-utils.test.tsnew file mode 100644index 0000000000..0d101d762a--- /dev/null+++ b/packages/design-system/src/colors/css-variable-source-utils.test.ts@@ -0,0 +1,49 @@+import { describe, expect, test } from "vitest";+import {+ getUniqueCssVariableNames,+ parseCssVariableDeclarations,+} from "./css-variable-source-utils";++describe("CSS variable declarations", () => {+ test("collects literal declarations from TypeScript", () => {+ expect(+ parseCssVariableDeclarations({+ source: "component.tsx",+ code: `+ const state = declareCssVar("--component-state");+ const text = "declareCssVar('ignored')";+ `,+ })+ ).toEqual([{ name: "--component-state", source: "component.tsx" }]);+ });++ test("rejects declarations that cannot be statically registered", () => {+ expect(() =>+ parseCssVariableDeclarations({+ source: "component.ts",+ code: `declareCssVar(variableName)`,+ })+ ).toThrow("declareCssVar() requires a string literal");+ });++ test("rejects duplicate and reserved declarations", () => {+ expect(() =>+ getUniqueCssVariableNames({+ declarations: [+ { name: "--component-state", source: "first.ts" },+ { name: "--component-state", source: "second.ts" },+ ],+ reservedNames: new Set(),+ })+ ).toThrow("Duplicate CSS variable declaration --component-state");++ expect(() =>+ getUniqueCssVariableNames({+ declarations: [+ { name: "--foreground-primary", source: "component.ts" },+ ],+ reservedNames: new Set(["--foreground-primary"]),+ })+ ).toThrow("conflicts with colors.css");+ });+});diff --git a/packages/design-system/src/colors/css-variable-source-utils.ts b/packages/design-system/src/colors/css-variable-source-utils.tsnew file mode 100644index 0000000000..2a9180b3b5--- /dev/null+++ b/packages/design-system/src/colors/css-variable-source-utils.ts@@ -0,0 +1,93 @@+import { parse } from "@babel/parser";++export type CssVariableDeclaration = {+ name: `--${string}`;+ source: string;+};++export const parseCssVariableDeclarations = ({+ code,+ source,+}: {+ code: string;+ source: string;+}): CssVariableDeclaration[] => {+ const sourceFile = parse(code, {+ sourceType: "module",+ plugins: ["typescript", "jsx"],+ });+ const declarations: CssVariableDeclaration[] = [];++ const visit = (value: unknown) => {+ if (Array.isArray(value)) {+ for (const item of value) {+ visit(item);+ }+ return;+ }+ if (typeof value !== "object" || value === null) {+ return;+ }+ const node = value as Record<string, unknown>;+ if (+ node.type === "CallExpression" &&+ typeof node.callee === "object" &&+ node.callee !== null &&+ (node.callee as Record<string, unknown>).type === "Identifier" &&+ (node.callee as Record<string, unknown>).name === "declareCssVar"+ ) {+ const argument = Array.isArray(node.arguments)+ ? node.arguments[0]+ : undefined;+ if (+ typeof argument !== "object" ||+ argument === null ||+ (argument as Record<string, unknown>).type !== "StringLiteral" ||+ typeof (argument as Record<string, unknown>).value !== "string"+ ) {+ throw new Error(`${source}: declareCssVar() requires a string literal`);+ }+ const name = (argument as Record<string, unknown>).value as string;+ if (name.startsWith("--") === false) {+ throw new Error(`${source}: invalid CSS variable ${name}`);+ }+ declarations.push({+ name: name as `--${string}`,+ source,+ });+ }+ for (const [key, child] of Object.entries(node)) {+ if (key !== "loc" && key !== "start" && key !== "end") {+ visit(child);+ }+ }+ };++ visit(sourceFile);+ return declarations;+};++export const getUniqueCssVariableNames = ({+ declarations,+ reservedNames,+}: {+ declarations: CssVariableDeclaration[];+ reservedNames: ReadonlySet<string>;+}) => {+ const sources = new Map<string, string>();+ for (const { name, source } of declarations) {+ const existingSource = sources.get(name);+ if (existingSource !== undefined) {+ throw new Error(+ `Duplicate CSS variable declaration ${name}: ${existingSource} and ${source}`+ );+ }+ if (reservedNames.has(name)) {+ throw new Error(+ `CSS variable declaration ${name} in ${source} conflicts with colors.css`+ );+ }+ sources.set(name, source);+ }+ return [...sources.keys()].sort();+};diff --git a/packages/design-system/src/colors/generate-color-types.ts b/packages/design-system/src/colors/generate-color-types.tsnew file mode 100644index 0000000000..13e0074328--- /dev/null+++ b/packages/design-system/src/colors/generate-color-types.ts@@ -0,0 +1,107 @@+import { readdir, readFile, writeFile } from "node:fs/promises";+import { relative } from "node:path";+import { fileURLToPath } from "node:url";+import { parseColorSource } from "./color-source-utils";+import {+ getUniqueCssVariableNames,+ parseCssVariableDeclarations,+ type CssVariableDeclaration,+} from "./css-variable-source-utils";++const sourceUrl = new URL("./colors.css", import.meta.url);+const outputUrl = new URL(+ "./__generated__/css-variable-names.d.ts",+ import.meta.url+);++const source = parseColorSource(await readFile(sourceUrl, "utf8"));+const repositoryUrl = new URL("../../../../", import.meta.url);++const ignoredDirectories = new Set([+ ".git",+ "__generated__",+ "dist",+ "lib",+ "node_modules",+]);+const isSourceFile = (name: string) =>+ (name.endsWith(".ts") || name.endsWith(".tsx")) &&+ name.endsWith(".d.ts") === false &&+ name.includes(".test.") === false &&+ name.includes(".stories.") === false;++const collectDeclarations = async (+ directoryUrl: URL+): Promise<CssVariableDeclaration[]> => {+ const declarations: CssVariableDeclaration[] = [];+ for (const entry of await readdir(directoryUrl, { withFileTypes: true })) {+ if (entry.isDirectory()) {+ if (ignoredDirectories.has(entry.name)) {+ continue;+ }+ declarations.push(+ ...(await collectDeclarations(new URL(`${entry.name}/`, directoryUrl)))+ );+ continue;+ }+ if (entry.isFile() === false || isSourceFile(entry.name) === false) {+ continue;+ }+ const fileUrl = new URL(entry.name, directoryUrl);+ const fileName = relative(+ fileURLToPath(repositoryUrl),+ fileURLToPath(fileUrl)+ );+ declarations.push(+ ...parseCssVariableDeclarations({+ code: await readFile(fileUrl, "utf8"),+ source: fileName,+ })+ );+ }+ return declarations;+};++const themeNames = [+ ...Object.keys(source.theme.color).map((name) => `--theme-color-${name}`),+ ...Object.keys(source.theme.contrast).map(+ (name) => `--theme-contrast-${name}`+ ),+];+const names = Object.entries(source.semantic).flatMap(([category, colors]) =>+ Object.keys(colors).map((name) => `--${category}-${name}`)+);+const colorDeclarationNames = new Set([+ ...themeNames,+ ...Object.keys(source.scheme.light).map((name) => `--scheme-${name}`),+ ...Object.keys(source.derived).map((name) => `--color-${name}`),+ ...names,+]);+const declarations = (+ await Promise.all(+ ["apps/", "packages/"].map((directory) =>+ collectDeclarations(new URL(directory, repositoryUrl))+ )+ )+).flat();+const componentNames = getUniqueCssVariableNames({+ declarations,+ reservedNames: colorDeclarationNames,+});+const cssVariableNames = [...names, ...componentNames];+const generated = `// Generated by generate-color-types.ts from colors.css and declareCssVar() calls. Do not edit directly.\n\nexport type ThemeVariableName =\n${themeNames+ .map((name) => ` | ${JSON.stringify(name)}`)+ .join("\n")};\n\nexport type CssVariableName =\n${cssVariableNames+ .map((name) => ` | ${JSON.stringify(name)}`)+ .join("\n")};\n`;++if (process.argv.includes("--check")) {+ const current = await readFile(outputUrl, "utf8").catch(() => "");+ if (current !== generated) {+ throw new Error(+ `${fileURLToPath(outputUrl)} is stale. Run pnpm generate:color-types.`+ );+ }+} else {+ await writeFile(outputUrl, generated);+}diff --git a/packages/design-system/src/components/__DEPRECATED__/list.tsx b/packages/design-system/src/components/__DEPRECATED__/list.tsxindex cf535e2acf..fdec200d42 100644--- a/packages/design-system/src/components/__DEPRECATED__/list.tsx+++ b/packages/design-system/src/components/__DEPRECATED__/list.tsx@@ -8,6 +8,7 @@ import {import { Text } from "../text";import { Flex } from "../flex";import { styled, theme } from "../../stitches.config";+import { cssVar } from "../../css-var";import { findNextListItemIndex } from "../primitives/list";const ListBase = styled("ul", {@@ -34,7 +35,7 @@ const ListItemBase = styled("li", {pointerEvents: "none",inset: `0 ${theme.spacing[3]}`,borderRadius: theme.borderRadius[4],- border: `1px solid ${theme.colors.borderFocus}`,+ border: `1px solid ${cssVar("--border-focus")}`,},});diff --git a/packages/design-system/src/components/avatar.tsx b/packages/design-system/src/components/avatar.tsxindex e13cdfa993..5964b1f8c1 100644--- a/packages/design-system/src/components/avatar.tsx+++ b/packages/design-system/src/components/avatar.tsx@@ -4,9 +4,14 @@ import {type ReactNode,forwardRef,} from "react";-import { theme, styled, type CSS } from "../stitches.config";+import { styled, type CSS } from "../stitches.config";import * as AvatarPrimitive from "@radix-ui/react-avatar";import { Box } from "./box";+import { cssVar } from "../css-var";++const fallbackBackground = `color-mix(in oklab, ${cssVar(+ "--background-inverse"+)} 60%, ${cssVar("--background-primary")})`;const StyledAvatar = styled(AvatarPrimitive.Root, {alignItems: "center",@@ -28,7 +33,7 @@ const StyledAvatar = styled(AvatarPrimitive.Root, {fontWeight: "500",width: 24,height: 24,- backgroundColor: theme.colors.foregroundSubtle,+ backgroundColor: fallbackBackground,borderRadius: "50%",'&[data-size="small"]': {width: 16,@@ -49,7 +54,7 @@ const StyledAvatarImage = styled(AvatarPrimitive.Image, {const StyledAvatarFallback = styled(AvatarPrimitive.Fallback, {textTransform: "uppercase",borderRadius: "50%",- color: theme.colors.white,+ color: cssVar("--foreground-on-inverse"),});type AvatarPrimitiveProps = ComponentProps<typeof AvatarPrimitive.Root>;diff --git a/packages/design-system/src/components/button-contrast.browser.test.ts b/packages/design-system/src/components/button-contrast.browser.test.tsnew file mode 100644index 0000000000..29e21a1971--- /dev/null+++ b/packages/design-system/src/components/button-contrast.browser.test.ts@@ -0,0 +1,474 @@+import { commands, page } from "@vitest/browser/context";+import { createElement } from "react";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import "../colors/colors.css";+import { Button, LinkButton } from "./button";+import { IconButton } from "./icon-button";+import { PanelTabs, PanelTabsList, PanelTabsTrigger } from "./panel-tabs";+import { SmallToggleButton } from "./small-toggle-button";+import { ToggleButton } from "./toggle-button";+import { ToggleGroup, ToggleGroupButton } from "./toggle-group";+import { Tooltip, TooltipProvider } from "./tooltip";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+ document.documentElement.removeAttribute("data-color-scheme");+ document.documentElement.removeAttribute("style");+});++const readColor = (color: string) => {+ const canvas = document.createElement("canvas");+ canvas.width = 1;+ canvas.height = 1;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ throw new Error("Canvas color evaluation is unavailable");+ }+ context.fillStyle = color;+ context.fillRect(0, 0, 1, 1);+ return Array.from(context.getImageData(0, 0, 1, 1).data);+};++const readRenderedBackground = async (element: Element) => {+ const { base64, path } = await page+ .elementLocator(element)+ .screenshot({ base64: true });+ await commands.removeFile(path);+ const image = new Image();+ image.src = `data:image/png;base64,${base64}`;+ await image.decode();+ const canvas = document.createElement("canvas");+ canvas.width = image.width;+ canvas.height = image.height;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ throw new Error("Canvas screenshot evaluation is unavailable");+ }+ context.drawImage(image, 0, 0);+ return [0.25, 0.5, 0.75].map((position) =>+ Array.from(+ context.getImageData(+ Math.floor(image.width * position),+ Math.floor(image.height / 2),+ 1,+ 1+ ).data+ )+ );+};++const luminance = (color: number[]) => {+ const linearize = (channel: number) => {+ const value = channel / 255;+ return value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;+ };+ return (+ 0.2126 * linearize(color[0]) ++ 0.7152 * linearize(color[1]) ++ 0.0722 * linearize(color[2])+ );+};++const contrast = (first: number[], second: number[]) => {+ const firstLuminance = luminance(first);+ const secondLuminance = luminance(second);+ return (+ (Math.max(firstLuminance, secondLuminance) + 0.05) /+ (Math.min(firstLuminance, secondLuminance) + 0.05)+ );+};++test("strong button interaction states preserve text contrast", async () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ const themeColors = ["oklch(0% 0.4 0)", "oklch(100% 0.4 60)"];+ const variants = [+ ["primary", "accent"],+ ["destructive", "negative"],+ ] as const;++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;++ for (const themeColor of themeColors) {+ for (const [variant, themeColorName] of variants) {+ document.documentElement.style.setProperty(+ `--theme-color-${themeColorName}`,+ themeColor+ );++ for (const state of ["hover", "pressed"] as const) {+ act(() => {+ root?.render(+ createElement(Button, {+ "aria-label": variant,+ color: variant,+ state,+ css: { width: 20, height: 20, padding: 0 },+ })+ );+ });++ const button = container.querySelector("button");+ if (button === null) {+ throw new Error("Expected a rendered button");+ }++ const style = getComputedStyle(button);+ expect(style.backgroundImage, `${mode} ${variant} ${state}`).not.toBe(+ "none"+ );+ for (const background of await readRenderedBackground(button)) {+ expect(+ contrast(readColor(style.color), background),+ `${mode} ${variant} ${state} with ${themeColor}`+ ).toBeGreaterThanOrEqual(4.5);+ }+ }+ }+ }+ }+});++test("inactive panel tabs remain readable", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ "div",+ { style: { background: "var(--background-primary)" } },+ createElement(+ PanelTabs,+ { defaultValue: "active" },+ createElement(+ PanelTabsList,+ null,+ createElement(PanelTabsTrigger, { value: "active" }, "Active"),+ createElement(PanelTabsTrigger, { value: "inactive" }, "Inactive")+ )+ )+ )+ );+ });++ const inactiveTab = container.querySelector('[data-state="inactive"]');+ if (inactiveTab === null) {+ throw new Error("Expected an inactive tab");+ }+ const backgroundElement = container.firstElementChild;+ if (backgroundElement === null) {+ throw new Error("Expected a tab background");+ }+ const background = getComputedStyle(backgroundElement).backgroundColor;+ const foreground = getComputedStyle(inactiveTab).color;+ expect(+ contrast(readColor(foreground), readColor(background)),+ mode+ ).toBeGreaterThanOrEqual(4.5);+ }+});++test("icon buttons share selected styling across control semantics", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ createElement(+ "div",+ null,+ createElement(IconButton, {+ "aria-label": "Toggle selection",+ "aria-pressed": true,+ }),+ createElement(IconButton, {+ "aria-label": "Tab selection",+ "aria-selected": true,+ }),+ createElement(IconButton, {+ "aria-label": "Checked selection",+ "aria-checked": true,+ })+ )+ );+ });++ const backgrounds = Array.from(+ container.querySelectorAll("button"),+ (item) => getComputedStyle(item).backgroundColor+ );+ expect(new Set(backgrounds).size).toBe(1);+ expect(backgrounds[0]).not.toBe("rgba(0, 0, 0, 0)");+});++test("text toggle buttons preserve button layout and toggle semantics", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ createElement(+ TooltipProvider,+ null,+ createElement(Tooltip, {+ content: "Selected filter",+ children: createElement(+ ToggleButton,+ { pressed: true },+ "Selected filter"+ ),+ })+ )+ );+ });++ const button = container.querySelector("button");+ if (button === null) {+ throw new Error("Expected a rendered text toggle button");+ }++ const style = getComputedStyle(button);+ expect(button.getAttribute("aria-pressed")).toBe("true");+ expect(button.dataset.state).toBe("pressed");+ expect(style.display).toBe("inline-grid");+ expect(Number.parseFloat(style.paddingLeft)).toBeGreaterThan(0);+});++test("link buttons use anchor semantics and button interaction states", async () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ createElement(+ LinkButton,+ {+ href: "https://example.com/path",+ state: "hover",+ target: "_blank",+ },+ "Open"+ )+ );+ });++ const link = container.querySelector("a");+ if (link === null) {+ throw new Error("Expected LinkButton to render an anchor");+ }+ expect(link.href).toBe("https://example.com/path");+ expect(link.target).toBe("_blank");+ expect(link.dataset.state).toBe("hover");+ expect(getComputedStyle(link).backgroundImage).not.toBe("none");++ act(() => {+ root?.render(+ createElement(LinkButton, { color: "primary", href: "/next" }, "Next")+ );+ });+ const autoLink = container.querySelector("a");+ if (autoLink === null) {+ throw new Error("Expected an automatic LinkButton state");+ }+ expect(autoLink.dataset.state).toBe("auto");+ expect(getComputedStyle(autoLink).backgroundImage).toBe("none");+ await page.elementLocator(autoLink).hover();+ expect(getComputedStyle(autoLink).backgroundImage).not.toBe("none");+});++test("toggle group states remain distinguishable", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ ToggleGroup,+ { type: "single", defaultValue: "selected" },+ createElement(+ ToggleGroupButton,+ { value: "selected", css: { height: 31 } },+ "Selected"+ ),+ createElement(ToggleGroupButton, { value: "inactive" }, "Inactive")+ )+ );+ });++ const selected = container.querySelector('[data-state="on"]');+ const inactive = container.querySelector('[data-state="off"]');+ const group = container.querySelector('[role="group"]');+ if (selected === null || inactive === null || group === null) {+ throw new Error(+ "Expected a toggle group with selected and inactive items"+ );+ }++ const selectedStyle = getComputedStyle(selected);+ const inactiveStyle = getComputedStyle(inactive);+ const groupStyle = getComputedStyle(group);++ expect(selectedStyle.height).toBe("31px");+ expect(+ contrast(+ readColor(selectedStyle.backgroundColor),+ readColor(groupStyle.backgroundColor)+ ),+ `${mode} selected surface`+ ).toBeGreaterThanOrEqual(1.2);+ expect(+ contrast(readColor(selectedStyle.color), readColor(inactiveStyle.color)),+ `${mode} foreground states`+ ).toBeGreaterThanOrEqual(1.5);+ }+});++test("small toggle selections remain distinguishable", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ "div",+ { style: { background: "var(--background-primary)" } },+ createElement(SmallToggleButton, {+ "aria-label": "Selected small toggle",+ icon: "Selected",+ pressed: true,+ }),+ createElement(SmallToggleButton, {+ "aria-label": "Inactive small toggle",+ icon: "Inactive",+ pressed: false,+ })+ )+ );+ });++ const background = container.firstElementChild;+ const smallSelected = container.querySelector(+ '[aria-label="Selected small toggle"]'+ );+ const smallInactive = container.querySelector(+ '[aria-label="Inactive small toggle"]'+ );+ if (+ background === null ||+ smallSelected === null ||+ smallInactive === null+ ) {+ throw new Error("Expected rendered small toggle states");+ }++ const backgroundColor = readColor(+ getComputedStyle(background).backgroundColor+ );+ const selectedStyle = getComputedStyle(smallSelected);+ const inactiveStyle = getComputedStyle(smallInactive);+ expect(+ contrast(readColor(selectedStyle.backgroundColor), backgroundColor),+ `${mode} selected surface`+ ).toBeGreaterThanOrEqual(1.2);+ expect(+ contrast(readColor(selectedStyle.color), readColor(inactiveStyle.color)),+ `${mode} foreground states`+ ).toBeGreaterThanOrEqual(1.5);+ }+});++test("chrome actions and toggles share open and selected surfaces", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ "div",+ null,+ createElement(+ IconButton,+ {+ "aria-label": "Open toolbar action",+ state: "open",+ },+ "Action"+ ),+ createElement(+ IconButton,+ { "aria-label": "Idle toolbar action" },+ "Idle"+ ),+ createElement(+ ToggleGroup,+ { type: "single", value: "selected", variant: "frameless" },+ createElement(+ ToggleGroupButton,+ {+ "aria-label": "Selected chrome toggle",+ value: "selected",+ },+ "Selected"+ )+ )+ )+ );+ });++ const openAction = container.querySelector(+ '[aria-label="Open toolbar action"]'+ );+ const selectedToggle = container.querySelector(+ '[aria-label="Selected chrome toggle"]'+ );+ const idleAction = container.querySelector(+ '[aria-label="Idle toolbar action"]'+ );+ if (openAction === null || selectedToggle === null || idleAction === null) {+ throw new Error("Expected rendered toolbar controls");+ }++ const actionStyle = getComputedStyle(openAction);+ const toggleStyle = getComputedStyle(selectedToggle);+ expect(+ readColor(toggleStyle.backgroundColor),+ `${mode} background`+ ).toEqual(readColor(actionStyle.backgroundColor));+ expect(readColor(toggleStyle.color), `${mode} foreground`).toEqual(+ readColor(actionStyle.color)+ );+ expect(+ readColor(getComputedStyle(idleAction).backgroundColor)[3],+ `${mode} idle background`+ ).toBe(0);+ }+});diff --git a/packages/design-system/src/components/button.stories.tsx b/packages/design-system/src/components/button.stories.tsxindex 7e952e256b..54af56cafa 100644--- a/packages/design-system/src/components/button.stories.tsx+++ b/packages/design-system/src/components/button.stories.tsx@@ -15,11 +15,7 @@ const colors: ReadonlyArray<ComponentProps<typeof ButtonComponent>["color"]> = ["neutral","destructive","neutral-destructive",- "positive","ghost",- "dark",- "gradient",- "dark-ghost",];const states: ReadonlyArray<ComponentProps<typeof ButtonComponent>["state"]> = [@@ -35,15 +31,7 @@ export const Button = () => (<StorySection title="Colors & States"><StoryGrid>{colors.map((color) => (- <StoryGrid- horizontal- key={color}- css={- color === "dark-ghost"- ? { backgroundColor: "#1E1E1E", padding: 8 }- : undefined- }- >+ <StoryGrid horizontal key={color}>{states.map((state) => (<ButtonComponentprefix={<TrashIcon />}@@ -69,9 +57,13 @@ export const Button = () => (<StorySection title="Icon"><StoryGrid horizontal>- <ButtonComponent prefix={<TrashIcon />}>Button</ButtonComponent>- <ButtonComponent suffix={<TrashIcon />}>Button</ButtonComponent>- <ButtonComponent prefix={<TrashIcon />} />+ <ButtonComponent color="primary" prefix={<TrashIcon />}>+ Button+ </ButtonComponent>+ <ButtonComponent color="primary" suffix={<TrashIcon />}>+ Button+ </ButtonComponent>+ <ButtonComponent color="primary" prefix={<TrashIcon />} /></StoryGrid></StorySection>@@ -81,8 +73,10 @@ export const Button = () => (alignItems: "flex-start",}}>- <ButtonComponent>Any content to preserve size</ButtonComponent>- <ButtonComponent state="pending">+ <ButtonComponent color="primary">+ Any content to preserve size+ </ButtonComponent>+ <ButtonComponent color="primary" state="pending">Any content to preserve size</ButtonComponent></StoryGrid>@@ -91,7 +85,9 @@ export const Button = () => (<StorySection title="Used as a Trigger for something that opens"><Popover defaultOpen><PopoverTrigger asChild>- <ButtonComponent prefix={<TrashIcon />}>Open</ButtonComponent>+ <ButtonComponent color="primary" prefix={<TrashIcon />}>+ Open+ </ButtonComponent></PopoverTrigger><PopoverContent css={{ padding: theme.panel.padding }}><Text>Some content</Text>diff --git a/packages/design-system/src/components/button.tsx b/packages/design-system/src/components/button.tsxindex 0d84730022..d08eb59c7c 100644--- a/packages/design-system/src/components/button.tsx+++ b/packages/design-system/src/components/button.tsx@@ -13,89 +13,95 @@ import { textVariants } from "./text";import { css, styled, theme, type CSS } from "../stitches.config";import { LoadingDotsIcon } from "@webstudio-is/icons";import { Flex } from "./flex";+import { cssVar } from "../css-var";+import { withInteractionOverlay } from "./control-state-color";const colors = ["primary","destructive",- "positive","neutral","ghost",- "dark",- "gradient","neutral-destructive",- "dark-ghost",] as const;-type ButtonColor = (typeof colors)[number];+export type ButtonColor = (typeof colors)[number];-type ButtonState = "auto" | "hover" | "focus" | "pressed" | "pending";+export type ButtonState = "auto" | "hover" | "focus" | "pressed" | "pending";++const neutralBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 86%, ${cssVar("--foreground-primary")})`;+const disabledBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 92%, ${cssVar("--foreground-primary")})`;+const chromaticHoverOverlay = `oklch(from ${cssVar(+ "--foreground-on-accent"+)} 0 0 h / 6.2745%)`;+const chromaticPressedOverlay = `oklch(from ${cssVar(+ "--foreground-on-accent"+)} 0 0 h / 10.9804%)`;const backgrounds: Record<ButtonColor, string> = {- primary: theme.colors.backgroundPrimary,- neutral: theme.colors.backgroundNeutralMain,- "neutral-destructive": theme.colors.backgroundNeutralMain,- destructive: theme.colors.backgroundDestructiveMain,- positive: theme.colors.backgroundSuccessMain,- ghost: theme.colors.backgroundHover,- dark: theme.colors.backgroundTopbar,- gradient: theme.colors.backgroundGradientPrimary,- "dark-ghost": theme.colors.backgroundTopbar,+ primary: cssVar("--background-accent"),+ neutral: neutralBackground,+ "neutral-destructive": neutralBackground,+ destructive: cssVar("--background-negative"),+ ghost: "transparent",};const foregrounds: Record<ButtonColor, string> = {- primary: theme.colors.foregroundContrastMain,- destructive: theme.colors.foregroundContrastMain,- "neutral-destructive": theme.colors.foregroundDestructive,- positive: theme.colors.foregroundContrastMain,- neutral: theme.colors.foregroundMain,- ghost: theme.colors.foregroundMain,- dark: theme.colors.foregroundContrastMain,- gradient: theme.colors.foregroundContrastMain,- "dark-ghost": theme.colors.foregroundContrastMain,+ primary: cssVar("--foreground-on-accent"),+ destructive: cssVar("--foreground-on-negative"),+ "neutral-destructive": cssVar("--foreground-negative"),+ neutral: cssVar("--foreground-primary"),+ ghost: cssVar("--foreground-primary"),};-const perColorStyle = (variant: ButtonColor) => ({- background:- variant === "ghost" || variant === "dark-ghost"- ? "transparent"- : backgrounds[variant],- color:- variant === "dark-ghost"- ? theme.colors.foregroundSubtle- : foregrounds[variant],-- "&[data-state=auto]:hover, &[data-state=hover]": {- color: foregrounds[variant],- background:- variant === "gradient"- ? `linear-gradient(${theme.colors.backgroundButtonHover}, ${theme.colors.backgroundButtonHover}), ${backgrounds[variant]}`- : `oklch(from ${backgrounds[variant]} l c h / 0.8)`,- },+const perColorStyle = (variant: ButtonColor) => {+ const isTransparent = variant === "ghost";+ const isChromatic = variant === "primary" || variant === "destructive";+ let hoverOverlay = cssVar("--overlay-interaction-hover");+ let pressedOverlay = cssVar("--overlay-interaction-pressed");+ if (isChromatic) {+ hoverOverlay = chromaticHoverOverlay;+ pressedOverlay = chromaticPressedOverlay;+ }- "&[data-state=auto]:focus-visible, &[data-state=focus]": {+ return {+ background: backgrounds[variant],color: foregrounds[variant],- outline: `1px solid ${theme.colors.borderFocus}`,- outlineOffset: "1px",- },- "&[data-state=auto]:active, &[data-state=pressed]": {- color: foregrounds[variant],- background:- variant === "gradient"- ? `linear-gradient(${theme.colors.backgroundButtonPressed}, ${theme.colors.backgroundButtonPressed}), ${backgrounds[variant]}`- : `oklch(from ${backgrounds[variant]} l c h / 0.8)`,- },+ "&[data-state=auto]:hover, &[data-state=hover]": {+ color: foregrounds[variant],+ background: isTransparent+ ? hoverOverlay+ : withInteractionOverlay(backgrounds[variant], hoverOverlay),+ },- "&:disabled:not([data-state=pending]), &[data-state=disabled], &[aria-disabled=true], &[aria-disabled=true]:hover, &[aria-disabled=true]:visited":- {- background: theme.colors.backgroundButtonDisabled,- color: theme.colors.foregroundDisabled,+ "&[data-state=auto]:focus-visible, &[data-state=focus]": {+ color: foregrounds[variant],+ outline: `1px solid ${cssVar("--border-focus")}`,+ outlineOffset: "1px",},- "&[data-state=pending]": {- cursor: "wait",- },-});+ "&[data-state=auto]:active, &[data-state=pressed]": {+ color: foregrounds[variant],+ background: isTransparent+ ? pressedOverlay+ : withInteractionOverlay(backgrounds[variant], pressedOverlay),+ },++ "&:disabled:not([data-state=pending]), &[data-state=disabled], &[aria-disabled=true]:not([data-state=pending]), &[aria-disabled=true]:not([data-state=pending]):hover, &[aria-disabled=true]:not([data-state=pending]):visited":+ {+ background: disabledBackground,+ color: cssVar("--foreground-disabled"),+ },++ "&[data-state=pending]": {+ cursor: "wait",+ },+ };+};export const buttonStyle = css({all: "unset",@@ -116,17 +122,13 @@ export const buttonStyle = css({primary: perColorStyle("primary"),destructive: perColorStyle("destructive"),"neutral-destructive": perColorStyle("neutral-destructive"),- positive: perColorStyle("positive"),neutral: perColorStyle("neutral"),ghost: perColorStyle("ghost"),- dark: perColorStyle("dark"),- gradient: perColorStyle("gradient"),- "dark-ghost": perColorStyle("dark-ghost"),},},defaultVariants: {- color: "primary",+ color: "neutral",},});@@ -145,7 +147,7 @@ const TextContainer = styled("span", textVariants.labels, {},});-type ButtonProps = {+type ButtonVisualProps = {state?: ButtonState;color?: ButtonColor;@@ -160,7 +162,44 @@ type ButtonProps = {// might be set when <Button> is asChild"data-state"?: string;-} & Omit<ComponentProps<"button">, "prefix">;+};++export type ButtonProps = ButtonVisualProps &+ Omit<ComponentProps<"button">, "prefix" | "color">;++const ButtonContent = ({+ prefix,+ suffix,+ children,+ pending,+}: Pick<ButtonVisualProps, "prefix" | "suffix"> & {+ children?: ReactNode;+ pending: boolean;+}) => (+ <>+ {prefix}+ {children && (+ <TextContainer hidden={pending}>+ {children}+ {pending && (+ <Flex+ css={{+ position: "absolute",+ inset: 0,+ visibility: "visible",+ pointerEvents: "none",+ }}+ justify="center"+ align="center"+ >+ <LoadingDotsIcon size={28} fill="currentColor" />+ </Flex>+ )}+ </TextContainer>+ )}+ {suffix}+ </>+);export const Button = forwardRef((@@ -171,6 +210,7 @@ export const Button = forwardRef(suffix,children,"data-state": dataState,+ "aria-pressed": ariaPressed,className,css,color,@@ -180,7 +220,12 @@ export const Button = forwardRef() => {// when button is used as a trigger for something that opens// <SomeTrigger asChild><Button /></SomeTrigger>- let finalState = dataState === "open" ? "pressed" : undefined;+ let finalState =+ dataState === "open" || dataState === "on" ? "pressed" : undefined;++ if (ariaPressed === true || ariaPressed === "true") {+ finalState = "pressed";+ }// "state" wins over "data-state"if (state !== undefined) {@@ -195,35 +240,79 @@ export const Button = forwardRef(return (<button{...restProps}+ aria-pressed={ariaPressed}disabled={disabled || state === "pending"}data-state={finalState ?? "auto"}ref={ref}className={buttonStyle({ color, className, css })}>- {prefix}- {children && (- <TextContainer hidden={state === "pending"}>- {children}- {state === "pending" && (- <Flex- css={{- position: "absolute",- inset: 0,- visibility: "visible",- pointerEvents: "none",- }}- justify={"center"}- align={"center"}- >- <LoadingDotsIcon size={28} fill="currentColor" />- </Flex>- )}- </TextContainer>- )}-- {suffix}+ <ButtonContent+ prefix={prefix}+ suffix={suffix}+ pending={state === "pending"}+ >+ {children}+ </ButtonContent></button>);});Button.displayName = "Button";++export type LinkButtonProps = ButtonVisualProps &+ Omit<ComponentProps<"a">, "prefix" | "color">;++export const LinkButton = forwardRef(+ (+ {+ state,+ prefix,+ suffix,+ children,+ "data-state": dataState,+ className,+ css,+ color,+ "aria-disabled": ariaDisabled,+ onClick,+ ...restProps+ }: LinkButtonProps,+ ref: Ref<HTMLAnchorElement>+ ) => {+ let finalState = dataState === "open" ? "pressed" : dataState;+ if (state !== undefined) {+ finalState = state;+ }++ const isDisabled = ariaDisabled === true || ariaDisabled === "true";+ if (isDisabled && state !== "pending") {+ finalState = "disabled";+ }++ return (+ <a+ {...restProps}+ aria-disabled={state === "pending" ? true : ariaDisabled}+ data-state={finalState ?? "auto"}+ ref={ref}+ className={buttonStyle({ color, className, css })}+ onClick={(event) => {+ if (isDisabled || state === "pending") {+ event.preventDefault();+ return;+ }+ onClick?.(event);+ }}+ >+ <ButtonContent+ prefix={prefix}+ suffix={suffix}+ pending={state === "pending"}+ >+ {children}+ </ButtonContent>+ </a>+ );+ }+);+LinkButton.displayName = "LinkButton";diff --git a/packages/design-system/src/components/card.tsx b/packages/design-system/src/components/card.tsxindex bce4d5d5bf..9fc1ddaf3b 100644--- a/packages/design-system/src/components/card.tsx+++ b/packages/design-system/src/components/card.tsx@@ -1,5 +1,5 @@-import { styled } from "../stitches.config";-import { theme } from "../stitches.config";+import { cssVar } from "../css-var";+import { styled, theme } from "../stitches.config";export const Card = styled("div", {appearance: "none",@@ -10,8 +10,8 @@ export const Card = styled("div", {outline: "none",textAlign: "inherit",verticalAlign: "middle",- WebkitTapHighlightColor: "rgba(0, 0, 0, 0)",- backgroundColor: "white",+ WebkitTapHighlightColor: "transparent",+ backgroundColor: cssVar("--background-primary"),display: "block",textDecoration: "none",color: "inherit",@@ -27,7 +27,7 @@ export const Card = styled("div", {right: 0,bottom: 0,left: 0,- boxShadow: "inset 0 0 0 1px rgba(0,0,0,.1)",+ boxShadow: `inset 0 0 0 1px ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[7],pointerEvents: "none",},diff --git a/packages/design-system/src/components/checkbox.tsx b/packages/design-system/src/components/checkbox.tsxindex 9c920a2599..1c56061dee 100644--- a/packages/design-system/src/components/checkbox.tsx+++ b/packages/design-system/src/components/checkbox.tsx@@ -7,6 +7,8 @@ import { forwardRef, type ComponentProps, type Ref } from "react";import * as Primitive from "@radix-ui/react-checkbox";import { CheckMarkIcon, MinusIcon } from "@webstudio-is/icons";import { type CSS, css, theme, styled } from "../stitches.config";+import { cssVar } from "../css-var";+import { restingControlBoundary } from "./form-control-style";const checkboxStyle = css({all: "unset", // reset <button>@@ -18,17 +20,18 @@ const checkboxStyle = css({justifyContent: "center",position: "relative",borderRadius: theme.borderRadius[3],- color: theme.colors.foregroundMain,- background: theme.colors.backgroundControls,- border: `1px solid ${theme.colors.borderMain}`,+ color: cssVar("--foreground-primary"),+ background: cssVar("--background-secondary"),+ border: `1px solid ${restingControlBoundary}`,"&:focus-visible": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},// [data-state] is needed to make selector specificity higher"&[data-state]:disabled": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),+ borderColor: cssVar("--border-default"),},});diff --git a/packages/design-system/src/components/chip.tsx b/packages/design-system/src/components/chip.tsxindex 2a09718a65..5c528a4b3f 100644--- a/packages/design-system/src/components/chip.tsx+++ b/packages/design-system/src/components/chip.tsx@@ -1,5 +1,15 @@import { styled, theme } from "../stitches.config";import { textVariants } from "./text";+import { cssVar } from "../css-var";+import { rotateBoundedBackgroundHue } from "../color-utils";++const neutralBackground = `color-mix(in oklab, ${cssVar(+ "--foreground-primary"+)} 58%, ${cssVar("--background-primary")})`;+const purpleBackground = rotateBoundedBackgroundHue(+ cssVar("--background-accent"),+ 72+);export const Chip = styled("span", textVariants.labels, {boxSizing: "border-box",@@ -20,23 +30,23 @@ export const Chip = styled("span", textVariants.labels, {textDecoration: "none","&:focus-visible": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: "1px",},variants: {color: {neutral: {- backgroundColor: theme.colors.foregroundTextSubtle,- color: theme.colors.foregroundContrastMain,+ backgroundColor: neutralBackground,+ color: cssVar("--foreground-on-inverse"),},green: {- backgroundColor: theme.colors.backgroundSuccessMain,- color: theme.colors.foregroundContrastMain,+ backgroundColor: cssVar("--background-positive"),+ color: cssVar("--foreground-on-positive"),},purple: {- backgroundColor: theme.colors.backgroundStyleSourceBreakpoint,- color: theme.colors.foregroundContrastMain,+ backgroundColor: purpleBackground,+ color: cssVar("--foreground-on-accent"),},},},diff --git a/packages/design-system/src/components/chrome-control-style.ts b/packages/design-system/src/components/chrome-control-style.tsnew file mode 100644index 0000000000..f8aaf80eca--- /dev/null+++ b/packages/design-system/src/components/chrome-control-style.ts@@ -0,0 +1,32 @@+import { cssVar } from "../css-var";+import type { CSS } from "../stitches.config";+import { focusRingStyle } from "./focus-ring";++const selectedSelector =+ '&[data-state="active"], &[data-state=on], &[data-state=open], &[aria-checked=true], &[aria-expanded=true]';++export const chromeControlStyle = {+ color: cssVar("--foreground-primary"),+ background: "transparent",+ "&[data-state=off], &[aria-checked=false]": {+ color: cssVar("--foreground-primary"),+ },+ "&:focus-visible": focusRingStyle(),+ "@hover": {+ "&:hover": {+ background: cssVar("--overlay-interaction-hover"),+ },+ },+ [selectedSelector]: {+ color: cssVar("--foreground-primary"),+ background: cssVar("--overlay-interaction-hover"),+ },+ "&:active": {+ background: cssVar("--overlay-interaction-pressed"),+ },+ "&:disabled, &[aria-disabled=true]": {+ color: cssVar("--foreground-disabled"),+ background: "transparent",+ cursor: "not-allowed",+ },+} satisfies CSS;diff --git a/packages/design-system/src/components/color-picker.test.ts b/packages/design-system/src/components/color-picker.browser.test.tssimilarity index 100%rename from packages/design-system/src/components/color-picker.test.tsrename to packages/design-system/src/components/color-picker.browser.test.tsdiff --git a/packages/design-system/src/components/color-picker.tsx b/packages/design-system/src/components/color-picker.tsxindex 4e46a704bf..6a3c6f0995 100644--- a/packages/design-system/src/components/color-picker.tsx+++ b/packages/design-system/src/components/color-picker.tsx@@ -5,13 +5,8 @@ import {toColorSpace,toColorComponent,parseColor,- colorDistance,- lerpColor,serializeColor,- transparentColor,- whiteColor,toValue,- type PlainColorObject,type StyleValue,type ColorValue,} from "@webstudio-is/css-engine";@@ -23,12 +18,16 @@ import {useEffect,useId,useRef,+ useState,} from "react";-import { clamp } from "@react-aria/utils";-import { css, rawTheme, theme, type CSS } from "../stitches.config";+import { css, theme, type CSS } from "../stitches.config";+import { cssVar, declareCssVar } from "../css-var";import { useDisableCanvasPointerEvents } from "../utilities";import { textStyle } from "./text";+const colorInputContrastProperty = declareCssVar("--contrast");+const colorInputValueProperty = declareCssVar("--value");+declare global {// eslint-disable-next-line @typescript-eslint/no-namespacenamespace React.JSX {@@ -105,30 +104,23 @@ const styleValueToColorInputValue = (value: StyleValue) => {// ─── ColorThumb ──────────────────────────────────────────────────────────────-const borderColorSwatch = parseColor(rawTheme.colors.borderColorSwatch);--const calcBorderColor = (color: PlainColorObject) => {- const distanceToStartDrawBorder = 0.15;- const alpha = clamp(- (distanceToStartDrawBorder - colorDistance(whiteColor, color)) /- distanceToStartDrawBorder,- 0,- 1- );- return lerpColor(transparentColor, borderColorSwatch, alpha);-};+const transparencyChecker = `oklch(from ${cssVar(+ "--foreground-primary"+)} l c h / 22%)`;const thumbStyle = css({display: "block",+ boxSizing: "border-box",position: "relative",width: theme.spacing[9],height: theme.spacing[9],backgroundBlendMode: "difference",borderRadius: theme.borderRadius[2],- borderWidth: 0,+ borderWidth: 1,borderStyle: "solid",+ borderColor: cssVar("--border-default"),"&:focus-visible": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: 1,},});@@ -143,21 +135,15 @@ export const ColorThumb = forwardRef<ElementRef<"button">, ColorThumbProps>(({ interactive, color = "transparent", css, ...rest }, ref) => {const parsed = parseColor(color);const alpha = parsed.alpha ?? 1;- const background =- alpha < 1- ? `repeating-conic-gradient(rgba(0,0,0,0.22) 0% 25%, transparent 0% 50%)- 0% 33.33% / 40% 40%, ${color}`- : color;- const borderColor = calcBorderColor(parsed);-const Component = interactive ? "button" : "span";return (<Componentstyle={{- background,- borderColor: serializeColor(borderColor),- borderWidth: (borderColor.alpha ?? 1) === 0 ? 0 : 1,+ background:+ alpha < 1+ ? `repeating-conic-gradient(${transparencyChecker} 0% 25%, transparent 0% 50%) 0% 33.33% / 40% 40%, ${color}`+ : color,}}className={thumbStyle({ css })}tabIndex={-1}@@ -197,6 +183,30 @@ const shouldHandleColorInputChange = ({return disabled === false && isOpen;};+const useColorInputTheme = () => {+ const [colorInputTheme, setColorInputTheme] = useState<"light" | "dark">(+ "light"+ );++ useEffect(() => {+ const root = document.documentElement;+ const updateTheme = () => {+ setColorInputTheme(+ root.getAttribute("data-color-scheme") === "dark" ? "dark" : "light"+ );+ };+ updateTheme();+ const observer = new MutationObserver(updateTheme);+ observer.observe(root, {+ attributes: true,+ attributeFilter: ["data-color-scheme"],+ });+ return () => observer.disconnect();+ }, []);++ return colorInputTheme;+};+// Renders <color-input> with its built-in trigger chip, hiding the text input.// The chip opens the panel natively via the Popover API.// Our own ColorThumb is rendered on top (pointer-events: none) so that clicks@@ -219,6 +229,7 @@ export const ColorPicker = ({disabled = false,}: ColorPickerProps) => {const colorInputRef = useRef<ColorInput>(null);+ const colorInputTheme = useColorInputTheme();const scopeClass = useId().replace(/:/g, "");const { enableCanvasPointerEvents, disableCanvasPointerEvents } =useDisableCanvasPointerEvents();@@ -251,10 +262,13 @@ export const ColorPicker = ({if (!colorInputElement) {return;}- colorInputElement.style.setProperty("--contrast", "inherit");+ colorInputElement.style.setProperty(colorInputContrastProperty, "inherit");colorInputElement.shadowRoot?.querySelector<HTMLElement>(".preview")- ?.style.setProperty("--value", rawTheme.colors.backgroundPanel);+ ?.style.setProperty(+ colorInputValueProperty,+ cssVar("--background-primary")+ );}, []);// Sync externally-controlled open state into the web component.@@ -434,7 +448,7 @@ export const ColorPicker = ({ref={colorInputRef}value={colorInputValue}colorspace={colorSpace}- theme="light"+ theme={colorInputTheme}class={`${textClass} ${scopeClass}`}/>)}diff --git a/packages/design-system/src/components/color-system.stories.tsx b/packages/design-system/src/components/color-system.stories.tsxnew file mode 100644index 0000000000..d6d7dc8ba5--- /dev/null+++ b/packages/design-system/src/components/color-system.stories.tsx@@ -0,0 +1,283 @@+import { useEffect, useState, type CSSProperties, type ReactNode } from "react";+import colorSourceCss from "../colors/colors.css?raw";+import {+ colorContrastContractCount,+ getColorContrast,+} from "../colors/color-contrast";+import { parseColorSource, type ColorMode } from "../colors/color-source-utils";++export default {+ title: "Foundations/Colors",+ parameters: { layout: "fullscreen" },+};++const source = parseColorSource(colorSourceCss);+const variable = (name: string) => `var(${name})`;++const cardStyle: CSSProperties = {+ minWidth: 0,+ overflow: "hidden",+ border: `1px solid ${variable("--border-default")}`,+ borderRadius: 8,+ background: variable("--background-primary"),+};++const labelStyle: CSSProperties = {+ display: "block",+ overflow: "hidden",+ textOverflow: "ellipsis",+ font: "600 12px/1.4 ui-monospace, SFMono-Regular, Menlo, monospace",+ color: variable("--foreground-primary"),+};++const codeStyle: CSSProperties = {+ display: "block",+ marginTop: 8,+ padding: 8,+ borderRadius: 4,+ background: variable("--background-secondary"),+ overflowWrap: "anywhere",+ whiteSpace: "pre-wrap",+ font: "11px/1.45 ui-monospace, SFMono-Regular, Menlo, monospace",+ color: variable("--foreground-secondary"),+};++const TokenCard = ({ name, value }: { name: string; value: string }) => (+ <article style={cardStyle}>+ <div+ aria-label={`${name} color preview`}+ style={{+ height: 72,+ background: variable(name),+ borderBottom: `1px solid ${variable("--border-default")}`,+ }}+ />+ <div style={{ padding: 10 }}>+ <code title={name} style={labelStyle}>+ {name}+ </code>+ <code style={codeStyle}>{`${name}: ${value};`}</code>+ </div>+ </article>+);++const TokenGrid = ({+ group,+ values,+}: {+ group: string;+ values: Record<string, string>;+}) => (+ <div+ style={{+ display: "grid",+ gridTemplateColumns: "repeat(auto-fill, minmax(240px, 1fr))",+ gap: 12,+ }}+ >+ {Object.entries(values).map(([name, value]) => (+ <TokenCard key={name} name={`--${group}-${name}`} value={value} />+ ))}+ </div>+);++const ThemeContrast = () => (+ <dl+ style={{+ ...cardStyle,+ display: "grid",+ gridTemplateColumns: "repeat(auto-fit, minmax(180px, 1fr))",+ gap: 12,+ padding: 12,+ margin: 0,+ }}+ >+ {Object.entries(source.theme.contrast).map(([name, value]) => (+ <div key={name}>+ <dt style={labelStyle}>{`--theme-contrast-${name}`}</dt>+ <dd style={{ ...codeStyle, marginInline: 0 }}>{value}</dd>+ </div>+ ))}+ </dl>+);++const ContrastPairs = ({+ mode,+ themeTestCase,+}: {+ mode: ColorMode;+ themeTestCase: string;+}) => {+ const [pairs, setPairs] = useState(() => getColorContrast(mode));++ useEffect(() => {+ setPairs(getColorContrast(mode));+ }, [mode, themeTestCase]);++ return (+ <div+ style={{+ display: "grid",+ gridTemplateColumns: "repeat(auto-fill, minmax(260px, 1fr))",+ gap: 12,+ }}+ >+ {pairs.map((pair) => (+ <article+ key={`${pair.foreground}-${pair.background}`}+ style={cardStyle}+ >+ <div+ style={{+ display: "grid",+ placeItems: "center",+ height: 72,+ background: variable(pair.background),+ color: variable(pair.foreground),+ font: "700 24px/1 system-ui, sans-serif",+ }}+ >+ Aa+ </div>+ <div style={{ padding: 10 }}>+ <code style={labelStyle}>{pair.foreground}</code>+ <code style={codeStyle}>+ {`${pair.ratio.toFixed(2)}:1 · minimum ${pair.minimum}:1\non ${pair.background}`}+ </code>+ </div>+ </article>+ ))}+ </div>+ );+};++const Section = ({+ title,+ description,+ children,+}: {+ title: string;+ description: string;+ children: ReactNode;+}) => (+ <section style={{ display: "grid", gap: 12 }}>+ <div>+ <h2 style={{ margin: 0, font: "600 18px/1.4 system-ui, sans-serif" }}>+ {title}+ </h2>+ <p+ style={{+ margin: "4px 0 0",+ color: variable("--foreground-secondary"),+ font: "14px/1.5 system-ui, sans-serif",+ }}+ >+ {description}+ </p>+ </div>+ {children}+ </section>+);++const ColorSystemPreview = ({+ mode,+ themeTestCase,+}: {+ mode: ColorMode;+ themeTestCase: string;+}) => {+ return (+ <main+ style={{+ minHeight: "100vh",+ boxSizing: "border-box",+ padding: 24,+ background: variable("--background-primary"),+ color: variable("--foreground-primary"),+ }}+ >+ <div+ style={{+ display: "grid",+ gap: 32,+ width: "min(1440px, 100%)",+ margin: "0 auto",+ }}+ >+ <header>+ <div>+ <h1+ style={{ margin: 0, font: "700 28px/1.25 system-ui, sans-serif" }}+ >+ Color system+ </h1>+ <p+ style={{+ maxWidth: 760,+ margin: "8px 0 0",+ color: variable("--foreground-secondary"),+ font: "14px/1.55 system-ui, sans-serif",+ }}+ >+ CSS derives a small Craft semantic vocabulary from nine bounded+ theme parameters. Every card shows its declaration directly from+ colors.css.+ </p>+ </div>+ </header>++ <Section+ title={`Theme colors · ${Object.keys(source.theme.color).length}`}+ description="Theme authors choose each color family once. The recipe normalizes them into safe semantic roles."+ >+ <TokenGrid group="theme-color" values={source.theme.color} />+ </Section>++ <Section+ title={`Theme contrast · ${Object.keys(source.theme.contrast).length}`}+ description="Bounded percentages shape content, surface, and border relationships in both color schemes."+ >+ <ThemeContrast />+ </Section>++ <Section+ title={`Contrast contracts · ${colorContrastContractCount}`}+ description="Required text and non-text pairings are validated in both schemes."+ >+ <ContrastPairs mode={mode} themeTestCase={themeTestCase} />+ </Section>++ <Section+ title={`Derived colors · ${Object.keys(source.derived).length}`}+ description="Derived colors normalize theme parameters before they feed the semantic graph."+ >+ <TokenGrid group="color" values={source.derived} />+ </Section>++ {Object.entries(source.semantic).map(([category, colors]) => (+ <Section+ key={category}+ title={`${category[0].toUpperCase() + category.slice(1)} · ${Object.keys(colors).length}`}+ description={`Reusable Craft ${category} decisions. Component states compose these values instead of adding component-specific colors.`}+ >+ <TokenGrid group={category} values={colors} />+ </Section>+ ))}+ </div>+ </main>+ );+};++export const ColorSystem = (+ _args: unknown,+ { globals }: { globals: Record<string, unknown> }+) => (+ <ColorSystemPreview+ mode={globals.colorScheme === "dark" ? "dark" : "light"}+ themeTestCase={+ typeof globals.themeTestCase === "string"+ ? globals.themeTestCase+ : "default"+ }+ />+);diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsxindex ae5d00379c..88ec814d61 100644--- a/packages/design-system/src/components/combobox.tsx+++ b/packages/design-system/src/components/combobox.tsx@@ -41,6 +41,9 @@ import { Flex } from "./flex";import { NestedInputButton } from "./nested-input-button";import { InputField } from "./input-field";import { Grid } from "./grid";+import { cssVar, declareCssVar } from "../css-var";++const popperAnchorWidth = declareCssVar("--radix-popper-anchor-width");export const ComboboxListbox = styled("ul",@@ -128,19 +131,15 @@ export const ComboboxItemDescription = ({return (<><ComboboxSeparator- style={{- display: `var(--ws-combobox-description-display-bottom, none)`,- order: "var(--ws-combobox-description-order)",- }}+ data-combobox-description="bottom-separator"+ css={{ order: 2 }}/><ListboxItem+ data-combobox-description="content"css={{display: "grid",}}hint- style={{- order: "var(--ws-combobox-description-order)",- }}>{descriptions.map((description, index) => (<Box@@ -164,10 +163,8 @@ export const ComboboxItemDescription = ({</Box></ListboxItem><ComboboxSeparator- style={{- display: `var(--ws-combobox-description-display-top, none)`,- order: "var(--ws-combobox-description-order)",- }}+ data-combobox-description="top-separator"+ css={{ order: 0 }}/></>);@@ -178,14 +175,25 @@ export const ComboboxRoot = (props: ComponentProps<typeof Popover>) => {};const StyledPopoverContent = styled(PopoverContent, {- minWidth: "var(--radix-popper-anchor-width)",+ minWidth: cssVar(popperAnchorWidth),+ '& [data-combobox-description$="separator"]': {+ display: "none",+ },"&[data-side=top]": {- "--ws-combobox-description-display-top": "block",- "--ws-combobox-description-order": 0,+ '& [data-combobox-description="top-separator"]': {+ display: "block",+ },+ '& [data-combobox-description="content"]': {+ order: 0,+ },},"&[data-side=bottom]": {- "--ws-combobox-description-display-bottom": "block",- "--ws-combobox-description-order": 2,+ '& [data-combobox-description="bottom-separator"]': {+ display: "block",+ },+ '& [data-combobox-description="content"]': {+ order: 2,+ },},});diff --git a/packages/design-system/src/components/command.browser.test.ts b/packages/design-system/src/components/command.browser.test.tsnew file mode 100644index 0000000000..cf781c4386--- /dev/null+++ b/packages/design-system/src/components/command.browser.test.ts@@ -0,0 +1,114 @@+import { createElement } from "react";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import "../colors/colors.css";+import {+ Command,+ CommandGroup,+ CommandGroupHeading,+ CommandItem,+ CommandList,+} from "./command";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+ document.documentElement.removeAttribute("data-color-scheme");+});++const readColor = (color: string) => {+ const canvas = document.createElement("canvas");+ canvas.width = 1;+ canvas.height = 1;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ throw new Error("Canvas color evaluation is unavailable");+ }+ context.fillStyle = color;+ context.fillRect(0, 0, 1, 1);+ return Array.from(context.getImageData(0, 0, 1, 1).data);+};++const luminance = (color: number[]) => {+ const linearize = (channel: number) => {+ const value = channel / 255;+ return value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;+ };+ return (+ 0.2126 * linearize(color[0]) ++ 0.7152 * linearize(color[1]) ++ 0.0722 * linearize(color[2])+ );+};++const contrast = (first: number[], second: number[]) => {+ const firstLuminance = luminance(first);+ const secondLuminance = luminance(second);+ return (+ (Math.max(firstLuminance, secondLuminance) + 0.05) /+ (Math.min(firstLuminance, secondLuminance) + 0.05)+ );+};++test("command panels use the panel surface and readable group headings", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ "div",+ { style: { background: "var(--background-primary)" } },+ createElement(+ Command,+ null,+ createElement(+ CommandList,+ null,+ createElement(+ CommandGroup,+ {+ name: "commands",+ actions: [],+ heading: createElement(+ CommandGroupHeading,+ null,+ "Commands (39)"+ ),+ },+ createElement(CommandItem, { value: "example" }, "Example")+ )+ )+ )+ )+ );+ });++ const panel = container.querySelector("[cmdk-root]");+ const heading = container.querySelector("[cmdk-group-heading]");+ const panelReference = container.firstElementChild;+ if (panel === null || heading === null || panelReference === null) {+ throw new Error("Expected a rendered command group");+ }++ const panelBackground = readColor(getComputedStyle(panel).backgroundColor);+ expect(panelBackground, `${mode} panel surface`).toEqual(+ readColor(getComputedStyle(panelReference).backgroundColor)+ );+ expect(+ contrast(readColor(getComputedStyle(heading).color), panelBackground),+ `${mode} heading contrast`+ ).toBeGreaterThanOrEqual(4.5);+ }+});diff --git a/packages/design-system/src/components/command.tsx b/packages/design-system/src/components/command.tsxindex 38fd21090b..41e246f07a 100644--- a/packages/design-system/src/components/command.tsx+++ b/packages/design-system/src/components/command.tsx@@ -34,17 +34,21 @@ import { useDebounceEffect } from "../utilities";import { Flex } from "./flex";import { InputField } from "./input-field";import { SmallIconButton } from "./small-icon-button";+import { cssVar, declareCssVar } from "../css-var";+import { selectionBackground } from "./selection-color";const panelWidth = "500px";const itemHeight = "32px";-const inputBorderBottomSize = "--command-input-border-bottom-width";+const inputBorderBottomSize = declareCssVar(+ "--command-input-border-bottom-width"+);const StyledCommand = styled(CommandPrimitive, {boxSizing: "border-box",width: panelWidth,boxShadow: theme.shadows.menuDropShadow,- backgroundColor: theme.colors.backgroundControls,- border: `1px solid ${theme.colors.borderMain}`,+ backgroundColor: cssVar("--background-primary"),+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[7],// clip selected item backgroundoverflow: "clip",@@ -162,19 +166,21 @@ export const CommandDialog = ({};const CommandInputContainer = styled("div", {- borderBottom: `var(${inputBorderBottomSize}) solid ${theme.colors.borderMain}`,+ borderBottom: `${cssVar(inputBorderBottomSize)} solid ${cssVar(+ "--border-default"+ )}`,});export const CommandSearchIcon = styled(SearchIcon, {display: "flex",width: theme.spacing[11],- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),});export const CommandBackIcon = styled(ChevronLeftIcon, {display: "flex",width: theme.spacing[11],- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),});const CommandInputField = styled(InputField, {@@ -480,9 +486,9 @@ export const CommandItem = ({export const CommandGroupHeading = styled("div", {...textVariants.labels,- color: theme.colors.foregroundMoreSubtle,+ color: cssVar("--foreground-secondary"),display: "flex",- backgroundColor: theme.colors.backgroundControls,+ backgroundColor: cssVar("--background-primary"),gap: theme.spacing[5],alignItems: "center",paddingInline: theme.spacing[5],@@ -491,14 +497,14 @@ export const CommandGroupHeading = styled("div", {export const CommandGroupFooter = styled("div", {...textVariants.labels,- color: theme.colors.foregroundMoreSubtle,+ color: cssVar("--foreground-secondary"),display: "flex",gap: theme.spacing[5],alignItems: "center",paddingInline: theme.spacing[5],height: itemHeight,justifyContent: "end",- borderTop: `1px solid ${theme.colors.borderMain}`,+ borderTop: `1px solid ${cssVar("--border-default")}`,});export const CommandBackButton = ({ onClick }: { onClick?: () => void }) => {@@ -520,10 +526,10 @@ const CommandItemStyled = styled(CommandPrimitive.Item, {minHeight: itemHeight,paddingInline: theme.spacing[9],"&:hover": {- backgroundColor: theme.colors.backgroundItemMenuItemHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},"&[aria-selected=true]": {- backgroundColor: theme.colors.backgroundItemCurrent,+ backgroundColor: selectionBackground,},});diff --git a/packages/design-system/src/components/component-card.tsx b/packages/design-system/src/components/component-card.tsxindex 0e7b807474..f7d9c82662 100644--- a/packages/design-system/src/components/component-card.tsx+++ b/packages/design-system/src/components/component-card.tsx@@ -12,6 +12,7 @@ import {import { css, theme, type CSS } from "../stitches.config";import { textVariants } from "./text";import { Tooltip } from "./tooltip";+import { cssVar } from "../css-var";const cardStyle = css({boxSizing: "border-box",@@ -22,22 +23,22 @@ const cardStyle = css({padding: theme.spacing[3],aspectRatio: "1",border: `1px solid`,- borderColor: theme.colors.borderMain,- borderRadius: theme.borderRadius[2],+ borderColor: cssVar("--border-default"),+ borderRadius: theme.borderRadius[4],outline: "none",userSelect: "none",- color: theme.colors.foregroundIconMain,+ color: cssVar("--foreground-primary"),cursor: "grab",- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),"&:hover, &[data-state=hover]": {- background: theme.colors.backgroundHover,+ background: cssVar("--overlay-interaction-hover"),},"&[data-state=disabled]": {- background: theme.colors.backgroundPanel,- color: theme.colors.foregroundDisabled,+ background: cssVar("--background-primary"),+ color: cssVar("--foreground-disabled"),},"&:focus-visible, &[data-state=selected]": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},"& svg": {flexGrow: 0,diff --git a/packages/design-system/src/components/control-state-color.ts b/packages/design-system/src/components/control-state-color.tsnew file mode 100644index 0000000000..ca8be41ed3--- /dev/null+++ b/packages/design-system/src/components/control-state-color.ts@@ -0,0 +1,27 @@+import { cssVar } from "../css-var";++// Selected controls need more separation in dark mode, while remaining neutral.+// This is a component-state composition, not a theme parameter.+export const selectedControlBackground = `light-dark(+ color-mix(in oklab, ${cssVar("--background-primary")} 86%, ${cssVar(+ "--foreground-primary"+ )}),+ color-mix(in oklab, ${cssVar("--background-primary")} 78%, ${cssVar(+ "--foreground-primary"+ )})+)`;++export const withInteractionOverlay = (+ background: string,+ overlay = cssVar("--overlay-interaction-hover")+) => `linear-gradient(${overlay}, ${overlay}), ${background}`;++export const selectedControlHoverBackground = withInteractionOverlay(+ selectedControlBackground,+ cssVar("--overlay-interaction-hover")+);++export const selectedControlPressedBackground = withInteractionOverlay(+ selectedControlBackground,+ cssVar("--overlay-interaction-pressed")+);diff --git a/packages/design-system/src/components/css-value-list-item.tsx b/packages/design-system/src/components/css-value-list-item.tsxindex 3d839e6840..2effaf0860 100644--- a/packages/design-system/src/components/css-value-list-item.tsx+++ b/packages/design-system/src/components/css-value-list-item.tsx@@ -12,6 +12,7 @@ import { Box } from "./box";import { theme } from "../stitches.config";import { DragHandleIcon } from "@webstudio-is/icons";import { ArrowFocus } from "./primitives/arrow-focus";+import { cssVar } from "../css-var";const listItemAttribute = "data-list-item";const listItemAttributes = { [listItemAttribute]: true };@@ -20,7 +21,7 @@ const DragHandleIconStyled = styled(DragHandleIcon, {width: theme.spacing[7],visibility: "hidden",cursor: "grab",- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),flexShrink: 0,});@@ -94,7 +95,7 @@ const ItemButton = styled("button", {display: "flex",},outline: "none",- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},variants: {hidden: {@@ -130,7 +131,7 @@ const ItemWrapper = styled("div", {width: "100%","&:hover, &:focus-within, &[data-active=true]": {[`& ${ItemButton}`]: {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),[`&[data-draggable=true] ${DragHandleIconStyled}`]: {visibility: "visible",},diff --git a/packages/design-system/src/components/dialog.stories.tsx b/packages/design-system/src/components/dialog.stories.tsxindex 660156e011..421b7a9f6f 100644--- a/packages/design-system/src/components/dialog.stories.tsx+++ b/packages/design-system/src/components/dialog.stories.tsx@@ -37,7 +37,7 @@ const DialogDemo = () => (<StorySection title="Dialog"><Dialog defaultOpen><DialogTrigger asChild>- <Button>Open</Button>+ <Button color="primary">Open</Button></DialogTrigger><DialogContent><div className={bodyStyle()}>@@ -49,7 +49,7 @@ const DialogDemo = () => (<Button color="ghost">Cancel</Button></DialogClose><DialogClose>- <Button color="positive">Save</Button>+ <Button color="primary">Save</Button></DialogClose></div></div>@@ -68,7 +68,7 @@ export const ResizableDialog = () => (<StorySection title="Resizable dialog"><Dialog defaultOpen resize="both"><DialogTrigger asChild>- <Button>Open resizable</Button>+ <Button color="primary">Open resizable</Button></DialogTrigger><DialogContent><div className={bodyStyle()}>@@ -88,7 +88,7 @@ export const WithMaximize = () => (<StorySection title="With maximize"><Dialog defaultOpen resize="both"><DialogTrigger asChild>- <Button>Open maximizable</Button>+ <Button color="primary">Open maximizable</Button></DialogTrigger><DialogContent><div className={bodyStyle()}>@@ -118,7 +118,7 @@ export const WithActions = () => (<StorySection title="With actions"><Dialog defaultOpen><DialogTrigger asChild>- <Button>Open with actions</Button>+ <Button color="primary">Open with actions</Button></DialogTrigger><DialogContent><div className={bodyStyle()}>@@ -130,7 +130,7 @@ export const WithActions = () => (</div><DialogActions><DialogClose>- <Button color="positive">Save</Button>+ <Button color="primary">Save</Button></DialogClose><DialogClose><Button color="ghost">Cancel</Button>@@ -146,7 +146,7 @@ export const NonDraggable = () => (<StorySection title="Non-draggable"><Dialog defaultOpen draggable={false}><DialogTrigger asChild>- <Button>Open non-draggable</Button>+ <Button color="primary">Open non-draggable</Button></DialogTrigger><DialogContent><div className={bodyStyle()}>diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsxindex 1c98f3874b..f9f174bd0d 100644--- a/packages/design-system/src/components/dialog.tsx+++ b/packages/design-system/src/components/dialog.tsx@@ -24,6 +24,7 @@ import { Button } from "./button";import { XIcon, MaximizeIcon, MinimizeIcon } from "@webstudio-is/icons";import { Separator } from "./separator";import { Text } from "./text";+import { cssVar } from "../css-var";const DIALOG_TITLE_HEIGHT = 40;const DIALOG_MAXIMIZED_MARGIN = 20;@@ -43,8 +44,10 @@ if (placeholderImage) {}const panelStyle = css({+ boxSizing: "border-box",boxShadow: theme.shadows.panelSectionDropShadow,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[7],display: "flex",flexDirection: "column",@@ -726,7 +729,7 @@ export const DialogActions = ({ children }: { children: ReactNode }) => {// Styles specific to dialog// (as opposed to be common for all floating panels)const overlayStyle = css({- backgroundColor: "rgba(17, 24, 28, 0.66)",+ backgroundColor: cssVar("--overlay-scrim"),position: "fixed",inset: 0,});diff --git a/packages/design-system/src/components/dropdown-menu.stories.tsx b/packages/design-system/src/components/dropdown-menu.stories.tsxindex 3af33338f9..56eea64ba6 100644--- a/packages/design-system/src/components/dropdown-menu.stories.tsx+++ b/packages/design-system/src/components/dropdown-menu.stories.tsx@@ -31,7 +31,7 @@ export const DropdownMenu = () => {<Flex gap="9" css={{ padding: 100 }}><DropdownMenuComponent open><DropdownMenuTrigger asChild>- <Button>Items</Button>+ <Button color="primary">Items</Button></DropdownMenuTrigger><DropdownMenuContent><DropdownMenuItem>New file</DropdownMenuItem>@@ -44,7 +44,7 @@ export const DropdownMenu = () => {<DropdownMenuComponent open><DropdownMenuTrigger asChild>- <Button>Checkboxes</Button>+ <Button color="primary">Checkboxes</Button></DropdownMenuTrigger><DropdownMenuContent><DropdownMenuCheckboxItem checked={bold} onCheckedChange={setBold}>@@ -67,7 +67,7 @@ export const WithIcons = () => (<StorySection title="With icons"><DropdownMenuComponent defaultOpen><DropdownMenuTrigger asChild>- <Button>With icons</Button>+ <Button color="primary">With icons</Button></DropdownMenuTrigger><DropdownMenuContent><DropdownMenuItem icon={<CopyIcon />}>Copy</DropdownMenuItem>@@ -85,7 +85,7 @@ export const WithRadioGroup = () => {<StorySection title="With radio group"><DropdownMenuComponent defaultOpen><DropdownMenuTrigger asChild>- <Button>Radio group</Button>+ <Button color="primary">Radio group</Button></DropdownMenuTrigger><DropdownMenuContent><DropdownMenuLabel>Choose one</DropdownMenuLabel>@@ -110,7 +110,7 @@ export const WithSubMenu = () => (<StorySection title="With sub menu"><DropdownMenuComponent defaultOpen><DropdownMenuTrigger asChild>- <Button>Sub menu</Button>+ <Button color="primary">Sub menu</Button></DropdownMenuTrigger><DropdownMenuContent><DropdownMenuItem>Item one</DropdownMenuItem>diff --git a/packages/design-system/src/components/dropdown-menu.tsx b/packages/design-system/src/components/dropdown-menu.tsxindex 453b08ac8d..e37628323d 100644--- a/packages/design-system/src/components/dropdown-menu.tsx+++ b/packages/design-system/src/components/dropdown-menu.tsx@@ -9,7 +9,7 @@ import {} from "react";import { mergeRefs } from "@react-aria/utils";import { ChevronRightIcon } from "@webstudio-is/icons";-import { styled } from "../stitches.config";+import { rawTheme, styled } from "../stitches.config";import { focusFirstCollectionItem } from "../utilities";import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";import {@@ -37,7 +37,7 @@ const DropdownMenuContentStyled = styled(export const DropdownMenuContent = forwardRef<ElementRef<typeof DropdownMenuContentStyled>,ComponentProps<typeof DropdownMenuContentStyled> & { autoFocus?: boolean }->(({ autoFocus, ...props }, forwardedRef) => {+>(({ autoFocus, sideOffset, ...props }, forwardedRef) => {const [node, setNode] = useState<HTMLDivElement | null>(null);useEffect(() => {@@ -50,6 +50,7 @@ export const DropdownMenuContent = forwardRef<<DropdownMenuPrimitive.Portal><DropdownMenuContentStyled{...props}+ sideOffset={sideOffset ?? Number.parseFloat(rawTheme.spacing[5])}ref={mergeRefs(forwardedRef, setNode)}/></DropdownMenuPrimitive.Portal>diff --git a/packages/design-system/src/components/enhanced-tooltip.stories.tsx b/packages/design-system/src/components/enhanced-tooltip.stories.tsxindex 0f3fbfd2b7..d145760c51 100644--- a/packages/design-system/src/components/enhanced-tooltip.stories.tsx+++ b/packages/design-system/src/components/enhanced-tooltip.stories.tsx@@ -44,16 +44,16 @@ export const EnhancedTooltip = () => (<StorySection title="Side placements"><Flex gap="6" css={{ padding: 60 }}><EnhancedTooltipComponent content="Top" side="top" defaultOpen>- <Button>Top</Button>+ <Button color="primary">Top</Button></EnhancedTooltipComponent><EnhancedTooltipComponent content="Right" side="right" defaultOpen>- <Button>Right</Button>+ <Button color="primary">Right</Button></EnhancedTooltipComponent><EnhancedTooltipComponent content="Bottom" side="bottom" defaultOpen>- <Button>Bottom</Button>+ <Button color="primary">Bottom</Button></EnhancedTooltipComponent><EnhancedTooltipComponent content="Left" side="left" defaultOpen>- <Button>Left</Button>+ <Button color="primary">Left</Button></EnhancedTooltipComponent></Flex></StorySection>@@ -76,17 +76,17 @@ export const EnhancedTooltip = () => (align="start"defaultOpen>- <Button>Start</Button>+ <Button color="primary">Start</Button></EnhancedTooltipComponent><EnhancedTooltipComponentcontent="Aligned center"align="center"defaultOpen>- <Button>Center</Button>+ <Button color="primary">Center</Button></EnhancedTooltipComponent><EnhancedTooltipComponent content="Aligned end" align="end" defaultOpen>- <Button>End</Button>+ <Button color="primary">End</Button></EnhancedTooltipComponent></Flex></StorySection>diff --git a/packages/design-system/src/components/floating-panel.stories.tsx b/packages/design-system/src/components/floating-panel.stories.tsxindex ad2bb66021..c78ed3ba08 100644--- a/packages/design-system/src/components/floating-panel.stories.tsx+++ b/packages/design-system/src/components/floating-panel.stories.tsx@@ -37,7 +37,7 @@ export const LeftDefault = () => (title="Left (default)"content={<Text>Content</Text>}>- <Button>Open on the left</Button>+ <Button color="primary">Open on the left</Button></FloatingPanelComponent></Container></StorySection>@@ -52,7 +52,7 @@ export const RightStart = () => (title="Right"content={<Text>Content</Text>}>- <Button>Open on the right</Button>+ <Button color="primary">Open on the right</Button></FloatingPanelComponent></Container></StorySection>@@ -67,7 +67,7 @@ export const BottomWithin = () => (title="Bottom"content={<Text>Content</Text>}>- <Button>Open below</Button>+ <Button color="primary">Open below</Button></FloatingPanelComponent></Container></StorySection>@@ -84,7 +84,7 @@ export const Center = () => (title="Center"content={<Text>Content</Text>}>- <Button>Open screen-centered</Button>+ <Button color="primary">Open screen-centered</Button></FloatingPanelComponent></Container></StorySection>@@ -101,7 +101,7 @@ export const CustomOffsetAndSize = () => (title="Custom Offset & Size"content={<Text>Content</Text>}>- <Button>Open with custom offsets</Button>+ <Button color="primary">Open with custom offsets</Button></FloatingPanelComponent></Container></StorySection>@@ -116,7 +116,7 @@ export const WithTitleSuffix = () => (titleSuffix={<Button color="ghost" prefix={<CopyIcon />} />}content={<Text>Panel with a custom title suffix button</Text>}>- <Button>Open with title suffix</Button>+ <Button color="primary">Open with title suffix</Button></FloatingPanelComponent></Container></StorySection>@@ -131,7 +131,7 @@ export const PersistentPanel = () => (closeOnInteractOutside={false}content={<Text>This panel stays open when clicking outside</Text>}>- <Button>Open persistent</Button>+ <Button color="primary">Open persistent</Button></FloatingPanelComponent></Container></StorySection>diff --git a/packages/design-system/src/components/focus-ring.ts b/packages/design-system/src/components/focus-ring.tsindex 59bb921609..7907e8f29d 100644--- a/packages/design-system/src/components/focus-ring.ts+++ b/packages/design-system/src/components/focus-ring.ts@@ -1,3 +1,4 @@+import { cssVar } from "../css-var";import { theme, type CSS } from "../stitches.config";export const focusRingStyle = (props?: CSS) => ({@@ -7,7 +8,7 @@ export const focusRingStyle = (props?: CSS) => ({inset: theme.spacing[3],outlineWidth: 1,outlineStyle: "solid",- outlineColor: theme.colors.borderFocus,+ outlineColor: cssVar("--border-focus"),borderRadius: theme.borderRadius[3],pointerEvents: "none",...props,diff --git a/packages/design-system/src/components/form-control-contrast.browser.test.ts b/packages/design-system/src/components/form-control-contrast.browser.test.tsnew file mode 100644index 0000000000..4d442cd351--- /dev/null+++ b/packages/design-system/src/components/form-control-contrast.browser.test.ts@@ -0,0 +1,112 @@+import { createElement } from "react";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import "../colors/colors.css";+import { Checkbox } from "./checkbox";+import { Switch } from "./switch";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+ document.documentElement.removeAttribute("data-color-scheme");+});++const readColor = (color: string) => {+ const canvas = document.createElement("canvas");+ canvas.width = 1;+ canvas.height = 1;+ const context = canvas.getContext("2d", { willReadFrequently: true });+ if (context === null) {+ throw new Error("Canvas color evaluation is unavailable");+ }+ context.fillStyle = color;+ context.fillRect(0, 0, 1, 1);+ return Array.from(context.getImageData(0, 0, 1, 1).data);+};++const luminance = (color: number[]) => {+ const linearize = (channel: number) => {+ const value = channel / 255;+ return value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4;+ };+ return (+ 0.2126 * linearize(color[0]) ++ 0.7152 * linearize(color[1]) ++ 0.0722 * linearize(color[2])+ );+};++const contrast = (first: number[], second: number[]) => {+ const firstLuminance = luminance(first);+ const secondLuminance = luminance(second);+ return (+ (Math.max(firstLuminance, secondLuminance) + 0.05) /+ (Math.min(firstLuminance, secondLuminance) + 0.05)+ );+};++test("compact form controls have visible boundaries", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;+ act(() => {+ root?.render(+ createElement(+ "div",+ { style: { background: "var(--background-primary)" } },+ createElement(+ "div",+ { "data-control": "checkbox" },+ createElement(Checkbox, { "aria-label": "Checkbox" })+ ),+ createElement(+ "div",+ { "data-switch": true },+ createElement(Switch, { "aria-label": "Switch" })+ )+ )+ );+ });++ const background = getComputedStyle(+ container.firstElementChild as Element+ ).backgroundColor;+ const controls = container.querySelectorAll("[data-control]");+ for (const control of controls) {+ const boundary = control.firstElementChild;+ if (boundary === null) {+ throw new Error("Expected a form control boundary");+ }+ expect(+ contrast(+ readColor(getComputedStyle(boundary).borderColor),+ readColor(background)+ ),+ `${mode} ${control.getAttribute("data-control")}`+ ).toBeGreaterThanOrEqual(3);+ }++ const switchControl = container.querySelector("[data-switch] > button");+ if (switchControl === null) {+ throw new Error("Expected a switch");+ }+ expect(+ contrast(+ readColor(getComputedStyle(switchControl, "::before").backgroundColor),+ readColor(background)+ ),+ `${mode} switch`+ ).toBeGreaterThanOrEqual(3);+ }+});diff --git a/packages/design-system/src/components/form-control-style.ts b/packages/design-system/src/components/form-control-style.tsnew file mode 100644index 0000000000..133014181f--- /dev/null+++ b/packages/design-system/src/components/form-control-style.ts@@ -0,0 +1,6 @@+import { cssVar } from "../css-var";++// A resting control boundary must retain 3:1 contrast against its panel.+export const restingControlBoundary = `color-mix(in oklab, ${cssVar(+ "--foreground-primary"+)} 45%, ${cssVar("--background-primary")})`;diff --git a/packages/design-system/src/components/gradient-picker.tsx b/packages/design-system/src/components/gradient-picker.tsxindex 9b36250933..1e661e760b 100644--- a/packages/design-system/src/components/gradient-picker.tsx+++ b/packages/design-system/src/components/gradient-picker.tsx@@ -25,6 +25,13 @@ import { styled, theme } from "../stitches.config";import { Flex } from "./flex";import { Box } from "./box";import { ColorPicker } from "./color-picker";+import { cssVar, declareCssVar } from "../css-var";++const thumbBorderColor = declareCssVar("--thumb-border-color");++const transparencyChecker = `oklch(from ${cssVar(+ "--foreground-primary"+)} l c h / 22%)`;// Helper to mix two RGB colorsconst mixColors = (@@ -1014,7 +1021,7 @@ const SliderRoot = styled("div", {position: "relative",width: "100%",height: SLIDER_HEIGHT,- border: `1px solid ${theme.colors.borderMain}`,+ border: `1px solid ${cssVar("--border-default")}`,borderRadius: theme.borderRadius[3],touchAction: "none",userSelect: "none",@@ -1023,7 +1030,7 @@ const SliderRoot = styled("div", {content: '""',position: "absolute",inset: 0,- background: `repeating-conic-gradient(rgba(0,0,0,0.22) 0% 25%, transparent 0% 50%) 0% 33.33% / 40% 40%`,+ background: `repeating-conic-gradient(${transparencyChecker} 0% 25%, transparent 0% 50%) 0% 33.33% / 40% 40%`,pointerEvents: "none",backgroundSize: "10px 10px",zIndex: -1,@@ -1039,7 +1046,7 @@ const SliderRoot = styled("div", {},},"&:focus-visible": {- boxShadow: `0 0 0 1px ${theme.colors.borderFocus}`,+ boxShadow: `0 0 0 1px ${cssVar("--border-focus")}`,},});@@ -1052,14 +1059,14 @@ const SliderTrack = styled("div", {});const SliderThumb = styled(Box, {- "--thumb-border-color": theme.colors.borderMain,+ [thumbBorderColor]: cssVar("--border-default"),position: "absolute",display: "grid",placeItems: "center",bottom: `calc(100% + ${theme.spacing[6]})`,transform: "translateX(-50%)",borderRadius: theme.borderRadius[2],- boxShadow: `0 0 0 1px var(--thumb-border-color)`,+ boxShadow: `0 0 0 1px ${cssVar(thumbBorderColor)}`,outline: "none",zIndex: 1,cursor: "grab",@@ -1067,8 +1074,8 @@ const SliderThumb = styled(Box, {cursor: "grabbing",},"&:focus-visible, &[aria-selected=true]": {- "--thumb-border-color": theme.colors.borderFocus,- boxShadow: `0 0 0 1px ${theme.colors.borderFocus}`,+ [thumbBorderColor]: cssVar("--border-focus"),+ boxShadow: `0 0 0 1px ${cssVar("--border-focus")}`,},});@@ -1078,9 +1085,9 @@ const SliderThumbPointer = styled("div", {height: theme.spacing[3],left: "50%",bottom: 0,- background: "white",+ background: cssVar("--background-primary"),zIndex: -1,- border: `1px solid var(--thumb-border-color)`,+ border: `1px solid ${cssVar(thumbBorderColor)}`,borderTopColor: "transparent",borderLeftColor: "transparent",borderRadius: theme.borderRadius[1],@@ -1100,7 +1107,7 @@ const SliderHint = styled(Flex, {cursor: "grab",touchAction: "none",userSelect: "none",- color: "black",+ color: cssVar("--foreground-primary"),"&:active": {cursor: "grabbing",},diff --git a/packages/design-system/src/components/icon-button.tsx b/packages/design-system/src/components/icon-button.tsxindex 7c3fe3e36f..a47eda85ee 100644--- a/packages/design-system/src/components/icon-button.tsx+++ b/packages/design-system/src/components/icon-button.tsx@@ -6,16 +6,28 @@*/import { styled } from "../stitches.config";import { theme } from "../stitches.config";+import { cssVar } from "../css-var";+import { styleSourceColor } from "./style-source-color";+import {+ selectedControlBackground,+ selectedControlHoverBackground,+ selectedControlPressedBackground,+ withInteractionOverlay,+} from "./control-state-color";const openOrHoverStateStyle = {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),+};++const pressedStateStyle = {+ backgroundColor: cssVar("--overlay-interaction-pressed"),};const disabledVariantStyles = {"&:disabled, &[aria-disabled=true]": {- color: theme.colors.foregroundDisabled,- "&:hover": {- backgroundColor: theme.colors.backgroundHover,+ color: cssVar("--foreground-disabled"),+ "&:hover, &:active": {+ background: "transparent",},},};@@ -40,73 +52,116 @@ export const IconButton = styled("button", {outline: "none","&[data-focused=true], &:focus-visible": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},"&:disabled, &[aria-disabled=true]": {borderColor: "transparent",- backgroundColor: "transparent",+ background: "transparent",},// https://www.radix-ui.com/docs/primitives/components/popover#trigger"&[data-state=open]": openOrHoverStateStyle,variants: {+ size: {+ regular: {},+ large: {+ minWidth: theme.spacing[13],+ width: theme.spacing[13],+ height: theme.spacing[13],+ },+ },variant: {default: {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),+ "&[data-state=off]": {+ color: cssVar("--foreground-secondary"),+ },"&:hover, &[data-hovered=true]": openOrHoverStateStyle,+ "&:active": pressedStateStyle,// According to the design https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=4-3199&t=lpT9jFuaiUnz1Foa-0// only the default variant has different toggle state// https://www.radix-ui.com/docs/primitives/components/toggle#root- "&[data-state=on]": {- backgroundColor: theme.colors.backgroundPresetMain,- borderColor: theme.colors.borderMain,+ "&[data-state=on], &[aria-pressed=true], &[aria-selected=true], &[aria-checked=true]":+ {+ backgroundColor: cssVar("--overlay-interaction-hover"),+ borderColor: "transparent",- "&:hover, &[data-hovered=true]": openOrHoverStateStyle,- },+ "&:hover, &[data-hovered=true]": {+ background: cssVar("--overlay-interaction-pressed"),+ },+ "&:active": {+ background: cssVar("--overlay-interaction-pressed"),+ },+ },"&[data-focused=true], &:focus-visible": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},...disabledVariantStyles,},preset: {- backgroundColor: theme.colors.backgroundPresetMain,- borderColor: theme.colors.borderMain,- color: theme.colors.foregroundMain,+ backgroundColor: selectedControlBackground,+ borderColor: cssVar("--border-default"),+ color: cssVar("--foreground-primary"),"&:hover, &[data-hovered=true]": {- backgroundColor: theme.colors.backgroundPresetHover,+ background: selectedControlHoverBackground,+ },+ "&:active": {+ background: selectedControlPressedBackground,},...disabledVariantStyles,},local: {- backgroundColor: theme.colors.backgroundLocalMain,- borderColor: theme.colors.borderLocalMain,- color: theme.colors.foregroundLocalMain,+ backgroundColor: styleSourceColor.local.background,+ borderColor: styleSourceColor.local.border,+ color: styleSourceColor.local.foreground,"&:hover, &[data-hovered=true]": {- backgroundColor: theme.colors.backgroundLocalHover,+ background: withInteractionOverlay(styleSourceColor.local.background),+ },+ "&:active": {+ background: withInteractionOverlay(+ styleSourceColor.local.background,+ cssVar("--overlay-interaction-pressed")+ ),},...disabledVariantStyles,},overwritten: {- backgroundColor: theme.colors.backgroundOverwrittenMain,- borderColor: theme.colors.borderOverwrittenMain,- color: theme.colors.foregroundOverwrittenMain,+ backgroundColor: styleSourceColor.overwritten.background,+ borderColor: styleSourceColor.overwritten.border,+ color: styleSourceColor.overwritten.foreground,"&:hover, &[data-hovered=true]": {- backgroundColor: theme.colors.backgroundOverwrittenHover,+ background: withInteractionOverlay(+ styleSourceColor.overwritten.background+ ),+ },+ "&:active": {+ background: withInteractionOverlay(+ styleSourceColor.overwritten.background,+ cssVar("--overlay-interaction-pressed")+ ),},...disabledVariantStyles,},remote: {- backgroundColor: theme.colors.backgroundRemoteMain,- borderColor: theme.colors.borderRemoteMain,- color: theme.colors.foregroundRemoteMain,+ backgroundColor: styleSourceColor.remote.background,+ borderColor: styleSourceColor.remote.border,+ color: styleSourceColor.remote.foreground,"&:hover, &[data-hovered=true]": {- backgroundColor: theme.colors.backgroundRemoteHover,+ background: withInteractionOverlay(+ styleSourceColor.remote.background+ ),+ },+ "&:active": {+ background: withInteractionOverlay(+ styleSourceColor.remote.background,+ cssVar("--overlay-interaction-pressed")+ ),},...disabledVariantStyles,},@@ -117,6 +172,7 @@ export const IconButton = styled("button", {},defaultVariants: {+ size: "regular",variant: "default",},});diff --git a/packages/design-system/src/components/input-field.browser.test.ts b/packages/design-system/src/components/input-field.browser.test.tsnew file mode 100644index 0000000000..ef9459fd60--- /dev/null+++ b/packages/design-system/src/components/input-field.browser.test.ts@@ -0,0 +1,58 @@+import { createElement } from "react";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import { InputField } from "./input-field";+import { NestedIconLabel } from "./nested-icon-label";+import { NestedInputButton } from "./nested-input-button";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+});++test("compact input field fits nested controls inside its content box", () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ createElement(InputField, {+ size: "1",+ prefix: createElement(+ NestedIconLabel,+ { size: "1" },+ createElement("svg")+ ),+ suffix: createElement(NestedInputButton, { size: "1" }),+ })+ );+ });++ const inputField = container.querySelector(+ "[data-input-field-input]"+ )?.parentElement;+ const nestedControls = container.querySelectorAll("label, button");+ if (+ inputField === null ||+ inputField === undefined ||+ nestedControls.length !== 2+ ) {+ throw new Error("Expected a compact input field with two nested controls");+ }++ const availableHeight = inputField.getBoundingClientRect().height - 2;+ for (const nestedControl of nestedControls) {+ expect(nestedControl.getBoundingClientRect().height).toBeLessThanOrEqual(+ availableHeight+ );+ }+});diff --git a/packages/design-system/src/components/input-field.stories.tsx b/packages/design-system/src/components/input-field.stories.tsxindex 556a6fd5d1..a6902e4780 100644--- a/packages/design-system/src/components/input-field.stories.tsx+++ b/packages/design-system/src/components/input-field.stories.tsx@@ -7,6 +7,7 @@ import {import { NestedIconLabel } from "./nested-icon-label";import { NestedInputButton } from "./nested-input-button";import { StorySection, StoryGrid } from "./storybook";+import { cssVar } from "../css-var";export default {title: "Input Field",@@ -77,7 +78,13 @@ export const InputField = () => (<StoryGrid>{[300, 100].map((width) => (<>- <Flex css={{ width, background: "black", height: 4 }} />+ <Flex+ css={{+ width,+ background: cssVar("--foreground-primary"),+ height: 4,+ }}+ /><Flexcss={{ width, justifyItems: "stretch", flexDirection: "column" }}>@@ -112,8 +119,12 @@ export const InputField = () => (<InputFieldComponentdefaultValue="Size 1 with prefix"size="1"- prefix={prefix}- suffix={suffix}+ prefix={+ <NestedIconLabel size="1" color="local" tabIndex={-1}>+ <GapVerticalIcon />+ </NestedIconLabel>+ }+ suffix={<NestedInputButton size="1" tabIndex={-1} />}/></StoryGrid></StorySection>diff --git a/packages/design-system/src/components/input-field.tsx b/packages/design-system/src/components/input-field.tsxindex 0b380d20e2..256885c733 100644--- a/packages/design-system/src/components/input-field.tsx+++ b/packages/design-system/src/components/input-field.tsx@@ -17,6 +17,7 @@ import { css, theme, type CSS } from "../stitches.config";import { ArrowFocus } from "./primitives/arrow-focus";import { mergeRefs } from "@react-aria/utils";import { useFocusWithin } from "@react-aria/interactions";+import { cssVar } from "../css-var";// we only support types that behave more or less like a regular text inputexport const inputFieldTypes = [@@ -33,7 +34,7 @@ export const inputFieldColors = ["placeholder", "set", "error"] as const;const inputStyle = css({all: "unset",- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),flexGrow: 1,flexShrink: 1,minWidth: 0,@@ -42,12 +43,12 @@ const inputStyle = css({paddingLeft: theme.spacing[3],"&[data-color=placeholder]:not(:hover, :disabled, [aria-disabled=true], :focus), &::placeholder":{- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),},- "&[data-color=error]": { color: theme.colors.foregroundDestructive },+ "&[data-color=error]": { color: cssVar("--foreground-negative") },"&:disabled, &[aria-disabled=true]": {"&, &::placeholder": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},},'&[type="number"]': {@@ -82,23 +83,23 @@ const containerStyle = css({minWidth: 0,alignItems: "center",borderRadius: theme.borderRadius[4],- border: `solid 1px transparent`,- backgroundColor: theme.colors.backgroundControls,+ border: "solid 1px transparent",+ backgroundColor: cssVar("--background-secondary"),"&:hover": {- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),},"&:focus-within": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),outline: "none",},"&:has([data-input-field-input][data-color=error])": {- borderColor: theme.colors.borderDestructiveMain,+ borderColor: cssVar("--border-negative"),},"&:focus-within:has([data-color=error])": {- borderColor: theme.colors.borderDestructiveMain,+ borderColor: cssVar("--border-negative"),},"&:has([data-input-field-input]:is(:disabled, [aria-disabled=true]))": {- backgroundColor: theme.colors.backgroundInputDisabled,+ backgroundColor: cssVar("--background-disabled"),},variants: {diff --git a/packages/design-system/src/components/label.tsx b/packages/design-system/src/components/label.tsxindex 49c7048f1b..b40c80ca83 100644--- a/packages/design-system/src/components/label.tsx+++ b/packages/design-system/src/components/label.tsx@@ -8,6 +8,16 @@ import { forwardRef } from "react";import { textVariants } from "./text";import { styled, theme } from "../stitches.config";import { Label as RadixLabel } from "@radix-ui/react-label";+import { cssVar } from "../css-var";+import { styleSourceColor } from "./style-source-color";++// Label colors are composed locally from semantic theme inputs.+const presetBackground = cssVar("--border-default");++const withInteractionOverlay = (background: string) =>+ `linear-gradient(${cssVar("--overlay-interaction-hover")}, ${cssVar(+ "--overlay-interaction-hover"+ )}), ${background}`;export const labelColors = ["default",@@ -34,16 +44,16 @@ const StyledLabel = styled(RadixLabel, {border: "1px solid transparent",borderRadius: theme.borderRadius[3],transition: "150ms color, 150ms background-color",- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),// https://github.com/webstudio-is/webstudio/issues/1271#issuecomment-1478436340"&:focus-visible": {- outline: `2px solid ${theme.colors.borderFocus}`,+ outline: `2px solid ${cssVar("--border-focus")}`,outlineOffset: 1,},"&[aria-disabled=true]": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},variants: {@@ -57,44 +67,48 @@ const StyledLabel = styled(RadixLabel, {},color: {default: {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),"&:hover": {- backgroundColor: theme.colors.backgroundHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},},preset: {- backgroundColor: theme.colors.backgroundPresetMain,- color: theme.colors.foregroundTextSubtle,+ backgroundColor: presetBackground,+ color: cssVar("--foreground-secondary"),"&:hover": {- backgroundColor: theme.colors.backgroundPresetHover,+ background: withInteractionOverlay(presetBackground),},},local: {- backgroundColor: theme.colors.backgroundLocalMain,- color: theme.colors.foregroundLocalMain,+ backgroundColor: styleSourceColor.local.background,+ color: styleSourceColor.local.foreground,"&:hover": {- backgroundColor: theme.colors.backgroundLocalHover,+ background: withInteractionOverlay(styleSourceColor.local.background),},},overwritten: {- backgroundColor: theme.colors.backgroundOverwrittenMain,- color: theme.colors.foregroundOverwrittenMain,+ backgroundColor: styleSourceColor.overwritten.background,+ color: styleSourceColor.overwritten.foreground,"&:hover": {- backgroundColor: theme.colors.backgroundOverwrittenHover,+ background: withInteractionOverlay(+ styleSourceColor.overwritten.background+ ),},},remote: {- backgroundColor: theme.colors.backgroundRemoteMain,- color: theme.colors.foregroundRemoteMain,+ backgroundColor: styleSourceColor.remote.background,+ color: styleSourceColor.remote.foreground,"&:hover": {- backgroundColor: theme.colors.backgroundRemoteHover,+ background: withInteractionOverlay(+ styleSourceColor.remote.background+ ),},},// Example is collapsible section title label when section has no content.inactive: {- color: theme.colors.foregroundTextSubtle,+ color: cssVar("--foreground-secondary"),"&:hover": {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),},},},diff --git a/packages/design-system/src/components/link-button.stories.tsx b/packages/design-system/src/components/link-button.stories.tsxnew file mode 100644index 0000000000..e5d88ed0fc--- /dev/null+++ b/packages/design-system/src/components/link-button.stories.tsx@@ -0,0 +1,64 @@+import type { ComponentProps } from "react";+import { ExternalLinkIcon } from "@webstudio-is/icons";+import { LinkButton as LinkButtonComponent } from "./button";+import { StoryGrid, StorySection } from "./storybook";++export default {+ title: "Link Button",+};++const colors: ReadonlyArray<+ ComponentProps<typeof LinkButtonComponent>["color"]+> = ["primary", "neutral", "destructive", "neutral-destructive", "ghost"];++const states: ReadonlyArray<+ ComponentProps<typeof LinkButtonComponent>["state"]+> = ["auto", "hover", "focus", "pressed", "pending"];++export const LinkButton = () => (+ <>+ <StorySection title="Colors & States">+ <StoryGrid>+ {colors.map((color) => (+ <StoryGrid horizontal key={color}>+ {states.map((state) => (+ <LinkButtonComponent+ href="#link-button"+ state={state}+ color={color}+ key={state}+ >+ {color} {state}+ </LinkButtonComponent>+ ))}+ <LinkButtonComponent+ href="#link-button"+ color={color}+ aria-disabled+ >+ {color} disabled+ </LinkButtonComponent>+ </StoryGrid>+ ))}+ </StoryGrid>+ </StorySection>++ <StorySection title="Anchor properties">+ <StoryGrid horizontal>+ <LinkButtonComponent color="primary" href="#link-button">+ Internal link+ </LinkButtonComponent>+ <LinkButtonComponent+ href="https://webstudio.is"+ target="_blank"+ rel="noreferrer"+ suffix={<ExternalLinkIcon />}+ >+ External link+ </LinkButtonComponent>+ </StoryGrid>+ </StorySection>+ </>+);++undefined;diff --git a/packages/design-system/src/components/link.stories.tsx b/packages/design-system/src/components/link.stories.tsxindex f72d327a83..91ea72eb4d 100644--- a/packages/design-system/src/components/link.stories.tsx+++ b/packages/design-system/src/components/link.stories.tsx@@ -1,6 +1,7 @@import { Box } from "./box";import { Link } from "./link";import { StorySection, StoryGrid } from "./storybook";+import { cssVar } from "../css-var";export default {title: "Link",@@ -54,20 +55,20 @@ const LinkStory = () => (alignItems: "flex-start",}}>- <Link color="main" href="">- Main- </Link>- <Box css={{ backgroundColor: "black" }}>- <Link color="contrast" href="">- Contrast+ <Link href="">Default</Link>+ <Box+ css={{+ backgroundColor: cssVar("--background-inverse"),+ color: cssVar("--foreground-on-inverse"),+ }}+ >+ <Link color="inherit" href="">+ Inherited inverse</Link></Box><Link color="subtle" href="">Subtle</Link>- <Link color="moreSubtle" href="">- More Subtle- </Link><div style={{ color: "blue" }}><Link color="inherit" href="">Inheritdiff --git a/packages/design-system/src/components/link.tsx b/packages/design-system/src/components/link.tsxindex ca1b389ce8..b7d17e564c 100644--- a/packages/design-system/src/components/link.tsx+++ b/packages/design-system/src/components/link.tsx@@ -1,7 +1,8 @@import { forwardRef } from "react";-import { styled, theme } from "../stitches.config";+import { styled } from "../stitches.config";import { textVariants } from "./text";import { ExternalLinkIcon } from "@webstudio-is/icons";+import { cssVar } from "../css-var";export const IconLink = forwardRef<HTMLAnchorElement,@@ -14,15 +15,17 @@ export const IconLink = forwardRef<export const Link = styled("a", {cursor: "pointer",+ color: cssVar("--foreground-primary"),+ "&:hover, &:visited": { color: cssVar("--foreground-primary") },"&[aria-disabled=true]": {cursor: "default",- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),"&:hover, &:visited": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},},"&:focus-visible": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},variants: {variant: {@@ -42,21 +45,9 @@ export const Link = styled("a", {monoBold: textVariants.monoBoldLink,},color: {- main: {- color: theme.colors.foregroundMain,- "&:hover, &:visited": { color: theme.colors.foregroundMain },- },- contrast: {- color: theme.colors.foregroundContrastMain,- "&:hover, &:visited": { color: theme.colors.foregroundContrastMain },- },subtle: {- color: theme.colors.foregroundTextSubtle,- "&:hover, &:visited": { color: theme.colors.foregroundTextSubtle },- },- moreSubtle: {- color: theme.colors.foregroundTextMoreSubtle,- "&:hover, &:visited": { color: theme.colors.foregroundTextMoreSubtle },+ color: cssVar("--foreground-secondary"),+ "&:hover, &:visited": { color: cssVar("--foreground-secondary") },},inherit: {color: "inherit",@@ -89,7 +80,6 @@ export const Link = styled("a", {},defaultVariants: {variant: "regular",- color: "main",underline: "always",},});diff --git a/packages/design-system/src/components/list-position-indicator.stories.tsx b/packages/design-system/src/components/list-position-indicator.stories.tsxindex 099f3805c0..4f357e8122 100644--- a/packages/design-system/src/components/list-position-indicator.stories.tsx+++ b/packages/design-system/src/components/list-position-indicator.stories.tsx@@ -7,8 +7,8 @@ import { StorySection, StoryGrid } from "./storybook";export default {title: "List Position Indicator",parameters: {- // to make white outline visible- backgrounds: { default: "Maintenance Medium" },+ // Make the on-inverse outline visible.+ backgrounds: { default: "Inverse" },},};diff --git a/packages/design-system/src/components/list-position-indicator.tsx b/packages/design-system/src/components/list-position-indicator.tsxindex 58c64ff33e..25433ce18b 100644--- a/packages/design-system/src/components/list-position-indicator.tsx+++ b/packages/design-system/src/components/list-position-indicator.tsx@@ -4,7 +4,8 @@*/import { Box } from "./box";-import { styled, theme } from "../stitches.config";+import { styled } from "../stitches.config";+import { cssVar } from "../css-var";const CIRCLE_SIZE = 8;const LINE_THICKNESS = 2;@@ -27,7 +28,7 @@ const CircleOutline = styled(Box, {left: -CIRCLE_SIZE / 2 - OUTLINE_WIDTH,borderRadius: "50%",pointerEvents: "none",- backgroundColor: theme.colors.borderContrast,+ backgroundColor: cssVar("--foreground-on-accent"),});const Circle = styled(Box, {@@ -36,7 +37,7 @@ const Circle = styled(Box, {position: "absolute",top: -CIRCLE_SIZE / 2,left: -CIRCLE_SIZE / 2,- border: `2px solid ${theme.colors.backgroundPrimary}`,+ border: `2px solid ${cssVar("--background-accent")}`,borderRadius: "50%",pointerEvents: "none",});@@ -48,9 +49,9 @@ const Line = styled(Box, {left: 0,width: "100%",height: LINE_THICKNESS,- backgroundColor: theme.colors.backgroundPrimary,+ backgroundColor: cssVar("--background-accent"),pointerEvents: "none",- outline: `solid ${theme.colors.borderContrast}`,+ outline: `solid ${cssVar("--foreground-on-accent")}`,outlineWidth: OUTLINE_WIDTH,});diff --git a/packages/design-system/src/components/menu.stories.tsx b/packages/design-system/src/components/menu.stories.tsxindex d3d1c59011..bb9899ccbc 100644--- a/packages/design-system/src/components/menu.stories.tsx+++ b/packages/design-system/src/components/menu.stories.tsx@@ -61,7 +61,7 @@ const DropdownDemo = ({ withIndicator }: { withIndicator: boolean }) => {return (<DropdownMenu defaultOpen><DropdownMenuTrigger asChild>- <Button prefix={<EllipsesIcon />} />+ <Button color="primary" prefix={<EllipsesIcon />} /></DropdownMenuTrigger><DropdownMenuContent width="regular"><DropdownMenuLabel>Not choosable</DropdownMenuLabel>diff --git a/packages/design-system/src/components/menu.tsx b/packages/design-system/src/components/menu.tsxindex b638bdd21b..34d594c492 100644--- a/packages/design-system/src/components/menu.tsx+++ b/packages/design-system/src/components/menu.tsx@@ -23,11 +23,12 @@ import {SubContent,} from "@radix-ui/react-dropdown-menu";import { CheckMarkIcon, DotIcon } from "@webstudio-is/icons";-import type { ComponentProps } from "react";+import { forwardRef, type ComponentProps } from "react";import { truncate } from "../utilities";+import { cssVar } from "../css-var";export const labelCss = css(textVariants.titles, {- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),mx: theme.spacing[3],padding: theme.spacing[3],order: 1,@@ -55,7 +56,7 @@ export const menuItemCss = css({display: "flex",order: 1,alignItems: "center",- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),mx: itemMargin,padding: theme.spacing[3],borderRadius: theme.borderRadius[3],@@ -63,10 +64,10 @@ export const menuItemCss = css({backgroundColor: "transparent","&:focus, &[data-found], &[aria-selected=true], &[data-state=open], &[data-state=checked]:is(:hover,:focus)":{- backgroundColor: theme.colors.backgroundItemMenuItemHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},"&[data-disabled], &[aria-disabled], &[disabled]": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},variants: {text: {@@ -80,14 +81,14 @@ export const menuItemCss = css({},destructive: {true: {- color: theme.colors.foregroundDestructive,+ color: cssVar("--foreground-negative"),},},hint: {true: {...textVariants.labels,px: theme.spacing[5],- background: theme.colors.backgroundMenuHint,+ background: cssVar("--overlay-interaction-hover"),borderRadius: theme.borderRadius[2],overflow: "hidden","&::before": {@@ -97,7 +98,9 @@ export const menuItemCss = css({content: '""',width: 2,height: "100%",- background: theme.colors.backgroundGradientVertical,+ background: `linear-gradient(180deg, ${cssVar(+ "--background-accent"+ )}, oklch(from ${cssVar("--background-accent")} l c calc(h + 72)))`,},},},@@ -112,7 +115,7 @@ export const MenuItemButton = styled("button", menuItemCss, {width: `calc(100% - ${itemMargin} * 2)`,"&:focus:not(:focus-visible)": { backgroundColor: "unset" },"&:hover:not([diabled])": {- backgroundColor: theme.colors.backgroundItemMenuItemHover,+ backgroundColor: cssVar("--overlay-interaction-hover"),},});@@ -120,7 +123,7 @@ export const separatorCss = css({height: 1,minHeight: 1,my: theme.spacing[3],- backgroundColor: theme.colors.borderMain,+ backgroundColor: cssVar("--border-default"),order: 1,});@@ -130,9 +133,11 @@ const menuBorderWidth = "1px";export const menuCss = css({boxSizing: "border-box",borderRadius: theme.borderRadius[6],- backgroundColor: theme.colors.backgroundMenu,- border: `1px solid ${theme.colors.borderMain}`,- boxShadow: `${theme.shadows.menuDropShadow}, inset 0 0 0 1px ${theme.colors.borderMenuInner}`,+ backgroundColor: cssVar("--background-primary"),+ border: `1px solid ${cssVar("--border-default")}`,+ boxShadow: `${theme.shadows.menuDropShadow}, inset 0 0 0 1px ${cssVar(+ "--background-primary"+ )}`,padding: `${menuPadding} 0`,variants: {width: {@@ -157,22 +162,38 @@ export const subContentProps: Partial<ComponentProps<typeof SubContent>> = {// Arrow is hard to implement with just CSS,// so we implement it as a component-const ArrowBackground = styled("path", { fill: theme.colors.backgroundMenu });-const ArrowInnerBorder = styled("path", { fill: theme.colors.borderMenuInner });-const ArrowOuterBorder = styled("path", { fill: theme.colors.borderMain });-const ArrowSgv = styled("svg", { transform: "translateY(-3px)" });+const ArrowBackground = styled("path", {+ fill: cssVar("--background-primary"),+});+const ArrowInnerBorder = styled("path", {+ fill: cssVar("--background-primary"),+});+const ArrowOuterBorder = styled("path", { fill: cssVar("--border-default") });+const ArrowSvg = styled("svg", { transform: "translateY(-3px)" });+export const PanelArrowGraphic = forwardRef<+ SVGSVGElement,+ ComponentProps<typeof ArrowSvg>+>((props, ref) => (+ <ArrowSvg+ {...props}+ ref={ref}+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 16 11"+ >+ <ArrowOuterBorder d="M8.73 9.76a1 1 0 0 1-1.46 0L.5 2.54h15L8.73 9.76Z" />+ <ArrowInnerBorder d="M8.146 8.909a.2.2 0 0 1-.292 0L.5 1.065h15L8.146 8.909Z" />+ <ArrowBackground d="M8.073 7.52a.1.1 0 0 1-.146 0L.877 0h14.246l-7.05 7.52Z" />+ </ArrowSvg>+));+PanelArrowGraphic.displayName = "PanelArrowGraphic";export const DropdownMenuArrow = () => (<BaseDropdownMenuArrow width={16} height={11} asChild>- <ArrowSgv xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 11">- <ArrowOuterBorder d="M8.73 9.76a1 1 0 0 1-1.46 0L.5 2.54h15L8.73 9.76Z" />- <ArrowInnerBorder d="M8.146 8.909a.2.2 0 0 1-.292 0L.5 1.065h15L8.146 8.909Z" />- <ArrowBackground d="M8.073 7.52a.1.1 0 0 1-.146 0L.877 0h14.246l-7.05 7.52Z" />- </ArrowSgv>+ <PanelArrowGraphic /></BaseDropdownMenuArrow>);const setIconStyle = css({- color: theme.colors.foregroundPrimary,+ color: cssVar("--foreground-accent"),});// Icon for the "checked" state from Figmadiff --git a/packages/design-system/src/components/nested-icon-label.tsx b/packages/design-system/src/components/nested-icon-label.tsxindex 6446491e44..9eaa021aa6 100644--- a/packages/design-system/src/components/nested-icon-label.tsx+++ b/packages/design-system/src/components/nested-icon-label.tsx@@ -6,43 +6,53 @@import { forwardRef, type ComponentProps, type Ref } from "react";import { type CSS, css, theme } from "../stitches.config";import type { labelColors } from "./label";+import { cssVar } from "../css-var";+import { styleSourceColor } from "./style-source-color";++const presetBackground = cssVar("--border-default");+const withInteractionOverlay = (background: string) =>+ `linear-gradient(${cssVar("--overlay-interaction-hover")}, ${cssVar(+ "--overlay-interaction-hover"+ )}), ${background}`;const colors = {default: {border: "transparent",background: "transparent",- backgroundHover: theme.colors.backgroundHover,- icon: theme.colors.foregroundIconMain,+ backgroundHover: cssVar("--overlay-interaction-hover"),+ icon: cssVar("--foreground-primary"),},preset: {- border: theme.colors.borderMain,- background: theme.colors.backgroundPresetMain,- backgroundHover: theme.colors.backgroundPresetHover,- icon: theme.colors.foregroundIconMain,+ border: cssVar("--border-default"),+ background: presetBackground,+ backgroundHover: withInteractionOverlay(presetBackground),+ icon: cssVar("--foreground-primary"),},local: {- border: theme.colors.borderLocalMain,- background: theme.colors.backgroundLocalMain,- backgroundHover: theme.colors.backgroundLocalHover,- icon: theme.colors.foregroundLocalMain,+ border: styleSourceColor.local.border,+ background: styleSourceColor.local.background,+ backgroundHover: withInteractionOverlay(styleSourceColor.local.background),+ icon: styleSourceColor.local.foreground,},overwritten: {- border: theme.colors.borderOverwrittenMain,- background: theme.colors.backgroundOverwrittenMain,- backgroundHover: theme.colors.backgroundOverwrittenHover,- icon: theme.colors.foregroundOverwrittenMain,+ border: styleSourceColor.overwritten.border,+ background: styleSourceColor.overwritten.background,+ backgroundHover: withInteractionOverlay(+ styleSourceColor.overwritten.background+ ),+ icon: styleSourceColor.overwritten.foreground,},remote: {- border: theme.colors.borderRemoteMain,- background: theme.colors.backgroundRemoteMain,- backgroundHover: theme.colors.backgroundRemoteHover,- icon: theme.colors.foregroundRemoteMain,+ border: styleSourceColor.remote.border,+ background: styleSourceColor.remote.background,+ backgroundHover: withInteractionOverlay(styleSourceColor.remote.background),+ icon: styleSourceColor.remote.foreground,},inactive: {border: "transparent",background: "transparent",backgroundHover: "transparent",- icon: theme.colors.foregroundSubtle,+ icon: cssVar("--foreground-secondary"),},} as const;@@ -56,20 +66,32 @@ const perColorStyle = (color: (typeof labelColors)[number]) => ({background: colors[color].backgroundHover,},"&[data-state=disabled]": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},});const style = css({display: "flex",- width: theme.spacing[10],- height: theme.spacing[10],boxSizing: "border-box",alignItems: "center",justifyContent: "center",borderRadius: theme.borderRadius[2],border: "1px solid transparent",variants: {+ size: {+ 1: {+ width: theme.spacing[8],+ height: theme.spacing[8],+ "& > svg": {+ width: theme.spacing[7],+ height: theme.spacing[7],+ },+ },+ 2: {+ width: theme.spacing[10],+ height: theme.spacing[10],+ },+ },color: {default: perColorStyle("default"),preset: perColorStyle("preset"),@@ -79,7 +101,7 @@ const style = css({inactive: perColorStyle("inactive"),},},- defaultVariants: { color: "default" },+ defaultVariants: { color: "default", size: 2 },});type Props = ComponentProps<"label"> & {@@ -87,16 +109,17 @@ type Props = ComponentProps<"label"> & {color?: (typeof labelColors)[number];disabled?: boolean;hover?: boolean;+ size?: "1" | "2";};export const NestedIconLabel = forwardRef((- { css, className, color, disabled, hover, ...props }: Props,+ { css, className, color, disabled, hover, size, ...props }: Props,ref: Ref<HTMLLabelElement>) => (<label{...props}- className={style({ css, className, color })}+ className={style({ css, className, color, size })}data-state={disabled ? "disabled" : hover ? "hover" : undefined}ref={ref}/>diff --git a/packages/design-system/src/components/nested-input-button.tsx b/packages/design-system/src/components/nested-input-button.tsxindex f546aaccc7..a02d6dbe50 100644--- a/packages/design-system/src/components/nested-input-button.tsx+++ b/packages/design-system/src/components/nested-input-button.tsx@@ -7,6 +7,7 @@ import { ChevronDownIcon } from "@webstudio-is/icons";import { forwardRef, type ComponentProps, type Ref } from "react";import { textVariants } from "./text";import { type CSS, css, theme } from "../stitches.config";+import { cssVar } from "../css-var";// From Figma:// In production the unitless unit should be an en dash with a space before and after@@ -15,30 +16,41 @@ export const nestedSelectButtonUnitless = " – ";const style = css({all: "unset",...textVariants.unit,- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),borderRadius: theme.borderRadius[2],display: "flex",alignItems: "center",justifyContent: "center",whiteSpace: "pre", // to make nestedSelectButtonUnitless work as expected- height: theme.spacing[10],"&:not(:has(svg))": {paddingLeft: theme.spacing[2],paddingRight: theme.spacing[2],},"&[data-state=hover], &:not([data-state=open], :disabled, :focus-visible):hover":{- color: theme.colors.foregroundMain,- backgroundColor: theme.colors.backgroundHover,+ color: cssVar("--foreground-primary"),+ backgroundColor: cssVar("--overlay-interaction-hover"),},"&[data-state=open], &:focus-visible": {- color: theme.colors.foregroundContrastMain,- backgroundColor: theme.colors.backgroundActive,+ color: cssVar("--foreground-on-accent"),+ backgroundColor: cssVar("--background-accent"),},"&:disabled": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},variants: {+ size: {+ 1: {+ height: theme.spacing[8],+ "& > svg": {+ width: theme.spacing[7],+ height: theme.spacing[7],+ },+ },+ 2: {+ height: theme.spacing[10],+ },+ },/*** ChevronDownIcon is the only case when we have svg inside the button and width is not equal to height*/@@ -50,6 +62,7 @@ const style = css({},},},+ defaultVariants: { size: 2 },});export const NestedInputButton = forwardRef(@@ -58,8 +71,9 @@ export const NestedInputButton = forwardRef(css,className,children,+ size,...props- }: ComponentProps<"button"> & { css?: CSS },+ }: ComponentProps<"button"> & { css?: CSS; size?: "1" | "2" },ref: Ref<HTMLButtonElement>) => {return (@@ -68,6 +82,7 @@ export const NestedInputButton = forwardRef(css,className,hasChildren: children !== undefined,+ size,})}{...props}ref={ref}diff --git a/packages/design-system/src/components/panel-banner.stories.tsx b/packages/design-system/src/components/panel-banner.stories.tsxindex 82ebaa8be3..a30d57df06 100644--- a/packages/design-system/src/components/panel-banner.stories.tsx+++ b/packages/design-system/src/components/panel-banner.stories.tsx@@ -4,9 +4,8 @@ import {} from "./panel-banner";import { StoryGrid, StorySection } from "./storybook";import { Text } from "./text";-import { Link } from "./link";import { Flex } from "./flex";-import { buttonStyle } from "./button";+import { LinkButton } from "./button";import {AlertIcon,InfoCircleIcon,@@ -32,15 +31,13 @@ export const PanelBanner = () => {</Text>{" "}to add unlimited domains.</Text>- <Link- className={buttonStyle({ color: "gradient" })}- color="contrast"- underline="none"+ <LinkButton+ color="primary"href="https://webstudio.is/pricing"target="_blank">Upgrade- </Link>+ </LinkButton></PanelBannerComponent></StoryGrid></StorySection>diff --git a/packages/design-system/src/components/panel-banner.tsx b/packages/design-system/src/components/panel-banner.tsxindex 8c776ba4b6..b32ca67b5d 100644--- a/packages/design-system/src/components/panel-banner.tsx+++ b/packages/design-system/src/components/panel-banner.tsx@@ -1,36 +1,37 @@import { styled, theme } from "../stitches.config";import { Box } from "./box";+import { cssVar, declareCssVar } from "../css-var";-const iconColor = "--ws-panel-banner-icon-color";+const iconColor = declareCssVar("--panel-banner-icon-color");-export const panelBannerIconColor = `var(${iconColor})`;+export const panelBannerIconColor = cssVar(iconColor);export const PanelBanner = styled(Box, {display: "flex",gap: theme.spacing[7],flexDirection: "column",- backgroundColor: theme.colors.backgroundInfoNotification,+ backgroundColor: cssVar("--background-informative-subtle"),padding: theme.panel.padding,- [iconColor]: theme.colors.foregroundInfo,+ [iconColor]: cssVar("--foreground-informative"),variants: {variant: {info: {},warning: {- backgroundColor: theme.colors.backgroundAlertNotification,- [iconColor]: theme.colors.backgroundAlertMain,+ backgroundColor: cssVar("--background-warning-subtle"),+ [iconColor]: cssVar("--foreground-warning"),},error: {- backgroundColor: theme.colors.backgroundDestructiveNotification,- [iconColor]: theme.colors.foregroundDestructive,+ backgroundColor: cssVar("--background-negative-subtle"),+ [iconColor]: cssVar("--foreground-negative"),},success: {- backgroundColor: theme.colors.backgroundSuccessNotification,- [iconColor]: theme.colors.foregroundSuccess,+ backgroundColor: cssVar("--background-positive-subtle"),+ [iconColor]: cssVar("--foreground-positive"),},neutral: {- backgroundColor: theme.colors.backgroundNeutralNotification,- [iconColor]: theme.colors.foregroundMain,+ backgroundColor: cssVar("--background-secondary"),+ [iconColor]: cssVar("--foreground-primary"),},},},diff --git a/packages/design-system/src/components/panel-tabs.stories.tsx b/packages/design-system/src/components/panel-tabs.stories.tsxindex a1ddcd8171..c1562c4998 100644--- a/packages/design-system/src/components/panel-tabs.stories.tsx+++ b/packages/design-system/src/components/panel-tabs.stories.tsx@@ -8,13 +8,21 @@ import {import { Box } from "./box";import { Text } from "./text";import { theme } from "../stitches.config";+import { cssVar } from "../css-var";export default {title: "Panel Tabs",};const Wrap = ({ children }: { children: React.ReactNode }) => (- <div style={{ width: 240, border: "dashed 3px #e3e3e3" }}>{children}</div>+ <div+ style={{+ width: 240,+ border: `dashed 3px ${cssVar("--border-default")}`,+ }}+ >+ {children}+ </div>);const Content = ({ children }: { children: React.ReactNode }) => (diff --git a/packages/design-system/src/components/panel-tabs.tsx b/packages/design-system/src/components/panel-tabs.tsxindex 52cecb86a5..4a6104c8c3 100644--- a/packages/design-system/src/components/panel-tabs.tsx+++ b/packages/design-system/src/components/panel-tabs.tsx@@ -6,6 +6,7 @@import * as Primitive from "@radix-ui/react-tabs";import { textVariants } from "./text";import { styled, theme } from "../stitches.config";+import { cssVar } from "../css-var";export const PanelTabs = styled(Primitive.Root, {display: "flex",@@ -20,22 +21,26 @@ export const PanelTabsList = styled(Primitive.List, {export const PanelTabsTrigger = styled(Primitive.Trigger, {all: "unset", // reset <button>- ...textVariants.titles,- color: theme.colors.foregroundTextMoreSubtle,+ ...textVariants.labels,+ color: cssVar("--foreground-secondary"),padding: theme.spacing[3],borderRadius: theme.borderRadius[4],"&:hover": {- backgroundColor: theme.colors.backgroundHover,- color: theme.colors.foregroundMain,+ backgroundColor: cssVar("--overlay-interaction-hover"),+ color: cssVar("--foreground-primary"),},"&:focus-visible": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: "-1px",},- "&[data-state=active]": { color: theme.colors.foregroundMain },+ "&[data-state=active]": {+ color: cssVar("--foreground-primary"),+ fontWeight: 600,+ },+ "&:disabled": { color: cssVar("--foreground-disabled") },});export const PanelTabsContent = styled(Primitive.Content, {diff --git a/packages/design-system/src/components/panel-title.stories.tsx b/packages/design-system/src/components/panel-title.stories.tsxindex beb351992c..7f66307e36 100644--- a/packages/design-system/src/components/panel-title.stories.tsx+++ b/packages/design-system/src/components/panel-title.stories.tsx@@ -41,7 +41,7 @@ export const PanelTitle = () => (<Button prefix={<XIcon />} color="ghost" /><Button prefix={<CopyIcon />} color="ghost" /><TitleSuffixSpacer />- <Button>Button</Button>+ <Button color="primary">Button</Button></>}>diff --git a/packages/design-system/src/components/popover.stories.tsx b/packages/design-system/src/components/popover.stories.tsxindex a7e1613011..05ff92f013 100644--- a/packages/design-system/src/components/popover.stories.tsx+++ b/packages/design-system/src/components/popover.stories.tsx@@ -22,7 +22,7 @@ const PopoverDemo = () => (<StorySection title="Popover"><Popover defaultOpen><PopoverTrigger asChild>- <Button>Open</Button>+ <Button color="primary">Open</Button></PopoverTrigger><PopoverContent><Flex css={{ padding: theme.spacing[7] }}>@@ -44,7 +44,7 @@ export const WithTitle = () => (<StorySection title="With title"><Popover defaultOpen><PopoverTrigger asChild>- <Button>Open</Button>+ <Button color="primary">Open</Button></PopoverTrigger><PopoverContent><Flex direction="column" gap="2" style={{ padding: 12 }}>@@ -60,7 +60,7 @@ export const WithTitleActions = () => (<StorySection title="With title actions"><Popover defaultOpen><PopoverTrigger asChild>- <Button>Open</Button>+ <Button color="primary">Open</Button></PopoverTrigger><PopoverContent><Flex direction="column" gap="2" style={{ padding: 12 }}>@@ -85,7 +85,7 @@ export const SideRight = () => (<Flex style={{ padding: 100 }}><Popover defaultOpen><PopoverTrigger asChild>- <Button>Right</Button>+ <Button color="primary">Right</Button></PopoverTrigger><PopoverContent side="right"><Flex direction="column" gap="2" style={{ padding: 12 }}>@@ -102,7 +102,7 @@ export const SideTop = () => (<Flex style={{ padding: 100 }}><Popover defaultOpen><PopoverTrigger asChild>- <Button>Top</Button>+ <Button color="primary">Top</Button></PopoverTrigger><PopoverContent side="top"><Flex direction="column" gap="2" style={{ padding: 12 }}>@@ -119,7 +119,7 @@ export const SideBottomWithOffset = () => (<Flex style={{ padding: 100 }}><Popover defaultOpen><PopoverTrigger asChild>- <Button>Bottom</Button>+ <Button color="primary">Bottom</Button></PopoverTrigger><PopoverContent side="bottom" sideOffset={16}><Flex direction="column" gap="2" style={{ padding: 12 }}>diff --git a/packages/design-system/src/components/popover.tsx b/packages/design-system/src/components/popover.tsxindex 5c333e5ccd..520f50ad92 100644--- a/packages/design-system/src/components/popover.tsx+++ b/packages/design-system/src/components/popover.tsx@@ -5,12 +5,13 @@ import {forwardRef,} from "react";import * as Primitive from "@radix-ui/react-popover";-import { css, theme, styled, type CSS } from "../stitches.config";+import { css, rawTheme, theme, styled, type CSS } from "../stitches.config";import { Separator } from "./separator";import { PanelTitle } from "./panel-title";import { Flex } from "./flex";import { Button } from "./button";import { XIcon } from "@webstudio-is/icons";+import { cssVar } from "../css-var";export const Popover = Primitive.Root;@@ -19,9 +20,11 @@ export const PopoverPortal = Primitive.Portal;export const PopoverAnchor = Primitive.Anchor;const contentStyle = css({- border: `1px solid ${theme.colors.borderMain}`,- boxShadow: `${theme.shadows.menuDropShadow}, inset 0 0 0 1px ${theme.colors.borderMenuInner}`,- background: theme.colors.backgroundMenu,+ border: `1px solid ${cssVar("--border-default")}`,+ boxShadow: `${theme.shadows.menuDropShadow}, inset 0 0 0 1px ${cssVar(+ "--background-primary"+ )}`,+ background: cssVar("--background-primary"),borderRadius: theme.borderRadius[6],display: "flex",flexDirection: "column",@@ -74,7 +77,7 @@ export const PopoverContent = forwardRef() => (<Primitive.Portal><Primitive.Content- sideOffset={sideOffset ?? 4}+ sideOffset={sideOffset ?? Number.parseFloat(rawTheme.spacing[5])}collisionPadding={4}className={contentStyle({ className, css })}{...props}diff --git a/packages/design-system/src/components/position-grid.tsx b/packages/design-system/src/components/position-grid.tsxindex cdad200526..c7fa95167f 100644--- a/packages/design-system/src/components/position-grid.tsx+++ b/packages/design-system/src/components/position-grid.tsx@@ -2,12 +2,19 @@ import { type KeyboardEventHandler, useState } from "react";import { css, theme } from "../stitches.config";import { Box } from "./box";import { Grid } from "./grid";+import { cssVar } from "../css-var";// oxfmt-ignoreconst positions = [- [0, 0], [50, 0], [100, 0],- [0, 50], [50, 50], [100, 50],- [0, 100], [50, 100], [100, 100],+ [0, 0],+ [50, 0],+ [100, 0],+ [0, 50],+ [50, 50],+ [100, 50],+ [0, 100],+ [50, 100],+ [100, 100],];type Position = { y: number; x: number };@@ -32,7 +39,7 @@ const toNumericPosition = (position?: MixedPosition) => {};const containerStyle = css({- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),padding: theme.spacing[3],width: "fit-content",borderRadius: theme.borderRadius[4],@@ -45,14 +52,14 @@ const containerStyle = css({"x x x"`,"&[data-focused=true], &:focus-visible": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},});const dotStyle = css({padding: theme.spacing[4],margin: 1,- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),border: `1px solid transparent`,borderRadius: theme.borderRadius[4],outline: "none",@@ -62,17 +69,21 @@ const dotStyle = css({display: "block",width: theme.spacing[3],height: theme.spacing[3],- background: theme.colors.foregroundGridControlsDot,+ background: `color-mix(in oklab, ${cssVar(+ "--foreground-secondary"+ )} 45%, ${cssVar("--background-primary")})`,borderRadius: "50%",},"&[data-selected=true], &:hover": {- background: theme.colors.foregroundGridControlsFlexHover,+ background: cssVar("--overlay-interaction-hover"),"&::before": {- background: theme.colors.foregroundGridControlsDotHover,+ background: `color-mix(in oklab, ${cssVar(+ "--foreground-secondary"+ )} 88%, ${cssVar("--background-primary")})`,},},"&[data-focused=true]": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},});diff --git a/packages/design-system/src/components/primitives/dnd/canvas.stories.tsx b/packages/design-system/src/components/primitives/dnd/canvas.stories.tsxindex 559a60dc26..882860a5b5 100644--- a/packages/design-system/src/components/primitives/dnd/canvas.stories.tsx+++ b/packages/design-system/src/components/primitives/dnd/canvas.stories.tsx@@ -9,10 +9,13 @@ import {PlacementIndicator,} from "./placement-indicator";import { useAutoScroll } from "./use-auto-scroll";-import { theme } from "../../../stitches.config";+import { cssVar } from "../../../css-var";import type { Placement } from "./geometry-utils";const ROOT_ID = "root";+const canvasItemBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 93%, ${cssVar("--foreground-primary")})`;type ItemData = {id: string;@@ -36,8 +39,8 @@ const Item = ({minHeight: 100,margin: 10,padding: 10,- background: theme.colors.backgroundCanvas,- border: `1px solid ${theme.colors.borderContrast}`,+ background: canvasItemBackground,+ border: `1px solid ${cssVar("--border-default")}`,}}style={data.style}data-id={data.id}@@ -328,7 +331,7 @@ export const Canvas = () => {<StorySection title="Canvas"><Boxcss={{- background: "white",+ background: cssVar("--background-primary"),padding: 10,width: 500,height: 500,diff --git a/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx b/packages/design-system/src/components/primitives/dnd/placement-indicator.tsxindex 0d2be6f445..2d0bae66fa 100644--- a/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx+++ b/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx@@ -1,5 +1,6 @@import { Box } from "../../box";-import { css, theme } from "../../../stitches.config";+import { css } from "../../../stitches.config";+import { cssVar } from "../../../css-var";import {type ChildrenOrientation,type Placement,@@ -13,7 +14,7 @@ import { defaultGetValidChildren, type DropTarget } from "./use-drop";const placementStyle = css({boxSizing: "content-box",position: "absolute",- background: theme.colors.backgroundPrimary,+ background: cssVar("--background-accent"),pointerEvents: "none",});diff --git a/packages/design-system/src/components/primitives/dnd/sortable-list.stories.tsx b/packages/design-system/src/components/primitives/dnd/sortable-list.stories.tsxindex 4e123eb129..3c7eb9d94a 100644--- a/packages/design-system/src/components/primitives/dnd/sortable-list.stories.tsx+++ b/packages/design-system/src/components/primitives/dnd/sortable-list.stories.tsx@@ -3,6 +3,7 @@ import { useState, useRef } from "react";import { StorySection } from "../../storybook";import { Box } from "../../box";import { styled } from "../../../stitches.config";+import { cssVar } from "../../../css-var";import { useDrop, type DropTarget } from "./use-drop";import { useDrag } from "./use-drag";import {@@ -10,15 +11,18 @@ import {PlacementIndicator,} from "./placement-indicator";import { useAutoScroll } from "./use-auto-scroll";-import { theme } from "../../../stitches.config";import type { Placement } from "./geometry-utils";type ItemData = { id: string; text: string };+const listItemBackground = `color-mix(in oklab, ${cssVar(+ "--foreground-secondary"+)} 55%, ${cssVar("--background-primary")})`;+const ListItem = styled("li", {display: "block",margin: 10,- background: theme.colors.foregroundMoreSubtle,+ background: listItemBackground,padding: 10,userSelect: "none",});@@ -160,8 +164,8 @@ export const SortableList = ({height: direction === "horizontal" ? "auto" : 500,width: direction === "horizontal" ? 500 : 200,overflow: "auto",- background: "white",- color: "black",+ background: cssVar("--background-primary"),+ color: cssVar("--foreground-primary"),// these are needed to make scroll work with column-reverse/row-reverse belowdisplay: "flex",diff --git a/packages/design-system/src/components/primitives/numeric-gesture-control.ts b/packages/design-system/src/components/primitives/numeric-gesture-control.tsindex db2872bf01..70b6038ab1 100644--- a/packages/design-system/src/components/primitives/numeric-gesture-control.ts+++ b/packages/design-system/src/components/primitives/numeric-gesture-control.ts@@ -16,6 +16,11 @@import { clamp } from "@react-aria/utils";import { css } from "../../stitches.config";+import { cssVar } from "../../css-var";++const cursorForeground = cssVar("--foreground-primary");+const cursorBackground = cssVar("--background-primary");+const cursorShadow = `oklch(from ${cursorForeground} l c h / 40%)`;const scrubUI = css({"*": {@@ -491,8 +496,8 @@ const requestPointerLock = (`<svg id="numeric-guesture-control-cursor" version="1.1" xmlns="http://www.w3.org/2000/svg" width="46" height="15"><g transform="translate(2 3)">- <path d="M 15 4.5L 15 2L 11.5 5.5L 15 9L 15 6.5L 31 6.5L 31 9L 34.5 5.5L 31 2L 31 4.5Z" fill="#111" fill-rule="evenodd" stroke="#FFF" stroke-width="2"></path>- <path d="M 15 4.5L 15 2L 11.5 5.5L 15 9L 15 6.5L 31 6.5L 31 9L 34.5 5.5L 31 2L 31 4.5Z" fill="#111" fill-rule="evenodd"></path>+ <path d="M 15 4.5L 15 2L 11.5 5.5L 15 9L 15 6.5L 31 6.5L 31 9L 34.5 5.5L 31 2L 31 4.5Z" fill="${cursorForeground}" fill-rule="evenodd" stroke="${cursorBackground}" stroke-width="2"></path>+ <path d="M 15 4.5L 15 2L 11.5 5.5L 15 9L 15 6.5L 31 6.5L 31 9L 34.5 5.5L 31 2L 31 4.5Z" fill="${cursorForeground}" fill-rule="evenodd"></path></g></svg>`,"application/xml"@@ -500,7 +505,7 @@ const requestPointerLock = (cursorNode.style.filter = `drop-shadow(${state.direction === "horizontal" ? "0 1px" : "1px 0"- } 1.1px rgba(0,0,0,.4))`;+ } 1.1px ${cursorShadow})`;cursorNode.style.position = "fixed";cursorNode.style.zIndex = Number.MAX_SAFE_INTEGER.toString();diff --git a/packages/design-system/src/components/primitives/small-button.tsx b/packages/design-system/src/components/primitives/small-button.tsxindex 3b97aae1b5..7ab2bea0a5 100644--- a/packages/design-system/src/components/primitives/small-button.tsx+++ b/packages/design-system/src/components/primitives/small-button.tsx@@ -5,6 +5,11 @@ import {type ReactNode,} from "react";import { css, theme, type CSS } from "../../stitches.config";+import { cssVar } from "../../css-var";+import {+ selectedControlBackground,+ withInteractionOverlay,+} from "../control-state-color";export const smallButtonVariants = ["normal",@@ -18,32 +23,72 @@ export const smallButtonVariants = [**/const smallButtonStates = ["open"] as const;+const contrastForeground = `light-dark(${cssVar(+ "--foreground-on-inverse"+)}, ${cssVar("--foreground-primary")})`;+const defaultColors = {- normal: theme.colors.foregroundSubtle,- destructive: theme.colors.foregroundSubtle,- contrast: theme.colors.foregroundContrastMain,+ normal: cssVar("--foreground-secondary"),+ destructive: cssVar("--foreground-secondary"),+ contrast: contrastForeground,};const hoverColors = {- normal: theme.colors.foregroundMain,- destructive: theme.colors.foregroundDestructive,- contrast: theme.colors.foregroundContrastMain,+ normal: cssVar("--foreground-primary"),+ destructive: cssVar("--foreground-negative"),+ contrast: contrastForeground,};const focusColors = {- normal: theme.colors.borderFocus,- destructive: theme.colors.borderFocus,- contrast: theme.colors.borderContrast,+ normal: cssVar("--border-focus"),+ destructive: cssVar("--border-focus"),+ contrast: contrastForeground,+};++const selectedBackgrounds = {+ normal: selectedControlBackground,+ destructive: selectedControlBackground,+ contrast: "color-mix(in oklab, currentColor 22%, transparent)",+};++const hoverOverlays = {+ normal: cssVar("--overlay-interaction-hover"),+ destructive: cssVar("--overlay-interaction-hover"),+ contrast: cssVar("--overlay-on-inverse-hover"),+};++const pressedOverlays = {+ normal: cssVar("--overlay-interaction-pressed"),+ destructive: cssVar("--overlay-interaction-pressed"),+ contrast: cssVar("--overlay-on-inverse-pressed"),};const perVariantStyle = (variant: (typeof smallButtonVariants)[number]) => ({color: defaultColors[variant],+ "&[data-state=on]": {+ color: hoverColors[variant],+ background: selectedBackgrounds[variant],+ borderRadius: theme.borderRadius[3],+ },+ "&[data-state=on]:hover": {+ background: withInteractionOverlay(+ selectedBackgrounds[variant],+ hoverOverlays[variant]+ ),+ },+ "&[data-state=on]:active": {+ background: withInteractionOverlay(+ selectedBackgrounds[variant],+ pressedOverlays[variant]+ ),+ },+"&:hover, &[data-state=open]": {color: hoverColors[variant],"&:disabled, &[data-disabled]": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},},"&[data-focused=true], &:focus-visible": {@@ -61,7 +106,7 @@ const style = css({height: theme.spacing[9],position: "relative","&:disabled, &[data-disabled]": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},variants: {variant: {diff --git a/packages/design-system/src/components/progress.stories.tsx b/packages/design-system/src/components/progress.stories.tsxindex 465ba6eb6c..392fdaf6f3 100644--- a/packages/design-system/src/components/progress.stories.tsx+++ b/packages/design-system/src/components/progress.stories.tsx@@ -25,10 +25,16 @@ export const Progress = () => {))}<Flex gap="2" align="center"><ProgressComponent value={value} />- <Button onClick={() => setValue(Math.max(0, value - 10))}>+ <Button+ color="primary"+ onClick={() => setValue(Math.max(0, value - 10))}+ >-10</Button>- <Button onClick={() => setValue(Math.min(100, value + 10))}>+ <Button+ color="primary"+ onClick={() => setValue(Math.min(100, value + 10))}+ >+10</Button></Flex>@@ -42,9 +48,15 @@ export const Progress = () => {transitionDuration="1000ms"/><Flex gap="2">- <Button onClick={() => setTransitionValue(0)}>0%</Button>- <Button onClick={() => setTransitionValue(50)}>50%</Button>- <Button onClick={() => setTransitionValue(100)}>100%</Button>+ <Button color="primary" onClick={() => setTransitionValue(0)}>+ 0%+ </Button>+ <Button color="primary" onClick={() => setTransitionValue(50)}>+ 50%+ </Button>+ <Button color="primary" onClick={() => setTransitionValue(100)}>+ 100%+ </Button></Flex></StoryGrid></StorySection>diff --git a/packages/design-system/src/components/progress.tsx b/packages/design-system/src/components/progress.tsxindex a6c502107f..c999ed8f47 100644--- a/packages/design-system/src/components/progress.tsx+++ b/packages/design-system/src/components/progress.tsx@@ -1,20 +1,20 @@import { Root, Indicator } from "@radix-ui/react-progress";-import { css, theme } from "../stitches.config";+import { css, type CSS } from "../stitches.config";import type { TransitionEventHandler } from "react";+import { cssVar } from "../css-var";const rootStyle = css({width: 200,height: 2,overflow: "hidden",borderRadius: 9999,- background: "#fff",- boxShadow: "0 0 32px #4a4efa80",+ background: cssVar("--background-secondary"),});const indicatorStyle = css({width: "100%",height: "100%",- background: theme.colors.brandBorderNavbar,+ background: cssVar("--background-accent"),transitionDuration: "200ms",transitionProperty: "transform",});@@ -23,15 +23,19 @@ export const Progress = ({value,transitionDuration,onTransitionEnd,+ css,+ indicatorCss,}: {value: number;transitionDuration?: string;onTransitionEnd?: TransitionEventHandler;+ css?: CSS;+ indicatorCss?: CSS;}) => {return (- <Root value={value} className={rootStyle()}>+ <Root value={value} className={rootStyle({ css })}><Indicator- className={indicatorStyle()}+ className={indicatorStyle({ css: indicatorCss })}style={{transform: `translateX(-${100 - value}%)`,transitionDuration,diff --git a/packages/design-system/src/components/radio.tsx b/packages/design-system/src/components/radio.tsxindex 5ced72c702..24f3a67c34 100644--- a/packages/design-system/src/components/radio.tsx+++ b/packages/design-system/src/components/radio.tsx@@ -7,6 +7,7 @@ import { forwardRef, type ComponentProps, type Ref } from "react";import { RadioUncheckedIcon, RadioCheckedIcon } from "@webstudio-is/icons";import * as Primitive from "@radix-ui/react-radio-group";import { type CSS, css, theme } from "../stitches.config";+import { cssVar } from "../css-var";export { CheckboxAndLabel as RadioAndLabel } from "./checkbox";@@ -17,19 +18,19 @@ const itemStyle = css({display: "block",position: "relative",borderRadius: theme.borderRadius.round,- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),"&:focus-visible": {- outline: `2px solid ${theme.colors.borderFocus}`,+ outline: `2px solid ${cssVar("--border-focus")}`,},"&[data-state=checked]": {- color: theme.colors.foregroundPrimary,+ color: cssVar("--foreground-accent"),},// [data-state] is needed to make selector specificity higher"&[data-state]:disabled": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},"&:not(:disabled)::before": {@@ -41,7 +42,7 @@ const itemStyle = css({top: theme.spacing[2],left: theme.spacing[2],borderRadius: theme.borderRadius.round,- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),},});diff --git a/packages/design-system/src/components/scroll-area.stories.tsx b/packages/design-system/src/components/scroll-area.stories.tsxindex 03995569a7..473fed0bf4 100644--- a/packages/design-system/src/components/scroll-area.stories.tsx+++ b/packages/design-system/src/components/scroll-area.stories.tsx@@ -1,8 +1,8 @@import { StorySection } from "./storybook";import { ScrollArea as ScrollAreaComponent } from "./scroll-area";import { Text } from "./text";-import { theme } from "..";import { Flex } from "./flex";+import { cssVar } from "../css-var";export default {title: "Scroll Area",@@ -21,7 +21,7 @@ export const ScrollArea = () => {const css = {height: 100,width: 100,- background: theme.colors.backgroundPanel,+ background: cssVar("--background-primary"),};return (<>diff --git a/packages/design-system/src/components/scroll-area.tsx b/packages/design-system/src/components/scroll-area.tsxindex 9a1b1b696d..265c73ec18 100644--- a/packages/design-system/src/components/scroll-area.tsx+++ b/packages/design-system/src/components/scroll-area.tsx@@ -1,6 +1,13 @@import { forwardRef, type ComponentProps, type Ref } from "react";import { styled, theme, css, type CSS } from "../stitches.config";import { Root, Viewport, Scrollbar, Thumb } from "@radix-ui/react-scroll-area";+import { cssVar, declareCssVar } from "../css-var";++const scrollAreaThumbHeight = declareCssVar("--radix-scroll-area-thumb-height");++const scrollbarColor = `oklch(from ${cssVar(+ "--foreground-secondary"+)} l c h / 27%)`;const ScrollAreaRoot = styled(Root, {boxSizing: "border-box",@@ -13,7 +20,7 @@ const ScrollAreaRoot = styled(Root, {const ScrollAreaThumb = styled(Thumb, {position: "relative",boxSizing: "border-box",- background: theme.colors.foregroundScrollBar,+ background: scrollbarColor,borderRadius: theme.spacing[4],});@@ -30,7 +37,7 @@ const ScrollAreaScrollbar = styled(Scrollbar, {'&[data-orientation="horizontal"]': {flexDirection: "column",height: theme.spacing[6],- "--radix-scroll-area-thumb-height": theme.spacing[4],+ [scrollAreaThumbHeight]: theme.spacing[4],},variants: {@@ -114,5 +121,5 @@ ScrollArea.displayName = "ScrollArea";export const ScrollAreaNative = styled("div", {overflow: "auto",scrollbarWidth: "thin",- scrollbarColor: `${theme.colors.foregroundScrollBar} transparent`,+ scrollbarColor: `${scrollbarColor} transparent`,});diff --git a/packages/design-system/src/components/search-field.tsx b/packages/design-system/src/components/search-field.tsxindex 9dd531987e..7978c8db7f 100644--- a/packages/design-system/src/components/search-field.tsx+++ b/packages/design-system/src/components/search-field.tsx@@ -16,11 +16,12 @@ import { InputField } from "./input-field";import { SmallIconButton } from "./small-icon-button";import { Flex } from "./flex";import { mergeRefs } from "@react-aria/utils";+import { cssVar } from "../css-var";const SearchIconStyled = styled(SearchIcon, {// need to center icon verticallydisplay: "block",- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),padding: theme.spacing[3],});diff --git a/packages/design-system/src/components/section-title.stories.tsx b/packages/design-system/src/components/section-title.stories.tsxindex ccea721dc1..854ef28474 100644--- a/packages/design-system/src/components/section-title.stories.tsx+++ b/packages/design-system/src/components/section-title.stories.tsx@@ -6,13 +6,21 @@ import {import { StoryGrid, StorySection } from "./storybook";import type { ComponentProps } from "react";import { PlusIcon } from "@webstudio-is/icons";+import { cssVar } from "../css-var";export default {title: "Section Title",};const Wrap = ({ children }: { children: React.ReactNode }) => (- <div style={{ width: 240, border: "dashed 3px #e3e3e3" }}>{children}</div>+ <div+ style={{+ width: 240,+ border: `dashed 3px ${cssVar("--border-default")}`,+ }}+ >+ {children}+ </div>);const Variants = ({diff --git a/packages/design-system/src/components/section-title.tsx b/packages/design-system/src/components/section-title.tsxindex 3cf4b0fb32..55f12272d7 100644--- a/packages/design-system/src/components/section-title.tsx+++ b/packages/design-system/src/components/section-title.tsx@@ -20,18 +20,22 @@ import { ArrowFocus } from "./primitives/arrow-focus";import { Label, isLabelButton } from "./label";import { focusRingStyle } from "./focus-ring";import { Flex } from "./flex";+import { cssVar, declareCssVar } from "../css-var";+import { styleSourceColor } from "./style-source-color";-const buttonContentColor = "--ws-section-title-button-content-color";-const labelTextColor = "--ws-section-title-label-content-color";-const chevronOpacity = "--ws-section-title-chevron-display";+const buttonContentColor = declareCssVar(+ "--section-title-button-content-color"+);+const labelTextColor = declareCssVar("--section-title-label-content-color");+const chevronOpacity = declareCssVar("--section-title-chevron-display");const StyledButton = styled(Button, {});const containerStyle = css({position: "relative",height: theme.spacing[14],- [buttonContentColor]: theme.colors.foregroundIconMain,- [labelTextColor]: theme.colors.foregroundMain,+ [buttonContentColor]: cssVar("--foreground-primary"),+ [labelTextColor]: cssVar("--foreground-primary"),"&:hover": {[chevronOpacity]: 1,},@@ -70,10 +74,10 @@ const invisibleSuffixStyle = css({const chevronStyle = css({width: theme.spacing[7],- opacity: `var(${chevronOpacity}, 0)`,+ opacity: cssVar(chevronOpacity, "0"),translate: "-100%",transition: "transform 150ms, opacity 200ms",- color: theme.colors.backgroundIconSubtle,+ color: cssVar("--foreground-secondary"),variants: {openState: {open: {@@ -92,11 +96,11 @@ const dotStyle = css({marginRight: -2,variants: {color: {- local: { backgroundColor: theme.colors.foregroundLocalFlexUi },+ local: { backgroundColor: styleSourceColor.local.foreground },overwritten: {- backgroundColor: theme.colors.foregroundOverwrittenFlexUi,+ backgroundColor: styleSourceColor.overwritten.foreground,},- remote: { backgroundColor: theme.colors.foregroundRemoteFlexUi },+ remote: { backgroundColor: styleSourceColor.remote.foreground },},},});@@ -221,7 +225,7 @@ export const SectionTitleLabel = forwardRef(css={{color:openState === "closed" && inactive === false- ? `var(${labelTextColor})`+ ? cssVar(labelTextColor): undefined,...commonCss,...css,@@ -250,7 +254,7 @@ export const SectionTitleButton = forwardRef(tabIndex={-1}color="ghost"{...props}- css={{ color: `var(${buttonContentColor})`, ...css }}+ css={{ color: cssVar(buttonContentColor), ...css }}ref={ref}/>)diff --git a/packages/design-system/src/components/select-button.tsx b/packages/design-system/src/components/select-button.tsxindex 135c46327e..595ef31112 100644--- a/packages/design-system/src/components/select-button.tsx+++ b/packages/design-system/src/components/select-button.tsx@@ -15,9 +15,10 @@ import {import { textVariants } from "./text";import { theme, css, type CSS } from "../stitches.config";import { ChevronDownIcon } from "@webstudio-is/icons";+import { cssVar, declareCssVar } from "../css-var";-const chevronColor = `--ws-select-button-chevron-color`;-const chevronStyle = css({ color: `var(${chevronColor})` });+const chevronColor = declareCssVar("--select-button-chevron-color");+const chevronStyle = css({ color: cssVar(chevronColor) });const style = css({all: "unset", // reset <button>@@ -26,29 +27,29 @@ const style = css({boxSizing: "border-box",display: "flex",alignItems: "center",- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),border: `1px solid transparent`,borderRadius: theme.borderRadius[4],paddingRight: theme.spacing[1],paddingLeft: theme.spacing[1],- color: theme.colors.foregroundMain,- [chevronColor]: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-primary"),+ [chevronColor]: cssVar("--foreground-secondary"),"&:hover": {- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),},"&[data-placeholder]:not([data-state=open], :hover, :disabled)": {- color: theme.colors.foregroundSubtle,+ color: cssVar("--foreground-secondary"),},"&:hover:not(:disabled), &[data-state=open]": {- [chevronColor]: theme.colors.foregroundMain,+ [chevronColor]: cssVar("--foreground-primary"),},"&:disabled": {- background: theme.colors.backgroundInputDisabled,- color: theme.colors.foregroundDisabled,- [chevronColor]: theme.colors.borderMain,+ background: cssVar("--background-disabled"),+ color: cssVar("--foreground-disabled"),+ [chevronColor]: cssVar("--border-default"),},"&:focus-visible": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},variants: {fullWidth: { true: { width: "100%" } },@@ -57,7 +58,7 @@ const style = css({background: "transparent","&:hover": {borderColor: "transparent",- background: theme.colors.backgroundHover,+ background: cssVar("--overlay-interaction-hover"),},},},diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsxindex 0e0cf9911b..2d80632ae1 100644--- a/packages/design-system/src/components/select.tsx+++ b/packages/design-system/src/components/select.tsx@@ -22,16 +22,30 @@ import {import { SelectButton } from "./select-button";import { Box } from "./box";import { ScrollArea } from "./scroll-area";+import { cssVar, declareCssVar } from "../css-var";++const selectTriggerWidth = declareCssVar("--radix-select-trigger-width");export const SelectContent = styled(Primitive.Content, menuCss, {- minWidth: "var(--radix-select-trigger-width)",+ minWidth: cssVar(selectTriggerWidth),+ '& [data-select-description$="separator"]': {+ display: "none",+ },"&[data-side=top]": {- "--ws-select-description-display-top": "block",- "--ws-select-description-order": 0,+ '& [data-select-description="top-separator"]': {+ display: "block",+ },+ '& [data-select-description="content"]': {+ order: 0,+ },},"&[data-side=bottom]": {- "--ws-select-description-display-bottom": "block",- "--ws-select-description-order": 2,+ '& [data-select-description="bottom-separator"]': {+ display: "block",+ },+ '& [data-select-description="content"]': {+ order: 2,+ },},});@@ -52,7 +66,7 @@ const scrollButtonStyles = {alignItems: "center",justifyContent: "center",height: 25,- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),cursor: "default",};@@ -99,20 +113,16 @@ export const SelectItemDescription = ({return (<><SelectSeparator- style={{- display: `var(--ws-select-description-display-bottom, none)`,- order: "var(--ws-select-description-order)",- }}+ data-select-description="bottom-separator"+ css={{ order: 2 }}/><Description+ data-select-description="content"css={{display: "grid",}}hint- style={{- order: "var(--ws-select-description-order)",- }}>{descriptions.map((descr, index) => (<Box@@ -137,10 +147,8 @@ export const SelectItemDescription = ({</Description><SelectSeparator- style={{- display: `var(--ws-select-description-display-top, none)`,- order: "var(--ws-select-description-order)",- }}+ data-select-description="top-separator"+ css={{ order: 0 }}/></>);diff --git a/packages/design-system/src/components/selection-color.ts b/packages/design-system/src/components/selection-color.tsnew file mode 100644index 0000000000..391c6fa072--- /dev/null+++ b/packages/design-system/src/components/selection-color.ts@@ -0,0 +1,10 @@+import { cssVar } from "../css-var";++export const selectionBackground = `light-dark(+ color-mix(in oklab, ${cssVar("--background-accent")} 12%, ${cssVar(+ "--background-primary"+ )}),+ color-mix(in oklab, ${cssVar("--background-accent")} 20%, ${cssVar(+ "--background-primary"+ )})+)`;diff --git a/packages/design-system/src/components/separator.tsx b/packages/design-system/src/components/separator.tsxindex 150450489b..12391616df 100644--- a/packages/design-system/src/components/separator.tsx+++ b/packages/design-system/src/components/separator.tsx@@ -3,15 +3,16 @@* https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=4%3A2613*/-import { styled, theme, css } from "../stitches.config";import * as SeparatorPrimitive from "@radix-ui/react-separator";+import { cssVar } from "../css-var";+import { styled, theme, css } from "../stitches.config";export const separatorStyle = css({border: "none",margin: 0,flexShrink: 0,alignSelf: "stretch",- backgroundColor: theme.colors.borderMain,+ backgroundColor: cssVar("--border-default"),cursor: "default",'&[data-orientation="horizontal"]': { height: theme.spacing[1] },'&[data-orientation="vertical"]': { width: theme.spacing[1] },diff --git a/packages/design-system/src/components/small-icon-button.stories.tsx b/packages/design-system/src/components/small-icon-button.stories.tsxindex 8bacdcd40c..d5a260ab2d 100644--- a/packages/design-system/src/components/small-icon-button.stories.tsx+++ b/packages/design-system/src/components/small-icon-button.stories.tsx@@ -66,7 +66,7 @@ export const SmallIconButton = () => (export default {title: "Small Icon Button",parameters: {- // to make the variant=contrast visible- backgrounds: { default: "Maintenance Medium" },+ // Make the contrast variant visible.+ backgrounds: { default: "Inverse" },},};diff --git a/packages/design-system/src/components/small-toggle-button.stories.tsx b/packages/design-system/src/components/small-toggle-button.stories.tsxindex 55e762a046..e0729fbb7d 100644--- a/packages/design-system/src/components/small-toggle-button.stories.tsx+++ b/packages/design-system/src/components/small-toggle-button.stories.tsx@@ -5,6 +5,7 @@ import {} from "./small-toggle-button";import { StorySection, StoryGrid } from "./storybook";import { theme } from "../stitches.config";+import { cssVar } from "../css-var";export const SmallToggleButton = () => (<>@@ -15,7 +16,7 @@ export const SmallToggleButton = () => (css={variant === "contrast"? {- backgroundColor: theme.colors.backgroundActive,+ backgroundColor: cssVar("--background-accent"),padding: theme.spacing[5],}: {@@ -57,7 +58,7 @@ export const SmallToggleButton = () => (css={variant === "contrast"? {- backgroundColor: theme.colors.backgroundActive,+ backgroundColor: cssVar("--background-accent"),padding: theme.spacing[5],}: {diff --git a/packages/design-system/src/components/split-button.browser.test.tsx b/packages/design-system/src/components/split-button.browser.test.tsxnew file mode 100644index 0000000000..39b5108d8f--- /dev/null+++ b/packages/design-system/src/components/split-button.browser.test.tsx@@ -0,0 +1,170 @@+import { page } from "@vitest/browser/context";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import "../colors/colors.css";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "./dropdown-menu";+import { SplitButton, SplitButtonMenuButton } from "./split-button";+import { Tooltip, TooltipProvider } from "./tooltip";+import { IconToggleButton } from "./toggle-button";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+});++const renderSplitButton = ({+ pressed = false,+ previewDisabled = false,+ menuDisabled = false,+ onPreviewClick,+}: {+ pressed?: boolean;+ previewDisabled?: boolean;+ menuDisabled?: boolean;+ onPreviewClick?: () => void;+} = {}) => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ <TooltipProvider delayDuration={0}>+ <SplitButton>+ <Tooltip content="Toggle preview" open={false}>+ <IconToggleButton+ aria-label="Toggle preview"+ disabled={previewDisabled}+ onClick={onPreviewClick}+ pressed={pressed}+ >+ P+ </IconToggleButton>+ </Tooltip>+ <DropdownMenu>+ <Tooltip content="Choose mode" open={false}>+ <DropdownMenuTrigger asChild>+ <SplitButtonMenuButton+ aria-label="Choose mode"+ disabled={menuDisabled}+ type="button"+ >+ <svg width="16" height="16" />+ </SplitButtonMenuButton>+ </DropdownMenuTrigger>+ </Tooltip>+ <DropdownMenuContent>+ <DropdownMenuItem>Design</DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </SplitButton>+ </TooltipProvider>+ );+ });++ return {+ buttons: Array.from(container.querySelectorAll("button")),+ container,+ };+};++test("split button segments share hover in the real menu composition", async () => {+ for (const pressed of [false, true]) {+ const { buttons, container } = renderSplitButton({ pressed });++ expect(buttons).toHaveLength(2);+ expect(buttons[0].getAttribute("aria-label")).toBe("Toggle preview");+ expect(buttons[1].getAttribute("aria-label")).toBe("Choose mode");++ for (const button of buttons) {+ await page.elementLocator(button).hover();++ const backgrounds = buttons.map(+ (segment) => getComputedStyle(segment).backgroundColor+ );+ expect(backgrounds[0]).toBe(backgrounds[1]);+ expect(backgrounds[0]).not.toBe("rgba(0, 0, 0, 0)");+ }++ await page.elementLocator(container).hover({+ position: {+ x: buttons[0].getBoundingClientRect().width + 0.5,+ y: buttons[0].getBoundingClientRect().height / 2,+ },+ });+ const gapHoverBackgrounds = buttons.map(+ (segment) => getComputedStyle(segment).backgroundColor+ );+ expect(gapHoverBackgrounds[0]).toBe(gapHoverBackgrounds[1]);+ expect(gapHoverBackgrounds[0]).not.toBe("rgba(0, 0, 0, 0)");++ expect(buttons[1].getBoundingClientRect().width).toBeLessThan(+ buttons[0].getBoundingClientRect().width+ );+ const chevron = buttons[1].querySelector("svg");+ expect(chevron).not.toBeNull();+ expect(+ buttons[1].getBoundingClientRect().width -+ (chevron?.getBoundingClientRect().width ?? 0)+ ).toBe(2);++ act(() => root?.unmount());+ root = undefined;+ }+});++test("split button segments remain independently actionable", async () => {+ let previewClicks = 0;+ const { buttons } = renderSplitButton({+ onPreviewClick: () => {+ previewClicks += 1;+ },+ });++ await act(async () => {+ await page.elementLocator(buttons[0]).click();+ });+ expect(previewClicks).toBe(1);++ await act(async () => {+ await page.elementLocator(buttons[1]).click();+ });+ expect(previewClicks).toBe(1);+ await expect.element(page.getByText("Design")).toBeVisible();+});++test("hovering a disabled segment does not highlight its sibling", async () => {+ for (const disabled of ["preview", "menu"] as const) {+ const { buttons } = renderSplitButton({+ previewDisabled: disabled === "preview",+ menuDisabled: disabled === "menu",+ });+ const siblingIndex = disabled === "preview" ? 1 : 0;+ const disabledIndex = disabled === "preview" ? 0 : 1;+ const siblingBackground = getComputedStyle(+ buttons[siblingIndex]+ ).backgroundColor;++ await page.elementLocator(buttons[disabledIndex]).hover();++ expect(getComputedStyle(buttons[siblingIndex]).backgroundColor).toBe(+ siblingBackground+ );++ act(() => root?.unmount());+ root = undefined;+ }+});diff --git a/packages/design-system/src/components/split-button.stories.tsx b/packages/design-system/src/components/split-button.stories.tsxnew file mode 100644index 0000000000..2485371297--- /dev/null+++ b/packages/design-system/src/components/split-button.stories.tsx@@ -0,0 +1,51 @@+import { useState } from "react";+import { ChevronDownIcon, PlayIcon } from "@webstudio-is/icons";+import { StorySection } from "./storybook";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "./dropdown-menu";+import { SplitButton, SplitButtonMenuButton } from "./split-button";+import { IconToggleButton } from "./toggle-button";+import { Tooltip, TooltipProvider } from "./tooltip";++export const States = () => {+ const [pressed, setPressed] = useState(false);++ return (+ <StorySection title="Split button">+ <TooltipProvider>+ <SplitButton>+ <Tooltip content="Toggle preview">+ <IconToggleButton+ aria-label="Toggle preview"+ pressed={pressed}+ onPressedChange={setPressed}+ >+ <PlayIcon />+ </IconToggleButton>+ </Tooltip>+ <DropdownMenu>+ <Tooltip content="Choose mode">+ <DropdownMenuTrigger asChild>+ <SplitButtonMenuButton type="button" aria-label="Choose mode">+ <ChevronDownIcon />+ </SplitButtonMenuButton>+ </DropdownMenuTrigger>+ </Tooltip>+ <DropdownMenuContent>+ <DropdownMenuItem>Design</DropdownMenuItem>+ <DropdownMenuItem>Content</DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </SplitButton>+ </TooltipProvider>+ </StorySection>+ );+};++export default {+ title: "Split Button",+};diff --git a/packages/design-system/src/components/split-button.tsx b/packages/design-system/src/components/split-button.tsxnew file mode 100644index 0000000000..556cfd1338--- /dev/null+++ b/packages/design-system/src/components/split-button.tsx@@ -0,0 +1,21 @@+import { styled, theme } from "../stitches.config";+import { cssVar } from "../css-var";+import { IconButton } from "./icon-button";++export const SplitButton = styled("div", {+ display: "inline-flex",+ alignItems: "center",+ gap: theme.spacing[1],+ "&:hover:not(:has(> button:disabled:hover, > button[aria-disabled=true]:hover))":+ {+ "> button:not(:disabled):not([aria-disabled=true])": {+ background: cssVar("--overlay-interaction-hover"),+ },+ },+});++export const SplitButtonMenuButton = styled(IconButton, {+ minWidth: "auto",+ width: "auto",+ paddingInline: 0,+});diff --git a/packages/design-system/src/components/split-view.test.tsx b/packages/design-system/src/components/split-view.browser.test.tsxsimilarity index 88%rename from packages/design-system/src/components/split-view.test.tsxrename to packages/design-system/src/components/split-view.browser.test.tsxindex 2174567f1f..2d75d8326e 100644--- a/packages/design-system/src/components/split-view.test.tsx+++ b/packages/design-system/src/components/split-view.browser.test.tsx@@ -47,6 +47,7 @@ const renderSplitView = ({defaultSize?: { value: number; unit: "%" | "px" };} = {}) => {const container = document.createElement("div");+ container.style.width = "1000px";document.body.appendChild(container);root = createRoot(container);act(() => {@@ -67,20 +68,8 @@ const renderSplitView = ({if (splitView === null) {throw new Error("Expected split view container");}- let width = 1000;- splitView.getBoundingClientRect = () => ({- x: 0,- y: 0,- width,- height: 500,- top: 0,- right: width,- bottom: 500,- left: 0,- toJSON: () => ({}),- });const resize = (nextWidth: number) => {- width = nextWidth;+ container.style.width = `${nextWidth}px`;act(() => {for (const observer of resizeObservers) {observer.notify();@@ -105,13 +94,13 @@ test("resizes panels with the keyboard", () => {test("keeps keyboard resizing within the configured ratios", () => {const { separator } = renderSplitView();- act(() => {- for (let index = 0; index < 10; index += 1) {+ for (let index = 0; index < 10; index += 1) {+ act(() => {separator.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowRight", bubbles: true }));- }- });+ });+ }expect(separator.getAttribute("aria-valuenow")).toBe("80");});@@ -122,7 +111,7 @@ test("preserves a proportional split when the container resizes", () => {});expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 0.4fr) 1px minmax(0, 0.6fr)"+ "minmax(0px, 399.6px) 1px minmax(0px, 1fr)");});@@ -132,7 +121,7 @@ test("preserves a fixed start pane when the container resizes", () => {});expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 320px) 1px minmax(0, 1fr)"+ "minmax(0px, 320px) 1px minmax(0px, 1fr)");act(() => {@@ -152,14 +141,14 @@ test("clamps a fixed split on container resize and restores its desired size", (resize(400);expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 239px) 1px minmax(0, 1fr)"+ "minmax(0px, 239px) 1px minmax(0px, 1fr)");expect(separator.getAttribute("aria-valuemin")).toBe("160");expect(separator.getAttribute("aria-valuemax")).toBe("239");resize(1000);expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 320px) 1px minmax(0, 1fr)"+ "minmax(0px, 320px) 1px minmax(0px, 1fr)");});@@ -170,11 +159,11 @@ test("clamps a percentage split on container resize and restores its ratio", ()resize(400);expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 160px) 1px minmax(0, 1fr)"+ "minmax(0px, 160px) 1px minmax(0px, 1fr)");resize(1000);expect(splitView.style.gridTemplateColumns).toBe(- "minmax(0, 399.6px) 1px minmax(0, 1fr)"+ "minmax(0px, 399.6px) 1px minmax(0px, 1fr)");});diff --git a/packages/design-system/src/components/split-view.tsx b/packages/design-system/src/components/split-view.tsxindex 84bfee5f6e..864a11a9a4 100644--- a/packages/design-system/src/components/split-view.tsx+++ b/packages/design-system/src/components/split-view.tsx@@ -5,7 +5,8 @@ import {useState,type ReactNode,} from "react";-import { css, theme } from "../stitches.config";+import { css } from "../stitches.config";+import { cssVar } from "../css-var";import { Box } from "./box";import { numericScrubControl } from "./primitives/numeric-gesture-control";@@ -18,7 +19,7 @@ const separatorStyle = css({cursor: "col-resize",touchAction: "none",outline: "none",- background: theme.colors.borderMain,+ background: cssVar("--border-default"),"&::before": {position: "absolute",content: '""',@@ -27,8 +28,10 @@ const separatorStyle = css({right: -2,},"&:hover, &:focus-visible": {- background: theme.colors.backgroundPrimaryLight,- boxShadow: `-1px 0 ${theme.colors.backgroundPrimaryLight}, 1px 0 ${theme.colors.backgroundPrimaryLight}`,+ background: cssVar("--border-focus"),+ boxShadow: `-1px 0 ${cssVar("--border-focus")}, 1px 0 ${cssVar(+ "--border-focus"+ )}`,},});@@ -229,7 +232,9 @@ export const SplitView = ({? `minmax(0, ${renderedStartSize}px) ${separatorWidth}px minmax(0, 1fr)`: sizeUnitRef.current === "px"? `minmax(0, ${size}px) ${separatorWidth}px minmax(0, 1fr)`- : `minmax(0, ${size / 100}fr) ${separatorWidth}px minmax(0, ${1 - size / 100}fr)`,+ : `minmax(0, ${size / 100}fr) ${separatorWidth}px minmax(0, ${+ 1 - size / 100+ }fr)`,}}><Box className={paneStyle()}>{start}</Box>diff --git a/packages/design-system/src/components/storybook.tsx b/packages/design-system/src/components/storybook.tsxindex a8388badb0..6b66abb466 100644--- a/packages/design-system/src/components/storybook.tsx+++ b/packages/design-system/src/components/storybook.tsx@@ -3,6 +3,7 @@*/import type { ReactNode } from "react";+import { cssVar } from "../css-var";import { theme, css, type CSS } from "../stitches.config";import { textVariants } from "./text";@@ -11,7 +12,7 @@ const sectionStyle = css({variants: {withBorder: {true: {- border: `1px dashed ${theme.colors.borderMain}`,+ border: `1px dashed ${cssVar("--border-default")}`,padding: theme.spacing[5],marginBottom: theme.spacing[7],},@@ -21,7 +22,7 @@ const sectionStyle = css({const titleStyle = css(textVariants.titles, {marginTop: 0,marginBottom: theme.spacing[5],- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),});export const StorySection = ({title,diff --git a/packages/design-system/src/components/style-source-color.ts b/packages/design-system/src/components/style-source-color.tsnew file mode 100644index 0000000000..ae46ccba16--- /dev/null+++ b/packages/design-system/src/components/style-source-color.ts@@ -0,0 +1,36 @@+import { cssVar } from "../css-var";+import { rotateBoundedBackgroundHue } from "../color-utils";++const rotateForegroundHue = (color: string, degrees: number) =>+ `color(+ from oklch(from ${color} l c calc(h + ${degrees}))+ srgb clamp(0, r, 1) clamp(0, g, 1) clamp(0, b, 1)+ )`;++const createStyleSourceColor = (solid: string, foreground: string) => ({+ solid,+ background: `color-mix(in oklab, ${solid} 16%, ${cssVar(+ "--background-primary"+ )})`,+ border: `color-mix(in oklab, ${solid} 44%, ${cssVar(+ "--background-primary"+ )})`,+ foreground,+});++const accentBackground = cssVar("--background-accent");+const accentForeground = cssVar("--foreground-accent");++// Style-source states are a component domain, not information, warning, or+// error intent. Their palette is derived from the theme accent locally.+export const styleSourceColor = {+ local: createStyleSourceColor(accentBackground, accentForeground),+ overwritten: createStyleSourceColor(+ rotateBoundedBackgroundHue(accentBackground, 100),+ rotateForegroundHue(accentForeground, 100)+ ),+ remote: createStyleSourceColor(+ rotateBoundedBackgroundHue(accentBackground, 150),+ rotateForegroundHue(accentForeground, 150)+ ),+} as const;diff --git a/packages/design-system/src/components/switch.tsx b/packages/design-system/src/components/switch.tsxindex 08b2e8996c..9e1239859b 100644--- a/packages/design-system/src/components/switch.tsx+++ b/packages/design-system/src/components/switch.tsx@@ -6,6 +6,8 @@import { forwardRef, type ComponentProps, type Ref } from "react";import * as Primitive from "@radix-ui/react-switch";import { type CSS, css, theme } from "../stitches.config";+import { cssVar } from "../css-var";+import { restingControlBoundary } from "./form-control-style";const padding = theme.spacing[1];const thumbOffset = `calc(${padding} + ${theme.spacing[1]})`;@@ -27,20 +29,20 @@ const switchStyle = css({position: "absolute",inset: padding,borderRadius: theme.borderRadius.pill,- backgroundColor: theme.colors.backgroundNeutralDark,+ backgroundColor: restingControlBoundary,},"&[data-state=checked]:not([data-disabled]):before, &[aria-checked=true]:not([data-disabled]):before":{- backgroundColor: theme.colors.backgroundPrimary,+ backgroundColor: cssVar("--background-accent"),},"&[data-disabled]:before": {- backgroundColor: theme.colors.foregroundDisabled,+ backgroundColor: cssVar("--foreground-disabled"),},"&:focus": {- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,},});@@ -48,7 +50,7 @@ const thumbStyle = css({width: theme.spacing[7],height: theme.spacing[7],borderRadius: theme.borderRadius.round,- backgroundColor: theme.colors.foregroundContrastMain,+ backgroundColor: cssVar("--foreground-on-accent"),position: "absolute",top: thumbOffset,left: thumbOffset,diff --git a/packages/design-system/src/components/text-area.tsx b/packages/design-system/src/components/text-area.tsxindex 3c420fcb33..26dec5b274 100644--- a/packages/design-system/src/components/text-area.tsx+++ b/packages/design-system/src/components/text-area.tsx@@ -9,16 +9,17 @@ import { textVariants } from "./text";import { Grid } from "./grid";import { useControllableState } from "@radix-ui/react-use-controllable-state";import { ScrollArea } from "./scroll-area";+import { cssVar } from "../css-var";const lineHeight = 16;const paddingY = 3;const borderWidth = 1;const gridStyle = css({- color: theme.colors.foregroundMain,+ color: cssVar("--foreground-primary"),borderRadius: theme.borderRadius[4],border: `${borderWidth}px solid transparent`,- background: theme.colors.backgroundControls,+ background: cssVar("--background-secondary"),paddingTop: paddingY,paddingBottom: paddingY,boxSizing: "border-box",@@ -26,19 +27,19 @@ const gridStyle = css({overflow: "auto",width: "100%","&:hover": {- borderColor: theme.colors.borderMain,+ borderColor: cssVar("--border-default"),},"&:focus-within": {- borderColor: theme.colors.borderFocus,+ borderColor: cssVar("--border-focus"),},"&:has([data-color=error])": {- borderColor: theme.colors.borderDestructiveMain,+ borderColor: cssVar("--border-negative"),"&:focus-within": {- outlineColor: theme.colors.borderDestructiveMain,+ outlineColor: cssVar("--border-negative"),},},"&:has(textarea:disabled)": {- backgroundColor: theme.colors.backgroundInputDisabled,+ backgroundColor: cssVar("--background-disabled"),},variants: {grow: {@@ -73,10 +74,10 @@ const commonStyle = css({resize: "none",outline: "none","&::placeholder": {- color: theme.colors.foregroundContrastSubtle,+ color: cssVar("--foreground-secondary"),},"&:disabled": {- color: theme.colors.foregroundDisabled,+ color: cssVar("--foreground-disabled"),},variants: {variant: {diff --git a/packages/design-system/src/components/text.ts b/packages/design-system/src/components/text.tsindex 0da9336667..80e2b2a609 100644--- a/packages/design-system/src/components/text.ts+++ b/packages/design-system/src/components/text.ts@@ -1,6 +1,7 @@-import { css, theme, styled } from "../stitches.config";+import { css, styled } from "../stitches.config";import { truncate } from "../utilities";import { typography } from "../design-tokens";+import { cssVar } from "../css-var";const normalize = {userSelect: "none",@@ -9,6 +10,10 @@ const normalize = {type Variant = keyof typeof typography;type VariantStyle = typeof normalize & (typeof typography)[Variant];+export const moreSubtleForeground = `color-mix(in oklab, ${cssVar(+ "--foreground-secondary"+)} 56%, ${cssVar("--background-primary")})`;+export const textVariants = {} as { [Key in Variant]: VariantStyle };let variant: Variant;@@ -25,14 +30,14 @@ export const textStyle = css({variants: {variant: textVariants,color: {- main: { color: theme.colors.foregroundMain },- contrast: { color: theme.colors.foregroundContrastMain },- subtle: { color: theme.colors.foregroundSubtle },- moreSubtle: { color: theme.colors.foregroundTextMoreSubtle },- disabled: { color: theme.colors.foregroundDisabled },- success: { color: theme.colors.foregroundSuccessText },+ main: { color: cssVar("--foreground-primary") },+ contrast: { color: cssVar("--foreground-on-inverse") },+ subtle: { color: cssVar("--foreground-secondary") },+ moreSubtle: { color: moreSubtleForeground },+ disabled: { color: cssVar("--foreground-disabled") },+ success: { color: cssVar("--foreground-positive") },destructive: {- color: theme.colors.foregroundDestructive,+ color: cssVar("--foreground-negative"),// destructive in most cases used to show 3rd party errors// we don't want it to break layoutoverflowWrap: "anywhere",diff --git a/packages/design-system/src/components/toast.tsx b/packages/design-system/src/components/toast.tsxindex e3ecbe3811..82aeb5a07a 100644--- a/packages/design-system/src/components/toast.tsx+++ b/packages/design-system/src/components/toast.tsx@@ -15,8 +15,11 @@ import { Flex } from "./flex";import { Tooltip } from "./tooltip";import { Button } from "./button";import { CopyIcon, LargeXIcon } from "@webstudio-is/icons";+import { cssVar, declareCssVar } from "../css-var";const ANIMATION_SLIDE_LENGTH = 30;+const toastSwipeEndX = declareCssVar("--radix-toast-swipe-end-x");+const toastSwipeMoveX = declareCssVar("--radix-toast-swipe-move-x");const hide = keyframes({"0%": { opacity: 1 },@@ -29,7 +32,7 @@ const slideIn = keyframes({});const swipeOut = keyframes({- from: { transform: "translateX(var(--radix-toast-swipe-end-x))" },+ from: { transform: `translateX(${cssVar(toastSwipeEndX)})` },to: { transform: `translateX(calc(100% + ${ANIMATION_SLIDE_LENGTH}px))` },});@@ -59,7 +62,7 @@ const AnimatedToast = styled(ToastPrimitive.Root, {animation: `${hide} 105ms ease-in`,},'&[data-swipe="move"]': {- transform: "translateX(var(--radix-toast-swipe-move-x))",+ transform: `translateX(${cssVar(toastSwipeMoveX)})`,},'&[data-swipe="cancel"]': {transform: "translateX(0)",@@ -71,45 +74,30 @@ const AnimatedToast = styled(ToastPrimitive.Root, {},});-const borderAccentBackgroundColor = "--ws-toast-border-accent-background-color";-const backgroundColor = "--ws-toast-background-color";-const borderColor = "--ws-toast-border-color";-const iconColor = "--ws-toast-icon-color";--const ToastVariants = styled("div", {- [borderAccentBackgroundColor]: theme.colors.foregroundMain,- [backgroundColor]: theme.colors.backgroundNeutralNotification,- [borderColor]: theme.colors.borderNeutral,- [iconColor]: theme.colors.foregroundMain,-- variants: {- variant: {- neutral: {},- warning: {- [backgroundColor]: theme.colors.backgroundAlertNotification,- [borderAccentBackgroundColor]: theme.colors.backgroundAlertMain,- [borderColor]: theme.colors.backgroundAlertMain,- [iconColor]: theme.colors.backgroundAlertMain,- },- error: {- [backgroundColor]: theme.colors.backgroundDestructiveNotification,- [borderAccentBackgroundColor]: theme.colors.backgroundDestructiveMain,- [borderColor]: theme.colors.backgroundDestructiveMain,- [iconColor]: theme.colors.foregroundDestructive,- },- success: {- [backgroundColor]: theme.colors.backgroundSuccessNotification,- [borderAccentBackgroundColor]: theme.colors.backgroundSuccessMain,- [borderColor]: theme.colors.backgroundSuccessMain,- [iconColor]: theme.colors.foregroundSuccess,- },- },+const toastColors = {+ neutral: {+ background: cssVar("--background-secondary"),+ border: cssVar("--border-default"),+ icon: cssVar("--foreground-primary"),},-});--type ToastVariant = React.ComponentProps<typeof ToastVariants>["variant"];+ warning: {+ background: cssVar("--background-warning-subtle"),+ border: cssVar("--border-warning"),+ icon: cssVar("--foreground-warning"),+ },+ error: {+ background: cssVar("--background-negative-subtle"),+ border: cssVar("--background-negative"),+ icon: cssVar("--foreground-negative"),+ },+ success: {+ background: cssVar("--background-positive-subtle"),+ border: cssVar("--background-positive"),+ icon: cssVar("--foreground-positive"),+ },+} as const;-const cssVar = (name: string) => `var(${name})`;+type ToastVariant = keyof typeof toastColors;const InternalToast = ({children,@@ -122,67 +110,51 @@ const InternalToast = ({icon?: React.ReactNode;sideButtons: React.ReactNode;}) => {+ const colors = toastColors[variant ?? "neutral"];+return (- <ToastVariants variant={variant}>- <Grid+ <Grid+ gap={"3"}+ align={"center"}+ css={{+ pointerEvents: "all",+ backgroundColor: colors.background,+ padding: theme.panel.padding,+ gridTemplateColumns: icon ? "auto 1fr auto" : "1fr auto",+ borderRadius: theme.borderRadius[5],+ border: `1px solid ${colors.border}`,+ }}+ >+ <Boxcss={{- display: "grid",- gridTemplateColumns: "8px 1fr",- pointerEvents: "all",+ color: colors.icon,+ display: icon ? "contents" : "none",}}>- <Box- css={{- backgroundColor: cssVar(borderAccentBackgroundColor),- borderTopLeftRadius: theme.borderRadius[5],- borderBottomLeftRadius: theme.borderRadius[5],- }}- ></Box>- <Grid- gap={"3"}- align={"center"}- css={{- backgroundColor: cssVar(backgroundColor),- padding: theme.panel.padding,- gridTemplateColumns: icon ? "auto 1fr auto" : "1fr auto",- borderBottomRightRadius: theme.borderRadius[5],- borderTopRightRadius: theme.borderRadius[5],- border: `1px solid ${cssVar(borderColor)}`,- borderLeft: "none",- }}- >- <Box+ {icon}+ </Box>++ <Grid gap={"1"}>+ <ToastPrimitive.Description asChild>+ <Textcss={{- color: cssVar(iconColor),- display: icon ? "contents" : "none",+ whiteSpace: "pre-wrap",+ wordBreak: "break-word",+ display: "-webkit-box",+ "-webkit-line-clamp": 20,+ "-webkit-box-orient": "vertical",+ overflow: "hidden",+ textOverflow: "ellipsis",}}+ variant={"labels"}>- {icon}- </Box>-- <Grid gap={"1"}>- <ToastPrimitive.Description asChild>- <Text- css={{- whiteSpace: "pre-wrap",- wordBreak: "break-word",- display: "-webkit-box",- "-webkit-line-clamp": 20,- "-webkit-box-orient": "vertical",- overflow: "hidden",- textOverflow: "ellipsis",- }}- variant={"labels"}- >- {children}- </Text>- </ToastPrimitive.Description>- </Grid>-- {sideButtons}- </Grid>+ {children}+ </Text>+ </ToastPrimitive.Description></Grid>- </ToastVariants>++ {sideButtons}+ </Grid>);};@@ -205,10 +177,10 @@ export const Toast = ({<Buttoncss={{"&[data-state=auto]:hover": {- background: "rgba(0, 0, 0, 0.07)",+ background: cssVar("--overlay-interaction-hover"),},"&[data-state=auto]:active": {- background: "rgba(0, 0, 0, 0.04)",+ background: cssVar("--overlay-interaction-pressed"),},}}color="ghost"@@ -222,10 +194,10 @@ export const Toast = ({<Buttoncss={{"&[data-state=auto]:hover": {- background: "rgba(0, 0, 0, 0.07)",+ background: cssVar("--overlay-interaction-hover"),},"&[data-state=auto]:active": {- background: "rgba(0, 0, 0, 0.04)",+ background: cssVar("--overlay-interaction-pressed"),},}}color="ghost"diff --git a/packages/design-system/src/components/toggle-button.stories.tsx b/packages/design-system/src/components/toggle-button.stories.tsxindex e43b67ba11..ae0db718ed 100644--- a/packages/design-system/src/components/toggle-button.stories.tsx+++ b/packages/design-system/src/components/toggle-button.stories.tsx@@ -1,5 +1,5 @@import { BorderRadiusIndividualIcon } from "@webstudio-is/icons";-import { ToggleButton as ToggleButtonComponent } from "./toggle-button";+import { IconToggleButton, ToggleButton } from "./toggle-button";import { StorySection, StoryGrid } from "./storybook";const toggleButtonVariants = [@@ -10,14 +10,18 @@ const toggleButtonVariants = ["remote",] as const;-export const ToggleButton = () => (+export const IconToggleButtons = () => (<><StorySection title="Variants"><StoryGrid horizontal>{toggleButtonVariants.map((variant) => (- <ToggleButtonComponent key={variant} variant={variant}>+ <IconToggleButton+ key={variant}+ variant={variant}+ aria-label={variant}+ ><BorderRadiusIndividualIcon fill="currentColor" />- </ToggleButtonComponent>+ </IconToggleButton>))}</StoryGrid></StorySection>@@ -25,9 +29,14 @@ export const ToggleButton = () => (<StorySection title="Variants disabled"><StoryGrid horizontal>{toggleButtonVariants.map((variant) => (- <ToggleButtonComponent key={variant} variant={variant} disabled>+ <IconToggleButton+ key={variant}+ variant={variant}+ aria-label={variant}+ disabled+ ><BorderRadiusIndividualIcon fill="currentColor" />- </ToggleButtonComponent>+ </IconToggleButton>))}</StoryGrid></StorySection>@@ -35,13 +44,14 @@ export const ToggleButton = () => (<StorySection title="Variants on"><StoryGrid horizontal>{toggleButtonVariants.map((variant) => (- <ToggleButtonComponent+ <IconToggleButtonkey={variant}variant={variant}+ aria-label={variant}data-state="on"><BorderRadiusIndividualIcon fill="currentColor" />- </ToggleButtonComponent>+ </IconToggleButton>))}</StoryGrid></StorySection>@@ -49,9 +59,14 @@ export const ToggleButton = () => (<StorySection title="Controlled pressed"><StoryGrid horizontal>{toggleButtonVariants.map((variant) => (- <ToggleButtonComponent key={variant} variant={variant} pressed>+ <IconToggleButton+ key={variant}+ variant={variant}+ aria-label={variant}+ pressed+ ><BorderRadiusIndividualIcon fill="currentColor" />- </ToggleButtonComponent>+ </IconToggleButton>))}</StoryGrid></StorySection>@@ -59,15 +74,29 @@ export const ToggleButton = () => (<StorySection title="Default pressed (uncontrolled)"><StoryGrid horizontal>{toggleButtonVariants.map((variant) => (- <ToggleButtonComponent key={variant} variant={variant} defaultPressed>+ <IconToggleButton+ key={variant}+ variant={variant}+ aria-label={variant}+ defaultPressed+ ><BorderRadiusIndividualIcon fill="currentColor" />- </ToggleButtonComponent>+ </IconToggleButton>))}</StoryGrid></StorySection></>);+export const TextToggleButtons = () => (+ <StorySection title="Text toggle buttons">+ <StoryGrid horizontal>+ <ToggleButton>Inactive</ToggleButton>+ <ToggleButton pressed>Selected</ToggleButton>+ </StoryGrid>+ </StorySection>+);+export default {title: "Toggle Button",parameters: {diff --git a/packages/design-system/src/components/toggle-button.tsx b/packages/design-system/src/components/toggle-button.tsxindex 0d4f6f401a..afaf364a05 100644--- a/packages/design-system/src/components/toggle-button.tsx+++ b/packages/design-system/src/components/toggle-button.tsx@@ -4,28 +4,47 @@*/import { forwardRef, type ComponentProps } from "react";-import type { CSS } from "../stitches.config";import * as TogglePrimitive from "@radix-ui/react-toggle";import { IconButton } from "./icon-button";+import { Button, type ButtonProps } from "./button";-type Props = {- variant?:- | "default"- | "preset"- | "local"- | "overwritten"- | "remote"- | undefined;- css?: CSS;-} & ComponentProps<typeof TogglePrimitive.Root>;+type ToggleRootProps = Omit<+ ComponentProps<typeof TogglePrimitive.Root>,+ "asChild" | "color"+>;-export const ToggleButton = forwardRef<HTMLButtonElement, Props>(- ({ children, ...restProps }, ref) => {+type ToggleButtonProps = ToggleRootProps &+ Pick<ButtonProps, "color" | "css" | "prefix" | "suffix">;++export const ToggleButton = forwardRef<HTMLButtonElement, ToggleButtonProps>(+ ({ children, color, css, prefix, suffix, ...toggleProps }, ref) => {return (- <TogglePrimitive.Root asChild ref={ref} {...restProps}>- <IconButton>{children}</IconButton>+ <TogglePrimitive.Root asChild ref={ref} {...toggleProps}>+ <Button color={color} css={css} prefix={prefix} suffix={suffix}>+ {children}+ </Button></TogglePrimitive.Root>);});ToggleButton.displayName = "ToggleButton";++type IconToggleButtonProps = ToggleRootProps &+ Pick<+ ComponentProps<typeof IconButton>,+ "variant" | "size" | "css" | "aria-label"+ > & { "aria-label": string };++export const IconToggleButton = forwardRef<+ HTMLButtonElement,+ IconToggleButtonProps+>(({ children, variant, size, css, ...toggleProps }, ref) => {+ return (+ <TogglePrimitive.Root asChild ref={ref} {...toggleProps}>+ <IconButton variant={variant} size={size} css={css}>+ {children}+ </IconButton>+ </TogglePrimitive.Root>+ );+});+IconToggleButton.displayName = "IconToggleButton";diff --git a/packages/design-system/src/components/toggle-group.tsx b/packages/design-system/src/components/toggle-group.tsxindex 5ed20c3752..6d799a3edf 100644--- a/packages/design-system/src/components/toggle-group.tsx+++ b/packages/design-system/src/components/toggle-group.tsx@@ -11,29 +11,75 @@ import {forwardRef,} from "react";import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group";-import { styled, theme } from "../stitches.config";+import { styled, theme, type CSS } from "../stitches.config";import { IconButton } from "./icon-button";import { textVariants } from "./text";+import { cssVar } from "../css-var";type Color = "default" | "preset" | "local" | "remote" | "overwritten";+type ToggleGroupVariant = "framed" | "frameless";++const toggleGroupBackground = `color-mix(in oklab, ${cssVar(+ "--background-primary"+)} 96%, ${cssVar("--foreground-primary")})`;const ToggleGroupContext = createContext<{color?: Color;+ variant?: ToggleGroupVariant;}>({});-type ToggleGroupProps = ComponentProps<- typeof ToggleGroupPrimitive.ToggleGroup-> & {+const ToggleGroupRoot = styled(ToggleGroupPrimitive.ToggleGroup, {+ boxSizing: "border-box",+ display: "flex",+ flexDirection: "row",+ alignItems: "center",+ padding: 1,+ background: toggleGroupBackground,+ border: `1px solid ${cssVar("--border-default")}`,+ borderRadius: theme.borderRadius[4],+ variants: {+ variant: {+ framed: {},+ frameless: {+ padding: 0,+ background: "transparent",+ borderColor: "transparent",+ gap: theme.spacing[5],+ "& > button": {+ height: theme.sizes.controlHeight,+ minWidth: theme.sizes.controlHeight,+ paddingInline: theme.spacing[3],+ },+ },+ },+ },+ defaultVariants: {+ variant: "framed",+ },+});++type ToggleGroupProps = ComponentProps<typeof ToggleGroupRoot> & {color?: Color;+ variant?: ToggleGroupVariant;};-const BaseToggleGroup = forwardRef<ElementRef<"div">, ToggleGroupProps>(- ({ color = "default", children, onValueChange, ...props }, ref) => {+export const ToggleGroup = forwardRef<ElementRef<"div">, ToggleGroupProps>(+ (+ {+ color = "default",+ variant = "framed",+ children,+ onValueChange,+ ...props+ },+ ref+ ) => {return (- <ToggleGroupContext.Provider value={{ color }}>- <ToggleGroupPrimitive.ToggleGroup+ <ToggleGroupContext.Provider value={{ color, variant }}>+ <ToggleGroupRootref={ref}{...props}+ variant={variant}onValueChange={(newValue: string | string[]) => {// prevent unselecting buttons when only single can be selectedif (newValue !== "") {@@ -42,30 +88,19 @@ const BaseToggleGroup = forwardRef<ElementRef<"div">, ToggleGroupProps>(}}>{children}- </ToggleGroupPrimitive.ToggleGroup>+ </ToggleGroupRoot></ToggleGroupContext.Provider>);});-BaseToggleGroup.displayName = "BaseToggleGroup";--export const ToggleGroup = styled(BaseToggleGroup, {- boxSizing: "border-box",- display: "flex",- flexDirection: "row",- alignItems: "center",- padding: 1,- background: theme.colors.backgroundControls,- border: `1px solid ${theme.colors.borderMain}`,- borderRadius: theme.borderRadius[4],-});+ToggleGroup.displayName = "ToggleGroup";const IconButtonStyled = styled(IconButton, {"&[data-focused=true], &:focus-visible": {// To not overlap focus-ring by the next buttonzIndex: 0,- outline: `1px solid ${theme.colors.borderFocus}`,+ outline: `1px solid ${cssVar("--border-focus")}`,outlineOffset: -1,},borderWidth: 0,@@ -75,8 +110,8 @@ const IconButtonStyled = styled(IconButton, {const BaseToggleGroupButton = forwardRef<ElementRef<"button">,ComponentProps<typeof IconButton>->((props, ref) => {- const { color } = useContext(ToggleGroupContext);+>(({ css, ...props }, ref) => {+ const { color, variant } = useContext(ToggleGroupContext);return (<IconButtonStyledref={ref}@@ -85,14 +120,17 @@ const BaseToggleGroupButton = forwardRef<// default is unselected state// when button is selected fallback to presetprops["aria-checked"] === true- ? color === "default"- ? "preset"- : color+ ? variant === "frameless"+ ? "default"+ : color === "default"+ ? "preset"+ : color: "default"}css={{height: theme.spacing[10],...textVariants.labels,+ ...css,}}/>);@@ -100,7 +138,9 @@ const BaseToggleGroupButton = forwardRef<BaseToggleGroupButton.displayName = "BaseToggleGroupButton";-type ToggleGroupButtonProps = ComponentProps<typeof ToggleGroupPrimitive.Item>;+type ToggleGroupButtonProps = ComponentProps<+ typeof ToggleGroupPrimitive.Item+> & { css?: CSS };export const ToggleGroupButton = forwardRef<ElementRef<"button">,diff --git a/packages/design-system/src/components/toolbar.stories.tsx b/packages/design-system/src/components/toolbar.stories.tsxdeleted file mode 100644index 9ff1fa0060..0000000000--- a/packages/design-system/src/components/toolbar.stories.tsx+++ /dev/null@@ -1,69 +0,0 @@-import { PlayIcon, ChevronDownIcon } from "@webstudio-is/icons";-import { theme } from "../stitches.config";-import {- Toolbar,- ToolbarButton,- ToolbarToggleItem,- ToolbarToggleGroup,- ToolbarSeparator,-} from "./toolbar";-import { StorySection } from "./storybook";--export default {- title: "Toolbar",-};--export const ToolbarDemo = () => (- <>- <StorySection title="Toggle groups">- <Toolbar css={{ gap: theme.spacing[5] }}>- <ToolbarToggleGroup type="single" value="2">- <ToolbarToggleItem value="1">- <PlayIcon size={22} />- </ToolbarToggleItem>- <ToolbarToggleItem value="2">- <PlayIcon size={22} />- </ToolbarToggleItem>- </ToolbarToggleGroup>- <ToolbarSeparator />- <ToolbarToggleGroup type="single" value="4">- <ToolbarToggleItem value="3" variant="subtle">- <PlayIcon size={22} />- </ToolbarToggleItem>- <ToolbarToggleItem value="4" variant="preview">- <PlayIcon size={22} />- </ToolbarToggleItem>- </ToolbarToggleGroup>- <ToolbarSeparator />- <ToolbarToggleGroup type="single">- <ToolbarToggleItem value="5" focused>- <PlayIcon size={22} />- </ToolbarToggleItem>- <ToolbarToggleItem value="5" variant="chevron">- <ChevronDownIcon />- </ToolbarToggleItem>- </ToolbarToggleGroup>- </Toolbar>- </StorySection>- <StorySection title="Buttons">- <Toolbar>- <ToolbarButton>- <PlayIcon size={22} />- </ToolbarButton>- <ToolbarButton variant="subtle">- <PlayIcon size={22} />- </ToolbarButton>- <ToolbarButton variant="preview">- <PlayIcon size={22} />- </ToolbarButton>- <ToolbarSeparator />- <ToolbarButton focused>- <PlayIcon size={22} />- </ToolbarButton>- <ToolbarButton variant="chevron">- <ChevronDownIcon />- </ToolbarButton>- </Toolbar>- </StorySection>- </>-);diff --git a/packages/design-system/src/components/toolbar.tsx b/packages/design-system/src/components/toolbar.tsxdeleted file mode 100644index 626d4b631a..0000000000--- a/packages/design-system/src/components/toolbar.tsx+++ /dev/null@@ -1,109 +0,0 @@-/**- * Implementation of the "Toolbar Toggle" component from:- * https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=1512%3A7422&t=BOWCrlme5NepfLUm-4- */-import * as ToolbarPrimitive from "@radix-ui/react-toolbar";-import { Slot, type SlotProps } from "@radix-ui/react-slot";-import { css, styled, theme } from "../stitches.config";-import { separatorStyle } from "./separator";-import { textVariants } from "./text";-import { forwardRef, type Ref } from "react";-import { focusRingStyle } from "./focus-ring";--export const Toolbar = styled(ToolbarPrimitive.Root, {- display: "flex",- height: theme.spacing[15],- background: theme.colors.backgroundTopbar,- color: theme.colors.foregroundContrastMain,- alignItems: "center",- gap: theme.spacing[5],-});--export const ToolbarToggleGroup = styled(ToolbarPrimitive.ToggleGroup, {- display: "flex",- alignItems: "center",-});--const focusRing = focusRingStyle();--const toggleItemStyle = css(textVariants.labels, {- // reset styles- boxSizing: "border-box",- position: "relative",- py: 0,- px: theme.spacing["5"],- appearance: "none",- border: "none",- outline: "none",- // center icon- display: "flex",- justifyContent: "center",- alignItems: "center",- // prevent shrinking inside flex box- flexShrink: 0,- // set size and shape- minWidth: theme.spacing["15"],- minHeight: theme.spacing["15"],-- color: "inherit",- background: "transparent",- transition: "200ms background",-- "&:focus-visible": focusRing,- "&:hover, &[data-state=on], &[data-state=open], &[aria-checked=true]": {- background: theme.colors.backgroundTopbarHover,- },- variants: {- // Just for story- focused: {- true: focusRing,- },- variant: {- subtle: {- color: theme.colors.foregroundTextMoreSubtle,- "&:hover, &[data-state=on], &[aria-checked=true]": {- color: "inherit",- },- },- preview: {- "&[data-state=on]": {- color: theme.colors.foregroundSuccess,- },- },- chevron: {- minWidth: "auto",- paddingInline: 0,- color: theme.colors.foregroundContrastSubtle,- "&:hover, &:focus-visible, &[aria-expanded=true]": {- color: theme.colors.foregroundContrastMain,- },- "&:focus-visible": focusRingStyle({ left: 0, right: 0 }),- },- },- },-});--export const ToolbarToggleItem = styled(- ToolbarPrimitive.ToggleItem,- toggleItemStyle-);--type ToolbarButtonProps = SlotProps & {- asChild?: boolean;-};--const ToolbarButtonBase = forwardRef(- ({ asChild, ...props }: ToolbarButtonProps, ref: Ref<HTMLButtonElement>) => {- const Component = asChild ? Slot : "button";- return <Component {...props} ref={ref} />;- }-);-ToolbarButtonBase.displayName = "ToolbarButton";--export const ToolbarButton = styled(ToolbarButtonBase, toggleItemStyle);--export const ToolbarSeparator = styled(- ToolbarPrimitive.Separator,- separatorStyle,- { background: theme.colors.borderDark }-);diff --git a/packages/design-system/src/components/tooltip.stories.tsx b/packages/design-system/src/components/tooltip.stories.tsxindex 579451d741..d455d1b683 100644--- a/packages/design-system/src/components/tooltip.stories.tsx+++ b/packages/design-system/src/components/tooltip.stories.tsx@@ -22,10 +22,10 @@ export const Tooltip = () => (<Text variant="labels">Tooltip</Text><Flex gap="3" align="center"><TooltipDesign content="HELLO" open>- <Button>With tooltip</Button>+ <Button color="primary">With tooltip</Button></TooltipDesign><TooltipDesign content={undefined}>- <Button>No tooltip content</Button>+ <Button color="primary">No tooltip content</Button></TooltipDesign></Flex></Flex>@@ -50,7 +50,9 @@ export const Tooltip = () => (side="right"open={true}>- <Button css={{ width: "100%", my: 10 }}>Tooltip 1</Button>+ <Button color="primary" css={{ width: "100%", my: 10 }}>+ Tooltip 1+ </Button></InputErrorsTooltip><br /><InputErrorsTooltip@@ -58,7 +60,9 @@ export const Tooltip = () => (side="right"open={true}>- <Button css={{ width: "100%", my: 10 }}>Tooltip 2</Button>+ <Button color="primary" css={{ width: "100%", my: 10 }}>+ Tooltip 2+ </Button></InputErrorsTooltip></Box></Box>@@ -69,16 +73,16 @@ export const Tooltip = () => (<StorySection title="Side placements"><Flex gap="6" wrap="wrap" css={{ padding: 60 }}><TooltipDesign content="Top tooltip" side="top" open>- <Button>Top</Button>+ <Button color="primary">Top</Button></TooltipDesign><TooltipDesign content="Right tooltip" side="right" open>- <Button>Right</Button>+ <Button color="primary">Right</Button></TooltipDesign><TooltipDesign content="Bottom tooltip" side="bottom" open>- <Button>Bottom</Button>+ <Button color="primary">Bottom</Button></TooltipDesign><TooltipDesign content="Left tooltip" side="left" open>- <Button>Left</Button>+ <Button color="primary">Left</Button></TooltipDesign></Flex></StorySection>@@ -92,7 +96,7 @@ export const Tooltip = () => (variant="wrapped"open>- <Button>Wrapped</Button>+ <Button color="primary">Wrapped</Button></TooltipDesign></Flex><Flex direction="column" gap="2">@@ -102,7 +106,7 @@ export const Tooltip = () => (variant="large"open>- <Button>Large</Button>+ <Button color="primary">Large</Button></TooltipDesign></Flex></Flex>diff --git a/packages/design-system/src/components/tooltip.tsx b/packages/design-system/src/components/tooltip.tsxindex a0b172f4d5..6396cf83f1 100644--- a/packages/design-system/src/components/tooltip.tsx+++ b/packages/design-system/src/components/tooltip.tsx@@ -13,6 +13,8 @@ import { Box } from "./box";import { Text } from "./text";import type { CSS } from "../stitches.config";import { theme } from "../stitches.config";+import { cssVar } from "../css-var";+import { menuCss, PanelArrowGraphic } from "./menu";export const TooltipProvider = TooltipPrimitive.TooltipProvider;@@ -25,10 +27,8 @@ export type TooltipProps = ComponentProps<typeof TooltipPrimitive.Root> &css?: CSS;};-const Content = styled(TooltipPrimitive.Content, {- backgroundColor: theme.colors.backgroundTooltipMain,- color: theme.colors.foregroundContrastMain,- borderRadius: theme.borderRadius[7],+const Content = styled(TooltipPrimitive.Content, menuCss, {+ color: cssVar("--foreground-primary"),padding: theme.panel.padding,position: "relative",@@ -44,11 +44,6 @@ const Content = styled(TooltipPrimitive.Content, {},});-const Arrow = styled(TooltipPrimitive.Arrow, {- fill: theme.colors.backgroundTooltipMain,- marginTop: -0.5,-});-export const Tooltip = forwardRef(({@@ -169,7 +164,14 @@ export const Tooltip = forwardRef(>{typeof content === "string" ? <Text>{content}</Text> : content}<Box css={{ color: "transparent" }}>- <Arrow offset={5} width={11} height={5} />+ <TooltipPrimitive.Arrow+ offset={5}+ width={11}+ height={5}+ asChild+ >+ <PanelArrowGraphic css={{ transform: "none" }} />+ </TooltipPrimitive.Arrow></Box></Content></TooltipPrimitive.Portal>diff --git a/packages/design-system/src/components/tree.browser.test.ts b/packages/design-system/src/components/tree.browser.test.tsnew file mode 100644index 0000000000..3082adb286--- /dev/null+++ b/packages/design-system/src/components/tree.browser.test.ts@@ -0,0 +1,93 @@+import { page } from "@vitest/browser/context";+import { createElement } from "react";+import { createRoot, type Root } from "react-dom/client";+import { act } from "react-dom/test-utils";+import { afterEach, expect, test } from "vitest";+import "../colors/colors.css";+import { TreeNode } from "./tree";++let root: Root | undefined;++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++afterEach(() => {+ act(() => root?.unmount());+ root = undefined;+ document.body.innerHTML = "";+ document.documentElement.removeAttribute("data-color-scheme");+});++test("selected Navigator rows preserve selection and show hover feedback", async () => {+ const hoverEscape = document.createElement("div");+ hoverEscape.style.height = "20px";+ document.body.append(hoverEscape);+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ for (const mode of ["light", "dark"] as const) {+ document.documentElement.dataset.colorScheme = mode;++ for (const selection of ["selected", "selected-descendant"] as const) {+ await page.elementLocator(hoverEscape).hover();+ act(() => {+ root?.render(+ createElement(TreeNode, {+ level: 1,+ isSelected: selection === "selected",+ isSelectedDescendant: selection === "selected-descendant",+ buttonProps: {},+ action: null,+ children: selection,+ })+ );+ });++ const node = container.querySelector("[data-selection-state]");+ if (node === null) {+ throw new Error("Expected a rendered Tree node");+ }+ const selectedBackground = getComputedStyle(node).backgroundColor;++ await page.elementLocator(node).hover();++ const hoveredStyle = getComputedStyle(node);+ expect(hoveredStyle.backgroundColor, `${mode} ${selection}`).toBe(+ selectedBackground+ );+ expect(hoveredStyle.backgroundImage, `${mode} ${selection}`).not.toBe(+ "none"+ );+ }+ }+});++test("tree actions stay transparent over selected and hovered rows", async () => {+ const container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);++ act(() => {+ root?.render(+ createElement(TreeNode, {+ level: 1,+ isSelected: true,+ buttonProps: {},+ action: createElement("button", null, "Action"),+ children: "A long tree node label",+ })+ );+ });++ const node = container.querySelector("[data-selection-state]");+ const action = container.querySelector("[data-tree-action]");+ if (node === null || action === null) {+ throw new Error("Expected a rendered Tree node action");+ }++ await page.elementLocator(node).hover();++ expect(getComputedStyle(action).backgroundColor).toBe("rgba(0, 0, 0, 0)");+});diff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsxindex 438e9d3361..c736f4d695 100644--- a/packages/design-system/src/components/tree.tsx+++ b/packages/design-system/src/components/tree.tsx@@ -29,11 +29,17 @@ import { styled, theme } from "../stitches.config";import { Box } from "./box";import { Text } from "./text";import { TreePositionIndicator } from "./list-position-indicator";+import { cssVar, declareCssVar } from "../css-var";+import { selectionBackground } from "./selection-color";-const treeNodeLevel = "--tree-node-level";-const treeNodeOutline = "--tree-node-outline";-const treeNodeBackgroundColor = "--tree-node-background-color";-const treeActionOpacity = "--tree-action-opacity";+const treeNodeLevel = declareCssVar("--tree-node-level");+const treeNodeOutline = declareCssVar("--tree-node-outline");+const treeNodeSelectionBackgroundColor = declareCssVar(+ "--tree-node-selection-background-color"+);+const treeNodeBackgroundColor = declareCssVar("--tree-node-background-color");+const treeActionOpacity = declareCssVar("--tree-action-opacity");+const treeActionWidth = declareCssVar("--tree-action-width");const TreeFocusRestoreContext = createContext<| undefined@@ -130,18 +136,24 @@ export const TreeRoot = ({ children }: { children: ReactNode }) => {const NodeContainer = styled("div", {position: "relative",height: theme.sizes.controlHeight,+ [treeNodeSelectionBackgroundColor]: "transparent",+ [treeNodeBackgroundColor]: cssVar(treeNodeSelectionBackgroundColor),+ background: cssVar(treeNodeBackgroundColor),"&:hover, &:has(:focus-visible), &:has([aria-current=true])": {- [treeNodeBackgroundColor]: theme.colors.backgroundHover,- backgroundColor: `var(${treeNodeBackgroundColor})`,+ [treeNodeBackgroundColor]: `linear-gradient(${cssVar(+ "--overlay-interaction-hover"+ )}, ${cssVar("--overlay-interaction-hover")}), ${cssVar(+ treeNodeSelectionBackgroundColor+ )}`,[treeActionOpacity]: 1,},'&[data-selection-state="selected-descendant"]': {- [treeNodeBackgroundColor]: theme.colors.backgroundItemCurrentChild,- backgroundColor: `var(${treeNodeBackgroundColor})`,+ [treeNodeSelectionBackgroundColor]: `color-mix(in oklab, ${selectionBackground} 50%, ${cssVar(+ "--background-primary"+ )})`,},'&[data-selection-state="selected"]': {- [treeNodeBackgroundColor]: theme.colors.backgroundItemCurrent,- backgroundColor: `var(${treeNodeBackgroundColor})`,+ [treeNodeSelectionBackgroundColor]: selectionBackground,},});@@ -154,8 +166,11 @@ const NodeButton = styled("button", {width: "100%",height: "inherit",minWidth: 0,- paddingLeft: `calc(${ITEM_PADDING_LEFT}px + var(${treeNodeLevel}) * 16px)`,- paddingRight: ITEM_PADDING_RIGHT,+ paddingLeft: `calc(${ITEM_PADDING_LEFT}px + ${cssVar(treeNodeLevel)} * 16px)`,+ paddingRight: `calc(${ITEM_PADDING_RIGHT}px + ${cssVar(+ treeActionWidth,+ "0px"+ )})`,flexBasis: 0,flexGrow: 1,position: "relative",@@ -168,7 +183,9 @@ const ExpandButton = styled("button", {alignItems: "center",position: "absolute",top: 0,- left: `calc(var(${treeNodeLevel}) * ${BARS_GAP}px - ${EXPAND_WIDTH / 2}px)`,+ left: `calc(${cssVar(treeNodeLevel)} * ${BARS_GAP}px - ${+ EXPAND_WIDTH / 2+ }px)`,width: EXPAND_WIDTH,height: "inherit",});@@ -176,15 +193,17 @@ const ExpandButton = styled("button", {const ActionContainer = styled("div", {// use opacity to hide action instead of visibility// to prevent focus loss while navigating with keyboard- opacity: `var(${treeActionOpacity}, 0)`,+ opacity: cssVar(treeActionOpacity, "0"),position: "sticky",translate: `-100% -100%`,- left: `calc(var(--sidebar-left-panel-width) - ${ITEM_PADDING_RIGHT}px)`,+ left: `calc(${cssVar(+ "--sidebar-left-panel-width"+ )} - ${ITEM_PADDING_RIGHT}px)`,height: "inherit",display: "inline-flex",justifyContent: "center",alignItems: "center",- backgroundColor: `var(${treeNodeBackgroundColor})`,+ background: "transparent",});const DropIndicator = ({@@ -507,6 +526,12 @@ export const TreeNode = ({data-selection-state={selectionState}css={{[treeNodeLevel]: level,+ [treeActionWidth]:+ action === null || action === undefined || actionCount === 0+ ? "0px"+ : actionCount > 1+ ? theme.spacing[14]+ : theme.spacing[9],...(isActionVisible && { [treeActionOpacity]: 1 }),}}onKeyDown={handleKeydown}diff --git a/packages/design-system/src/components/two-rows-icon-button-container.tsx b/packages/design-system/src/components/two-rows-icon-button-container.tsxindex 100b589157..353eab505d 100644--- a/packages/design-system/src/components/two-rows-icon-button-container.tsx+++ b/packages/design-system/src/components/two-rows-icon-button-container.tsx@@ -5,9 +5,10 @@import { forwardRef, type ReactNode, type Ref } from "react";import { css, theme, type CSS } from "../stitches.config";+import { cssVar } from "../css-var";const curveStyle = css({- fill: theme.colors.borderMain,+ fill: cssVar("--border-default"),alignSelf: "start",variants: { rotated: { true: { transform: "rotate(90deg)" } } },});diff --git a/packages/design-system/src/css-var.test.ts b/packages/design-system/src/css-var.test.tsnew file mode 100644index 0000000000..15c462b995--- /dev/null+++ b/packages/design-system/src/css-var.test.ts@@ -0,0 +1,36 @@+import { describe, expect, test } from "vitest";+import { cssVar, declareCssVar } from "./css-var";++const verifyPublicVariableType = () => {+ cssVar("--foreground-primary");+ declareCssVar("--select-button-chevron-color");+ cssVar("--select-button-chevron-color");+ // @ts-expect-error Authoring inputs are not public component variables.+ cssVar("--theme-color-accent");+ // @ts-expect-error Component variables must be explicitly declared.+ cssVar("--component-state");+ // @ts-expect-error CSS variable declarations must use custom property syntax.+ declareCssVar("component-state");+};+void verifyPublicVariableType;++describe("cssVar", () => {+ test("uses native CSS variable syntax", () => {+ expect(cssVar("--foreground-primary")).toBe("var(--foreground-primary)");+ expect(cssVar("--foreground-primary", "currentColor")).toBe(+ "var(--foreground-primary, currentColor)"+ );+ expect(+ cssVar("--foreground-primary", cssVar("--foreground-secondary"))+ ).toBe("var(--foreground-primary, var(--foreground-secondary))");+ });++ test("accepts globally declared component variables", () => {+ expect(cssVar("--select-button-chevron-color")).toBe(+ "var(--select-button-chevron-color)"+ );+ expect(cssVar("--select-button-chevron-color", "none")).toBe(+ "var(--select-button-chevron-color, none)"+ );+ });+});diff --git a/packages/design-system/src/css-var.ts b/packages/design-system/src/css-var.tsnew file mode 100644index 0000000000..bed26f0321--- /dev/null+++ b/packages/design-system/src/css-var.ts@@ -0,0 +1,7 @@+import type { CssVariableName } from "./colors/__generated__/css-variable-names";++export const declareCssVar = <const Name extends `--${string}`>(name: Name) =>+ name;++export const cssVar = (name: CssVariableName, fallback?: string) =>+ fallback === undefined ? `var(${name})` : `var(${name}, ${fallback})`;diff --git a/packages/design-system/src/css.d.ts b/packages/design-system/src/css.d.tsnew file mode 100644index 0000000000..78d1ba1ad9--- /dev/null+++ b/packages/design-system/src/css.d.ts@@ -0,0 +1,6 @@+declare module "*.css";++declare module "*.css?raw" {+ const source: string;+ export default source;+}diff --git a/packages/design-system/src/design-tokens.ts b/packages/design-system/src/design-tokens.tsindex bec04ccebc..ce692bd8d3 100644--- a/packages/design-system/src/design-tokens.ts+++ b/packages/design-system/src/design-tokens.ts@@ -368,165 +368,6 @@ export const borderRadius = {"5": "6px",} as const;-export const color = {- white: "#ffffff",- black: "#000000",- backgroundPanel: "#fff",- backgroundPrimary: "#096cff",- backgroundHover: "#efefef",- backgroundActive: "#096cff",- backgroundMenu: "#fff",- backgroundControls: "#f5f5f5",- backgroundAssetcardHover: "#e6e8eb",- backgroundNeutralMain: "#d7dbdf",- backgroundNeutralAccent: "#11181c",- backgroundNeutralNotification: "#f5f5f5",- backgroundNeutralDark: "#b2b2b2",- backgroundDestructiveMain: "#dc2929",- backgroundDestructiveNotification: "#ffe9e9",- backgroundSuccessMain: "#00894a",- backgroundSuccessNotification: "#e9f9ee",- backgroundStatusAttention: "#f4c430",- backgroundAlertMain: "#f5d90a",- backgroundAlertNotification: "#fffbd1",- backgroundInfoMain: "#0175dc",- backgroundInfoNotification: "#e0f0ff",- backgroundPresetMain: "#e6e6e6",- backgroundPresetHover: "#dfe3e6",- backgroundLocalMain: "#e1f0ff",- backgroundLocalHover: "#cee7fe",- backgroundRemoteMain: "#ffe8d7",- backgroundRemoteHover: "#ffdcc3",- backgroundInputSelected: "#b7d9f8",- backgroundInputDisabled: "#f8f8f8",- backgroundInputHighlight: "#b7d9f8",- backgroundButtonHover: "#00000010",- backgroundButtonPressed: "#0000001c",- backgroundButtonDisabled: "#e9ebed",- backgroundButtonDisabledDark: "#646464",- backgroundItemCurrent: "#e1f0ff",- backgroundItemCurrentChild: "#eef6ff",- backgroundItemCurrentHidden: "#7e868c",- backgroundItemMenuItemHover: "#efefef",- backgroundTooltipMain: "#11181c",- backgroundTooltipBuilder: "#ffffff",- backgroundTooltipDesigner: "#ffffff",- backgroundSpacingTopBottom: "#f8f8f8",- backgroundSpacingLeftRight: "#f1f3f5",- backgroundSpacingHover: "#e3e3e3",- backgroundStyleSourceSelected: "#096cff",- backgroundStyleSourceTag: "#d54113",- backgroundStyleSourceState: "#00894a",- backgroundStyleSourceNeutral: "#687076",- backgroundStyleSourceDisabled: "#9da2a6",- backgroundStyleSourceGradientSelected:- "linear-gradient(90deg, #096cff00 0%, #096cff 31.87%)",- backgroundStyleSourceGradientTag:- "linear-gradient(90deg, #d5411300 0%, #d54113 31.87%)",- backgroundStyleSourceGradientUnselected:- "linear-gradient(90deg, #68707600 0%, #687076 31.87%)",- backgroundStyleSourceBreakpoint: "#bd2fdb",- backgroundCanvas: "#eee",- backgroundTopbar: "#2d2d2d",- backgroundGradientPrimary:- "linear-gradient(135deg, #1774ff 0%, #bd2fdb 100%)",- backgroundGradientVertical:- "linear-gradient(180deg, #096cff 0%, #096cff 0.01%, #bd2fdb 100%)",- backgroundGradientHorizontal:- "linear-gradient(90deg, #4a4efa 0%, #bd2fdb 100%)",- backgroundGradientHorizontalReverse:- "linear-gradient(90deg, #bd2fdb 0%, #4a4efa 100%)",- backgroundMenuHint: "#efefef",- backgroundTopbarHover: "#383838",- backgroundWorkspace: "#a9a9a9",- backgroundIconSubtle: "#3e3e3e",- backgroundPrimaryLight: "#2e82ff",- backgroundOverwrittenMain: "#ffd9d9",- backgroundOverwrittenHover: "#fec4c4",- backgroundDisabledDark: "#323232",- brandBackgroundProjectCardFront:- "linear-gradient(0deg, #fbf8ff 0%, #e2e2e2 100%)",- brandBackgroundProjectCardBack:- "linear-gradient(0deg, #fbf8ff 0%, #c7c7c7 100%)",- brandBackgroundProjectCardTextArea: "#ffffff",- brandBackgroundPublishedMain: "#39fbbb",- brandBackgroundGradient: "linear-gradient(180deg, #e63cfe 0%, #ffae3c 100%)",- brandBackgroundPublishedContrast: "#ebfffc",- brandBackgroundDashboard:- "radial-gradient(65.88% 47.48% at 50% 50%, #FFFFFF 0%, #ffffff00 100%),linear-gradient(0deg, #ffffff00 49.46%, #ffffff54 100%), linear-gradient(180deg, #ffae3c00 0%, #e63cfe54 100%),radial-gradient(211.58% 161.63% at 3.13% 100%, #ffae3c4d 0%, #e335ff00 100%), radial-gradient(107.1% 32.15% at 92.96% 5.04%, #35ffb633 0%, #4a4efa33 100%), #EBFFFC;",- brandBackgroundRegularButtonSelected:- "linear-gradient(180deg, #bffeec 0%, #fbfff6 100%)",- brandBackgroundCtaButton: "linear-gradient(135deg, #4a4efa 0%, #bd2fdb 100%)",- brandForegroundPublished: "#00894a",- brandBorderPublished: "#ebfffc",- brandBorderFullGradient:- "linear-gradient(135deg, #92fddc 0%, #7d7ffb 31.94%, #ed72fe 64.24%, #fdd791 100%)",- brandBorderNavbar:- "linear-gradient(90deg, #39fbbb00 0%, #39fbbb 20%, #4a4efa 40.03%, #e63cfe 60.02%, #ffae3c 80.04%, #ffae3c00 100%, #ffae3c00 100%)",- brandSpinnerTurquoise: "#39fbbb",- brandSpinnerBlue: "#4a4efa",- brandSpinnerPurple: "#e63cfe",- brandSpinnerOrange: "#ffae3c",- borderMain: "#e6e6e6",- borderFocus: "#096cff",- borderMenuInner: "#fcfcfc",- borderColorSwatch: "#687076",- borderNeutral: "#e8e8e8",- borderSuccess: "#00894a",- borderAlert: "#e2c802",- borderInfo: "#096cff",- borderContrast: "#ffffff",- borderItemChildLine: "#889096",- borderItemChildLineCurrent: "#96c7f2",- borderLocalMain: "#b7d9f8",- borderLocalFlexUi: "#096cff",- borderRemoteMain: "#fbc69f",- borderRemoteFlexUi: "#fa934e",- borderDestructiveMain: "#d13a3a",- borderDestructiveNotification: "#f9c6c6",- borderDark: "#595c5d",- borderOverwrittenMain: "#fdaaab",- borderOverwrittenFlexUi: "#dc3d43",- borderPrimary: "#096cff",- foregroundMain: "#11181c",- foregroundSubtle: "#656869",- foregroundCategoryLabel: "#889096",- foregroundTextSubtle: "#687076",- foregroundDestructive: "#d13a3a",- foregroundSuccess: "#00b661",- foregroundInfo: "#096cff",- foregroundDisabled: "#c1c8cd",- foregroundHiddenItem: "#7e868c",- foregroundFlexUiMain: "#c7c7c7",- foregroundFlexUiHover: "#e3e3e3",- foregroundContrastMain: "#ffffff",- foregroundContrastSubtle: "#c1c8cd",- foregroundLocalMain: "#016ccc",- foregroundLocalFlexUi: "#237cff",- foregroundRemoteMain: "#b74900",- foregroundRemoteFlexUi: "#fa934e",- foregroundTextMoreSubtle: "#8d949a",- foregroundPrimary: "#096cff",- foregroundSuccessText: "#008447",- foregroundGridControlsDot: "#c7c7c7",- foregroundGridControlsDotHover: "#707375",- foregroundGridControlsFlexHover: "#e3e3e3",- foregroundIconSecondary: "#c1c8cd",- foregroundIconMain: "#11181c",- foregroundMoreSubtle: "#adb1b4",- foregroundScrollBar: "#a7acaf99",- foregroundOverwrittenMain: "#bf0007",- foregroundOverwrittenFlexUi: "#dc3d43",- foregroundInversePrimary: "#ff22ae",- foregroundReusable: "#834df4",- maintenanceLight: "#ededed",- maintenanceMedium: "#c7c7c7",- maintenanceDark: "#858585",- maintenanceSpacerViz: "#f9c6c6",- darkBlueFade: "linear-gradient(180deg, #11273f 0%, #11273f00 100%)",- strokeFade: "linear-gradient(180deg, #9697fc 0%, #4a4efa00 100%)",-} as const;-export const borderWidth = { "0": 1, "1": 2 } as const;export const dimension = { paragraphIndent_0: "0px" } as const;diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 1ab817af7f..49f9dec5b8 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -1,4 +1,9 @@export * from "./stitches.config";+export { cssVar, declareCssVar } from "./css-var";+export type { ThemeVariableName } from "./colors/__generated__/css-variable-names";+export { rotateBoundedBackgroundHue } from "./color-utils";+export { selectionBackground } from "./components/selection-color";+export { chromeControlStyle } from "./components/chrome-control-style";export * from "./components/storybook";export * from "./utilities";export { type SlotProps, Slot } from "@radix-ui/react-slot";@@ -10,6 +15,7 @@ export * from "./components/section-title";export * from "./components/separator";export * from "./components/button";export * from "./components/label";+export { styleSourceColor } from "./components/style-source-color";export * from "./components/select";export * from "./components/combobox";export * from "./components/dropdown-menu";@@ -37,7 +43,6 @@ export {menuItemCss,} from "./components/menu";export * from "./components/switch";-export * from "./components/toolbar";export * from "./components/two-rows-icon-button-container";export * from "./components/small-icon-button";export * from "./components/list-position-indicator";@@ -55,6 +60,7 @@ export * from "./components/input-field";export * from "./components/nested-input-button";export * from "./components/panel-tabs";export * from "./components/split-view";+export * from "./components/split-button";export * from "./components/link";export * from "./components/panel-banner";export * from "./components/focus-ring";diff --git a/packages/design-system/src/stitches.config.ts b/packages/design-system/src/stitches.config.tsindex b38b1883bc..0b7105eee2 100644--- a/packages/design-system/src/stitches.config.ts+++ b/packages/design-system/src/stitches.config.ts@@ -45,7 +45,6 @@ const spacing = {const { styled, css, getCssText, globalCss, keyframes, config, reset } =createStitches({theme: {- colors: tokens.color,fonts: {...tokens.fontFamilies,sans: tokens.fontFamilies.inter,@@ -194,9 +193,14 @@ const toVariblesNames = (values: VariblesValues): VariblesNames => {return result as VariblesNames;};-export const theme = toVariblesNames(config.theme);+const variableNames = toVariblesNames(config.theme);+export const theme = {+ ...variableNames,+};-export const rawTheme = config.theme;+export const rawTheme = {+ ...config.theme,+};export type CSS = Stitches.CSS<typeof config>;diff --git a/packages/design-system/src/test-setup.ts b/packages/design-system/src/test-setup.tsindex f55258a624..b7567cd4bb 100644--- a/packages/design-system/src/test-setup.ts+++ b/packages/design-system/src/test-setup.ts@@ -9,6 +9,9 @@ if (typeof g.CSS === "undefined") {// jsdom does not implement canvas, while hdr-color-input touches getContext// during module evaluation through the design-system barrel import.-if (g.HTMLCanvasElement !== undefined) {+if (+ g.HTMLCanvasElement !== undefined &&+ g.navigator?.userAgent.includes("jsdom")+) {g.HTMLCanvasElement.prototype.getContext = () => null;}diff --git a/packages/design-system/src/utilities.ts b/packages/design-system/src/utilities.tsindex aba6c11e1a..08e92a1b27 100644--- a/packages/design-system/src/utilities.ts+++ b/packages/design-system/src/utilities.ts@@ -1,8 +1,11 @@import { useCallback, useEffect, useMemo, useRef, useState } from "react";import warnOnce from "warn-once";import type { CSS } from "./stitches.config";+import { declareCssVar } from "./css-var";-export const canvasPointerEventsPropertyName = "--canvas-pointer-events";+const canvasPointerEventsPropertyName = declareCssVar(+ "--canvas-pointer-events"+);let disableCount = 0;@@ -29,7 +32,7 @@ const updateCanvasPointerEvents = () => {};/**- * Temporarily disables pointer events on the canvas using canvasPointerEventsPropertyName.+ * Temporarily disables pointer events on the canvas.* Use the returned disposable to re-enable them.** Implemented as disposable todiff --git a/packages/design-system/vitest.config.ts b/packages/design-system/vitest.config.tsindex a6784d6647..d64a7b6bbe 100644--- a/packages/design-system/vitest.config.ts+++ b/packages/design-system/vitest.config.ts@@ -1,6 +1,9 @@import { defineConfig } from "vitest/config";export default defineConfig({+ optimizeDeps: {+ include: ["react/jsx-dev-runtime"],+ },resolve: {conditions: ["webstudio", "browser", "development|production"],},@@ -10,7 +13,32 @@ export default defineConfig({},},test: {- environment: "jsdom",- setupFiles: ["./src/test-setup.ts"],+ workspace: [+ {+ extends: "./vitest.config.ts",+ test: {+ name: "browser",+ include: ["**/*.browser.{test,spec}.{ts,tsx}"],+ browser: {+ provider: "playwright",+ enabled: true,+ headless: true,+ screenshotFailures: false,+ instances: [{ browser: "chromium" }],+ },+ },+ },+ {+ extends: "./vitest.config.ts",+ test: {+ name: "unit",+ include: [+ "!**/*.browser.{test,spec}.{ts,tsx}",+ "**/*.{test,spec}.{ts,tsx}",+ ],+ environment: "node",+ },+ },+ ],},});diff --git a/packages/icons/icons/ai-loading.svg b/packages/icons/icons/ai-loading.svgindex 47c4fa6134..ad9e43c6bf 100644--- a/packages/icons/icons/ai-loading.svg+++ b/packages/icons/icons/ai-loading.svg@@ -14,7 +14,8 @@<pathd="M2.81592,12.9564c0,0,.699-2.7972,1.513-6.05155.285-1.1412,1.311-1.9416,2.487-1.9416c1.177,0,2.202.8004,2.487,1.9416.457,1.8276.87798,3.50995,1.15898,4.63435.2059.8244.9668,1.4172,1.816,1.4172c1.0186,0,1.872-.8534,1.872-1.872c0-2.36515,0-6.12835,0-6.12835"fill="none"- stroke="rgba(255,255,255,0.4)"+ stroke="currentColor"+ stroke-opacity="0.4"stroke-width="2.2"stroke-linecap="round"stroke-dasharray="0"@@ -23,7 +24,7 @@id="evA4hI5dD263"d="M2.81592,12.9564c0,0,.699-2.7972,1.513-6.05155"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="6.2"@@ -33,7 +34,7 @@id="evA4hI5dD264"d="M4.32892,6.90485c.285-1.1412,1.311-1.9416,2.487-1.9416c1.177,0,2.202.8004,2.487,1.9416"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="6.8"@@ -43,7 +44,7 @@id="evA4hI5dD265"d="M9.30292,6.90485c.093946.375699.326476,1.305406.561072,2.243404"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="2.32"@@ -53,7 +54,7 @@id="evA4hI5dD266"d="M9.863992,9.148254c.255929,1.023295.514316,2.056457.597908,2.390946"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="2.47"@@ -63,7 +64,7 @@id="evA4hI5dD267"d="M10.4619,11.5392c.2059.8244.9668,1.4172,1.816,1.4172c1.0186,0,1.872-.8534,1.872-1.872"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="5.42"@@ -73,7 +74,7 @@id="evA4hI5dD268"d="M14.1499,11.0844c0-2.36515,0-6.12835,0-6.12835"fill="none"- stroke="#fff"+ stroke="currentColor"stroke-width="3.3"stroke-linecap="round"stroke-dashoffset="6.13"diff --git a/packages/icons/icons/align-self-end.svg b/packages/icons/icons/align-self-end.svgindex 378bd47aca..75d76e7de6 100644--- a/packages/icons/icons/align-self-end.svg+++ b/packages/icons/icons/align-self-end.svg@@ -7,13 +7,13 @@><pathd="M7.34944 11.9032L8.65049 11.9032C9.36904 11.9032 9.95154 11.3207 9.95154 10.6021L9.95154 2.7958C9.95154 2.07725 9.36904 1.49475 8.65049 1.49475L7.34944 1.49475C6.63089 1.49475 6.04839 2.07725 6.04839 2.7958L6.04839 10.6021C6.04839 11.3207 6.63089 11.9032 7.34944 11.9032Z"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M1.50269 14.5052L14.5027 14.5052"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/icons/arrow-down-a-z.svg b/packages/icons/icons/arrow-down-a-z.svgindex 7c79dc4810..75f1e9e9b8 100644--- a/packages/icons/icons/arrow-down-a-z.svg+++ b/packages/icons/icons/arrow-down-a-z.svg@@ -7,35 +7,35 @@><pathd="M2 10.6667L4.66667 13.3333L7.33333 10.6667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M4.66669 13.3333V2.66667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M13.3333 5.33333H10"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M10 6.66667V4.33334C10 3.89131 10.1756 3.46739 10.4882 3.15483C10.8007 2.84227 11.2246 2.66667 11.6667 2.66667C12.1087 2.66667 12.5326 2.84227 12.8452 3.15483C13.1577 3.46739 13.3333 3.89131 13.3333 4.33334V6.66667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M10 9.33333H13.3333L10 13.3333H13.3333"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"diff --git a/packages/icons/icons/arrow-down-narrow-wide.svg b/packages/icons/icons/arrow-down-narrow-wide.svgindex 6bada34c9e..05a33cdf0c 100644--- a/packages/icons/icons/arrow-down-narrow-wide.svg+++ b/packages/icons/icons/arrow-down-narrow-wide.svg@@ -7,35 +7,35 @@><pathd="M2 10.6667L4.66667 13.3333L7.33333 10.6667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M4.66669 13.3333V2.66667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 2.66667H9.99998"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 5.33333H12"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 8H14"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"diff --git a/packages/icons/icons/arrow-down-wide-narrow.svg b/packages/icons/icons/arrow-down-wide-narrow.svgindex aa9011ab83..73af4b93d9 100644--- a/packages/icons/icons/arrow-down-wide-narrow.svg+++ b/packages/icons/icons/arrow-down-wide-narrow.svg@@ -7,35 +7,35 @@><pathd="M2 10.6667L4.66667 13.3333L7.33333 10.6667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M4.66669 13.3333V2.66667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 2.66667H14"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 5.33333H12"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.33331 8H9.99998"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"diff --git a/packages/icons/icons/arrow-down-z-a.svg b/packages/icons/icons/arrow-down-z-a.svgindex 305f9b6f9c..6e08d8bd0a 100644--- a/packages/icons/icons/arrow-down-z-a.svg+++ b/packages/icons/icons/arrow-down-z-a.svg@@ -7,35 +7,35 @@><pathd="M2 10.6667L4.66667 13.3333L7.33333 10.6667"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M4.66669 2.66667V13.3333"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M10 2.66667H13.3333L10 6.66667H13.3333"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M10 13.3333V11C10 10.558 10.1756 10.134 10.4882 9.82148C10.8007 9.50892 11.2246 9.33333 11.6667 9.33333C12.1087 9.33333 12.5326 9.50892 12.8452 9.82148C13.1577 10.134 13.3333 10.558 13.3333 11V13.3333"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"/><pathd="M13.3333 12H10"- stroke="black"+ stroke="currentColor"stroke-width="0.666667"stroke-linecap="round"stroke-linejoin="round"diff --git a/packages/icons/icons/border-radius.svg b/packages/icons/icons/border-radius.svgindex 2fa7b06231..f75d73cc21 100644--- a/packages/icons/icons/border-radius.svg+++ b/packages/icons/icons/border-radius.svg@@ -9,6 +9,6 @@fill-rule="evenodd"clip-rule="evenodd"d="M1.9165 10.6665C1.9165 5.83401 5.83401 1.9165 10.6665 1.9165H13.3334C13.7476 1.9165 14.0834 2.25229 14.0834 2.6665C14.0834 3.08072 13.7476 3.4165 13.3334 3.4165H10.6665C6.66244 3.4165 3.4165 6.66244 3.4165 10.6665V13.3334C3.4165 13.7476 3.08072 14.0834 2.6665 14.0834C2.25229 14.0834 1.9165 13.7476 1.9165 13.3334V10.6665Z"- fill="#11181C"+ fill="currentColor"/></svg>diff --git a/packages/icons/icons/border-width-individual.svg b/packages/icons/icons/border-width-individual.svgindex adf210be4e..8a472c036c 100644--- a/packages/icons/icons/border-width-individual.svg+++ b/packages/icons/icons/border-width-individual.svg@@ -7,25 +7,25 @@><pathd="M5.40002 1.74376H10.6"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M14.5 10.3562L14.5 5.15624"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M1.5 10.3562L1.5 5.15624"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M5.40002 14.2562H10.6"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/icons/chevrons-left.svg b/packages/icons/icons/chevrons-left.svgindex 54e23332da..7a72293f25 100644--- a/packages/icons/icons/chevrons-left.svg+++ b/packages/icons/icons/chevrons-left.svg@@ -7,13 +7,13 @@><pathd="M7.06883 12.656L2.41284 8L7.06883 3.34401"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M13.5871 12.656L8.93115 8L13.5871 3.34401"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/icons/dialog.svg b/packages/icons/icons/dialog.svgindex 06c4c0f3b7..33c93b6a7c 100644--- a/packages/icons/icons/dialog.svg+++ b/packages/icons/icons/dialog.svg@@ -7,11 +7,12 @@><pathd="M13.4444 1H2.55556C1.69645 1 1 1.69645 1 2.55556V13.4444C1 14.3036 1.69645 15 2.55556 15H13.4444C14.3036 15 15 14.3036 15 13.4444V2.55556C15 1.69645 14.3036 1 13.4444 1Z"- fill="#D2D2D2"+ fill="currentColor"+ fill-opacity="0.18"/><pathd="M11.3335 5.66667H4.66675L4.66679 10.3333H11.3335V5.66667Z"- fill="white"+ fill="currentColor"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"diff --git a/packages/icons/icons/gradient-conic.svg b/packages/icons/icons/gradient-conic.svgindex 90afbffadf..6030de65b6 100644--- a/packages/icons/icons/gradient-conic.svg+++ b/packages/icons/icons/gradient-conic.svg@@ -6,7 +6,7 @@xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#paint0_angular_9413_9319_clip_path)">- <g fill="#11181C">+ <g fill="currentColor"><path d="M8 8 L8 0 A8 8 0 0 1 12 1.072 Z" fill-opacity="1" /><path d="M8 8 L12 1.072 A8 8 0 0 1 14.928 4 Z" fill-opacity="0.909" /><path d="M8 8 L14.928 4 A8 8 0 0 1 16 8 Z" fill-opacity="0.818" />diff --git a/packages/icons/icons/gradient-linear.svg b/packages/icons/icons/gradient-linear.svgindex ac721c0181..379f7e0883 100644--- a/packages/icons/icons/gradient-linear.svg+++ b/packages/icons/icons/gradient-linear.svg@@ -18,8 +18,8 @@y2="14"gradientUnits="userSpaceOnUse">- <stop offset="0" stop-color="#11181C" stop-opacity="1" />- <stop offset="1" stop-color="#11181C" stop-opacity="0" />+ <stop offset="0" stop-color="currentColor" stop-opacity="1" />+ <stop offset="1" stop-color="currentColor" stop-opacity="0" /></linearGradient></defs></svg>diff --git a/packages/icons/icons/gradient-radial.svg b/packages/icons/icons/gradient-radial.svgindex 7e4e4d4574..16b1b20b5e 100644--- a/packages/icons/icons/gradient-radial.svg+++ b/packages/icons/icons/gradient-radial.svg@@ -18,8 +18,8 @@gradientUnits="userSpaceOnUse"gradientTransform="translate(8 8) rotate(135) scale(8.48528)">- <stop stop-color="#11181C" />- <stop offset="1" stop-color="#11181C" stop-opacity="0" />+ <stop stop-color="currentColor" />+ <stop offset="1" stop-color="currentColor" stop-opacity="0" /></radialGradient></defs></svg>diff --git a/packages/icons/icons/life-buoy.svg b/packages/icons/icons/life-buoy.svgindex bf84d53a5f..4c1a78356c 100644--- a/packages/icons/icons/life-buoy.svg+++ b/packages/icons/icons/life-buoy.svg@@ -8,10 +8,10 @@stroke-linecap="round"stroke-linejoin="round">- <circle cx="7.99483" cy="7.995" r="6.665" stroke="black" />+ <circle cx="7.99483" cy="7.995" r="6.665" /><path d="M3.2865 3.28667L6.11317 6.11333" /><path d="M9.88647 6.11333L12.7131 3.28667" /><path d="M9.88647 9.88667L12.7131 12.7133" /><path d="M6.11317 9.88667L3.2865 12.7133" />- <circle cx="7.99483" cy="7.995" r="2.665" stroke="black" />+ <circle cx="7.99483" cy="7.995" r="2.665" /></svg>diff --git a/packages/icons/icons/new-folder.svg b/packages/icons/icons/new-folder.svgindex 9d65bf9d58..41e4edd920 100644--- a/packages/icons/icons/new-folder.svg+++ b/packages/icons/icons/new-folder.svg@@ -7,19 +7,19 @@><pathd="M8 6.66667V10.6667"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M6 8.66667H10"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M13.3333 13.3333C13.6869 13.3333 14.026 13.1929 14.2761 12.9428C14.5261 12.6928 14.6666 12.3536 14.6666 12V5.33333C14.6666 4.97971 14.5261 4.64057 14.2761 4.39052C14.026 4.14048 13.6869 4 13.3333 4H8.06659C7.84359 4.00219 7.62362 3.94841 7.42679 3.84359C7.22995 3.73877 7.06256 3.58625 6.93992 3.4L6.39992 2.6C6.27851 2.41565 6.11323 2.26432 5.91892 2.1596C5.7246 2.05488 5.50732 2.00004 5.28658 2H2.66659C2.31296 2 1.97382 2.14048 1.72378 2.39052C1.47373 2.64057 1.33325 2.97971 1.33325 3.33333V12C1.33325 12.3536 1.47373 12.6928 1.72378 12.9428C1.97382 13.1929 2.31296 13.3333 2.66659 13.3333H13.3333Z"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/icons/overlay.svg b/packages/icons/icons/overlay.svgindex 5bb3877fad..97ed53c6eb 100644--- a/packages/icons/icons/overlay.svg+++ b/packages/icons/icons/overlay.svg@@ -7,6 +7,7 @@><pathd="M13.4444 1H2.55556C1.69645 1 1 1.69645 1 2.55556V13.4444C1 14.3036 1.69645 15 2.55556 15H13.4444C14.3036 15 15 14.3036 15 13.4444V2.55556C15 1.69645 14.3036 1 13.4444 1Z"- fill="#D2D2D2"+ fill="currentColor"+ fill-opacity="0.18"/></svg>diff --git a/packages/icons/icons/radio-group.svg b/packages/icons/icons/radio-group.svgindex b7ecccc61f..c1a5ff3552 100644--- a/packages/icons/icons/radio-group.svg+++ b/packages/icons/icons/radio-group.svg@@ -7,20 +7,20 @@><pathd="M8.83895 8C8.83895 9.00522 8.02406 9.82011 7.01884 9.82011C6.01362 9.82011 5.19873 9.00522 5.19873 8C5.19873 6.99478 6.01362 6.17989 7.01884 6.17989C8.02406 6.17989 8.83895 6.99478 8.83895 8Z"- fill="black"- stroke="black"+ fill="currentColor"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M7.01885 13.0269C9.79513 13.0269 12.0458 10.7763 12.0458 8C12.0458 5.22372 9.79513 2.9731 7.01885 2.9731C4.24257 2.9731 1.99194 5.22372 1.99194 8C1.99194 10.7763 4.24257 13.0269 7.01885 13.0269Z"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M12.6287 12.0769V12.0769C14.5853 9.51231 14.442 5.91604 12.2917 3.51154V3.51154"- stroke="black"+ stroke="currentColor"stroke-linecap="round"/></svg>diff --git a/packages/icons/icons/settings.svg b/packages/icons/icons/settings.svgindex b0902598c7..33c76a993a 100644--- a/packages/icons/icons/settings.svg+++ b/packages/icons/icons/settings.svg@@ -6,19 +6,13 @@xmlns="http://www.w3.org/2000/svg"><path- d="M13.987 6H9.32031"+ d="M9.32031 6H1.93164"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><path- d="M13.9316 6H1.93164"- stroke="currentColor"- stroke-linecap="round"- stroke-linejoin="round"- />- <path- d="M14 10.5L6.5 10.5L2 10.5"+ d="M14 10.5H6.5"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"@@ -29,7 +23,7 @@width="4"height="4"rx="2"- fill="white"+ fill="none"stroke="currentColor"/><rect@@ -38,7 +32,7 @@width="4"height="4"rx="2"- fill="white"+ fill="none"stroke="currentColor"/></svg>diff --git a/packages/icons/icons/slider.svg b/packages/icons/icons/slider.svgindex d3faf4ef7e..b3c6efa86e 100644--- a/packages/icons/icons/slider.svg+++ b/packages/icons/icons/slider.svg@@ -23,7 +23,7 @@width="3"height="3"rx="1.5"- fill="white"+ fill="currentColor"stroke="currentColor"/></svg>diff --git a/packages/icons/icons/tooltip.svg b/packages/icons/icons/tooltip.svgindex 57fb67e42f..809b217c32 100644--- a/packages/icons/icons/tooltip.svg+++ b/packages/icons/icons/tooltip.svg@@ -7,7 +7,7 @@><pathd="M14 10C14 10.3536 13.8595 10.6928 13.6095 10.9428C13.3594 11.1929 13.0203 11.3333 12.6667 11.3333H4.66667L2 14V3.33333C2 2.97971 2.14048 2.64057 2.39052 2.39052C2.64057 2.14048 2.97971 2 3.33333 2H12.6667C13.0203 2 13.3594 2.14048 13.6095 2.39052C13.8595 2.64057 14 2.97971 14 3.33333V10Z"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/icons/x-logo.svg b/packages/icons/icons/x-logo.svgindex 243d626e89..d943586931 100644--- a/packages/icons/icons/x-logo.svg+++ b/packages/icons/icons/x-logo.svg@@ -7,6 +7,6 @@><pathd="M9.14163 7.08118L13.6089 2H12.5503L8.67137 6.41192L5.57328 2H2L6.68492 8.6716L2 14H3.05866L7.15491 9.34086L10.4267 14H14L9.14137 7.08118H9.14163ZM7.69165 8.73038L7.21697 8.06604L3.44011 2.77981H5.06615L8.11412 7.04596L8.5888 7.71031L12.5508 13.2557H10.9248L7.69165 8.73063V8.73038Z"- fill="black"+ fill="currentColor"/></svg>diff --git a/packages/icons/icons/x-small.svg b/packages/icons/icons/x-small.svgindex 3c50b6af61..b991d04194 100644--- a/packages/icons/icons/x-small.svg+++ b/packages/icons/icons/x-small.svg@@ -7,13 +7,13 @@><pathd="M5.33337 10.6667L10.6667 5.33333"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/><pathd="M10.6667 10.6667L5.33337 5.33333"- stroke="black"+ stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"/>diff --git a/packages/icons/src/__generated__/components.tsx b/packages/icons/src/__generated__/components.tsxindex 1539cb0e76..ba6409dfa1 100644--- a/packages/icons/src/__generated__/components.tsx+++ b/packages/icons/src/__generated__/components.tsx@@ -77,16 +77,17 @@ export const AiLoadingIcon: IconComponent = forwardRef(</style><pathfill="none"- stroke="rgba(255,255,255,0.4)"+ stroke="currentColor"strokeDasharray="0"strokeLinecap="round"+ strokeOpacity=".4"strokeWidth="2.2"d="m2.816 12.956 1.513-6.051a2.563 2.563 0 0 1 4.974 0l1.159 4.634a1.888 1.888 0 0 0 1.816 1.417 1.892 1.892 0 0 0 1.872-1.872V4.956"/><pathid="c86546c68__evA4hI5dD263"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="6.24"strokeDashoffset="6.2"strokeLinecap="round"@@ -96,7 +97,7 @@ export const AiLoadingIcon: IconComponent = forwardRef(<pathid="c86546c68__evA4hI5dD264"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="6.8"strokeDashoffset="6.8"strokeLinecap="round"@@ -106,7 +107,7 @@ export const AiLoadingIcon: IconComponent = forwardRef(<pathid="c86546c68__evA4hI5dD265"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="2.32"strokeDashoffset="2.32"strokeLinecap="round"@@ -116,7 +117,7 @@ export const AiLoadingIcon: IconComponent = forwardRef(<pathid="c86546c68__evA4hI5dD266"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="2.47"strokeDashoffset="2.47"strokeLinecap="round"@@ -126,7 +127,7 @@ export const AiLoadingIcon: IconComponent = forwardRef(<pathid="c86546c68__evA4hI5dD267"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="5.42"strokeDashoffset="5.42"strokeLinecap="round"@@ -136,7 +137,7 @@ export const AiLoadingIcon: IconComponent = forwardRef(<pathid="c86546c68__evA4hI5dD268"fill="none"- stroke="#fff"+ stroke="currentColor"strokeDasharray="6.13"strokeDashoffset="6.13"strokeLinecap="round"@@ -663,7 +664,7 @@ export const AlignSelfEndIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M7.35 11.903h1.3c.719 0 1.302-.582 1.302-1.3V2.795c0-.719-.583-1.301-1.302-1.301h-1.3c-.72 0-1.302.582-1.302 1.3v7.807c0 .719.583 1.301 1.301 1.301ZM1.503 14.505h13"@@ -783,7 +784,7 @@ export const ArrowDownAZIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"strokeWidth=".667"@@ -808,7 +809,7 @@ export const ArrowDownNarrowWideIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"strokeWidth=".667"@@ -833,7 +834,7 @@ export const ArrowDownWideNarrowIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"strokeWidth=".667"@@ -858,7 +859,7 @@ export const ArrowDownZAIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"strokeWidth=".667"@@ -1374,7 +1375,7 @@ export const BorderRadiusIcon: IconComponent = forwardRef(ref={forwardedRef}><path- fill="#11181C"+ fill="currentColor"fillRule="evenodd"d="M1.917 10.666a8.75 8.75 0 0 1 8.75-8.75h2.666a.75.75 0 0 1 0 1.5h-2.667a7.25 7.25 0 0 0-7.25 7.25v2.667a.75.75 0 0 1-1.5 0v-2.667Z"clipRule="evenodd"@@ -1422,7 +1423,7 @@ export const BorderWidthIndividualIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M5.4 1.744h5.2M14.5 10.356v-5.2M1.5 10.356v-5.2M5.4 14.256h5.2"@@ -1905,7 +1906,7 @@ export const ChevronsLeftIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M7.069 12.656 2.413 8l4.656-4.656M13.587 12.656 8.931 8l4.656-4.656"@@ -2211,11 +2212,12 @@ export const DialogIcon: IconComponent = forwardRef(ref={forwardedRef}><path- fill="#D2D2D2"+ fill="currentColor"+ fillOpacity=".18"d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/><path- fill="#fff"+ fill="currentColor"stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"@@ -2961,7 +2963,7 @@ export const GradientConicIcon: IconComponent = forwardRef(ref={forwardedRef}><g- fill="#11181C"+ fill="currentColor"clipPath="url(#c15388f97__paint0_angular_9413_9319_clip_path)"><path d="M8 8V0a8 8 0 0 1 4 1.072Z" />@@ -3013,8 +3015,8 @@ export const GradientLinearIcon: IconComponent = forwardRef(y2="14"gradientUnits="userSpaceOnUse">- <stop offset="0" stopColor="#11181C" />- <stop offset="1" stopColor="#11181C" stopOpacity="0" />+ <stop offset="0" stopColor="currentColor" />+ <stop offset="1" stopColor="currentColor" stopOpacity="0" /></linearGradient></defs></svg>@@ -3048,8 +3050,8 @@ export const GradientRadialIcon: IconComponent = forwardRef(gradientTransform="translate(8 8) rotate(135) scale(8.48528)"gradientUnits="userSpaceOnUse">- <stop stopColor="#11181C" />- <stop offset="1" stopColor="#11181C" stopOpacity="0" />+ <stop stopColor="currentColor" />+ <stop offset="1" stopColor="currentColor" stopOpacity="0" /></radialGradient></defs></svg>@@ -3432,9 +3434,9 @@ export const LifeBuoyIcon: IconComponent = forwardRef({...props}ref={forwardedRef}>- <circle cx="7.995" cy="7.995" r="6.665" stroke="#000" />+ <circle cx="7.995" cy="7.995" r="6.665" /><path d="m3.287 3.287 2.826 2.826M9.886 6.113l2.827-2.826M9.886 9.887l2.827 2.826M6.113 9.887l-2.827 2.826" />- <circle cx="7.995" cy="7.995" r="2.665" stroke="#000" />+ <circle cx="7.995" cy="7.995" r="2.665" /></svg>);}@@ -3947,7 +3949,7 @@ export const NewFolderIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M8 6.667v4M6 8.667h4M13.333 13.333A1.333 1.333 0 0 0 14.667 12V5.333A1.334 1.334 0 0 0 13.333 4H8.067a1.333 1.333 0 0 1-1.127-.6l-.54-.8A1.333 1.333 0 0 0 5.287 2h-2.62a1.333 1.333 0 0 0-1.334 1.333V12a1.333 1.333 0 0 0 1.334 1.333h10.666Z"@@ -4146,7 +4148,8 @@ export const OverlayIcon: IconComponent = forwardRef(ref={forwardedRef}><path- fill="#D2D2D2"+ fill="currentColor"+ fillOpacity=".18"d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/></svg>@@ -4378,20 +4381,20 @@ export const RadioGroupIcon: IconComponent = forwardRef(ref={forwardedRef}><path- fill="#000"- stroke="#000"+ fill="currentColor"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M8.839 8a1.82 1.82 0 1 1-3.64 0 1.82 1.82 0 0 1 3.64 0Z"/><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M7.019 13.027a5.027 5.027 0 1 0 0-10.054 5.027 5.027 0 0 0 0 10.054Z"/><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"d="M12.629 12.077v0a6.73 6.73 0 0 0-.337-8.565v0"/>@@ -4795,14 +4798,13 @@ export const SettingsIcon: IconComponent = forwardRef(stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"- d="M13.987 6H9.32M13.932 6h-12M14 10.5H2"+ d="M9.32 6H1.932M14 10.5H6.5"/><rectwidth="4"height="4"x="1.932"y="8.534"- fill="#fff"stroke="currentColor"rx="2"/>@@ -4811,7 +4813,6 @@ export const SettingsIcon: IconComponent = forwardRef(height="4"x="10.068"y="4"- fill="#fff"stroke="currentColor"rx="2"/>@@ -4952,7 +4953,7 @@ export const SliderIcon: IconComponent = forwardRef(height="3"x="4.026"y="6.5"- fill="#fff"+ fill="currentColor"stroke="currentColor"rx="1.5"/>@@ -5560,7 +5561,7 @@ export const TooltipIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="M14 10a1.333 1.333 0 0 1-1.333 1.333h-8L2 14V3.333A1.333 1.333 0 0 1 3.333 2h9.334A1.333 1.333 0 0 1 14 3.333V10Z"@@ -6372,7 +6373,7 @@ export const XLogoIcon: IconComponent = forwardRef(ref={forwardedRef}><path- fill="#000"+ fill="currentColor"d="M9.142 7.081 13.609 2H12.55L8.671 6.412 5.573 2H2l4.685 6.672L2 14h1.059l4.096-4.66L10.427 14H14L9.141 7.081Zm-1.45 1.65-.475-.665L3.44 2.78h1.626l3.048 4.266.475.664 3.962 5.546h-1.626L7.692 8.73Z"/></svg>@@ -6394,7 +6395,7 @@ export const XSmallIcon: IconComponent = forwardRef(ref={forwardedRef}><path- stroke="#000"+ stroke="currentColor"strokeLinecap="round"strokeLinejoin="round"d="m5.333 10.667 5.334-5.334M10.667 10.667 5.333 5.333"diff --git a/packages/icons/src/__generated__/svg.ts b/packages/icons/src/__generated__/svg.tsindex f393f11482..3b5d2d85fb 100644--- a/packages/icons/src/__generated__/svg.ts+++ b/packages/icons/src/__generated__/svg.ts@@ -2,7 +2,7 @@ export const AccordionIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="noneexport const AddTemplateInstanceIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M4.5 2H3.333A1.333 1.333 0 0 0 2 3.333V4.5M14 12.667c0 .021 0 .042-.002.063M11.5 14h1.167a1.333 1.333 0 0 0 1.331-1.27m0 0V11.5M2 11.5v1.167A1.333 1.333 0 0 0 3.333 14H4.5M7 14h2M2 7v2M8.461 4.77H14M11.23 2v5.538"/></svg>`;-export const AiLoadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" id="c86546c68__evA4hI5dD261" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 17 17" fill="currentColor" width="100%" height="100%" style="display: block;"><style>@keyframes evA4hI5dD263_s_do{0%,to{stroke-dashoffset:6.2}17.5%,82.5%{stroke-dashoffset:-6.24}}@keyframes evA4hI5dD264_s_do{0%,10%,90%,to{stroke-dashoffset:6.8}22.5%,77.5%{stroke-dashoffset:-6.8}}@keyframes evA4hI5dD265_s_do{0%,17.5%,82.5%,to{stroke-dashoffset:2.32}27.5%,72.5%{stroke-dashoffset:-2.32}}@keyframes evA4hI5dD266_s_do{0%,22.5%,77.5%,to{stroke-dashoffset:2.47}32.5%,67.5%{stroke-dashoffset:-2.47}}@keyframes evA4hI5dD267_s_do{0%,27.5%,72.5%,to{stroke-dashoffset:5.42}40%,60%{stroke-dashoffset:-5.42}}@keyframes evA4hI5dD268_s_do{0%,32.5%,67.5%,to{stroke-dashoffset:6.13}50%{stroke-dashoffset:-6.1}}#c86546c68__evA4hI5dD263{animation:evA4hI5dD263_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD264{animation:evA4hI5dD264_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD265{animation:evA4hI5dD265_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD266{animation:evA4hI5dD266_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD267{animation:evA4hI5dD267_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD268{animation:evA4hI5dD268_s_do 4000ms linear infinite normal forwards}</style><path fill="none" stroke="rgba(255,255,255,0.4)" stroke-dasharray="0" stroke-linecap="round" stroke-width="2.2" d="m2.816 12.956 1.513-6.051a2.563 2.563 0 0 1 4.974 0l1.159 4.634a1.888 1.888 0 0 0 1.816 1.417 1.892 1.892 0 0 0 1.872-1.872V4.956"/><path id="c86546c68__evA4hI5dD263" fill="none" stroke="#fff" stroke-dasharray="6.24" stroke-dashoffset="6.2" stroke-linecap="round" stroke-width="3.3" d="m2.816 12.956 1.513-6.051"/><path id="c86546c68__evA4hI5dD264" fill="none" stroke="#fff" stroke-dasharray="6.8" stroke-dashoffset="6.8" stroke-linecap="round" stroke-width="3.3" d="M4.329 6.905a2.563 2.563 0 0 1 4.974 0"/><path id="c86546c68__evA4hI5dD265" fill="none" stroke="#fff" stroke-dasharray="2.32" stroke-dashoffset="2.32" stroke-linecap="round" stroke-width="3.3" d="m9.303 6.905.561 2.243"/><path id="c86546c68__evA4hI5dD266" fill="none" stroke="#fff" stroke-dasharray="2.47" stroke-dashoffset="2.47" stroke-linecap="round" stroke-width="3.3" d="m9.864 9.148.598 2.391"/><path id="c86546c68__evA4hI5dD267" fill="none" stroke="#fff" stroke-dasharray="5.42" stroke-dashoffset="5.42" stroke-linecap="round" stroke-width="3.3" d="M10.462 11.54a1.888 1.888 0 0 0 1.816 1.416 1.892 1.892 0 0 0 1.872-1.872"/><path id="c86546c68__evA4hI5dD268" fill="none" stroke="#fff" stroke-dasharray="6.13" stroke-dashoffset="6.13" stroke-linecap="round" stroke-width="3.3" d="M14.15 11.084V4.956"/></svg>`;+export const AiLoadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" id="c86546c68__evA4hI5dD261" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 17 17" fill="currentColor" width="100%" height="100%" style="display: block;"><style>@keyframes evA4hI5dD263_s_do{0%,to{stroke-dashoffset:6.2}17.5%,82.5%{stroke-dashoffset:-6.24}}@keyframes evA4hI5dD264_s_do{0%,10%,90%,to{stroke-dashoffset:6.8}22.5%,77.5%{stroke-dashoffset:-6.8}}@keyframes evA4hI5dD265_s_do{0%,17.5%,82.5%,to{stroke-dashoffset:2.32}27.5%,72.5%{stroke-dashoffset:-2.32}}@keyframes evA4hI5dD266_s_do{0%,22.5%,77.5%,to{stroke-dashoffset:2.47}32.5%,67.5%{stroke-dashoffset:-2.47}}@keyframes evA4hI5dD267_s_do{0%,27.5%,72.5%,to{stroke-dashoffset:5.42}40%,60%{stroke-dashoffset:-5.42}}@keyframes evA4hI5dD268_s_do{0%,32.5%,67.5%,to{stroke-dashoffset:6.13}50%{stroke-dashoffset:-6.1}}#c86546c68__evA4hI5dD263{animation:evA4hI5dD263_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD264{animation:evA4hI5dD264_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD265{animation:evA4hI5dD265_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD266{animation:evA4hI5dD266_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD267{animation:evA4hI5dD267_s_do 4000ms linear infinite normal forwards}#c86546c68__evA4hI5dD268{animation:evA4hI5dD268_s_do 4000ms linear infinite normal forwards}</style><path fill="none" stroke="currentColor" stroke-dasharray="0" stroke-linecap="round" stroke-opacity=".4" stroke-width="2.2" d="m2.816 12.956 1.513-6.051a2.563 2.563 0 0 1 4.974 0l1.159 4.634a1.888 1.888 0 0 0 1.816 1.417 1.892 1.892 0 0 0 1.872-1.872V4.956"/><path id="c86546c68__evA4hI5dD263" fill="none" stroke="currentColor" stroke-dasharray="6.24" stroke-dashoffset="6.2" stroke-linecap="round" stroke-width="3.3" d="m2.816 12.956 1.513-6.051"/><path id="c86546c68__evA4hI5dD264" fill="none" stroke="currentColor" stroke-dasharray="6.8" stroke-dashoffset="6.8" stroke-linecap="round" stroke-width="3.3" d="M4.329 6.905a2.563 2.563 0 0 1 4.974 0"/><path id="c86546c68__evA4hI5dD265" fill="none" stroke="currentColor" stroke-dasharray="2.32" stroke-dashoffset="2.32" stroke-linecap="round" stroke-width="3.3" d="m9.303 6.905.561 2.243"/><path id="c86546c68__evA4hI5dD266" fill="none" stroke="currentColor" stroke-dasharray="2.47" stroke-dashoffset="2.47" stroke-linecap="round" stroke-width="3.3" d="m9.864 9.148.598 2.391"/><path id="c86546c68__evA4hI5dD267" fill="none" stroke="currentColor" stroke-dasharray="5.42" stroke-dashoffset="5.42" stroke-linecap="round" stroke-width="3.3" d="M10.462 11.54a1.888 1.888 0 0 0 1.816 1.416 1.892 1.892 0 0 0 1.872-1.872"/><path id="c86546c68__evA4hI5dD268" fill="none" stroke="currentColor" stroke-dasharray="6.13" stroke-dashoffset="6.13" stroke-linecap="round" stroke-width="3.3" d="M14.15 11.084V4.956"/></svg>`;export const AiIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" d="m1.5 12.588 1.735-6.94a2.94 2.94 0 0 1 5.705 0l1.33 5.315a2.165 2.165 0 0 0 2.083 1.625 2.17 2.17 0 0 0 2.147-2.147v-7.03"/></svg>`;@@ -42,7 +42,7 @@ export const AlignSelfBaselineIcon = `<svg xmlns="http://www.w3.org/2000/svg" fiexport const AlignSelfCenterIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M6.048 6.048V4.097c0-.719.583-1.301 1.301-1.301H8.65c.719 0 1.302.582 1.302 1.3v1.952m0 3.904v1.951c0 .719-.583 1.301-1.302 1.301h-1.3a1.301 1.301 0 0 1-1.302-1.3V9.951M1.503 8h13"/></svg>`;-export const AlignSelfEndIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.35 11.903h1.3c.719 0 1.302-.582 1.302-1.3V2.795c0-.719-.583-1.301-1.302-1.301h-1.3c-.72 0-1.302.582-1.302 1.3v7.807c0 .719.583 1.301 1.301 1.301ZM1.503 14.505h13"/></svg>`;+export const AlignSelfEndIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.35 11.903h1.3c.719 0 1.302-.582 1.302-1.3V2.795c0-.719-.583-1.301-1.302-1.301h-1.3c-.72 0-1.302.582-1.302 1.3v7.807c0 .719.583 1.301 1.301 1.301ZM1.503 14.505h13"/></svg>`;export const AlignSelfStartIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8.65 4.097h-1.3c-.719 0-1.302.582-1.302 1.3v7.807c0 .719.583 1.301 1.302 1.301h1.3c.72 0 1.302-.582 1.302-1.3V5.397c0-.719-.583-1.301-1.301-1.301ZM14.497 1.495h-13"/></svg>`;@@ -52,13 +52,13 @@ export const AlignStartHorizontalIcon = `<svg xmlns="http://www.w3.org/2000/svg"export const AnimationGroupIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M4.5 8.3C6.3 7.7 7.8 8 9.3 11c.3-1.8 1.2-4.5 2.1-6M4.208 1.5H2.944A1.444 1.444 0 0 0 1.5 2.944v1.264m13 0V2.944A1.444 1.444 0 0 0 13.056 1.5h-1.264M14.5 13.056c0 .023 0 .046-.002.069M11.792 14.5h1.264a1.444 1.444 0 0 0 1.442-1.375m0 0v-1.333m-12.998 0v1.264A1.444 1.444 0 0 0 2.944 14.5h1.264m2.709-13h2.166m-2.166 13h2.166M1.5 6.917v2.166m13-2.166v2.166"/></svg>`;-export const ArrowDownAZIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M13.333 5.333H10M10 6.667V4.333a1.667 1.667 0 1 1 3.333 0v2.334M10 9.333h3.333l-3.333 4h3.333"/></svg>`;+export const ArrowDownAZIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M13.333 5.333H10M10 6.667V4.333a1.667 1.667 0 1 1 3.333 0v2.334M10 9.333h3.333l-3.333 4h3.333"/></svg>`;-export const ArrowDownNarrowWideIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M7.333 2.667H10M7.333 5.333H12M7.333 8H14"/></svg>`;+export const ArrowDownNarrowWideIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M7.333 2.667H10M7.333 5.333H12M7.333 8H14"/></svg>`;-export const ArrowDownWideNarrowIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M7.333 2.667H14M7.333 5.333H12M7.333 8H10"/></svg>`;+export const ArrowDownWideNarrowIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 13.333V2.667M7.333 2.667H14M7.333 5.333H12M7.333 8H10"/></svg>`;-export const ArrowDownZAIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 2.667v10.666M10 2.667h3.333l-3.333 4h3.333M10 13.333V11a1.667 1.667 0 1 1 3.333 0v2.333M13.333 12H10"/></svg>`;+export const ArrowDownZAIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667" d="m2 10.667 2.667 2.666 2.666-2.666M4.667 2.667v10.666M10 2.667h3.333l-3.333 4h3.333M10 13.333V11a1.667 1.667 0 1 1 3.333 0v2.333M13.333 12H10"/></svg>`;export const ArrowDownIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 3.333v9.334M12.667 8 8 12.667 3.333 8"/></svg>`;@@ -100,11 +100,11 @@ export const BorderRadiusTopLeftIcon = `<svg xmlns="http://www.w3.org/2000/svg"export const BorderRadiusTopRightIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M3 3h6.364A3.636 3.636 0 0 1 13 6.636V13"/></svg>`;-export const BorderRadiusIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="#11181C" fill-rule="evenodd" d="M1.917 10.666a8.75 8.75 0 0 1 8.75-8.75h2.666a.75.75 0 0 1 0 1.5h-2.667a7.25 7.25 0 0 0-7.25 7.25v2.667a.75.75 0 0 1-1.5 0v-2.667Z" clip-rule="evenodd"/></svg>`;+export const BorderRadiusIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-rule="evenodd" d="M1.917 10.666a8.75 8.75 0 0 1 8.75-8.75h2.666a.75.75 0 0 1 0 1.5h-2.667a7.25 7.25 0 0 0-7.25 7.25v2.667a.75.75 0 0 1-1.5 0v-2.667Z" clip-rule="evenodd"/></svg>`;export const BorderWidthBottomIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M14 14H2m0-3.667v-7C2 2.597 2.597 2 3.333 2h9.334C13.403 2 14 2.597 14 3.333v7"/></svg>`;-export const BorderWidthIndividualIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M5.4 1.744h5.2M14.5 10.356v-5.2M1.5 10.356v-5.2M5.4 14.256h5.2"/></svg>`;+export const BorderWidthIndividualIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M5.4 1.744h5.2M14.5 10.356v-5.2M1.5 10.356v-5.2M5.4 14.256h5.2"/></svg>`;export const BorderWidthLeftIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M2 14V2m3.667 0h7C13.403 2 14 2.597 14 3.333v9.334c0 .736-.597 1.333-1.333 1.333h-7"/></svg>`;@@ -142,7 +142,7 @@ export const ChevronRightIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="nexport const ChevronUpIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M12 10 8 6l-4 4"/></svg>`;-export const ChevronsLeftIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.069 12.656 2.413 8l4.656-4.656M13.587 12.656 8.931 8l4.656-4.656"/></svg>`;+export const ChevronsLeftIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.069 12.656 2.413 8l4.656-4.656M13.587 12.656 8.931 8l4.656-4.656"/></svg>`;export const CircleIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-rule="evenodd" d="M8 3.65a4.35 4.35 0 1 0 0 8.7 4.35 4.35 0 0 0 0-8.7ZM2.35 8a5.65 5.65 0 1 1 11.3 0 5.65 5.65 0 0 1-11.3 0Z" clip-rule="evenodd"/></svg>`;@@ -166,7 +166,7 @@ export const DashedBorderIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="nexport const DescriptionIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.333 3.135a.47.47 0 0 0-.802-.332L4.275 5.058a.933.933 0 0 1-.664.275H2A.667.667 0 0 0 1.333 6v4a.667.667 0 0 0 .667.667h1.61a.934.934 0 0 1 .665.275l2.256 2.256a.47.47 0 0 0 .802-.333v-9.73ZM10.667 6a3.333 3.333 0 0 1 0 4M12.91 12.243a6 6 0 0 0 0-8.486"/></svg>`;-export const DialogIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="#D2D2D2" d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/><path fill="#fff" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M11.334 5.667H4.667v4.666h6.667V5.667Z"/></svg>`;+export const DialogIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-opacity=".18" d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/><path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M11.334 5.667H4.667v4.666h6.667V5.667Z"/></svg>`;export const DimensionsIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M2.833 6.833v-4h4"/><path fill="currentColor" fill-rule="evenodd" d="M3.687 2.98a.5.5 0 0 0-.707.707l8.48 8.48H8.666a.5.5 0 1 0 0 1h4a.5.5 0 0 0 .5-.5v-4a.5.5 0 1 0-1 0v2.793l-8.48-8.48Z" clip-rule="evenodd"/></svg>`;@@ -222,11 +222,11 @@ export const GithubIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0export const GoogleIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" d="M14.72 8.16c0-.497-.045-.975-.127-1.433H8v2.711h3.767a3.228 3.228 0 0 1-1.406 2.107v1.762h2.272c1.323-1.222 2.087-3.016 2.087-5.148Z"/><path fill="currentColor" d="M8 15c1.89 0 3.475-.624 4.633-1.693l-2.272-1.762c-.624.42-1.42.674-2.361.674-1.82 0-3.366-1.228-3.92-2.883H1.75v1.808A6.993 6.993 0 0 0 8 15Z"/><path fill="currentColor" d="M4.08 9.33A4.195 4.195 0 0 1 3.857 8c0-.465.083-.91.223-1.33V4.863H1.75A6.914 6.914 0 0 0 1 8c0 1.133.274 2.195.75 3.137l1.815-1.412.515-.395Z"/><path fill="currentColor" d="M8 3.787c1.03 0 1.947.357 2.679 1.044l2.005-2.005C11.468 1.694 9.89 1 8 1a6.988 6.988 0 0 0-6.25 3.863L4.08 6.67C4.634 5.015 6.18 3.787 8 3.787Z"/></svg>`;-export const GradientConicIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><g fill="#11181C" clip-path="url(#c15388f97__paint0_angular_9413_9319_clip_path)"><path d="M8 8V0a8 8 0 0 1 4 1.072Z"/><path fill-opacity=".909" d="m8 8 4-6.928A8 8 0 0 1 14.928 4Z"/><path fill-opacity=".818" d="m8 8 6.928-4A8 8 0 0 1 16 8Z"/><path fill-opacity=".727" d="M8 8h8a8 8 0 0 1-1.072 4Z"/><path fill-opacity=".636" d="m8 8 6.928 4A8 8 0 0 1 12 14.928Z"/><path fill-opacity=".545" d="m8 8 4 6.928A8 8 0 0 1 8 16Z"/><path fill-opacity=".455" d="M8 8v8a8 8 0 0 1-4-1.072Z"/><path fill-opacity=".364" d="m8 8-4 6.928A8 8 0 0 1 1.072 12Z"/><path fill-opacity=".273" d="m8 8-6.928 4A8 8 0 0 1 0 8Z"/><path fill-opacity=".182" d="M8 8H0a8 8 0 0 1 1.072-4Z"/><path fill-opacity=".091" d="M8 8 1.072 4A8 8 0 0 1 4 1.072Z"/><path fill="none" d="M8 8 4 1.072A8 8 0 0 1 8 0Z"/></g><defs><clipPath id="c15388f97__paint0_angular_9413_9319_clip_path"><path d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/></clipPath></defs></svg>`;+export const GradientConicIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><g fill="currentColor" clip-path="url(#c15388f97__paint0_angular_9413_9319_clip_path)"><path d="M8 8V0a8 8 0 0 1 4 1.072Z"/><path fill-opacity=".909" d="m8 8 4-6.928A8 8 0 0 1 14.928 4Z"/><path fill-opacity=".818" d="m8 8 6.928-4A8 8 0 0 1 16 8Z"/><path fill-opacity=".727" d="M8 8h8a8 8 0 0 1-1.072 4Z"/><path fill-opacity=".636" d="m8 8 6.928 4A8 8 0 0 1 12 14.928Z"/><path fill-opacity=".545" d="m8 8 4 6.928A8 8 0 0 1 8 16Z"/><path fill-opacity=".455" d="M8 8v8a8 8 0 0 1-4-1.072Z"/><path fill-opacity=".364" d="m8 8-4 6.928A8 8 0 0 1 1.072 12Z"/><path fill-opacity=".273" d="m8 8-6.928 4A8 8 0 0 1 0 8Z"/><path fill-opacity=".182" d="M8 8H0a8 8 0 0 1 1.072-4Z"/><path fill-opacity=".091" d="M8 8 1.072 4A8 8 0 0 1 4 1.072Z"/><path fill="none" d="M8 8 4 1.072A8 8 0 0 1 8 0Z"/></g><defs><clipPath id="c15388f97__paint0_angular_9413_9319_clip_path"><path d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/></clipPath></defs></svg>`;-export const GradientLinearIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="url(#c1fa533d5__gradient-linear_svg__a)" d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/><defs><linearGradient id="c1fa533d5__gradient-linear_svg__a" x1="8" x2="8" y1="2" y2="14" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#11181C"/><stop offset="1" stop-color="#11181C" stop-opacity="0"/></linearGradient></defs></svg>`;+export const GradientLinearIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="url(#c1fa533d5__gradient-linear_svg__a)" d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/><defs><linearGradient id="c1fa533d5__gradient-linear_svg__a" x1="8" x2="8" y1="2" y2="14" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="currentColor"/><stop offset="1" stop-color="currentColor" stop-opacity="0"/></linearGradient></defs></svg>`;-export const GradientRadialIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="url(#c539a7588__paint0_radial_9420_9425)" d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/><defs><radialGradient id="c539a7588__paint0_radial_9420_9425" cx="0" cy="0" r="1" gradientTransform="translate(8 8) rotate(135) scale(8.48528)" gradientUnits="userSpaceOnUse"><stop stop-color="#11181C"/><stop offset="1" stop-color="#11181C" stop-opacity="0"/></radialGradient></defs></svg>`;+export const GradientRadialIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="url(#c539a7588__paint0_radial_9420_9425)" d="M2 5.2c0-1.12 0-1.68.218-2.108a2 2 0 0 1 .874-.874C3.52 2 4.08 2 5.2 2h5.6c1.12 0 1.68 0 2.108.218a2 2 0 0 1 .874.874C14 3.52 14 4.08 14 5.2v5.6c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874C12.48 14 11.92 14 10.8 14H5.2c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C2 12.48 2 11.92 2 10.8V5.2Z"/><defs><radialGradient id="c539a7588__paint0_radial_9420_9425" cx="0" cy="0" r="1" gradientTransform="translate(8 8) rotate(135) scale(8.48528)" gradientUnits="userSpaceOnUse"><stop stop-color="currentColor"/><stop offset="1" stop-color="currentColor" stop-opacity="0"/></radialGradient></defs></svg>`;export const GrowIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M4 8h4M6 10 4 8l2-2M12 8H8M10 6l2 2-2 2M2 14V2M14.003 14V2"/></svg>`;@@ -254,7 +254,7 @@ export const LabelIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viexport const LargeXIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M12.5 3 3 12.5M3 3l9.5 9.5"/></svg>`;-export const LifeBuoyIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><circle cx="7.995" cy="7.995" r="6.665" stroke="#000"/><path d="m3.287 3.287 2.826 2.826M9.886 6.113l2.827-2.826M9.886 9.887l2.827 2.826M6.113 9.887l-2.827 2.826"/><circle cx="7.995" cy="7.995" r="2.665" stroke="#000"/></svg>`;+export const LifeBuoyIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><circle cx="7.995" cy="7.995" r="6.665"/><path d="m3.287 3.287 2.826 2.826M9.886 6.113l2.827-2.826M9.886 9.887l2.827 2.826M6.113 9.887l-2.827 2.826"/><circle cx="7.995" cy="7.995" r="2.665"/></svg>`;export const Link2UnlinkedIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M10 4.667h1.333a3.333 3.333 0 0 1 0 6.666H10m-4 0H4.667a3.333 3.333 0 0 1 0-6.666H6"/></svg>`;@@ -292,7 +292,7 @@ export const NavigationMenuIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill=export const NavigatorIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M4.5 8H15M1 4.5h10.5M4.5 11.5H15"/></svg>`;-export const NewFolderIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M8 6.667v4M6 8.667h4M13.333 13.333A1.333 1.333 0 0 0 14.667 12V5.333A1.334 1.334 0 0 0 13.333 4H8.067a1.333 1.333 0 0 1-1.127-.6l-.54-.8A1.333 1.333 0 0 0 5.287 2h-2.62a1.333 1.333 0 0 0-1.334 1.333V12a1.333 1.333 0 0 0 1.334 1.333h10.666Z"/></svg>`;+export const NewFolderIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 6.667v4M6 8.667h4M13.333 13.333A1.333 1.333 0 0 0 14.667 12V5.333A1.334 1.334 0 0 0 13.333 4H8.067a1.333 1.333 0 0 1-1.127-.6l-.54-.8A1.333 1.333 0 0 0 5.287 2h-2.62a1.333 1.333 0 0 0-1.334 1.333V12a1.333 1.333 0 0 0 1.334 1.333h10.666Z"/></svg>`;export const NewPageIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M10 1.333H4a1.333 1.333 0 0 0-1.333 1.334v10.666A1.333 1.333 0 0 0 4 14.667h8a1.333 1.333 0 0 0 1.333-1.334V4.667L10 1.333Z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M9.333 1.333V4a1.333 1.333 0 0 0 1.334 1.333h2.666M6 10h4M8 12V8"/></svg>`;@@ -306,7 +306,7 @@ export const OrderFirstIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="nonexport const OrderLastIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M3.547 3.667h-.981c-.542 0-.982.403-.982.9v7.2c0 .497.44.9.982.9h.98c.543 0 .982-.403.982-.9v-7.2c0-.497-.44-.9-.981-.9ZM8.49 3.667h-.98c-.542 0-.982.403-.982.9v7.2c0 .497.44.9.981.9h.982c.542 0 .981-.403.981-.9v-7.2c0-.497-.44-.9-.981-.9Z"/><path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M13.434 3.667h-.98c-.543 0-.982.403-.982.9v7.2c0 .497.44.9.981.9h.982c.541 0 .98-.403.98-.9v-7.2c0-.497-.439-.9-.98-.9Z"/></svg>`;-export const OverlayIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="#D2D2D2" d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/></svg>`;+export const OverlayIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-opacity=".18" d="M13.444 1H2.556C1.696 1 1 1.696 1 2.556v10.888C1 14.304 1.696 15 2.556 15h10.888c.86 0 1.556-.696 1.556-1.556V2.556C15 1.696 14.304 1 13.444 1Z"/></svg>`;export const PageIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M9.833 2h-5.5A1.333 1.333 0 0 0 3 3.333v10a1.333 1.333 0 0 0 1.333 1.334h7.5a1.333 1.333 0 0 0 1.334-1.334v-8L9.833 2Z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M9.167 2.5v1.667A1.333 1.333 0 0 0 10.5 5.5h2.667"/></svg>`;@@ -324,7 +324,7 @@ export const PopoverIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none"export const RadioCheckedIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13Z"/><path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M10.5 8a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Z"/></svg>`;-export const RadioGroupIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M8.839 8a1.82 1.82 0 1 1-3.64 0 1.82 1.82 0 0 1 3.64 0Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.019 13.027a5.027 5.027 0 1 0 0-10.054 5.027 5.027 0 0 0 0 10.054Z"/><path stroke="#000" stroke-linecap="round" d="M12.629 12.077v0a6.73 6.73 0 0 0-.337-8.565v0"/></svg>`;+export const RadioGroupIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8.839 8a1.82 1.82 0 1 1-3.64 0 1.82 1.82 0 0 1 3.64 0Z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.019 13.027a5.027 5.027 0 1 0 0-10.054 5.027 5.027 0 0 0 0 10.054Z"/><path stroke="currentColor" stroke-linecap="round" d="M12.629 12.077v0a6.73 6.73 0 0 0-.337-8.565v0"/></svg>`;export const RadioUncheckedIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13Z"/></svg>`;@@ -356,7 +356,7 @@ export const SectionLinkIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="noexport const SelectIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M13.184 10.33h.149c.736 0 1.332-.597 1.332-1.332V6.332c0-.735-.596-1.332-1.332-1.332H2.667c-.735 0-1.332.597-1.332 1.332v2.666c0 .735.597 1.332 1.333 1.332h10.516Z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m10.078 7.165 1 1 1-1"/></svg>`;-export const SettingsIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M13.987 6H9.32M13.932 6h-12M14 10.5H2"/><rect width="4" height="4" x="1.932" y="8.534" fill="#fff" stroke="currentColor" rx="2"/><rect width="4" height="4" x="10.068" y="4" fill="#fff" stroke="currentColor" rx="2"/></svg>`;+export const SettingsIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M9.32 6H1.932M14 10.5H6.5"/><rect width="4" height="4" x="1.932" y="8.534" stroke="currentColor" rx="2"/><rect width="4" height="4" x="10.068" y="4" stroke="currentColor" rx="2"/></svg>`;export const ShadowInsetIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><rect width="13" height="13" x="1.5" y="1.5" stroke="currentColor" rx="6.5"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M3.804 7.833a4.196 4.196 0 1 1 8.392 0"/></svg>`;@@ -366,7 +366,7 @@ export const ShieldIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" sexport const ShrinkIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1A.5.5 0 0 1 8 1ZM1.333 7.5a.5.5 0 0 0 0 1h2.793L2.98 9.646a.5.5 0 0 0 .707.708l2-2a.499.499 0 0 0 .146-.351v-.006a.498.498 0 0 0-.146-.35l-2-2a.5.5 0 1 0-.707.707L4.126 7.5H1.333Zm8.834.503a.496.496 0 0 0 .146.35l2 2a.5.5 0 0 0 .707-.707L11.874 8.5h2.793a.5.5 0 1 0 0-1h-2.793l1.146-1.146a.5.5 0 1 0-.707-.708l-2 2a.498.498 0 0 0-.146.351v.006ZM8.5 5.5a.5.5 0 0 0-1 0v1a.5.5 0 0 0 1 0v-1ZM8 9a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-1 0v-1A.5.5 0 0 1 8 9Zm.5 4.5a.5.5 0 0 0-1 0v1a.5.5 0 0 0 1 0v-1Z" clip-rule="evenodd"/></svg>`;-export const SliderIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M14.015 8.265h-6M8.015 8.265h-6"/><rect width="3" height="3" x="4.026" y="6.5" fill="#fff" stroke="currentColor" rx="1.5"/></svg>`;+export const SliderIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M14.015 8.265h-6M8.015 8.265h-6"/><rect width="3" height="3" x="4.026" y="6.5" fill="currentColor" stroke="currentColor" rx="1.5"/></svg>`;export const SlotComponentIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M4.5 2H3.333A1.333 1.333 0 0 0 2 3.333V4.5M14 4.5V3.333A1.333 1.333 0 0 0 12.667 2H11.5M14 12.667c0 .021 0 .042-.002.063M11.5 14h1.167a1.333 1.333 0 0 0 1.331-1.27m0 0V11.5M2 11.5v1.167A1.333 1.333 0 0 0 3.333 14H4.5M7 2h2M7 14h2M2 7v2M14 7v2"/></svg>`;@@ -414,7 +414,7 @@ export const TextUppercaseIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="export const TextIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M2.667 4.667v-2h10.666v2M6 13.333h4M8 2.667v10.666"/></svg>`;-export const TooltipIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14 10a1.333 1.333 0 0 1-1.333 1.333h-8L2 14V3.333A1.333 1.333 0 0 1 3.333 2h9.334A1.333 1.333 0 0 1 14 3.333V10Z"/></svg>`;+export const TooltipIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M14 10a1.333 1.333 0 0 1-1.333 1.333h-8L2 14V3.333A1.333 1.333 0 0 1 3.333 2h9.334A1.333 1.333 0 0 1 14 3.333V10Z"/></svg>`;export const TrashIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M2 4h12M12.667 4v9.333c0 .667-.667 1.334-1.334 1.334H4.667c-.667 0-1.334-.667-1.334-1.334V4M5.333 4V2.667C5.333 2 6 1.333 6.667 1.333h2.666c.667 0 1.334.667 1.334 1.334V4M6.667 7.333v4M9.333 7.333v4"/></svg>`;@@ -448,9 +448,9 @@ export const XAxisIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viexport const XCircledFilledIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" d="m5.333 10.667 5.334-5.334M10.667 10.667 5.333 5.333"/></svg>`;-export const XLogoIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="#000" d="M9.142 7.081 13.609 2H12.55L8.671 6.412 5.573 2H2l4.685 6.672L2 14h1.059l4.096-4.66L10.427 14H14L9.141 7.081Zm-1.45 1.65-.475-.665L3.44 2.78h1.626l3.048 4.266.475.664 3.962 5.546h-1.626L7.692 8.73Z"/></svg>`;+export const XLogoIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path fill="currentColor" d="M9.142 7.081 13.609 2H12.55L8.671 6.412 5.573 2H2l4.685 6.672L2 14h1.059l4.096-4.66L10.427 14H14L9.141 7.081Zm-1.45 1.65-.475-.665L3.44 2.78h1.626l3.048 4.266.475.664 3.962 5.546h-1.626L7.692 8.73Z"/></svg>`;-export const XSmallIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m5.333 10.667 5.334-5.334M10.667 10.667 5.333 5.333"/></svg>`;+export const XSmallIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m5.333 10.667 5.334-5.334M10.667 10.667 5.333 5.333"/></svg>`;export const XIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M12.5 3 3 12.5M3 3l9.5 9.5"/></svg>`;diff --git a/packages/icons/src/index.stories.tsx b/packages/icons/src/index.stories.tsxindex bc1674b416..3054a4c4e5 100644--- a/packages/icons/src/index.stories.tsx+++ b/packages/icons/src/index.stories.tsx@@ -1,6 +1,6 @@import type { ReactNode } from "react";import type { Meta } from "@storybook/react";-import { StorySection } from "@webstudio-is/design-system";+import { cssVar, StorySection } from "@webstudio-is/design-system";import * as icons from "./index";export const Icons = ({@@ -31,14 +31,14 @@ export const Icons = ({height: 100,margin: 5,padding: 5,- border: "solid 1px #f5f5f5",+ border: `solid 1px ${cssVar("--border-default")}`,display: "flex",flexDirection: "column",alignItems: "center",justifyContent: "center",}}>- <Icon width="32" height="32" color="black" />+ <Icon width="32" height="32" /><divstyle={{marginTop: 16,@@ -47,7 +47,7 @@ export const Icons = ({wordWrap: "break-word",width: "100%",fontSize: "14px",- color: "#5a5a5a",+ color: cssVar("--foreground-secondary"),}}>{name.replace(/Icon$/, "")}diff --git a/packages/query-builder-react/src/index.tsx b/packages/query-builder-react/src/index.tsxindex 421fb0e7f1..ec3ebbd3cf 100644--- a/packages/query-builder-react/src/index.tsx+++ b/packages/query-builder-react/src/index.tsx@@ -28,6 +28,7 @@ import {SmallIconButton,Text,TextArea,+ cssVar,theme,} from "@webstudio-is/design-system";import { MinusIcon, PlusIcon } from "@webstudio-is/icons";@@ -340,12 +341,12 @@ const Group = <FieldType extends string, Operator extends string>({...(root? {paddingInline: shared.sectionPaddingInline,- borderTop: `1px solid ${theme.colors.borderMain}`,+ borderTop: `1px solid ${cssVar("--border-default")}`,paddingTop: theme.spacing[7],}: {paddingLeft: theme.spacing[3],- borderLeft: `1px solid ${theme.colors.borderMain}`,+ borderLeft: `1px solid ${cssVar("--border-default")}`,}),}}>@@ -815,7 +816,7 @@ const QueryParameters = ({<Gridgap={2}css={{- borderTop: `1px solid ${theme.colors.borderMain}`,+ borderTop: `1px solid ${cssVar("--border-default")}`,paddingTop: theme.spacing[7],}}>@@ -1167,7 +1168,7 @@ export const StructuredQueryBuilder = <gap={2}css={{paddingInline: sectionPaddingInline,- borderTop: `1px solid ${theme.colors.borderMain}`,+ borderTop: `1px solid ${cssVar("--border-default")}`,paddingTop: theme.spacing[7],}}>diff --git a/packages/sdk-components-animation/package.json b/packages/sdk-components-animation/package.jsonindex 8a805ad685..c6ee3f4b74 100644--- a/packages/sdk-components-animation/package.json+++ b/packages/sdk-components-animation/package.json@@ -70,7 +70,7 @@"@webstudio-is/template": "workspace:*","@webstudio-is/tsconfig": "workspace:*","fast-glob": "^3.3.2",- "playwright": "^1.50.1",+ "playwright": "1.50.1","react": "18.3.0-canary-14898b6a9-20240318","react-dom": "18.3.0-canary-14898b6a9-20240318","type-fest": "^4.37.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex ed509ef062..91a1b509b0 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -9,6 +9,8 @@ overrides:'@types/react-dom': ^18.2.25react: 18.3.0-canary-14898b6a9-20240318react-dom: 18.3.0-canary-14898b6a9-20240318+ playwright: 1.50.1+ '@playwright/test': 1.50.1vite@<7: 6.3.4patchedDependencies:@@ -50,6 +52,9 @@ importers:'@storybook/addon-controls':specifier: ^8.6.4version: 8.6.4([email protected]([email protected]))+ '@storybook/addon-toolbars':+ specifier: ^8.6.4+ version: 8.6.4([email protected]([email protected]))'@storybook/react':specifier: ^8.6.4version: 8.6.4([email protected]([email protected]))([email protected])([email protected]([email protected]))([email protected])@@ -480,6 +485,9 @@ importers:specifier: ^5.0.0version: 5.0.0([email protected])devDependencies:+ '@playwright/test':+ specifier: 1.50.1+ version: 1.50.1'@remix-run/dev':specifier: ^2.16.5version: 2.16.5(patch_hash=yortwzoeu3uj2blmdikhhw5byy)(@remix-run/[email protected]([email protected]([email protected]))([email protected])([email protected]))(@remix-run/[email protected]([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))([email protected](@cloudflare/[email protected]))([email protected])@@ -519,9 +527,6 @@ importers:msw:specifier: ^2.13.2version: 2.13.2(@types/[email protected])([email protected])- playwright:- specifier: ^1.50.1- version: 1.50.1react-router-dom:specifier: ^6.30.0@@ -1855,18 +1860,30 @@ importers:specifier: ^0.1.1version: 0.1.1devDependencies:+ '@babel/parser':+ specifier: ^7.29.7+ version: 7.29.7'@types/react':specifier: ^18.2.70version: 18.2.79'@types/react-dom':specifier: ^18.2.25version: 18.2.25+ '@vitest/browser':+ specifier: ^3.1.2+ version: 3.1.2([email protected](@types/[email protected])([email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))([email protected])'@webstudio-is/image':specifier: workspace:*version: link:../image'@webstudio-is/tsconfig':specifier: workspace:*version: link:../tsconfig+ css-tree:+ specifier: ^3.2.1+ version: 3.2.1+ playwright:+ specifier: 1.50.1+ version: 1.50.1react:specifier: 18.3.0-canary-14898b6a9-20240318version: 18.3.0-canary-14898b6a9-20240318@@ -2688,7 +2705,7 @@ importers:specifier: ^3.3.2version: 3.3.2playwright:- specifier: ^1.50.1+ specifier: 1.50.1version: 1.50.1react:specifier: 18.3.0-canary-14898b6a9-20240318@@ -3472,11 +3489,6 @@ packages:resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==}- engines: {node: '>=6.0.0'}- hasBin: true-'@babel/[email protected]':resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}engines: {node: '>=6.0.0'}@@ -3592,10 +3604,6 @@ packages:resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}engines: {node: '>=6.9.0'}- '@babel/[email protected]':- resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}- engines: {node: '>=6.9.0'}-'@babel/[email protected]':resolution: {integrity: sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==}engines: {node: '>=6.9.0'}@@ -5361,6 +5369,11 @@ packages:resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}engines: {node: '>=14'}+ '@playwright/[email protected]':+ resolution: {integrity: sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==}+ engines: {node: '>=18'}+ hasBin: true+'@polka/[email protected]':resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}@@ -6581,6 +6594,11 @@ packages:peerDependencies:storybook: ^8.6.4+ '@storybook/[email protected]':+ resolution: {integrity: sha512-PU2lvgwCKDn93zpp5MEog103UUmSSugcxDf18xaoa9D15Qtr+YuQHd2hXbxA7+dnYL9lA7MLYsstfxE91ieM4Q==}+ peerDependencies:+ storybook: ^8.6.4+'@storybook/[email protected]':resolution: {integrity: sha512-FuSP2GhWVVTt6NdX0UJHhPOqhu09X4apSk+KWUf3aITRIJg9gbPYtJDBmxv1vXQEgvfCDdYBYbeG1khiO/Ghfw==}peerDependencies:@@ -7073,7 +7091,7 @@ packages:'@vitest/[email protected]':resolution: {integrity: sha512-dwL6hQg3NSDP3Z4xzIZL0xHq/AkQAPQ4StFpWVlY2zbRJtK3Y2YqdFZ7YmZjszTETN1BDQZRn/QOrcP+c8ATgg==}peerDependencies:- playwright: '*'+ playwright: 1.50.1safaridriver: '*'vitest: 3.1.2webdriverio: ^7.0.0 || ^8.0.0 || ^9.0.0@@ -8633,10 +8651,6 @@ packages:resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}- engines: {node: '>= 0.4'}-resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}engines: {node: '>= 0.4'}@@ -12334,7 +12348,7 @@ snapshots:'@babel/[email protected]':dependencies:- '@babel/helper-validator-identifier': 7.25.9+ '@babel/helper-validator-identifier': 7.29.7js-tokens: 4.0.0picocolors: 1.1.1@@ -12381,7 +12395,7 @@ snapshots:'@babel/parser': 7.29.7'@babel/template': 7.27.0'@babel/traverse': 7.27.0- '@babel/types': 7.27.0+ '@babel/types': 7.29.7convert-source-map: 2.0.0debug: 4.4.0gensync: 1.0.0-beta.2@@ -12413,7 +12427,7 @@ snapshots:'@babel/[email protected]':dependencies:'@babel/parser': 7.29.7- '@babel/types': 7.27.0+ '@babel/types': 7.29.7'@jridgewell/gen-mapping': 0.3.5'@jridgewell/trace-mapping': 0.3.25jsesc: 3.1.0@@ -12522,7 +12536,7 @@ snapshots:dependencies:'@babel/core': 7.26.0'@babel/helper-module-imports': 7.25.9- '@babel/helper-validator-identifier': 7.25.9+ '@babel/helper-validator-identifier': 7.29.7'@babel/traverse': 7.29.7transitivePeerDependencies:- supports-color@@ -12531,7 +12545,7 @@ snapshots:dependencies:'@babel/core': 7.26.10'@babel/helper-module-imports': 7.25.9- '@babel/helper-validator-identifier': 7.25.9+ '@babel/helper-validator-identifier': 7.29.7'@babel/traverse': 7.29.7transitivePeerDependencies:- supports-color@@ -12622,10 +12636,6 @@ snapshots:'@babel/template': 7.29.7'@babel/types': 7.29.7- '@babel/[email protected]':- dependencies:- '@babel/types': 7.27.0-'@babel/[email protected]':dependencies:'@babel/types': 7.29.7@@ -12772,7 +12782,7 @@ snapshots:'@babel/generator': 7.27.0'@babel/parser': 7.29.7'@babel/template': 7.27.0- '@babel/types': 7.27.0+ '@babel/types': 7.29.7debug: 4.4.0globals: 11.12.0transitivePeerDependencies:@@ -12790,11 +12800,6 @@ snapshots:transitivePeerDependencies:- supports-color- '@babel/[email protected]':- dependencies:- '@babel/helper-string-parser': 7.25.9- '@babel/helper-validator-identifier': 7.25.9-'@babel/[email protected]':dependencies:'@babel/helper-string-parser': 7.25.9@@ -13745,7 +13750,7 @@ snapshots:'@jridgewell/[email protected]':dependencies:- '@jridgewell/sourcemap-codec': 1.5.5+ '@jridgewell/sourcemap-codec': 1.5.0'@jridgewell/trace-mapping': 0.3.31'@jridgewell/[email protected]':@@ -13780,7 +13785,7 @@ snapshots:'@jridgewell/[email protected]':dependencies:'@jridgewell/resolve-uri': 3.1.0- '@jridgewell/sourcemap-codec': 1.5.0+ '@jridgewell/sourcemap-codec': 1.5.5'@jspm/[email protected]': {}@@ -14430,6 +14435,10 @@ snapshots:'@pkgjs/[email protected]':optional: true+ '@playwright/[email protected]':+ dependencies:+ playwright: 1.50.1+'@polka/[email protected]': {}'@preact/[email protected]': {}@@ -15419,7 +15428,7 @@ snapshots:dependencies:'@babel/core': 7.26.10'@babel/generator': 7.27.0- '@babel/parser': 7.27.0+ '@babel/parser': 7.29.7'@babel/plugin-syntax-decorators': 7.24.1(@babel/[email protected])'@babel/plugin-syntax-jsx': 7.24.1(@babel/[email protected])'@babel/preset-typescript': 7.24.1(@babel/[email protected])@@ -15502,7 +15511,7 @@ snapshots:dependencies:'@babel/core': 7.26.10'@babel/generator': 7.27.0- '@babel/parser': 7.27.0+ '@babel/parser': 7.29.7'@babel/plugin-syntax-decorators': 7.24.1(@babel/[email protected])'@babel/plugin-syntax-jsx': 7.24.1(@babel/[email protected])'@babel/preset-typescript': 7.24.1(@babel/[email protected])@@ -15922,6 +15931,10 @@ snapshots:storybook: 8.6.4([email protected])ts-dedent: 2.2.0+ dependencies:+ storybook: 8.6.4([email protected])+'@storybook/[email protected]([email protected]([email protected]))([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))':dependencies:'@storybook/csf-plugin': 8.6.4([email protected]([email protected]))@@ -16369,7 +16382,7 @@ snapshots:'@unocss/[email protected]':dependencies:'@unocss/core': 66.6.8- magic-string: 0.30.21+ magic-string: 0.30.17'@vanilla-extract/[email protected]':dependencies:@@ -16483,7 +16496,7 @@ snapshots:sirv: 3.0.1tinyrainbow: 2.0.0vitest: 3.1.2(@types/[email protected])(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected])- ws: 8.21.0+ ws: 8.18.0optionalDependencies:playwright: 1.50.1transitivePeerDependencies:@@ -16523,7 +16536,7 @@ snapshots:dependencies:'@vitest/spy': 3.1.2estree-walker: 3.0.3- magic-string: 0.30.17+ magic-string: 0.30.21optionalDependencies:msw: 2.13.2(@types/[email protected])([email protected])vite: 6.3.4(@types/[email protected])([email protected])([email protected])([email protected])([email protected])@@ -18086,7 +18099,7 @@ snapshots:get-proto: 1.0.1gopd: 1.2.0has-symbols: 1.1.0- hasown: 2.0.3+ hasown: 2.0.4math-intrinsics: 1.1.0@@ -18229,14 +18242,9 @@ snapshots:dependencies:function-bind: 1.1.2- dependencies:- function-bind: 1.1.2-dependencies:function-bind: 1.1.2- optional: truedependencies:@@ -19032,7 +19040,7 @@ snapshots:dependencies:'@babel/parser': 7.29.7- '@babel/types': 7.27.0+ '@babel/types': 7.29.7source-map-js: 1.2.1@@ -19961,7 +19969,7 @@ snapshots:stoppable: 1.1.0undici: 5.29.0workerd: 1.20240701.0- ws: 8.18.0+ ws: 8.21.0youch: 3.3.3zod: 3.25.76transitivePeerDependencies:@@ -20722,7 +20730,7 @@ snapshots:dependencies:'@babel/core': 7.26.0'@babel/traverse': 7.25.9- '@babel/types': 7.26.0+ '@babel/types': 7.29.7'@types/babel__core': 7.20.5'@types/babel__traverse': 7.18.2'@types/doctrine': 0.0.9