@difizen/libro-core 0.2.34 → 0.2.35-next.0

package/es/cell/libro-edit-cell-view.d.ts

@@ -1,6 +1,11 @@
-import type { IEditor } from '@difizen/libro-code-editor';
+import type { CodeEditorView, CodeEditorViewOptions, IEditor } from '@difizen/libro-code-editor';
+import { CodeEditorManager } from '@difizen/libro-code-editor';
+import { DisposableCollection } from '@difizen/mana-app';
 import type { ReactNode } from 'react';
-import type { CellView, EditorStatus } from '../libro-protocol.js';
+import { LibroContextKey } from '../libro-context-key.js';
+import type { CellView, CellViewOptions } from '../libro-protocol.js';
+import { EditorStatus } from '../libro-protocol.js';
+import { CellService } from './libro-cell-protocol.js';
 import { LibroCellView } from './libro-cell-view.js';
 export interface EditorCellView extends CellView {
     editor: IEditor | undefined;
@@ -16,9 +21,22 @@ export declare const EditorCellView: {
  * 超出编辑器的相关能力放在其他的更高抽象中
  */
 export declare abstract class LibroEditorCellView extends LibroCellView implements EditorCellView {
+    protected toDisposeOnEditor: DisposableCollection;
     editor: IEditor | undefined;
+    protected readonly libroContextKey: LibroContextKey;
+    codeEditorManager: CodeEditorManager;
+    editorView?: CodeEditorView;
+    constructor(options: CellViewOptions, cellService: CellService);
+    protected getEditorOption(): CodeEditorViewOptions;
+    protected afterEditorReady(): Promise<void>;
+    createEditor(): Promise<void>;
     editorStatus: EditorStatus;
-    renderEditor: () => ReactNode;
+    renderEditor: () => import("react/jsx-runtime").JSX.Element | null;
+    onViewMount(): void;
+    shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>): boolean;
+    protected focusEditor(): void;
+    focus: (toEdit: boolean) => void;
+    blur: () => void;
     get wrapperCls(): string;
     redo(): void;
     undo(): void;

package/es/cell/libro-edit-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-edit-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/libro-edit-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC9C,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAE5B,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB,YAAY,EAAE,MAAM,SAAS,CAAC;CAC/B;AAED,eAAO,MAAM,cAAc;cACf,OAAO,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS;CAWvC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,mBACpB,SAAQ,aACR,YAAW,cAAc;IAGzB,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAG5B,YAAY,EAAE,YAAY,CAAC;IAE3B,YAAY,EAAE,MAAM,SAAS,CAAC;IAE9B,IAAI,UAAU,WAEb;IAED,IAAI,IAAI,IAAI;IAIZ,IAAI,IAAI,IAAI;CAGb"}
+{"version":3,"file":"libro-edit-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/libro-edit-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,OAAO,EACR,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAEL,oBAAoB,EAOrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC9C,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAE5B,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB,IAAI,EAAE,MAAM,IAAI,CAAC;IAEjB,YAAY,EAAE,MAAM,SAAS,CAAC;CAC/B;AAED,eAAO,MAAM,cAAc;cACf,OAAO,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS;CAWvC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,mBACpB,SAAQ,aACR,YAAW,cAAc;IAEzB,SAAS,CAAC,iBAAiB,uBAA8B;IAEzD,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAEH,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,iBAAiB,EAAE,iBAAiB,CAAC;IAGhE,UAAU,CAAC,EAAE,cAAc,CAAC;gBAGN,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW;IAK/C,SAAS,CAAC,eAAe,IAAI,qBAAqB;cAalC,gBAAgB;IAoB1B,YAAY;IA2BlB,YAAY,EAAE,YAAY,CAA0B;IAEpD,YAAY,uDAKV;IAEO,WAAW;IAQX,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;IAQ/D,SAAS,CAAC,WAAW;IAgBZ,KAAK,WAAY,OAAO,UAS/B;IAEO,IAAI,aAGX;IAEF,IAAI,UAAU,WAEb;IAED,IAAI,IAAI,IAAI;IAIZ,IAAI,IAAI,IAAI;CAGb"}

package/es/cell/libro-edit-cell-view.js

@@ -1,5 +1,8 @@
 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, _class, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+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); }); }; }
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -15,9 +18,15 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
-import { prop } from '@difizen/mana-app';
+import { CodeEditorManager } from '@difizen/libro-code-editor';
+import { CellUri } from '@difizen/libro-common';
+import { Disposable, DisposableCollection, getOrigin, inject, prop, ViewOption, ViewRender, watch } from '@difizen/mana-app';
+import { LibroContextKey } from "../libro-context-key.js";
+import { EditorStatus } from "../libro-protocol.js";
 import { isCellView } from "../libro-protocol.js";
