Skip to content

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.

fix(docs): no need to scroll when enter zen mode (#3222)

Ran Luo1ebbe272775a
diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.ts
index 1a4225fd26..8ba78e2ef2 100644
--- a/packages/engine-render/src/viewport.ts
+++ b/packages/engine-render/src/viewport.ts
@@ -1407,6 +1407,7 @@ export class Viewport {
let viewportScrollX = scrollVpPos.viewportScrollX ?? this.viewportScrollX;
let viewportScrollY = scrollVpPos.viewportScrollY ?? this.viewportScrollY;
+
const rawScrollXY = this.transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY);
// const afterLimit = this.limitedScroll(rawScrollXY.x, rawScrollXY.y);
// const scrollX = afterLimit.scrollX;
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index e7ae44220d..748d8927b9 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -83,6 +83,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/docs": "workspace:*",
+ "@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
diff --git a/packages/sheets-zen-editor/src/commands/commands/zen-editor.command.ts b/packages/sheets-zen-editor/src/commands/commands/zen-editor.command.ts
index 1026246030..428e26feff 100644
--- a/packages/sheets-zen-editor/src/commands/commands/zen-editor.command.ts
+++ b/packages/sheets-zen-editor/src/commands/commands/zen-editor.command.ts
@@ -14,12 +14,25 @@
* limitations under the License.
*/
-import type { ICommand, Workbook } from '@univerjs/core';
-import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
-import { DeviceInputEventType } from '@univerjs/engine-render';
+import type { IAccessor, ICommand, ITextRange, Workbook } from '@univerjs/core';
+import { CommandType, DOCS_ZEN_EDITOR_UNIT_ID_KEY, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import { DocBackScrollRenderController } from '@univerjs/docs-ui';
+import { DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { IZenZoneService, KeyCode } from '@univerjs/ui';
+function scrollToTop(accessor: IAccessor) {
+ const renderManagerService = accessor.get(IRenderManagerService);
+ const backScrollController = renderManagerService.getRenderById(DOCS_ZEN_EDITOR_UNIT_ID_KEY)?.with(DocBackScrollRenderController);
+ const textRange = {
+ startOffset: 0,
+ endOffset: 0,
+ };
+ if (backScrollController) {
+ backScrollController.scrollToRange(DOCS_ZEN_EDITOR_UNIT_ID_KEY, textRange as ITextRange);
+ }
+}
+
export const CancelZenEditCommand: ICommand = {
id: 'zen-editor.command.cancel-zen-edit',
type: CommandType.COMMAND,
@@ -40,6 +53,8 @@ export const CancelZenEditCommand: ICommand = {
zenZoneEditorService.close();
+ scrollToTop(accessor);
+
const currentSheetInstance = univerInstanceManager.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (currentSheetInstance) {
univerInstanceManager.focusUnit(currentSheetInstance.getUnitId());
@@ -73,6 +88,8 @@ export const ConfirmZenEditCommand: ICommand = {
zenZoneEditorService.close();
+ scrollToTop(accessor);
+
const currentSheetInstance = univerInstanceManager.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (currentSheetInstance) {
univerInstanceManager.focusUnit(currentSheetInstance.getUnitId());
diff --git a/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts b/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
index de81eb670c..99fa9fcad5 100644
--- a/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
+++ b/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
@@ -184,7 +184,7 @@ export class ZenEditorController extends RxDisposable {
},
];
- this._textSelectionManagerService.replaceTextRanges(textRanges);
+ this._textSelectionManagerService.replaceTextRanges(textRanges, false);
}
private _editorSyncHandler(param: IEditorBridgeServiceParam) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4b0fec3fc..70dd8a23cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: 2.27.3
'@commitlint/cli':
specifier: ^19.4.0
version: 19.4.0(@types/[email protected])([email protected])
@@ -31,7 +31,7 @@ importers:
'@storybook/react':
specifier: 8.2.9
'@types/node':
specifier: ^22.5.1
version: 22.5.1
@@ -133,7 +133,7 @@ importers:
'@storybook/addon-interactions':
specifier: 8.2.9
'@storybook/addon-links':
specifier: 8.2.9
@@ -151,7 +151,7 @@ importers:
'@storybook/react':
specifier: 8.2.9
'@storybook/react-webpack5':
specifier: 8.2.9
@@ -175,7 +175,7 @@ importers:
storybook:
specifier: 8.2.9
- version: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ version: 8.2.9(@babel/[email protected])
storybook-addon-swc:
specifier: ^1.2.0
@@ -2619,6 +2619,9 @@ importers:
'@univerjs/docs':
specifier: workspace:*
version: link:../docs
+ '@univerjs/docs-ui':
+ specifier: workspace:*
+ version: link:../docs-ui
'@univerjs/engine-render':
specifier: workspace:*
version: link:../engine-render
@@ -11088,7 +11091,7 @@ snapshots:
dependencies:
'@babel/runtime': 7.25.0
dependencies:
'@antfu/install-pkg': 0.4.1
'@clack/prompts': 0.7.0
@@ -11096,7 +11099,7 @@ snapshots:
'@stylistic/eslint-plugin': 2.6.4([email protected]([email protected]))([email protected])
'@typescript-eslint/parser': 8.3.0([email protected]([email protected]))([email protected])
eslint: 9.9.0([email protected])
eslint-config-flat-gitignore: 0.1.8
eslint-flat-config-utils: 0.3.1
@@ -13047,21 +13050,21 @@ snapshots:
'@types/uuid': 9.0.8
dequal: 2.0.3
polished: 4.3.1
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
uuid: 9.0.1
dependencies:
'@storybook/global': 5.0.0
memoizerific: 1.11.3
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
dependencies:
dequal: 2.0.3
lodash: 4.17.21
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13071,14 +13074,14 @@ snapshots:
'@storybook/csf-plugin': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/global': 5.0.0
'@types/react': 18.3.4
fs-extra: 11.2.0
react: 18.3.1
react-dom: 18.3.1([email protected])
rehype-external-links: 3.0.0
rehype-slug: 6.0.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- supports-color
@@ -13094,7 +13097,7 @@ snapshots:
'@storybook/addon-outline': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/addon-toolbars': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/addon-viewport': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- supports-color
@@ -13102,15 +13105,15 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
'@storybook/global': 5.0.0
'@storybook/instrumenter': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
polished: 4.3.1
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
transitivePeerDependencies:
- '@jest/globals'
@@ -13123,7 +13126,7 @@ snapshots:
dependencies:
'@storybook/csf': 0.1.11
'@storybook/global': 5.0.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
optionalDependencies:
react: 18.3.1
@@ -13131,13 +13134,13 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
tiny-invariant: 1.3.3
dependencies:
'@storybook/global': 5.0.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13147,12 +13150,12 @@ snapshots:
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
memoizerific: 1.11.3
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
@@ -13175,7 +13178,7 @@ snapshots:
memoizerific: 1.11.3
polished: 4.3.1
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
telejson: 7.2.0
ts-dedent: 2.2.0
util-deprecate: 1.0.2
@@ -13202,7 +13205,7 @@ snapshots:
path-browserify: 1.0.1
process: 0.11.10
semver: 7.6.3
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
@@ -13233,7 +13236,7 @@ snapshots:
'@types/cross-spawn': 6.0.6
cross-spawn: 7.0.3
globby: 14.0.2
- jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))
+ jscodeshift: 0.15.2(@babel/[email protected])
lodash: 4.17.21
prettier: 3.3.3
recast: 0.23.9
@@ -13243,14 +13246,14 @@ snapshots:
- supports-color
- utf-8-validate
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
'@types/node': 18.19.47
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
'@storybook/[email protected]':
@@ -13273,7 +13276,7 @@ snapshots:
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
unplugin: 1.12.2
'@storybook/[email protected]':
@@ -13291,19 +13294,19 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
'@vitest/utils': 1.6.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
util: 0.12.5
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
'@storybook/[email protected]': {}
dependencies:
'@storybook/core-webpack': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
'@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0([email protected])([email protected](@swc/[email protected])([email protected]))
'@types/node': 18.19.47
'@types/semver': 7.5.8
@@ -13315,7 +13318,7 @@ snapshots:
react-dom: 18.3.1([email protected])
resolve: 1.22.8
semver: 7.6.3
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
tsconfig-paths: 4.2.0
webpack: 5.94.0(@swc/[email protected])([email protected])
optionalDependencies:
@@ -13327,9 +13330,9 @@ snapshots:
- uglify-js
- webpack-cli
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
@@ -13345,21 +13348,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
react: 18.3.1
react-dom: 18.3.1([email protected])
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
'@types/node': 18.19.47
react: 18.3.1
react-dom: 18.3.1([email protected])
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
optionalDependencies:
typescript: 5.5.4
transitivePeerDependencies:
@@ -13370,14 +13373,14 @@ snapshots:
- uglify-js
- webpack-cli
dependencies:
- '@storybook/components': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
+ '@storybook/components': 8.2.9([email protected](@babel/[email protected]))
'@storybook/global': 5.0.0
- '@storybook/manager-api': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/preview-api': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
- '@storybook/theming': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
+ '@storybook/manager-api': 8.2.9([email protected](@babel/[email protected]))
+ '@storybook/preview-api': 8.2.9([email protected](@babel/[email protected]))
+ '@storybook/theming': 8.2.9([email protected](@babel/[email protected]))
'@types/escodegen': 0.0.6
'@types/estree': 0.0.51
'@types/node': 18.19.47
@@ -13392,23 +13395,23 @@ snapshots:
react-dom: 18.3.1([email protected])
react-element-to-jsx-string: 15.0.0([email protected]([email protected]))([email protected])
semver: 7.6.3
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
ts-dedent: 2.2.0
type-fest: 2.19.0
util-deprecate: 1.0.2
optionalDependencies:
typescript: 5.5.4
dependencies:
'@storybook/csf': 0.1.11
'@storybook/instrumenter': 8.2.9([email protected](@babel/[email protected](@babel/[email protected])))
'@testing-library/dom': 10.1.0
'@testing-library/user-event': 14.5.2(@testing-library/[email protected])
'@vitest/expect': 1.6.0
'@vitest/spy': 1.6.0
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
util: 0.12.5
transitivePeerDependencies:
- '@jest/globals'
@@ -13417,13 +13420,13 @@ snapshots:
- jest
- vitest
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
- storybook: 8.2.9(@babel/[email protected](@babel/[email protected]))
+ storybook: 8.2.9(@babel/[email protected])
dependencies:
@@ -13537,7 +13540,7 @@ snapshots:
lz-string: 1.5.0
pretty-format: 27.5.1
dependencies:
'@adobe/css-tools': 4.4.0
'@babel/runtime': 7.25.4
@@ -13915,7 +13918,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
eslint: 9.9.0([email protected])
optionalDependencies:
@@ -17109,7 +17112,7 @@ snapshots:
dependencies:
'@babel/core': 7.25.2
'@babel/parser': 7.25.4
@@ -19216,7 +19219,7 @@ snapshots:
webpack: 5.94.0(@swc/[email protected])([email protected])
dependencies:
'@babel/core': 7.25.2
'@babel/types': 7.25.4
@@ -19236,7 +19239,7 @@ snapshots:
fs-extra: 11.2.0
giget: 1.2.3
globby: 14.0.2
- jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))
+ jscodeshift: 0.15.2(@babel/[email protected])
leven: 3.1.0
ora: 5.4.1
prettier: 3.3.3