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 pointer events (#2089)
Ivan Starkov377889f5fbc3
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsxindex 282646543a..42bc0117ab 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx@@ -9,8 +9,7 @@ import {useDrag,ComponentCard,toast,- enableCanvasPointerEvents,- disableCanvasPointerEvents,+ useDisableCanvasPointerEvents,} from "@webstudio-is/design-system";import {instancesStore,@@ -127,6 +126,8 @@ export const useDraggable = ({const [point, setPoint] = useState<Point>({ x: 0, y: 0 });const canvasRect = useStore(canvasRectStore);const scale = useStore(scaleStore);+ const { enableCanvasPointerEvents, disableCanvasPointerEvents } =+ useDisableCanvasPointerEvents();const dragHandlers = useDrag<Instance["component"]>({elementToData(element) {diff --git a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsxindex cff3c8d202..f3d42f0cf6 100644--- a/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/color-picker.tsx@@ -14,8 +14,7 @@ import {PopoverTrigger,PopoverContent,css,- enableCanvasPointerEvents,- disableCanvasPointerEvents,+ useDisableCanvasPointerEvents,} from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import { theme } from "@webstudio-is/design-system";@@ -122,6 +121,8 @@ export const ColorPicker = ({property,}: ColorPickerProps) => {const [displayColorPicker, setDisplayColorPicker] = useState(false);+ const { enableCanvasPointerEvents, disableCanvasPointerEvents } =+ useDisableCanvasPointerEvents();const currentValue =intermediateValue ?? styleValueResolve(value, currentColor);@@ -173,6 +174,7 @@ export const ColorPicker = ({disableCanvasPointerEvents();return;}+enableCanvasPointerEvents();};diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsxindex 186d47de46..1e292ab6fc 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx@@ -3,7 +3,6 @@ import { findApplicableMedia } from "@webstudio-is/css-engine";import {css,disableCanvasPointerEvents,- enableCanvasPointerEvents,numericScrubControl,theme,} from "@webstudio-is/design-system";@@ -101,7 +100,10 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {if (ref.current === null) {return;}- return numericScrubControl(ref.current, {++ let enableCanvasPointerEvents: (() => void) | undefined;++ const disposeScrubControl = numericScrubControl(ref.current, {getInitialValue() {return canvasWidthStore.get();},@@ -116,11 +118,13 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {},onStatusChange(status) {if (status === "scrubbing") {- disableCanvasPointerEvents();+ enableCanvasPointerEvents?.();+ enableCanvasPointerEvents = disableCanvasPointerEvents();isResizingCanvasStore.set(true);return;}- enableCanvasPointerEvents();+ enableCanvasPointerEvents?.();+isResizingCanvasStore.set(false);},onValueInput(event) {@@ -128,6 +132,12 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {updateBreakpoint(event.value);},});++ return () => {+ enableCanvasPointerEvents?.();++ disposeScrubControl();+ };}, [side]);return ref;diff --git a/packages/design-system/src/components/tooltip.tsx b/packages/design-system/src/components/tooltip.tsxindex 9dac349b57..0087c17165 100644--- a/packages/design-system/src/components/tooltip.tsx+++ b/packages/design-system/src/components/tooltip.tsx@@ -1,5 +1,5 @@import type { Ref, ComponentProps, ReactNode, ReactElement } from "react";-import { Fragment, forwardRef, useEffect, useRef } from "react";+import { Fragment, forwardRef, useEffect } from "react";import { styled } from "../stitches.config";import * as TooltipPrimitive from "@radix-ui/react-tooltip";import { useControllableState } from "@radix-ui/react-use-controllable-state";@@ -7,11 +7,7 @@ import { Box } from "./box";import { Text } from "./text";import type { CSS } from "../stitches.config";import { theme } from "../stitches.config";-import warnOnce from "warn-once";-import {- disableCanvasPointerEvents,- enableCanvasPointerEvents,-} from "../utilities";+import { disableCanvasPointerEvents } from "../utilities";export type TooltipProps = ComponentProps<typeof TooltipPrimitive.Root> &Omit<ComponentProps<typeof Content>, "content"> & {@@ -48,33 +44,6 @@ const Arrow = styled(TooltipPrimitive.Arrow, {marginTop: -0.5,});-let openTooltipsCount = 0;--/**- * When the mouse leaves Tooltip.Content and moves over an iframe, the Radix Tooltip stays open.- * This happens because Radix's internal grace area relies on the pointermove event, which isn't triggered over iframes.- * The current workaround is to set pointer-events: none on the canvas when the tooltip is open.- **/-const handleTooltipOpenChange = (open: boolean) => {- if (openTooltipsCount < 0) {- // Should be impossible but in case if we've missed a tooltip open/close event,- // just enable events and stop this algorithm, to preserve system in working state- warnOnce(true, "Tooltip counter can't be less than 0");- enableCanvasPointerEvents();- return;- }-- // Multiple tooltips can open simultaneously. Use a counter instead of a boolean to manage them.- openTooltipsCount = openTooltipsCount + (open ? 1 : -1);-- if (openTooltipsCount > 0) {- disableCanvasPointerEvents();- return;- }-- enableCanvasPointerEvents();-};-export const Tooltip = forwardRef(({@@ -92,8 +61,6 @@ export const Tooltip = forwardRef(},ref: Ref<HTMLDivElement>) => {- const isOpenRef = useRef(false);-// We need to intercept tooltip openconst [open = false, setOpen] = useControllableState({prop: openProp,@@ -103,19 +70,18 @@ export const Tooltip = forwardRef(},});- // Manage scenarios where defaultOpen or open is initially set, or when the tooltip is unmounted.+ /**+ * When the mouse leaves Tooltip.Content and moves over an iframe, the Radix Tooltip stays open.+ * This happens because Radix's internal grace area relies on the pointermove event, which isn't triggered over iframes.+ * The current workaround is to set pointer-events: none on the canvas when the tooltip is open.+ **/useEffect(() => {- if (isOpenRef.current !== open) {- handleTooltipOpenChange(open);- isOpenRef.current = open;+ if (open) {+ const enableCanvasPointerEvents = disableCanvasPointerEvents();+ return () => {+ enableCanvasPointerEvents?.();+ };}-- return () => {- if (isOpenRef.current) {- handleTooltipOpenChange(false);- isOpenRef.current = false;- }- };}, [open]);if (!content) {diff --git a/packages/design-system/src/utilities.ts b/packages/design-system/src/utilities.tsindex faa6c9eb4a..c181e7b71a 100644--- a/packages/design-system/src/utilities.ts+++ b/packages/design-system/src/utilities.ts@@ -1,14 +1,83 @@+import { useEffect, useMemo, useRef } from "react";+import warnOnce from "warn-once";+export const canvasPointerEventsPropertyName = "--canvas-pointer-events";-export const enableCanvasPointerEvents = () => {- document.documentElement.style.removeProperty(- canvasPointerEventsPropertyName- );+let disableCount = 0;++const updateCanvasPointerEvents = () => {+ if (disableCount < 0) {+ // Should be impossible as counter control implemented as disposable resource+ throw new Error("canvas pointer event counter can't be less than 0");+ }++ // use ===1 instead of >0 for optimisation+ if (disableCount === 1) {+ document.documentElement.style.setProperty(+ canvasPointerEventsPropertyName,+ "none"+ );+ return;+ }++ if (disableCount === 0) {+ document.documentElement.style.removeProperty(+ canvasPointerEventsPropertyName+ );+ }};+/**+ * Temporarily disables pointer events on the canvas using canvasPointerEventsPropertyName.+ * Use the returned disposable to re-enable them.+ *+ * Implemented as disposable to+ * - Ensure events are first disabled, then enabled in sequence.+ * - To support concurrent calls (internal counter tracks the number of disables/enables).+ **/export const disableCanvasPointerEvents = () => {- document.documentElement.style.setProperty(- canvasPointerEventsPropertyName,- "none"+ let disposeCalled = false;++ disableCount += 1;+ updateCanvasPointerEvents();++ return () => {+ if (disposeCalled) {+ // It's perfectly ok to dispose multiple times.+ return;+ }+ disposeCalled = true;+ disableCount -= 1;+ updateCanvasPointerEvents();+ };+};++export const useDisableCanvasPointerEvents = () => {+ const enableCanvasPointerEventsRef = useRef<() => void>();++ const enableDisable = useMemo(+ () => ({+ enableCanvasPointerEvents: () => {+ warnOnce(+ enableCanvasPointerEventsRef.current === undefined,+ "enableCanvasPointerEvents was called before disableCanvasPointerEvents, this is not an issue but may indicate the problem with the code."+ );+ enableCanvasPointerEventsRef.current?.();+ },+ disableCanvasPointerEvents: () => {+ enableCanvasPointerEventsRef.current?.();+ enableCanvasPointerEventsRef.current = disableCanvasPointerEvents();+ },+ }),+ []);++ useEffect(+ () => () => {+ enableCanvasPointerEventsRef.current?.();+ },+ [enableDisable]+ );++ return enableDisable;};