+import { CellService } from "./libro-cell-protocol.js";
 import { LibroCellView } from "./libro-cell-view.js";
+import { jsx as _jsx } from "react/jsx-runtime";
 export var EditorCellView = {
   is: function is(arg) {
     return !!arg && isCellView(arg) &&
@@ -30,22 +39,175 @@ export var EditorCellView = {
  * 带有编辑器能力的cell view，例如raw、markdown、python、sql等
  * 超出编辑器的相关能力放在其他的更高抽象中
  */
-export var LibroEditorCellView = (_dec = prop(), _dec2 = prop(), (_class = /*#__PURE__*/function (_LibroCellView) {
+export var LibroEditorCellView = (_dec = prop(), _dec2 = inject(LibroContextKey), _dec3 = inject(CodeEditorManager), _dec4 = prop(), _dec5 = prop(), (_class = /*#__PURE__*/function (_LibroCellView) {
   _inherits(LibroEditorCellView, _LibroCellView);
   var _super = _createSuper(LibroEditorCellView);
-  function LibroEditorCellView() {
+  function LibroEditorCellView(options, cellService) {
     var _this;
     _classCallCheck(this, LibroEditorCellView);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, options, cellService);
+    _this.toDisposeOnEditor = new DisposableCollection();
     _initializerDefineProperty(_this, "editor", _descriptor, _assertThisInitialized(_this));
-    _initializerDefineProperty(_this, "editorStatus", _descriptor2, _assertThisInitialized(_this));
-    _this.renderEditor = void 0;
+    _initializerDefineProperty(_this, "libroContextKey", _descriptor2, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "codeEditorManager", _descriptor3, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "editorView", _descriptor4, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "editorStatus", _descriptor5, _assertThisInitialized(_this));
+    _this.renderEditor = function () {
+      if (_this.editorView) {
+        return /*#__PURE__*/_jsx(ViewRender, {
+          view: _this.editorView
+        });
+      }
+      return null;
+    };
+    _this.focus = function (toEdit) {
+      if (toEdit) {
+        _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)) {
+          return;
+        }
+        (_this$container2 = _this.container) === null || _this$container2 === void 0 || (_this$container2 = _this$container2.current) === null || _this$container2 === void 0 || (_this$container2 = _this$container2.parentElement) === null || _this$container2 === void 0 || _this$container2.focus();
+      }
+    };
+    _this.blur = function () {
+      var _this$editorView, _this$editorView2;
+      (_this$editorView = _this.editorView) === null || _this$editorView === void 0 || (_this$editorView = _this$editorView.editor) === null || _this$editorView === void 0 || _this$editorView.setOption('styleActiveLine', false);
+      (_this$editorView2 = _this.editorView) === null || _this$editorView2 === void 0 || (_this$editorView2 = _this$editorView2.editor) === null || _this$editorView2 === void 0 || _this$editorView2.setOption('highlightActiveLineGutter', false);
+    };
     return _this;
   }
+  LibroEditorCellView = inject(CellService)(LibroEditorCellView, undefined, 1) || LibroEditorCellView;
+  LibroEditorCellView = inject(ViewOption)(LibroEditorCellView, undefined, 0) || LibroEditorCellView;
   _createClass(LibroEditorCellView, [{
+    key: "getEditorOption",
+    value: function getEditorOption() {
+      var option = {
+        uuid: CellUri.from(this.parent.model.id, this.model.id).toString(),
+        editorHostId: this.parent.id + this.id,
+        model: this.model,
+        config: {
+          readOnly: !this.parent.model.inputEditable,
+          editable: this.parent.model.inputEditable
+        }
+      };
+      return option;
+    }
+  }, {
+    key: "afterEditorReady",
+    value: function () {
+      var _afterEditorReady = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _this2 = this,
+          _this$editorView$onMo,
+          _this$editorView3,
+          _this$editor$onModelC,
+          _this$editor,
+          _this$editor$onModelC2;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.focusEditor();
+              this.toDisposeOnEditor.push(watch(this.parent.model, 'inputEditable', function () {
+                var _this2$editorView;
+                (_this2$editorView = _this2.editorView) === null || _this2$editorView === void 0 || (_this2$editorView = _this2$editorView.editor) === null || _this2$editorView === void 0 || _this2$editorView.setOption('readOnly', getOrigin(!_this2.parent.model.inputEditable));
+              }));
+              this.toDisposeOnEditor.push((_this$editorView$onMo = (_this$editorView3 = this.editorView) === null || _this$editorView3 === void 0 ? void 0 : _this$editorView3.onModalChange(function (val) {
+                return _this2.hasModal = val;
+              })) !== null && _this$editorView$onMo !== void 0 ? _this$editorView$onMo : Disposable.NONE);
+              this.toDisposeOnEditor.push((_this$editor$onModelC = (_this$editor = this.editor) === null || _this$editor === void 0 || (_this$editor$onModelC2 = _this$editor.onModelContentChanged) === null || _this$editor$onModelC2 === void 0 ? void 0 : _this$editor$onModelC2.call(_this$editor, function (e) {
+                _this2.parent.model.onCellContentChange({
+                  cell: _this2,
+                  changes: e
+                });
+              })) !== null && _this$editor$onModelC !== void 0 ? _this$editor$onModelC : Disposable.NONE);
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function afterEditorReady() {
+        return _afterEditorReady.apply(this, arguments);
+      }
+      return afterEditorReady;
+    }()
+  }, {
+    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) {
+            case 0:
+              option = this.getEditorOption();
+              this.editorStatus = EditorStatus.LOADING;
+
+              // 防止虚拟滚动中编辑器被频繁创建
+              if (!this.editorView) {
+                _context2.next = 5;
+                break;
+              }
+              this.editorStatus = EditorStatus.LOADED;
+              return _context2.abrupt("return");
+            case 5:
+              _context2.next = 7;
+              return this.codeEditorManager.getOrCreateEditorView(option);
+            case 7:
+              editorView = _context2.sent;
+              this.editorView = editorView;
+              this.editorStatus = EditorStatus.LOADED;
+              editorView.onEditorStatusChange(function (e) {
+                if (e.status === 'ready') {
+                  _this3.editor = _this3.editorView.editor;
+                  _this3.afterEditorReady();
+                } else if (e.status === 'disposed') {
+                  _this3.toDisposeOnEditor.dispose();
+                }
+              });
+            case 11:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function createEditor() {
+        return _createEditor.apply(this, arguments);
+      }
+      return createEditor;
+    }()
+  }, {
+    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: "shouldEnterEditorMode",
+    value: function shouldEnterEditorMode(e) {
+      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$editorView4, _this$parent$model$ac2;
+      //选中cell、编辑模式、非只读时才focus
+      if ((_this$editorView4 = this.editorView) !== null && _this$editorView4 !== void 0 && _this$editorView4.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.libroContextKey.commandModeEnabled === true &&
+      // 排除弹窗等情况
+      this.parent.model.inputEditable) {
+        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: "wrapperCls",
     get: function get() {
       return '';
@@ -53,14 +215,14 @@ export var LibroEditorCellView = (_dec = prop(), _dec2 = prop(), (_class = /*#__
   }, {
     key: "redo",
     value: function redo() {
-      var _this$editor;
-      (_this$editor = this.editor) === null || _this$editor === void 0 || _this$editor.redo();
+      var _this$editor2;
+      (_this$editor2 = this.editor) === null || _this$editor2 === void 0 || _this$editor2.redo();
     }
   }, {
     key: "undo",
     value: function undo() {
-      var _this$editor2;
-      (_this$editor2 = this.editor) === null || _this$editor2 === void 0 || _this$editor2.undo();
+      var _this$editor3;
+      (_this$editor3 = this.editor) === null || _this$editor3 === void 0 || _this$editor3.undo();
     }
   }]);
   return LibroEditorCellView;
@@ -69,9 +231,26 @@ export var LibroEditorCellView = (_dec = prop(), _dec2 = prop(), (_class = /*#__
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, "editorStatus", [_dec2], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, "libroContextKey", [_dec2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, "codeEditorManager", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, "editorView", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, "editorStatus", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function initializer() {
+    return EditorStatus.NOTLOADED;
+  }
 })), _class));

package/es/cell/libro-executable-cell-view.d.ts

@@ -17,7 +17,7 @@ export declare const ExecutableCellView: {
  * 带有编辑器、执行、output相关能力的cell view，例如python、sql
  * model 必须为 ExecutableCellModel
  */
-export declare abstract class LibroExecutableCellView extends LibroEditorCellView implements ExecutableCellView {
+export declare abstract class LibroEditableExecutableCellView extends LibroEditorCellView implements ExecutableCellView {
     model: CellModel & ExecutableCellModel;
     outputArea: BaseOutputArea;
     noEditorAreaHeight: number;
@@ -26,5 +26,9 @@ export declare abstract class LibroExecutableCellView extends LibroEditorCellVie
     hasCellHidden(): boolean;
     outputWatch(): void;
 }
+/**
+ * @deprecated use LibroEditableExecutableCellView instead.
+ */
+export declare const LibroExecutableCellView: typeof LibroEditableExecutableCellView;
 export {};
 //# sourceMappingURL=libro-executable-cell-view.d.ts.map

package/es/cell/libro-executable-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-executable-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/libro-executable-cell-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,UAAU,kBAAmB,SAAQ,cAAc;IACjD,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B,UAAU,EAAE,cAAc,CAAC;IAE3B,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB;cACnB,OAAO,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS;CAYvC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,uBACpB,SAAQ,mBACR,YAAW,kBAAkB;IAErB,KAAK,EAAE,SAAS,GAAG,mBAAmB,CAAC;IAE/C,UAAU,EAAE,cAAc,CAAC;IAEnB,kBAAkB,EAAE,MAAM,CAAC;gBAGb,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW;IAM/C,cAAc,EAAE,MAAM,IAAI,CAExB;IAGO,aAAa;IAUtB,WAAW;CAOZ"}
+{"version":3,"file":"libro-executable-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/libro-executable-cell-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,UAAU,kBAAmB,SAAQ,cAAc;IACjD,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B,UAAU,EAAE,cAAc,CAAC;IAE3B,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB;cACnB,OAAO,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS;CAYvC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,+BACpB,SAAQ,mBACR,YAAW,kBAAkB;IAErB,KAAK,EAAE,SAAS,GAAG,mBAAmB,CAAC;IAE/C,UAAU,EAAE,cAAc,CAAC;IAEnB,kBAAkB,EAAE,MAAM,CAAC;gBAGb,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW;IAM/C,cAAc,EAAE,MAAM,IAAI,CAExB;IAGO,aAAa;IAUtB,WAAW;CAOZ;AAED;;GAEG;AACH,eAAO,MAAM,uBAAuB,wCAAkC,CAAC"}

package/es/cell/libro-executable-cell-view.js

@@ -29,12 +29,12 @@ export var ExecutableCellView = {
  * 带有编辑器、执行、output相关能力的cell view，例如python、sql
  * model 必须为 ExecutableCellModel
  */
-export var LibroExecutableCellView = /*#__PURE__*/function (_LibroEditorCellView) {
-  _inherits(LibroExecutableCellView, _LibroEditorCellView);
-  var _super = _createSuper(LibroExecutableCellView);
-  function LibroExecutableCellView(options, cellService) {
+export var LibroEditableExecutableCellView = /*#__PURE__*/function (_LibroEditorCellView) {
+  _inherits(LibroEditableExecutableCellView, _LibroEditorCellView);
+  var _super = _createSuper(LibroEditableExecutableCellView);
+  function LibroEditableExecutableCellView(options, cellService) {
     var _this;
-    _classCallCheck(this, LibroExecutableCellView);
+    _classCallCheck(this, LibroEditableExecutableCellView);
     _this = _super.call(this, options, cellService);
     _this.outputArea = void 0;
     _this.clearExecution = function () {
@@ -43,9 +43,9 @@ export var LibroExecutableCellView = /*#__PURE__*/function (_LibroEditorCellView
     _this.outputWatch();
     return _this;
   }
-  LibroExecutableCellView = inject(CellService)(LibroExecutableCellView, undefined, 1) || LibroExecutableCellView;
-  LibroExecutableCellView = inject(ViewOption)(LibroExecutableCellView, undefined, 0) || LibroExecutableCellView;
-  _createClass(LibroExecutableCellView, [{
+  LibroEditableExecutableCellView = inject(CellService)(LibroEditableExecutableCellView, undefined, 1) || LibroEditableExecutableCellView;
+  LibroEditableExecutableCellView = inject(ViewOption)(LibroEditableExecutableCellView, undefined, 0) || LibroEditableExecutableCellView;
+  _createClass(LibroEditableExecutableCellView, [{
     key: "hasCellHidden",
     value:
     // TODO: 性能！
@@ -65,5 +65,10 @@ export var LibroExecutableCellView = /*#__PURE__*/function (_LibroEditorCellView
       }));
     }
   }]);
-  return LibroExecutableCellView;
-}(LibroEditorCellView);
+  return LibroEditableExecutableCellView;
+}(LibroEditorCellView);
+
+/**
+ * @deprecated use LibroEditableExecutableCellView instead.
+ */
+export var LibroExecutableCellView = LibroEditableExecutableCellView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-core",
-  "version": "0.2.34",
+  "version": "0.2.35-next.0",
   "description": "",
   "keywords": [
     "libro",
@@ -34,10 +34,10 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-editor": "^0.2.34",
-    "@difizen/libro-common": "^0.2.34",
-    "@difizen/libro-shared-model": "^0.2.34",
-    "@difizen/libro-virtualized": "^0.2.34",
+    "@difizen/libro-code-editor": "^0.2.35-next.0",
+    "@difizen/libro-common": "^0.2.35-next.0",
+    "@difizen/libro-shared-model": "^0.2.35-next.0",
+    "@difizen/libro-virtualized": "^0.2.35-next.0",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@difizen/mana-react": "latest",

package/src/cell/README.md

@@ -6,7 +6,7 @@
 
 - LibroCellView
   - LibroEditorCellView: 带有文本编辑器相关能力
-    - LibroExecutableCellView: 带有执行、输出能力
+    - LibroEditableExecutableCellView: 带有执行、输出能力
       - LibroCodeCellView
         - AIStudioLibroCodeCellView
       - LibroSqlCellView

package/src/cell/libro-edit-cell-view.tsx

@@ -1,10 +1,28 @@
-import type { IEditor } from '@difizen/libro-code-editor';
-import { prop } from '@difizen/mana-app';
+import type {
+  CodeEditorView,
+  CodeEditorViewOptions,
+  IEditor,
+} from '@difizen/libro-code-editor';
+import { CodeEditorManager } from '@difizen/libro-code-editor';
+import { CellUri } from '@difizen/libro-common';
+import {
+  Disposable,
+  DisposableCollection,
+  getOrigin,
+  inject,
+  prop,
+  ViewOption,
+  ViewRender,
+  watch,
+} from '@difizen/mana-app';
 import type { ReactNode } from 'react';
 
-import type { CellView, EditorStatus } from '../libro-protocol.js';
+import { LibroContextKey } from '../libro-context-key.js';
+import type { CellView, CellViewOptions } from '../libro-protocol.js';
+import { EditorStatus } from '../libro-protocol.js';
 import { isCellView } from '../libro-protocol.js';
 
+import { CellService } from './libro-cell-protocol.js';
 import { LibroCellView } from './libro-cell-view.js';
 
 export interface EditorCellView extends CellView {
@@ -39,13 +57,139 @@ export abstract class LibroEditorCellView
   extends LibroCellView
   implements EditorCellView
 {
+  protected toDisposeOnEditor = new DisposableCollection();
   @prop()
   editor: IEditor | undefined;
 
+  @inject(LibroContextKey) protected readonly libroContextKey: LibroContextKey;
+  @inject(CodeEditorManager) codeEditorManager: CodeEditorManager;
+
   @prop()
-  editorStatus: EditorStatus;
+  editorView?: CodeEditorView;
 
-  renderEditor: () => ReactNode;
+  constructor(
+    @inject(ViewOption) options: CellViewOptions,
+    @inject(CellService) cellService: CellService,
+  ) {
+    super(options, cellService);
+  }
+
+  protected getEditorOption(): CodeEditorViewOptions {
+    const option: CodeEditorViewOptions = {
+      uuid: CellUri.from(this.parent.model.id, this.model.id).toString(),
+      editorHostId: this.parent.id + this.id,
+      model: this.model,
+      config: {
+        readOnly: !this.parent.model.inputEditable,
+        editable: this.parent.model.inputEditable,
+      },
+    };
+    return option;
+  }
+
+  protected async afterEditorReady() {
+    this.focusEditor();
+    this.toDisposeOnEditor.push(
+      watch(this.parent.model, 'inputEditable', () => {
+        this.editorView?.editor?.setOption(
+          'readOnly',
+          getOrigin(!this.parent.model.inputEditable),
+        );
+      }),
+    );
+    this.toDisposeOnEditor.push(
+      this.editorView?.onModalChange((val) => (this.hasModal = val)) ?? Disposable.NONE,
+    );
+    this.toDisposeOnEditor.push(
+      this.editor?.onModelContentChanged?.((e) => {
+        this.parent.model.onCellContentChange({ cell: this, changes: e });
+      }) ?? Disposable.NONE,
+    );
+  }
+
+  async createEditor() {
+    const option = this.getEditorOption();
+
+    this.editorStatus = EditorStatus.LOADING;
+
+    // 防止虚拟滚动中编辑器被频繁创建
+    if (this.editorView) {
+      this.editorStatus = EditorStatus.LOADED;
+      return;
+    }
+
+    const editorView = await this.codeEditorManager.getOrCreateEditorView(option);
+
+    this.editorView = editorView;
+    this.editorStatus = EditorStatus.LOADED;
+
+    editorView.onEditorStatusChange((e) => {
+      if (e.status === 'ready') {
+        this.editor = this.editorView!.editor;
+        this.afterEditorReady();
+      } else if (e.status === 'disposed') {
+        this.toDisposeOnEditor.dispose();
+      }
+    });
+  }
+
+  @prop()
+  editorStatus: EditorStatus = EditorStatus.NOTLOADED;
+
+  renderEditor = () => {
+    if (this.editorView) {
+      return <ViewRender view={this.editorView} />;
+    }
+    return null;
+  };
+
+  override onViewMount() {
+    this.createEditor();
+    //选中cell时才focus
+    if (this.parent.model.active?.id === this.id) {
+      this.focus(!this.parent.model.commandMode);
+    }
+  }
+
+  override shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>) {
+    return getOrigin(this.editorView)?.editor?.host?.contains(
+      e.target as HTMLElement,
+    ) && this.parent.model.commandMode
+      ? true
+      : false;
+  }
+
+  protected focusEditor() {
+    //选中cell、编辑模式、非只读时才focus
+    if (
+      this.editorView?.editor &&
+      this.editorView.editorStatus === 'ready' &&
+      this.parent.model.active?.id === this.id &&
+      !this.parent.model.commandMode &&
+      this.libroContextKey.commandModeEnabled === true && // 排除弹窗等情况
+      this.parent.model.inputEditable
+    ) {
+      this.editorView?.editor.setOption('styleActiveLine', true);
+      this.editorView?.editor.setOption('highlightActiveLineGutter', true);
+      this.editorView?.editor.focus();
+    }
+  }
+
+  override focus = (toEdit: boolean) => {
+    if (toEdit) {
+      this.focusEditor();
+    } else {
+      if (this.container?.current?.parentElement?.contains(document.activeElement)) {
+        return;
+      }
+      this.container?.current?.parentElement?.focus();
+    }
+  };
+
+  override blur = () => {
+    this.editorView?.editor?.setOption('styleActiveLine', false);
+    this.editorView?.editor?.setOption('highlightActiveLineGutter', false);
+  };
 
   get wrapperCls() {
     return '';

package/src/cell/libro-executable-cell-view.ts

@@ -38,7 +38,7 @@ export const ExecutableCellView = {
  * 带有编辑器、执行、output相关能力的cell view，例如python、sql
  * model 必须为 ExecutableCellModel
  */
-export abstract class LibroExecutableCellView
+export abstract class LibroEditableExecutableCellView
   extends LibroEditorCellView
   implements ExecutableCellView
 {
@@ -79,3 +79,8 @@ export abstract class LibroExecutableCellView
     );
   }
 }
+
+/**
+ * @deprecated use LibroEditableExecutableCellView instead.
+ */
+export const LibroExecutableCellView = LibroEditableExecutableCellView;