feat(sheet): editor shortcuts

examples/univer-doc-ts/package.json

@@ -21,27 +21,28 @@
  "dev:demo": "node ./esbuild.config.mjs --watch"
  },
  "dependencies": {
- "@univerjs/base-docs": "workspace:^0.0.1",
- "@univerjs/base-render": "workspace:^0.0.1",
- "@univerjs/base-ui": "workspace:^0.0.1",
- "@univerjs/common-plugin-data": "workspace:^0.0.1",
- "@univerjs/core": "workspace:^0.0.1",
- "@univerjs/ui-plugin-docs": "workspace:^0.0.1",
+ "@univerjs/base-docs": "workspace:*",
+ "@univerjs/base-render": "workspace:*",
+ "@univerjs/base-ui": "workspace:*",
+ "@univerjs/common-plugin-data": "workspace:*",
+ "@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
+ "@univerjs/ui-plugin-docs": "workspace:*",
  "react": "^18.2.0",
  "react-dom": "^18.2.0"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@types/react": "^18.2.33",
+ "@types/react-dom": "^18.2.14",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "esbuild-plugin-clean": "^1.0.1",
  "esbuild-plugin-copy": "^2.1.1",
  "esbuild-style-plugin": "^1.6.2",
  "less": "^4.2.0",
  "minimist": "^1.2.8",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
 }

examples/univer-doc-ts/src/main.tsx

@@ -1,8 +1,9 @@
 import { DocPlugin } from '@univerjs/base-docs';
 import { RenderEngine } from '@univerjs/base-render';
-import { greenTheme, UIPlugin } from '@univerjs/base-ui';
+import { UIPlugin } from '@univerjs/base-ui';
 import { DEFAULT_DOCUMENT_DATA_EN } from '@univerjs/common-plugin-data';
 import { LocaleType, Univer } from '@univerjs/core';
+import { greenTheme } from '@univerjs/design';
 import { DocUIPlugin } from '@univerjs/ui-plugin-docs';
 
 // univer

examples/univer-sheet-ts/package.json

@@ -15,29 +15,30 @@
  "dev:demo": "node ./esbuild.config.mjs --watch"
  },
  "dependencies": {
- "@univerjs/base-docs": "workspace:^0.0.1",
- "@univerjs/base-render": "workspace:^0.0.1",
- "@univerjs/base-sheets": "workspace:^0.0.1",
- "@univerjs/base-ui": "workspace:^0.0.1",
- "@univerjs/common-plugin-data": "workspace:^0.0.1",
- "@univerjs/core": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-debugger": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-find": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-formula": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-image": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-import-xlsx": "workspace:^0.0.1",
- "@univerjs/sheets-plugin-numfmt": "workspace:^0.0.1",
- "@univerjs/ui-plugin-docs": "workspace:^0.0.1",
- "@univerjs/ui-plugin-sheets": "workspace:^0.0.1",
+ "@univerjs/base-docs": "workspace:*",
+ "@univerjs/base-render": "workspace:*",
+ "@univerjs/base-sheets": "workspace:*",
+ "@univerjs/base-ui": "workspace:*",
+ "@univerjs/common-plugin-data": "workspace:*",
+ "@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
+ "@univerjs/sheets-plugin-debugger": "workspace:*",
+ "@univerjs/sheets-plugin-find": "workspace:*",
+ "@univerjs/sheets-plugin-formula": "workspace:*",
+ "@univerjs/sheets-plugin-image": "workspace:*",
+ "@univerjs/sheets-plugin-import-xlsx": "workspace:*",
+ "@univerjs/sheets-plugin-numfmt": "workspace:*",
+ "@univerjs/ui-plugin-docs": "workspace:*",
+ "@univerjs/ui-plugin-sheets": "workspace:*",
  "react": "^18.2.0",
  "react-dom": "^18.2.0"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@types/react": "^18.2.33",
+ "@types/react-dom": "^18.2.14",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "esbuild-plugin-clean": "^1.0.1",
  "esbuild-plugin-copy": "^2.1.1",
  "esbuild-style-plugin": "^1.6.2",

examples/univer-sheet-ts/src/main.tsx

@@ -1,9 +1,10 @@
 import { DocPlugin } from '@univerjs/base-docs';
 import { RenderEngine } from '@univerjs/base-render';
 import { SheetPlugin } from '@univerjs/base-sheets';
-import { greenTheme, UIPlugin } from '@univerjs/base-ui';
+import { UIPlugin } from '@univerjs/base-ui';
 import { DEFAULT_WORKBOOK_DATA_DEMO } from '@univerjs/common-plugin-data';
 import { LocaleType, Univer } from '@univerjs/core';
+import { greenTheme } from '@univerjs/design';
 import { DebuggerPlugin } from '@univerjs/sheets-plugin-debugger';
 // import { FindPlugin } from '@univerjs/sheets-plugin-find';
 // import { DEFAULT_FORMULA_DATA_DEMO, FormulaPlugin } from '@univerjs/sheets-plugin-formula';

examples/univer-slide-ts/package.json

@@ -18,27 +18,28 @@
  "dev:demo": "node ./esbuild.config.mjs --watch"
  },
  "dependencies": {
- "@univerjs/base-render": "workspace:^0.0.1",
- "@univerjs/base-slides": "workspace:^0.0.1",
- "@univerjs/base-ui": "workspace:^0.0.1",
- "@univerjs/common-plugin-data": "workspace:^0.0.1",
- "@univerjs/core": "workspace:^0.0.1",
- "@univerjs/ui-plugin-slides": "workspace:^0.0.1",
+ "@univerjs/base-render": "workspace:*",
+ "@univerjs/base-slides": "workspace:*",
+ "@univerjs/base-ui": "workspace:*",
+ "@univerjs/common-plugin-data": "workspace:*",
+ "@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
+ "@univerjs/ui-plugin-slides": "workspace:*",
  "react": "^18.2.0",
  "react-dom": "^18.2.0"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@types/react": "^18.2.33",
+ "@types/react-dom": "^18.2.14",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "esbuild-plugin-clean": "^1.0.1",
  "esbuild-plugin-copy": "^2.1.1",
  "esbuild-style-plugin": "^1.6.2",
  "less": "^4.2.0",
  "minimist": "^1.2.8",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
 }

