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.

fix: Stop scaling instance labels (#2325)

Oleg Isonen62cfcace4b93
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
index a2c7faf956..6fbd5ce3e5 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
@@ -14,6 +14,8 @@ import { Outline } from "./outline/outline";
import { useSubscribeDragAndDropState } from "./use-subscribe-drag-drop-state";
import { ResizeHandles } from "./resize-handles";
import { MediaBadge } from "./media-badge";
+import { applyScale } from "./outline";
+import { scaleStore } from "~/builder/shared/nano-states";
const containerStyle = css({
position: "absolute",
@@ -39,7 +41,7 @@ export const CanvasTools = ({ publish }: CanvasToolsProps) => {
const [isPreviewMode] = useIsPreviewMode();
const [dragAndDropState] = useDragAndDropState();
const instances = useStore(instancesStore);
-
+ const scale = useStore(scaleStore);
if (
dragAndDropState.isDragging &&
dragAndDropState.placementIndicator !== undefined
@@ -49,16 +51,15 @@ export const CanvasTools = ({ publish }: CanvasToolsProps) => {
dropTarget === undefined
? undefined
: instances.get(dropTarget.itemSelector[0]);
+ const rect = applyScale(placementIndicator.parentRect, scale);
+
return dropTargetInstance ? (
<div className={containerStyle({ overflow: "hidden" })}>
- <Outline rect={placementIndicator.parentRect}>
- <Label
- instance={dropTargetInstance}
- instanceRect={placementIndicator.parentRect}
- />
+ <Outline rect={rect}>
+ <Label instance={dropTargetInstance} instanceRect={rect} />
</Outline>
{placementIndicator !== undefined && (
- <PlacementIndicator placement={placementIndicator} />
+ <PlacementIndicator placement={placementIndicator} scale={scale} />
)}
</div>
) : null;
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/apply-scale.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/apply-scale.ts
new file mode 100644
index 0000000000..6f11188a16
--- /dev/null
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/apply-scale.ts
@@ -0,0 +1,12 @@
+import type { Rect } from "@webstudio-is/design-system";
+
+export const applyScale = (rect: Rect, scale: number = 1) => {
+ // Calculate in the "scale" that is applied to the canvas
+ const scaleFactor = scale / 100;
+ return {
+ top: rect.top * scaleFactor,
+ left: rect.left * scaleFactor,
+ width: rect.width * scaleFactor,
+ height: rect.height * scaleFactor,
+ };
+};
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 423ac29cfa..bab7e1ba1e 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
@@ -1,18 +1,21 @@
import { useStore } from "@nanostores/react";
import {
+ hoveredInstanceOutlineAndInstanceStore,
hoveredInstanceSelectorStore,
selectedInstanceSelectorStore,
textEditingInstanceSelectorStore,
- hoveredInstanceOutlineAndInstanceStore,
} from "~/shared/nano-states";
import { areInstanceSelectorsEqual } from "~/shared/tree-utils";
import { Outline } from "./outline";
import { Label } from "./label";
+import { applyScale } from "./apply-scale";
+import { scaleStore } from "~/builder/shared/nano-states";
export const HoveredInstanceOutline = () => {
const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);
const hoveredInstanceSelector = useStore(hoveredInstanceSelectorStore);
const outline = useStore(hoveredInstanceOutlineAndInstanceStore);
+ const scale = useStore(scaleStore);
const textEditingInstanceSelector = useStore(
textEditingInstanceSelectorStore
);
@@ -25,10 +28,10 @@ export const HoveredInstanceOutline = () => {
if (outline === undefined || isHoveringSelectedInstance || isEditingText) {
return null;
}
-
+ const rect = applyScale(outline.rect, scale);
return (
- <Outline rect={outline.rect}>
- <Label instance={outline.instance} instanceRect={outline.rect} />
+ <Outline rect={rect}>
+ <Label instance={outline.instance} instanceRect={rect} />
</Outline>
);
};
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
index 1cf83e8390..197c99fe6a 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
@@ -1,2 +1,3 @@
export { SelectedInstanceOutline } from "./selected-instance-outline";
export { HoveredInstanceOutline } from "./hovered-instance-outline";
+export { applyScale } from "./apply-scale";
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 27cf72beec..5fec7f6e01 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
@@ -28,6 +28,7 @@ const useLabelPosition = (
}
const labelRect = element.getBoundingClientRect();
let nextPosition: LabelPosition = "top";
+ // Label won't fit above the instance outline
if (labelRect.height > instanceRect.top) {
nextPosition = instanceRect.height < 250 ? "bottom" : "inside";
}
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 a73c60a4f6..46f009c8ed 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,31 +1,36 @@
import { useStore } from "@nanostores/react";
-import { selectedInstanceSelectorStore } from "~/shared/nano-states";
+import {
+ selectedInstanceOutlineAndInstanceStore,
+ selectedInstanceSelectorStore,
+} from "~/shared/nano-states";
import { textEditingInstanceSelectorStore } from "~/shared/nano-states";
-import { selectedInstanceOutlineAndInstanceStore } from "~/shared/nano-states";
import { areInstanceSelectorsEqual } from "~/shared/tree-utils";
import { Outline } from "./outline";
import { Label } from "./label";
+import { applyScale } from "./apply-scale";
+import { scaleStore } from "~/builder/shared/nano-states";
export const SelectedInstanceOutline = () => {
const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);
const textEditingInstanceSelector = useStore(
textEditingInstanceSelectorStore
);
+ const outline = useStore(selectedInstanceOutlineAndInstanceStore);
+ const scale = useStore(scaleStore);
const isEditingCurrentInstance =
textEditingInstanceSelector !== undefined &&
areInstanceSelectorsEqual(
textEditingInstanceSelector,
selectedInstanceSelector
);
- const outline = useStore(selectedInstanceOutlineAndInstanceStore);
if (isEditingCurrentInstance || outline === undefined) {
return null;
}
-
+ const rect = applyScale(outline.rect, scale);
return (
- <Outline rect={outline.rect}>
- <Label instance={outline.instance} instanceRect={outline.rect} />
+ <Outline rect={rect}>
+ <Label instance={outline.instance} instanceRect={rect} />
</Outline>
);
};
diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsx
index fa29e8c068..0fd8aee7ef 100644
--- a/apps/builder/app/builder/features/workspace/workspace.tsx
+++ b/apps/builder/app/builder/features/workspace/workspace.tsx
@@ -24,7 +24,7 @@ const workspaceStyle = css({
});
const canvasContainerStyle = css({
- position: "relative",
+ position: "absolute",
transformStyle: "preserve-3d",
transformOrigin: "0 0",
});
@@ -85,6 +85,18 @@ const useCanvasStyle = () => {
return getCanvasStyle(scale, workspaceRect, canvasWidth);
};
+const useOutlineStyle = () => {
+ const scale = useStore(scaleStore);
+ const workspaceRect = useStore(workspaceRectStore);
+ const [canvasWidth] = useCanvasWidth();
+ const style = getCanvasStyle(100, workspaceRect, canvasWidth);
+ return {
+ ...style,
+ pointerEvents: "none",
+ width: (canvasWidth ?? 0) * (scale / 100),
+ } as const;
+};
+
type WorkspaceProps = {
children: JSX.Element;
onTransitionEnd: () => void;
@@ -97,6 +109,7 @@ export const Workspace = ({
publish,
}: WorkspaceProps) => {
const canvasStyle = useCanvasStyle();
+ const outlineStyle = useOutlineStyle();
const workspaceRef = useMeasureWorkspace();
useSetCanvasWidth();
const handleWorkspaceClick = () => {
@@ -117,6 +130,8 @@ export const Workspace = ({
onTransitionEnd={onTransitionEnd}
>
{children}
+ </div>
+ <div className={canvasContainerStyle()} style={outlineStyle}>
<CanvasTools publish={publish} />
</div>
<Toaster />
diff --git a/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx b/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx
index 534a990fa0..2afe02f6d4 100644
--- a/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx
+++ b/packages/design-system/src/components/primitives/dnd/placement-indicator.tsx
@@ -1,22 +1,23 @@
import { Box } from "../../box";
-import { theme } from "../../../stitches.config";
+import { css, theme } from "../../../stitches.config";
import {
type ChildrenOrientation,
type Placement,
getPlacementBetween,
getPlacementInside,
getPlacementNextTo,
+ type Rect,
} from "./geometry-utils";
import { defaultGetValidChildren, type DropTarget } from "./use-drop";
-const placementStyle = {
+const placementStyle = css({
boxSizing: "content-box",
position: "absolute",
background: theme.colors.blue10,
pointerEvents: "none",
-};
+});
-const getStyle = (placement: Placement) => {
+const getRect = (placement: Placement) => {
if (placement.direction === "horizontal") {
return {
top: placement.y - 1,
@@ -33,12 +34,29 @@ const getStyle = (placement: Placement) => {
};
};
-export const PlacementIndicator = ({ placement }: { placement: Placement }) => {
+const applyScale = (rect: Rect, scale: number) => {
+ // Calculate in the "scale" that is applied to the canvas
+ const scaleFactor = scale / 100;
+ return {
+ top: rect.top * scaleFactor,
+ left: rect.left * scaleFactor,
+ width: rect.width * scaleFactor,
+ height: rect.height,
+ };
+};
+
+export const PlacementIndicator = ({
+ placement,
+ scale = 1,
+}: {
+ placement: Placement;
+ scale?: number;
+}) => {
return (
<Box
data-placement-indicator
- style={getStyle(placement)}
- css={placementStyle}
+ style={applyScale(getRect(placement), scale)}
+ className={placementStyle()}
/>
);
};