Merge to main

README.md

@@ -36,6 +36,10 @@ npm run dev
 
 Open your browser and go to http://localhost:5173 (if this port is busy it will be changed to the next available port)
 
+## VS Code extension
+
+If you prefer to work inside VS Code, install the [QuickMock VS Code extension](./packages/vscode-extension/README.md). It adds a custom editor for `.qm` files and also configures the MCP server for AI tools.
+
 ## 🤝 Contributing
 
 Your feedback and contributions are welcome! If you have ideas for new features or have found a bug, we would love to hear about it. Here's how you can contribute:

apps/web/src/common/components/gallery/components/item-component.tsx

@@ -1,4 +1,10 @@
 import { ShapeDisplayName, ShapeType } from '#core/model';
+import {
+  loadThumbnailAsDataUrl,
+  notifyDragEndToWebviewShell,
+  notifyDragStartToWebviewShell,
+  shouldUseMacWebviewDragBridge,
+} from '#core/vscode/mac-webview-drag-bridge.utils';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { useEffect, useRef, useState } from 'react';
@@ -14,8 +20,22 @@ interface Props {
 export const ItemComponent: React.FC<Props> = props => {
   const { item } = props;
   const dragRef = useRef<HTMLDivElement>(null);
+  const thumbnailDataUrlRef = useRef<string | null>(null);
   const [isDragging, setIsDragging] = useState(false);
 
+  useEffect(() => {
+    if (!shouldUseMacWebviewDragBridge()) return;
+    let cancelled = false;
+    loadThumbnailAsDataUrl(item.thumbnailSrc)
+      .then(dataUrl => {
+        if (!cancelled) thumbnailDataUrlRef.current = dataUrl;
+      })
+      .catch(() => {});
+    return () => {
+      cancelled = true;
+    };
+  }, [item.thumbnailSrc]);
+
   useEffect(() => {
     const el = dragRef.current;
 
@@ -24,9 +44,39 @@ export const ItemComponent: React.FC<Props> = props => {
     return draggable({
       element: el,
       getInitialData: () => ({ type: item.type }),
-      onDragStart: () => setIsDragging(true),
-      onDrop: () => setIsDragging(false),
+      onDragStart: () => {
+        setIsDragging(true);
+        const dataUrl = thumbnailDataUrlRef.current;
+        if (dataUrl) {
+          notifyDragStartToWebviewShell(item.type as ShapeType, dataUrl);
+        }
+      },
+      onDrop: () => {
+        setIsDragging(false);
+        notifyDragEndToWebviewShell();
+      },
       onGenerateDragPreview: ({ nativeSetDragImage }) => {
+        // Native drag image from the nested iframe is unreliable on macOS; the
+        // shell paints its own preview (see drag-bridge.ts), so suppress the
+        // native one with a 1×1 transparent element.
+        if (shouldUseMacWebviewDragBridge() && thumbnailDataUrlRef.current) {
+          setCustomNativeDragPreview({
+            getOffset: () => ({ x: 0, y: 0 }),
+            render({ container }) {
+              const transparent = document.createElement('div');
+              transparent.style.width = '1px';
+              transparent.style.height = '1px';
+              transparent.style.opacity = '0';
+              container.appendChild(transparent);
+              return () => {
+                transparent.remove();
+              };
+            },
+            nativeSetDragImage,
+          });
+          return;
+        }
+
         setCustomNativeDragPreview({
           //Important: this numbers are the half of the width and height of var(--gallery-item-size)
           // TODO, we may extract the size variable value from the HTML variable it self

apps/web/src/common/components/modal-dialog/modal-dialog.component.module.css

@@ -1,5 +1,5 @@
 .container {
-  z-index: 3;
+  z-index: 5;
   position: fixed;
   top: 0;
   left: 0;

apps/web/src/common/helpers/platform.helpers.ts

@@ -1,7 +1,12 @@
-export function isMacOS() {
-  return navigator.userAgent.toLowerCase().includes('mac');
+interface NavigatorWithUserAgentData extends Navigator {
+  userAgentData?: { platform: string };
 }
 
-export function isWindowsOrLinux() {
-  return !isMacOS();
+export function isMacOS(): boolean {
+  const userAgentData = (navigator as NavigatorWithUserAgentData).userAgentData;
+  if (userAgentData?.platform) {
+    return userAgentData.platform === 'macOS';
+  }
+  // Fallback for runtimes without UA-CH (Firefox, Safari, older Chromium).
+  return /Mac/i.test(navigator.userAgent);
 }

apps/web/src/common/utils/vscode-bridge.utils.ts

@@ -22,7 +22,7 @@ const resolveParentOrigin = (): string => {
   }
 };
 
-const parentOrigin = resolveParentOrigin();
+export const parentOrigin = resolveParentOrigin();
 
 export const sendToExtension = (msg: AppMessage): void => {
   if (!isVSCodeEnv()) return;

apps/web/src/core/vscode/mac-webview-drag-bridge.utils.ts

@@ -0,0 +1,72 @@
+import { isMacOS } from '#common/helpers/platform.helpers.ts';
+import { isVSCodeEnv } from '#common/utils/env.utils';
+import { parentOrigin } from '#common/utils/vscode-bridge.utils';
+import { ShapeType } from '#core/model';
+import {
+  type DragBridgeAppMessage,
+  DRAG_BRIDGE_MESSAGE_TYPE,
+} from '@lemoncode/quickmock-bridge-protocol';
+
+// macOS workaround for microsoft/vscode#193558: the native HTML5 drag preview
+// from the nested iframe is unreliable, so the shell paints its own preview
+// from a thumbnail data URL the iframe sends on drag-start.
+export const shouldUseMacWebviewDragBridge = (): boolean => {
+  return isVSCodeEnv() && isMacOS();
+};
+
+const postMessageToWebviewShell = (message: DragBridgeAppMessage): void => {
+  window.parent.postMessage(message, parentOrigin);
+};
+
+export const notifyDragStartToWebviewShell = (
+  shapeType: ShapeType,
+  thumbnailDataUrl: string
+): void => {
+  if (!shouldUseMacWebviewDragBridge()) {
+    return;
+  }
+  postMessageToWebviewShell({
+    type: DRAG_BRIDGE_MESSAGE_TYPE.DRAG_START,
+    payload: { shapeType, thumbnailDataUrl },
+  });
+};
+
+export const notifyDragMoveToWebviewShell = (
+  clientX: number,
+  clientY: number
+): void => {
+  if (!shouldUseMacWebviewDragBridge()) {
+    return;
+  }
+  postMessageToWebviewShell({
+    type: DRAG_BRIDGE_MESSAGE_TYPE.DRAG_MOVE,
+    payload: { clientX, clientY },
+  });
+};
+
+export const notifyDragEndToWebviewShell = (): void => {
+  if (!shouldUseMacWebviewDragBridge()) {
+    return;
+  }
+  postMessageToWebviewShell({ type: DRAG_BRIDGE_MESSAGE_TYPE.DRAG_END });
+};
+
+const thumbnailDataUrlCache = new Map<string, Promise<string>>();
+
+export const loadThumbnailAsDataUrl = (src: string): Promise<string> => {
+  const cached = thumbnailDataUrlCache.get(src);
+  if (cached) return cached;
+  const promise = fetch(src)
+    .then(response => response.blob())
+    .then(
+      blob =>
+        new Promise<string>((resolve, reject) => {
+          const reader = new FileReader();
+          reader.onload = () => resolve(reader.result as string);
+          reader.onerror = () => reject(reader.error);
+          reader.readAsDataURL(blob);
+        })
+    );
+  thumbnailDataUrlCache.set(src, promise);
+  return promise;
+};

apps/web/src/core/vscode/use-mac-webview-drag-bridge.hook.ts

@@ -0,0 +1,122 @@
+import { ShapeType } from '#core/model';
+import { useCanvasContext } from '#core/providers';
+import {
+  convertFromDivElementCoordsToKonvaCoords,
+  getScrollFromDiv,
+  isScreenPositionInsideDivElement,
+  portScreenPositionToDivCoordinates,
+} from '#pods/canvas/canvas.util';
+import { calculateShapeOffsetToXDropCoordinate } from '#pods/canvas/use-monitor.business';
+import {
+  type DragBridgeHostMessage,
+  DRAG_BRIDGE_MESSAGE_TYPE,
+} from '@lemoncode/quickmock-bridge-protocol';
+import { useEffect } from 'react';
+import {
+  notifyDragMoveToWebviewShell,
+  shouldUseMacWebviewDragBridge,
+} from './mac-webview-drag-bridge.utils';
+
+// macOS workaround for microsoft/vscode#193558: drag events on the inner
+// iframe route to the shell, so the shell-side bridge captures the drop and
+// forwards coordinates here; this reproduces the insertion useMonitorShape
+// performs natively on other platforms.
+
+type GalleryDropMessage = Extract<
+  DragBridgeHostMessage,
+  { type: typeof DRAG_BRIDGE_MESSAGE_TYPE.GALLERY_DROP }
+>;
+
+const isGalleryDropMessage = (data: unknown): data is GalleryDropMessage => {
+  if (!data || typeof data !== 'object') {
+    return false;
+  }
+  const message = data as {
+    type?: unknown;
+    payload?: {
+      shapeType?: unknown;
+      clientX?: unknown;
+      clientY?: unknown;
+    };
+  };
+  return (
+    message.type === DRAG_BRIDGE_MESSAGE_TYPE.GALLERY_DROP &&
+    typeof message.payload?.shapeType === 'string' &&
+    typeof message.payload?.clientX === 'number' &&
+    typeof message.payload?.clientY === 'number'
+  );
+};
+
+export const useMacWebviewDragBridge = (
+  dropRef: React.MutableRefObject<null>,
+  addNewShape: (type: ShapeType, x: number, y: number) => void
+) => {
+  const { stageRef } = useCanvasContext();
+
+  useEffect(() => {
+    if (!shouldUseMacWebviewDragBridge()) {
+      return;
+    }
+
+    const handleGalleryDrop = (event: MessageEvent): void => {
+      if (!isGalleryDropMessage(event.data)) {
+        return;
+      }
+      const { shapeType, clientX, clientY } = event.data.payload;
+
+      const dropDivElement = dropRef.current as HTMLDivElement | null;
+      const stageInstance = stageRef.current;
+      if (!dropDivElement || !stageInstance) {
+        return;
+      }
+
+      const screenPosition = { x: clientX, y: clientY };
+      if (!isScreenPositionInsideDivElement(dropDivElement, screenPosition)) {
+        return;
+      }
+
+      const relativeDivPosition = portScreenPositionToDivCoordinates(
+        dropDivElement,
+        screenPosition
+      );
+      const { scrollLeft, scrollTop } = getScrollFromDiv(
+        dropRef as unknown as React.MutableRefObject<HTMLDivElement>
+      );
+      const konvaCoordinate = convertFromDivElementCoordsToKonvaCoords(
+        stageInstance,
+        {
+          screenPosition,
+          relativeDivPosition,
+          scroll: { x: scrollLeft, y: scrollTop },
+        }
+      );
+
+      const shapeOffsetX = calculateShapeOffsetToXDropCoordinate(
+        konvaCoordinate.x,
+        shapeType as ShapeType
+      );
+      const positionX = konvaCoordinate.x - shapeOffsetX;
+      const positionY = konvaCoordinate.y;
+
+      addNewShape(shapeType as ShapeType, positionX, positionY);
+    };
+
+    window.addEventListener('message', handleGalleryDrop);
+    return () => {
+      window.removeEventListener('message', handleGalleryDrop);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!shouldUseMacWebviewDragBridge()) {
+      return;
+    }
+    const handleDragOver = (event: DragEvent): void => {
+      notifyDragMoveToWebviewShell(event.clientX, event.clientY);
+    };
+    document.addEventListener('dragover', handleDragOver, true);
+    return () => {
+      document.removeEventListener('dragover', handleDragOver, true);
+    };
+  }, []);
+};

apps/web/src/pods/canvas/canvas.pod.tsx

@@ -6,6 +6,7 @@ import { useTransform } from './use-transform.hook';
 import { renderShapeComponent } from './shape-renderer';
 import { useDropShape } from './use-drop-shape.hook';
 import { useMonitorShape } from './use-monitor-shape.hook';
+import { useMacWebviewDragBridge } from '#core/vscode/use-mac-webview-drag-bridge.hook';
 import classes from './canvas.pod.module.css';
 import { EditableComponent } from '#common/components/inline-edit';
 import { useSnapIn } from './use-snapin.hook';
@@ -58,6 +59,7 @@ export const CanvasPod = () => {
 
   const { isDraggedOver, dropRef } = useDropShape();
   useMonitorShape(dropRef, addNewShapeAndSetSelected);
+  useMacWebviewDragBridge(dropRef, addNewShapeAndSetSelected);
   useEffect(() => {
     if (dropRef.current) setDropRef(dropRef);
   }, [dropRef, setDropRef]);

apps/web/src/pods/canvas/canvas.util.ts

@@ -24,6 +24,20 @@ export const portScreenPositionToDivCoordinates = (
   return { x, y };
 };
 
+export const isScreenPositionInsideDivElement = (
+  divElement: HTMLDivElement,
+  screenPosition: Coord
+) => {
+  const { left, right, top, bottom } = divElement.getBoundingClientRect();
+
+  return (
+    screenPosition.x >= left &&
+    screenPosition.x <= right &&
+    screenPosition.y >= top &&
+    screenPosition.y <= bottom
+  );
+};
+
 interface PositionInfo {
   screenPosition: Coord;
   relativeDivPosition: Coord;

apps/web/src/pods/properties/components/stroke-width/stroke-width.component.module.css

@@ -28,6 +28,7 @@
   cursor: pointer;
   background: white;
   border-radius: 2px;
+  color: black;
 }
 
 .arrowIcon {
@@ -60,10 +61,12 @@
   gap: var(--space-s);
   font-size: var(--fs-xs);
   cursor: pointer;
+  color: black;
 }
 
 .dropdownItem:hover {
   background-color: var(--primary-100);
+  color: var(--text-color);
 }
 
 .linePreview {