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
Add "show" system prop for conditional rendering (#1724)
Bogdan Chadkin36b98ef3f63c
diff --git a/apps/builder/app/builder/features/props-panel/use-props-logic.ts b/apps/builder/app/builder/features/props-panel/use-props-logic.tsindex 89f40e1e70..68d14d69ae 100644--- a/apps/builder/app/builder/features/props-panel/use-props-logic.ts+++ b/apps/builder/app/builder/features/props-panel/use-props-logic.ts@@ -1,7 +1,10 @@import { useState } from "react";import { nanoid } from "nanoid";import type { Instance, Prop } from "@webstudio-is/project-build";-import type { WsComponentPropsMeta } from "@webstudio-is/react-sdk";+import {+ type WsComponentPropsMeta,+ showAttribute,+} from "@webstudio-is/react-sdk";import type { PropMeta, PropValue } from "./shared";type PropOrName = { prop?: Prop; propName: string };@@ -114,10 +117,20 @@ const systemPropsMeta: { name: string; meta: PropMeta }[] = [{name: "id",meta: {+ label: "ID",required: false,control: "text",type: "string",- label: "ID",+ },+ },+ {+ name: showAttribute,+ meta: {+ label: "Show",+ required: false,+ defaultValue: true,+ control: "boolean",+ type: "boolean",},},];@@ -137,7 +150,10 @@ export const usePropsLogic = ({const initialPropsNames = new Set(meta.initialProps ?? []);const systemProps = systemPropsMeta.map(({ name, meta }) => {- const saved = getAndDelete(unprocessedSaved, name);+ let saved = getAndDelete(unprocessedSaved, name);+ if (saved === undefined && meta.defaultValue !== undefined) {+ saved = getStartingProp(instanceId, meta, name);+ }getAndDelete(unprocessedKnown, name);initialPropsNames.delete(name);return { prop: saved, propName: name, meta };diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex c4984f7503..f9c4fbce93 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -15,6 +15,7 @@ import {renderWebstudioComponentChildren,idAttribute,componentAttribute,+ showAttribute,} from "@webstudio-is/react-sdk";import {instancesStore,@@ -127,7 +128,7 @@ export const WebstudioComponentDev = ({);const instanceProps = useInstanceProps(instance.id);- const userProps = useMemo(() => {+ const { [showAttribute]: show = true, ...userProps } = useMemo(() => {const result: UserProps = {};if (instanceProps === undefined) {return result;@@ -176,6 +177,10 @@ export const WebstudioComponentDev = ({const Component = components.get(instance.component);+ if (show === false) {+ return <></>;+ }+if (Component === undefined) {return <></>;}diff --git a/packages/react-sdk/src/tree/webstudio-component.tsx b/packages/react-sdk/src/tree/webstudio-component.tsxindex 42ec67b12d..3ec7b8ab83 100644--- a/packages/react-sdk/src/tree/webstudio-component.tsx+++ b/packages/react-sdk/src/tree/webstudio-component.tsx@@ -40,13 +40,18 @@ export const WebstudioComponent = ({components,...rest}: WebstudioComponentProps) => {- const instanceProps = useInstanceProps(instance.id);+ const { [showAttribute]: show = true, ...instanceProps } = useInstanceProps(+ instance.id+ );const props = {...instanceProps,...rest,[idAttribute]: instance.id,[componentAttribute]: instance.component,};+ if (show === false) {+ return <></>;+ }const Component = components.get(instance.component);if (Component === undefined) {return <></>;@@ -60,4 +65,5 @@ export const WebstudioComponent = ({export const idAttribute = "data-ws-id";export const componentAttribute = "data-ws-component";+export const showAttribute = "data-ws-show";export const collapsedAttribute = "data-ws-collapsed";diff --git a/packages/sdk-components-react/src/list.ws.tsx b/packages/sdk-components-react/src/list.ws.tsxindex 96f38a1621..b003fe0d3f 100644--- a/packages/sdk-components-react/src/list.ws.tsx+++ b/packages/sdk-components-react/src/list.ws.tsx@@ -54,5 +54,5 @@ export const meta: WsComponentMeta = {export const propsMeta: WsComponentPropsMeta = {props,- initialProps: ["ordered", "type", "starts", "reversed"],+ initialProps: ["ordered", "type", "start", "reversed"],};