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.

refactor: Stop humanizing properties and attributes in autocomplete (#3122)

Oleg Isonen50b890b47719
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 e351c6bea5..b706b14eda 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/boolean.tsx
@@ -6,13 +6,13 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
Label,
RemovePropButton,
$selectedInstanceScope,
updateExpressionValue,
useBindingState,
} from "../shared";
+import { humanizeString } from "~/shared/string-utils";
export const BooleanControl = ({
meta,
@@ -24,7 +24,7 @@ export const BooleanControl = ({
onDelete,
}: ControlProps<"boolean">) => {
const id = useId();
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/check.tsx b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
index d6fc5573af..133ee81b18 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/check.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/check.tsx
@@ -7,7 +7,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
VerticalLayout,
Label,
$selectedInstanceScope,
@@ -46,7 +45,7 @@ export const CheckControl = ({
const options = Array.from(new Set([...meta.options, ...value]));
const id = useId();
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
index 568f11faa3..06744ddb1e 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx
@@ -7,7 +7,6 @@ import {
import {
useLocalValue,
type ControlProps,
- getLabel,
VerticalLayout,
Label,
updateExpressionValue,
@@ -25,6 +24,7 @@ import {
theme,
} from "@webstudio-is/design-system";
import { InfoCircleIcon } from "@webstudio-is/icons";
+import { humanizeString } from "~/shared/string-utils";
const ErrorInfo = ({
error,
@@ -104,7 +104,7 @@ export const CodeControl = ({
onChange({ type: "string", value });
}
});
- const label = getLabel(metaOverride, propName);
+ const label = humanizeString(metaOverride.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
diff --git a/apps/builder/app/builder/features/settings-panel/controls/file.tsx b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
index 8454b05304..2c2acf5843 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/file.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/file.tsx
@@ -7,7 +7,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
VerticalLayout,
useLocalValue,
Label,
@@ -16,6 +15,7 @@ import {
useBindingState,
} from "../shared";
import { SelectAsset } from "./select-asset";
+import { humanizeString } from "~/shared/string-utils";
const UrlInput = ({
id,
@@ -72,7 +72,7 @@ export const FileControl = ({
}
);
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/json.tsx b/apps/builder/app/builder/features/settings-panel/controls/json.tsx
index ed60e8b804..b79a32f6ce 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/json.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/json.tsx
@@ -3,7 +3,6 @@ import { useStore } from "@nanostores/react";
import { isLiteralExpression } from "@webstudio-is/sdk";
import {
type ControlProps,
- getLabel,
useLocalValue,
VerticalLayout,
Label,
@@ -19,6 +18,7 @@ import {
BindingControl,
BindingPopover,
} from "~/builder/shared/binding-popover";
+import { humanizeString } from "~/shared/string-utils";
export const JsonControl = ({
meta,
@@ -50,7 +50,7 @@ export const JsonControl = ({
// empty block
}
});
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression = prop?.type === "expression" ? prop.value : valueString;
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 38076d8233..e161b58437 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/number.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/number.tsx
@@ -7,7 +7,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
useLocalValue,
ResponsiveLayout,
Label,
@@ -15,6 +14,7 @@ import {
$selectedInstanceScope,
useBindingState,
} from "../shared";
+import { humanizeString } from "~/shared/string-utils";
export const NumberControl = ({
meta,
@@ -45,7 +45,7 @@ export const NumberControl = ({
}
);
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
index 6de785359a..3e10bd81a2 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/radio.tsx
@@ -8,7 +8,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
VerticalLayout,
Label,
$selectedInstanceScope,
@@ -33,7 +32,7 @@ export const RadioControl = ({
: [value, ...meta.options];
const id = useId();
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/select.tsx b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
index 7819588ecc..d9d5bdf11b 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/select.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/select.tsx
@@ -8,7 +8,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
VerticalLayout,
Label,
$selectedInstanceScope,
@@ -34,7 +33,7 @@ export const SelectControl = ({
? meta.options
: [value, ...meta.options];
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
@@ -63,7 +62,6 @@ export const SelectControl = ({
disabled={overwritable === false}
value={value}
options={options}
- getLabel={humanizeString}
onChange={(value) => {
if (prop?.type === "expression") {
updateExpressionValue(prop.value, value);
diff --git a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
index ba16b134a2..5f50962313 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text-content.tsx
@@ -11,7 +11,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
useLocalValue,
VerticalLayout,
$selectedInstanceScope,
@@ -19,6 +18,7 @@ import {
updateExpressionValue,
useBindingState,
} from "../shared";
+import { humanizeString } from "~/shared/string-utils";
const useInstance = (instanceId: Instance["id"]) => {
const $store = useMemo(() => {
@@ -58,7 +58,7 @@ export const TextContent = ({
}
});
const id = useId();
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
let expression: undefined | string;
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 94a17eafee..fd7ee60676 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx
@@ -6,7 +6,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
useLocalValue,
VerticalLayout,
ResponsiveLayout,
@@ -16,6 +15,7 @@ import {
useBindingState,
} from "../shared";
import { useEffect, useRef } from "react";
+import { humanizeString } from "~/shared/string-utils";
export const TextControl = ({
meta,
@@ -35,7 +35,7 @@ export const TextControl = ({
}
});
const id = useId();
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const textAreaRef = useRef<HTMLTextAreaElement>(null);
const rows = meta.rows ?? 1;
const isTwoColumnLayout = rows < 2;
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
index 59e87b21bf..b92753a038 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -33,7 +33,6 @@ import {
} from "~/builder/shared/binding-popover";
import {
type ControlProps,
- getLabel,
useLocalValue,
VerticalLayout,
Label,
@@ -43,6 +42,7 @@ import {
} from "../shared";
import { SelectAsset } from "./select-asset";
import { createRootFolder } from "@webstudio-is/project-build";
+import { humanizeString } from "~/shared/string-utils";
type UrlControlProps = ControlProps<"url">;
@@ -476,7 +476,7 @@ export const UrlControl = ({
const BaseControl = modes[mode].control;
- const label = getLabel(meta, propName);
+ const label = humanizeString(meta.label || propName);
const { scope, aliases } = useStore($selectedInstanceScope);
const expression =
prop?.type === "expression" ? prop.value : JSON.stringify(computedValue);
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 9ebf082a00..a7dd8bcde7 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
@@ -27,12 +27,12 @@ import {
type NameAndLabel,
type PropAndMeta,
} from "./use-props-logic";
-import { Row, getLabel } from "../shared";
+import { Row } from "../shared";
import { serverSyncStore } from "~/shared/sync";
import { matchSorter } from "match-sorter";
const itemToString = (item: NameAndLabel | null) =>
- item ? getLabel(item, item.name) : "";
+ item?.label || item?.name || "";
const matchOrSuggestToCreate = (
search: string,
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index 8ac0cd2e8b..17b4185c43 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -30,7 +30,6 @@ import {
theme,
rawTheme,
} from "@webstudio-is/design-system";
-import { humanizeString } from "~/shared/string-utils";
import {
$dataSourceVariables,
$dataSources,
@@ -70,9 +69,6 @@ export type ControlProps<Control> = {
autoFocus?: boolean;
};
-export const getLabel = (meta: { label?: string }, fallback: string) =>
- meta.label || humanizeString(fallback);
-
export const RemovePropButton = (props: { onClick: () => void }) => (
<SmallIconButton icon={<SubtractIcon />} variant="destructive" {...props} />
);