@difizen/libro-code-cell 0.1.14 → 0.1.16

package/es/code-cell-view.d.ts

@@ -3,12 +3,13 @@ import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { IOutput } from '@difizen/libro-common';
 import type { LibroCell, CellViewOptions } from '@difizen/libro-core';
-import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea } from '@difizen/libro-core';
+import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, LirboContextKey } from '@difizen/libro-core';
 import type { ViewSize } from '@difizen/mana-app';
 import { ViewManager, Deferred } from '@difizen/mana-app';
 import type { LibroCodeCellModel } from './code-cell-model.js';
 export declare const CellEditorMemo: import("react").NamedExoticComponent<{}>;
 export declare class LibroCodeCellView extends LibroExecutableCellView {
+    protected readonly lirboContextKey: LirboContextKey;
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     viewManager: ViewManager;
     codeEditorManager: CodeEditorManager;
@@ -19,8 +20,6 @@ export declare class LibroCodeCellView extends LibroExecutableCellView {
     noEditorAreaHeight: number;
     cellViewTopPos: number;
     editorStatus: EditorStatus;
-    protected editorViewReadyDeferred: Deferred<void>;
-    get editorReady(): Promise<void>;
     protected outputAreaDeferred: Deferred<LibroOutputArea>;
     get outputAreaReady(): Promise<LibroOutputArea>;
     renderEditor: () => import("react/jsx-runtime").JSX.Element | null;
@@ -34,6 +33,7 @@ export declare class LibroCodeCellView extends LibroExecutableCellView {
     protected getEditorOption(): CodeEditorViewOptions;
     protected createEditor(): Promise<void>;
     protected afterEditorReady(): Promise<void>;
+    protected focusEditor(): void;
     shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>): boolean;
     blur: () => void;
     focus: (toEdit: boolean) => void;

package/es/code-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-cell-view.d.ts","sourceRoot":"","sources":["../src/code-cell-view.tsx"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAa,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAEV,SAAS,EACT,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,uBAAuB,EACvB,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAQL,WAAW,EAIX,QAAQ,EACT,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AA2C/D,eAAO,MAAM,cAAc,0CAAmB,CAAC;AAmB/C,qBAEa,iBAAkB,SAAQ,uBAAuB;IACnD,IAAI,2FAA2B;IAExC,WAAW,EAAE,WAAW,CAAC;IAEzB,iBAAiB,EAAE,iBAAiB,CAAC;IAE7B,KAAK,EAAE,kBAAkB,CAAC;IAElC,OAAO,EAAE,OAAO,EAAE,CAAC;IAGnB,UAAU,CAAC,EAAE,cAAc,CAAC;IAG5B,gBAAgB,SAAK;IAGZ,kBAAkB,SAAK;IAGvB,cAAc,SAAK;IAGnB,YAAY,EAAE,YAAY,CAA0B;IAE7D,SAAS,CAAC,uBAAuB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEzE,IAAI,WAAW,kBAEd;IAED,SAAS,CAAC,kBAAkB,4BAAmC;IAC/D,IAAI,eAAe,6BAElB;IAEQ,YAAY,uDAKnB;IAEO,YAAY,CAAC,IAAI,EAAE,QAAQ;IAMpC,oBAAoB;gBAqBE,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB;IA6BxD,WAAW;IAQX,MAAM,IAAI,SAAS;IAQnB,WAAW;IAQpB,aAAa,CAAC,GAAG,EAAE,GAAG;IAMtB,SAAS,CAAC,eAAe,IAAI,qBAAqB;cAalC,YAAY;cAoBZ,gBAAgB;IAUvB,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;IAMtD,IAAI,aAGX;IAEO,KAAK,WAAY,OAAO,UAkC/B;IAEO,cAAc,aAGrB;CACH"}
+{"version":3,"file":"code-cell-view.d.ts","sourceRoot":"","sources":["../src/code-cell-view.tsx"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAa,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAEV,SAAS,EACT,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,uBAAuB,EACvB,eAAe,EAEf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAQL,WAAW,EAIX,QAAQ,EACT,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AA2C/D,eAAO,MAAM,cAAc,0CAAmB,CAAC;AAmB/C,qBAEa,iBAAkB,SAAQ,uBAAuB;IACnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACpE,IAAI,2FAA2B;IAExC,WAAW,EAAE,WAAW,CAAC;IAEzB,iBAAiB,EAAE,iBAAiB,CAAC;IAE7B,KAAK,EAAE,kBAAkB,CAAC;IAElC,OAAO,EAAE,OAAO,EAAE,CAAC;IAGnB,UAAU,CAAC,EAAE,cAAc,CAAC;IAG5B,gBAAgB,SAAK;IAGZ,kBAAkB,SAAK;IAGvB,cAAc,SAAK;IAGnB,YAAY,EAAE,YAAY,CAA0B;IAE7D,SAAS,CAAC,kBAAkB,4BAAmC;IAC/D,IAAI,eAAe,6BAElB;IAEQ,YAAY,uDAKnB;IAEO,YAAY,CAAC,IAAI,EAAE,QAAQ;IAMpC,oBAAoB;gBAqBE,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB;IA6BxD,WAAW;IAQX,MAAM,IAAI,SAAS;IAQnB,WAAW;IAIpB,aAAa,CAAC,GAAG,EAAE,GAAG;IAKtB,SAAS,CAAC,eAAe,IAAI,qBAAqB;cAclC,YAAY;cAwBZ,gBAAgB;IAWhC,SAAS,CAAC,WAAW;IAgBZ,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;IAMtD,IAAI,aAGX;IAEO,KAAK,WAAY,OAAO,UAS/B;IAEO,cAAc,aAGrB;CACH"}

package/es/code-cell-view.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -29,7 +29,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import { isOutput } from '@difizen/libro-common';
-import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, VirtualizedManagerHelper } from '@difizen/libro-core';
+import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, VirtualizedManagerHelper, LirboContextKey } from '@difizen/libro-core';
 import { getOrigin, inject, prop, transient, useInject, view, ViewInstance, ViewManager, ViewOption, ViewRender, watch, Deferred } from '@difizen/mana-app';
 import { useEffect, useRef, memo, forwardRef } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -83,7 +83,7 @@ var CodeEditorViewComponent = /*#__PURE__*/forwardRef(function CodeEditorViewCom
     children: /*#__PURE__*/_jsx(CellEditorMemo, {})
   });
 });
