Skip to content

Commit d74b3e6

Browse files
authored
refactor: remove deprecated tree (#4180)
We refactored both pages and navigator with new tree.
1 parent 75e1630 commit d74b3e6

File tree

14 files changed

+14
-1899
lines changed

14 files changed

+14
-1899
lines changed

apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator-tree.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
TreeNodeLabel,
1717
TreeRoot,
1818
TreeSortableItem,
19-
type ItemDropTarget,
2019
type TreeDropTarget,
2120
} from "@webstudio-is/design-system";
2221
import {
@@ -39,6 +38,7 @@ import {
3938
$selectedInstanceSelector,
4039
$selectedPage,
4140
getIndexedInstanceId,
41+
type ItemDropTarget,
4242
} from "~/shared/nano-states";
4343
import type { InstanceSelector } from "~/shared/tree-utils";
4444
import { serverSyncStore } from "~/shared/sync";

apps/builder/app/canvas/shared/use-drag-drop.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { useLayoutEffect, useRef } from "react";
22
import type { Instance } from "@webstudio-is/sdk";
33
import {
44
type Point,
5-
type ItemDropTarget,
65
useAutoScroll,
76
useDrag,
87
useDrop,
@@ -12,6 +11,7 @@ import {
1211
$dragAndDropState,
1312
$instances,
1413
$registeredComponentMetas,
14+
type ItemDropTarget,
1515
} from "~/shared/nano-states";
1616
import { publish, useSubscribe } from "~/shared/pubsub";
1717
import {

apps/builder/app/shared/nano-states/misc.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { atom, computed, onSet } from "nanostores";
22
import { nanoid } from "nanoid";
33
import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";
4-
import type { ItemDropTarget, Placement } from "@webstudio-is/design-system";
4+
import type { Placement } from "@webstudio-is/design-system";
55
import type {
66
Assets,
77
DataSources,
@@ -27,6 +27,7 @@ import { $selectedInstanceSelector } from "./instances";
2727
import type { UnitSizes } from "~/builder/features/style-panel/shared/css-value-input/convert-units";
2828
import type { Simplify } from "type-fest";
2929
import type { AssetType } from "@webstudio-is/asset-uploader";
30+
import type { ChildrenOrientation } from "node_modules/@webstudio-is/design-system/src/components/primitives/dnd/geometry-utils";
3031

3132
export const $project = atom<Project | undefined>();
3233

@@ -314,6 +315,16 @@ export const $authToken = atom<string | undefined>(undefined);
314315

315316
export const $toastErrors = atom<string[]>([]);
316317

318+
export type ItemDropTarget = {
319+
itemSelector: InstanceSelector;
320+
indexWithinChildren: number;
321+
placement: {
322+
closestChildIndex: number;
323+
indexAdjustment: number;
324+
childrenOrientation: ChildrenOrientation;
325+
};
326+
};
327+
317328
export type DragAndDropState = {
318329
isDragging: boolean;
319330
dropTarget?: ItemDropTarget;

packages/design-system/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
},
1313
"devDependencies": {
1414
"@jest/globals": "^29.7.0",
15-
"@testing-library/react-hooks": "^8.0.1",
1615
"@types/react": "^18.2.70",
1716
"@types/react-dom": "^18.2.25",
1817
"@webstudio-is/image": "workspace:*",
@@ -65,7 +64,6 @@
6564
"@webstudio-is/icons": "workspace:*",
6665
"change-case": "^5.4.4",
6766
"downshift": "^6.1.7",
68-
"immer": "^10.0.3",
6967
"match-sorter": "^6.3.4",
7068
"react-field-sizing-content": "^1.0.0",
7169
"react-hot-toast": "^2.4.1",

0 commit comments

Comments
 (0)