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
fix: Incorrect style calculations (#3929)
Ivan Starkov9d6773f38283
diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.test.tsindex 3701ff33c4..b86547967d 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts@@ -1,4 +1,4 @@-import { test, expect, describe } from "@jest/globals";+import { test, expect, describe, jest } from "@jest/globals";import { act, renderHook } from "@testing-library/react-hooks";import * as defaultMetas from "@webstudio-is/sdk-components-react/metas";import {@@ -15,7 +15,6 @@ import {$breakpoints,$instances,$registeredComponentMetas,- $selectedInstanceIntanceToTag,$selectedInstanceSelector,$selectedStyleSources,$styleSourceSelections,@@ -34,7 +33,16 @@ import {useStyleInfo,} from "./style-info";-const { getPriorityStyleSource } = __testing__;+jest.unstable_mockModule("~/shared/canvas-api", () => ({+ isInitialized: () => {+ throw new Error("Not implemented");+ },+ getElementAndAncestorInstanceTags: () => {+ throw new Error("Not implemented");+ },+}));++const { getPriorityStyleSource, setInstanceToTag } = __testing__;const toMap = <T extends { id: string }>(list: T[]) =>new Map(list.map((item) => [item.id, item]));@@ -405,7 +413,7 @@ const resetStores = () => {$styleSourceSelections.set(new Map());$breakpoints.set(new Map());$selectedInstanceSelector.set(undefined);- $selectedInstanceIntanceToTag.set(new Map());+ setInstanceToTag(new Map());$selectedStyleSources.set(new Map());$selectedInstanceStates.set(new Set());};@@ -935,12 +943,14 @@ describe("active states", () => {],]));+$selectedInstanceSelector.set(["box"]);$selectedInstanceStates.set(new Set([":hover"]));$selectedStyleSources.set(new Map([["box", "box.local"]]));- $selectedInstanceIntanceToTag.set(new Map([["box", "div"]]));+ setInstanceToTag(new Map([["box", "div"]]));const { result } = renderHook(() => useStyleInfo());+expect(getStyleSource(result.current.color)).toEqual("preset");expect(result.current.color?.value).toEqual({type: "keyword",diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.tsindex e4358c7b27..a3aa8aa876 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.ts@@ -21,7 +21,6 @@ import {type StyleSourceSelector,$instances,$selectedInstanceSelector,- $selectedInstanceIntanceToTag,$stylesIndex,$selectedOrLastStyleSourceSelector,$breakpoints,@@ -32,6 +31,9 @@ import {import { $selectedBreakpoint } from "~/shared/nano-states";import type { InstanceSelector } from "~/shared/tree-utils";import type { WsComponentMeta } from "@webstudio-is/react-sdk";+import { canvasApi } from "~/shared/canvas-api";+import { computed } from "nanostores";+import { $loadingState } from "~/builder/shared/nano-states";type CascadedValueInfo = {breakpointId: string;@@ -334,6 +336,7 @@ export const getInheritedInfo = (];const tagName = selectedInstanceIntanceToTag.get(instanceId);+const component = getInstanceComponent(instances, instanceId);const presetStyle =tagName !== undefined && component !== undefined@@ -490,6 +493,28 @@ export const getNextSourceInfo = (return nextSourceStyle;};+const $instanceToTag = computed(+ [$selectedInstanceSelector, $loadingState],+ (instanceSelector, loadingState) => {+ if (__testing__.instanceToTag !== undefined) {+ return __testing__.instanceToTag;+ }++ if (instanceSelector === undefined) {+ return;+ }++ if (loadingState.state !== "ready") {+ return;+ }++ const result =+ canvasApi.getElementAndAncestorInstanceTags(instanceSelector);++ return result;+ }+);+/*** combine all local, cascaded, inherited and browser styles*/@@ -500,16 +525,12 @@ const useStyleInfoByInstanceAndStyleSource = (const breakpoints = useStore($breakpoints);const selectedBreakpoint = useStore($selectedBreakpoint);const selectedBreakpointId = selectedBreakpoint?.id;-- // We do not move $selectedInstanceIntanceToTag out of here as it contains ascendants of selected element- // And we do not gonna iterate over children- const instanceToTag = useStore($selectedInstanceIntanceToTag);-const instances = useStore($instances);const metas = useStore($registeredComponentMetas);const { stylesByInstanceId, stylesByStyleSourceId } = useStore($stylesIndex);const styleSourceSelections = useStore($styleSourceSelections);const selectedInstanceStates = useStore($selectedInstanceStates);+ const instanceToTag = useStore($instanceToTag);const activeStates = useMemo(() => {const activeStates = new Set(selectedInstanceStates);if (styleSourceSelector?.state !== undefined) {@@ -923,4 +944,15 @@ export const hasInstanceValue = (export const __testing__ = {getPriorityStyleSource,+ instanceToTag: undefined as Map<Instance["id"], HtmlTags> | undefined,+ setInstanceToTag: (instanceToTag: Map<Instance["id"], HtmlTags>) => {+ __testing__.instanceToTag = instanceToTag;++ const selector = $selectedInstanceSelector.get();+ if (selector === undefined) {+ return;+ }+ // enforce recompute+ $selectedInstanceSelector.set([...selector]);+ },};diff --git a/apps/builder/app/canvas/collaborative-instance.ts b/apps/builder/app/canvas/collaborative-instance.tsindex bb50c7ac5a..9cc108585e 100644--- a/apps/builder/app/canvas/collaborative-instance.ts+++ b/apps/builder/app/canvas/collaborative-instance.ts@@ -1,6 +1,6 @@import {getAllElementsBoundingBox,- getElementsByInstanceSelector,+ getVisibleElementsByInstanceSelector,} from "~/shared/dom-utils";import {$collaborativeInstanceSelector,@@ -35,7 +35,7 @@ export const updateCollaborativeInstanceRect = () => {return;}- elements = getElementsByInstanceSelector(selector);+ elements = getVisibleElementsByInstanceSelector(selector);if (elements.length > 0) {cancelAnimationFrame(frameHandler);diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex cc14e61168..f521edc6a9 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -3,7 +3,7 @@ import { $hoveredInstanceSelector, $instances } from "~/shared/nano-states";import { $hoveredInstanceOutline } from "~/shared/nano-states";import {getAllElementsBoundingBox,- getElementsByInstanceSelector,+ getVisibleElementsByInstanceSelector,getInstanceSelectorFromElement,} from "~/shared/dom-utils";import { subscribeScrollState } from "./shared/scroll-state";@@ -106,7 +106,7 @@ export const subscribeInstanceHovering = () => {const unsubscribeHoveredInstanceId = $hoveredInstanceSelector.subscribe((instanceSelector) => {if (instanceSelector) {- const elements = getElementsByInstanceSelector(instanceSelector);+ const elements = getVisibleElementsByInstanceSelector(instanceSelector);updateHoveredRect(elements, instanceSelector);} else {$hoveredInstanceOutline.set(undefined);diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.tsindex 0b326ab0e5..35e0766f51 100644--- a/apps/builder/app/canvas/instance-selected.ts+++ b/apps/builder/app/canvas/instance-selected.ts@@ -18,7 +18,8 @@ import {import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import {getAllElementsBoundingBox,- getElementsByInstanceSelector,+ getVisibleElementsByInstanceSelector,+ getAllElementsByInstanceSelector,} from "~/shared/dom-utils";import { subscribeScrollState } from "~/canvas/shared/scroll-state";import { $selectedInstanceOutline } from "~/shared/nano-states";@@ -75,6 +76,34 @@ const calculateUnitSizes = (element: HTMLElement): UnitSizes => {};};+export const getElementAndAncestorInstanceTags = (+ instanceSelector: Readonly<InstanceSelector>+) => {+ const elements = getAllElementsByInstanceSelector(instanceSelector);++ if (elements.length === 0) {+ return;+ }++ const [element] = elements;++ const instanceToTag = new Map<Instance["id"], HtmlTags>();+ for (+ let ancestorOrSelf: HTMLElement | null = element;+ ancestorOrSelf !== null;+ ancestorOrSelf = ancestorOrSelf.parentElement+ ) {+ const tagName = ancestorOrSelf.tagName.toLowerCase();+ const instanceId = ancestorOrSelf.getAttribute(idAttribute);++ if (isHtmlTag(tagName) && instanceId !== null) {+ instanceToTag.set(instanceId, tagName);+ }+ }++ return instanceToTag;+};+const subscribeSelectedInstance = (selectedInstanceSelector: Readonly<InstanceSelector>,debounceEffect: (callback: () => void) => void@@ -84,25 +113,28 @@ const subscribeSelectedInstance = (}const instanceId = selectedInstanceSelector[0];- // setDataCollapsed- let elements = getElementsByInstanceSelector(selectedInstanceSelector);+ let visibleElements = getVisibleElementsByInstanceSelector(+ selectedInstanceSelector+ );- elements[0]?.scrollIntoView({+ visibleElements[0]?.scrollIntoView({behavior: "smooth",block: "nearest",});const updateElements = () => {- elements = getElementsByInstanceSelector(selectedInstanceSelector);+ visibleElements = getVisibleElementsByInstanceSelector(+ selectedInstanceSelector+ );};const updateDataCollapsed = () => {- if (elements.length === 0) {+ if (visibleElements.length === 0) {return;}- for (const element of elements) {+ for (const element of visibleElements) {const selectorId = element.getAttribute(selectorIdAttribute);if (selectorId === null) {continue;@@ -127,13 +159,15 @@ const subscribeSelectedInstance = (if ($isResizingCanvas.get()) {return;}- setOutline(instanceId, elements);+ setOutline(instanceId, visibleElements);};// effect close to rendered element also catches dnd remounts// so actual state is always provided hereshowOutline();const updateStores = () => {+ const elements = getAllElementsByInstanceSelector(selectedInstanceSelector);+if (elements.length === 0) {return;}@@ -143,19 +177,9 @@ const subscribeSelectedInstance = ($selectedInstanceBrowserStyle.set(getBrowserStyle(element));// Map self and ancestor instance ids to tag names- const instanceToTag = new Map<Instance["id"], HtmlTags>();- for (- let ancestorOrSelf: HTMLElement | null = element;- ancestorOrSelf !== null;- ancestorOrSelf = ancestorOrSelf.parentElement- ) {- const tagName = ancestorOrSelf.tagName.toLowerCase();- const instanceId = ancestorOrSelf.getAttribute(idAttribute);-- if (isHtmlTag(tagName) && instanceId !== null) {- instanceToTag.set(instanceId, tagName);- }- }+ const instanceToTag = getElementAndAncestorInstanceTags(+ selectedInstanceSelector+ );$selectedInstanceIntanceToTag.set(instanceToTag);@@ -224,7 +248,7 @@ const subscribeSelectedInstance = (const mutationObserver = new MutationObserver(update);const updateObservers = () => {- for (const element of elements) {+ for (const element of visibleElements) {resizeObserver.observe(element);const parent = element?.parentElement;diff --git a/apps/builder/app/shared/canvas-api.ts b/apps/builder/app/shared/canvas-api.tsindex a7b6e99367..319fefb206 100644--- a/apps/builder/app/shared/canvas-api.ts+++ b/apps/builder/app/shared/canvas-api.ts@@ -4,6 +4,7 @@ import { monitorForExternal } from "@atlaskit/pragmatic-drag-and-drop/external/aimport { createRecursiveProxy } from "@trpc/server/shared";import invariant from "tiny-invariant";import { $canvasIframeState } from "./nano-states";+import { getElementAndAncestorInstanceTags } from "~/canvas/instance-selected";const apiWindowNamespace = "__webstudio__$__canvasApi";@@ -13,6 +14,7 @@ const _canvasApi = {resetInert,preventUnhandled,monitorForExternal,+ getElementAndAncestorInstanceTags,};declare global {diff --git a/apps/builder/app/shared/dom-utils.test.ts b/apps/builder/app/shared/dom-utils.test.tsnew file mode 100644index 0000000000..559da858de--- /dev/null+++ b/apps/builder/app/shared/dom-utils.test.ts@@ -0,0 +1,52 @@+/**+ * @jest-environment jsdom+ */++import { test, expect, beforeEach } from "@jest/globals";+import {+ getAllElementsByInstanceSelector,+ getVisibleElementsByInstanceSelector,+} from "./dom-utils";++beforeEach(() => {+ document.body.innerHTML = `+ <div data-ws-selector="box,body">+ <select data-ws-selector="select,box,body">+ <option data-ws-selector="option,select,box,body">test</option>+ </select>+ <div style="display:fixed;" data-ws-selector="box-fixed,body"></div>+ <div style="display:none;" data-ws-selector="box-none,body"></div>+ </div>`;++ document.body.setAttribute("data-ws-selector", "body");+});++test("Select body element", () => {+ expect(getVisibleElementsByInstanceSelector(["body"])).toEqual([+ document.body,+ ]);+});++test("getVisibleElementsByInstanceSelector selects select element", () => {+ expect(+ getVisibleElementsByInstanceSelector(["option", "select", "box", "body"])+ ).toEqual([document.querySelector("select")]);+});++test("getAllElementsByInstanceSelector selects option element", () => {+ expect(+ getAllElementsByInstanceSelector(["option", "select", "box", "body"])+ ).toEqual([document.querySelector("option")]);+});++test("getVisibleElementsByInstanceSelector selects parent of box-none element", () => {+ expect(getVisibleElementsByInstanceSelector(["box-none", "body"])).toEqual([+ document.querySelector("[data-ws-selector='box,body']"),+ ]);+});++test("getAllElementsByInstanceSelector selects box-none element", () => {+ expect(getAllElementsByInstanceSelector(["box-none", "body"])).toEqual([+ document.querySelector("[data-ws-selector='box-none,body']"),+ ]);+});diff --git a/apps/builder/app/shared/dom-utils.ts b/apps/builder/app/shared/dom-utils.tsindex 177fceec98..567274aa58 100644--- a/apps/builder/app/shared/dom-utils.ts+++ b/apps/builder/app/shared/dom-utils.ts@@ -34,17 +34,52 @@ export const getElementByInstanceSelector = ();};+// Determine if the element is detached, or lacks visual layout.+// We want to exclude elements that are display: none, option tags, or are not in the DOM+const hasLayout = (element: HTMLElement) => {+ // Detached element+ if (false === document.documentElement.contains(element)) {+ return false;+ }++ if (element.tagName.toLowerCase() === "option") {+ return false;+ }++ // Display none+ if (getComputedStyle(element)?.display?.toLowerCase() === "none") {+ return false;+ }++ return true;+};++export const getVisibleElementsByInstanceSelector = (+ instanceSelector: InstanceSelector | Readonly<InstanceSelector>+) => {+ return getElementsByInstanceSelector(instanceSelector, true);+};++export const getAllElementsByInstanceSelector = (+ instanceSelector: InstanceSelector | Readonly<InstanceSelector>+) => {+ return getElementsByInstanceSelector(instanceSelector, false);+};+/*** Get root visible elements, even if instance**/-export const getElementsByInstanceSelector = (- instanceSelector: InstanceSelector | Readonly<InstanceSelector>+const getElementsByInstanceSelector = (+ instanceSelector: InstanceSelector | Readonly<InstanceSelector>,+ skipHidden: boolean) => {const descendantsOrSelf = [...document.querySelectorAll<HTMLElement>(`[${selectorIdAttribute}$="${instanceSelector.join(",")}"]`),- ].filter((element) => getIsVisuallyHidden(element) === false);+ ].filter((element) =>+ skipHidden ? getIsVisuallyHidden(element) === false : true+ );const visibleIdSelectors = descendantsOrSelf.map((element) => element.getAttribute(selectorIdAttribute) ?? ""@@ -68,17 +103,13 @@ export const getElementsByInstanceSelector = ();return rootElements.map((element) => {- // We are not interested in display:none or option elements (they have offsetParent === null)let elementResult: HTMLElement = element;while (- elementResult.offsetParent === null &&+ skipHidden &&+ false === hasLayout(elementResult) &&elementResult.parentElement !== null) {- if (getComputedStyle(element).position === "fixed") {- return element;- }-elementResult = elementResult.parentElement;}@@ -119,6 +150,24 @@ export const getAllElementsBoundingBox = (elements: Element[]): DOMRect => {}if (element.children.length === 0) {+ const textNode = element.firstChild;+ if (textNode?.nodeType !== Node.TEXT_NODE) {+ continue;+ }++ // Create a range object+ const range = document.createRange();+ // Set the range to encompass the text node+ range.selectNodeContents(textNode);+ // Get the bounding rectangle+ const rect = range.getBoundingClientRect();++ if (rect.width !== 0 || rect.height !== 0) {+ rects.push(rect);+ }++ range.detach();+continue;}