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
refactor: reimplement navigator tree with new component (#4165)
Bogdan Chadkin671fdd50b2c8
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex eb355c73a3..ebcf543a2b 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -27,7 +27,7 @@ import {$dragAndDropState,$selectedPage,} from "~/shared/nano-states";-import { NavigatorTree } from "~/builder/shared/navigator-tree";+import { NavigatorTree } from "~/builder/features/sidebar-left/panels/navigator";import type { Settings } from "~/builder/shared/client-settings";import { MetaIcon } from "~/builder/shared/meta-icon";import { getInstanceLabel } from "~/shared/instance-utils";diff --git a/apps/builder/app/builder/features/sidebar-left/panels/navigator/index.ts b/apps/builder/app/builder/features/sidebar-left/panels/navigator/index.tsindex e17e01b012..f81da804b2 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/navigator/index.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/navigator/index.ts@@ -1 +1,2 @@export * from "./navigator";+export * from "./navigator-tree";diff --git a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator-tree.tsxnew file mode 100644index 0000000000..0c9832f12b--- /dev/null+++ b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator-tree.tsx@@ -0,0 +1,582 @@+import { useEffect, useRef } from "react";+import { nanoid } from "nanoid";+import { atom, computed } from "nanostores";+import { mergeRefs } from "@react-aria/utils";+import { useStore } from "@nanostores/react";+import {+ rawTheme,+ ScrollArea,+ SmallIconButton,+ styled,+ theme,+ toast,+ Tooltip,+ TreeNode,+ TreeNodeLabel,+ TreeRoot,+ TreeSortableItem,+ type ItemDropTarget,+ type TreeDropTarget,+} from "@webstudio-is/design-system";+import {+ collectionComponent,+ showAttribute,+ WsComponentMeta,+} from "@webstudio-is/react-sdk";+import type { Instance } from "@webstudio-is/sdk";+import { EyeconClosedIcon, EyeconOpenIcon } from "@webstudio-is/icons";+import {+ $dragAndDropState,+ $editingItemSelector,+ $hoveredInstanceSelector,+ $instances,+ $props,+ $propsIndex,+ $propValuesByInstanceSelector,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedPage,+ getIndexedInstanceId,+} from "~/shared/nano-states";+import type { InstanceSelector } from "~/shared/tree-utils";+import { serverSyncStore } from "~/shared/sync";+import { MetaIcon } from "~/builder/shared/meta-icon";+import {+ computeInstancesConstraints,+ findClosestDroppableComponentIndex,+ getInstanceLabel,+ reparentInstance,+} from "~/shared/instance-utils";+import { emitCommand } from "~/builder/shared/commands";+import { useContentEditable } from "~/shared/dom-hooks";++type TreeItem = {+ level: number;+ selector: InstanceSelector;+ instance: Instance;+ isExpanded: undefined | boolean;+ isLastChild: boolean;+ isHidden: boolean;+ isReusable: boolean;+ dropTarget?: TreeDropTarget;+};++const $expandedItems = atom(new Set<string>());++const $dropTarget = computed(+ $dragAndDropState,+ (dragAndDropState) => dragAndDropState.dropTarget+);++const $flatTree = computed(+ [+ $selectedPage,+ $instances,+ $expandedItems,+ $propValuesByInstanceSelector,+ $dropTarget,+ ],+ (+ page,+ instances,+ expandedItems,+ propValuesByInstanceSelector,+ dropTarget+ ) => {+ const flatTree: TreeItem[] = [];+ if (page === undefined) {+ return flatTree;+ }+ const traverse = (+ instanceId: Instance["id"],+ selector: InstanceSelector,+ isParentHidden = false,+ isParentReusable = false,+ isLastChild = false,+ level = 0,+ indexWithinChildren = 0+ ) => {+ const instance = instances.get(instanceId);+ if (instance === undefined) {+ throw Error("Unknown instance");+ }+ const propValues = propValuesByInstanceSelector.get(+ JSON.stringify(selector)+ );+ const isHidden =+ isParentHidden ||+ false === Boolean(propValues?.get(showAttribute) ?? true);+ const isReusable = isParentReusable || instance.component === "Slot";+ let isExpanded: undefined | boolean;+ if (level > 0 && instance.children.some((child) => child.type === "id")) {+ isExpanded = expandedItems.has(selector.join());+ }++ const treeItem: TreeItem = {+ level,+ selector,+ instance,+ isExpanded,+ isLastChild,+ isHidden,+ isReusable,+ };+ let lastItem = treeItem;+ if (instance.component === "Fragment") {+ // slot fragment component is not rendered in navigator tree+ // so should be always expanded+ for (let index = 0; index < instance.children.length; index += 1) {+ const child = instance.children[index];+ if (child.type === "id") {+ const isLastChild = index === instance.children.length - 1;+ lastItem = traverse(+ child.value,+ [child.value, ...selector],+ isHidden,+ isReusable,+ isLastChild,+ // do not increate level because Fragment is not rendered+ level,+ index+ );+ }+ }+ return lastItem;+ }++ flatTree.push(treeItem);++ // render same children for each collection item in data+ if (instance.component === collectionComponent && isExpanded) {+ const data = propValues?.get("data");+ // create items only when collection has content+ if (Array.isArray(data) && instance.children.length > 0) {+ data.forEach((_item, dataIndex) => {+ for (let index = 0; index < instance.children.length; index += 1) {+ const child = instance.children[index];+ if (child.type === "id") {+ const isLastChild =+ index * dataIndex ===+ instance.children.length * dataIndex - 1;+ lastItem = traverse(+ child.value,+ [+ child.value,+ getIndexedInstanceId(instance.id, dataIndex),+ ...selector,+ ],+ isHidden,+ isReusable,+ isLastChild,+ level + 1,+ index * dataIndex+ );+ }+ }+ });+ }+ }++ if (level === 0 || isExpanded) {+ for (let index = 0; index < instance.children.length; index += 1) {+ const child = instance.children[index];+ if (child.type === "id") {+ const isLastChild = index === instance.children.length - 1;+ lastItem = traverse(+ child.value,+ [child.value, ...selector],+ isHidden,+ isReusable,+ isLastChild,+ level + 1,+ index+ );+ }+ }+ }++ const parentSelector = treeItem.selector.slice(1);+ if (+ dropTarget &&+ parentSelector.join() === dropTarget.itemSelector.join() &&+ dropTarget.placement.closestChildIndex === indexWithinChildren+ ) {+ if (dropTarget.placement.indexAdjustment === 0) {+ treeItem.dropTarget = {+ parentLevel: level - 1,+ beforeLevel: level,+ };+ } else {+ lastItem.dropTarget = {+ parentLevel: level - 1,+ afterLevel: level,+ };+ }+ }++ return lastItem;+ };+ traverse(page.rootInstanceId, [page.rootInstanceId]);+ return flatTree;+ }+);++const handleExpand = (item: TreeItem, isExpanded: boolean, all: boolean) => {+ const expandedItems = new Set($expandedItems.get());+ const instances = $instances.get();+ const traverse = (instanceId: Instance["id"], selector: InstanceSelector) => {+ const key = selector.join();+ if (isExpanded) {+ expandedItems.add(key);+ } else {+ expandedItems.delete(key);+ }+ const instance = instances.get(instanceId);+ // expand all descendents as well when alt is pressed+ if (all && instance) {+ for (const child of instance.children) {+ traverse(child.value, [child.value, ...selector]);+ }+ }+ };+ traverse(item.instance.id, item.selector);+ $expandedItems.set(expandedItems);+};++const ShowToggle = ({+ instanceId,+ value,+}: {+ instanceId: Instance["id"];+ value: boolean;+}) => {+ const toggleShow = () => {+ const newValue = value === false;+ serverSyncStore.createTransaction([$props], (props) => {+ const { propsByInstanceId } = $propsIndex.get();+ const instanceProps = propsByInstanceId.get(instanceId);+ let showProp = instanceProps?.find((prop) => prop.name === showAttribute);+ if (showProp === undefined) {+ showProp = {+ id: nanoid(),+ instanceId,+ name: showAttribute,+ type: "boolean",+ value: newValue,+ };+ }+ if (showProp.type === "boolean") {+ props.set(showProp.id, { ...showProp, value: newValue });+ }+ });+ };+ return (+ <Tooltip+ // If you are changing it, change the other one too+ content="Removes the instance from the DOM. Breakpoints have no effect on this setting."+ disableHoverableContent+ variant="wrapped"+ >+ <SmallIconButton+ tabIndex={-1}+ aria-label="Show"+ onClick={toggleShow}+ icon={value ? <EyeconOpenIcon /> : <EyeconClosedIcon />}+ />+ </Tooltip>+ );+};++const EditableTreeNodeLabel = styled("div", {+ variants: {+ isEditing: {+ true: {+ background: theme.colors.backgroundControls,+ padding: theme.spacing[3],+ borderRadius: theme.spacing[3],+ color: theme.colors.hiContrast,+ outline: "none",+ cursor: "auto",+ textOverflow: "clip",+ userSelect: "text",+ },+ },+ },+});++const TreeNodeContent = ({+ meta,+ instance,+ isEditing,+ onIsEditingChange,+}: {+ meta: WsComponentMeta;+ instance: Instance;+ isEditing: boolean;+ onIsEditingChange: (isEditing: boolean) => void;+}) => {+ const editableRef = useRef<HTMLDivElement | null>(null);++ const label = getInstanceLabel(instance, meta);+ const { ref, handlers } = useContentEditable({+ value: label,+ isEditable: true,+ isEditing,+ onChangeValue: (value: string) => {+ const instanceId = instance.id;+ serverSyncStore.createTransaction([$instances], (instances) => {+ const instance = instances.get(instanceId);+ if (instance) {+ instance.label = value;+ }+ });+ editableRef.current?.closest("button")?.focus();+ },+ onChangeEditing: onIsEditingChange,+ });++ return (+ <TreeNodeLabel prefix={<MetaIcon icon={meta.icon} />}>+ <EditableTreeNodeLabel+ ref={mergeRefs(editableRef, ref)}+ {...handlers}+ isEditing={isEditing}+ />+ </TreeNodeLabel>+ );+};++const getBuilderDropTarget = (+ selector: string[],+ treeDropTarget: undefined | TreeDropTarget+): undefined | ItemDropTarget => {+ if (treeDropTarget === undefined) {+ return;+ }+ const instances = $instances.get();+ const parentSelector = selector.slice(-treeDropTarget.parentLevel - 1);+ const parentInstance = instances.get(parentSelector[0]);+ if (parentInstance === undefined) {+ return;+ }+ const beforeId =+ treeDropTarget.beforeLevel === undefined+ ? undefined+ : selector.at(-treeDropTarget.beforeLevel - 1);+ const beforeIndex = parentInstance.children.findIndex(+ (child) => child.type === "id" && child.value === beforeId+ );+ const afterId =+ treeDropTarget.afterLevel === undefined+ ? undefined+ : selector.at(-treeDropTarget.afterLevel - 1);+ const afterIndex = parentInstance.children.findIndex(+ (child) => child.type === "id" && child.value === afterId+ );+ let closestChildIndex = 0;+ let indexAdjustment = 0;+ if (beforeIndex > -1) {+ closestChildIndex = beforeIndex;+ indexAdjustment = 0;+ } else if (afterIndex > -1) {+ closestChildIndex = afterIndex;+ indexAdjustment = 1;+ }+ const indexWithinChildren = closestChildIndex + indexAdjustment;+ return {+ itemSelector: parentSelector,+ indexWithinChildren,+ placement: {+ closestChildIndex,+ indexAdjustment,+ childrenOrientation: { type: "vertical", reverse: false },+ },+ };+};++const canDrag = (instance: Instance) => {+ const meta = $registeredComponentMetas.get().get(instance.component);+ if (meta === undefined) {+ return true;+ }+ const detachable =+ meta.type !== "rich-text-child" && (meta.detachable ?? true);+ if (detachable === false) {+ toast.error(+ "This instance can not be moved outside of its parent component."+ );+ }+ return detachable;+};++const canDrop = (+ dragSelector: InstanceSelector,+ dropSelector: InstanceSelector+) => {+ const metas = $registeredComponentMetas.get();+ const instances = $instances.get();+ const insertConstraints = computeInstancesConstraints(metas, instances, [+ dragSelector[0],+ ]);+ const ancestorIndex = findClosestDroppableComponentIndex({+ metas,+ constraints: insertConstraints,+ instances,+ instanceSelector: dropSelector,+ });+ return ancestorIndex === 0;+};++export const NavigatorTree = () => {+ const flatTree = useStore($flatTree);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const selectedKey = selectedInstanceSelector?.join();+ const hoveredInstanceSelector = useStore($hoveredInstanceSelector);+ const hoveredKey = hoveredInstanceSelector?.join();+ const propValuesByInstanceSelector = useStore($propValuesByInstanceSelector);+ const metas = useStore($registeredComponentMetas);+ const editingItemSelector = useStore($editingItemSelector);+ const dragAndDropState = useStore($dragAndDropState);+ const dropTargetKey = dragAndDropState.dropTarget?.itemSelector.join();++ // expand selected instance ancestors+ useEffect(() => {+ if (selectedInstanceSelector) {+ const newExpandedItems = new Set($expandedItems.get());+ let expanded = 0;+ // do not expand the selected instance itself, start with parent+ for (let index = 1; index < selectedInstanceSelector.length; index += 1) {+ const key = selectedInstanceSelector.slice(index).join();+ if (newExpandedItems.has(key) === false) {+ newExpandedItems.add(key);+ expanded += 1;+ }+ }+ // prevent rerender if nothing new is expanded+ if (expanded > 0) {+ $expandedItems.set(newExpandedItems);+ }+ }+ }, [selectedInstanceSelector]);++ return (+ <ScrollArea+ direction="both"+ css={{+ width: "100%",+ overflow: "hidden",+ flexBasis: 0,+ flexGrow: 1,+ }}+ >+ <TreeRoot>+ {flatTree.map((item) => {+ const key = item.selector.join();+ const propValues = propValuesByInstanceSelector.get(+ JSON.stringify(item.selector)+ );+ const show = Boolean(propValues?.get(showAttribute) ?? true);+ const meta = metas.get(item.instance.component);+ if (meta === undefined) {+ return;+ }+ return (+ <TreeSortableItem+ key={key}+ level={item.level}+ isExpanded={item.isExpanded}+ isLastChild={item.isLastChild}+ data={item}+ canDrag={() => canDrag(item.instance)}+ dropTarget={item.dropTarget}+ onDropTargetChange={(dropTarget, draggingItem) => {+ const builderDropTarget = getBuilderDropTarget(+ item.selector,+ dropTarget+ );+ if (+ builderDropTarget &&+ canDrop(draggingItem.selector, builderDropTarget.itemSelector)+ ) {+ $dragAndDropState.set({+ ...$dragAndDropState.get(),+ isDragging: true,+ dragPayload: {+ origin: "panel",+ type: "reparent",+ dragInstanceSelector: draggingItem.selector,+ },+ dropTarget: builderDropTarget,+ });+ } else {+ $dragAndDropState.set({+ ...$dragAndDropState.get(),+ isDragging: false,+ dropTarget: undefined,+ });+ }+ }}+ onDrop={(data) => {+ const builderDropTarget = $dragAndDropState.get().dropTarget;+ if (builderDropTarget) {+ reparentInstance(data.selector, {+ parentSelector: builderDropTarget.itemSelector,+ position: builderDropTarget.indexWithinChildren,+ });+ }+ $dragAndDropState.set({ isDragging: false });+ }}+ onExpand={(isExpanded) => handleExpand(item, isExpanded, false)}+ >+ <TreeNode+ level={item.level}+ isSelected={selectedKey === key}+ isHighlighted={hoveredKey === key || dropTargetKey === key}+ isExpanded={item.isExpanded}+ onExpand={(isExpanded, all) =>+ handleExpand(item, isExpanded, all)+ }+ nodeProps={{+ style: {+ opacity: item.isHidden ? 0.4 : undefined,+ color: item.isReusable+ ? rawTheme.colors.foregroundReusable+ : undefined,+ },+ }}+ buttonProps={{+ onMouseEnter: () =>+ $hoveredInstanceSelector.set(item.selector),+ onMouseLeave: () => $hoveredInstanceSelector.set(undefined),+ onClick: () => $selectedInstanceSelector.set(item.selector),+ onFocus: () => $selectedInstanceSelector.set(item.selector),+ onKeyDown: (event) => {+ if (event.key === "Enter") {+ emitCommand("editInstanceText");+ }+ },+ }}+ action={+ <ShowToggle instanceId={item.instance.id} value={show} />+ }+ >+ <TreeNodeContent+ meta={meta}+ instance={item.instance}+ isEditing={+ item.selector.join() === editingItemSelector?.join()+ }+ onIsEditingChange={(isEditing) => {+ $editingItemSelector.set(+ isEditing === true ? item.selector : undefined+ );+ }}+ />+ </TreeNode>+ </TreeSortableItem>+ );+ })}+ </TreeRoot>+ </ScrollArea>+ );+};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsxindex 0405ee5799..c419ac523e 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/navigator/navigator.tsx@@ -1,21 +1,13 @@import { NavigatorIcon } from "@webstudio-is/icons";import { Kbd, Text, Flex, Separator } from "@webstudio-is/design-system";-import { useHotkeys } from "react-hotkeys-hook";-import { NavigatorTree } from "~/builder/shared/navigator-tree";-import { emitCommand } from "~/builder/shared/commands";import type { TabContentProps } from "../../types";import { Header, CloseButton, Root } from "../../shared/panel";import { CssPreview } from "./css-preview";+import { NavigatorTree } from "./navigator-tree";export const TabContent = ({ onSetActiveTab }: TabContentProps) => {- const shortcutRef = useHotkeys<HTMLDivElement>(- "enter",- () => emitCommand("editInstanceText"),- []- );-return (- <Root ref={shortcutRef}>+ <Root><Headertitle="Navigator"suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsxdeleted file mode 100644index d7e3fbc7b6..0000000000--- a/apps/builder/app/builder/shared/navigator-tree.tsx+++ /dev/null@@ -1,423 +0,0 @@-import { useCallback, useMemo, useRef } from "react";-import { nanoid } from "nanoid";-import { mergeRefs } from "@react-aria/utils";-import { useStore } from "@nanostores/react";-import { shallowEqual } from "shallow-equal";-import {- toast,- Tree,- TreeItemLabel,- TreeItemBody,- type TreeItemRenderProps,- styled,- theme,- getNodeVars,- rawTheme,- Tooltip,- SmallIconButton,-} from "@webstudio-is/design-system";-import { EyeconClosedIcon, EyeconOpenIcon } from "@webstudio-is/icons";-import { collectionComponent, showAttribute } from "@webstudio-is/react-sdk";-import {- $hoveredInstanceSelector,- $instances,- $rootInstance,- $selectedInstanceSelector,- $textEditingInstanceSelector,- $registeredComponentMetas,- $dragAndDropState,- $editingItemSelector,- $propValuesByInstanceSelector,- getIndexedInstanceId,- $props,- $propsIndex,-} from "~/shared/nano-states";-import type { InstanceSelector } from "~/shared/tree-utils";-import {- computeInstancesConstraints,- findClosestDroppableComponentIndex,- reparentInstance,- type InsertConstraints,- isInstanceDetachable,- getComponentTemplateData,-} from "~/shared/instance-utils";-import { useContentEditable } from "~/shared/dom-hooks";-import { getInstanceLabel } from "~/shared/instance-utils";-import { serverSyncStore } from "~/shared/sync";-import type { Instance } from "@webstudio-is/sdk";-import { MetaIcon } from "./meta-icon";--const TreeItem = ({- prefix,- value,- isEditing,- isEditable = false,- onChangeValue,- onChangeEditing,-}: {- isEditable: boolean;- isEditing: boolean;- prefix?: React.ReactNode;- value: string;- onChangeValue: (value: string) => void;- onChangeEditing: (isEditing: boolean) => void;-}) => {- const editableRef = useRef<HTMLDivElement | null>(null);- const { ref, handlers } = useContentEditable({- value,- isEditable,- isEditing,- onChangeValue: (value: string) => {- onChangeValue(value);- const button = editableRef.current?.closest(- "[data-item-button-id]"- ) as HTMLElement;- button?.focus();- },- onChangeEditing,- });-- return (- <EditableTreeItemLabel- ref={mergeRefs(editableRef, ref)}- {...handlers}- isEditing={isEditing}- prefix={prefix}- >- {value}- </EditableTreeItemLabel>- );-};--const EditableTreeItemLabel = styled(TreeItemLabel, {- variants: {- isEditing: {- true: {- background: theme.colors.backgroundControls,- padding: theme.spacing[3],- borderRadius: theme.spacing[3],- color: theme.colors.hiContrast,- outline: "none",- cursor: "auto",- textOverflow: "clip",- userSelect: "text",- },- },- },-});--const ShowToggle = ({- show,- onChange,-}: {- show: boolean;- onChange: (show: boolean) => void;-}) => {- return (- <Tooltip- // If you are changing it, change the other one too- content="Removes the instance from the DOM. Breakpoints have no effect on this setting."- disableHoverableContent- variant="wrapped"- >- <SmallIconButton- aria-label="Show"- onClick={() => onChange(show ? false : true)}- icon={show ? <EyeconOpenIcon /> : <EyeconClosedIcon />}- />- </Tooltip>- );-};--const updateShowProp = (instanceId: Instance["id"], value: boolean) => {- serverSyncStore.createTransaction([$props], (props) => {- const { propsByInstanceId } = $propsIndex.get();- const instanceProps = propsByInstanceId.get(instanceId);- let showProp = instanceProps?.find((prop) => prop.name === showAttribute);-- if (showProp === undefined) {- showProp = {- id: nanoid(),- instanceId,- name: showAttribute,- type: "boolean",- value,- };- }- if (showProp.type === "boolean") {- props.set(showProp.id, {- ...showProp,- value,- });- }- });-};--const updateInstanceLabel = (instanceId: Instance["id"], value: string) => {- serverSyncStore.createTransaction([$instances], (instances) => {- const instance = instances.get(instanceId);- if (instance === undefined) {- return;- }- instance.label = value;- });-};--const canLeaveParent = ([instanceId]: InstanceSelector) => {- const instance = $instances.get().get(instanceId);- if (instance === undefined) {- return false;- }- const meta = $registeredComponentMetas.get().get(instance.component);- return meta?.type !== "rich-text-child";-};--export const NavigatorTree = () => {- const selectedInstanceSelector = useStore($selectedInstanceSelector);- const hoveredInstanceSelector = useStore($hoveredInstanceSelector);- const rootInstance = useStore($rootInstance);- const instances = useStore($instances);- const metas = useStore($registeredComponentMetas);- const state = useStore($dragAndDropState);- const editingItemSelector = useStore($editingItemSelector);- const propValues = useStore($propValuesByInstanceSelector);-- const dragPayload = state.dragPayload;-- const dragItemSelector =- dragPayload?.type === "reparent"- ? dragPayload.dragInstanceSelector- : undefined;-- const insertConstraints: undefined | InsertConstraints = useMemo(() => {- if (dragPayload?.type === "insert") {- const templateData = getComponentTemplateData(dragPayload.dragComponent);- if (templateData) {- const { children, instances } = templateData;- const newInstances = new Map(- instances.map((instance) => [instance.id, instance])- );- const rootInstanceIds = children- .filter((child) => child.type === "id")- .map((child) => child.value);- return computeInstancesConstraints(- metas,- newInstances,- rootInstanceIds- );- }- }- if (dragPayload?.type === "reparent") {- return computeInstancesConstraints(metas, instances, [- dragPayload.dragInstanceSelector[0],- ]);- }- }, [dragPayload, instances, metas]);-- const findClosestDroppableIndex = useCallback(- (instanceSelector: InstanceSelector) => {- if (insertConstraints === undefined) {- return -1;- }- return findClosestDroppableComponentIndex({- metas,- constraints: insertConstraints,- instances,- instanceSelector,- });- },- [instances, metas, insertConstraints]- );-- const isItemHidden = useCallback(- (instanceSelector: InstanceSelector) => {- const [instanceId, parentInstanceId] = instanceSelector;- return (- // fragment is internal component to group other instances- // for example to support multiple children in slots- instances.get(instanceId)?.component === "Fragment" ||- // hide collection items which are temporary generated- instances.get(parentInstanceId)?.component === collectionComponent- );- },- [instances]- );-- const handleDragEnd = useCallback(- (payload: {- itemSelector: InstanceSelector;- dropTarget: { itemSelector: InstanceSelector; position: number | "end" };- }) => {- reparentInstance(payload.itemSelector, {- parentSelector: payload.dropTarget.itemSelector,- position: payload.dropTarget.position,- });- $dragAndDropState.set({ isDragging: false });- },- []- );-- const handleSelect = useCallback((instanceSelector: InstanceSelector) => {- // TreeNode is refocused during "delete" hot key here https://github.com/webstudio-is/webstudio/blob/5935d7818fba3739e4f16fe710ea468bf9d0ac78/packages/design-system/src/components/tree/tree.tsx#L435- // and then focus cause handleSelect to be called with the same instanceSelector- // This avoids additional rerender on node delete- if (shallowEqual($selectedInstanceSelector.get(), instanceSelector)) {- return;- }- $selectedInstanceSelector.set(instanceSelector);- $textEditingInstanceSelector.set(undefined);- }, []);-- const getItemChildren = useCallback(- (instanceSelector: InstanceSelector) => {- const [instanceId, parentId] = instanceSelector;- let instance = instances.get(instanceId);- const children: Instance[] = [];-- // put fake collection item instances according to collection data- if (instance?.component === collectionComponent) {- const data = propValues- .get(JSON.stringify(instanceSelector))- ?.get("data");- // create items only when collection has content- if (Array.isArray(data) && instance.children.length > 0) {- data.forEach((_item, index) => {- children.push({- type: "instance",- id: getIndexedInstanceId(instanceId, index),- component: "ws:collection-item",- children: [],- });- });- }- return children;- }-- // put parent children as own when parent is a collection- if (instance === undefined) {- const parentInstance = instances.get(parentId);- if (parentInstance?.component === collectionComponent) {- instance = parentInstance;- }- }- if (instance === undefined) {- return children;- }-- for (const child of instance.children) {- if (child.type !== "id") {- continue;- }- const childInstance = instances.get(child.value);- if (childInstance === undefined) {- continue;- }- children.push(childInstance);- }- return children;- },- [instances, propValues]- );-- const renderItem = useCallback(- (props: TreeItemRenderProps<Instance>) => {- const { itemData, itemSelector } = props;- const meta = metas.get(itemData.component);- if (meta === undefined) {- return <></>;- }- const label = getInstanceLabel(itemData, meta);- const isEditing = shallowEqual(itemSelector, editingItemSelector);- const instanceProps = propValues.get(JSON.stringify(itemSelector));- const show = Boolean(instanceProps?.get(showAttribute) ?? true);-- return (- <TreeItemBody- {...props}- selectionEvent="focus"- suffix={- <ShowToggle- show={show}- onChange={(show) => {- updateShowProp(itemData.id, show);- }}- />- }- >- <TreeItem- isEditable={true}- isEditing={isEditing}- onChangeValue={(val) => {- updateInstanceLabel(props.itemData.id, val);- }}- onChangeEditing={(isEditing) => {- $editingItemSelector.set(- isEditing === true ? props.itemSelector : undefined- );- }}- prefix={<MetaIcon icon={meta.icon} />}- value={label}- />- </TreeItemBody>- );- },- [metas, editingItemSelector, propValues]- );-- if (rootInstance === undefined) {- return;- }-- return (- <Tree- root={rootInstance}- selectedItemSelector={selectedInstanceSelector}- highlightedItemSelector={hoveredInstanceSelector}- dragItemSelector={dragItemSelector}- dropTarget={state.dropTarget}- canLeaveParent={canLeaveParent}- getItemChildren={getItemChildren}- getItemProps={({ itemData, itemSelector }) => {- const props = propValues.get(JSON.stringify(itemSelector));- const opacity = props?.get(showAttribute) === false ? 0.4 : undefined;- const color =- itemData.component === "Slot"- ? rawTheme.colors.foregroundReusable- : undefined;- return {- style: getNodeVars({ color, opacity }),- };- }}- renderItem={renderItem}- editingItemId={editingItemSelector?.[0]}- isItemHidden={isItemHidden}- findClosestDroppableIndex={findClosestDroppableIndex}- onSelect={handleSelect}- onHover={$hoveredInstanceSelector.set}- onDragItemChange={(dragInstanceSelector) => {- const instances = $instances.get();- if (isInstanceDetachable(instances, dragInstanceSelector) === false) {- toast.error(- "This instance can not be moved outside of its parent component."- );- return;- }- $dragAndDropState.set({- ...$dragAndDropState.get(),- dragPayload: {- origin: "panel",- type: "reparent",- dragInstanceSelector,- },- });- }}- onDropTargetChange={(dropTarget) => {- $dragAndDropState.set({ ...$dragAndDropState.get(), dropTarget });- }}- onDragEnd={handleDragEnd}- onCancel={() => {- $dragAndDropState.set({ isDragging: false });- }}- />- );-};diff --git a/apps/builder/app/shared/dom-hooks/use-content-editable.ts b/apps/builder/app/shared/dom-hooks/use-content-editable.tsindex c926b82686..b20207e5cf 100644--- a/apps/builder/app/shared/dom-hooks/use-content-editable.ts+++ b/apps/builder/app/shared/dom-hooks/use-content-editable.ts@@ -85,9 +85,13 @@ export const useContentEditable = ({};const handleKeyDown: KeyboardEventHandler = (event) => {+ if (isEditing === false) {+ return;+ }+ // prevent keyboard navigation on parent elements+ event.stopPropagation();if (event.key === "Enter") {handleComplete(event);- return;}if (event.key === "Escape" && elementRef.current !== null) {elementRef.current.textContent = value;diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 4e819026c5..5f7039e97a 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -40,8 +40,8 @@"@nanostores/react": "^0.7.1","@radix-ui/react-select": "^2.1.1","@radix-ui/react-tooltip": "^1.1.2",- "@react-aria/interactions": "^3.19.0",- "@react-aria/utils": "^3.21.0",+ "@react-aria/interactions": "^3.22.2",+ "@react-aria/utils": "^3.25.2","@remix-run/node": "^2.11.0","@remix-run/react": "^2.11.0","@remix-run/serve": "^2.11.0",@@ -103,7 +103,6 @@"react-colorful": "^5.6.1","react-dom": "18.3.0-canary-14898b6a9-20240318","react-error-boundary": "^4.0.12",- "react-hotkeys-hook": "^4.4.1","react-script-hook": "^1.7.2","remix-auth": "^3.7.0","remix-auth-form": "^1.5.0",diff --git a/packages/design-system/package.json b/packages/design-system/package.jsonindex 9cc4e79b5a..ae5339ebd1 100644--- a/packages/design-system/package.json+++ b/packages/design-system/package.json@@ -59,8 +59,8 @@"@radix-ui/react-tooltip": "^1.1.2","@radix-ui/react-use-controllable-state": "^1.1.0","@react-aria/focus": "^3.18.2",- "@react-aria/interactions": "^3.19.0",- "@react-aria/utils": "^3.21.0",+ "@react-aria/interactions": "^3.22.2",+ "@react-aria/utils": "^3.25.2","@stitches/react": "1.3.1-1","@webstudio-is/icons": "workspace:*","change-case": "^5.4.4",diff --git a/packages/design-system/src/components/list-position-indicator.tsx b/packages/design-system/src/components/list-position-indicator.tsxindex 503cad98a0..4975dbdd76 100644--- a/packages/design-system/src/components/list-position-indicator.tsx+++ b/packages/design-system/src/components/list-position-indicator.tsx@@ -16,6 +16,7 @@ const OVERLAP = 2;const Container = styled(Box, {position: "absolute",+ zIndex: 1,});const CircleOutline = styled(Box, {diff --git a/packages/design-system/src/components/tree.stories.tsx b/packages/design-system/src/components/tree.stories.tsxindex 1d3a397dfa..4ed21df8c6 100644--- a/packages/design-system/src/components/tree.stories.tsx+++ b/packages/design-system/src/components/tree.stories.tsx@@ -25,6 +25,7 @@ type FlatNode = {level: number;isExpanded?: boolean;isLastChild: boolean;+ dropTarget?: TreeDropTarget;};const findNode = (data: Node, name?: string) => {@@ -116,7 +117,7 @@ type DropTarget = {afterName?: string;};-const getDropTarget = (+const getStoriesDropTarget = (node: FlatNode,dropTarget: undefined | TreeDropTarget): undefined | DropTarget => {@@ -141,6 +142,7 @@ export const Tree = () => {const [selectedItemId, setSelectedItemId] = useState("");const [expandedItems, setExpandedItems] = useState(new Set<string>());const [data, setData] = useState(initialData);+ const [dropTarget, setDropTarget] = useState<undefined | DropTarget>();const flatTree = useMemo(() => {const flatTree: FlatNode[] = [];const traverse = (@@ -154,24 +156,43 @@ export const Tree = () => {isExpanded = expandedItems.has(node.name);}// hide root folder- flatTree.push({+ const flatNode: FlatNode = {name: node.name,selector,level,isExpanded,isLastChild,- });+ };+ flatTree.push(flatNode);+ let lastFlatNode = flatNode;if (level === 0 || isExpanded) {for (const child of node.children) {const isLastChild = node.children.at(-1) === child;- traverse(child, [child.name, ...selector], isLastChild, level + 1);+ lastFlatNode = traverse(+ child,+ [child.name, ...selector],+ isLastChild,+ level + 1+ );}}+ if (dropTarget?.beforeName === node.name) {+ flatNode.dropTarget = {+ parentLevel: level - 1,+ beforeLevel: level,+ };+ }+ if (dropTarget?.afterName === node.name) {+ lastFlatNode.dropTarget = {+ parentLevel: level - 1,+ afterLevel: level,+ };+ }+ return lastFlatNode;};traverse(data, [data.name], false);return flatTree;- }, [data, expandedItems]);- const [dropTarget, setDropTarget] = useState<undefined | DropTarget>();+ }, [data, expandedItems, dropTarget]);return (<Box css={{ maxWidth: 300 }}>@@ -198,12 +219,16 @@ export const Tree = () => {data={node}// prevent dragging rootcanDrag={() => node.level > 0}- // prevent dropping into toplevel- canDrop={(dropTarget) => dropTarget.parentLevel > 0}onExpand={handleExpand}- onDropTargetChange={(dropTarget) =>- setDropTarget(getDropTarget(node, dropTarget))- }+ dropTarget={node.dropTarget}+ onDropTargetChange={(dropTarget) => {+ // prevent dropping into toplevel+ if (dropTarget && dropTarget.parentLevel > 0) {+ setDropTarget(getStoriesDropTarget(node, dropTarget));+ } else {+ setDropTarget(undefined);+ }+ }}onDrop={(sourceNode) => {if (dropTarget) {setData((data) =>@@ -215,6 +240,7 @@ export const Tree = () => {}));}+ setDropTarget(undefined);}}><TreeNodediff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsxindex 2596921648..4aed19643f 100644--- a/packages/design-system/src/components/tree.tsx+++ b/packages/design-system/src/components/tree.tsx@@ -175,7 +175,7 @@ const ActionContainer = styled("div", {const DropIndicator = ({instruction,}: {- instruction: null | Instruction;+ instruction: undefined | Instruction;}) => {if (instruction?.type === "reorder-above") {const indent = instruction.currentLevel * instruction.indentPerLevel;@@ -215,24 +215,44 @@ export type TreeDropTarget = {afterLevel?: number;};-const getTreeDropTarget = (instruction: null | Instruction) => {- let treeDropTarget: undefined | TreeDropTarget;+const getTreeDropTarget = (+ instruction: null | Instruction+): undefined | TreeDropTarget => {if (instruction?.type === "make-child") {- treeDropTarget = { parentLevel: instruction.currentLevel };+ const afterLevel = instruction.currentLevel + 1;+ return { parentLevel: afterLevel - 1, afterLevel };}if (instruction?.type === "reorder-below") {const afterLevel = instruction.currentLevel;- treeDropTarget = { parentLevel: afterLevel - 1, afterLevel };+ return { parentLevel: afterLevel - 1, afterLevel };}if (instruction?.type === "reorder-above") {const beforeLevel = instruction.currentLevel;- treeDropTarget = { parentLevel: beforeLevel - 1, beforeLevel };+ return { parentLevel: beforeLevel - 1, beforeLevel };}if (instruction?.type === "reparent") {const afterLevel = instruction.desiredLevel;- treeDropTarget = { parentLevel: afterLevel - 1, afterLevel };+ return { parentLevel: afterLevel - 1, afterLevel };+ }+};++const getInstruction = (+ treeDropTarget: undefined | TreeDropTarget+): undefined | Instruction => {+ if (treeDropTarget?.beforeLevel !== undefined) {+ return {+ type: "reorder-above",+ currentLevel: treeDropTarget.beforeLevel,+ indentPerLevel: BARS_GAP,+ };+ }+ if (treeDropTarget?.afterLevel !== undefined) {+ return {+ type: "reorder-below",+ currentLevel: treeDropTarget.afterLevel,+ indentPerLevel: BARS_GAP,+ };}- return treeDropTarget;};// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type@@ -250,7 +270,7 @@ export const TreeSortableItem = <Data,>({isLastChild,data,canDrag,- canDrop,+ dropTarget,onDropTargetChange,onDrop,onExpand,@@ -261,21 +281,22 @@ export const TreeSortableItem = <Data,>({isLastChild: boolean;data: Data;canDrag: () => boolean;- canDrop: (dropTarge: TreeDropTarget) => boolean;- onDropTargetChange: (dropTarget: undefined | TreeDropTarget) => void;+ dropTarget: undefined | TreeDropTarget;+ onDropTargetChange: (+ dropTarget: undefined | TreeDropTarget,+ draggingData: Data+ ) => void;onDrop: (data: Data) => void;onExpand: (isExpanded: boolean) => void;children: ReactNode;}) => {const elementRef = useRef<HTMLDivElement>(null);- const [instruction, setInstruction] = useState<null | Instruction>(null);const [isDragging, setIsDragging] = useState(false);const [isDropOver, setIsDropOver] = useState(false);const handleDropTargetChange = useCallbackRef(onDropTargetChange);const handleDrop = useCallbackRef(onDrop);const handleExpand = useCallbackRef(onExpand);const handleCanDrag = useCallbackRef(canDrag);- const handleCanDrop = useCallbackRef(canDrop);const expandTimeout = useRef<number>();useEffect(() => {@@ -322,17 +343,12 @@ export const TreeSortableItem = <Data,>({);},onDrag: (args) => {- let instruction = extractInstruction(args.self.data);+ const instruction = extractInstruction(args.self.data);const dropTarget = getTreeDropTarget(instruction);+ const draggingData = args.source.data.itemData as Data;if (dropTarget) {- if (handleCanDrop.current(dropTarget)) {- handleDropTargetChange.current(dropTarget);- } else {- handleDropTargetChange.current(undefined);- instruction = null;- }+ handleDropTargetChange.current(dropTarget, draggingData);}- setInstruction(instruction);},onDragEnter: () => {// timeout in browser use only number as timeout id@@ -342,18 +358,17 @@ export const TreeSortableItem = <Data,>({}, 600);setIsDropOver(true);},- onDragLeave: () => {+ onDragLeave: (args) => {window.clearTimeout(expandTimeout.current);setIsDropOver(false);- setInstruction(null);- handleDropTargetChange.current(undefined);+ const draggingData = args.source.data.itemData as Data;+ handleDropTargetChange.current(undefined, draggingData);},onDrop: (args) => {+ const draggingData = args.source.data.itemData as Data;window.clearTimeout(expandTimeout.current);- handleDropTargetChange.current(undefined);- handleDrop.current(args.source.data.itemData as Data);+ handleDrop.current(draggingData);setIsDropOver(false);- setInstruction(null);},}),autoScrollWindowForElements()@@ -364,7 +379,6 @@ export const TreeSortableItem = <Data,>({isLastChild,data,handleCanDrag,- handleCanDrop,handleDrop,handleDropTargetChange,handleExpand,@@ -388,7 +402,7 @@ export const TreeSortableItem = <Data,>({}}>{children}- <DropIndicator instruction={instruction} />+ <DropIndicator instruction={getInstruction(dropTarget)} /></Box>);};@@ -400,6 +414,7 @@ export const TreeNode = ({isHighlighted,isExpanded,onExpand,+ nodeProps,buttonProps,action,children,@@ -410,6 +425,7 @@ export const TreeNode = ({isHighlighted?: boolean;isExpanded: undefined | boolean;onExpand: (expanded: boolean, all: boolean) => void;+ nodeProps?: ComponentPropsWithoutRef<"div">;buttonProps: ComponentPropsWithoutRef<"button">;action?: ReactNode;children: ReactNode;@@ -419,7 +435,8 @@ export const TreeNode = ({useEffect(() => {if (isSelected) {containerRef.current?.scrollIntoView({- behavior: "smooth",+ // smooth behavior in both canvas and navigator confuses chrome+ behavior: "auto",block: "nearest",});}@@ -448,6 +465,7 @@ export const TreeNode = ({return (<NodeContainer+ {...nodeProps}ref={containerRef}css={{ [treeNodeLevel]: level }}onKeyDown={handleKeydown}diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.jsonindex aa8864bdef..603b3fe8dd 100644--- a/packages/sdk-components-react/package.json+++ b/packages/sdk-components-react/package.json@@ -46,7 +46,7 @@"react-dom": "18.3.0-canary-14898b6a9-20240318"},"dependencies": {- "@react-aria/utils": "^3.21.0",+ "@react-aria/utils": "^3.25.2","@webstudio-is/icons": "workspace:*","@webstudio-is/image": "workspace:*","@webstudio-is/react-sdk": "workspace:*",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 32d62ec011..e85be35236 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -194,11 +194,11 @@ importers:specifier: ^1.1.2version: 1.1.2(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])'@react-aria/interactions':- specifier: ^3.19.0- version: 3.19.0([email protected])+ specifier: ^3.22.2+ version: 3.22.2([email protected])'@react-aria/utils':- specifier: ^3.21.0- version: 3.21.0([email protected])+ specifier: ^3.25.2+ version: 3.25.2([email protected])'@remix-run/node':specifier: ^2.11.0version: 2.11.0([email protected])@@ -382,9 +382,6 @@ importers:react-error-boundary:specifier: ^4.0.12version: 4.0.12([email protected])- react-hotkeys-hook:- specifier: ^4.4.1react-script-hook:specifier: ^1.7.2@@ -1394,11 +1391,11 @@ importers:specifier: ^3.18.2version: 3.18.2([email protected])'@react-aria/interactions':- specifier: ^3.19.0- version: 3.19.0([email protected])+ specifier: ^3.22.2+ version: 3.22.2([email protected])'@react-aria/utils':- specifier: ^3.21.0- version: 3.21.0([email protected])+ specifier: ^3.25.2+ version: 3.25.2([email protected])'@stitches/react':specifier: 1.3.1-1version: 1.3.1-1(patch_hash=knml42mpr6mlzseo3d6gjljiq4)([email protected])@@ -1941,8 +1938,8 @@ importers:packages/sdk-components-react:dependencies:'@react-aria/utils':- specifier: ^3.21.0- version: 3.21.0([email protected])+ specifier: ^3.25.2+ version: 3.25.2([email protected])'@webstudio-is/icons':specifier: workspace:*version: link:../icons@@ -4414,33 +4411,17 @@ packages:peerDependencies:react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]':- resolution: {integrity: sha512-nJ8VTmEOYJAAvV7wzeQVnamxWd3j16hGAzG++onjhluSWWKO1jMRN6WG9LDwvT5mBI0VYwf7JdVB3QBaCa9fsQ==}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]':resolution: {integrity: sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==}peerDependencies:react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]':- resolution: {integrity: sha512-Y54xs483rglN5DxbwfCPHxnkvZ+gZ0LbSYmR72LyWPGft8hN/lrl1VRS1EW2SMjnkEWlj+Km2mwvA3kEHDUA0A==}- engines: {node: '>= 12'}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]':resolution: {integrity: sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==}engines: {node: '>= 12'}peerDependencies:react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]':- resolution: {integrity: sha512-0ZNaXgvbWnqqiG7FB0qhAIENN7CmBU30AnyTzz5ZZgvJexUJkhd2GMjvTqrBZ6zSjeMpUEIKg5PUA1eptGRPww==}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]':resolution: {integrity: sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==}peerDependencies:@@ -4451,16 +4432,6 @@ packages:peerDependencies:react: 18.3.0-canary-14898b6a9-20240318- '@react-stately/[email protected]':- resolution: {integrity: sha512-wCIoFDbt/uwNkWIBF+xV+21k8Z8Sj5qGO3uptTcVmjYcZngOaGGyB4NkiuZhmhG70Pkv+yVrRwoC1+4oav9cCg==}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318-- '@react-types/[email protected]':- resolution: {integrity: sha512-wJA2cUF8dP4LkuNUt9Vh2kkfiQb2NLnV2pPXxVnKJZ7d4x2/7VPccN+LYPnH8m0X3+rt50cxWuPKQmjxSsCFOg==}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318-'@react-types/[email protected]':resolution: {integrity: sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==}peerDependencies:@@ -5625,10 +5596,6 @@ packages:resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}engines: {node: '>=0.8'}- resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}- engines: {node: '>=6'}-resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}engines: {node: '>=6'}@@ -8202,12 +8169,6 @@ packages:react: 18.3.0-canary-14898b6a9-20240318react-dom: 18.3.0-canary-14898b6a9-20240318- resolution: {integrity: sha512-sClBMBioFEgFGYLTWWRKvhxcCx1DRznd+wkFHwQZspnRBkHTgruKIHptlK/U/2DPX8BhHoRGzpMVWUXMmdZlmw==}- peerDependencies:- react: 18.3.0-canary-14898b6a9-20240318- react-dom: 18.3.0-canary-14898b6a9-20240318-resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}@@ -11719,14 +11680,6 @@ snapshots:clsx: 2.1.1react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]([email protected])':- dependencies:- '@react-aria/ssr': 3.8.0([email protected])- '@react-aria/utils': 3.21.0([email protected])- '@react-types/shared': 3.21.0([email protected])- '@swc/helpers': 0.5.1- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]([email protected])':dependencies:'@react-aria/ssr': 3.9.5([email protected])@@ -11735,25 +11688,11 @@ snapshots:'@swc/helpers': 0.5.1react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]([email protected])':- dependencies:- '@swc/helpers': 0.5.1- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.1react: 18.3.0-canary-14898b6a9-20240318- '@react-aria/[email protected]([email protected])':- dependencies:- '@react-aria/ssr': 3.8.0([email protected])- '@react-stately/utils': 3.8.0([email protected])- '@react-types/shared': 3.21.0([email protected])- '@swc/helpers': 0.5.1- clsx: 1.2.1- react: 18.3.0-canary-14898b6a9-20240318-'@react-aria/[email protected]([email protected])':dependencies:'@react-aria/ssr': 3.9.5([email protected])@@ -11768,15 +11707,6 @@ snapshots:'@swc/helpers': 0.5.1react: 18.3.0-canary-14898b6a9-20240318- '@react-stately/[email protected]([email protected])':- dependencies:- '@swc/helpers': 0.5.1- react: 18.3.0-canary-14898b6a9-20240318-- '@react-types/[email protected]([email protected])':- dependencies:- react: 18.3.0-canary-14898b6a9-20240318-'@react-types/[email protected]([email protected])':dependencies:react: 18.3.0-canary-14898b6a9-20240318@@ -13221,8 +13151,6 @@ snapshots:- [email protected]: {}-@@ -16500,11 +16428,6 @@ snapshots:transitivePeerDependencies:- csstype- dependencies:- react: 18.3.0-canary-14898b6a9-20240318- react-dom: 18.3.0-canary-14898b6a9-20240318([email protected])-