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 hidden elements not selected sometimes (#2109)

Ivan Starkovff8682d1d1ad
diff --git a/apps/builder/app/canvas/instance-selected-react.ts b/apps/builder/app/canvas/instance-selected-react.ts
index 1b0b2769ad..0cf51bf88f 100644
--- a/apps/builder/app/canvas/instance-selected-react.ts
+++ b/apps/builder/app/canvas/instance-selected-react.ts
@@ -1,7 +1,5 @@
import { useCallback, useEffect, useState } from "react";
-import { useStore } from "@nanostores/react";
-import { selectedInstanceSelectorStore } from "~/shared/nano-states";
-import { subscribeSelectedInstance } from "./instance-selected";
+import { subscribeSelected } from "./instance-selected";
/**
* Debounce task execution until useEffect
@@ -23,16 +21,9 @@ const useDebounceEffect = () => {
};
export const useSelectedInstance = () => {
- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);
const execTaskInEffect = useDebounceEffect();
useEffect(() => {
- if (selectedInstanceSelector === undefined) {
- return;
- }
- return subscribeSelectedInstance(
- selectedInstanceSelector,
- execTaskInEffect
- );
- }, [selectedInstanceSelector, execTaskInEffect]);
+ return subscribeSelected(execTaskInEffect);
+ }, [execTaskInEffect]);
};
diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.ts
index 061dedbd4f..3cd7cc24e6 100644
--- a/apps/builder/app/canvas/instance-selected.ts
+++ b/apps/builder/app/canvas/instance-selected.ts
@@ -11,6 +11,8 @@ import {
instancesStore,
propsStore,
dataSourceValuesStore,
+ selectedInstanceSelectorStore,
+ dataSourceVariablesStore,
} from "~/shared/nano-states";
import htmlTags, { type htmlTags as HtmlTags } from "html-tags";
import {
@@ -72,8 +74,8 @@ const calculateUnitSizes = (element: HTMLElement): UnitSizes => {
};
};
-export const subscribeSelectedInstance = (
- selectedInstanceSelector: InstanceSelector,
+const subscribeSelectedInstance = (
+ selectedInstanceSelector: Readonly<InstanceSelector>,
queueTask: (task: () => void) => void
) => {
if (selectedInstanceSelector.length === 0) {
@@ -85,11 +87,7 @@ export const subscribeSelectedInstance = (
let elements = getElementsByInstanceSelector(selectedInstanceSelector);
- if (elements.length === 0) {
- return;
- }
-
- elements[0].scrollIntoView({
+ elements[0]?.scrollIntoView({
behavior: "smooth",
block: "nearest",
});
@@ -192,9 +190,7 @@ export const subscribeSelectedInstance = (
// Lightweight update
const updateOutline = () => {
- queueTask(() => {
- showOutline();
- });
+ showOutline();
};
const resizeObserver = new ResizeObserver(update);
@@ -235,6 +231,9 @@ export const subscribeSelectedInstance = (
const unsubscribeDataSourceValuesStore =
dataSourceValuesStore.subscribe(update);
+ const unsubscribeDataSourceVariablesStore =
+ dataSourceVariablesStore.subscribe(update);
+
const unsubscribeIsResizingCanvas = isResizingCanvasStore.subscribe(
(isResizing) => {
if (isResizing && selectedInstanceOutlineStore.get()) {
@@ -278,5 +277,28 @@ export const subscribeSelectedInstance = (
unsubscribeInstancesStore();
unsubscribePropsStore();
unsubscribeDataSourceValuesStore();
+ unsubscribeDataSourceVariablesStore();
+ };
+};
+
+export const subscribeSelected = (queueTask: (task: () => void) => void) => {
+ let previousSelectedInstance: readonly string[] | undefined = undefined;
+ let unsubscribeSelectedInstance = () => {};
+
+ const unsubscribe = selectedInstanceSelectorStore.subscribe(
+ (instanceSelector) => {
+ if (instanceSelector !== previousSelectedInstance) {
+ unsubscribeSelectedInstance();
+ unsubscribeSelectedInstance =
+ subscribeSelectedInstance(instanceSelector ?? [], queueTask) ??
+ (() => {});
+ previousSelectedInstance = instanceSelector;
+ }
+ }
+ );
+
+ return () => {
+ unsubscribe();
+ unsubscribeSelectedInstance();
};
};