@difizen/libro-raw-cell 0.1.14 → 0.1.16

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

@@ -1,19 +1,17 @@
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService, LibroEditorCellView } from '@difizen/libro-core';
-import { Deferred } from '@difizen/mana-app';
+import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
 import { ViewManager } from '@difizen/mana-app';
 import React from 'react';
 import type { LibroRawCellModel } from './raw-cell-model.js';
 export declare class LibroRawCellView extends LibroEditorCellView {
+    protected readonly lirboContextKey: LirboContextKey;
     model: LibroRawCellModel;
     view: React.ForwardRefExoticComponent<React.RefAttributes<HTMLDivElement>>;
     viewManager: ViewManager;
     codeEditorManager: CodeEditorManager;
     editorView?: CodeEditorView;
-    protected editorViewReadyDeferred: Deferred<void>;
-    get editorReady(): Promise<void>;
     constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, codeEditorManager: CodeEditorManager);
     onViewMount(): void;
     protected getEditorOption(): CodeEditorViewOptions;
@@ -21,6 +19,7 @@ export declare class LibroRawCellView extends LibroEditorCellView {
     protected afterEditorReady(): Promise<void>;
     shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>): boolean;
     blur: () => void;
+    protected focusEditor(): void;
     focus: (toEdit: boolean) => void;
 }
 //# sourceMappingURL=raw-cell-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"raw-cell-view.d.ts","sourceRoot":"","sources":["../src/raw-cell-view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAGL,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyB7D,qBAEa,gBAAiB,SAAQ,mBAAmB;IAC/C,KAAK,EAAE,iBAAiB,CAAC;IACxB,IAAI,uEAA2B;IAExC,WAAW,EAAE,WAAW,CAAC;IAEzB,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B,SAAS,CAAC,uBAAuB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEzE,IAAI,WAAW,kBAEd;gBAGqB,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB;IAQxD,WAAW;IAQpB,SAAS,CAAC,eAAe,IAAI,qBAAqB;IAgB5C,YAAY;cAUF,gBAAgB;IAMvB,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;IAQtD,IAAI,aAEX;IAEO,KAAK,WAAY,OAAO,UA8B/B;CACH"}
+{"version":3,"file":"raw-cell-view.d.ts","sourceRoot":"","sources":["../src/raw-cell-view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAExF,OAAO,EAGL,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyB7D,qBAEa,gBAAiB,SAAQ,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACrE,KAAK,EAAE,iBAAiB,CAAC;IACxB,IAAI,uEAA2B;IAExC,WAAW,EAAE,WAAW,CAAC;IAEzB,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,UAAU,CAAC,EAAE,cAAc,CAAC;gBAGN,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB;IAQxD,WAAW;IAQpB,SAAS,CAAC,eAAe,IAAI,qBAAqB;IAkB5C,YAAY;cASF,gBAAgB;IAMvB,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;IAQtD,IAAI,aAEX;IAEF,SAAS,CAAC,WAAW;IAgBZ,KAAK,WAAY,OAAO,UAS/B;CACH"}

package/es/raw-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, _class, _class2, _descriptor;
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -22,9 +22,8 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 /* eslint-disable @typescript-eslint/parameter-properties */
 
 import { CodeEditorManager } from '@difizen/libro-code-editor';
-import { CellService, LibroEditorCellView } from '@difizen/libro-core';
+import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
 import { getOrigin, prop, useInject, watch } from '@difizen/mana-app';
-import { Deferred } from '@difizen/mana-app';
 import { view, ViewInstance, ViewManager, ViewOption, ViewRender } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 import React, { useEffect } from 'react';
@@ -55,46 +54,24 @@ var CodeEditorViewComponent = /*#__PURE__*/React.forwardRef(function CodeEditorV
     children: /*#__PURE__*/_jsx(CellEditorMemo, {})
   });
 });
