@a3s-lab/office 0.1.0 → 0.2.2

package/dist/0~markdown-editor.js

@@ -1440,6 +1440,7 @@ function MarkdownWorkspace({ editor, markdown, mode, readOnly = false, visualRea
     const releaseFrameRef = useRef(null);
     const sourceInputTypeRef = useRef(void 0);
     const [sourcePanePercent, setSourcePanePercent] = useState(DEFAULT_MARKDOWN_SPLIT_PERCENT);
+    const [compactPane, setCompactPane] = useState('source');
     const [resizing, setResizing] = useState(false);
     const showSource = !readOnly && 'visual' !== mode;
     const showVisual = readOnly || 'source' !== mode;
@@ -1538,16 +1539,40 @@ function MarkdownWorkspace({ editor, markdown, mode, readOnly = false, visualRea
     return /*#__PURE__*/ jsxs("div", {
         ref: workspaceRef,
         className: `work-markdown-workspace ${mode}`,
+        "data-compact-pane": 'split' === mode ? compactPane : void 0,
         "data-split-resizing": resizing || void 0,
         style: workspaceStyle,
         children: [
+            'split' === mode && /*#__PURE__*/ jsxs("fieldset", {
+                className: "work-markdown-compact-switch",
+                children: [
+                    /*#__PURE__*/ jsx("legend", {
+                        className: "sr-only",
+                        children: "分屏显示内容"
+                    }),
+                    /*#__PURE__*/ jsx("button", {
+                        type: "button",
+                        "aria-label": "显示源码窗格",
+                        "aria-pressed": 'source' === compactPane,
+                        onClick: ()=>setCompactPane('source'),
+                        children: "源码"
+                    }),
+                    /*#__PURE__*/ jsx("button", {
+                        type: "button",
+                        "aria-label": "显示预览窗格",
+                        "aria-pressed": 'preview' === compactPane,
+                        onClick: ()=>setCompactPane('preview'),
+                        children: "预览"
+                    })
+                ]
+            }),
             showSource && /*#__PURE__*/ jsxs("section", {
                 "aria-label": "Markdown 源码窗格",
                 className: "work-markdown-pane source",
                 children: [
                     'split' === mode && /*#__PURE__*/ jsx("header", {
                         className: "work-markdown-pane-label",
-                        children: "编辑"
+                        children: "源码"
                     }),
                     /*#__PURE__*/ jsx("textarea", {
                         ref: sourceRef,

package/dist/0~presentation-editor.js

@@ -15,8 +15,8 @@ import { createOfficeId as createWorkId } from "./1134.js";
 import { OfficeTableInsertPopover, readOfficeFileAsDataUrl } from "./0~9445.js";
 import { normalizePresentationChartLegendPosition, presentationChartDataLabelPositions, presentationChartDataLabelText, normalizePresentationBubbleSizeRepresents, parsePresentationChartCategories, presentationChartXValues, withPresentationChartLayout, presentationChartTypeLabel, presentationChartAxes, withPresentationChartSeriesAnalysis, presentationChartUsesNumericXAxis, presentationChartSupportsSeriesMarkers, presentationChartBubbleSizes, createPresentationChartElement, parsePresentationChartValueDraft, normalizePresentationChartDataLabelPosition, presentationChartSupportsAxisTitles, withPresentationChartDataLabels, withPresentationChartType, createPresentationChartSeries, presentationChartErrorBarCount, normalizePresentationScatterStyle, withPresentationChartSeriesStyle, normalizePresentationBubbleScale, presentationChartDataLabelPositionLabel, presentationChartShowsLegend, presentationChartTrendlineCount, presentationChartHasDataLabels, normalizeDoughnutHoleSize, withPresentationChartAxes } from "./0~work-presentation-charts.js";
 import { spreadsheetChartSeriesLayout, workSpreadsheetChartSupportsGrouping, normalizeWorkSpreadsheetChartSmoothLines, workSpreadsheetChartAxisIsValueAxis, fitSpreadsheetTrendline, spreadsheetChartSeriesLegendColor, normalizeWorkSpreadsheetChartSeriesStyle, spreadsheetChartCategoryVisualIndex, errorBarSourceValues, normalizeWorkSpreadsheetErrorBars, workSpreadsheetChartSupportsTrendlines, normalizeWorkSpreadsheetChartLegendOverlay, normalizeWorkSpreadsheetChartGapWidth, spreadsheetChartCategoryLabelVisible, spreadsheetChartAxisLabelLayout, workSpreadsheetChartSupportsSmoothLines, workSpreadsheetChartGroupingIsStacked, normalizeWorkSpreadsheetChartGrouping, workSpreadsheetChartSupportsBarSpacing, workSpreadsheetChartSupportsErrorBars, spreadsheetChartSeriesLineStyle, workSpreadsheetChartAxisDefaultLabelPosition, workSpreadsheetChartSupportsSeriesAnalysis, workSpreadsheetChartAxisIsCategoryAxis, spreadsheetErrorBarAmounts, spreadsheetChartAxisValueRatio, spreadsheetChartAxisScale, normalizeWorkSpreadsheetChartOverlap, spreadsheetChartBarGeometry, workSpreadsheetChartAxisShowsMajorGridlinesByDefault, spreadsheetChartAxisGridlinesVisible, normalizeWorkSpreadsheetTrendline, roundChartNumber, formatSpreadsheetChartAxisNumber, spreadsheetChartSeriesFillStyle } from "./8715.js";
-import { useOfficeEditorWheelZoom, office_text_field_OfficeTextArea, stepOfficeZoom, button_Button, CommittedOfficeTextArea, CommittedOfficeTextField, office_text_field_OfficeTextField, icon_button_IconButton, useDialogFocusScope, office_text_field_OfficeFileInput } from "./0~9512.js";
-import { useOfficeTaskPaneEscape, normalizeOfficeFontFamily, OfficeCheckbox, CommittedOfficeNumberField, officeFontFamilyLabel, useOfficeDialog, createOfficeKernelClient, officeFontFamilies, CollectionState, OfficeNumberField, handleOfficeTaskPaneKeyDown } from "./0~7048.js";
+import { useOfficeEditorWheelZoom, office_text_field_OfficeTextArea, stepOfficeZoom, button_Button, CommittedOfficeTextArea, CommittedOfficeTextField, office_text_field_OfficeTextField, useDialogFocusScope, icon_button_IconButton, office_text_field_OfficeFileInput } from "./0~9512.js";
+import { useOfficeTaskPaneEscape, normalizeOfficeFontFamily, OfficeCheckbox, CommittedOfficeNumberField, useOfficeTaskPaneModal, officeFontFamilyLabel, useOfficeDialog, officeFontFamilies, CollectionState, createOfficeKernelClient, OfficeNumberField, handleOfficeTaskPaneKeyDown } from "./0~7048.js";
 import { WorkspaceContextMenu, isWorkspaceContextMenuKeyboardEvent, WorkOfficeZoomControls, WorkOfficeStatusBar, WorkOfficeRibbon, workspaceContextMenuPosition, OfficeSelect, WorkOfficeRibbonGroup, WorkOfficePreviewBar, WorkOfficeRibbonButton } from "./0~4595.js";
 import { presentationAgentProposalTargets, SpreadsheetChartSeriesStyleEditor, applyPresentationAgentProposalChanges, normalizeOptionalOfficeNumber, SpreadsheetErrorBarEditor, useOfficeHistory, presentationNotesProposalTarget, presentationAgentSelection, SpreadsheetTrendlineEditor, presentationAgentMenuItems } from "./0~3539.js";
 import { createOfficeEditorExtension, useOfficeEditorRuntime, useOfficeEditorKeyboardShortcuts } from "./0~3557.js";
@@ -978,6 +978,7 @@ function PresentationChartSeriesAnalysisEditor({ chart, seriesIndex, onChange })
         ]
     });
 }
+const PRESENTATION_CHART_PANE_MODAL_QUERY = '(max-width: 1100px)';
 const CHART_TYPES = [
     'column',
     'bar',
@@ -989,7 +990,20 @@ const CHART_TYPES = [
     'scatter',
     'bubble'
 ];
-function PresentationChartPanel({ chart, onChange, onDelete, onClose }) {
+function PresentationChartPanel({ chart, onChange, onDelete, onClose, restoreFocusTarget }) {
+    const panelRef = useRef(null);
+    const closeRef = useRef(null);
+    const modal = useOfficeTaskPaneModal(PRESENTATION_CHART_PANE_MODAL_QUERY);
+    const modalAttributes = modal ? {
+        role: 'dialog',
+        'aria-modal': true
+    } : {};
+    const focusScope = useDialogFocusScope({
+        active: modal,
+        initialFocus: ()=>closeRef.current,
+        getActiveScope: ()=>panelRef.current,
+        restoreFocusTarget
+    });
     const numericXAxis = presentationChartUsesNumericXAxis(chart.type);
     const updateSeries = (index, patch)=>{
         onChange({
@@ -1001,9 +1015,14 @@ function PresentationChartPanel({ chart, onChange, onDelete, onClose }) {
         });
     };
     return /*#__PURE__*/ jsxs("section", {
+        ...modalAttributes,
+        ref: panelRef,
         className: "work-presentation-chart-panel",
         "aria-label": "演示图表数据",
-        onKeyDown: (event)=>handleOfficeTaskPaneKeyDown(event, onClose),
+        onKeyDown: (event)=>{
+            focusScope.handleKeyDown(event);
+            if (!event.defaultPrevented) handleOfficeTaskPaneKeyDown(event, onClose);
+        },
         children: [
             /*#__PURE__*/ jsxs("header", {
                 children: [
@@ -1031,6 +1050,7 @@ function PresentationChartPanel({ chart, onChange, onDelete, onClose }) {
                                 ]
                             }),
                             /*#__PURE__*/ jsx(icon_button_IconButton, {
+                                ref: closeRef,
                                 className: "close",
                                 label: "关闭演示图表数据",
                                 onClick: (event)=>{
@@ -1886,12 +1906,31 @@ function createPresentationEditorExtensions() {
         createPresentationKeyboardExtension()
     ];
 }
-function PresentationCommentsPanel({ slides, activeCommentId, commands }) {
+const PRESENTATION_COMMENTS_PANE_MODAL_QUERY = '(max-width: 640px)';
+function PresentationCommentsPanel({ slides, activeCommentId, commands, restoreFocusTarget }) {
+    const panelRef = useRef(null);
+    const closeRef = useRef(null);
+    const modal = useOfficeTaskPaneModal(PRESENTATION_COMMENTS_PANE_MODAL_QUERY);
+    const modalAttributes = modal ? {
+        role: 'dialog',
+        'aria-modal': true
+    } : {};
+    const focusScope = useDialogFocusScope({
+        active: modal,
+        initialFocus: ()=>closeRef.current,
+        getActiveScope: ()=>panelRef.current,
+        restoreFocusTarget
+    });
     const comments = presentationCommentViews(slides);
     return /*#__PURE__*/ jsxs("section", {
+        ...modalAttributes,
+        ref: panelRef,
         className: "work-presentation-comments-panel",
         "aria-label": "演示批注审阅",
-        onKeyDown: (event)=>handleOfficeTaskPaneKeyDown(event, commands.closeComments),
+        onKeyDown: (event)=>{
+            focusScope.handleKeyDown(event);
+            if (!event.defaultPrevented) handleOfficeTaskPaneKeyDown(event, commands.closeComments);
+        },
         children: [
             /*#__PURE__*/ jsxs("header", {
                 children: [
@@ -1901,11 +1940,12 @@ function PresentationCommentsPanel({ slides, activeCommentId, commands }) {
                                 children: "演示批注"
                             }),
                             /*#__PURE__*/ jsx("span", {
-                                children: comments.length ? `${comments.length} 条传统 PPTX 批注` : '没有批注'
+                                children: comments.length ? `${comments.length} 条批注` : '没有批注'
                             })
                         ]
                     }),
                     /*#__PURE__*/ jsx(icon_button_IconButton, {
+                        ref: closeRef,
                         className: "close",
                         label: "关闭演示批注审阅",
                         onClick: commands.closeComments,
@@ -7204,6 +7244,7 @@ function resolveHistorySlideSelection(currentContent, nextContent, currentSlideI
 function usePresentationReviewCommands({ content, onChange, onClearSelection, onCloseComments, onOpenComments, onSelectComment, onSelectSlide, selectedElement, selectedSlide }) {
     const officeDialog = useOfficeDialog();
     const addComment = useCallback(()=>{
+        const invoker = activePresentationReviewInvoker();
         officeDialog.prompt({
             title: '批注内容',
             multiline: true,
@@ -7228,7 +7269,7 @@ function usePresentationReviewCommands({ content, onChange, onClearSelection, on
                     ]
                 }), onChange);
             onSelectComment(comment.id);
-            onOpenComments();
+            onOpenComments(invoker);
         });
     }, [
         content,
@@ -7240,8 +7281,9 @@ function usePresentationReviewCommands({ content, onChange, onClearSelection, on
         selectedSlide.id
     ]);
     const openComment = useCallback((commentId)=>{
+        const invoker = activePresentationReviewInvoker();
         onSelectComment(commentId);
-        onOpenComments();
+        onOpenComments(invoker);
     }, [
         onOpenComments,
         onSelectComment
@@ -7288,6 +7330,9 @@ function usePresentationReviewCommands({ content, onChange, onClearSelection, on
         updateComment
     };
 }
+function activePresentationReviewInvoker() {
+    return "u" > typeof document && document.activeElement instanceof HTMLElement ? document.activeElement : null;
+}
 function usePresentationSelection(elements) {
     const [selectedElementIds, setSelectedElementIds] = useState([]);
     const [editingElementId, setEditingElementId] = useState(null);
@@ -7800,6 +7845,7 @@ function PresentationEditingSurface({ initialSlide, content, preview, saveStatus
     const [slideshowStartIndex, setSlideshowStartIndex] = useState(null);
     const [zoom, setZoom] = useState(90);
     const slideshowReturnFocusRef = useRef(null);
+    const commentsInvokerRef = useRef(null);
     const presentationRootRef = useRef(null);
     const canvasRef = useRef(null);
     const objectFocusStateRef = useRef({
@@ -7949,7 +7995,11 @@ function PresentationEditingSurface({ initialSlide, content, preview, saveStatus
     const closeComments = useCallback(()=>{
         setTaskPane((current)=>'comments' === current ? null : current);
     }, []);
-    const openComments = useCallback(()=>{
+    const openComments = useCallback((invoker)=>{
+        const activeElement = "u" > typeof document && document.activeElement instanceof HTMLElement ? document.activeElement : null;
+        const candidate = invoker ?? activeElement;
+        const fallback = presentationRootRef.current?.querySelector('.work-presentation-ribbon button[aria-label^="查看批注"]') ?? null;
+        commentsInvokerRef.current = !candidate?.isConnected || candidate.matches(':disabled') || candidate.closest('[hidden], [aria-hidden="true"]') ? fallback : candidate;
         if ('slide' !== designMode) {
             setDesignMode('slide');
             selection.clear();
@@ -7961,7 +8011,7 @@ function PresentationEditingSurface({ initialSlide, content, preview, saveStatus
     ]);
     const toggleComments = useCallback(()=>{
         if (commentsOpen) return void closeComments();
-        openComments();
+        openComments("u" > typeof document && document.activeElement instanceof HTMLElement ? document.activeElement : null);
     }, [
         closeComments,
         commentsOpen,
@@ -8237,7 +8287,12 @@ function PresentationEditingSurface({ initialSlide, content, preview, saveStatus
             commentsOpen && 'slide' === designMode && /*#__PURE__*/ jsx(PresentationCommentsPanel, {
                 slides: content.slides,
                 activeCommentId: activeCommentId,
-                commands: presentationCommands
+                commands: presentationCommands,
+                restoreFocusTarget: ()=>{
+                    const invoker = commentsInvokerRef.current;
+                    if (invoker?.isConnected && !invoker.matches(':disabled') && !invoker.closest('[hidden], [aria-hidden="true"]')) return invoker;
+                    return presentationRootRef.current?.querySelector('.work-presentation-ribbon button[aria-label^="查看批注"]') ?? null;
+                }
             }),
             /*#__PURE__*/ jsxs("div", {
                 className: "work-presentation-workspace",
@@ -8281,6 +8336,7 @@ function PresentationEditingSurface({ initialSlide, content, preview, saveStatus
                                 altText: chart.title || '演示图表'
                             }),
                         onDelete: presentationCommands.deleteSelection,
+                        restoreFocusTarget: ()=>presentationRootRef.current?.querySelector('.work-slide-element.chart.selected') ?? null,
                         onClose: closeChartPane
                     })
                 ]

package/dist/0~spreadsheet-editor.js

@@ -6,13 +6,13 @@ import { Fragment as external_react_Fragment, useCallback, useEffect, useId, use
 import { genarate, update as core_update } from "@fortune-sheet/core";
 import { withoutEditableRange, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, editableRangeRequiresCredentials, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, spreadsheetConditionalThresholdValue, normalizeSpreadsheetConditionalVisualOptions, withSheetProtection, spreadsheetProtectionKey, defaultSpreadsheetColorScaleThresholds, effectiveSpreadsheetPageSetup, protectedSheetCount, SPREADSHEET_CONDITIONAL_ICON_SETS, withSheetSelectionPermissions, withEditableRange, spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalComparisonOperator, drawSpreadsheetConditionalIcon, spreadsheetConditionalIconForValue, defaultSpreadsheetConditionalIconThresholds, sheetProtectionAuthority, spreadsheetConditionalThresholdsEqual, editableRangeCellCount, unlockedCellCount } from "./8728.js";
 import { showToast } from "./6489.js";
-import { useOfficeTaskPaneEscape, OfficeCheckbox, CommittedOfficeNumberField, useOfficeDialog, createOfficeKernelClient, isOfficeKernelSpreadsheetError, officeFontFamilies, CollectionState, office_kernel_spreadsheet_protocol_OFFICE_KERNEL_SPREADSHEET_MAX_ROWS, OfficeNumberField, handleOfficeTaskPaneKeyDown } from "./0~7048.js";
+import { useOfficeTaskPaneEscape, OfficeCheckbox, CommittedOfficeNumberField, useOfficeDialog, useOfficeTaskPaneModal, isOfficeKernelSpreadsheetError, officeFontFamilies, CollectionState, office_kernel_spreadsheet_protocol_OFFICE_KERNEL_SPREADSHEET_MAX_ROWS, OfficeNumberField, createOfficeKernelClient, handleOfficeTaskPaneKeyDown } from "./0~7048.js";
 import { isOfficeShortcutBlocked, OfficeColorPicker } from "./0~3635.js";
 import { createOfficeEditorExtension, useOfficeEditorRuntime, useOfficeEditorKeyboardShortcuts } from "./0~3557.js";
 import { workSpreadsheetChartSupportsGrouping, createSpreadsheetChartFromSelection, normalizeWorkSpreadsheetDataLabelPosition, normalizeSpreadsheetPrintTitleRows, normalizeSpreadsheetPrintTitleColumns, formulaHasStructuredReference, normalizeWorkSpreadsheetErrorBars, defaultPivotValueCaption, workSpreadsheetChartSupportsBarSpacing, normalizeWorkSpreadsheetChartGrouping, normalizeWorkSpreadsheetChartAxisGroup, normalizeWorkSpreadsheetScatterStyle, spreadsheetPivotAggregationLabel, workSpreadsheetChartAxisIsCategoryAxis, reconcileSpreadsheetChartPreviews, normalizeWorkSpreadsheetChartAxes, normalizeWorkSpreadsheetDoughnutHoleSize, normalizeWorkSpreadsheetChartLegendPosition, spreadsheetChartCount, workSpreadsheetChartTypeLabel, normalizeWorkSpreadsheetTrendline, spreadsheetPivotOutputContains, effectiveSpreadsheetCalculationSettings, normalizeWorkSpreadsheetDataLabels, spreadsheetPivotIntersects, normalizeSpreadsheetPrintArea, spreadsheetCellAddress, formatSpreadsheetCellRanges, normalizeWorkSpreadsheetChartLayout, spreadsheetFormulaRangeForCell, workSpreadsheetChartAxisIsValueAxis, normalizeWorkSpreadsheetChartSmoothLines, spreadsheetPivotFilterValueKey, normalizeWorkSpreadsheetBubbleScale, normalizeWorkSpreadsheetChartSeriesStyle, volatileSpreadsheetFormulaFunctions, normalizeWorkSpreadsheetBubbleSizeRepresents, workSpreadsheetChartSupportsTrendlines, normalizeWorkSpreadsheetChartLegendOverlay, parseSpreadsheetChartReference, workSpreadsheetChartGroupingIsStacked, normalizeWorkSpreadsheetChartGapWidth, workSpreadsheetChartSupportsSmoothLines, refreshSpreadsheetPivotTables, createSpreadsheetPivotFromSelection, spreadsheetPivotCount, reconcileSpreadsheetPivots, workSpreadsheetChartSupportsErrorBars, formulaHasExternalReference, isValidSpreadsheetDefinedName, spreadsheetPivotValidation, deleteSpreadsheetPivotTable, workSpreadsheetChartAxisDefaultLabelPosition, workSpreadsheetChartSupportsSeriesAnalysis, parseSpreadsheetCellRanges, spreadsheetPivotFields, spreadsheetPivotFilterItems, normalizeWorkSpreadsheetChartOverlap, spreadsheetFormulaRangeConflict, spreadsheetSheetsWithChartPreviews, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetChartAxisShowsMajorGridlinesByDefault, workSpreadsheetChartSupportsAxes, normalizeWorkSpreadsheetCombinationSeriesType, normalizeWorkSpreadsheetRadarStyle } from "./8715.js";
 import { unsupportedSpreadsheetFormulaFunctions } from "./0~work-spreadsheet-formula-support.js";
 import { WorkspaceContextMenu, isWorkspaceContextMenuKeyboardEvent, WorkOfficeZoomControls, WorkOfficeStatusBar, WorkOfficeRibbon, workspaceContextMenuPosition, OfficeSelect, WorkOfficeRibbonGroup, WorkOfficePreviewBar, WorkOfficeRibbonButton } from "./0~4595.js";
-import { button_Button, moveOfficeMenuFocus, stepOfficeZoom, icon_button_IconButton, office_text_field_OfficeTextField, Popover, useOfficeEditorWheelZoom } from "./0~9512.js";
+import { moveOfficeMenuFocus, stepOfficeZoom, Popover, button_Button, icon_button_IconButton, office_text_field_OfficeTextField, useDialogFocusScope, useOfficeEditorWheelZoom } from "./0~9512.js";
 import { useOfficeDraft } from "./0~use-office-draft.js";
 import { spreadsheetAgentMenuItems, SpreadsheetChartSeriesStyleEditor, normalizeOptionalOfficeNumber, normalizeRequiredOfficeNumber, SpreadsheetErrorBarEditor, useOfficeHistory, spreadsheetAgentSelection, SpreadsheetTrendlineEditor, applySpreadsheetAgentProposalChanges } from "./0~3539.js";
 import { StateView } from "./432.js";
@@ -8315,15 +8315,33 @@ function newRangeDraft() {
         reference: 'B2:B10'
     };
 }
-function SpreadsheetWorkbookPanel({ id, content, view, activeSheetId, selection, can, commands, onClose }) {
+function SpreadsheetWorkbookPanel({ id, content, view, activeSheetId, selection, can, commands, restoreFocusTarget, onClose }) {
     const title = panelTitle(view);
+    const panelRef = useRef(null);
+    const closeRef = useRef(null);
+    const modal = useOfficeTaskPaneModal();
+    const modalAttributes = modal ? {
+        role: 'dialog',
+        'aria-modal': true
+    } : {};
+    const focusScope = useDialogFocusScope({
+        active: modal,
+        initialFocus: ()=>closeRef.current,
+        getActiveScope: ()=>panelRef.current,
+        restoreFocusTarget
+    });
     useOfficeTaskPaneEscape(true, onClose);
     return /*#__PURE__*/ jsxs("section", {
+        ...modalAttributes,
+        ref: panelRef,
         id: id,
         className: "work-spreadsheet-workbook-panel",
         "aria-label": title.label,
         "data-view": view,
-        onKeyDown: (event)=>handleOfficeTaskPaneKeyDown(event, onClose),
+        onKeyDown: (event)=>{
+            focusScope.handleKeyDown(event);
+            if (!event.defaultPrevented) handleOfficeTaskPaneKeyDown(event, onClose);
+        },
         children: [
             /*#__PURE__*/ jsxs("header", {
                 children: [
@@ -8338,6 +8356,7 @@ function SpreadsheetWorkbookPanel({ id, content, view, activeSheetId, selection,
                         ]
                     }),
                     /*#__PURE__*/ jsx(icon_button_IconButton, {
+                        ref: closeRef,
                         label: `关闭${title.heading}`,
                         onClick: onClose,
                         children: /*#__PURE__*/ jsx(X, {
@@ -9712,9 +9731,13 @@ function SpreadsheetEditor({ content, kernelWasmUrl, preview, saveStatus = '已
     ]);
     const closeWorkbookPanel = useCallback(()=>{
         const trigger = panelTriggerRef.current;
-        panelTriggerRef.current = null;
         setPanel(null);
-        if (trigger?.isConnected) trigger.focus();
+        requestAnimationFrame(()=>{
+            if (trigger?.isConnected) trigger.focus({
+                preventScroll: true
+            });
+            if (panelTriggerRef.current === trigger) panelTriggerRef.current = null;
+        });
     }, []);
     const workbookHooks = useMemo(()=>({
             afterActivateSheet: (id)=>{
@@ -9875,7 +9898,7 @@ function SpreadsheetEditor({ content, kernelWasmUrl, preview, saveStatus = '已
     }, []);
     const closeSpreadsheetFind = useCallback(()=>{
         setFindOpen(false);
-        requestAnimationFrame(()=>focusSpreadsheetGrid(spreadsheetCanvasRef.current));
+        focusSpreadsheetGrid(spreadsheetCanvasRef.current);
     }, []);
     const selectSpreadsheetFindMatch = useCallback((match)=>{
         try {
@@ -10054,17 +10077,13 @@ function SpreadsheetEditor({ content, kernelWasmUrl, preview, saveStatus = '已
                 onOpenFind: openSpreadsheetFind,
                 onTabChange: (tab)=>{
                     setRibbonTab(tab);
-                    panelTriggerRef.current = null;
-                    setPanel(null);
+                    if (panel) closeWorkbookPanel();
+                },
+                onTogglePanel: (nextPanel, trigger)=>{
+                    if (panel === nextPanel) return void closeWorkbookPanel();
+                    panelTriggerRef.current = trigger;
+                    setPanel(nextPanel);
                 },
-                onTogglePanel: (nextPanel, trigger)=>setPanel((current)=>{
-                        if (current === nextPanel) {
-                            panelTriggerRef.current = null;
-                            return null;
-                        }
-                        panelTriggerRef.current = trigger;
-                        return nextPanel;
-                    }),
                 panel: panel,
                 toolbarCell: toolbarCell
             }),
@@ -10120,6 +10139,7 @@ function SpreadsheetEditor({ content, kernelWasmUrl, preview, saveStatus = '已
                         selection: selectionState?.sheetId === panelSheetId ? selectionState.selection : void 0,
                         can: spreadsheetCan,
                         commands: spreadsheetCommands,
+                        restoreFocusTarget: ()=>panelTriggerRef.current,
                         onClose: closeWorkbookPanel
                     })
                 ]