packages/editor/src/editor/Canvas.tsx

@@ -5,7 +5,6 @@ import { Button, Space } from 'antd';
 import type { ResizeHandle } from './types';
 import { rectFromPoints } from './geometry';
 import type { ContextMenuState } from './ContextMenu';
-import { selectionKeyOf } from './selection';
 
 export interface CanvasProps {
   screen: Screen;
@@ -41,6 +40,12 @@ function isPrimaryButton(e: React.PointerEvent | PointerEvent): boolean {
   return (e as PointerEvent).buttons === 1 || (e as PointerEvent).button === 0;
 }
 
+function selectionKeyOf(ids: string[]): string {
+  // Keep stable regardless of selection order.
+  // This avoids false mismatches between context-menu state and reducer state.
+  return [...ids].sort().join('|');
+}
+
 export function Canvas(props: CanvasProps) {
   const ref = useRef<HTMLDivElement | null>(null);
   const [box, setBox] = useState<{ x1: number; y1: number; x2: number; y2: number } | null>(null);

packages/editor/src/editor/ContextMenu.tsx

@@ -1,7 +1,11 @@
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { Typography } from 'antd';
 
-import { selectionKeyOf } from './selection';
+function selectionKeyOf(ids: string[]): string {
+  // Keep stable regardless of selection order.
+  // This avoids false mismatches between context-menu state and reducer state.
+  return [...ids].sort().join('|');
+}
 
 export type ContextMenuState =
   | {

packages/editor/src/editor/EditorApp.tsx

@@ -14,7 +14,6 @@ import { bindEditorHotkeys } from './hotkeys';
 import { Canvas } from './Canvas';
 import { ContextMenu, type ContextMenuState } from './ContextMenu';
 import { Inspector } from './Inspector';
-import { selectionKeyOf } from './selection';
 import { createInitialState, editorReducer, exportScreenJSON } from './store';
 
 const { Header, Sider, Content } = Layout;
@@ -87,7 +86,10 @@ export function EditorApp() {
 
   const closeContextMenu = useCallback(() => setCtxMenu(null), []);
 
-  // selectionKeyOf imported from ./selection
+  const selectionKeyOf = useCallback((ids: string[]) => {
+    // Keep stable regardless of ordering.
+    return [...ids].sort().join('|');
+  }, []);
 
   const ctxMenuSyncedRef = useRef(false);
 
@@ -101,7 +103,7 @@ export function EditorApp() {
       }
       dispatch(action);
     },
-    [ctxMenu, dispatch, state.selection.ids],
+    [ctxMenu, dispatch, selectionKeyOf, state.selection.ids],
   );
 
   useEffect(() => {

packages/editor/src/editor/selection.ts

@@ -1,5 +0,0 @@
-export function selectionKeyOf(ids: string[]): string {
-  // Keep stable regardless of selection order.
-  // This avoids false mismatches between context-menu state and reducer state.
-  return [...ids].sort().join('|');
-}