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.

Fix prop labels (#2144)

Bogdan Chadkin036b156c6b1f
diff --git a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
index e79445bca0..882e14e927 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
@@ -1,5 +1,10 @@
-import { Switch, useId } from "@webstudio-is/design-system";
-import { type ControlProps, getLabel, HorizontalLayout } from "../shared";
+import { Grid, Switch, theme, useId } from "@webstudio-is/design-system";
+import {
+ type ControlProps,
+ getLabel,
+ Label,
+ RemovePropButton,
+} from "../shared";
export const BooleanControl = ({
meta,
@@ -11,18 +16,23 @@ export const BooleanControl = ({
const id = useId();
return (
- <HorizontalLayout
- id={id}
- label={getLabel(meta, propName)}
- onDelete={onDelete}
- labelSize="large"
+ <Grid
+ css={{
+ gridTemplateColumns: onDelete
+ ? `1fr max-content max-content`
+ : `1fr max-content`,
+ minHeight: theme.spacing[13],
+ }}
+ align="center"
+ gap="2"
>
+ <Label htmlFor={id}>{getLabel(meta, propName)}</Label>
<Switch
id={id}
checked={prop?.value ?? false}
onCheckedChange={(value) => onChange({ type: "boolean", value })}
- css={{ justifySelf: "end" }}
/>
- </HorizontalLayout>
+ {onDelete && <RemovePropButton onClick={onDelete} />}
+ </Grid>
);
};
diff --git a/apps/builder/app/builder/features/settings-panel/controls/color.tsx b/apps/builder/app/builder/features/settings-panel/controls/color.tsx
index ed8857d235..698f38d3d5 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/color.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/color.tsx
@@ -3,7 +3,7 @@ import {
type ControlProps,
getLabel,
useLocalValue,
- HorizontalLayout,
+ ResponsiveLayout,
} from "../shared";
// @todo:
@@ -24,7 +24,7 @@ export const ColorControl = ({
);
return (
- <HorizontalLayout
+ <ResponsiveLayout
label={getLabel(meta, propName)}
id={id}
onDelete={onDelete}
@@ -40,6 +40,6 @@ export const ColorControl = ({
}
}}
/>
- </HorizontalLayout>
+ </ResponsiveLayout>
);
};
diff --git a/apps/builder/app/builder/features/settings-panel/controls/number.tsx b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
index 108ed980f0..e06fb81fae 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
@@ -3,7 +3,7 @@ import {
type ControlProps,
getLabel,
useLocalValue,
- HorizontalLayout,
+ ResponsiveLayout,
} from "../shared";
export const NumberControl = ({
@@ -26,9 +26,9 @@ export const NumberControl = ({
});
return (
- <HorizontalLayout
- id={id}
+ <ResponsiveLayout
label={getLabel(meta, propName)}
+ id={id}
onDelete={onDelete}
>
<InputField
@@ -45,6 +45,6 @@ export const NumberControl = ({
}
}}
/>
- </HorizontalLayout>
+ </ResponsiveLayout>
);
};
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
index 7587df0b7d..25175c2126 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -4,7 +4,7 @@ import {
getLabel,
useLocalValue,
VerticalLayout,
- HorizontalLayout,
+ ResponsiveLayout,
} from "../shared";
import { useState, type ComponentProps } from "react";
@@ -63,7 +63,7 @@ const UniversalInput = ({
const { value } = event.target;
handleChange(value);
}}
- onBlur={(event) => {
+ onBlur={(_event) => {
handleChange(value);
onSubmit();
}}
@@ -108,7 +108,8 @@ export const TextControl = ({
});
const id = useId();
const label = getLabel(meta, propName);
- const isTwoColumnLayout = meta.rows && meta.rows < 2 ? true : false;
+ const rows = meta.rows ?? 1;
+ const isTwoColumnLayout = rows < 2;
const input = (
<UniversalInput
@@ -122,9 +123,9 @@ export const TextControl = ({
if (isTwoColumnLayout) {
return (
- <HorizontalLayout label={label} id={id} onDelete={onDelete}>
+ <ResponsiveLayout label={label} id={id} onDelete={onDelete}>
<Flex>{input}</Flex>
- </HorizontalLayout>
+ </ResponsiveLayout>
);
}
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
index 7757e7aaef..c5589102b5 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx
@@ -391,6 +391,7 @@ export const Story = () => {
const logic = usePropsLogic({
instance,
+ props,
updateProp: handleUpdate,
deleteProp: handleDelete,
});
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.tsx
index 17943ecfba..904d7ac59d 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
@@ -1,3 +1,5 @@
+import { useState } from "react";
+import { useStore } from "@nanostores/react";
import store from "immerhin";
import type { Instance } from "@webstudio-is/project-build";
import {
@@ -14,7 +16,11 @@ import {
NestedInputButton,
} from "@webstudio-is/design-system";
import type { Publish } from "~/shared/pubsub";
-import { dataSourceVariablesStore, propsStore } from "~/shared/nano-states";
+import {
+ dataSourceVariablesStore,
+ propsIndexStore,
+ propsStore,
+} from "~/shared/nano-states";
import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";
import {
useStyleData,
@@ -27,7 +33,6 @@ import {
type PropAndMeta,
} from "./use-props-logic";
import { Row, getLabel } from "../shared";
-import { useState } from "react";
const itemToString = (item: NameAndLabel | null) =>
item ? getLabel(item, item.name) : "";
@@ -196,9 +201,11 @@ export const PropsSectionContainer = ({
selectedInstance: instance,
publish,
});
+ const { propsByInstanceId } = useStore(propsIndexStore);
const logic = usePropsLogic({
instance,
+ props: propsByInstanceId.get(instance.id) ?? [],
updateProp: (update) => {
const props = propsStore.get();
const prop = props.get(update.id);
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
index 7fe02ce76f..4ecd6f8c92 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
@@ -10,7 +10,6 @@ import { useStore } from "@nanostores/react";
import {
dataSourceValuesStore,
dataSourcesStore,
- propsIndexStore,
registeredComponentPropsMetasStore,
} from "~/shared/nano-states";
@@ -104,6 +103,7 @@ const getDefaultMetaForType = (type: Prop["type"]): PropMeta => {
type UsePropsLogicInput = {
instance: Instance;
+ props: Prop[];
updateProp: (update: Prop) => void;
deleteProp: (id: Prop["id"]) => void;
};
@@ -164,6 +164,7 @@ const getPropTypeAndValue = (value: unknown) => {
/** usePropsLogic expects that key={instanceId} is used on the ancestor component */
export const usePropsLogic = ({
instance,
+ props,
updateProp,
deleteProp,
}: UsePropsLogicInput): UsePropsLogicOutput => {
@@ -172,35 +173,33 @@ export const usePropsLogic = ({
);
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,
- ];
- }) ?? [];
+ const savedProps = props.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]));
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index e7bbcdeb94..f98f48721b 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -126,7 +126,6 @@ export const useLocalValue = <Type,>(
type LayoutProps = {
label: string;
id?: string;
- labelSize?: "default" | "large";
onDelete?: () => void;
children: ReactNode;
};
@@ -149,36 +148,47 @@ export const VerticalLayout = ({
export const HorizontalLayout = ({
label,
id,
- labelSize = "default",
onDelete,
children,
}: LayoutProps) => (
<Grid
css={{
- gridTemplateColumns: `${
- labelSize === "default" ? theme.spacing[19] : theme.spacing[24]
- } 1fr`,
+ gridTemplateColumns: onDelete
+ ? `${theme.spacing[19]} 1fr max-content`
+ : `${theme.spacing[19]} 1fr`,
minHeight: theme.spacing[13],
}}
align="center"
gap="2"
>
<Label htmlFor={id}>{label}</Label>
- <Grid
- css={{
- gridTemplateColumns: `1fr`,
- gridAutoFlow: "column",
- gridAutoColumns: "auto",
- }}
- align="center"
- gap="2"
- >
- {children}
- {onDelete && <RemovePropButton onClick={onDelete} />}
- </Grid>
+ {children}
+ {onDelete && <RemovePropButton onClick={onDelete} />}
</Grid>
);
+export const ResponsiveLayout = ({
+ label,
+ id,
+ onDelete,
+ children,
+}: LayoutProps) => {
+ // more than 9 characters in label trigger ellipsis
+ // might not cover all cases though
+ if (label.length <= 8) {
+ return (
+ <HorizontalLayout label={label} id={id} onDelete={onDelete}>
+ {children}
+ </HorizontalLayout>
+ );
+ }
+ return (
+ <VerticalLayout label={label} id={id} onDelete={onDelete}>
+ {children}
+ </VerticalLayout>
+ );
+};
+
export const Row = ({ children, css }: { children: ReactNode; css?: CSS }) => (
<Flex css={{ px: theme.spacing[9], ...css }} gap="2" direction="column">
{children}