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.

chore: Highlight slot and it's children in the navigator and on canvas with purple color (#3193)

Oleg Isonen3512b0e77bdc
diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/builder/features/project-settings/project-settings.tsx
index 7bee219d42..538ff7e680 100644
--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx
+++ b/apps/builder/app/builder/features/project-settings/project-settings.tsx
@@ -80,7 +80,7 @@ export const ProjectSettingsView = ({
"&:hover": focusOutline,
"&[aria-current=true]": {
background: theme.colors.backgroundItemCurrent,
- color: theme.colors.foregroundContrastMain,
+ color: theme.colors.foregroundMain,
},
}}
align="center"
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
index 8328ee0e32..6d7ae84dc5 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
@@ -2,6 +2,7 @@ import { useStore } from "@nanostores/react";
import {
$hoveredInstanceOutlineAndInstance,
$hoveredInstanceSelector,
+ $instances,
$selectedInstanceSelector,
$textEditingInstanceSelector,
} from "~/shared/nano-states";
@@ -10,8 +11,10 @@ import { Outline } from "./outline";
import { Label } from "./label";
import { applyScale } from "./apply-scale";
import { $scale } from "~/builder/shared/nano-states";
+import { findClosestSlot } from "~/shared/instance-utils";
export const HoveredInstanceOutline = () => {
+ const instances = useStore($instances);
const selectedInstanceSelector = useStore($selectedInstanceSelector);
const hoveredInstanceSelector = useStore($hoveredInstanceSelector);
const outline = useStore($hoveredInstanceOutlineAndInstance);
@@ -23,16 +26,27 @@ export const HoveredInstanceOutline = () => {
hoveredInstanceSelector
);
- if (outline === undefined || isHoveringSelectedInstance || isEditingText) {
- return null;
+ if (
+ outline === undefined ||
+ isHoveringSelectedInstance ||
+ isEditingText ||
+ hoveredInstanceSelector === undefined
+ ) {
+ return;
}
+
+ const variant = findClosestSlot(instances, hoveredInstanceSelector)
+ ? "slot"
+ : "default";
const rect = applyScale(outline.rect, scale);
+
return (
- <Outline
- rect={rect}
- variant={outline.instance.component === "Slot" ? "component" : "default"}
- >
- <Label instance={outline.instance} instanceRect={rect} />
+ <Outline rect={rect} variant={variant}>
+ <Label
+ variant={variant}
+ instance={outline.instance}
+ instanceRect={rect}
+ />
</Outline>
);
};
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx
index 98b43944f1..fdf72187d7 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx
@@ -72,10 +72,10 @@ const LabelContainer = styled(
},
variant: {
default: {
- backgroundColor: theme.colors.backgroundItemCurrent,
+ backgroundColor: theme.colors.backgroundPrimary,
},
- component: {
- backgroundColor: theme.colors.backgroundSuccessMain,
+ slot: {
+ backgroundColor: theme.colors.foregroundReusable,
},
},
},
@@ -86,21 +86,20 @@ const LabelContainer = styled(
type LabelProps = {
instance: { label?: string; component: Instance["component"] };
instanceRect: Rect;
+ variant?: "default" | "slot";
};
-export const Label = ({ instance, instanceRect }: LabelProps) => {
+export const Label = ({ instance, instanceRect, variant }: LabelProps) => {
const [labelRef, position] = useLabelPosition(instanceRect);
const metas = useStore($registeredComponentMetas);
const meta = metas.get(instance.component);
+
if (meta === undefined) {
return <></>;
}
+
return (
- <LabelContainer
- position={position}
- variant={instance.component === "Slot" ? "component" : "default"}
- ref={labelRef}
- >
+ <LabelContainer position={position} variant={variant} ref={labelRef}>
<MetaIcon size="1em" icon={meta.icon} />
{getInstanceLabel(instance, meta)}
</LabelContainer>
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx
index c7f40231d6..f48a1da291 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx
@@ -27,10 +27,11 @@ const baseStyle = css({
pointerEvents: "none",
top: 0,
left: 0,
+ borderWidth: 1,
variants: {
variant: {
default: {
- outline: `1px solid ${theme.colors.backgroundItemCurrent}`,
+ outline: `1px solid ${theme.colors.backgroundPrimary}`,
outlineOffset: -1,
},
collaboration: {
@@ -39,8 +40,8 @@ const baseStyle = css({
borderImage: `conic-gradient(from var(${angleVar}), #39FBBB 0%, #4A4EFA 12.5%, #E63CFE 25%, #FFAE3C 37.5%, #39FBBB 50%, #4A4EFA 62.5%, #E63CFE 75%, #FFAE3C 87.5%) 1`,
animation: `2s ${angleKeyframes} linear infinite`,
},
- component: {
- outline: `1px solid ${theme.colors.backgroundSuccessMain}`,
+ slot: {
+ outline: `1px solid ${theme.colors.foregroundReusable}`,
outlineOffset: -1,
},
},
@@ -64,7 +65,7 @@ const useDynamicStyle = (rect?: Rect) => {
type OutlineProps = {
children?: JSX.Element;
rect?: Rect;
- variant?: "default" | "collaboration" | "component";
+ variant?: "default" | "collaboration" | "slot";
};
export const Outline = ({ children, rect, variant }: OutlineProps) => {
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
index 3c29f24136..0fb3f099e4 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
@@ -1,5 +1,6 @@
import { useStore } from "@nanostores/react";
import {
+ $instances,
$selectedInstanceOutlineAndInstance,
$selectedInstanceSelector,
} from "~/shared/nano-states";
@@ -9,8 +10,10 @@ import { Outline } from "./outline";
import { Label } from "./label";
import { applyScale } from "./apply-scale";
import { $scale } from "~/builder/shared/nano-states";
+import { findClosestSlot } from "~/shared/instance-utils";
export const SelectedInstanceOutline = () => {
+ const instances = useStore($instances);
const selectedInstanceSelector = useStore($selectedInstanceSelector);
const textEditingInstanceSelector = useStore($textEditingInstanceSelector);
const outline = useStore($selectedInstanceOutlineAndInstance);
@@ -22,16 +25,26 @@ export const SelectedInstanceOutline = () => {
selectedInstanceSelector
);
- if (isEditingCurrentInstance || outline === undefined) {
- return null;
+ if (
+ isEditingCurrentInstance ||
+ outline === undefined ||
+ selectedInstanceSelector === undefined
+ ) {
+ return;
}
+
+ const variant = findClosestSlot(instances, selectedInstanceSelector)
+ ? "slot"
+ : "default";
const rect = applyScale(outline.rect, scale);
+
return (
- <Outline
- rect={rect}
- variant={outline.instance.component === "Slot" ? "component" : "default"}
- >
- <Label instance={outline.instance} instanceRect={rect} />
+ <Outline rect={rect} variant={variant}>
+ <Label
+ variant={variant}
+ instance={outline.instance}
+ instanceRect={rect}
+ />
</Outline>
);
};
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index e9b25280ed..8416994804 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -127,7 +127,7 @@ export const NavigatorTree = () => {
}, []);
if (rootInstance === undefined) {
- return null;
+ return;
}
return (
diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsx
index 5b2825e67b..332f9058d5 100644
--- a/apps/builder/app/builder/shared/tree/index.tsx
+++ b/apps/builder/app/builder/shared/tree/index.tsx
@@ -8,6 +8,8 @@ import {
type TreeItemRenderProps,
styled,
theme,
+ getNodeVars,
+ rawTheme,
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/sdk";
import { collectionComponent } from "@webstudio-is/react-sdk";
@@ -149,6 +151,13 @@ export const InstanceTree = (
{...props}
canLeaveParent={canLeaveParent}
getItemChildren={getItemChildren}
+ getItemProps={(itemData) => {
+ if (itemData.component === "Slot") {
+ return {
+ style: getNodeVars({ color: rawTheme.colors.foregroundReusable }),
+ };
+ }
+ }}
renderItem={renderItem}
editingItemId={editingItemSelector?.[0]}
/>
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index 27bfac6be4..13d30fcf86 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -1486,3 +1486,15 @@ export const insertWebstudioFragmentCopy = ({
return newDataIds;
};
+
+export const findClosestSlot = (
+ instances: Instances,
+ instanceSelector: InstanceSelector
+) => {
+ for (const instanceId of instanceSelector) {
+ const instance = instances.get(instanceId);
+ if (instance?.component === "Slot") {
+ return instance;
+ }
+ }
+};
diff --git a/packages/design-system/src/__generated__/figma-design-tokens.json b/packages/design-system/src/__generated__/figma-design-tokens.json
index cecd554605..1e112e2d31 100644
--- a/packages/design-system/src/__generated__/figma-design-tokens.json
+++ b/packages/design-system/src/__generated__/figma-design-tokens.json
@@ -560,12 +560,12 @@
},
"item": {
"current": {
- "value": "#096cff",
+ "value": "#e1f0ff",
"type": "color",
"description": "color for current item in the navigator item, menu item, pages panel item components"
},
"current-child": {
- "value": "#e1f0ff",
+ "value": "{background.panel}",
"type": "color",
"description": "color for child of current item in the navigator item, pages panel item components"
},
@@ -611,7 +611,7 @@
},
"style-source": {
"token": {
- "value": "#834df4",
+ "value": "{foreground.reusable}",
"type": "color",
"description": "Style sources that are tokens"
},
@@ -1093,6 +1093,10 @@
"value": "#ff22ae",
"type": "color",
"description": "The inverse color of our primary blue, when we want a contrasting highlight."
+ },
+ "reusable": {
+ "value": "#834df4",
+ "type": "color"
}
},
"Brand": {
@@ -1489,6 +1493,8 @@
},
"$themes": [],
"$metadata": {
- "tokenSetOrder": ["global"]
+ "tokenSetOrder": [
+ "global"
+ ]
}
-}
+}
\ No newline at end of file
diff --git a/packages/design-system/src/__generated__/figma-design-tokens.ts b/packages/design-system/src/__generated__/figma-design-tokens.ts
index b0727c97b0..600ecac25a 100644
--- a/packages/design-system/src/__generated__/figma-design-tokens.ts
+++ b/packages/design-system/src/__generated__/figma-design-tokens.ts
@@ -416,8 +416,8 @@ export const color = {
backgroundButtonPressed: "#0000001c",
backgroundButtonDisabled: "#e9ebed",
backgroundButtonDisabledDark: "#646464",
- backgroundItemCurrent: "#096cff",
- backgroundItemCurrentChild: "#e1f0ff",
+ backgroundItemCurrent: "#e1f0ff",
+ backgroundItemCurrentChild: "#f8f8f8",
backgroundItemCurrentHidden: "#7e868c",
backgroundItemMenuItemHover: "#d3d3d3",
backgroundTooltipMain: "#11181c",
@@ -532,6 +532,7 @@ export const color = {
foregroundOverwrittenMain: "#bf0007",
foregroundOverwrittenFlexUi: "#dc3d43",
foregroundInversePrimary: "#ff22ae",
+ foregroundReusable: "#834df4",
maintenanceLight: "#ededed",
maintenanceMedium: "#c7c7c7",
maintenanceDark: "#858585",
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index c69f861751..c82acdcbd0 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -6,6 +6,7 @@ import {
forwardRef,
type ForwardRefRenderFunction,
type MouseEvent,
+ type ComponentProps,
} from "react";
import {
ChevronFilledDownIcon,
@@ -172,8 +173,14 @@ const hoverStyle: CSS = {
boxSizing: "border-box",
};
+const itemContainerColor: string = "--ws-tree-node-item-container-color";
+
+export const getNodeVars = ({ color }: { color: string }) => ({
+ [itemContainerColor]: color,
+});
+
const ItemContainer = styled(Flex, {
- color: theme.colors.foregroundMain,
+ color: `var(${itemContainerColor}, ${theme.colors.foregroundMain})`,
alignItems: "center",
position: "relative",
...getItemButtonCssVars({ suffixVisible: false }),
@@ -182,7 +189,6 @@ const ItemContainer = styled(Flex, {
variants: {
isSelected: {
true: {
- color: theme.colors.foregroundContrastMain,
bc: theme.colors.backgroundItemCurrent,
},
},
@@ -346,7 +352,9 @@ export const TreeItemBody = <Data extends { id: string }>({
suffixVisible={alwaysShowSuffix || focusTarget !== undefined}
onFocus={updateFocusTarget}
onBlur={updateFocusTarget}
- css={{ [suffixWidthVar]: suffixWidth }}
+ css={{
+ [suffixWidthVar]: suffixWidth,
+ }}
>
<ItemButton
type="button"
@@ -416,6 +424,7 @@ export const TreeItemLabel = forwardRef(TreeItemLabelBase);
export type TreeNodeProps<Data extends { id: ItemId }> = {
itemData: Data;
getItemChildren: (itemSelector: ItemSelector) => Data[];
+ getItemProps?: (itemData: Data) => ComponentProps<"div"> | undefined;
isItemHidden: (itemSelector: ItemSelector) => boolean;
renderItem: (props: TreeItemRenderProps<Data>) => React.ReactNode;
@@ -453,6 +462,7 @@ export const TreeNode = <Data extends { id: string }>({
dropTargetItemSelector,
renderItem,
getItemChildren,
+ getItemProps,
isItemHidden,
} = commonProps;
@@ -471,7 +481,7 @@ export const TreeNode = <Data extends { id: string }>({
const shouldRenderExpandButton = isExpandable && isAlwaysExpanded === false;
return (
- <div data-drop-target-id={itemData.id}>
+ <div data-drop-target-id={itemData.id} {...getItemProps?.(itemData)}>
{/* optionally prevent rendering root item */}
{itemIsHidden === false &&
renderItem({
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index efa5f0461e..958187a0aa 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -7,6 +7,7 @@ import {
INDENT,
type TreeItemRenderProps,
showNestingLineVars,
+ type TreeNodeProps,
} from "./tree-node";
import {
useHold,
@@ -38,6 +39,7 @@ export type TreeProps<Data extends { id: string }> = {
canLeaveParent: (itemSelector: ItemSelector) => boolean;
findClosestDroppableIndex: (itemSelector: ItemSelector) => number;
getItemChildren: (itemSelector: ItemSelector) => Data[];
+ getItemProps?: TreeNodeProps<Data>["getItemProps"];
isItemHidden: (itemSelector: ItemSelector) => boolean;
renderItem: (props: TreeItemRenderProps<Data>) => React.ReactNode;
@@ -74,6 +76,7 @@ export const Tree = <Data extends { id: string }>({
canLeaveParent,
findClosestDroppableIndex,
getItemChildren,
+ getItemProps,
isItemHidden,
renderItem,
onSelect,
@@ -302,6 +305,7 @@ export const Tree = <Data extends { id: string }>({
<TreeNode
renderItem={renderItem}
getItemChildren={getItemChildren}
+ getItemProps={getItemProps}
isItemHidden={isItemHidden}
onSelect={onSelect}
onHover={onHover}