@a3s-lab/office 0.37.1 → 0.37.2

package/dist/0~spreadsheet-editor.js

@@ -4561,6 +4561,7 @@ function isSpreadsheetNativeTextUndoTarget(target) {
     return target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement || target instanceof HTMLSelectElement || target.isContentEditable || Boolean(target.closest('[contenteditable="true"]'));
 }
 function isSpreadsheetCellEditingTarget(target) {
+    if (!isSpreadsheetCellEditorTarget(target)) return false;
     if (!(target instanceof Element)) return false;
     const formulaInput = target.closest('.fortune-fx-input');
     if (formulaInput) return true;
@@ -4571,6 +4572,9 @@ function isSpreadsheetCellEditingTarget(target) {
     const zIndex = Number.parseInt(inputBox.style.zIndex || getComputedStyle(inputBox).zIndex, 10);
     return !Number.isFinite(zIndex) || zIndex >= 0;
 }
+function isSpreadsheetCellEditorTarget(target) {
+    return target instanceof Element && Boolean(target.closest('.fortune-fx-input, .luckysheet-cell-input'));
+}
 function spreadsheetFormulaBarSelectAllTarget(event) {
     if (event.defaultPrevented || event.repeat || event.altKey || event.shiftKey || !(event.metaKey || event.ctrlKey) || 'a' !== event.key.toLocaleLowerCase() || !(event.target instanceof Element)) return null;
     const formulaBar = event.target.closest('.fortune-fx-input');
@@ -25185,6 +25189,11 @@ function spreadsheetClipboardSnapshotForText(plainText) {
     }
     return createSpreadsheetTextClipboardSnapshot(normalized);
 }
+function clearRichSpreadsheetClipboard() {
+    richSpreadsheetClipboard = null;
+    browserClipboardWriteRevision += 1;
+    preferLocalSpreadsheetClipboardRead = false;
+}
 async function readSpreadsheetClipboardText(readSystem, readLocal, timeoutMs = spreadsheetSystemClipboardTimeoutMs, canReadSystem = ()=>true) {
     if (readSystem && await canReadSystem()) try {
         const value = await withSpreadsheetClipboardTimeout(readSystem(), timeoutMs);
@@ -25758,25 +25767,26 @@ function useSpreadsheetClipboard({ clipboard = browserSpreadsheetClipboard, canA
     }, [
         editable
     ]);
-    const currentSnapshot = useCallback(()=>{
+    const currentSource = useCallback(()=>{
         if (!editable) return null;
         const selection = getSelection();
         if (!selection) return null;
         const snapshot = captureSpreadsheetClipboardSnapshot(contentRef.current, selection.sheetId, selection.range, selection.plainText);
-        return snapshot ? {
+        return {
             selection,
             snapshot
-        } : null;
+        };
     }, [
         contentRef,
         editable,
         getSelection
     ]);
     const copy = useCallback((cut)=>{
-        const source = currentSnapshot();
+        const source = currentSource();
         if (!source) return false;
-        storeRichSpreadsheetClipboard(source.snapshot);
-        copySpreadsheetSelection(clipboard, source.snapshot.plainText, cut);
+        if (source.snapshot) storeRichSpreadsheetClipboard(source.snapshot);
+        else clearRichSpreadsheetClipboard();
+        copySpreadsheetSelection(clipboard, source.selection.plainText, cut);
         if (cut && !clearSelection()) {
             showToast('选区已复制，但无法清除原内容。', 'error');
             return false;
@@ -25785,7 +25795,7 @@ function useSpreadsheetClipboard({ clipboard = browserSpreadsheetClipboard, canA
     }, [
         clearSelection,
         clipboard,
-        currentSnapshot
+        currentSource
     ]);
     const applySnapshot = useCallback((snapshot, targetSheetId, targetRange, options, notify = true)=>{
         const request = {
@@ -25913,15 +25923,16 @@ function useSpreadsheetClipboard({ clipboard = browserSpreadsheetClipboard, canA
         fallbackFocusTarget
     ]);
     const copyToDataTransfer = useCallback((data, cut)=>{
-        const source = currentSnapshot();
+        const source = currentSource();
         if (!source) return false;
-        storeRichSpreadsheetClipboard(source.snapshot);
-        data.setData('text/plain', source.snapshot.plainText);
+        if (source.snapshot) storeRichSpreadsheetClipboard(source.snapshot);
+        else clearRichSpreadsheetClipboard();
+        data.setData('text/plain', source.selection.plainText);
         if (cut && !clearSelection()) return false;
         return true;
     }, [
         clearSelection,
-        currentSnapshot
+        currentSource
     ]);
     return {
         applyDialog,
@@ -28896,6 +28907,7 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     const previewRef = useRef(preview);
     const spreadsheetRootRef = useRef(null);
     const spreadsheetCanvasRef = useRef(null);
+    const spreadsheetEditingEscapePendingRef = useRef(false);
     const editorFocusOrigin = useOfficeEditorFocusOrigin();
     const workbookRef = useRef(null);
     const projectedWorkbookSheetsRef = useRef([]);
@@ -28953,6 +28965,32 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     }, [
         preview
     ]);
+    useEffect(()=>{
+        const container = spreadsheetCanvasRef.current;
+        if (!container || preview) return;
+        const restoreGridFocus = ()=>requestAnimationFrame(()=>focusSpreadsheetGrid(container, {
+                    forceCellEditingExit: true
+                }));
+        const handleKeyDown = (event)=>{
+            if ('Escape' !== event.key || !isSpreadsheetCellEditorTarget(event.target)) return;
+            spreadsheetEditingEscapePendingRef.current = true;
+            restoreGridFocus();
+        };
+        const handleKeyUp = (event)=>{
+            if ('Escape' !== event.key || !spreadsheetEditingEscapePendingRef.current) return;
+            spreadsheetEditingEscapePendingRef.current = false;
+            restoreGridFocus();
+        };
+        container.addEventListener('keydown', handleKeyDown, true);
+        container.addEventListener('keyup', handleKeyUp, true);
+        return ()=>{
+            container.removeEventListener('keydown', handleKeyDown, true);
+            container.removeEventListener('keyup', handleKeyUp, true);
+            spreadsheetEditingEscapePendingRef.current = false;
+        };
+    }, [
+        preview
+    ]);
     const spreadsheetZoomRef = useRef(100);
     const [workbookInstance, setWorkbookInstance] = useState(null);
     const bindWorkbookInstance = useCallback((instance)=>{
@@ -29383,6 +29421,20 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     });
     const currentClipboardSelection = useCallback(()=>{
         if (previewRef.current) return null;
+        if (contextMenu) return {
+            sheetId: contextMenu.selection.sheetId,
+            range: {
+                row: [
+                    contextMenu.range.row[0] ?? 0,
+                    contextMenu.range.row[1] ?? contextMenu.range.row[0] ?? 0
+                ],
+                column: [
+                    contextMenu.range.column[0] ?? 0,
+                    contextMenu.range.column[1] ?? contextMenu.range.column[0] ?? 0
+                ]
+            },
+            plainText: contextMenu.selection.clipboard
+        };
         const sheetId = selectionState?.sheetId ?? activeSheetIdRef.current;
         const sheet = contentRef.current.sheets.find((candidate)=>candidate.id === sheetId);
         const selection = selectionState?.selection ?? sheet?.luckysheet_select_save?.at(-1);
@@ -29406,6 +29458,7 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
             plainText: agentSelection.clipboard
         } : null;
     }, [
+        contextMenu,
         selectionState
     ]);
     const spreadsheetClipboard = useSpreadsheetClipboard({
@@ -29754,9 +29807,6 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
         onZoomIn: ()=>changeSpreadsheetWheelZoom('in'),
         onZoomOut: ()=>changeSpreadsheetWheelZoom('out')
     });
-    const handleSpreadsheetEditingEscape = (event)=>{
-        if ('Escape' === event.key && isSpreadsheetCellEditingTarget(event.target)) requestAnimationFrame(()=>focusSpreadsheetGrid(spreadsheetCanvasRef.current));
-    };
     const handleSpreadsheetKeyDownCapture = (event)=>{
         releaseSpreadsheetSelectionRequest(selectionStateRef.current);
         if ('Alt' === event.key && !event.repeat && event.target instanceof Element && event.target.closest('.fortune-sheet-overlay') && reserveAutoFilterAltKey()) {
@@ -29764,7 +29814,6 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
             event.stopPropagation();
             return;
         }
-        handleSpreadsheetEditingEscape(event);
     };
     const handleSpreadsheetPointerDownCapture = (event)=>{
         releaseSpreadsheetSelectionRequest(selectionStateRef.current);
@@ -30135,7 +30184,7 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
         ]
     });
 }
-function focusSpreadsheetGrid(container, { focusOrigin = document.activeElement, forceInitial = true } = {}) {
+function focusSpreadsheetGrid(container, { focusOrigin = document.activeElement, forceCellEditingExit = false, forceInitial = true } = {}) {
     if (!container) return;
     spreadsheetFocusCleanups.get(container)?.();
     let remainingFrames = spreadsheetFocusRetryFrames;
@@ -30174,8 +30223,9 @@ function focusSpreadsheetGrid(container, { focusOrigin = document.activeElement,
     const restoreFocus = (force)=>{
         if (focusRestorationStopped) return;
         const activeElement = document.activeElement;
-        if (!force && isSpreadsheetCellEditingTarget(activeElement)) return void stopObservingFocusTarget();
-        if (!force && activeElement !== document.body && activeElement !== document.documentElement && activeElement !== commandTrigger && activeElement !== lastFocusedTarget) return void stopObservingFocusTarget();
+        const activeCellEditor = isSpreadsheetCellEditorTarget(activeElement);
+        if (!force && !forceCellEditingExit && isSpreadsheetCellEditingTarget(activeElement)) return void stopObservingFocusTarget();
+        if (!force && !(forceCellEditingExit && activeCellEditor) && activeElement !== document.body && activeElement !== document.documentElement && activeElement !== commandTrigger && activeElement !== lastFocusedTarget) return void stopObservingFocusTarget();
         const focusTarget = spreadsheetGridFocusTarget(container);
         if (focusTarget) {
             focusTarget.focus({

package/dist/internal/features/work/editors/controlled-editor-composition.d.ts

@@ -0,0 +1,20 @@
+import type { Editor } from '@tiptap/core';
+/**
+ * Keeps controlled TipTap editors from publishing or reconciling content while
+ * the browser and ProseMirror still own an IME composition. The zero-delay
+ * settlement lets ProseMirror flush WebKit's pending DOM records first; the
+ * bounded retries cover runtimes that keep `view.composing` true briefly after
+ * `compositionend` without adding work to ordinary keyboard input.
+ */
+export declare class ControlledEditorComposition {
+    private active;
+    private generation;
+    private settling;
+    private timer;
+    start(): void;
+    end(editor: Editor, onSettled: (editor: Editor) => void): void;
+    isBlocking(editor?: Editor | null): boolean;
+    destroy(): void;
+    private scheduleSettlement;
+    private cancelTimer;
+}

package/dist/internal/features/work/editors/spreadsheet-editor-support.d.ts

@@ -35,5 +35,6 @@ export declare function spreadsheetContentWithSelection(content: WorkSpreadsheet
 export declare function spreadsheetContentWithSelections(content: WorkSpreadsheetContent, sheetId: string, selections: readonly Selection[]): WorkSpreadsheetContent;
 export declare function isSpreadsheetNativeTextUndoTarget(target: EventTarget | null): boolean;
 export declare function isSpreadsheetCellEditingTarget(target: EventTarget | null): boolean;
+export declare function isSpreadsheetCellEditorTarget(target: EventTarget | null): boolean;
 export declare function spreadsheetFormulaBarSelectAllTarget(event: KeyboardEvent): HTMLElement | null;
 export declare function selectSpreadsheetFormulaBarContents(event: KeyboardEvent): boolean;

package/dist/internal/features/work/editors/spreadsheet-editor.d.ts

@@ -17,8 +17,9 @@ export interface SpreadsheetEditorProps {
     onAgentRequest?: (request: WorkEditorAgentRequest) => void | Promise<void>;
 }
 export declare function SpreadsheetEditor(props: SpreadsheetEditorProps): import("react").JSX.Element;
-export declare function focusSpreadsheetGrid(container: HTMLElement | null, { focusOrigin, forceInitial, }?: {
+export declare function focusSpreadsheetGrid(container: HTMLElement | null, { focusOrigin, forceCellEditingExit, forceInitial, }?: {
     focusOrigin?: Element | null;
+    forceCellEditingExit?: boolean;
     forceInitial?: boolean;
 }): void;
 export declare function preserveSpreadsheetGridFocus(container: HTMLElement | null, target: EventTarget | null): void;

package/dist/internal/features/work/editors/use-document-review-conflicts.d.ts

@@ -10,6 +10,8 @@ export interface UseDocumentReviewConflictsOptions {
     appliedSourceKeyRef: MutableValue<string>;
     artifactId?: string;
     content: WorkDocumentContent;
+    controlledUpdateRevision?: number;
+    deferControlledUpdates?: boolean;
     editor: Editor | null;
     editorInput: WorkDocumentEditorInput;
     normalizedContent: string;
@@ -17,7 +19,7 @@ export interface UseDocumentReviewConflictsOptions {
     publishedDocumentRef: MutableValue<Editor['state']['doc'] | null>;
     reconcileControlledUpdates?: boolean;
 }
-export declare function useDocumentReviewConflicts({ activeConflictsRef, appliedSourceKeyRef, artifactId, content, editor, editorInput, normalizedContent, onReviewConflict, publishedDocumentRef, reconcileControlledUpdates, }: UseDocumentReviewConflictsOptions): {
+export declare function useDocumentReviewConflicts({ activeConflictsRef, appliedSourceKeyRef, artifactId, content, controlledUpdateRevision, deferControlledUpdates, editor, editorInput, normalizedContent, onReviewConflict, publishedDocumentRef, reconcileControlledUpdates, }: UseDocumentReviewConflictsOptions): {
     dismiss: () => void;
     visibleConflicts: WorkDocumentReviewConflict[];
 };

package/docs/latest/en/browser-editor-architecture.md

@@ -644,6 +644,22 @@ The shell never searches visible labels, scrapes rendered text, or synthesizes
 clicks to infer product intent. This keeps localized UI copy independent from
 behavior and gives Worker/WASM operations a stable request contract.
 
+## Controlled rich-text IME boundary
+
+Document body text, visual Markdown, and Presentation text share one internal
+composition coordinator. `compositionstart` blocks host publication and
+controlled-value reconciliation. `compositionend` schedules settlement after
+the current task so ProseMirror can flush WebKit's pending DOM observer records;
+bounded 20 ms retries cover runtimes that briefly retain `view.composing`.
+Only the settled canonical value is published, and an authoritative host value
+received during composition is reconciled afterward.
+
+The coordinator creates no timers or extra renders for ordinary keyboard input.
+Focused component tests cover controlled echo and mid-composition host
+replacement. A dedicated Playwright WebKit gate exercises the browser event
+ordering, asserts zero publications for Pinyin pre-edit text, one publication
+for the committed Chinese value, and the same value after a controlled reopen.
+
 ## Markdown editing flow
 
 ```text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "description": "Open-source collaborative browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",
@@ -86,6 +86,7 @@
     "playground:bundle-check": "bun scripts/check-playground-bundle.ts",
     "playground:preview": "rspress preview -c website/rspress.config.ts --host 127.0.0.1 --port 4175",
     "playground:typecheck": "tsc --noEmit -p playground/tsconfig.json",
+    "playground:ime:webkit": "playwright test --config playwright.ime.config.ts",
     "playground:visual": "playwright test --config playwright.config.ts",
     "playground:visual:document-emphasis": "playwright test visual-tests/document-emphasis.functional.spec.ts --config playwright.config.ts",
     "playground:visual:document-index": "playwright test visual-tests/document-index.functional.spec.ts --config playwright.config.ts",