-export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-cell-view'), _dec3 = prop(), _dec4 = prop(), _dec5 = prop(), _dec6 = prop(), _dec7 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroExecutableCellV) {
+export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-cell-view'), _dec3 = inject(LirboContextKey), _dec4 = prop(), _dec5 = prop(), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroExecutableCellV) {
   _inherits(LibroCodeCellView, _LibroExecutableCellV);
   var _super = _createSuper(LibroCodeCellView);
   function LibroCodeCellView(options, cellService, viewManager, codeEditorManager) {
@@ -91,16 +91,16 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     var _this;
     _classCallCheck(this, LibroCodeCellView);
     _this = _super.call(this, options, cellService);
+    _initializerDefineProperty(_this, "lirboContextKey", _descriptor, _assertThisInitialized(_this));
     _this.view = CodeEditorViewComponent;
     _this.viewManager = void 0;
     _this.codeEditorManager = void 0;
     _this.outputs = void 0;
-    _initializerDefineProperty(_this, "editorView", _descriptor, _assertThisInitialized(_this));
-    _initializerDefineProperty(_this, "editorAreaHeight", _descriptor2, _assertThisInitialized(_this));
-    _initializerDefineProperty(_this, "noEditorAreaHeight", _descriptor3, _assertThisInitialized(_this));
-    _initializerDefineProperty(_this, "cellViewTopPos", _descriptor4, _assertThisInitialized(_this));
-    _initializerDefineProperty(_this, "editorStatus", _descriptor5, _assertThisInitialized(_this));
-    _this.editorViewReadyDeferred = new Deferred();
+    _initializerDefineProperty(_this, "editorView", _descriptor2, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "editorAreaHeight", _descriptor3, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "noEditorAreaHeight", _descriptor4, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "cellViewTopPos", _descriptor5, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "editorStatus", _descriptor6, _assertThisInitialized(_this));
     _this.outputAreaDeferred = new Deferred();
     _this.renderEditor = function () {
       if (_this.editorView) {
@@ -117,33 +117,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     };
     _this.focus = function (toEdit) {
       if (toEdit) {
-        if (_this.parent.model.readOnly === true) {
-          return;
-        }
-        if (!_this.editorView) {
-          _this.editorReady.then(function () {
-            var _this$editorView3;
-            (_this$editorView3 = _this.editorView) === null || _this$editorView3 === void 0 || _this$editorView3.editorReady.then(function () {
-              var _this$editorView4, _this$editorView5, _this$editorView6, _this$editorView7;
-              (_this$editorView4 = _this.editorView) === null || _this$editorView4 === void 0 || (_this$editorView4 = _this$editorView4.editor) === null || _this$editorView4 === void 0 || _this$editorView4.setOption('styleActiveLine', true);
-              (_this$editorView5 = _this.editorView) === null || _this$editorView5 === void 0 || (_this$editorView5 = _this$editorView5.editor) === null || _this$editorView5 === void 0 || _this$editorView5.setOption('highlightActiveLineGutter', true);
-              if ((_this$editorView6 = _this.editorView) !== null && _this$editorView6 !== void 0 && (_this$editorView6 = _this$editorView6.editor) !== null && _this$editorView6 !== void 0 && _this$editorView6.hasFocus()) {
-                return;
-              }
-              (_this$editorView7 = _this.editorView) === null || _this$editorView7 === void 0 || (_this$editorView7 = _this$editorView7.editor) === null || _this$editorView7 === void 0 || _this$editorView7.focus();
-              return;
-            });
-            return;
-          }).catch(console.error);
-        } else {
-          var _this$editorView8, _this$editorView9, _this$editorView10, _this$editorView11;
-          (_this$editorView8 = _this.editorView) === null || _this$editorView8 === void 0 || (_this$editorView8 = _this$editorView8.editor) === null || _this$editorView8 === void 0 || _this$editorView8.setOption('styleActiveLine', true);
-          (_this$editorView9 = _this.editorView) === null || _this$editorView9 === void 0 || (_this$editorView9 = _this$editorView9.editor) === null || _this$editorView9 === void 0 || _this$editorView9.setOption('highlightActiveLineGutter', true);
-          if ((_this$editorView10 = _this.editorView) !== null && _this$editorView10 !== void 0 && (_this$editorView10 = _this$editorView10.editor) !== null && _this$editorView10 !== void 0 && _this$editorView10.hasFocus()) {
-            return;
-          }
-          (_this$editorView11 = _this.editorView) === null || _this$editorView11 === void 0 || (_this$editorView11 = _this$editorView11.editor) === null || _this$editorView11 === void 0 || _this$editorView11.focus();
-        }
+        _this.focusEditor();
       } else {
         var _this$container, _this$container2;
         if ((_this$container = _this.container) !== null && _this$container !== void 0 && (_this$container = _this$container.current) !== null && _this$container !== void 0 && (_this$container = _this$container.parentElement) !== null && _this$container !== void 0 && _this$container.contains(document.activeElement)) {
@@ -201,11 +175,6 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
   LibroCodeCellView = inject(CellService)(LibroCodeCellView, undefined, 1) || LibroCodeCellView;
   LibroCodeCellView = inject(ViewOption)(LibroCodeCellView, undefined, 0) || LibroCodeCellView;
   _createClass(LibroCodeCellView, [{
-    key: "editorReady",
-    get: function get() {
-      return this.editorViewReadyDeferred.promise;
-    }
-  }, {
     key: "outputAreaReady",
     get: function get() {
       return this.outputAreaDeferred.promise;
@@ -256,12 +225,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
   }, {
     key: "onViewMount",
     value: function onViewMount() {
-      var _this$parent$model$ac;
       this.createEditor();
-      //选中cell时才focus
-      if (((_this$parent$model$ac = this.parent.model.active) === null || _this$parent$model$ac === void 0 ? void 0 : _this$parent$model$ac.id) === this.id) {
-        this.focus(!this.parent.model.commandMode);
-      }
     }
   }, {
     key: "setEditorHost",
@@ -273,6 +237,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     key: "getEditorOption",
     value: function getEditorOption() {
       var option = {
+        uuid: "".concat(this.parent.model.id, "-").concat(this.model.id),
         editorHostId: this.parent.id + this.id,
         model: this.model,
         config: {
@@ -287,6 +252,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     key: "createEditor",
     value: function () {
       var _createEditor = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this3 = this;
         var option, editorView;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -307,11 +273,14 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
             case 7:
               editorView = _context2.sent;
               this.editorView = editorView;
-              this.editorViewReadyDeferred.resolve();
               this.editorStatus = EditorStatus.LOADED;
-              _context2.next = 13;
-              return this.afterEditorReady();
-            case 13:
+              editorView.onEditorStatusChange(function (e) {
+                if (e.status === 'ready') {
+                  _this3.editor = _this3.editorView.editor;
+                  _this3.afterEditorReady();
+                }
+              });
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -326,19 +295,20 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     key: "afterEditorReady",
     value: function () {
       var _afterEditorReady = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this3 = this,
-          _this$editorView12;
+        var _this4 = this,
+          _this$editorView3;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               watch(this.parent.model, 'readOnly', function () {
-                var _this3$editorView;
-                (_this3$editorView = _this3.editorView) === null || _this3$editorView === void 0 || (_this3$editorView = _this3$editorView.editor) === null || _this3$editorView === void 0 || _this3$editorView.setOption('readOnly', getOrigin(_this3.parent.model.readOnly));
+                var _this4$editorView;
+                (_this4$editorView = _this4.editorView) === null || _this4$editorView === void 0 || (_this4$editorView = _this4$editorView.editor) === null || _this4$editorView === void 0 || _this4$editorView.setOption('readOnly', getOrigin(_this4.parent.model.readOnly));
               });
-              (_this$editorView12 = this.editorView) === null || _this$editorView12 === void 0 || _this$editorView12.onModalChange(function (val) {
-                return _this3.hasModal = val;
+              (_this$editorView3 = this.editorView) === null || _this$editorView3 === void 0 || _this$editorView3.onModalChange(function (val) {
+                return _this4.hasModal = val;
               });
-            case 2:
+              this.focusEditor();
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -349,6 +319,20 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
       }
       return afterEditorReady;
     }()
+  }, {
+    key: "focusEditor",
+    value: function focusEditor() {
+      var _this$editorView4, _this$parent$model$ac;
+      //选中cell、编辑模式、非只读时才focus
+      if ((_this$editorView4 = this.editorView) !== null && _this$editorView4 !== void 0 && _this$editorView4.editor && this.editorView.editorStatus === 'ready' && ((_this$parent$model$ac = this.parent.model.active) === null || _this$parent$model$ac === void 0 ? void 0 : _this$parent$model$ac.id) === this.id && !this.parent.model.commandMode && this.lirboContextKey.commandModeEnabled === true &&
+      // 排除弹窗等情况
+      this.parent.model.readOnly === false) {
+        var _this$editorView5, _this$editorView6, _this$editorView7;
+        (_this$editorView5 = this.editorView) === null || _this$editorView5 === void 0 || _this$editorView5.editor.setOption('styleActiveLine', true);
+        (_this$editorView6 = this.editorView) === null || _this$editorView6 === void 0 || _this$editorView6.editor.setOption('highlightActiveLineGutter', true);
+        (_this$editorView7 = this.editorView) === null || _this$editorView7 === void 0 || _this$editorView7.editor.focus();
+      }
+    }
   }, {
     key: "shouldEnterEditorMode",
     value: function shouldEnterEditorMode(e) {
@@ -357,33 +341,38 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     }
   }]);
   return LibroCodeCellView;
-}(LibroExecutableCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "editorView", [_dec3], {
+}(LibroExecutableCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "lirboContextKey", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "editorView", [_dec4], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "editorAreaHeight", [_dec4], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "editorAreaHeight", [_dec5], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function initializer() {
     return 0;
   }
-}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "noEditorAreaHeight", [_dec5], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "noEditorAreaHeight", [_dec6], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function initializer() {
     return 0;
   }
-}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "cellViewTopPos", [_dec6], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "cellViewTopPos", [_dec7], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function initializer() {
     return 0;
   }
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "editorStatus", [_dec7], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "editorStatus", [_dec8], {
   configurable: true,
   enumerable: true,
   writable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-code-cell",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "",
   "keywords": [
     "libro",
@@ -32,9 +32,9 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-code-editor": "^0.1.14",
-    "@difizen/libro-common": "^0.1.14",
-    "@difizen/libro-core": "^0.1.14",
+    "@difizen/libro-code-editor": "^0.1.16",
+    "@difizen/libro-common": "^0.1.16",
+    "@difizen/libro-core": "^0.1.16",
     "@difizen/mana-app": "latest"
   },
   "peerDependencies": {

package/src/code-cell-view.tsx

@@ -16,6 +16,7 @@ import {
   LibroExecutableCellView,
   LibroOutputArea,
   VirtualizedManagerHelper,
+  LirboContextKey,
 } from '@difizen/libro-core';
 import type { ViewSize } from '@difizen/mana-app';
 import {
@@ -99,6 +100,7 @@ const CodeEditorViewComponent = forwardRef<HTMLDivElement>(
 @transient()
 @view('code-editor-cell-view')
 export class LibroCodeCellView extends LibroExecutableCellView {
+  @inject(LirboContextKey) protected readonly lirboContextKey: LirboContextKey;
   override view = CodeEditorViewComponent;
 
   viewManager: ViewManager;
@@ -124,12 +126,6 @@ export class LibroCodeCellView extends LibroExecutableCellView {
   @prop()
   override editorStatus: EditorStatus = EditorStatus.NOTLOADED;
 
-  protected editorViewReadyDeferred: Deferred<void> = new Deferred<void>();
-
-  get editorReady() {
-    return this.editorViewReadyDeferred.promise;
-  }
-
   protected outputAreaDeferred = new Deferred<LibroOutputArea>();
   get outputAreaReady() {
     return this.outputAreaDeferred.promise;
@@ -219,20 +215,16 @@ export class LibroCodeCellView extends LibroExecutableCellView {
 
   override onViewMount() {
     this.createEditor();
-    //选中cell时才focus
-    if (this.parent.model.active?.id === this.id) {
-      this.focus(!this.parent.model.commandMode);
-    }
   }
 
   setEditorHost(ref: any) {
     const editorHostId = this.parent.id + this.id;
-
     this.codeEditorManager.setEditorHostRef(editorHostId, ref);
   }
 
   protected getEditorOption(): CodeEditorViewOptions {
     const option: CodeEditorViewOptions = {
+      uuid: `${this.parent.model.id}-${this.model.id}`,
       editorHostId: this.parent.id + this.id,
       model: this.model,
       config: {
@@ -258,10 +250,14 @@ export class LibroCodeCellView extends LibroExecutableCellView {
     const editorView = await this.codeEditorManager.getOrCreateEditorView(option);
 
     this.editorView = editorView;
-    this.editorViewReadyDeferred.resolve();
     this.editorStatus = EditorStatus.LOADED;
 
-    await this.afterEditorReady();
+    editorView.onEditorStatusChange((e) => {
+      if (e.status === 'ready') {
+        this.editor = this.editorView!.editor;
+        this.afterEditorReady();
+      }
+    });
   }
 
   protected async afterEditorReady() {
@@ -272,6 +268,23 @@ export class LibroCodeCellView extends LibroExecutableCellView {
       );
     });
     this.editorView?.onModalChange((val) => (this.hasModal = val));
+    this.focusEditor();
+  }
+
+  protected focusEditor() {
+    //选中cell、编辑模式、非只读时才focus
+    if (
+      this.editorView?.editor &&
+      this.editorView.editorStatus === 'ready' &&
+      this.parent.model.active?.id === this.id &&
+      !this.parent.model.commandMode &&
+      this.lirboContextKey.commandModeEnabled === true && // 排除弹窗等情况
+      this.parent.model.readOnly === false
+    ) {
+      this.editorView?.editor.setOption('styleActiveLine', true);
+      this.editorView?.editor.setOption('highlightActiveLineGutter', true);
+      this.editorView?.editor.focus();
+    }
   }
 
   override shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>) {
@@ -287,32 +300,7 @@ export class LibroCodeCellView extends LibroExecutableCellView {
 
   override focus = (toEdit: boolean) => {
     if (toEdit) {
-      if (this.parent.model.readOnly === true) {
-        return;
-      }
-      if (!this.editorView) {
-        this.editorReady
-          .then(() => {
-            this.editorView?.editorReady.then(() => {
-              this.editorView?.editor?.setOption('styleActiveLine', true);
-              this.editorView?.editor?.setOption('highlightActiveLineGutter', true);
-              if (this.editorView?.editor?.hasFocus()) {
-                return;
-              }
-              this.editorView?.editor?.focus();
-              return;
-            });
-            return;
-          })
-          .catch(console.error);
-      } else {
-        this.editorView?.editor?.setOption('styleActiveLine', true);
-        this.editorView?.editor?.setOption('highlightActiveLineGutter', true);
-        if (this.editorView?.editor?.hasFocus()) {
-          return;
-        }
-        this.editorView?.editor?.focus();
-      }
+      this.focusEditor();
     } else {
       if (this.container?.current?.parentElement?.contains(document.activeElement)) {
         return;