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
refactor: allow any style value to be hidden (#3703)
Bogdan Chadkin1fcd542469ff
diff --git a/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts b/apps/builder/app/builder/features/style-panel/style-layer-utils.test.tsindex 05476cf924..81d39e6bc0 100644--- a/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts+++ b/apps/builder/app/builder/features/style-panel/style-layer-utils.test.ts@@ -203,7 +203,7 @@ describe("boxShadowUtils", () => {expect(published).toBe(true);expect(boxShadowValue).toBeDefined();expect(deletedProperties.has("boxShadow")).toBe(false);- expect((boxShadowValue.value[0] as TupleValue).hidden).toBe(true);+ expect(boxShadowValue.value[0].hidden).toBe(true);});test("adds layer to box-shadow proeprty", () => {diff --git a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx b/apps/builder/app/builder/features/style-panel/style-layers-list.tsxindex 4350af6b68..4d12c44082 100644--- a/apps/builder/app/builder/features/style-panel/style-layers-list.tsx+++ b/apps/builder/app/builder/features/style-panel/style-layers-list.tsx@@ -171,10 +171,7 @@ export const LayersList = (props: LayerListProps) => {active={dragItemId === id}index={index}label={<Label truncate>{properties.name}</Label>}- hidden={- (layer.type === "tuple" || layer.type === "function") &&- layer?.hidden- }+ hidden={layer.hidden}thumbnail={property === "textShadow" || property === "boxShadow" ? (<ColorThumb color={properties.color} />@@ -185,12 +182,12 @@ export const LayersList = (props: LayerListProps) => {{layer.type === "tuple" || layer.type === "function" ? (<SmallToggleButtonvariant="normal"- pressed={layer?.hidden}+ pressed={layer.hidden}disabled={false}tabIndex={-1}onPressedChange={() => handleHideLayer(index)}icon={- layer?.hidden ? (+ layer.hidden ? (<EyeconClosedIcon />) : (<EyeconOpenIcon />@@ -201,10 +198,7 @@ export const LayersList = (props: LayerListProps) => {<SmallIconButtonvariant="destructive"tabIndex={-1}- disabled={- (layer.type === "tuple" || layer.type === "function") &&- layer.hidden- }+ disabled={layer.hidden}icon={<SubtractIcon />}onClick={() => handleDeleteLayer(index)}/>diff --git a/packages/css-engine/src/core/to-value.ts b/packages/css-engine/src/core/to-value.tsindex f29eb2b01b..fdb66bde30 100644--- a/packages/css-engine/src/core/to-value.ts+++ b/packages/css-engine/src/core/to-value.ts@@ -96,20 +96,17 @@ export const toValue = (if (value.type === "layers") {const valueString = value.value- .filter(- (layer) =>- "hidden" in layer === false ||- ("hidden" in layer && layer.hidden === false)- )- .map((layer) => {- return toValue(layer, transformValue);- })+ .filter((layer) => layer.hidden !== true)+ .map((layer) => toValue(layer, transformValue)).join(", ");return valueString === "" ? "none" : valueString;}if (value.type === "tuple") {- return value.value.map((value) => toValue(value, transformValue)).join(" ");+ return value.value+ .filter((value) => value.hidden !== true)+ .map((value) => toValue(value, transformValue))+ .join(" ");}if (value.type === "function") {diff --git a/packages/css-engine/src/schema.ts b/packages/css-engine/src/schema.tsindex 76dfbccff4..19d997b1fe 100644--- a/packages/css-engine/src/schema.ts+++ b/packages/css-engine/src/schema.ts@@ -44,6 +44,7 @@ export type UnparsedValue = z.infer<typeof UnparsedValue>;const FontFamilyValue = z.object({type: z.literal("fontFamily"),value: z.array(z.string()),+ hidden: z.boolean().optional(),});export type FontFamilyValue = z.infer<typeof FontFamilyValue>;@@ -53,6 +54,7 @@ const RgbValue = z.object({g: z.number(),b: z.number(),alpha: z.number(),+ hidden: z.boolean().optional(),});export type RgbValue = z.infer<typeof RgbValue>;@@ -88,6 +90,7 @@ export type ImageValue = z.infer<typeof ImageValue>;// https://www.w3.org/TR/css-variables-1/#guaranteed-invalidexport const GuaranteedInvalidValue = z.object({type: z.literal("guaranteedInvalid"),+ hidden: z.boolean().optional(),});export type GuaranteedInvalidValue = z.infer<typeof GuaranteedInvalidValue>;@@ -96,12 +99,14 @@ export type GuaranteedInvalidValue = z.infer<typeof GuaranteedInvalidValue>;export const InvalidValue = z.object({type: z.literal("invalid"),value: z.string(),+ hidden: z.boolean().optional(),});export type InvalidValue = z.infer<typeof InvalidValue>;const UnsetValue = z.object({type: z.literal("unset"),value: z.literal(""),+ hidden: z.boolean().optional(),});export type UnsetValue = z.infer<typeof UnsetValue>;@@ -139,6 +144,7 @@ export type LayerValueItem = z.infer<typeof LayerValueItem>;export const LayersValue = z.object({type: z.literal("layers"),value: z.array(LayerValueItem),+ hidden: z.boolean().optional(),});export type LayersValue = z.infer<typeof LayersValue>;@@ -186,6 +192,7 @@ const VarValue = z.object({type: z.literal("var"),value: z.string(),fallbacks: z.array(ValidStaticStyleValue),+ hidden: z.boolean().optional(),});export type VarValue = z.infer<typeof VarValue>;