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 infinite dependencies loop (#1166)

Oleg Isonena273c7a8ffd3
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsx
index 2e1927b7c3..6f4d33a39f 100644
--- a/apps/builder/app/builder/features/inspector/inspector.tsx
+++ b/apps/builder/app/builder/features/inspector/inspector.tsx
@@ -80,7 +80,7 @@ export const Inspector = ({ publish }: InspectorProps) => {
/>
</TabsContent>
<TabsContent value="settings" css={contentStyle}>
- <SettingsPanel selectedInstance={selectedInstance} />
+ <SettingsPanel />
</TabsContent>
</Flex>
</FloatingPanelProvider>
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 ac2fa0c35a..c48ddbbb54 100644
--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx
@@ -1,16 +1,15 @@
+import { useStore } from "@nanostores/react";
import { Flex, Label, TextField, theme } from "@webstudio-is/design-system";
-import type { Instance } from "@webstudio-is/project-build";
import { getComponentMeta } from "@webstudio-is/react-sdk";
+import { selectedInstanceStore } from "~/shared/nano-states";
import { useSettingsLogic } from "./use-settings-logic";
-type SettingsPanelProps = {
- selectedInstance: Instance;
-};
-
-export const SettingsPanel = ({ selectedInstance }: SettingsPanelProps) => {
- const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic({
- selectedInstance,
- });
+export const SettingsPanel = () => {
+ const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic();
+ const selectedInstance = useStore(selectedInstanceStore);
+ if (selectedInstance === undefined) {
+ return null;
+ }
const label = getComponentMeta(selectedInstance.component)?.label;
return (
<Flex css={{ px: theme.spacing[9] }}>
diff --git a/apps/builder/app/builder/features/settings-panel/use-settings-logic.ts b/apps/builder/app/builder/features/settings-panel/use-settings-logic.ts
index c4e4240c1a..64aa11d898 100644
--- a/apps/builder/app/builder/features/settings-panel/use-settings-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/use-settings-logic.ts
@@ -1,4 +1,3 @@
-import type { Instance } from "@webstudio-is/project-build";
import store from "immerhin";
import {
type KeyboardEventHandler,
@@ -6,15 +5,11 @@ import {
useEffect,
useCallback,
} from "react";
-import { instancesStore } from "~/shared/nano-states";
+import { instancesStore, selectedInstanceStore } from "~/shared/nano-states";
type SettingUpdate = { label?: string };
-export const useSettingsLogic = ({
- selectedInstance,
-}: {
- selectedInstance: Instance;
-}) => {
+export const useSettingsLogic = () => {
const changes = useRef<SettingUpdate>({});
const setLabel = (value: SettingUpdate[keyof SettingUpdate]) => {
@@ -23,13 +18,17 @@ export const useSettingsLogic = ({
};
const updateLabel = useCallback(() => {
+ const selectedInstance = selectedInstanceStore.get();
+ if (selectedInstance === undefined) {
+ return;
+ }
store.createTransaction([instancesStore], (instances) => {
const instance = instances.get(selectedInstance.id);
if (instance !== undefined) {
instance.label = changes.current.label;
}
});
- }, [selectedInstance]);
+ }, []);
const handleKeyDown: KeyboardEventHandler = (event) => {
if (event.key === "Enter") {