examples/univer-slide-ts/src/main.tsx

@@ -1,8 +1,9 @@
 import { RenderEngine } from '@univerjs/base-render';
 import { SlidePlugin } from '@univerjs/base-slides';
-import { greenTheme, UIPlugin } from '@univerjs/base-ui';
+import { UIPlugin } from '@univerjs/base-ui';
 import { DEFAULT_SLIDE_DATA } from '@univerjs/common-plugin-data';
 import { LocaleType, Univer } from '@univerjs/core';
+import { greenTheme } from '@univerjs/design';
 import { SlideUIPlugin } from '@univerjs/ui-plugin-slides';
 
 // univer

package.json

@@ -25,28 +25,28 @@
  "license": "MIT",
  "devDependencies": {
  "@changesets/cli": "^2.26.2",
- "@commitlint/cli": "^17.7.1",
- "@commitlint/config-conventional": "^17.7.0",
- "@types/node": "^18.14.0",
- "@typescript-eslint/eslint-plugin": "^6.6.0",
- "@typescript-eslint/parser": "^6.6.0",
- "esbuild": "^0.19.3",
+ "@commitlint/cli": "^18.1.0",
+ "@commitlint/config-conventional": "^18.1.0",
+ "@types/node": "^20.8.9",
+ "@typescript-eslint/eslint-plugin": "^6.9.0",
+ "@typescript-eslint/parser": "^6.9.0",
+ "esbuild": "^0.19.5",
  "esbuild-plugin-clean": "^1.0.1",
  "esbuild-style-plugin": "^1.6.2",
- "eslint": "^8.50.0",
+ "eslint": "^8.52.0",
  "eslint-config-airbnb-base": "^15.0.0",
  "eslint-config-airbnb-typescript": "^17.1.0",
  "eslint-config-prettier": "^9.0.0",
  "eslint-import-resolver-typescript": "^3.6.1",
  "eslint-plugin-import-newlines": "^1.3.4",
- "eslint-plugin-prettier": "^5.0.0",
+ "eslint-plugin-prettier": "^5.0.1",
  "eslint-plugin-simple-import-sort": "^10.0.0",
  "eslint-plugin-unused-imports": "^3.0.0",
  "husky": "^8.0.3",
- "lint-staged": "^14.0.1",
+ "lint-staged": "^15.0.2",
  "prettier": "^3.0.3",
  "ts-node": "^10.9.1",
- "turbo": "^1.10.14",
+ "turbo": "^1.10.16",
  "typescript": "^5.2.2"
  },
  "lint-staged": {

packages/base-docs/package.json

@@ -37,23 +37,19 @@
  "test": "vitest run"
  },
  "dependencies": {
- "@univerjs/base-render": "workspace:^0.0.1",
- "@univerjs/base-sheets": "workspace:^0.0.1",
- "@univerjs/base-ui": "workspace:^0.0.1",
- "@univerjs/common-plugin-data": "workspace:^0.0.1",
- "@univerjs/core": "workspace:^0.0.1",
+ "@univerjs/base-render": "workspace:*",
+ "@univerjs/base-sheets": "workspace:*",
+ "@univerjs/base-ui": "workspace:*",
+ "@univerjs/common-plugin-data": "workspace:*",
+ "@univerjs/core": "workspace:*",
  "@wendellhu/redi": "^0.12.8",
- "react": "^18.2.0",
- "react-dom": "^18.2.0",
  "rxjs": "^7.8.1"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
+ "@types/node": "^20.8.9",
+ "@vitest/coverage-v8": "^0.34.6",
  "less": "^4.2.0",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
 }

packages/base-docs/src/Controller/doc-render.controller.ts

@@ -53,7 +53,7 @@
  return;
  }
 
  const { mainComponent, components, scene } = currentRender;
 
  const docsComponent = mainComponent as Documents;
 
