Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets-ui): should disable sheet menus on cell editing (#3809)
zhangwe75801346f1c
diff --git a/packages/core/src/docs/data-model/text-x/build-utils/custom-range.ts b/packages/core/src/docs/data-model/text-x/build-utils/custom-range.tsindex 0d74caf06a..719f8ac6d2 100644--- a/packages/core/src/docs/data-model/text-x/build-utils/custom-range.ts+++ b/packages/core/src/docs/data-model/text-x/build-utils/custom-range.ts@@ -23,6 +23,14 @@ export function isCustomRangeSplitSymbol(text: string) {return text === DataStreamTreeTokenType.CUSTOM_RANGE_END || text === DataStreamTreeTokenType.CUSTOM_RANGE_START;}+/**+ * Check if two ranges intersect+ * @param line1Start - The start of the first range+ * @param line1End - The end of the first range+ * @param line2Start - The start of the second range+ * @param line2End - The end of the second range+ * @returns True if the ranges intersect, false otherwise+ */export function isIntersecting(line1Start: number, line1End: number, line2Start: number, line2End: number) {if ((line1Start <= line2Start && line1End >= line2Start) ||(line1Start >= line2Start && line1Start <= line2End)) {diff --git a/packages/core/src/docs/data-model/text-x/build-utils/selection.ts b/packages/core/src/docs/data-model/text-x/build-utils/selection.tsindex 27f5da4037..66f62fcee4 100644--- a/packages/core/src/docs/data-model/text-x/build-utils/selection.ts+++ b/packages/core/src/docs/data-model/text-x/build-utils/selection.ts@@ -239,7 +239,7 @@ export function getRetainAndDeleteFromReplace(const textStart = startOffset - memoryCursor;const textEnd = endOffset - memoryCursor;const dataStream = body.dataStream;- const relativeCustomRanges = body.customRanges?.filter((customRange) => isIntersecting(customRange.startIndex, customRange.endIndex, startOffset, endOffset));+ const relativeCustomRanges = body.customRanges?.filter((customRange) => isIntersecting(customRange.startIndex, customRange.endIndex, startOffset, endOffset - 1));const toDeleteRanges = new Set(relativeCustomRanges?.filter((customRange) => shouldDeleteCustomRange(startOffset, endOffset - startOffset, customRange, dataStream)));const retainPoints = new Set<number>();relativeCustomRanges?.forEach((range) => {diff --git a/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts b/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.tsindex bbbc158257..c4572256a7 100644--- a/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts+++ b/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts@@ -256,7 +256,7 @@ export function getRetainAndDeleteAndExcludeLineBreak((p) => p.startIndex - memoryCursor >= textStart && p.startIndex - memoryCursor < textEnd);- const relativeCustomRanges = body.customRanges?.filter((customRange) => isIntersecting(customRange.startIndex, customRange.endIndex, startOffset, endOffset));+ const relativeCustomRanges = body.customRanges?.filter((customRange) => isIntersecting(customRange.startIndex, customRange.endIndex, startOffset, endOffset - 1));const toDeleteRanges = new Set(relativeCustomRanges?.filter((customRange) => shouldDeleteCustomRange(startOffset, endOffset - startOffset, customRange, dataStream)));const retainPoints = new Set<number>();relativeCustomRanges?.forEach((range) => {diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx b/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsxindex bcd891061c..f16e1ce0b3 100644--- a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx+++ b/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx@@ -14,14 +14,12 @@* limitations under the License.*/+import type { DocumentDataModel } from '@univerjs/core';import { BuildTextUtils, getBodySlice, ICommandService, IUniverInstanceService, LocaleService, Tools, UniverInstanceType, useDependency, useObservable } from '@univerjs/core';import { Button, FormLayout, Input } from '@univerjs/design';import { DocSelectionManagerService } from '@univerjs/docs';-import { DocSelectionRenderService } from '@univerjs/docs-ui';-import { IRenderManagerService } from '@univerjs/engine-render';import { KeyCode } from '@univerjs/ui';import React, { useEffect, useState } from 'react';-import type { DocumentDataModel } from '@univerjs/core';import { AddDocHyperLinkCommand } from '../../commands/commands/add-link.command';import { UpdateDocHyperLinkCommand } from '../../commands/commands/update-link.command';import { DocHyperLinkPopupService } from '../../services/hyper-link-popup.service';@@ -47,7 +45,6 @@ export const DocHyperLinkEdit = () => {const editing = useObservable(hyperLinkService.editingLink$);const commandService = useDependency(ICommandService);const univerInstanceService = useDependency(IUniverInstanceService);- const renderManagerService = useDependency(IRenderManagerService);const docSelectionManagerService = useDependency(DocSelectionManagerService);const [link, setLink] = useState('');@@ -58,8 +55,6 @@ export const DocHyperLinkEdit = () => {? univerInstanceService.getUnit<DocumentDataModel>(editing.unitId, UniverInstanceType.UNIVER_DOC) :univerInstanceService.getCurrentUnitForType<DocumentDataModel>(UniverInstanceType.UNIVER_DOC);- const docSelectionRenderService = renderManagerService.getRenderById(doc!.getUnitId())?.with(DocSelectionRenderService);-useEffect(() => {const activeRange = docSelectionManagerService.getActiveTextRange();if (!activeRange) {@@ -82,19 +77,6 @@ export const DocHyperLinkEdit = () => {}}, [doc, editing, docSelectionManagerService, univerInstanceService]);- // TODO: @zhangwei, do not use docSelectionRenderService in this component.- useEffect(() => {- if (docSelectionRenderService) {- docSelectionRenderService.blurEditor();- }-- return () => {- if (docSelectionRenderService) {- docSelectionRenderService.focusEditor();- }- };- }, [docSelectionRenderService]);-const handleCancel = () => {hyperLinkService.hideEditPopup();};diff --git a/packages/docs-ui/src/services/doc-state-change-manager.service.ts b/packages/docs-ui/src/services/doc-state-change-manager.service.tsindex 9dc023de7b..5f8e3a87c4 100644--- a/packages/docs-ui/src/services/doc-state-change-manager.service.ts+++ b/packages/docs-ui/src/services/doc-state-change-manager.service.ts@@ -81,8 +81,8 @@ export class DocStateChangeManagerService extends RxDisposable {return;}- const { isCompositionEnd, ...changeState } = changeStateInfo;- const imeInputManagerService = this._renderManagerService.getRenderById(changeStateInfo.unitId)?.with(DocIMEInputManagerService);+ const { isCompositionEnd, isSync, syncer, ...changeState } = changeStateInfo;+ const imeInputManagerService = this._renderManagerService.getRenderById(isSync ? syncer! : changeStateInfo.unitId)?.with(DocIMEInputManagerService);if (imeInputManagerService == null) {return;diff --git a/packages/docs/src/commands/mutations/core-editing.mutation.ts b/packages/docs/src/commands/mutations/core-editing.mutation.tsindex c2532f0d7d..afd42631d5 100644--- a/packages/docs/src/commands/mutations/core-editing.mutation.ts+++ b/packages/docs/src/commands/mutations/core-editing.mutation.ts@@ -37,6 +37,7 @@ export interface IRichTextEditingMutationParams extends IMutationCommonParams {// Whether this mutation is from a sync operation.isSync?: boolean;isEditing?: boolean;+ syncer?: string;}const RichTextEditingMutationId = 'doc.mutation.rich-text-editing';@@ -50,6 +51,7 @@ export const RichTextEditingMutation: IMutation<IRichTextEditingMutationParams,type: CommandType.MUTATION,+ // eslint-disable-next-line max-lines-per-functionhandler: (accessor, params) => {const {unitId,@@ -63,8 +65,9 @@ export const RichTextEditingMutation: IMutation<IRichTextEditingMutationParams,noNeedSetTextRange,debounce,isEditing = true,+ isSync,+ syncer,} = params;-const univerInstanceService = accessor.get(IUniverInstanceService);const renderManagerService = accessor.get(IRenderManagerService);const docStateEmitService = accessor.get(DocStateEmitService);@@ -100,7 +103,7 @@ export const RichTextEditingMutation: IMutation<IRichTextEditingMutationParams,// Make sure update cursor & selection after doc skeleton is calculated.if (!noNeedSetTextRange && textRanges && trigger != null) {queueMicrotask(() => {- docSelectionManagerService.replaceTextRanges(textRanges, isEditing, params.options);+ docSelectionManagerService.replaceDocRanges(textRanges, { unitId, subUnitId: unitId }, isEditing, params.options);});}@@ -121,6 +124,8 @@ export const RichTextEditingMutation: IMutation<IRichTextEditingMutationParams,textRanges: prevTextRanges ?? docRanges,},isCompositionEnd,+ isSync,+ syncer,};docStateEmitService.emitStateChangeInfo(changeState);diff --git a/packages/docs/src/services/doc-state-emit.service.ts b/packages/docs/src/services/doc-state-emit.service.tsindex 8763ac6c23..a88868f80e 100644--- a/packages/docs/src/services/doc-state-emit.service.ts+++ b/packages/docs/src/services/doc-state-emit.service.ts@@ -14,10 +14,10 @@* limitations under the License.*/-import { RxDisposable } from '@univerjs/core';-import { BehaviorSubject } from 'rxjs';import type { JSONXActions, Nullable } from '@univerjs/core';import type { ITextRangeWithStyle } from '@univerjs/engine-render';+import { RxDisposable } from '@univerjs/core';+import { BehaviorSubject } from 'rxjs';interface IDocChangeState {actions: JSONXActions;@@ -37,6 +37,8 @@ export interface IDocStateChangeParams {export interface IDocStateChangeInfo extends IDocStateChangeParams {isCompositionEnd?: boolean;+ isSync?: boolean;+ syncer?: string;}export class DocStateEmitService extends RxDisposable {diff --git a/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx b/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsxindex 52d908b34f..c9b02d3921 100644--- a/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/date-dropdown/index.tsx@@ -16,12 +16,16 @@import type { CellValue, Nullable } from '@univerjs/core';import type { DateValidator } from '@univerjs/sheets-data-validation';+import type { IEditorBridgeServiceVisibleParam } from '@univerjs/sheets-ui';import type { IDropdownComponentProps } from '../../../services/dropdown-manager.service';import { CellValueType, DataValidationErrorStyle, ICommandService, LocaleService, numfmt, useDependency } from '@univerjs/core';import { Button, DatePanel } from '@univerjs/design';+import { DeviceInputEventType } from '@univerjs/engine-render';import { SetRangeValuesCommand } from '@univerjs/sheets';import { getCellValueOrigin } from '@univerjs/sheets-data-validation';import { getPatternType } from '@univerjs/sheets-numfmt';+import { SetCellEditVisibleOperation } from '@univerjs/sheets-ui';+import { KeyCode } from '@univerjs/ui';import dayjs from 'dayjs';import utc from 'dayjs/plugin/utc';import React, { useState } from 'react';@@ -90,7 +94,13 @@ export function DateDropdown(props: IDropdownComponentProps) {t: CellValueType.NUMBER,}, rule))) {- commandService.executeCommand(SetRangeValuesCommand.id, {+ await commandService.executeCommand(SetCellEditVisibleOperation.id, {+ visible: false,+ eventType: DeviceInputEventType.Keyboard,+ unitId,+ keycode: KeyCode.ESC,+ } as IEditorBridgeServiceVisibleParam);+ await commandService.executeCommand(SetRangeValuesCommand.id, {unitId,subUnitId,range: {diff --git a/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx b/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsxindex bd1f4ff1bf..d6202263ea 100644--- a/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx+++ b/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx@@ -18,6 +18,7 @@ import type { DocumentDataModel } from '@univerjs/core';import type { IRichTextEditingMutationParams } from '@univerjs/docs';import type { ISetRangeValuesCommandParams, ISheetLocation } from '@univerjs/sheets';import type { ListMultipleValidator } from '@univerjs/sheets-data-validation';+import type { IEditorBridgeServiceVisibleParam } from '@univerjs/sheets-ui';import type { IUniverSheetsDataValidationUIConfig } from '../../../controllers/config.schema';import type { IDropdownComponentProps } from '../../../services/dropdown-manager.service';import { BuildTextUtils, DataValidationRenderMode, DataValidationType, ICommandService, IConfigService, IUniverInstanceService, LocaleService, UniverInstanceType, useDependency } from '@univerjs/core';@@ -28,7 +29,7 @@ import { DeviceInputEventType } from '@univerjs/engine-render';import { CheckMarkSingle } from '@univerjs/icons';import { RangeProtectionPermissionEditPoint, SetRangeValuesCommand, WorkbookEditablePermission, WorksheetEditPermission } from '@univerjs/sheets';import { deserializeListOptions, getDataValidationCellValue, serializeListOptions } from '@univerjs/sheets-data-validation';-import { IEditorBridgeService, SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';+import { IEditorBridgeService, SetCellEditVisibleOperation, SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';import { KeyCode, useObservable } from '@univerjs/ui';import React, { useEffect, useMemo, useState } from 'react';import { debounceTime } from 'rxjs';@@ -204,7 +205,7 @@ export function ListDropDown(props: IDropdownComponentProps) {title={multiple ? localeService.t('dataValidation.listMultiple.dropdown') : localeService.t('dataValidation.list.dropdown')}value={value}multiple={multiple}- onChange={(newValue) => {+ onChange={async (newValue) => {const str = serializeListOptions(newValue);const params: ISetRangeValuesCommandParams = {unitId,@@ -232,6 +233,12 @@ export function ListDropDown(props: IDropdownComponentProps) {});}+ await commandService.executeCommand(SetCellEditVisibleOperation.id, {+ visible: false,+ eventType: DeviceInputEventType.Keyboard,+ unitId,+ keycode: KeyCode.ESC,+ } as IEditorBridgeServiceVisibleParam);commandService.executeCommand(SetRangeValuesCommand.id, params);setLocalValue(str);if (!multiple) {diff --git a/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts b/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.tsindex 1258d28f23..91922e20d5 100644--- a/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts+++ b/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts@@ -17,7 +17,6 @@import type { ICellData, ICommand, IDocumentData, IMutationInfo, Workbook } from '@univerjs/core';import type { ISetRangeValuesMutationParams } from '@univerjs/sheets';import { BuildTextUtils, CellValueType, CommandType, CustomRangeType, DataStreamTreeTokenType, generateRandomId, ICommandService, IUndoRedoService, IUniverInstanceService, sequenceExecuteAsync, TextX, Tools, UniverInstanceType } from '@univerjs/core';-import { DocSelectionManagerService } from '@univerjs/docs';import { addCustomRangeBySelectionFactory } from '@univerjs/docs-ui';import { IRenderManagerService } from '@univerjs/engine-render';import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';@@ -194,13 +193,9 @@ export const AddRichHyperLinkCommand: ICommand<IAddRichHyperLinkCommandParams> =}const { documentId, link } = params;const commandService = accessor.get(ICommandService);- const textSelectionService = accessor.get(DocSelectionManagerService);const newId = generateRandomId();const { payload } = link;- const range = textSelectionService.getActiveTextRange();- if (!range) {- return false;- }+const replaceSelection = addCustomRangeBySelectionFactory(accessor, {unitId: documentId,rangeId: newId,diff --git a/packages/sheets-hyper-link-ui/src/controllers/menu.ts b/packages/sheets-hyper-link-ui/src/controllers/menu.tsindex 7d96cf761b..d12573580c 100644--- a/packages/sheets-hyper-link-ui/src/controllers/menu.ts+++ b/packages/sheets-hyper-link-ui/src/controllers/menu.ts@@ -14,19 +14,19 @@* limitations under the License.*/+import type { IAccessor, Workbook } from '@univerjs/core';+import type { IMenuItem, IShortcutItem } from '@univerjs/ui';import { DOCS_ZEN_EDITOR_UNIT_ID_KEY, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { DocSelectionManagerService } from '@univerjs/docs';import { getSheetCommandTarget, RangeProtectionPermissionEditPoint, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetInsertHyperlinkPermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';import { getCurrentRangeDisable$, IEditorBridgeService, whenSheetEditorFocused } from '@univerjs/sheets-ui';import { getMenuHiddenObservable, KeyCode, MenuGroup, MenuItemType, MenuPosition, MetaKeys } from '@univerjs/ui';import { map, mergeMap, Observable } from 'rxjs';-import type { IAccessor, Workbook } from '@univerjs/core';-import type { IMenuItem, IShortcutItem } from '@univerjs/ui';import { InsertHyperLinkOperation, InsertHyperLinkToolbarOperation } from '../commands/operations/popup.operations';import { getShouldDisableCellLink, shouldDisableAddLink } from '../utils';const getLinkDisable$ = (accessor: IAccessor) => {- const disableRange$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission], rangeTypes: [RangeProtectionPermissionEditPoint] });+ const disableRange$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true);const univerInstanceService = accessor.get(IUniverInstanceService);const sheetSelectionService = accessor.get(SheetsSelectionsService);const disableCell$ = univerInstanceService.focused$.pipe(diff --git a/packages/sheets-hyper-link-ui/src/controllers/popup.controller.ts b/packages/sheets-hyper-link-ui/src/controllers/popup.controller.tsindex 13bf1ddad7..510edba291 100644--- a/packages/sheets-hyper-link-ui/src/controllers/popup.controller.ts+++ b/packages/sheets-hyper-link-ui/src/controllers/popup.controller.ts@@ -236,6 +236,9 @@ export class SheetsHyperLinkPopupController extends Disposable {this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.EDITING);this._sheetsHyperLinkPopupService.endEditing(HyperLinkEditSourceType.EDITING);this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.VIEWING);+ } else {+ this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.ZEN_EDITOR);+ this._sheetsHyperLinkPopupService.endEditing(HyperLinkEditSourceType.ZEN_EDITOR);}}));diff --git a/packages/sheets-hyper-link-ui/src/utils/index.ts b/packages/sheets-hyper-link-ui/src/utils/index.tsindex f6b862959b..29030e023b 100644--- a/packages/sheets-hyper-link-ui/src/utils/index.ts+++ b/packages/sheets-hyper-link-ui/src/utils/index.ts@@ -14,10 +14,10 @@* limitations under the License.*/+import type { DocumentDataModel, IAccessor, ITextRange, Workbook, Worksheet } from '@univerjs/core';import { BuildTextUtils, CustomRangeType, DataValidationType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { DocSelectionManagerService } from '@univerjs/docs';import { SheetsSelectionsService } from '@univerjs/sheets';-import type { DocumentDataModel, IAccessor, ITextRange, Workbook, Worksheet } from '@univerjs/core';export const getShouldDisableCellLink = (worksheet: Worksheet, row: number, col: number) => {const cell = worksheet.getCell(row, col);@@ -67,10 +67,10 @@ export const shouldDisableAddLink = (accessor: IAccessor) => {}const body = doc.getSelfOrHeaderFooterModel(activeRange.segmentId).getBody();- const paragraphs = body?.paragraphs;- if (!paragraphs) {+ if (!body) {return true;}+ const paragraphs = body?.paragraphs ?? [];for (let i = 0, len = paragraphs.length; i < len; i++) {const p = paragraphs[i];diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsxindex 1da8724263..c645eff7e8 100644--- a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx@@ -221,11 +221,20 @@ export const CellLinkEdit = () => {};}, [editing, markSelectionService, themeService, univerInstanceService]);+ useEffect(() => {+ if (type === SheetHyperLinkType.RANGE && !showLabel && !isFocusRangeSelector) {+ isFocusRangeSelectorSet(true);+ }+ }, [type, isFocusRangeSelector, showLabel, editorBridgeService]);+const payloadInitial = useMemo(() => payload, [type]);useEffect(() => {- const render = renderManagerService.getRenderById(editorBridgeService.getCurrentEditorId());+ const render = editing?.type === HyperLinkEditSourceType.ZEN_EDITOR ?+ renderManagerService.getRenderById(DOCS_ZEN_EDITOR_UNIT_ID_KEY) :+ renderManagerService.getRenderById(editorBridgeService.getCurrentEditorId());const disposeCollection = new DisposableCollection();+if (render) {const selectionRenderService = render.with(DocSelectionRenderService);selectionRenderService.setReserveRangesStatus(true);@@ -241,11 +250,11 @@ export const CellLinkEdit = () => {}, [editorBridgeService, renderManagerService]);useEffect(() => {- popupService.setIsKeepVisible(type === SheetHyperLinkType.RANGE);+ popupService.setIsKeepVisible(isFocusRangeSelector);return () => {popupService.setIsKeepVisible(false);};- }, [type]);+ }, [isFocusRangeSelector, popupService]);useEffect(() => {return () => {@@ -445,7 +454,7 @@ export const CellLinkEdit = () => {}}}placeholder={localeService.t('hyperLink.form.linkPlaceholder')}- autoFocus={!showLabel}+ autoFocusonKeyDown={(e) => {if (e.keyCode === KeyCode.ENTER) {handleSubmit();@@ -491,11 +500,8 @@ export const CellLinkEdit = () => {const range = docSelectionManagerService.getTextRanges({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY })?.[0];if (docBackScrollRenderController && range) {- // TODO: this was hacking- setTimeout(() => {- docBackScrollRenderController.scrollToRange(range);- docSelectionManagerService.refreshSelection({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY });- }, 100);+ docBackScrollRenderController.scrollToRange(range);+ docSelectionManagerService.refreshSelection({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY });}}editorBridgeService.disableForceKeepVisible();diff --git a/packages/sheets-ui/src/commands/commands/inline-format.command.ts b/packages/sheets-ui/src/commands/commands/inline-format.command.tsindex 893fc645b8..55a84c03e8 100644--- a/packages/sheets-ui/src/commands/commands/inline-format.command.ts+++ b/packages/sheets-ui/src/commands/commands/inline-format.command.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import type { ICommand } from '@univerjs/core';import { CommandType, EDITOR_ACTIVATED, ICommandService, IContextService } from '@univerjs/core';import { SetInlineFormatBoldCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand } from '@univerjs/docs-ui';import {@@ -25,7 +26,6 @@ import {SetTextColorCommand,SetUnderlineCommand,} from '@univerjs/sheets';-import type { ICommand } from '@univerjs/core';/*** It is used to set the bold style of selections or one cell, need to distinguish between@@ -176,3 +176,19 @@ export const SetRangeTextColorCommand: ICommand = {return commandService.executeCommand(SetTextColorCommand.id, params);},};++export const ResetRangeTextColorCommand: ICommand = {+ type: CommandType.COMMAND,+ id: 'sheet.command.reset-range-text-color',+ handler: async (accessor) => {+ const commandService = accessor.get(ICommandService);+ const contextService = accessor.get(IContextService);+ const isCellEditorFocus = contextService.getContextValue(EDITOR_ACTIVATED);++ if (isCellEditorFocus) {+ return commandService.executeCommand(SetInlineFormatTextColorCommand.id, { value: null });+ }++ return commandService.executeCommand(SetTextColorCommand.id, { value: null });+ },+};diff --git a/packages/sheets-ui/src/controllers/editor/data-sync.controller.ts b/packages/sheets-ui/src/controllers/editor/data-sync.controller.tsindex 5e6d42c8d1..546b52f007 100644--- a/packages/sheets-ui/src/controllers/editor/data-sync.controller.ts+++ b/packages/sheets-ui/src/controllers/editor/data-sync.controller.ts@@ -185,6 +185,7 @@ export class EditorDataSyncController extends Disposable {...parmas,isSync: true,unitId,+ syncer: parmas.unitId,});docViewModel.reset(docDataModel);diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.tsindex bdfd143e5d..0cb417d979 100644--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts@@ -107,7 +107,8 @@ export class EditingRenderController extends Disposable implements IRenderModule@ICommandService private readonly _commandService: ICommandService,@Inject(LocaleService) protected readonly _localService: LocaleService,@IEditorService private readonly _editorService: IEditorService,- @Inject(SheetCellEditorResizeService) private readonly _sheetCellEditorResizeService: SheetCellEditorResizeService+ @Inject(SheetCellEditorResizeService) private readonly _sheetCellEditorResizeService: SheetCellEditorResizeService,+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService) {super();@@ -694,23 +695,29 @@ export class EditingRenderController extends Disposable implements IRenderModulereturn;}- const { documentLayoutObject, editorUnitId } = editCellState;+ const { documentLayoutObject } = editCellState;const documentDataModel = documentLayoutObject.documentModel;if (documentDataModel == null) {return;}- const snapshot = Tools.deepClone(documentDataModel.getSnapshot());- const documentViewModel = this._getEditorViewModel(editorUnitId);+ const empty = (documentDataModel: DocumentDataModel) => {+ const snapshot = Tools.deepClone(documentDataModel.getSnapshot());+ const documentViewModel = this._getEditorViewModel(documentDataModel.getUnitId());- if (documentViewModel == null) {- return;- }+ if (documentViewModel == null) {+ return;+ }++ resetBodyStyle(snapshot.body!, removeStyle);- resetBodyStyle(snapshot.body!, removeStyle);+ documentDataModel.reset(snapshot);+ documentViewModel.reset(documentDataModel);+ };- documentDataModel.reset(snapshot);- documentViewModel.reset(documentDataModel);+ empty(documentDataModel);+ const formulaDocument = this._univerInstanceService.getUnit<DocumentDataModel>(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, UniverInstanceType.UNIVER_DOC);+ formulaDocument && empty(formulaDocument);}}diff --git a/packages/sheets-ui/src/controllers/menu/menu-util.ts b/packages/sheets-ui/src/controllers/menu/menu-util.tsindex b3dcc792f5..6e9a8f0433 100644--- a/packages/sheets-ui/src/controllers/menu/menu-util.ts+++ b/packages/sheets-ui/src/controllers/menu/menu-util.ts@@ -14,11 +14,12 @@* limitations under the License.*/-import { FOCUSING_COMMON_DRAWINGS, IContextService, IPermissionService, IUniverInstanceService, Rectangle, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';-import { IExclusiveRangeService, RangeProtectionPermissionEditPoint, RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetEditPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';-import { combineLatest, debounceTime, map, merge, of, startWith, switchMap } from 'rxjs';import type { IAccessor, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';import type { Observable } from 'rxjs';+import { FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, IContextService, IPermissionService, IUniverInstanceService, Rectangle, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';+import { IExclusiveRangeService, RangeProtectionPermissionEditPoint, RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetEditPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';+import { combineLatest, debounceTime, map, merge, of, startWith, switchMap } from 'rxjs';+import { IEditorBridgeService } from '../../services/editor-bridge.service';interface IActive {workbook: Workbook;@@ -95,14 +96,23 @@ export function getObservableWithExclusiveRange$(accessor: IAccessor, observable);}-export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IPermissionTypes = {}) {+// eslint-disable-next-line max-lines-per-function+export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IPermissionTypes = {}, supportCellEdit = false) {const univerInstanceService = accessor.get(IUniverInstanceService);const workbook$ = univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET);const userManagerService = accessor.get(UserManagerService);-- return combineLatest([userManagerService.currentUser$, workbook$]).pipe(- switchMap(([_, workbook]) => {- if (!workbook) {+ const editorBridgeService = accessor.has(IEditorBridgeService) ? accessor.get(IEditorBridgeService) : null;+ const contextService = accessor.get(IContextService);+ const formulaEditorFocus$ = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR);+ const editorVisible$ = editorBridgeService?.visible$ ?? of(null);++ return combineLatest([userManagerService.currentUser$, workbook$, editorVisible$, formulaEditorFocus$]).pipe(+ switchMap(([_, workbook, visible, formulaEditorFocus]) => {+ if (+ !workbook ||+ (visible?.visible && visible.unitId === workbook.getUnitId() && !supportCellEdit) ||+ (formulaEditorFocus && !supportCellEdit)+ ) {return of(true);}diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.tsindex 7f0cd74b35..8353ffb5c0 100644--- a/packages/sheets-ui/src/controllers/menu/menu.ts+++ b/packages/sheets-ui/src/controllers/menu/menu.ts@@ -14,6 +14,8 @@* limitations under the License.*/+import type { IAccessor } from '@univerjs/core';+import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';import {BooleanNumber,DEFAULT_STYLES,@@ -32,14 +34,13 @@ import {VerticalAlign,WrapStrategy,} from '@univerjs/core';+import { DocSelectionManagerService, SetTextSelectionsOperation } from '@univerjs/docs';import { SetInlineFormatCommand } from '@univerjs/docs-ui';-import {RangeProtectionPermissionEditPoint,RangeProtectionPermissionViewPoint,ResetBackgroundColorCommand,- ResetTextColorCommand,SetBackgroundColorCommand,SetColHiddenMutation,SetColVisibleMutation,@@ -77,10 +78,8 @@ import {IClipboardInterfaceService,MenuItemType,} from '@univerjs/ui';-import { combineLatestWith, map, Observable } from 'rxjs';-import type { IAccessor } from '@univerjs/core';-import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';+import { combineLatestWith, map, Observable } from 'rxjs';import {SheetCopyCommand,SheetCutCommand,@@ -92,6 +91,7 @@ import {} from '../../commands/commands/clipboard.command';import { HideColConfirmCommand, HideRowConfirmCommand } from '../../commands/commands/hide-row-col-confirm.command';import {+ ResetRangeTextColorCommand,SetRangeBoldCommand,SetRangeFontFamilyCommand,SetRangeFontSizeCommand,@@ -149,7 +149,7 @@ export function FormatPainterMenuItemFactory(accessor: IAccessor): IMenuButtonIt};}),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),};}@@ -165,7 +165,7 @@ export function BoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {icon: 'BoldSingle',title: 'Set bold',tooltip: 'toolbar.bold',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {const disposable = commandService.onCommandExecuted((c) => {const id = c.id;@@ -227,7 +227,15 @@ export function ItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {icon: 'ItalicSingle',title: 'Set italic',tooltip: 'toolbar.italic',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(+ accessor,+ {+ workbookTypes: [WorkbookEditablePermission],+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],+ rangeTypes: [RangeProtectionPermissionEditPoint],+ },+ true+ ),activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {const disposable = commandService.onCommandExecuted((c) => {const id = c.id;@@ -318,7 +326,7 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {subscriber.next(!!(isUnderline && isUnderline.s));return disposable.dispose;})),- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}@@ -335,7 +343,7 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIticon: 'StrikethroughSingle',title: 'Set strike through',tooltip: 'toolbar.strikethrough',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {const disposable = commandService.onCommandExecuted((c) => {const id = c.id;@@ -401,7 +409,7 @@ export function FontFamilySelectorMenuItemFactory(accessor: IAccessor): IMenuSelvalue: item.value,})),- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, ({ worksheet }) => new Observable((subscriber) => {const disposable = commandService.onCommandExecuted((c) => {const id = c.id;@@ -440,7 +448,7 @@ export function FontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuSelecconst contextService = accessor.get(IContextService);const defaultValue = DEFAULT_STYLES.fs;- const disabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] });+ const disabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true);return {id: SetRangeFontSizeCommand.id,@@ -501,11 +509,11 @@ export function FontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuSelecexport function ResetTextColorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {return {- id: ResetTextColorCommand.id,+ id: ResetRangeTextColorCommand.id,type: MenuItemType.BUTTON,title: 'toolbar.resetColor',icon: 'NoColor',- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),};}@@ -541,7 +549,7 @@ export function TextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSelereturn disposable.dispose;}),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),};}diff --git a/packages/sheets-ui/src/controllers/menu/permission-menu-util.ts b/packages/sheets-ui/src/controllers/menu/permission-menu-util.tsindex c67a809bb1..8cce4a4688 100644--- a/packages/sheets-ui/src/controllers/menu/permission-menu-util.ts+++ b/packages/sheets-ui/src/controllers/menu/permission-menu-util.ts@@ -15,9 +15,10 @@*/import type { IAccessor, Workbook } from '@univerjs/core';-import { FOCUSING_COMMON_DRAWINGS, IContextService, IPermissionService, IUniverInstanceService, Rectangle, UniverInstanceType, UserManagerService } from '@univerjs/core';+import { FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, IContextService, IPermissionService, IUniverInstanceService, Rectangle, UniverInstanceType, UserManagerService } from '@univerjs/core';import { RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';import { combineLatest, map, merge, of, startWith, switchMap } from 'rxjs';+import { IEditorBridgeService } from '../../services/editor-bridge.service';export function getAddPermissionHidden$(accessor: IAccessor) {const univerInstanceService = accessor.get(IUniverInstanceService);@@ -186,10 +187,14 @@ export function getAddPermissionDisableBase$(accessor: IAccessor) {const permissionService = accessor.get(IPermissionService);const workbook$ = univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET);const userManagerService = accessor.get(UserManagerService);-- return combineLatest([workbook$, userManagerService.currentUser$]).pipe(- switchMap(([workbook, _]) => {- if (!workbook) {+ const editorBridgeService = accessor.has(IEditorBridgeService) ? accessor.get(IEditorBridgeService) : null;+ const contextService = accessor.get(IContextService);+ const formulaEditorFocus$ = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR);+ const editorVisible$ = editorBridgeService?.visible$ ?? of(null);++ return combineLatest([workbook$, userManagerService.currentUser$, editorVisible$, formulaEditorFocus$]).pipe(+ switchMap(([workbook, __, visible, formulaEditorFocus]) => {+ if (!workbook || (visible?.visible && visible.unitId === workbook.getUnitId()) || formulaEditorFocus) {return of(true);}@@ -436,10 +441,14 @@ export function getViewPermissionDisable$(accessor: IAccessor) {const permissionService = accessor.get(IPermissionService);const workbook$ = univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET);const userManagerService = accessor.get(UserManagerService);-- return combineLatest([workbook$, userManagerService.currentUser$]).pipe(- switchMap(([workbook, _]) => {- if (!workbook) {+ const editorBridgeService = accessor.has(IEditorBridgeService) ? accessor.get(IEditorBridgeService) : null;+ const contextService = accessor.get(IContextService);+ const formulaEditorFocus$ = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR);+ const editorVisible$ = editorBridgeService?.visible$ ?? of(null);++ return combineLatest([workbook$, userManagerService.currentUser$, editorVisible$, formulaEditorFocus$]).pipe(+ switchMap(([workbook, __, visible, formulaEditorFocus]) => {+ if (!workbook || (visible?.visible && visible.unitId === workbook.getUnitId()) || formulaEditorFocus) {return of(true);}diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.tsindex 2500b5f064..1fbe8d84ff 100644--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts@@ -39,6 +39,7 @@ import { DeleteRangeMoveLeftConfirmCommand } from '../commands/commands/delete-rimport { DeleteRangeMoveUpConfirmCommand } from '../commands/commands/delete-range-move-up-confirm.command';import { HideColConfirmCommand, HideRowConfirmCommand } from '../commands/commands/hide-row-col-confirm.command';import {+ ResetRangeTextColorCommand,SetRangeBoldCommand,SetRangeFontFamilyCommand,SetRangeFontSizeCommand,@@ -228,6 +229,7 @@ export class SheetUIController extends Disposable {SetRangeFontSizeCommand,SetRangeFontFamilyCommand,SetRangeTextColorCommand,+ ResetRangeTextColorCommand,SetItalicCommand,SetStrikeThroughCommand,SetFontFamilyCommand,diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex 3050ac9264..4417fddd7b 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -128,6 +128,7 @@ export { DeleteRangeMoveLeftConfirmCommand } from './commands/commands/delete-raexport { DeleteRangeMoveUpConfirmCommand } from './commands/commands/delete-range-move-up-confirm.command';export { HideColConfirmCommand, HideRowConfirmCommand } from './commands/commands/hide-row-col-confirm.command';export {+ ResetRangeTextColorCommand,SetRangeBoldCommand,SetRangeFontFamilyCommand,SetRangeFontSizeCommand,diff --git a/packages/sheets/src/commands/commands/set-style.command.ts b/packages/sheets/src/commands/commands/set-style.command.tsindex d508a755f6..87c07e794f 100644--- a/packages/sheets/src/commands/commands/set-style.command.ts+++ b/packages/sheets/src/commands/commands/set-style.command.ts@@ -364,7 +364,7 @@ export const SetFontSizeCommand: ICommand<ISetFontSizeCommandParams> = {};export interface ISetColorCommandParams {- value: string;+ value: string | null;}export const SetTextColorCommand: ICommand<ISetColorCommandParams> = {diff --git a/packages/ui/src/views/components/zen-zone/ZenZone.tsx b/packages/ui/src/views/components/zen-zone/ZenZone.tsxindex 821ba86c97..0768a52560 100644--- a/packages/ui/src/views/components/zen-zone/ZenZone.tsx+++ b/packages/ui/src/views/components/zen-zone/ZenZone.tsx@@ -56,5 +56,5 @@ export function ZenZone() {}}, [componentKey]);- return <section style={hidden ? { display: 'none' } : undefined} className={_className}>{Component && <Component />}</section>;+ return <section style={hidden ? { opacity: 0, zIndex: -1 } : undefined} className={_className}>{Component && <Component />}</section>;}