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
fix: Keep Slot colors consistent (#6296)
Oleg Isonen1de752f2ae8b
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.stories.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.stories.tsxnew file mode 100644index 0000000000..f7a13aae01--- /dev/null+++ b/apps/builder/app/builder/features/navigator/navigator-tree.stories.tsx@@ -0,0 +1,99 @@+import type { Meta, StoryObj } from "@storybook/react";+import {+ Box,+ Flex,+ StorySection,+ cssVar,+ theme,+} from "@webstudio-is/design-system";+import { createDefaultPages } from "@webstudio-is/project-build";+import { coreMetas } from "@webstudio-is/sdk";+import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";+import { $registeredComponentMetas } from "~/shared/nano-states";+import { $instances, $pages, $props } from "~/shared/sync/data-stores";+import { $selectedPageId } from "~/shared/nano-states";+import { Label } from "~/builder/features/workspace/canvas-tools/outline/label";+import { Outline } from "~/builder/features/workspace/canvas-tools/outline/outline";+import { NavigatorTree } from "./navigator-tree";++const meta = {+ title: "Navigator/Navigator tree",+} satisfies Meta;++export default meta;++$registeredComponentMetas.set(+ new Map(Object.entries({ ...coreMetas, ...baseComponentMetas }))+);+$instances.set(+ new Map([+ [+ "body",+ {+ type: "instance",+ id: "body",+ component: "Body",+ children: [{ type: "id", value: "slot" }],+ },+ ],+ [+ "slot",+ {+ type: "instance",+ id: "slot",+ component: "Slot",+ label: "Reusable Slot",+ children: [],+ },+ ],+ ])+);+$props.set(new Map());+$pages.set(createDefaultPages({ rootInstanceId: "body", homePageId: "home" }));+$selectedPageId.set("home");++const instanceRect = new DOMRect(24, 48, 192, 80);+const clampingRect = new DOMRect(0, 0, 240, 160);++export const ReusableInstance: StoryObj = {+ render: () => (+ <StorySection title="Reusable instance color">+ <Flex gap={5} align="start">+ <Box+ css={{+ width: theme.sizes.sidebarWidth,+ height: 160,+ backgroundColor: cssVar("--background-primary"),+ }}+ >+ <NavigatorTree />+ </Box>+ <Box+ css={{+ position: "relative",+ width: clampingRect.width,+ height: clampingRect.height,+ backgroundColor: cssVar("--background-primary"),+ }}+ >+ <Outline+ rect={instanceRect}+ clampingRect={clampingRect}+ variant="slot"+ >+ <Label+ instance={{ component: "Slot", label: "Reusable Slot" }}+ instanceRect={instanceRect}+ variant="slot"+ />+ </Outline>+ </Box>+ </Flex>+ </StorySection>+ ),+};++export const ReusableInstanceDark: StoryObj = {+ ...ReusableInstance,+ globals: { colorScheme: "dark" },+};diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex 37e7473344..d34bd1829f 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -1132,7 +1132,7 @@ export const NavigatorTree = () => {style: {opacity: item.isHidden ? 0.4 : undefined,color: item.isReusable- ? cssVar("--foreground-accent")+ ? cssVar("--foreground-accent-secondary"): undefined,},}}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.tsindex 4698c23d29..4d65241026 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/color-recipes.ts+++ b/apps/builder/app/builder/features/workspace/canvas-tools/color-recipes.ts@@ -1,16 +1,14 @@-import {- cssVar,- rotateBoundedBackgroundHue,-} from "@webstudio-is/design-system";+import { cssVar } 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.+// Keep their small palette relative to the theme accent.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),+ slot: cssVar("--background-accent-secondary"),+ onSlot: cssVar("--foreground-on-accent-secondary"),onSelection: cssVar("--foreground-on-accent"),} as const;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 a3961dd8d1..500b519b6e 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@@ -50,6 +50,7 @@ const LabelContainer = styled(backgroundColor: canvasToolColors.selection,},slot: {+ color: canvasToolColors.onSlot,backgroundColor: canvasToolColors.slot,},},diff --git a/packages/design-system/src/colors/README.md b/packages/design-system/src/colors/README.mdindex 4f9182cc27..3fe168e405 100644--- a/packages/design-system/src/colors/README.md+++ b/packages/design-system/src/colors/README.md@@ -115,16 +115,17 @@ styled("button", {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. |+| 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`. |+| `accent-secondary` | Secondary interactive emphasis; use the foreground on surfaces and pair the strong background with `--foreground-on-accent-secondary`. |+| `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 themecolor, so it dims content in both schemes rather than following foregrounddiff --git a/packages/design-system/src/colors/__generated__/css-variable-names.d.ts b/packages/design-system/src/colors/__generated__/css-variable-names.d.tsindex 7f97863c27..c14bce8ec4 100644--- a/packages/design-system/src/colors/__generated__/css-variable-names.d.ts+++ b/packages/design-system/src/colors/__generated__/css-variable-names.d.ts@@ -17,6 +17,7 @@ export type CssVariableName =| "--background-disabled"| "--background-inverse"| "--background-accent"+ | "--background-accent-secondary"| "--background-positive"| "--background-positive-subtle"| "--background-negative"@@ -28,9 +29,11 @@ export type CssVariableName =| "--foreground-disabled"| "--foreground-on-inverse"| "--foreground-on-accent"+ | "--foreground-on-accent-secondary"| "--foreground-on-positive"| "--foreground-on-negative"| "--foreground-accent"+ | "--foreground-accent-secondary"| "--foreground-positive"| "--foreground-negative"| "--foreground-warning"diff --git a/packages/design-system/src/colors/color-contrast.browser.test.ts b/packages/design-system/src/colors/color-contrast.browser.test.tsindex 8e6ee8e5a3..fe5a11ef1b 100644--- a/packages/design-system/src/colors/color-contrast.browser.test.ts+++ b/packages/design-system/src/colors/color-contrast.browser.test.ts@@ -31,6 +31,7 @@ const expectedLightColors = {"--background-disabled": "#f8f8f8","--background-inverse": "#11181c","--background-accent": "#096cff",+ "--background-accent-secondary": "#ab38d4","--background-positive": "#00894a","--background-positive-subtle": "#e9f9ee","--background-negative": "#dc2929",@@ -42,9 +43,11 @@ const expectedLightColors = {"--foreground-disabled": "#898d90","--foreground-on-inverse": "#ffffff","--foreground-on-accent": "#ffffff",+ "--foreground-on-accent-secondary": "#ffffff","--foreground-on-positive": "#ffffff","--foreground-on-negative": "#ffffff","--foreground-accent": "#096cff",+ "--foreground-accent-secondary": "#ab38d4",// Darkened from the legacy green so positive text remains accessible on its subtle background."--foreground-positive": "#0b7b45","--foreground-negative": "#d13a3a",@@ -363,6 +366,28 @@ describe("Craft color contrast", () => {}});+ test("default dark secondary accent foreground remains distinctly purple", () => {+ const root = document.documentElement;+ const previousMode = root.getAttribute("data-color-scheme");+ root.dataset.colorScheme = "dark";++ try {+ const secondaryAccent = readColor("--foreground-accent-secondary");+ expect(secondaryAccent[0] - secondaryAccent[1]).toBeGreaterThanOrEqual(+ 70+ );+ expect(secondaryAccent[2] - secondaryAccent[1]).toBeGreaterThanOrEqual(+ 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");diff --git a/packages/design-system/src/colors/color-contrast.ts b/packages/design-system/src/colors/color-contrast.tsindex 9c4602f3e7..402375a7aa 100644--- a/packages/design-system/src/colors/color-contrast.ts+++ b/packages/design-system/src/colors/color-contrast.ts@@ -15,12 +15,14 @@ const contrastContracts = [["--foreground-primary", "--background-secondary", 4.5],["--foreground-secondary", "--background-secondary", 4.5],["--foreground-accent", "--background-primary", 4.5],+ ["--foreground-accent-secondary", "--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-accent-secondary", "--background-accent-secondary", 4.5],["--foreground-on-positive", "--background-positive", 4.5],["--foreground-on-negative", "--background-negative", 4.5],["--foreground-positive", "--background-positive-subtle", 4.5],diff --git a/packages/design-system/src/colors/color-source-utils.test.ts b/packages/design-system/src/colors/color-source-utils.test.tsindex 5aa46fd223..4b725d918d 100644--- a/packages/design-system/src/colors/color-source-utils.test.ts+++ b/packages/design-system/src/colors/color-source-utils.test.ts@@ -89,7 +89,7 @@ describe("Craft color CSS source", () => {expect(Object.keys(colors.scheme.light)).toEqual(Object.keys(colors.scheme.dark));- expect(Object.keys(colors.derived)).toHaveLength(28);+ expect(Object.keys(colors.derived)).toHaveLength(31);expect(colors.derived).toHaveProperty("focus");expect(Object.keys(colors.semantic)).toEqual(["background",@@ -102,8 +102,11 @@ describe("Craft color CSS source", () => {(count, category) => count + Object.keys(category).length,0)- ).toBe(33);+ ).toBe(36);expect(colors.semantic.background).toHaveProperty("positive-subtle");+ expect(colors.semantic.background).toHaveProperty("accent-secondary");+ expect(colors.semantic.foreground).toHaveProperty("accent-secondary");+ expect(colors.semantic.foreground).toHaveProperty("on-accent-secondary");expect(colors.semantic.background).not.toHaveProperty("accent-hover");expect(colors.semantic.overlay).toHaveProperty("interaction-hover");});diff --git a/packages/design-system/src/colors/colors.css b/packages/design-system/src/colors/colors.cssindex 7e2ac2168b..66612df2f2 100644--- a/packages/design-system/src/colors/colors.css+++ b/packages/design-system/src/colors/colors.css@@ -136,6 +136,16 @@)));+ --color-accent-secondary-source: color(+ from oklch(from var(--color-accent) l c calc(h + 55)) srgb clamp(0, r, 1)+ clamp(0, g, 1) clamp(0, b, 1)+ );+ --color-accent-secondary: color(+ from var(--color-accent-secondary-source) xyz-d65+ calc(x * min(1, var(--scheme-chromatic-luminance-max) / max(y, 0.000001)))+ min(y, var(--scheme-chromatic-luminance-max))+ calc(z * min(1, var(--scheme-chromatic-luminance-max) / max(y, 0.000001)))+ );--color-positive: color(from var(--color-positive-source) xyz-d65calc(@@ -407,6 +417,10 @@var(--color-accent) var(--scheme-chromatic-foreground-mix),var(--color-foreground));+ --color-accent-secondary-foreground: light-dark(+ var(--color-accent-secondary),+ oklch(from var(--color-accent-secondary) max(l, 0.72) c h)+ );--color-positive-foreground: color-mix(in oklab,color-mix(in oklab, var(--color-positive) 90%, var(--color-foreground))@@ -444,6 +458,7 @@);--background-inverse: var(--color-foreground);--background-accent: var(--color-accent);+ --background-accent-secondary: var(--color-accent-secondary);--background-positive: var(--color-positive);--background-positive-subtle: color-mix(in oklab,@@ -487,9 +502,11 @@);--foreground-on-inverse: var(--color-background);--foreground-on-accent: var(--color-on-chromatic);+ --foreground-on-accent-secondary: 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-accent-secondary: var(--color-accent-secondary-foreground);--foreground-positive: var(--color-positive-foreground);--foreground-negative: var(--color-negative-foreground);--foreground-warning: var(--color-warning-foreground);