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.

Replace findInstanceById with instances index (#983)

Bogdan Chadkin541f801218d6
diff --git a/apps/designer/app/canvas/shared/use-drag-drop.ts b/apps/designer/app/canvas/shared/use-drag-drop.ts
index 3cb48a89e2..912a1ccdde 100644
--- a/apps/designer/app/canvas/shared/use-drag-drop.ts
+++ b/apps/designer/app/canvas/shared/use-drag-drop.ts
@@ -1,4 +1,5 @@
import { useLayoutEffect, useRef } from "react";
+import { useStore } from "@nanostores/react";
import { utils } from "@webstudio-is/project";
import {
type DropTarget,
@@ -14,16 +15,16 @@ import {
} from "@webstudio-is/project-build";
import { getComponentMeta } from "@webstudio-is/react-sdk";
import {
+ instancesIndexStore,
useRootInstance,
useTextEditingInstanceId,
} from "~/shared/nano-states";
+import { publish, useSubscribe } from "~/shared/pubsub";
+import { insertInstance, reparentInstance } from "~/shared/instance-utils";
import {
- findInstanceByElement,
getInstanceElementById,
getInstanceIdFromElement,
} from "~/shared/dom-utils";
-import { publish, useSubscribe } from "~/shared/pubsub";
-import { insertInstance, reparentInstance } from "~/shared/instance-utils";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -63,6 +64,7 @@ const initialState: {
export const useDragAndDrop = () => {
const [rootInstance] = useRootInstance();
+ const { instancesById } = useStore(instancesIndexStore);
const [textEditingInstanceId] = useTextEditingInstanceId();
const state = useRef({ ...initialState });
@@ -82,9 +84,9 @@ export const useDragAndDrop = () => {
const dropHandlers = useDrop<Instance>({
elementToData(element) {
+ const instanceId = getInstanceIdFromElement(element);
const instance =
- rootInstance !== undefined &&
- findInstanceByElement(rootInstance, element);
+ instanceId === undefined ? undefined : instancesById.get(instanceId);
return instance || false;
},
@@ -164,7 +166,9 @@ export const useDragAndDrop = () => {
return false;
}
- const instance = findInstanceByElement(rootInstance, element);
+ const instanceId = getInstanceIdFromElement(element);
+ const instance =
+ instanceId === undefined ? undefined : instancesById.get(instanceId);
if (instance === undefined) {
return false;
diff --git a/apps/designer/app/designer/features/style-panel/shared/property-name.tsx b/apps/designer/app/designer/features/style-panel/shared/property-name.tsx
index adc6d6ed19..12de843e18 100644
--- a/apps/designer/app/designer/features/style-panel/shared/property-name.tsx
+++ b/apps/designer/app/designer/features/style-panel/shared/property-name.tsx
@@ -1,4 +1,5 @@
import { useState } from "react";
+import { useStore } from "@nanostores/react";
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import type { StyleProperty } from "@webstudio-is/css-data";
import { toValue } from "@webstudio-is/css-engine";
@@ -17,8 +18,7 @@ import {
Separator,
} from "@webstudio-is/design-system";
import { UndoIcon } from "@webstudio-is/icons";
-import { utils } from "@webstudio-is/project";
-import { useBreakpoints, useRootInstance } from "~/shared/nano-states";
+import { instancesIndexStore, useBreakpoints } from "~/shared/nano-states";
import { type StyleInfo, type StyleSource, getStyleSource } from "./style-info";
const PropertyPopoverContent = ({
@@ -33,7 +33,7 @@ const PropertyPopoverContent = ({
onReset: () => void;
}) => {
const [breakpoints] = useBreakpoints();
- const [rootInstance] = useRootInstance();
+ const { instancesById } = useStore(instancesIndexStore);
if (styleSource === "local") {
return (
@@ -66,10 +66,7 @@ const PropertyPopoverContent = ({
if (styleValueInfo?.inherited) {
const { value, instanceId } = styleValueInfo.inherited;
- const instance =
- rootInstance === undefined
- ? undefined
- : utils.tree.findInstanceById(rootInstance, instanceId);
+ const instance = instancesById.get(instanceId);
return (
<DeprecatedText2 key={property} color="hint">
Resetting will change {property} to inherited {toValue(value)}{" "}
@@ -108,10 +105,7 @@ const PropertyPopoverContent = ({
if (styleValueInfo?.inherited) {
const { instanceId } = styleValueInfo.inherited;
- const instance =
- rootInstance === undefined
- ? undefined
- : utils.tree.findInstanceById(rootInstance, instanceId);
+ const instance = instancesById.get(instanceId);
return (
<DeprecatedText2 key={property} color="hint">
{property} value is inherited from {instance?.component}
diff --git a/apps/designer/app/designer/features/tree-preview/tree-preview.tsx b/apps/designer/app/designer/features/tree-preview/tree-preview.tsx
index db6b9e29db..38f6a7d91c 100644
--- a/apps/designer/app/designer/features/tree-preview/tree-preview.tsx
+++ b/apps/designer/app/designer/features/tree-preview/tree-preview.tsx
@@ -1,9 +1,14 @@
import produce from "immer";
import { useMemo } from "react";
+import { useStore } from "@nanostores/react";
import type { Instance } from "@webstudio-is/project-build";
import { theme, Flex } from "@webstudio-is/design-system";
import { utils } from "@webstudio-is/project";
-import { useRootInstance, useDragAndDropState } from "~/shared/nano-states";
+import {
+ useRootInstance,
+ useDragAndDropState,
+ instancesIndexStore,
+} from "~/shared/nano-states";
import { InstanceTreeNode } from "~/designer/shared/tree";
import {
createInstancesIndex,
@@ -13,6 +18,7 @@ import {
export const TreePrevew = () => {
const [rootInstance] = useRootInstance();
+ const { instancesById } = useStore(instancesIndexStore);
const [dragAndDropState] = useDragAndDropState();
const dragItemInstance = dragAndDropState.dragItem;
@@ -29,9 +35,7 @@ export const TreePrevew = () => {
return null;
}
- const isNew =
- utils.tree.findInstanceById(rootInstance, dragItemInstance.id) ===
- undefined;
+ const isNew = instancesById.get(dragItemInstance.id) === undefined;
const instance: Instance = produce<Instance>((draft) => {
const instancesIndex = createInstancesIndex(draft);
@@ -65,6 +69,7 @@ export const TreePrevew = () => {
};
}, [
rootInstance,
+ instancesById,
dragItemInstance,
dropTargetInstanceId,
dropTargetPosition,
diff --git a/apps/designer/app/designer/shared/tree/index.tsx b/apps/designer/app/designer/shared/tree/index.tsx
index 10fd0163bf..336e822cf0 100644
--- a/apps/designer/app/designer/shared/tree/index.tsx
+++ b/apps/designer/app/designer/shared/tree/index.tsx
@@ -1,3 +1,5 @@
+import { useCallback } from "react";
+import { useStore } from "@nanostores/react";
import {
Tree,
TreeItemLabel,
@@ -10,9 +12,9 @@ import {
import type { Instance } from "@webstudio-is/project-build";
import { getComponentMeta } from "@webstudio-is/react-sdk";
import { utils } from "@webstudio-is/project";
+import { instancesIndexStore } from "~/shared/nano-states";
const instanceRelatedProps = {
- findItemById: utils.tree.findInstanceById,
getItemPath: utils.tree.getInstancePath,
getItemPathWithPositions: utils.tree.getInstancePathWithPositions,
canLeaveParent(item: Instance) {
@@ -55,8 +57,22 @@ const instanceRelatedProps = {
} as const;
export const InstanceTree = (
- props: Omit<TreeProps<Instance>, keyof typeof instanceRelatedProps>
-) => <Tree {...props} {...instanceRelatedProps} />;
+ props: Omit<
+ TreeProps<Instance>,
+ keyof typeof instanceRelatedProps | "findItemById"
+ >
+) => {
+ const { instancesById } = useStore(instancesIndexStore);
+ const findItemById = useCallback(
+ (_rootInstance: Instance, instanceId: Instance["id"]) => {
+ return instancesById.get(instanceId);
+ },
+ [instancesById]
+ );
+ return (
+ <Tree {...props} {...instanceRelatedProps} findItemById={findItemById} />
+ );
+};
export const InstanceTreeNode = (
props: Omit<TreeNodeProps<Instance>, "getItemChildren" | "renderItem">
diff --git a/apps/designer/app/shared/dom-utils.ts b/apps/designer/app/shared/dom-utils.ts
new file mode 100644
index 0000000000..f116ff60e9
--- /dev/null
+++ b/apps/designer/app/shared/dom-utils.ts
@@ -0,0 +1,12 @@
+import type { Instance } from "@webstudio-is/project-build";
+import { idAttribute } from "@webstudio-is/react-sdk";
+
+export const getInstanceElementById = (id: Instance["id"]) => {
+ return document.querySelector(`[${idAttribute}="${id}"]`);
+};
+
+export const getInstanceIdFromElement = (
+ element: Element
+): Instance["id"] | undefined => {
+ return element.getAttribute(idAttribute) ?? undefined;
+};
diff --git a/apps/designer/app/shared/dom-utils/index.ts b/apps/designer/app/shared/dom-utils/index.ts
deleted file mode 100644
index b1120b975a..0000000000
--- a/apps/designer/app/shared/dom-utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./instance";
diff --git a/apps/designer/app/shared/dom-utils/instance.ts b/apps/designer/app/shared/dom-utils/instance.ts
deleted file mode 100644
index baaf3c702c..0000000000
--- a/apps/designer/app/shared/dom-utils/instance.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Instance } from "@webstudio-is/project-build";
-import { utils } from "@webstudio-is/project";
-
-export const getInstanceElementById = (id: Instance["id"]) => {
- return document.getElementById(id);
-};
-
-export const getInstanceIdFromElement = (
- element: Element
-): Instance["id"] | undefined => {
- return element.id === "" ? undefined : element.id;
-};
-
-export const findInstanceByElement = (
- rootInstance: Instance,
- element: Element
-): Instance | undefined => {
- const id = getInstanceIdFromElement(element);
-
- if (id === undefined) {
- return undefined;
- }
-
- return utils.tree.findInstanceById(rootInstance, id);
-};