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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Hide outline when preview styles (#663)
Bogdan Chadkin7e19e4f7dc8d
diff --git a/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts b/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.tsindex 1fb729c043..04034e2278 100644--- a/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts+++ b/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts@@ -1,13 +1,43 @@-import { useCallback, useEffect } from "react";+import { useEffect } from "react";import type { Instance, InstanceProps } from "@webstudio-is/react-sdk";import { getBrowserStyle } from "@webstudio-is/react-sdk";-import { publish, subscribeAll } from "~/shared/pubsub";-import { useScrollState } from "~/shared/dom-hooks";+import { publish, subscribe, subscribeAll } from "~/shared/pubsub";+import { subscribeScrollState } from "~/shared/dom-hooks";-const publishSelectedRect = (element: HTMLElement) => {+declare module "~/shared/pubsub" {+ export interface PubsubMap {+ updateSelectedInstanceOutline: {+ visible?: boolean;+ rect?: DOMRect;+ };+ }+}++const updateOutlineRect = (element: HTMLElement) => {+ publish({+ type: "updateSelectedInstanceOutline",+ payload: {+ rect: element.getBoundingClientRect(),+ },+ });+};++const showOutline = (element: HTMLElement) => {publish({- type: "selectedInstanceRect",- payload: element.getBoundingClientRect(),+ type: "updateSelectedInstanceOutline",+ payload: {+ visible: true,+ rect: element.getBoundingClientRect(),+ },+ });+};++const hideOutline = () => {+ publish({+ type: "updateSelectedInstanceOutline",+ payload: {+ visible: false,+ },});};@@ -28,7 +58,7 @@ export const SelectedInstanceConnector = ({// effect close to rendered element also catches dnd remounts// so actual state is always provided here- publishSelectedRect(element);+ showOutline(element);// ResizeObserver does not work for inline elementsconst canObserve = getComputedStyle(element).display !== "inline";@@ -36,14 +66,14 @@ export const SelectedInstanceConnector = ({const resizeObserver = new ResizeObserver(() => {// contentRect has wrong x/y values for absolutely positioned element.// getBoundingClientRect is used instead.- publishSelectedRect(element);+ updateOutlineRect(element);});resizeObserver.observe(element);// detect movement of the element within same parent// React prevent remount when key stays the sameconst mutationObserver = new window.MutationObserver(() => {- publishSelectedRect(element);+ updateOutlineRect(element);});const parent = element?.parentElement;if (parent) {@@ -59,15 +89,29 @@ export const SelectedInstanceConnector = ({type === "deleteProp" ||type === "insertInstance" ||type === "deleteInstance" ||- type === "reparentInstance" ||- type === "updateStyle" ||- type.startsWith("previewStyle:")+ type === "reparentInstance") {- publishSelectedRect(element);+ updateOutlineRect(element);}});}+ // hide rect when preview style is send+ // new rect will be send when new styles+ // will be written to instance css rules+ const unsubscribePreviewStyle = subscribe("previewStyle", () => {+ hideOutline();+ });++ const unsubscribeScrollState = subscribeScrollState({+ onScrollStart() {+ hideOutline();+ },+ onScrollEnd() {+ showOutline(element);+ },+ });+// trigger style recomputing every time instance styles are changedpublish({type: "selectInstance",@@ -84,22 +128,12 @@ export const SelectedInstanceConnector = ({resizeObserver.disconnect();mutationObserver.disconnect();unsubscribeTreeChange?.();+ unsubscribePreviewStyle();+ unsubscribeScrollState();};// instance props may change dom element}, [instanceElementRef, instance, instanceProps]);- const onScrollEnd = useCallback(() => {- const element = instanceElementRef.current;- if (element === undefined) {- return;- }- publishSelectedRect(element);- }, [instanceElementRef]);-- useScrollState({- onScrollEnd,- });-return null;};diff --git a/apps/designer/app/canvas/shared/instance.ts b/apps/designer/app/canvas/shared/instance.tsindex 5a86321089..dfa1da8da7 100644--- a/apps/designer/app/canvas/shared/instance.ts+++ b/apps/designer/app/canvas/shared/instance.ts@@ -28,7 +28,6 @@ declare module "~/shared/pubsub" {hoveredInstanceRect: DOMRect;hoverInstance?: HoveredInstanceData;loadRootInstance?: Instance;- selectedInstanceRect: DOMRect;selectInstance?: SelectedInstanceData;textEditingInstanceId?: Instance["id"];insertInstance: {diff --git a/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.ts b/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.tsindex 874e0dedea..ec5923370c 100644--- a/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.ts+++ b/apps/designer/app/designer/features/workspace/canvas-tools/hooks/use-subscribe-instance-rect.ts@@ -1,12 +1,15 @@import { useSubscribe } from "~/shared/pubsub";import {- useSelectedInstanceRect,+ useSelectedInstanceOutline,useHoveredInstanceRect,} from "~/shared/nano-states";export const useSubscribeInstanceRect = () => {- const [, setSelectedRect] = useSelectedInstanceRect();- useSubscribe("selectedInstanceRect", setSelectedRect);+ const [selectedInstanceOutline, setSelectedInstanceOutline] =+ useSelectedInstanceOutline();+ useSubscribe("updateSelectedInstanceOutline", (value) => {+ setSelectedInstanceOutline({ ...selectedInstanceOutline, ...value });+ });const [, setHoveredRect] = useHoveredInstanceRect();useSubscribe("hoveredInstanceRect", setHoveredRect);};diff --git a/apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsxindex 4c7891f9dc..96e37db636 100644--- a/apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsx+++ b/apps/designer/app/designer/features/workspace/canvas-tools/outline/selected-instance-outline.tsx@@ -1,5 +1,5 @@import {- useSelectedInstanceRect,+ useSelectedInstanceOutline,useTextEditingInstanceId,} from "~/shared/nano-states";import { useSelectedInstanceData } from "~/designer/shared/nano-states";@@ -7,7 +7,7 @@ import { Outline } from "./outline";import { Label } from "./label";export const SelectedInstanceOutline = () => {- const [instanceRect] = useSelectedInstanceRect();+ const [{ rect, visible }] = useSelectedInstanceOutline();const [instanceData] = useSelectedInstanceData();const [textEditingInstanceId] = useTextEditingInstanceId();@@ -17,15 +17,16 @@ export const SelectedInstanceOutline = () => {if (instanceData === undefined ||- instanceRect === undefined ||- isEditingCurrentInstance+ isEditingCurrentInstance ||+ visible === false ||+ rect === undefined) {return null;}return (- <Outline rect={instanceRect}>- <Label component={instanceData.component} instanceRect={instanceRect} />+ <Outline rect={rect}>+ <Label component={instanceData.component} instanceRect={rect} /></Outline>);};diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.tsindex e2b28ee744..15bb9d797e 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/designer/app/shared/nano-states/nano-states.ts@@ -18,11 +18,15 @@ export const useBreakpoints = () => useValue(breakpointsContainer);const isPreviewModeContainer = createValueContainer<boolean>(false);export const useIsPreviewMode = () => useValue(isPreviewModeContainer);-const selectedInstanceRectContainer = createValueContainer<- DOMRect | undefined->();-export const useSelectedInstanceRect = () =>- useValue(selectedInstanceRectContainer);+const selectedInstanceOutlineContainer = createValueContainer<{+ visible: boolean;+ rect?: DOMRect;+}>({+ visible: false,+ rect: undefined,+});+export const useSelectedInstanceOutline = () =>+ useValue(selectedInstanceOutlineContainer);const hoveredInstanceRectContainer = createValueContainer<DOMRect | undefined