-export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view'), _dec3 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroEditorCellView) {
+export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view'), _dec3 = inject(LirboContextKey), _dec4 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroEditorCellView) {
   _inherits(LibroRawCellView, _LibroEditorCellView);
   var _super = _createSuper(LibroRawCellView);
   function LibroRawCellView(options, cellService, viewManager, codeEditorManager) {
     var _this;
     _classCallCheck(this, LibroRawCellView);
     _this = _super.call(this, options, cellService);
+    _initializerDefineProperty(_this, "lirboContextKey", _descriptor, _assertThisInitialized(_this));
     _this.view = CodeEditorViewComponent;
     _this.viewManager = void 0;
     _this.codeEditorManager = void 0;
-    _initializerDefineProperty(_this, "editorView", _descriptor, _assertThisInitialized(_this));
-    _this.editorViewReadyDeferred = new Deferred();
+    _initializerDefineProperty(_this, "editorView", _descriptor2, _assertThisInitialized(_this));
     _this.blur = function () {
       //
     };
     _this.focus = function (toEdit) {
       if (toEdit) {
-        if (_this.parent.model.readOnly === true) {
-          return;
-        }
-        if (!_this.editorView) {
-          _this.editorReady.then(function () {
-            var _this$editorView;
-            (_this$editorView = _this.editorView) === null || _this$editorView === void 0 || _this$editorView.editorReady.then(function () {
-              var _this$editorView2, _this$editorView3;
-              if ((_this$editorView2 = _this.editorView) !== null && _this$editorView2 !== void 0 && _this$editorView2.editor.hasFocus()) {
-                return;
-              }
-              (_this$editorView3 = _this.editorView) === null || _this$editorView3 === void 0 || _this$editorView3.editor.focus();
-              return;
-            });
-            return;
-          }).catch(console.error);
-        } else {
-          var _this$editorView4, _this$editorView5;
-          if ((_this$editorView4 = _this.editorView) !== null && _this$editorView4 !== void 0 && _this$editorView4.editor.hasFocus()) {
-            return;
-          }
-          (_this$editorView5 = _this.editorView) === null || _this$editorView5 === void 0 || _this$editorView5.editor.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)) {
@@ -113,11 +90,6 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
   LibroRawCellView = inject(CellService)(LibroRawCellView, undefined, 1) || LibroRawCellView;
   LibroRawCellView = inject(ViewOption)(LibroRawCellView, undefined, 0) || LibroRawCellView;
   _createClass(LibroRawCellView, [{
-    key: "editorReady",
-    get: function get() {
-      return this.editorViewReadyDeferred.promise;
-    }
-  }, {
     key: "onViewMount",
     value: function onViewMount() {
       var _this$parent$model$ac;
@@ -131,6 +103,8 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
     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: {
           readOnly: this.parent.model.readOnly,
@@ -159,11 +133,8 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
               editorView = _context.sent;
               this.editorView = editorView;
               _context.next = 7;
-              return editorView.editorReady;
-            case 7:
-              _context.next = 9;
               return this.afterEditorReady();
-            case 9:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -203,9 +174,28 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
       var _getOrigin;
       return (_getOrigin = getOrigin(this.editorView)) !== null && _getOrigin !== void 0 && (_getOrigin = _getOrigin.editor) !== null && _getOrigin !== void 0 && (_getOrigin = _getOrigin.host) !== null && _getOrigin !== void 0 && _getOrigin.contains(e.target) && this.parent.model.commandMode ? true : false;
     }
+  }, {
+    key: "focusEditor",
+    value: function focusEditor() {
+      var _this$editorView, _this$parent$model$ac2;
+      //选中cell、编辑模式、非只读时才focus
+      if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.editor && this.editorView.editorStatus === 'ready' && ((_this$parent$model$ac2 = this.parent.model.active) === null || _this$parent$model$ac2 === void 0 ? void 0 : _this$parent$model$ac2.id) === this.id && !this.parent.model.commandMode && this.lirboContextKey.commandModeEnabled === true &&
+      // 排除弹窗等情况
+      this.parent.model.readOnly === false) {
+        var _this$editorView2, _this$editorView3, _this$editorView4;
+        (_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 || _this$editorView2.editor.setOption('styleActiveLine', true);
+        (_this$editorView3 = this.editorView) === null || _this$editorView3 === void 0 || _this$editorView3.editor.setOption('highlightActiveLineGutter', true);
+        (_this$editorView4 = this.editorView) === null || _this$editorView4 === void 0 || _this$editorView4.editor.focus();
+      }
+    }
   }]);
   return LibroRawCellView;
-}(LibroEditorCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "editorView", [_dec3], {
+}(LibroEditorCellView), (_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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-raw-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/raw-cell-view.tsx

@@ -3,9 +3,8 @@
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService, LibroEditorCellView } from '@difizen/libro-core';
+import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
 import { getOrigin, prop, useInject, watch } from '@difizen/mana-app';
-import { Deferred } from '@difizen/mana-app';
 import {
   view,
   ViewInstance,
@@ -44,6 +43,7 @@ const CodeEditorViewComponent = React.forwardRef<HTMLDivElement>(
 @transient()
 @view('raw-cell-view')
 export class LibroRawCellView extends LibroEditorCellView {
+  @inject(LirboContextKey) protected readonly lirboContextKey: LirboContextKey;
   declare model: LibroRawCellModel;
   override view = CodeEditorViewComponent;
 
@@ -54,12 +54,6 @@ export class LibroRawCellView extends LibroEditorCellView {
   @prop()
   editorView?: CodeEditorView;
 
-  protected editorViewReadyDeferred: Deferred<void> = new Deferred<void>();
-
-  get editorReady() {
-    return this.editorViewReadyDeferred.promise;
-  }
-
   constructor(
     @inject(ViewOption) options: CellViewOptions,
     @inject(CellService) cellService: CellService,
@@ -82,6 +76,8 @@ export class LibroRawCellView extends LibroEditorCellView {
 
   protected getEditorOption(): CodeEditorViewOptions {
     const option: CodeEditorViewOptions = {
+      uuid: `${this.parent.model.id}-${this.model.id}`,
+      editorHostId: this.parent.id + this.id,
       model: this.model,
       config: {
         readOnly: this.parent.model.readOnly,
@@ -102,7 +98,6 @@ export class LibroRawCellView extends LibroEditorCellView {
     const editorView = await this.codeEditorManager.getOrCreateEditorView(option);
 
     this.editorView = editorView;
-    await editorView.editorReady;
     await this.afterEditorReady();
   }
 
@@ -124,30 +119,25 @@ export class LibroRawCellView extends LibroEditorCellView {
     //
   };
 
+  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 focus = (toEdit: boolean) => {
     if (toEdit) {
-      if (this.parent.model.readOnly === true) {
-        return;
-      }
-      if (!this.editorView) {
-        this.editorReady
-          .then(() => {
-            this.editorView?.editorReady.then(() => {
-              if (this.editorView?.editor.hasFocus()) {
-                return;
-              }
-              this.editorView?.editor.focus();
-              return;
-            });
-            return;
-          })
-          .catch(console.error);
-      } else {
-        if (this.editorView?.editor.hasFocus()) {
-          return;
-        }
-        this.editorView?.editor.focus();
-      }
+      this.focusEditor();
     } else {
       if (this.container?.current?.parentElement?.contains(document.activeElement)) {
         return;