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: Hide the label of the instance when mouse is not hovering it (#4046)

Oleg Isonen2ab94fd9f408
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 6d7ae84dc5..3f82235203 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
@@ -3,10 +3,8 @@ import {
$hoveredInstanceOutlineAndInstance,
$hoveredInstanceSelector,
$instances,
- $selectedInstanceSelector,
$textEditingInstanceSelector,
} from "~/shared/nano-states";
-import { areInstanceSelectorsEqual } from "~/shared/tree-utils";
import { Outline } from "./outline";
import { Label } from "./label";
import { applyScale } from "./apply-scale";
@@ -15,20 +13,14 @@ 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);
const scale = useStore($scale);
const textEditingInstanceSelector = useStore($textEditingInstanceSelector);
const isEditingText = textEditingInstanceSelector !== undefined;
- const isHoveringSelectedInstance = areInstanceSelectorsEqual(
- selectedInstanceSelector,
- hoveredInstanceSelector
- );
if (
outline === undefined ||
- isHoveringSelectedInstance ||
isEditingText ||
hoveredInstanceSelector === undefined
) {
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 f48a1da291..fd8dc94733 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
@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo, type ReactNode } from "react";
import { css, keyframes, type Rect } from "@webstudio-is/design-system";
import { theme } from "@webstudio-is/design-system";
@@ -63,7 +63,7 @@ const useDynamicStyle = (rect?: Rect) => {
};
type OutlineProps = {
- children?: JSX.Element;
+ children?: ReactNode;
rect?: Rect;
variant?: "default" | "collaboration" | "slot";
};
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 68aa6c79ed..81312834fa 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
@@ -7,7 +7,6 @@ import {
import { $textEditingInstanceSelector } from "~/shared/nano-states";
import { areInstanceSelectorsEqual } from "~/shared/tree-utils";
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";
@@ -20,6 +19,7 @@ export const SelectedInstanceOutline = () => {
const outline = useStore($selectedInstanceOutlineAndInstance);
const scale = useStore($scale);
const ephemeralStyles = useStore($ephemeralStyles);
+
const isEditingCurrentInstance =
textEditingInstanceSelector !== undefined &&
areInstanceSelectorsEqual(
@@ -41,13 +41,5 @@ export const SelectedInstanceOutline = () => {
: "default";
const rect = applyScale(outline.rect, scale);
- return (
- <Outline rect={rect} variant={variant}>
- <Label
- variant={variant}
- instance={outline.instance}
- instanceRect={rect}
- />
- </Outline>
- );
+ return <Outline rect={rect} variant={variant} />;
};