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
feat: Autosave settings (#2897)
Oleg Isonen66f36a0e8383
diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsxindex 74cfcbbf42..64cb344776 100644--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx@@ -1,5 +1,5 @@import type { Instance } from "@webstudio-is/sdk";-import { SettingsSection } from "./settings-section/settings-section";+import { SettingsSection } from "./settings-section";import { PropsSectionContainer } from "./props-section/props-section";import { VariablesSection } from "./variables-section";import { isFeatureEnabled } from "@webstudio-is/feature-flags";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.tsxsimilarity index 58%rename from apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsxrename to apps/builder/app/builder/features/settings-panel/settings-section.tsxindex 9770cb464d..d4728d28db 100644--- a/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/settings-section.tsx@@ -1,18 +1,33 @@import { useStore } from "@nanostores/react";import { InputField, useId } from "@webstudio-is/design-system";import {+ $instances,$registeredComponentMetas,$selectedInstance,} from "~/shared/nano-states";-import { useSettingsLogic } from "./use-settings-logic";-import { HorizontalLayout, Label, Row } from "../shared";+import { HorizontalLayout, Label, Row, useLocalValue } from "./shared";import { getInstanceLabel } from "~/shared/instance-utils";+import { serverSyncStore } from "~/shared/sync";+import type { Instance } from "@webstudio-is/sdk";++const saveLabel = (label: string, selectedInstance: Instance) => {+ serverSyncStore.createTransaction([$instances], (instances) => {+ const instance = instances.get(selectedInstance.id);+ if (instance !== undefined) {+ instance.label = label;+ }+ });+};export const SettingsSection = () => {- const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic();const selectedInstance = useStore($selectedInstance);const metas = useStore($registeredComponentMetas);const id = useId();+ const localValue = useLocalValue(selectedInstance?.label ?? "", (value) => {+ if (selectedInstance) {+ saveLabel(value, selectedInstance);+ }+ });if (selectedInstance === undefined) {return null;@@ -35,13 +50,10 @@ export const SettingsSection = () => {id={id}/* Key is required, otherwise when label is undefined, previous value stayed */key={selectedInstance.id}- onBlur={handleBlur}- onKeyDown={handleKeyDown}placeholder={placeholder}- defaultValue={selectedInstance.label}- onChange={(event) => {- setLabel(event.target.value.trim());- }}+ value={localValue.value}+ onChange={(event) => localValue.set(event.target.value.trim())}+ onBlur={localValue.save}/></HorizontalLayout></Row>diff --git a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.tsdeleted file mode 100644index c9dce972a6..0000000000--- a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts+++ /dev/null@@ -1,83 +0,0 @@-import {- type KeyboardEventHandler,- useRef,- useEffect,- useCallback,-} from "react";-import { $instances, $selectedInstance } from "~/shared/nano-states";-import { serverSyncStore } from "~/shared/sync";--type Setting = "label";-type Value = string;--type Operation =- | {- operation: "delete";- property: Setting;- }- | {- operation: "set";- property: Setting;- value: Value;- };--export const useSettingsLogic = () => {- const updates = useRef<Array<Operation>>([]);-- const setLabel = (value?: Value) => {- if (value === undefined) {- updates.current.push({ operation: "delete", property: "label" });- return;- }- updates.current.push({ operation: "set", property: "label", value });- };-- // Gets updates by property and removes them from the list- const popUpdates = (property: Setting) => {- const remainingUpdates: Array<Operation> = [];- const searchedUpdates: Array<Operation> = [];- for (const update of updates.current) {- const array =- update.property === property ? searchedUpdates : remainingUpdates;- array.push(update);- }- updates.current = remainingUpdates;- return searchedUpdates;- };-- const updateLabel = useCallback(() => {- const selectedInstance = $selectedInstance.get();- if (selectedInstance === undefined) {- return;- }- serverSyncStore.createTransaction([$instances], (instances) => {- const instance = instances.get(selectedInstance.id);- if (instance === undefined) {- return;- }- const labelUpdates = popUpdates("label");- for (const update of labelUpdates) {- if (update.operation === "delete") {- delete instance.label;- continue;- }- instance.label = update.value;- }- });- }, []);-- const handleKeyDown: KeyboardEventHandler = (event) => {- if (event.key === "Enter") {- updateLabel();- }- };-- // Save changes when unmounting, e.g. when switiching to another tab- useEffect(() => updateLabel, [updateLabel]);-- return {- setLabel,- handleBlur: updateLabel,- handleKeyDown,- };-};diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsxindex 7d43a4c807..62825ba810 100644--- a/apps/builder/app/builder/features/settings-panel/shared.tsx+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx@@ -37,6 +37,7 @@ import {$variableValuesByInstanceSelector,} from "~/shared/nano-states";import type { BindingVariant } from "~/builder/shared/binding-popover";+import { useDebouncedCallback } from "use-debounce";export type PropValue =| { type: "number"; value: number }@@ -155,7 +156,8 @@ export const Label = ({export const useLocalValue = <Type,>(savedValue: Type,- onSave: (value: Type) => void+ onSave: (value: Type) => void,+ { autoSave = true } = {}) => {const isEditingRef = useRef(false);const localValueRef = useRef(savedValue);@@ -173,10 +175,15 @@ export const useLocalValue = <Type,>(}};+ const saveDebounced = useDebouncedCallback(save, 500);+const setLocalValue = (value: Type) => {isEditingRef.current = true;localValueRef.current = value;setRefresh((refresh) => refresh + 1);+ if (autoSave) {+ saveDebounced();+ }};// onBlur will not trigger if control is unmounted when props panel is closed or similar.