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: prop expression removing (#2588)
Bogdan Chadkincdf6681bf327
diff --git a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsxindex e8fa773643..d935be43a6 100644--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx@@ -33,7 +33,11 @@ export const BooleanControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box><Switchid={id}diff --git a/apps/builder/app/builder/features/settings-panel/controls/check.tsx b/apps/builder/app/builder/features/settings-panel/controls/check.tsxindex cc576d5059..138940d6c1 100644--- a/apps/builder/app/builder/features/settings-panel/controls/check.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/check.tsx@@ -48,7 +48,11 @@ export const CheckControl = ({<Label htmlFor={`${id}:${options[0]}`} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/color.tsx b/apps/builder/app/builder/features/settings-panel/controls/color.tsxindex f30605e358..0dd0518888 100644--- a/apps/builder/app/builder/features/settings-panel/controls/color.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/color.tsx@@ -33,7 +33,11 @@ export const ColorControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/file.tsx b/apps/builder/app/builder/features/settings-panel/controls/file.tsxindex 045c0bd9f3..8473f36ae7 100644--- a/apps/builder/app/builder/features/settings-panel/controls/file.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/file.tsx@@ -78,7 +78,11 @@ export const FileControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/number.tsx b/apps/builder/app/builder/features/settings-panel/controls/number.tsxindex 20f5fe9543..89f4ef6d8d 100644--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx@@ -36,7 +36,11 @@ export const NumberControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx b/apps/builder/app/builder/features/settings-panel/controls/radio.tsxindex 798936fc61..99d1990f74 100644--- a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx@@ -33,7 +33,11 @@ export const RadioControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/select.tsx b/apps/builder/app/builder/features/settings-panel/controls/select.tsxindex 4f45a87859..da62bf591c 100644--- a/apps/builder/app/builder/features/settings-panel/controls/select.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/select.tsx@@ -26,7 +26,11 @@ export const SelectControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsxindex 001e67b0a2..7682af2b74 100644--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx@@ -44,7 +44,7 @@ export const TextControl = ({<Label htmlFor={id} description={meta.description}>{label}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton propId={prop?.id} propName={propName} propMeta={meta} /></Box>);diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsxindex b511e82391..d967db8106 100644--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx@@ -406,7 +406,11 @@ export const UrlControl = ({<Label htmlFor={id} description={meta.description}>{getLabel(meta, propName)}</Label>- <VariablesButton prop={prop} propMeta={meta} onChange={onChange} />+ <VariablesButton+ propId={prop?.id}+ propName={propName}+ propMeta={meta}+ /></Box>}deletable={deletable}diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex 949f894de4..ae84c04710 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -218,7 +218,7 @@ export const PropsSectionContainer = ({const props = propsStore.get();const prop = props.get(update.id);// update data source instead when real prop has data source type- // update the prop when new binding is added+ // update the prop when new expression is addedif (prop?.type === "dataSource" && update.type !== "dataSource") {let dataSourceId = prop.value;const dataSources = dataSourcesStore.get();@@ -240,7 +240,7 @@ export const PropsSectionContainer = ({dataSourceVariables.set(dataSourceId, update.value);dataSourceVariablesStore.set(dataSourceVariables);// update the variable when real prop has expression type- // update the prop when new binding is added+ // update the prop when new expression is added} else if (prop?.type === "expression" && update.type !== "expression") {const dataSources = dataSourcesStore.get();// when expression contains only reference to variable update that variablediff --git a/apps/builder/app/builder/features/settings-panel/variables.stories.tsx b/apps/builder/app/builder/features/settings-panel/variables.stories.tsxindex f68aacbb19..a7199ad878 100644--- a/apps/builder/app/builder/features/settings-panel/variables.stories.tsx+++ b/apps/builder/app/builder/features/settings-panel/variables.stories.tsx@@ -12,7 +12,7 @@ import {propsStore,selectedInstanceSelectorStore,} from "~/shared/nano-states";-import { registerContainers, serverSyncStore } from "~/shared/sync";+import { registerContainers } from "~/shared/sync";export default {title: "Builder/Variables",@@ -41,17 +41,13 @@ const VariablesPopover = () => {<FloatingPanelPopoverContent align="start"><VariablesPanelpropId="my-prop"+ propName="my-prop"propMeta={{required: false,control: "text",type: "string",defaultValue: "initial",}}- onChange={(propValue) => {- serverSyncStore.createTransaction([propsStore], (props) => {- props.set("my-prop", { ...initialProp, ...propValue });- });- }}/></FloatingPanelPopoverContent></FloatingPanelPopover>diff --git a/apps/builder/app/builder/features/settings-panel/variables.tsx b/apps/builder/app/builder/features/settings-panel/variables.tsxindex 678a1d5dff..7b8beae4c2 100644--- a/apps/builder/app/builder/features/settings-panel/variables.tsx+++ b/apps/builder/app/builder/features/settings-panel/variables.tsx@@ -2,6 +2,7 @@ import { useEffect, useId, useMemo, useState } from "react";import { nanoid } from "nanoid";import { computed } from "nanostores";import { useStore } from "@nanostores/react";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {Button,CssValueListArrowFocus,@@ -44,7 +45,6 @@ import {import { serverSyncStore } from "~/shared/sync";import { CodeEditor } from "./code-editor";import type { PropValue } from "./shared";-import { isFeatureEnabled } from "@webstudio-is/feature-flags";type VariableDataSource = Extract<DataSource, { type: "variable" }>;@@ -415,6 +415,33 @@ const getExpressionVariables = (expression: string) => {return variableIds;};+const setPropValue = ({+ propId,+ propName,+ propValue,+}: {+ propId: undefined | Prop["id"];+ propName: Prop["name"];+ propValue: PropValue;+}) => {+ const instanceSelector = selectedInstanceSelectorStore.get();+ if (instanceSelector === undefined) {+ return;+ }+ const [instanceId] = instanceSelector;++ // create new prop or update existing one+ serverSyncStore.createTransaction([propsStore], (props) => {+ let prop = propId === undefined ? undefined : props.get(propId);+ if (prop === undefined) {+ prop = { id: nanoid(), instanceId, name: propName, ...propValue };+ } else {+ prop = { ...prop, ...propValue };+ }+ props.set(prop.id, prop);+ });+};+const ListPanel = ({prop,onAdd,@@ -538,12 +565,12 @@ const ListPanel = ({export const VariablesPanel = ({propId,+ propName,propMeta,- onChange,}: {propId: undefined | Prop["id"];+ propName: Prop["id"];propMeta: PropMeta;- onChange: (value: PropValue) => void;}) => {// compute prop instead of using passed one// because data source props are converted into values@@ -587,7 +614,7 @@ export const VariablesPanel = ({);}- const removeBinding = () => {+ const removeExpression = () => {// delete expression if existsif (prop?.type === "dataSource") {serverSyncStore.createTransaction([dataSourcesStore], (dataSources) => {@@ -598,10 +625,14 @@ export const VariablesPanel = ({});}// reset prop with initial value from meta- onChange({- type: propMeta.type,- value: propMeta.defaultValue,- } as PropValue);+ setPropValue({+ propId,+ propName,+ propValue: {+ type: propMeta.type,+ value: propMeta.defaultValue,+ } as PropValue,+ });};return (@@ -610,11 +641,11 @@ export const VariablesPanel = ({prop={prop}onAdd={() => setView({ name: "add" })}onEdit={(variable) => setView({ name: "edit", variable })}- onChange={(value) => {- if (value === undefined) {- removeBinding();+ onChange={(propValue) => {+ if (propValue === undefined) {+ removeExpression();} else {- onChange(value);+ setPropValue({ propId, propName, propValue });}}}/>@@ -623,14 +654,14 @@ export const VariablesPanel = ({actions={<>{(prop?.type === "dataSource" || prop?.type === "expression") && (- <Tooltip content="Remove binding" side="bottom">- {/* automatically close popover when remove binding */}+ <Tooltip content="Remove expression" side="bottom">+ {/* automatically close popover when remove expression */}<FloatingPanelPopoverClose asChild><Button- aria-label="Remove binding"+ aria-label="Remove expression"prefix={<TrashIcon />}color="ghost"- onClick={removeBinding}+ onClick={removeExpression}/></FloatingPanelPopoverClose></Tooltip>@@ -653,13 +684,13 @@ export const VariablesPanel = ({};export const VariablesButton = ({- prop,+ propId,+ propName,propMeta,- onChange,}: {- prop: undefined | Prop;+ propId: undefined | Prop["id"];+ propName: Prop["name"];propMeta: PropMeta;- onChange: (value: PropValue) => void;}) => {if (isFeatureEnabled("bindings") === false) {return;@@ -678,9 +709,9 @@ export const VariablesButton = ({</FloatingPanelPopoverTrigger><FloatingPanelPopoverContent side="left" align="start"><VariablesPanel- propId={prop?.id}+ propId={propId}+ propName={propName}propMeta={propMeta}- onChange={onChange}/></FloatingPanelPopoverContent></FloatingPanelPopover>diff --git a/fixtures/webstudio-remix-vercel/.webstudio/data.json b/fixtures/webstudio-remix-vercel/.webstudio/data.jsonindex dc0f74679e..72444e67ff 100644--- a/fixtures/webstudio-remix-vercel/.webstudio/data.json+++ b/fixtures/webstudio-remix-vercel/.webstudio/data.json@@ -4,7 +4,7 @@"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d","version": 222,"createdAt": "2023-11-03T13:22:34.879Z",- "updatedAt": "2023-11-03T13:22:34.879Z",+ "updatedAt": "2023-11-09T09:26:06.133Z","pages": {"meta": {"siteName": "KittyGuardedZone",@@ -1769,8 +1769,8 @@"id": "XDeoQFsXw3NhVjns6I5HM","instanceId": "AM9fD6dv2Ftc3Xjcsd7Uc","name": "value",- "type": "dataSource",- "value": "RR_FthRebEUcAKUJIXl0j"+ "type": "expression",+ "value": "$ws$dataSource$RR_FthRebEUcAKUJIXl0j"}],[@@ -1845,8 +1845,8 @@"id": "OER1GvKVEE4CdEX1yrNe3","instanceId": "isNSM3wXcnHFikwNPlEOL","name": "state",- "type": "dataSource",- "value": "KvfuNNCNslj7nAGsD69Fl"+ "type": "expression",+ "value": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl"}],[@@ -1871,8 +1871,8 @@"id": "Nyxr4ohgm_MNVtGpsGUn3","instanceId": "a5YPRc19IJyhTrjjasA_R","name": "data-ws-show",- "type": "dataSource",- "value": "ezyBm7JGcDokMP8DZVzrD"+ "type": "expression",+ "value": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'initial' || $ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'"}],[@@ -1901,8 +1901,8 @@"id": "mtOiOi1u0WbNI09rVIS6T","instanceId": "Gw-ta0R4FNFAGBTVRWKep","name": "data-ws-show",- "type": "dataSource",- "value": "_NmOL-v4PZhCcmj2vaDy_"+ "type": "expression",+ "value": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'success'"}],[@@ -1911,8 +1911,8 @@"id": "FTd65V4oEibesTqvAjKp0","instanceId": "ewk_WKpu4syHLPABMmvUz","name": "data-ws-show",- "type": "dataSource",- "value": "VeQ-Tiya3whVhWHbJVHID"+ "type": "expression",+ "value": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'"}],[@@ -1921,8 +1921,8 @@"id": "vtsKrdjJH3YT89prj2K5T","instanceId": "-1RvizaBcVpHsjvnYxn1c","name": "state",- "type": "dataSource",- "value": "Ip0FRY7L24QrIMdtuMN5j"+ "type": "expression",+ "value": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j"}],[@@ -1947,8 +1947,8 @@"id": "K6DEgf4WkIDqdiuiwAS5E","instanceId": "qhnVrmYGlyrMZi3UzqSQA","name": "data-ws-show",- "type": "dataSource",- "value": "DUDDZM-QmYH_zBgbIODiu"+ "type": "expression",+ "value": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'initial' || $ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'"}],[@@ -1977,8 +1977,8 @@"id": "JbdIh72OZ8RnHXvYTsLRd","instanceId": "966cjxuqP_T99N27-mqWE","name": "data-ws-show",- "type": "dataSource",- "value": "F72Gu_6DnbW9CGp_747xa"+ "type": "expression",+ "value": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'success'"}],[@@ -1987,8 +1987,8 @@"id": "6UMH0WLK_fORElv3ffHCg","instanceId": "SYG5hhOz31xFJUN_v9zq6","name": "data-ws-show",- "type": "dataSource",- "value": "XhDObB85P8I_uDZ_CzGDt"+ "type": "expression",+ "value": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'"}],[@@ -2102,36 +2102,6 @@}}],- [- "ezyBm7JGcDokMP8DZVzrD",- {- "type": "expression",- "id": "ezyBm7JGcDokMP8DZVzrD",- "scopeInstanceId": "a5YPRc19IJyhTrjjasA_R",- "name": "formInitial",- "code": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'initial' || $ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'"- }- ],- [- "_NmOL-v4PZhCcmj2vaDy_",- {- "type": "expression",- "id": "_NmOL-v4PZhCcmj2vaDy_",- "scopeInstanceId": "Gw-ta0R4FNFAGBTVRWKep",- "name": "formSuccess",- "code": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'success'"- }- ],- [- "VeQ-Tiya3whVhWHbJVHID",- {- "type": "expression",- "id": "VeQ-Tiya3whVhWHbJVHID",- "scopeInstanceId": "ewk_WKpu4syHLPABMmvUz",- "name": "formError",- "code": "$ws$dataSource$KvfuNNCNslj7nAGsD69Fl === 'error'"- }- ],["Ip0FRY7L24QrIMdtuMN5j",{@@ -2144,36 +2114,6 @@"value": "initial"}}- ],- [- "DUDDZM-QmYH_zBgbIODiu",- {- "type": "expression",- "id": "DUDDZM-QmYH_zBgbIODiu",- "scopeInstanceId": "qhnVrmYGlyrMZi3UzqSQA",- "name": "formInitial",- "code": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'initial' || $ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'"- }- ],- [- "F72Gu_6DnbW9CGp_747xa",- {- "type": "expression",- "id": "F72Gu_6DnbW9CGp_747xa",- "scopeInstanceId": "966cjxuqP_T99N27-mqWE",- "name": "formSuccess",- "code": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'success'"- }- ],- [- "XhDObB85P8I_uDZ_CzGDt",- {- "type": "expression",- "id": "XhDObB85P8I_uDZ_CzGDt",- "scopeInstanceId": "SYG5hhOz31xFJUN_v9zq6",- "name": "formError",- "code": "$ws$dataSource$Ip0FRY7L24QrIMdtuMN5j === 'error'"- }]],"instances": [diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex 95f766ca38..7704f934f0 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -73,6 +73,7 @@ export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";const Page = (props: { scripts?: ReactNode }) => {let [formState, set$formState] = useState<any>("initial");let [formState_1, set$formState_1] = useState<any>("initial");+ let state = formState;let onStateChange = (state: any) => {formState = state;set$formState(formState);@@ -80,6 +81,7 @@ const Page = (props: { scripts?: ReactNode }) => {let datawsshow = formState === "initial" || formState === "error";let datawsshow_1 = formState === "success";let datawsshow_2 = formState === "error";+ let state_1 = formState_1;let onStateChange_1 = (state: any) => {formState_1 = state;set$formState_1(formState_1);@@ -92,7 +94,7 @@ const Page = (props: { scripts?: ReactNode }) => {<Formdata-ws-id="-1RvizaBcVpHsjvnYxn1c"data-ws-component="Form"- state={formState_1}+ state={state_1}onStateChange={onStateChange_1}>{datawsshow_3 && (@@ -142,7 +144,7 @@ const Page = (props: { scripts?: ReactNode }) => {<Formdata-ws-id="isNSM3wXcnHFikwNPlEOL"data-ws-component="Form"- state={formState}+ state={state}onStateChange={onStateChange}method={"get"}action={"/custom"}diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex c785cca01c..7566026685 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -81,6 +81,7 @@ export const projectId = "cddc1d44-af37-4cb6-a430-d300cf6f932d";const Page = (props: { scripts?: ReactNode }) => {let [accordionValue, set$accordionValue] = useState<any>("0");+ let value = accordionValue;let onValueChange = (value: any) => {accordionValue = value;set$accordionValue(accordionValue);@@ -91,7 +92,7 @@ const Page = (props: { scripts?: ReactNode }) => {data-ws-id="AM9fD6dv2Ftc3Xjcsd7Uc"data-ws-component="@webstudio-is/sdk-components-react-radix:Accordion"collapsible={true}- value={accordionValue}+ value={value}onValueChange={onValueChange}><AccordionItemdiff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].tsindex b819700c09..d690702891 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts@@ -2,19 +2,19 @@ export const sitemap = {pages: [{path: "",- lastModified: "2023-11-03T13:22:34.879Z",+ lastModified: "2023-11-09T09:26:06.133Z",},{path: "/_route_with_symbols_",- lastModified: "2023-11-03T13:22:34.879Z",+ lastModified: "2023-11-09T09:26:06.133Z",},{path: "/form",- lastModified: "2023-11-03T13:22:34.879Z",+ lastModified: "2023-11-09T09:26:06.133Z",},{path: "/heading-with-id",- lastModified: "2023-11-03T13:22:34.879Z",+ lastModified: "2023-11-09T09:26:06.133Z",},],};