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
Fix tree hover (#1429)
Bogdan Chadkin1c0faf73d6de
diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex e12b57ed37..68e5fd0c82 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -83,12 +83,13 @@ export const subscribeInstanceHovering = () => {// update rect whenever hovered instance is changedconst unsubscribeHoveredInstanceId = hoveredInstanceSelectorStore.subscribe((instanceSelector) => {- if (instanceSelector === undefined) {- return;- }- const element = getElementByInstanceSelector(instanceSelector);- if (element !== undefined) {- updateHoveredRect(element);+ if (instanceSelector) {+ const element = getElementByInstanceSelector(instanceSelector);+ if (element !== undefined) {+ updateHoveredRect(element);+ }+ } else {+ hoveredInstanceOutlineStore.set(undefined);}});diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsxindex a1819433d1..5c92c946b5 100644--- a/packages/design-system/src/components/tree/tree-node.tsx+++ b/packages/design-system/src/components/tree/tree-node.tsx@@ -248,8 +248,7 @@ const useScrollIntoView = (};export type TreeItemRenderProps<Data extends { id: string }> = {- onMouseEnter?: (itemSelector: ItemSelector) => void;- onMouseLeave?: (itemSelector: ItemSelector) => void;+ onHover?: (itemSelector?: ItemSelector) => void;itemData: Data;itemSelector: ItemSelector;dropTargetItemSelector?: ItemSelector;@@ -268,8 +267,7 @@ export const TreeItemBody = <Data extends { id: string }>({parentIsSelected = false,isSelected = false,dropTargetItemSelector,- onMouseEnter,- onMouseLeave,+ onHover,itemData,itemSelector,level,@@ -332,8 +330,8 @@ export const TreeItemBody = <Data extends { id: string }>({return (<ItemContainer- onMouseEnter={onMouseEnter && (() => onMouseEnter(itemSelector))}- onMouseLeave={onMouseLeave && (() => onMouseLeave(itemSelector))}+ onMouseEnter={onHover && (() => onHover(itemSelector))}+ onMouseLeave={onHover && (() => onHover())}isSelected={isSelected}parentIsSelected={parentIsSelected}enableHoverState={isDragging === false}@@ -411,8 +409,7 @@ export type TreeNodeProps<Data extends { id: ItemId }> = {parentIsSelected?: boolean;onSelect?: (itemSelector: ItemSelector) => void;- onMouseEnter?: (itemSelector: ItemSelector) => void;- onMouseLeave?: (itemSelector: ItemSelector) => void;+ onHover?: (itemSelector?: ItemSelector) => void;animate?: boolean;@@ -432,8 +429,7 @@ export const TreeNode = <Data extends { id: string }>({setIsExpanded,selectedItemSelector,onSelect,- onMouseEnter,- onMouseLeave,+ onHover,onExpandTransitionEnd,dropTargetItemSelector,renderItem,@@ -489,8 +485,7 @@ export const TreeNode = <Data extends { id: string }>({{itemIsHidden === false &&renderItem({dropTargetItemSelector,- onMouseEnter,- onMouseLeave,+ onHover,itemData,itemSelector,parentIsSelected,diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsxindex dc8b98823f..18afbdbf4e 100644--- a/packages/design-system/src/components/tree/tree.tsx+++ b/packages/design-system/src/components/tree/tree.tsx@@ -295,8 +295,7 @@ export const Tree = <Data extends { id: string }>({isItemHidden={isItemHidden}animate={animate}onSelect={onSelect}- onMouseEnter={onHover}- onMouseLeave={onHover}+ onHover={onHover}selectedItemSelector={selectedItemSelector}itemData={root}getIsExpanded={getIsExpanded}