@@ -88,15 +88,15 @@
 
  if (engineWidth > docsWidth) {
  docsLeft = engineWidth / 2 - docsWidth / 2;
- sceneWidth = engineWidth - 30;
+ sceneWidth = engineWidth - 34;
  } else {
  docsLeft = pageMarginLeft;
  sceneWidth = docsWidth + pageMarginLeft * 2;
  }
 
  if (engineHeight > docsHeight) {
  docsTop = engineHeight / 2 - docsHeight / 2;
- sceneHeight = engineHeight - 30;
+ sceneHeight = engineHeight - 34;
  } else {
  docsTop = pageMarginTop;
  sceneHeight = docsHeight + pageMarginTop * 2;
@@ -106,7 +106,7 @@
 
  // this.docsTop = docsTop;
 
  scene.resize(sceneWidth, sceneHeight + 200);
 
  docsComponent.translate(docsLeft, docsTop);
 
@@ -114,7 +114,7 @@
  }
 
  recalculateSizeBySkeleton(currentRender: IRender, skeleton: DocumentSkeleton) {
  const { mainComponent, scene } = currentRender;
 
  const docsComponent = mainComponent as Documents;
 

packages/base-docs/src/Locale/en.ts

@@ -18,9 +18,9 @@ export default {
  moreFormats: 'More formats',
  font: 'Font',
  fontSize: 'Font size',
- bold: 'Bold (Ctrl+B)',
- italic: 'Italic (Ctrl+I)',
- strikethrough: 'Strikethrough (Alt+Shift+5)',
+ bold: 'Bold',
+ italic: 'Italic',
+ strikethrough: 'Strikethrough',
  underline: 'Underline',
  textColor: {
  main: 'Text color',

packages/base-docs/src/Locale/zh.ts

@@ -18,9 +18,9 @@ export default {
  moreFormats: '更多格式',
  font: '字体',
  fontSize: '字号大小',
- bold: '粗体 (Ctrl+B)',
- italic: '斜体 (Ctrl+I)',
- strikethrough: '删除线 (Alt+Shift+5)',
+ bold: '粗体',
+ italic: '斜体',
+ strikethrough: '删除线',
  underline: '下划线',
  textColor: {
  main: '文本颜色',

packages/base-docs/src/commands/operations/cursor.operation.ts

@@ -17,11 +17,6 @@ export const MoveCursorOperation: IOperation<IMoveCursorOperationParams> = {
  return false;
  }
 
- // const univerInstanceService = accessor.get(IUniverInstanceService);
- // const inputController = accessor.get(InputController);
-
- // inputController.moveCursor(univerInstanceService.getCurrentUniverDocInstance(), params.direction);
-
  return true;
  },
 };

packages/base-docs/src/index.ts

@@ -12,10 +12,12 @@ export {
  type IUpdateCommandParams,
  UpdateCommand,
 } from './commands/commands/core-editing.command';
+export { BreakLineCommand, DeleteLeftCommand } from './commands/commands/core-editing.command';
 export {
  type IRichTextEditingMutationParams,
  RichTextEditingMutation,
 } from './commands/mutations/core-editing.mutation';
+export { MoveCursorOperation } from './commands/operations/cursor.operation';
 export * from './DocPlugin';
 export * from './Locale';
 export { DocSkeletonManagerService } from './services/doc-skeleton-manager.service';

packages/base-formula-engine/package.json

@@ -40,19 +40,15 @@
  "esbuild": "node ./esbuild.config.mjs"
  },
  "dependencies": {
- "@univerjs/core": "workspace:^0.0.1",
- "@wendellhu/redi": "^0.12.8",
- "react": "^18.2.0",
- "react-dom": "^18.2.0"
+ "@univerjs/core": "workspace:*",
+ "@wendellhu/redi": "^0.12.8"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "less": "^4.2.0",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
-}
+}

packages/base-numfmt-engine/package.json

@@ -40,18 +40,14 @@
  "esbuild": "node ./esbuild.config.mjs"
  },
  "dependencies": {
- "@univerjs/core": "workspace:^0.0.1",
- "react": "^18.2.0",
- "react-dom": "^18.2.0"
+ "@univerjs/core": "workspace:*"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "less": "^4.2.0",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
 }

packages/base-render/package.json

@@ -44,20 +44,16 @@
  "esbuild": "node ./esbuild.config.mjs"
  },
  "dependencies": {
- "@univerjs/core": "workspace:^0.0.1",
+ "@univerjs/core": "workspace:*",
  "@wendellhu/redi": "^0.12.8",
- "react": "^18.2.0",
- "react-dom": "^18.2.0",
  "rxjs": "^7.8.1"
  },
  "devDependencies": {
- "@types/node": "^18.14.0",
- "@types/react": "^18.2.22",
- "@types/react-dom": "^18.2.7",
- "@vitest/coverage-v8": "^0.34.5",
- "esbuild": "^0.19.3",
+ "@types/node": "^20.8.9",
+ "@vitest/coverage-v8": "^0.34.6",
+ "esbuild": "^0.19.5",
  "less": "^4.2.0",
  "ts-node": "^10.9.1",
- "vitest": "^0.34.5"
+ "vitest": "^0.34.6"
  }
 }