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: Use a green outline color for Slot instances (#3153)

Oleg Isonen6d259dd8516f
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 8767d96fb4..8328ee0e32 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
@@ -28,7 +28,10 @@ export const HoveredInstanceOutline = () => {
}
const rect = applyScale(outline.rect, scale);
return (
- <Outline rect={rect}>
+ <Outline
+ rect={rect}
+ variant={outline.instance.component === "Slot" ? "component" : "default"}
+ >
<Label 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 f3e917a6ca..d9f10b56b1 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
@@ -56,7 +56,6 @@ const LabelContainer = styled(
lineHeight: 1,
minWidth: theme.spacing[13],
whiteSpace: "nowrap",
- backgroundColor: theme.colors.blue9,
},
{
variants: {
@@ -71,7 +70,16 @@ const LabelContainer = styled(
bottom: `-${theme.spacing[10]}`,
},
},
+ variant: {
+ default: {
+ backgroundColor: theme.colors.backgroundInfoMain,
+ },
+ component: {
+ backgroundColor: theme.colors.backgroundSuccessMain,
+ },
+ },
},
+ defaultVariants: { variant: "default" },
}
);
@@ -88,7 +96,11 @@ export const Label = ({ instance, instanceRect }: LabelProps) => {
return <></>;
}
return (
- <LabelContainer position={position} ref={labelRef}>
+ <LabelContainer
+ position={position}
+ variant={instance.component === "Slot" ? "component" : "default"}
+ 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 4498712a87..a6337652ac 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
@@ -25,21 +25,27 @@ const baseStyle = css({
boxSizing: "border-box",
position: "absolute",
pointerEvents: "none",
- outline: `1px solid ${theme.colors.blue9}`,
- outlineOffset: -1,
top: 0,
left: 0,
variants: {
variant: {
+ default: {
+ outline: `1px solid ${theme.colors.backgroundInfoMain}`,
+ outlineOffset: -1,
+ },
collaboration: {
- outline: "none",
[angleVar]: `0deg`,
border: `1px solid`,
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}`,
+ outlineOffset: -1,
+ },
},
},
+ defaultVariants: { variant: "default" },
});
const useDynamicStyle = (rect?: Rect) => {
@@ -58,7 +64,7 @@ const useDynamicStyle = (rect?: Rect) => {
type OutlineProps = {
children?: JSX.Element;
rect?: Rect;
- variant?: "collaboration";
+ variant?: "default" | "collaboration" | "component";
};
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 f3b6c8caf0..3c29f24136 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
@@ -27,7 +27,10 @@ export const SelectedInstanceOutline = () => {
}
const rect = applyScale(outline.rect, scale);
return (
- <Outline rect={rect}>
+ <Outline
+ rect={rect}
+ variant={outline.instance.component === "Slot" ? "component" : "default"}
+ >
<Label instance={outline.instance} instanceRect={rect} />
</Outline>
);