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.

feat: Highlight navigator item when canvas instance is hovered (#3999)

Oleg Isonen625c9df31cd8
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index 9083922f2f..e98e0e040f 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -25,6 +25,7 @@ import { InstanceTree } from "./tree";
export const NavigatorTree = () => {
const selectedInstanceSelector = useStore($selectedInstanceSelector);
+ const hoveredInstanceSelector = useStore($hoveredInstanceSelector);
const rootInstance = useStore($rootInstance);
const instances = useStore($instances);
const metas = useStore($registeredComponentMetas);
@@ -124,6 +125,7 @@ export const NavigatorTree = () => {
<InstanceTree
root={rootInstance}
selectedItemSelector={selectedInstanceSelector}
+ highlightedItemSelector={hoveredInstanceSelector}
dragItemSelector={dragItemSelector}
dropTarget={state.dropTarget}
isItemHidden={isItemHidden}
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index d9d96ab667..c19d55457c 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -205,6 +205,9 @@ const ItemContainer = styled(Flex, {
bc: theme.colors.backgroundItemCurrent,
},
},
+ isHighlighted: {
+ true: { "&:after": hoverStyle },
+ },
parentIsSelected: {
true: {
bc: theme.colors.backgroundItemCurrentChild,
@@ -272,6 +275,7 @@ export type TreeItemRenderProps<Data extends { id: string }> = {
dropTargetItemSelector?: ItemSelector;
parentIsSelected?: boolean;
isSelected?: boolean;
+ isHighlighted?: boolean;
onSelect?: (itemSelector: ItemSelector, all?: boolean) => void;
level: number;
isAlwaysExpanded: boolean;
@@ -285,6 +289,7 @@ export const TreeItemBody = <Data extends { id: string }>({
onSelect,
parentIsSelected = false,
isSelected = false,
+ isHighlighted = false,
dropTargetItemSelector,
onHover,
itemData,
@@ -382,6 +387,7 @@ export const TreeItemBody = <Data extends { id: string }>({
onMouseEnter={onHover && (() => onHover(itemSelector))}
onMouseLeave={onHover && (() => onHover())}
isSelected={isSelected}
+ isHighlighted={isHighlighted}
parentIsSelected={parentIsSelected}
enableHoverState={isDragging === false}
forceHoverState={
@@ -390,9 +396,7 @@ export const TreeItemBody = <Data extends { id: string }>({
suffixVisible={alwaysShowSuffix || focusTarget !== undefined}
onFocus={updateFocusTarget}
onBlur={updateFocusTarget}
- css={{
- [suffixWidthVar]: suffixWidth,
- }}
+ css={{ [suffixWidthVar]: suffixWidth }}
>
<ItemButton
type="button"
@@ -483,6 +487,7 @@ export type TreeNodeProps<Data extends { id: ItemId }> = {
) => void;
selectedItemSelector?: ItemSelector;
+ highlightedItemSelector?: ItemSelector;
dropTargetItemSelector?: ItemSelector;
parentSelector?: ItemSelector;
@@ -504,6 +509,7 @@ export const TreeNode = <Data extends { id: string }>({
getIsExpanded,
setIsExpanded,
selectedItemSelector,
+ highlightedItemSelector,
onSelect,
onHover,
dropTargetItemSelector,
@@ -524,7 +530,10 @@ export const TreeNode = <Data extends { id: string }>({
const isExpandable = itemChildren.length > 0;
const isExpanded = getIsExpanded(itemSelector) || isAlwaysExpanded;
const isSelected = areItemSelectorsEqual(itemSelector, selectedItemSelector);
-
+ const isHighlighted = areItemSelectorsEqual(
+ itemSelector,
+ highlightedItemSelector
+ );
const shouldRenderExpandButton = isExpandable && isAlwaysExpanded === false;
return (
@@ -541,6 +550,7 @@ export const TreeNode = <Data extends { id: string }>({
itemSelector,
parentIsSelected,
isSelected,
+ isHighlighted,
onSelect,
level,
isAlwaysExpanded,
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index 90728e2a2b..863e90d2fa 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -33,6 +33,7 @@ import { theme } from "../..";
export type TreeProps<Data extends { id: string }> = {
root: Data;
selectedItemSelector: undefined | ItemSelector;
+ highlightedItemSelector?: ItemSelector;
dragItemSelector: undefined | ItemSelector;
dropTarget: undefined | ItemDropTarget;
@@ -71,6 +72,7 @@ const sharedDropOptions = {
export const Tree = <Data extends { id: string }>({
root,
selectedItemSelector,
+ highlightedItemSelector,
dragItemSelector,
dropTarget,
canLeaveParent,
@@ -313,6 +315,7 @@ export const Tree = <Data extends { id: string }>({
onSelect={onSelect}
onHover={onHover}
selectedItemSelector={selectedItemSelector}
+ highlightedItemSelector={highlightedItemSelector}
itemData={root}
getIsExpanded={getIsExpanded}
setIsExpanded={(itemSelector, value, all) => {