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
Make canvas iframe receive no pointer events for the time of dragging (#1256)
Oleg Isonend93937365ed4
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 3e2d799b31..43670b67cb 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -13,7 +13,10 @@ import robotoMonoFont from "@fontsource/roboto-mono/index.css";import { useSharedShortcuts } from "~/shared/shortcuts";import { SidebarLeft } from "./features/sidebar-left";import { Inspector } from "./features/inspector";-import { useProject } from "./shared/nano-states";+import {+ isCanvasPointerEventsEnabledStore,+ useProject,+} from "./shared/nano-states";import { Topbar } from "./features/topbar";import builderStyles from "./builder.css";import { Footer } from "./features/footer";@@ -50,6 +53,7 @@ import type { Asset } from "@webstudio-is/asset-uploader";import { useSearchParams } from "@remix-run/react";import { useSyncInitializeOnce } from "~/shared/hook-utils";import { BlockingAlerts } from "./features/blocking-alerts";+import { useStore } from "@nanostores/react";registerContainers();@@ -302,6 +306,9 @@ export const Builder = ({},[publishRef, onRefReadCanvasWidth, onRefReadCanvas]);+ const isCanvasPointerEventsEnabled = useStore(+ isCanvasPointerEventsEnabledStore+ );const canvasUrl = getBuildUrl({buildOrigin,@@ -319,12 +326,7 @@ export const Builder = ({<CanvasIframeref={iframeRefCallback}src={canvasUrl}- pointerEvents={- dragAndDropState.isDragging &&- dragAndDropState.origin === "panel"- ? "none"- : "all"- }+ pointerEvents={isCanvasPointerEventsEnabled ? "auto" : "none"}title={project.title}css={{height: "100%",diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex 266b03212b..dafb9874d4 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -16,7 +16,10 @@ import {selectedInstanceSelectorStore,} from "~/shared/nano-states";import { useSubscribe, type Publish } from "~/shared/pubsub";-import { useCanvasRect } from "~/builder/shared/nano-states";+import {+ isCanvasPointerEventsEnabledStore,+ useCanvasRect,+} from "~/builder/shared/nano-states";import { insertNewComponentInstance } from "~/shared/instance-utils";import { zoomStore } from "~/shared/nano-states/breakpoints";import type { TabName } from "../../types";@@ -134,6 +137,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {dragItem: utils.tree.createInstance({ component: componentName }),},});+ isCanvasPointerEventsEnabledStore.set(false);},onMove: (point) => {setPoint(point);@@ -148,6 +152,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {type: "dragEnd",payload: { origin: "panel", isCanceled },});+ isCanvasPointerEventsEnabledStore.set(true);},});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 2fec0bf623..910ced798c 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@@ -1,4 +1,4 @@-import { useState } from "react";+import { useEffect, useState } from "react";import { colord, extend, type RgbaColor } from "colord";import namesPlugin from "colord/plugins/names";import { ColorResult, RGBColor, SketchPicker } from "react-color";@@ -22,6 +22,8 @@ import { theme } from "@webstudio-is/design-system";import type { StyleSource } from "./style-info";import { CssValueInput } from "./css-value-input";import type { IntermediateStyleValue } from "./css-value-input/css-value-input";+import { isCanvasPointerEventsEnabledStore } from "~/builder/shared/nano-states";+import { useStore } from "@nanostores/react";// To support color namesextend([namesPlugin]);@@ -44,25 +46,6 @@ const defaultPickerStyles = {},};-export type CssColorPickerValueInput =- | RgbValue- | KeywordValue- | IntermediateStyleValue;--type ColorPickerProps = {- onChange: (value: CssColorPickerValueInput | undefined) => void;- onChangeComplete: (event: {- value: RgbValue | KeywordValue | InvalidValue;- }) => void;- onHighlight: (value: StyleValue | undefined) => void;- onAbort: () => void;- intermediateValue: CssColorPickerValueInput | undefined;- value: RgbValue | KeywordValue;- styleSource: StyleSource;- keywords?: Array<KeywordValue>;- property: StyleProperty;-};-const colorResultToRgbValue = (rgb: RgbaColor | RGBColor): RgbValue => {return {type: "rgb",@@ -117,6 +100,54 @@ const clamp = (value: number, min: number, max: number) => {return Math.min(Math.max(value, min), max);};+// Dragging over canvas iframe with CORS policies will lead to loosing events and getting stuck in mousedown state.+const useFixDragOverCanvas = () => {+ const isCanvasPointerEventsEnabled = useStore(+ isCanvasPointerEventsEnabledStore+ );++ useEffect(() => {+ const handleMouseUp = () => {+ isCanvasPointerEventsEnabledStore.set(true);+ removeEventListener("mouseup", handleMouseUp);+ };+ if (isCanvasPointerEventsEnabled === false) {+ addEventListener("mouseup", handleMouseUp);+ }+ return () => {+ removeEventListener("mouseup", handleMouseUp);+ };+ }, [isCanvasPointerEventsEnabled]);++ const handleChange = (event: MouseEvent) => {+ // Prevents selection of text during drag.+ if (event.type === "mousedown") {+ event.preventDefault();+ isCanvasPointerEventsEnabledStore.set(false);+ }+ };+ return { handleChange };+};++export type CssColorPickerValueInput =+ | RgbValue+ | KeywordValue+ | IntermediateStyleValue;++type ColorPickerProps = {+ onChange: (value: CssColorPickerValueInput | undefined) => void;+ onChangeComplete: (event: {+ value: RgbValue | KeywordValue | InvalidValue;+ }) => void;+ onHighlight: (value: StyleValue | undefined) => void;+ onAbort: () => void;+ intermediateValue: CssColorPickerValueInput | undefined;+ value: RgbValue | KeywordValue;+ styleSource: StyleSource;+ keywords?: Array<KeywordValue>;+ property: StyleProperty;+};+export const ColorPicker = ({value,intermediateValue,@@ -129,6 +160,7 @@ export const ColorPicker = ({property,}: ColorPickerProps) => {const [displayColorPicker, setDisplayColorPicker] = useState(false);+ const canvasFix = useFixDragOverCanvas();const currentValue = intermediateValue ?? value;@@ -212,14 +244,14 @@ export const ColorPicker = ({<PopoverContent><SketchPickercolor={rgbValue}- onChange={(color: ColorResult) => {+ onChange={(color: ColorResult, event) => {+ // SketchPicker event can be mouse event, type is wrong.+ canvasFix.handleChange(event as unknown as MouseEvent);const newColor = fixColor(color);-onChange(newColor);}}onChangeComplete={(color: ColorResult) => {const newColor = fixColor(color);-onChangeComplete({value: newColor,});diff --git a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx b/apps/builder/app/builder/features/workspace/canvas-iframe.tsxindex 08e9aa7b64..49be3ef2d9 100644--- a/apps/builder/app/builder/features/workspace/canvas-iframe.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-iframe.tsx@@ -8,20 +8,20 @@ const iframeStyle = css({none: {pointerEvents: "none",},- all: {- pointerEvents: "all",+ auto: {+ pointerEvents: "auto",},},},});type CanvasIframeProps = {- pointerEvents: "all" | "none";+ pointerEvents: "auto" | "none";css: CSS;} & JSX.IntrinsicElements["iframe"];export const CanvasIframe = forwardRef<HTMLIFrameElement, CanvasIframeProps>(- ({ pointerEvents = "all", css, ...rest }, ref) => {+ ({ pointerEvents = "auto", css, ...rest }, ref) => {return (<iframe{...rest}diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tsindex b765762f54..a83da1b79c 100644--- a/apps/builder/app/builder/shared/nano-states/index.ts+++ b/apps/builder/app/builder/shared/nano-states/index.ts@@ -34,3 +34,5 @@ export type TextToolbarState = {};const textToolbarState = atom<undefined | TextToolbarState>();export const useTextToolbarState = () => useValue(textToolbarState);++export const isCanvasPointerEventsEnabledStore = atom<boolean>(true);