Skip to content

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.

Condense settings and properties tabs into one (#1902)

Oleg Isonen84c06569b947
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsx
index 1e0c56c52d..3cfba4362b 100644
--- a/apps/builder/app/builder/features/inspector/inspector.tsx
+++ b/apps/builder/app/builder/features/inspector/inspector.tsx
@@ -16,15 +16,13 @@ import {
} from "@webstudio-is/design-system";
import type { Publish } from "~/shared/pubsub";
import { StylePanel } from "~/builder/features/style-panel";
-import { PropsPanelContainer } from "~/builder/features/props-panel";
+import { SettingsPanelContainer } from "~/builder/features/settings-panel";
import { FloatingPanelProvider } from "~/builder/shared/floating-panel";
import {
selectedInstanceStore,
isDraggingStore,
registeredComponentMetasStore,
- registeredComponentPropsMetasStore,
} from "~/shared/nano-states";
-import { SettingsPanel } from "../settings-panel";
import { NavigatorTree } from "~/builder/shared/navigator-tree";
import type { Settings } from "~/builder/shared/client-settings";
import { MetaIcon } from "~/builder/shared/meta-icon";
@@ -73,7 +71,6 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
const [tab, setTab] = useState("style");
const isDragging = useStore(isDraggingStore);
const metas = useStore(registeredComponentMetasStore);
- const propsMetas = useStore(registeredComponentPropsMetasStore);
if (navigatorLayout === "docked" && isDragging) {
return <NavigatorTree />;
@@ -93,14 +90,10 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
}
const meta = metas.get(selectedInstance.component);
- const propsMeta = propsMetas.get(selectedInstance.component);
const isStyleTabVisible = meta?.stylable ?? true;
- const isPropsTabVisible =
- propsMeta && Object.keys(propsMeta.props).length !== 0;
const availableTabs = [
isStyleTabVisible ? "style" : undefined,
- isPropsTabVisible ? "props" : undefined,
"settings",
].filter((tab) => tab);
@@ -122,10 +115,6 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
{isStyleTabVisible && (
<PanelTabsTrigger value="style">Style</PanelTabsTrigger>
)}
- {/* @note: events would be part of props */}
- {isPropsTabVisible && (
- <PanelTabsTrigger value="props">Properties</PanelTabsTrigger>
- )}
<PanelTabsTrigger value="settings">Settings</PanelTabsTrigger>
</PanelTabsList>
<PanelTabsContent value="style" css={contentStyle} tabIndex={-1}>
@@ -135,10 +124,10 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
selectedInstance={selectedInstance}
/>
</PanelTabsContent>
- <PanelTabsContent value="props" css={contentStyle} tabIndex={-1}>
+ <PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>
<ScrollArea>
<InstanceInfo instance={selectedInstance} />
- <PropsPanelContainer
+ <SettingsPanelContainer
publish={publish}
key={
selectedInstance.id /* Re-render when instance changes */
@@ -147,12 +136,6 @@ export const Inspector = ({ publish, navigatorLayout }: InspectorProps) => {
/>
</ScrollArea>
</PanelTabsContent>
- <PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>
- <ScrollArea>
- <InstanceInfo instance={selectedInstance} />
- <SettingsPanel />
- </ScrollArea>
- </PanelTabsContent>
</Flex>
</PanelTabs>
</FloatingPanelProvider>
diff --git a/apps/builder/app/builder/features/props-panel/index.ts b/apps/builder/app/builder/features/props-panel/index.ts
deleted file mode 100644
index f1357c1481..0000000000
--- a/apps/builder/app/builder/features/props-panel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./props-panel";
diff --git a/apps/builder/app/builder/features/props-panel/controls/boolean.tsx b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/boolean.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/check.tsx b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/check.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/check.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/code.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/code.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/color.tsx b/apps/builder/app/builder/features/settings-panel/controls/color.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/color.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/color.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/combined.tsx b/apps/builder/app/builder/features/settings-panel/controls/combined.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/combined.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/combined.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/file.tsx b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/file.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/file.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/number.tsx b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/number.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/number.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/radio.tsx b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/radio.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/radio.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/select-asset.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/select.tsx b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/select.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/select.tsx
diff --git a/apps/builder/app/builder/features/props-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
similarity index 87%
rename from apps/builder/app/builder/features/props-panel/controls/text.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/text.tsx
index 26ad5becba..89c181f7e1 100644
--- a/apps/builder/app/builder/features/props-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -108,10 +108,7 @@ export const TextControl = ({
});
const id = useId();
const label = getLabel(meta, propName);
- const [initialRows] = useState(
- () => meta.rows ?? countLines(localValue.value)
- );
- const isMultiline = initialRows > 1;
+ const isTwoColumnLayout = meta.rows && meta.rows < 2 ? true : false;
const input = (
<UniversalInput
@@ -123,17 +120,17 @@ export const TextControl = ({
/>
);
- if (isMultiline) {
+ if (isTwoColumnLayout) {
return (
- <VerticalLayout label={label} id={id} onDelete={onDelete}>
- <Flex css={{ py: theme.spacing[2] }}>{input}</Flex>
- </VerticalLayout>
+ <HorizontalLayout label={label} id={id} onDelete={onDelete}>
+ <Flex css={{ width: theme.spacing[22] }}>{input}</Flex>
+ </HorizontalLayout>
);
}
return (
- <HorizontalLayout label={label} id={id} onDelete={onDelete}>
- <Flex css={{ width: theme.spacing[22] }}>{input}</Flex>
- </HorizontalLayout>
+ <VerticalLayout label={label} id={id} onDelete={onDelete}>
+ <Flex css={{ py: theme.spacing[2] }}>{input}</Flex>
+ </VerticalLayout>
);
};
diff --git a/apps/builder/app/builder/features/props-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/controls/url.tsx
rename to apps/builder/app/builder/features/settings-panel/controls/url.tsx
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.assets/beach.jpg b/apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/beach.jpg
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/props-panel.stories.assets/beach.jpg
rename to apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/beach.jpg
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.assets/car.png b/apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/car.png
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/props-panel.stories.assets/car.png
rename to apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/car.png
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.assets/cat.jpg b/apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/cat.jpg
similarity index 100%
rename from apps/builder/app/builder/features/props-panel/props-panel.stories.assets/cat.jpg
rename to apps/builder/app/builder/features/settings-panel/props-section/props-panel.stories.assets/cat.jpg
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
similarity index 75%
rename from apps/builder/app/builder/features/props-panel/props-panel.stories.tsx
rename to apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
index 67aa43c42c..8ad72b83d9 100644
--- a/apps/builder/app/builder/features/props-panel/props-panel.stories.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
@@ -1,11 +1,12 @@
import { useState } from "react";
-import { PropsPanel } from "./props-panel";
+import { PropsSection } from "./props-section";
import { usePropsLogic } from "./use-props-logic";
import {
assetsStore,
instancesStore,
pagesStore,
propsStore,
+ registerComponentPropsMetas,
selectedPageIdStore,
} from "~/shared/nano-states";
import { setMockEnv } from "~/shared/env";
@@ -85,12 +86,24 @@ const addLinkableSections = (
};
props.set(prop.id, prop);
}
+ return rootInstance;
};
addLinkableSections(["contacts", "about"]);
-addLinkableSections(["company", "employees"], pagesStore.get()?.pages[0]);
+const rootInstance = addLinkableSections(
+ ["company", "employees"],
+ pagesStore.get()?.pages[0]
+);
selectedPageIdStore.set(pagesStore.get()?.homePage.id);
+const instance: Instance = {
+ id: instanceId,
+ type: "instance",
+ component: "Box",
+ children: [],
+};
+rootInstance?.children.push({ type: "id", value: instance.id });
+
const imageAsset = (name = "cat", format = "jpg"): Asset => ({
id: unique(),
projectId,
@@ -191,57 +204,59 @@ const checkProp = (options = defaultOptions, label?: string): PropMeta => ({
label,
});
-const componentPropsMeta: WsComponentPropsMeta = {
- props: {
- initialText: textProp("", "multi\nline"),
- initialShortText: shortTextProp(),
- initialNumber: numberProp(),
- initialBoolean: booleanProp(),
- initialColor: colorProp(),
- initialRadio: radioProp(),
- initialSelect: selectProp(),
- initialCheck: checkProp(),
- initialUrl: urlProp(),
- initialFile: fileProp("Initial File (PNG only)", ".png"),
- addedText: textProp(),
- addedShortText: shortTextProp(),
- addedNumber: numberProp(),
- addedBoolean: booleanProp(),
- addedColor: colorProp(),
- addedRadio: radioProp(),
- addedSelect: selectProp(),
- addedCheck: checkProp(),
- addedUrlUrl: urlProp("Added URL (URL)"),
- addedUrlPage: urlProp("Added URL (Page)"),
- addedUrlSection: urlProp("Added URL (Section)"),
- addedUrlEmail: urlProp("Added URL (Email)"),
- addedUrlPhone: urlProp("Added URL (Phone)"),
- addedUrlAttachment: urlProp("Added URL (Attachment)"),
- addedFile: fileProp(),
- availableText: textProp(),
- availableShortText: shortTextProp(),
- availableNumber: numberProp(),
- availableBoolean: booleanProp(),
- availableColor: colorProp(),
- availableRadio: radioProp(),
- availableSelect: selectProp(),
- availableCheck: checkProp(),
- availableUrl: urlProp(),
- availableFile: fileProp(),
+registerComponentPropsMetas({
+ Box: {
+ props: {
+ initialText: textProp("", "multi\nline"),
+ initialShortText: shortTextProp(),
+ initialNumber: numberProp(),
+ initialBoolean: booleanProp(),
+ initialColor: colorProp(),
+ initialRadio: radioProp(),
+ initialSelect: selectProp(),
+ initialCheck: checkProp(),
+ initialUrl: urlProp(),
+ initialFile: fileProp("Initial File (PNG only)", ".png"),
+ addedText: textProp(),
+ addedShortText: shortTextProp(),
+ addedNumber: numberProp(),
+ addedBoolean: booleanProp(),
+ addedColor: colorProp(),
+ addedRadio: radioProp(),
+ addedSelect: selectProp(),
+ addedCheck: checkProp(),
+ addedUrlUrl: urlProp("Added URL (URL)"),
+ addedUrlPage: urlProp("Added URL (Page)"),
+ addedUrlSection: urlProp("Added URL (Section)"),
+ addedUrlEmail: urlProp("Added URL (Email)"),
+ addedUrlPhone: urlProp("Added URL (Phone)"),
+ addedUrlAttachment: urlProp("Added URL (Attachment)"),
+ addedFile: fileProp(),
+ availableText: textProp(),
+ availableShortText: shortTextProp(),
+ availableNumber: numberProp(),
+ availableBoolean: booleanProp(),
+ availableColor: colorProp(),
+ availableRadio: radioProp(),
+ availableSelect: selectProp(),
+ availableCheck: checkProp(),
+ availableUrl: urlProp(),
+ availableFile: fileProp(),
+ },
+ initialProps: [
+ "initialText",
+ "initialShortText",
+ "initialNumber",
+ "initialBoolean",
+ "initialColor",
+ "initialRadio",
+ "initialSelect",
+ "initialCheck",
+ "initialUrl",
+ "initialFile",
+ ],
},
- initialProps: [
- "initialText",
- "initialShortText",
- "initialNumber",
- "initialBoolean",
- "initialColor",
- "initialRadio",
- "initialSelect",
- "initialCheck",
- "initialUrl",
- "initialFile",
- ],
-};
+});
const startingProps: Prop[] = [
{
@@ -358,22 +373,20 @@ export const Story = () => {
const [props, setProps] = useState(startingProps);
const handleDelete = (id: Prop["id"]) => {
- setProps((currernt) => currernt.filter((prop) => prop.id !== id));
+ setProps((current) => current.filter((prop) => prop.id !== id));
};
const handleUpdate = (prop: Prop) => {
- setProps((currernt) => {
- const exists = currernt.find((item) => item.id === prop.id) !== undefined;
+ setProps((current) => {
+ const exists = current.find((item) => item.id === prop.id) !== undefined;
return exists
- ? currernt.map((item) => (item.id === prop.id ? prop : item))
- : [...currernt, prop];
+ ? current.map((item) => (item.id === prop.id ? prop : item))
+ : [...current, prop];
});
};
const logic = usePropsLogic({
- props,
- meta: componentPropsMeta,
- instanceId,
+ instance,
updateProp: handleUpdate,
deleteProp: handleDelete,
});
@@ -381,7 +394,7 @@ export const Story = () => {
return (
<div style={{ display: "flex", gap: 12 }}>
<div style={{ width: 240, border: "dashed 3px #e3e3e3" }}>
- <PropsPanel
+ <PropsSection
instanceId={instanceId}
propsLogic={logic}
component="Button"
diff --git a/apps/builder/app/builder/features/props-panel/props-panel.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
similarity index 59%
rename from apps/builder/app/builder/features/props-panel/props-panel.tsx
rename to apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
index 9ac71dd627..17943ecfba 100644
--- a/apps/builder/app/builder/features/props-panel/props-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
@@ -1,6 +1,5 @@
-import { useStore } from "@nanostores/react";
import store from "immerhin";
-import type { Instance, Prop } from "@webstudio-is/project-build";
+import type { Instance } from "@webstudio-is/project-build";
import {
theme,
useCombobox,
@@ -11,42 +10,28 @@ import {
ComboboxListboxItem,
Separator,
Flex,
- type CSS,
InputField,
NestedInputButton,
} from "@webstudio-is/design-system";
import type { Publish } from "~/shared/pubsub";
-import {
- dataSourceValuesStore,
- dataSourceVariablesStore,
- dataSourcesStore,
- propsIndexStore,
- propsStore,
- registeredComponentPropsMetasStore,
-} from "~/shared/nano-states";
+import { dataSourceVariablesStore, propsStore } from "~/shared/nano-states";
import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";
import {
useStyleData,
type SetProperty as SetCssProperty,
} from "~/builder/features/style-panel/shared/use-style-data";
-import { renderControl } from "./controls/combined";
+import { renderControl } from "../controls/combined";
import {
usePropsLogic,
type NameAndLabel,
type PropAndMeta,
} from "./use-props-logic";
-import { getLabel } from "./shared";
-import { useState, type ReactNode } from "react";
+import { Row, getLabel } from "../shared";
+import { useState } from "react";
const itemToString = (item: NameAndLabel | null) =>
item ? getLabel(item, item.name) : "";
-const Row = ({ children, css }: { children: ReactNode; css?: CSS }) => (
- <Flex css={{ px: theme.spacing[9], ...css }} gap="2" direction="column">
- {children}
- </Flex>
-);
-
const PropsCombobox = ({
items,
onItemSelect,
@@ -75,7 +60,7 @@ const PropsCombobox = ({
<InputField
autoFocus
{...combobox.getInputProps()}
- placeholder="Property"
+ placeholder="New Property"
suffix={<NestedInputButton {...combobox.getToggleButtonProps()} />}
/>
</ComboboxAnchor>
@@ -99,7 +84,12 @@ const PropsCombobox = ({
};
const renderProperty = (
- { propsLogic: logic, setCssProperty, component, instanceId }: PropsPanelProps,
+ {
+ propsLogic: logic,
+ setCssProperty,
+ component,
+ instanceId,
+ }: PropsSectionProps,
{ prop, propName, meta }: PropAndMeta,
deletable?: boolean
) =>
@@ -148,7 +138,7 @@ const AddPropertyForm = ({
</Flex>
);
-type PropsPanelProps = {
+type PropsSectionProps = {
propsLogic: ReturnType<typeof usePropsLogic>;
component: Instance["component"];
instanceId: string;
@@ -156,12 +146,13 @@ type PropsPanelProps = {
};
// A UI componet with minimum logic that can be demoed in Storybook etc.
-export const PropsPanel = (props: PropsPanelProps) => {
+export const PropsSection = (props: PropsSectionProps) => {
const { propsLogic: logic } = props;
const [addingProp, setAddingProp] = useState(false);
- const hasAddedProps = logic.addedProps.length > 0 || addingProp;
+ const hasItems =
+ logic.addedProps.length > 0 || addingProp || logic.initialProps.length > 0;
return (
<>
@@ -171,111 +162,43 @@ export const PropsPanel = (props: PropsPanelProps) => {
<Separator />
- {logic.initialProps.length > 0 && (
- <>
- <Row
- css={{
- paddingTop: theme.spacing[5],
- paddingBottom: theme.spacing[5],
- }}
- >
- {logic.initialProps.map((item) => renderProperty(props, item))}
- </Row>
- <Separator />
- </>
- )}
-
<CollapsibleSectionWithAddButton
- label="Custom Properties"
+ label="Properties"
onAdd={() => setAddingProp(true)}
- hasItems={hasAddedProps}
+ hasItems={hasItems}
>
- {hasAddedProps && (
- <Flex gap="2" direction="column">
- {logic.addedProps.map((item) => renderProperty(props, item, true))}
- {addingProp && (
- <AddPropertyForm
- availableProps={logic.remainingProps}
- onPropSelected={(propName) => {
- setAddingProp(false);
- logic.handleAdd(propName);
- }}
- />
- )}
- </Flex>
- )}
+ <Flex gap="2" direction="column">
+ {addingProp && (
+ <AddPropertyForm
+ availableProps={logic.availableProps}
+ onPropSelected={(propName) => {
+ setAddingProp(false);
+ logic.handleAdd(propName);
+ }}
+ />
+ )}
+ {logic.addedProps.map((item) => renderProperty(props, item, true))}
+ {logic.initialProps.map((item) => renderProperty(props, item))}
+ </Flex>
</CollapsibleSectionWithAddButton>
</>
);
};
-const getPropTypeAndValue = (value: unknown) => {
- if (typeof value === "boolean") {
- return { type: "boolean", value } as const;
- }
- if (typeof value === "number") {
- return { type: "number", value } as const;
- }
- if (typeof value === "string") {
- return { type: "string", value } as const;
- }
- if (Array.isArray(value)) {
- return { type: "string[]", value } as const;
- }
- throw Error(`Unexpected prop value ${value}`);
-};
-
-export const PropsPanelContainer = ({
+export const PropsSectionContainer = ({
selectedInstance: instance,
publish,
}: {
publish: Publish;
selectedInstance: Instance;
}) => {
- const propsMeta = useStore(registeredComponentPropsMetasStore).get(
- instance.component
- );
- const dataSources = useStore(dataSourcesStore);
- const dataSourceValues = useStore(dataSourceValuesStore);
- if (propsMeta === undefined) {
- throw new Error(`Could not get meta for compoent "${instance.component}"`);
- }
-
const { setProperty: setCssProperty } = useStyleData({
selectedInstance: instance,
publish,
});
- const { propsByInstanceId } = useStore(propsIndexStore);
-
- const instanceProps =
- propsByInstanceId.get(instance.id)?.flatMap((prop) => {
- if (prop.type !== "dataSource") {
- return [prop];
- }
- // convert data source prop to typed prop
- const dataSourceId = prop.value;
- const dataSource = dataSources.get(dataSourceId);
- const dataSourceValue = dataSourceValues.get(dataSourceId);
- if (dataSource === undefined) {
- return [];
- }
- return [
- {
- id: prop.id,
- instanceId: prop.instanceId,
- name: prop.name,
- required: prop.required,
- // infer type from value
- ...getPropTypeAndValue(dataSourceValue),
- } satisfies Prop,
- ];
- }) ?? [];
-
const logic = usePropsLogic({
- props: instanceProps,
- meta: propsMeta,
- instanceId: instance.id,
+ instance,
updateProp: (update) => {
const props = propsStore.get();
const prop = props.get(update.id);
@@ -298,8 +221,14 @@ export const PropsPanelContainer = ({
},
});
+ const hasMetaProps = Object.keys(logic.meta.props).length !== 0;
+
+ if (hasMetaProps === false) {
+ return null;
+ }
+
return (
- <PropsPanel
+ <PropsSection
propsLogic={logic}
component={instance.component}
instanceId={instance.id}
diff --git a/apps/builder/app/builder/features/props-panel/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
similarity index 75%
rename from apps/builder/app/builder/features/props-panel/use-props-logic.ts
rename to apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
index ca0bed3b26..fbea8bae95 100644
--- a/apps/builder/app/builder/features/props-panel/use-props-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
@@ -2,10 +2,17 @@ import { useState } from "react";
import { nanoid } from "nanoid";
import type { Instance, Prop } from "@webstudio-is/project-build";
import {
- type WsComponentPropsMeta,
showAttribute,
+ type WsComponentPropsMeta,
} from "@webstudio-is/react-sdk";
-import type { PropMeta, PropValue } from "./shared";
+import type { PropMeta, PropValue } from "../shared";
+import { useStore } from "@nanostores/react";
+import {
+ dataSourceValuesStore,
+ dataSourcesStore,
+ propsIndexStore,
+ registeredComponentPropsMetasStore,
+} from "~/shared/nano-states";
type PropOrName = { prop?: Prop; propName: string };
export type PropAndMeta = { prop?: Prop; propName: string; meta: PropMeta };
@@ -96,14 +103,13 @@ const getDefaultMetaForType = (type: Prop["type"]): PropMeta => {
};
type UsePropsLogicInput = {
- props: Prop[];
- meta: WsComponentPropsMeta;
- instanceId: Instance["id"];
+ instance: Instance;
updateProp: (update: Prop) => void;
deleteProp: (id: Prop["id"]) => void;
};
type UsePropsLogicOutput = {
+ meta: WsComponentPropsMeta;
/** Similar to Initial, but displayed as a separate group in UI etc.
* Currentrly used only for the ID prop. */
systemProps: PropAndMeta[];
@@ -112,7 +118,7 @@ type UsePropsLogicOutput = {
/** Optional props that were added by user */
addedProps: PropAndMeta[];
/** List of remaining props still available to add */
- remainingProps: NameAndLabel[];
+ availableProps: NameAndLabel[];
handleAdd: (propName: string) => void;
handleChange: (prop: PropOrName, value: PropValue) => void;
handleDelete: (prop: PropOrName) => void;
@@ -127,15 +133,6 @@ const getAndDelete = <Value>(map: Map<string, Value>, key: string) => {
};
const systemPropsMeta: { name: string; meta: PropMeta }[] = [
- {
- name: "id",
- meta: {
- label: "ID",
- required: false,
- control: "text",
- type: "string",
- },
- },
{
name: showAttribute,
meta: {
@@ -148,14 +145,63 @@ const systemPropsMeta: { name: string; meta: PropMeta }[] = [
},
];
+const getPropTypeAndValue = (value: unknown) => {
+ if (typeof value === "boolean") {
+ return { type: "boolean", value } as const;
+ }
+ if (typeof value === "number") {
+ return { type: "number", value } as const;
+ }
+ if (typeof value === "string") {
+ return { type: "string", value } as const;
+ }
+ if (Array.isArray(value)) {
+ return { type: "string[]", value } as const;
+ }
+ throw Error(`Unexpected prop value ${value}`);
+};
+
/** usePropsLogic expects that key={instanceId} is used on the ancestor component */
export const usePropsLogic = ({
- props: savedProps,
- meta,
- instanceId,
+ instance,
updateProp,
deleteProp,
}: UsePropsLogicInput): UsePropsLogicOutput => {
+ const meta = useStore(registeredComponentPropsMetasStore).get(
+ instance.component
+ );
+ const dataSources = useStore(dataSourcesStore);
+ const dataSourceValues = useStore(dataSourceValuesStore);
+ const { propsByInstanceId } = useStore(propsIndexStore);
+
+ if (meta === undefined) {
+ throw new Error(`Could not get meta for component "${instance.component}"`);
+ }
+
+ const savedProps =
+ propsByInstanceId.get(instance.id)?.flatMap((prop) => {
+ if (prop.type !== "dataSource") {
+ return [prop];
+ }
+ // convert data source prop to typed prop
+ const dataSourceId = prop.value;
+ const dataSource = dataSources.get(dataSourceId);
+ const dataSourceValue = dataSourceValues.get(dataSourceId);
+ if (dataSource === undefined) {
+ return [];
+ }
+ return [
+ {
+ id: prop.id,
+ instanceId: prop.instanceId,
+ name: prop.name,
+ required: prop.required,
+ // infer type from value
+ ...getPropTypeAndValue(dataSourceValue),
+ } satisfies Prop,
+ ];
+ }) ?? [];
+
// we will delete items from these maps as we categorize the props
const unprocessedSaved = new Map(savedProps.map((prop) => [prop.name, prop]));
const unprocessedKnown = new Map(Object.entries(meta.props));
@@ -163,9 +209,9 @@ export const usePropsLogic = ({
const initialPropsNames = new Set(meta.initialProps ?? []);
const systemProps = systemPropsMeta.map(({ name, meta }) => {
- let saved = getAndDelete(unprocessedSaved, name);
+ let saved = getAndDelete<Prop>(unprocessedSaved, name);
if (saved === undefined) {
- saved = getStartingProp(instanceId, meta, name);
+ saved = getStartingProp(instance.id, meta, name);
}
getAndDelete(unprocessedKnown, name);
initialPropsNames.delete(name);
@@ -173,7 +219,7 @@ export const usePropsLogic = ({
});
const initialProps: PropAndMeta[] = Array.from(initialPropsNames, (name) => {
- const saved = getAndDelete(unprocessedSaved, name);
+ const saved = getAndDelete<Prop>(unprocessedSaved, name);
const known = getAndDelete(unprocessedKnown, name);
if (known === undefined) {
@@ -194,7 +240,7 @@ export const usePropsLogic = ({
// - they think that width is set to 0, but it's actually not set at all
//
if (prop === undefined) {
- prop = getStartingProp(instanceId, known, name);
+ prop = getStartingProp(instance.id, known, name);
}
return { prop, propName: name, meta: known };
@@ -231,19 +277,19 @@ export const usePropsLogic = ({
const handleAdd = (propName: string) => {
const propMeta = unprocessedKnown.get(propName);
if (propMeta === undefined) {
- throw new Error(`Attempting to add a prop not lised in remainingProps`);
+ throw new Error(`Attempting to add a prop not lised in availableProps`);
}
- const prop = getStartingProp(instanceId, propMeta, propName);
+ const prop = getStartingProp(instance.id, propMeta, propName);
if (prop) {
updateProp(prop);
}
- setAddedNames((prev) => [...prev, propName]);
+ setAddedNames((prev) => [propName, ...prev]);
};
const handleChange = ({ prop, propName }: PropOrName, value: PropValue) => {
updateProp(
prop === undefined
- ? { id: nanoid(), instanceId, name: propName, ...value }
+ ? { id: nanoid(), instanceId: instance.id, name: propName, ...value }
: { ...prop, ...value }
);
};
@@ -260,10 +306,11 @@ export const usePropsLogic = ({
};
return {
+ meta,
systemProps,
initialProps,
addedProps,
- remainingProps: Array.from(
+ availableProps: Array.from(
unprocessedKnown.entries(),
([name, { label }]) => ({ name, label })
),
diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
index 7c85a41b80..7cdf2c64d3 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
@@ -1,38 +1,22 @@
-import { useStore } from "@nanostores/react";
-import { Flex, Label, theme, InputField } from "@webstudio-is/design-system";
-import {
- registeredComponentMetasStore,
- selectedInstanceStore,
-} from "~/shared/nano-states";
-import { useSettingsLogic } from "./use-settings-logic";
+import type { Publish } from "~/shared/pubsub";
+import type { Instance } from "@webstudio-is/project-build";
+import { SettingsSection } from "./settings-section/settings-section";
+import { PropsSectionContainer } from "./props-section/props-section";
-export const SettingsPanel = () => {
- const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic();
- const selectedInstance = useStore(selectedInstanceStore);
- const metas = useStore(registeredComponentMetasStore);
- if (selectedInstance === undefined) {
- return null;
- }
- const label = metas.get(selectedInstance.component)?.label;
+export const SettingsPanelContainer = ({
+ selectedInstance,
+ publish,
+}: {
+ publish: Publish;
+ selectedInstance: Instance;
+}) => {
return (
- <Flex
- gap="1"
- direction="column"
- grow
- css={{ px: theme.spacing[9], py: theme.spacing[9] }}
- >
- <Label>Instance Name</Label>
- <InputField
- /* Key is required, otherwise when label is undefined, previous value stayed */
- key={selectedInstance.id}
- onBlur={handleBlur}
- onKeyDown={handleKeyDown}
- placeholder={label}
- defaultValue={selectedInstance.label}
- onChange={(event) => {
- setLabel(event.target.value.trim());
- }}
+ <>
+ <SettingsSection />
+ <PropsSectionContainer
+ publish={publish}
+ selectedInstance={selectedInstance}
/>
- </Flex>
+ </>
);
};
diff --git a/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx b/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx
new file mode 100644
index 0000000000..2090fba7b5
--- /dev/null
+++ b/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx
@@ -0,0 +1,35 @@
+import { useStore } from "@nanostores/react";
+import { InputField } from "@webstudio-is/design-system";
+import {
+ registeredComponentMetasStore,
+ selectedInstanceStore,
+} from "~/shared/nano-states";
+import { useSettingsLogic } from "./use-settings-logic";
+import { HorizontalLayout, Row } from "../shared";
+
+export const SettingsSection = () => {
+ const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic();
+ const selectedInstance = useStore(selectedInstanceStore);
+ const metas = useStore(registeredComponentMetasStore);
+ if (selectedInstance === undefined) {
+ return null;
+ }
+ const label = metas.get(selectedInstance.component)?.label;
+ return (
+ <Row>
+ <HorizontalLayout label="Name">
+ <InputField
+ /* Key is required, otherwise when label is undefined, previous value stayed */
+ key={selectedInstance.id}
+ onBlur={handleBlur}
+ onKeyDown={handleKeyDown}
+ placeholder={label}
+ defaultValue={selectedInstance.label}
+ onChange={(event) => {
+ setLabel(event.target.value.trim());
+ }}
+ />
+ </HorizontalLayout>
+ </Row>
+ );
+};
diff --git a/apps/builder/app/builder/features/settings-panel/use-settings-logic.ts b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts
similarity index 100%
rename from apps/builder/app/builder/features/settings-panel/use-settings-logic.ts
rename to apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts
diff --git a/apps/builder/app/builder/features/props-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
similarity index 95%
rename from apps/builder/app/builder/features/props-panel/shared.tsx
rename to apps/builder/app/builder/features/settings-panel/shared.tsx
index 5d9f34f630..99a42344aa 100644
--- a/apps/builder/app/builder/features/props-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -18,6 +18,7 @@ import {
Box,
Flex,
theme,
+ type CSS,
} from "@webstudio-is/design-system";
import { humanizeString } from "~/shared/string-utils";
@@ -163,3 +164,9 @@ export const HorizontalLayout = ({
</Flex>
</Flex>
);
+
+export const Row = ({ children, css }: { children: ReactNode; css?: CSS }) => (
+ <Flex css={{ px: theme.spacing[9], ...css }} gap="2" direction="column">
+ {children}
+ </Flex>
+);
diff --git a/apps/builder/app/shared/string-utils.ts b/apps/builder/app/shared/string-utils.ts
index 92c37d23de..c70351d0b7 100644
--- a/apps/builder/app/shared/string-utils.ts
+++ b/apps/builder/app/shared/string-utils.ts
@@ -1,5 +1,14 @@
import { noCase } from "no-case";
import { titleCase } from "title-case";
-export const humanizeString = (string: string): string =>
- titleCase(noCase(string));
+// Initialize the cache with abbreviations that don't follow the title case rules.
+const cache: Map<string, string> = new Map([
+ ["id", "ID"],
+ ["url", "URL"],
+]);
+
+export const humanizeString = (string: string): string => {
+ const result = cache.get(string) ?? titleCase(noCase(string));
+ cache.set(string, result);
+ return result;
+};
diff --git a/packages/sdk-components-react-remix/src/form.ws.tsx b/packages/sdk-components-react-remix/src/form.ws.tsx
index 2b538a5f94..a04cd478d3 100644
--- a/packages/sdk-components-react-remix/src/form.ws.tsx
+++ b/packages/sdk-components-react-remix/src/form.ws.tsx
@@ -137,5 +137,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["state"],
+ initialProps: ["id", "state"],
};
diff --git a/packages/sdk-components-react-remix/src/link.ws.ts b/packages/sdk-components-react-remix/src/link.ws.ts
index 5ea4b29fd5..69fa31ce46 100644
--- a/packages/sdk-components-react-remix/src/link.ws.ts
+++ b/packages/sdk-components-react-remix/src/link.ws.ts
@@ -12,5 +12,5 @@ export const propsMeta: WsComponentPropsMeta = {
required: false,
},
},
- initialProps: ["href", "target", "prefetch"],
+ initialProps: ["id", "href", "target", "prefetch"],
};
diff --git a/packages/sdk-components-react/src/blockquote.ws.tsx b/packages/sdk-components-react/src/blockquote.ws.tsx
index 23978967a2..bd62b7b8aa 100644
--- a/packages/sdk-components-react/src/blockquote.ws.tsx
+++ b/packages/sdk-components-react/src/blockquote.ws.tsx
@@ -78,4 +78,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/body.ws.tsx b/packages/sdk-components-react/src/body.ws.tsx
index 398ac5069e..707a6d1411 100644
--- a/packages/sdk-components-react/src/body.ws.tsx
+++ b/packages/sdk-components-react/src/body.ws.tsx
@@ -23,4 +23,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/bold.ws.tsx b/packages/sdk-components-react/src/bold.ws.tsx
index 15c3a67798..da0e0ac89c 100644
--- a/packages/sdk-components-react/src/bold.ws.tsx
+++ b/packages/sdk-components-react/src/bold.ws.tsx
@@ -23,4 +23,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/box.ws.ts b/packages/sdk-components-react/src/box.ws.ts
index 1765df9be5..fcaecea93d 100644
--- a/packages/sdk-components-react/src/box.ws.ts
+++ b/packages/sdk-components-react/src/box.ws.ts
@@ -48,5 +48,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["tag"],
+ initialProps: ["id", "tag"],
};
diff --git a/packages/sdk-components-react/src/button.ws.tsx b/packages/sdk-components-react/src/button.ws.tsx
index 8748abb5ec..dbd4c3b9e0 100644
--- a/packages/sdk-components-react/src/button.ws.tsx
+++ b/packages/sdk-components-react/src/button.ws.tsx
@@ -37,5 +37,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["type", "aria-label"],
+ initialProps: ["id", "type", "aria-label"],
};
diff --git a/packages/sdk-components-react/src/checkbox.ws.tsx b/packages/sdk-components-react/src/checkbox.ws.tsx
index 4d106a0c05..c74afba192 100644
--- a/packages/sdk-components-react/src/checkbox.ws.tsx
+++ b/packages/sdk-components-react/src/checkbox.ws.tsx
@@ -57,5 +57,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["name"],
+ initialProps: ["id", "name"],
};
diff --git a/packages/sdk-components-react/src/code-text.ws.tsx b/packages/sdk-components-react/src/code-text.ws.tsx
index 337ee1ad2f..ab36912dfe 100644
--- a/packages/sdk-components-react/src/code-text.ws.tsx
+++ b/packages/sdk-components-react/src/code-text.ws.tsx
@@ -54,5 +54,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["inline", "lang", "meta"],
+ initialProps: ["id", "inline", "lang", "meta"],
};
diff --git a/packages/sdk-components-react/src/form.ws.tsx b/packages/sdk-components-react/src/form.ws.tsx
index a56f45c73c..62160cd7f7 100644
--- a/packages/sdk-components-react/src/form.ws.tsx
+++ b/packages/sdk-components-react/src/form.ws.tsx
@@ -64,5 +64,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: [],
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/heading.ws.tsx b/packages/sdk-components-react/src/heading.ws.tsx
index 2c4b116aa3..614400f60f 100644
--- a/packages/sdk-components-react/src/heading.ws.tsx
+++ b/packages/sdk-components-react/src/heading.ws.tsx
@@ -40,5 +40,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["tag"],
+ initialProps: ["id", "tag"],
};
diff --git a/packages/sdk-components-react/src/html-embed.tsx b/packages/sdk-components-react/src/html-embed.tsx
index 5995344bf7..717bd86235 100644
--- a/packages/sdk-components-react/src/html-embed.tsx
+++ b/packages/sdk-components-react/src/html-embed.tsx
@@ -72,7 +72,7 @@ const Placeholder = (props: ChildProps) => {
const { code, innerRef, ...rest } = props;
return (
<div ref={innerRef} {...rest} style={{ padding: "20px" }}>
- {'Open "Properties" panel to insert HTML code'}
+ {'Open the "Settings" panel to insert HTML code'}
</div>
);
};
diff --git a/packages/sdk-components-react/src/html-embed.ws.ts b/packages/sdk-components-react/src/html-embed.ws.ts
index c5831c39a5..c668f51d7c 100644
--- a/packages/sdk-components-react/src/html-embed.ws.ts
+++ b/packages/sdk-components-react/src/html-embed.ws.ts
@@ -24,4 +24,5 @@ export const propsMeta: WsComponentPropsMeta = {
rows: 10,
},
},
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/image.ws.tsx b/packages/sdk-components-react/src/image.ws.tsx
index 6cb71e3a5a..5e5dc98486 100644
--- a/packages/sdk-components-react/src/image.ws.tsx
+++ b/packages/sdk-components-react/src/image.ws.tsx
@@ -52,5 +52,5 @@ export const propsMeta: WsComponentPropsMeta = {
...props,
...propsOverrides,
},
- initialProps: ["src", "width", "height", "alt", "loading"],
+ initialProps: ["id", "src", "width", "height", "alt", "loading"],
};
diff --git a/packages/sdk-components-react/src/input.ws.tsx b/packages/sdk-components-react/src/input.ws.tsx
index db27981503..fee01f4d17 100644
--- a/packages/sdk-components-react/src/input.ws.tsx
+++ b/packages/sdk-components-react/src/input.ws.tsx
@@ -36,5 +36,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["name", "type", "placeholder", "required", "autoFocus"],
+ initialProps: ["id", "name", "type", "placeholder", "required", "autoFocus"],
};
diff --git a/packages/sdk-components-react/src/italic.ws.tsx b/packages/sdk-components-react/src/italic.ws.tsx
index 23e458dd10..6aa6be9ac3 100644
--- a/packages/sdk-components-react/src/italic.ws.tsx
+++ b/packages/sdk-components-react/src/italic.ws.tsx
@@ -29,4 +29,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/label.ws.tsx b/packages/sdk-components-react/src/label.ws.tsx
index 85704e153f..269f69eb3b 100644
--- a/packages/sdk-components-react/src/label.ws.tsx
+++ b/packages/sdk-components-react/src/label.ws.tsx
@@ -41,5 +41,5 @@ export const propsMeta: WsComponentPropsMeta = {
label: "For",
},
},
- initialProps: ["htmlFor"],
+ initialProps: ["id", "htmlFor"],
};
diff --git a/packages/sdk-components-react/src/link.ws.tsx b/packages/sdk-components-react/src/link.ws.tsx
index 41b58542ef..7f3b5f406f 100644
--- a/packages/sdk-components-react/src/link.ws.tsx
+++ b/packages/sdk-components-react/src/link.ws.tsx
@@ -60,5 +60,5 @@ export const propsMeta: WsComponentPropsMeta = {
required: false,
},
},
- initialProps: ["href", "target"],
+ initialProps: ["id", "href", "target"],
};
diff --git a/packages/sdk-components-react/src/list-item.ws.tsx b/packages/sdk-components-react/src/list-item.ws.tsx
index 844fed6459..4414638105 100644
--- a/packages/sdk-components-react/src/list-item.ws.tsx
+++ b/packages/sdk-components-react/src/list-item.ws.tsx
@@ -33,4 +33,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/list.ws.tsx b/packages/sdk-components-react/src/list.ws.tsx
index b003fe0d3f..8b9a2f609c 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", "start", "reversed"],
+ initialProps: ["id", "ordered", "type", "start", "reversed"],
};
diff --git a/packages/sdk-components-react/src/paragraph.ws.tsx b/packages/sdk-components-react/src/paragraph.ws.tsx
index b4a805bb1b..f8ec96c3a2 100644
--- a/packages/sdk-components-react/src/paragraph.ws.tsx
+++ b/packages/sdk-components-react/src/paragraph.ws.tsx
@@ -32,4 +32,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/radio-button.ws.tsx b/packages/sdk-components-react/src/radio-button.ws.tsx
index 03e992bf42..1465c6e12e 100644
--- a/packages/sdk-components-react/src/radio-button.ws.tsx
+++ b/packages/sdk-components-react/src/radio-button.ws.tsx
@@ -57,5 +57,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["name"],
+ initialProps: ["id", "name"],
};
diff --git a/packages/sdk-components-react/src/separator.ws.tsx b/packages/sdk-components-react/src/separator.ws.tsx
index c64881a704..5ef3b89838 100644
--- a/packages/sdk-components-react/src/separator.ws.tsx
+++ b/packages/sdk-components-react/src/separator.ws.tsx
@@ -52,5 +52,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: [],
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/span.ws.tsx b/packages/sdk-components-react/src/span.ws.tsx
index 4c97ae2237..9eb4aec756 100644
--- a/packages/sdk-components-react/src/span.ws.tsx
+++ b/packages/sdk-components-react/src/span.ws.tsx
@@ -23,4 +23,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/subscript.ws.tsx b/packages/sdk-components-react/src/subscript.ws.tsx
index 1c1f706b39..54473f3f5f 100644
--- a/packages/sdk-components-react/src/subscript.ws.tsx
+++ b/packages/sdk-components-react/src/subscript.ws.tsx
@@ -23,4 +23,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/superscript.ws.tsx b/packages/sdk-components-react/src/superscript.ws.tsx
index 0cdfffa7aa..9414872478 100644
--- a/packages/sdk-components-react/src/superscript.ws.tsx
+++ b/packages/sdk-components-react/src/superscript.ws.tsx
@@ -23,4 +23,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/text.ws.tsx b/packages/sdk-components-react/src/text.ws.tsx
index c969240fa5..58233fe24a 100644
--- a/packages/sdk-components-react/src/text.ws.tsx
+++ b/packages/sdk-components-react/src/text.ws.tsx
@@ -38,5 +38,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["tag"],
+ initialProps: ["id", "tag"],
};
diff --git a/packages/sdk-components-react/src/textarea.ws.tsx b/packages/sdk-components-react/src/textarea.ws.tsx
index 559cc650f6..cd340a3a3d 100644
--- a/packages/sdk-components-react/src/textarea.ws.tsx
+++ b/packages/sdk-components-react/src/textarea.ws.tsx
@@ -40,5 +40,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
- initialProps: ["name", "placeholder", "required", "autoFocus"],
+ initialProps: ["id", "name", "placeholder", "required", "autoFocus"],
};
diff --git a/packages/sdk-components-react/src/vimeo-play-button.ws.ts b/packages/sdk-components-react/src/vimeo-play-button.ws.ts
index ce4b4937a3..87d436b8c6 100644
--- a/packages/sdk-components-react/src/vimeo-play-button.ws.ts
+++ b/packages/sdk-components-react/src/vimeo-play-button.ws.ts
@@ -26,4 +26,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/vimeo-spinner.ws.ts b/packages/sdk-components-react/src/vimeo-spinner.ws.ts
index 40764f96a3..cd64a0b890 100644
--- a/packages/sdk-components-react/src/vimeo-spinner.ws.ts
+++ b/packages/sdk-components-react/src/vimeo-spinner.ws.ts
@@ -24,4 +24,5 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props,
+ initialProps: ["id"],
};
diff --git a/packages/sdk-components-react/src/vimeo.tsx b/packages/sdk-components-react/src/vimeo.tsx
index ff56b1f236..38437c275b 100644
--- a/packages/sdk-components-react/src/vimeo.tsx
+++ b/packages/sdk-components-react/src/vimeo.tsx
@@ -413,8 +413,9 @@ const EmptyState = () => {
fontSize: "1.2em",
}}
>
- Open the Properties panel and paste a video URL, e.g.
- https://vimeo.com/831343124.
+ {
+ 'Open the "Settings" panel and paste a video URL, e.g. https://vimeo.com/831343124.'
+ }
</div>
);
};
diff --git a/packages/sdk-components-react/src/vimeo.ws.ts b/packages/sdk-components-react/src/vimeo.ws.ts
index 24d8da7f9d..ce16dc713e 100644
--- a/packages/sdk-components-react/src/vimeo.ws.ts
+++ b/packages/sdk-components-react/src/vimeo.ws.ts
@@ -7,7 +7,8 @@ import {
} from "@webstudio-is/react-sdk";
import { div } from "@webstudio-is/react-sdk/css-normalize";
import { props } from "./__generated__/vimeo.props";
-import { type VimeoOptions } from "./vimeo";
+import { Vimeo } from "./vimeo";
+import type { ComponentProps } from "react";
const presetStyle = {
div,
@@ -309,7 +310,8 @@ export const meta: WsComponentMeta = {
],
};
-const initialProps: Array<keyof VimeoOptions> = [
+const initialProps: Array<keyof ComponentProps<typeof Vimeo>> = [
+ "id",
"url",
"quality",
"showPreview",
diff --git a/packages/sdk-size-test/package.json b/packages/sdk-size-test/package.json
index aad36c71ae..2b4ef658e4 100644
--- a/packages/sdk-size-test/package.json
+++ b/packages/sdk-size-test/package.json
@@ -15,7 +15,7 @@
},
{
"path": "functions/*.js",
- "limit": "237 kB",
+ "limit": "238 kB",
"gzip": false
}
],