@difizen/libro-code-editor 0.3.47 → 0.3.49

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

@@ -1 +1 @@
-{"version":3,"file":"code-editor-view.d.ts","sourceRoot":"","sources":["../src/code-editor-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAGL,OAAO,EACP,QAAQ,EACR,YAAY,EAGb,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EACV,kBAAkB,EAElB,aAAa,EACb,OAAO,EACP,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,eAAO,MAAM,gBAAgB,+HAI5B,CAAC;AAuBF,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;AAEjE;;GAEG;AACH,qBAEa,cAAe,SAAQ,QAAQ;IACpB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEtF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,qBAAqB,EAAE,qBAAqB,CAAC;IAEpC,IAAI,gIAAoB;IAEjC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAM;IAEnC,SAAS,CAAC,OAAO,EAAE,qBAAqB,CAAC;IAEzC,SAAS,CAAC,kBAAkB,eAAiB;IAE7C,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAE5E,IAAI,aAAa,2CAEhB;IAED;;OAEG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB,YAAY,EAAE,oBAAoB,CAAU;IAE5C,SAAS,CAAC,yBAAyB;gBACzB,oBAAoB;mBACjB,oBAAoB;OAC5B;IACL,oBAAoB;gBAHV,oBAAoB;mBACjB,oBAAoB;OAE2B;IAE5D;;OAEG;gBAEmB,OAAO,EAAE,qBAAqB,EACnB,qBAAqB,EAAE,qBAAqB;IAO7E,SAAS,CAAC,aAAa;IASR,WAAW;IAiE1B,gBAAgB,WAAY,GAAG,UAI7B;IAEO,aAAa,aAyBpB;IAEO,YAAY;IAIrB;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;OAEG;IACM,OAAO,IAAI,IAAI;IAQxB,SAAS,CAAC,YAAY,QAAO,IAAI,CAE/B;IAEF;;OAEG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAM1B,QAAQ,CAAC,SAAS,EAAE,MAAM;IAI1B,WAAW,CAAC,SAAS,EAAE,MAAM;IAO7B;;OAEG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAqBtC;;OAEG;IACH,SAAS,CAAC,aAAa,UAAW,SAAS,KAAG,IAAI,CAWhD;IAEF;;OAEG;IACH,SAAS,CAAC,aAAa,UAAW,SAAS,KAAG,IAAI,CAWhD;IAEF;;OAEG;IACH,SAAS,CAAC,YAAY,UAAW,SAAS,KAAG,IAAI,CAa/C;IAEF;;OAEG;IACH,SAAS,CAAC,QAAQ,UAAW,SAAS,KAAG,IAAI,CA+B3C;CACH;AAED;;GAEG;AACH;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa;IACjF;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAE5B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzB;;OAEG;IACH,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB"}
+{"version":3,"file":"code-editor-view.d.ts","sourceRoot":"","sources":["../src/code-editor-view.tsx"],"names":[],"mappings":"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"}

package/es/code-editor-view.js

@@ -84,8 +84,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
       }
     };
     _this.onViewUnmount = function () {
-      var _this$editorHostRef2;
-      if (_this.editor.hasFocus()) {
+      var _this$editor, _this$editor2, _this$editorHostRef2;
+      if ((_this$editor = _this.editor) !== null && _this$editor !== void 0 && _this$editor.hasFocus()) {
         var _this$editorHostRef;
         // 保存编辑器状态
         var editorState = _this.editor.getState();
@@ -94,7 +94,7 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
         _this.editorHostRef = _this.getEditorHost();
         (_this$editorHostRef = _this.editorHostRef) === null || _this$editorHostRef === void 0 || (_this$editorHostRef = _this$editorHostRef.current) === null || _this$editorHostRef === void 0 || _this$editorHostRef.focus();
       }
-      _this.editor.dispose();
+      (_this$editor2 = _this.editor) === null || _this$editor2 === void 0 || _this$editor2.dispose();
       var prevState = _this.editorStatus;
       _this.editorStatus = 'disposed';
       _this.editorStatusChangeEmitter.fire({
@@ -112,13 +112,15 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
       }
     };
     _this.onViewActive = function () {
-      _this.editor.focus();
+      var _this$editor3;
+      (_this$editor3 = _this.editor) === null || _this$editor3 === void 0 || _this$editor3.focus();
     };
     /**
      * Handle the `'lm-dragenter'` event for the widget.
      */
     _this._evtDragEnter = function (event) {
-      if (_this.editor.getOption('readOnly') === true) {
+      var _this$editor4;
+      if (((_this$editor4 = _this.editor) === null || _this$editor4 === void 0 ? void 0 : _this$editor4.getOption('readOnly')) === true) {
         return;
       }
       var data = findTextData(event);
@@ -302,8 +304,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
   }, {
     key: "onViewResize",
     value: function onViewResize() {
-      var _this$editor;
-      (_this$editor = this.editor) === null || _this$editor === void 0 || _this$editor.resizeToFit();
+      var _this$editor5;
+      (_this$editor5 = this.editor) === null || _this$editor5 === void 0 || _this$editor5.resizeToFit();
     }
 
     /**
@@ -312,7 +314,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
   }, {
     key: "model",
     get: function get() {
-      return this.editor.model;
+      var _this$editor6;
+      return ((_this$editor6 = this.editor) === null || _this$editor6 === void 0 ? void 0 : _this$editor6.model) || this.options.model;
     }
 
     /**
@@ -321,11 +324,12 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
   }, {
     key: "dispose",
     value: function dispose() {
+      var _this$editor7;
       if (this.isDisposed) {
         return;
       }
       _get(_getPrototypeOf(CodeEditorView.prototype), "dispose", this).call(this);
-      this.editor.dispose();
+      (_this$editor7 = this.editor) === null || _this$editor7 === void 0 || _this$editor7.dispose();
     }
   }, {
     key: "onResize",
@@ -335,7 +339,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
      */
     function onResize() {
       if (this.isVisible) {
-        this.editor.resizeToFit();
+        var _this$editor8;
+        (_this$editor8 = this.editor) === null || _this$editor8 === void 0 || _this$editor8.resizeToFit();
       }
     }
   }, {
@@ -358,6 +363,9 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
   }, {
     key: "_onSelectionsChanged",
     value: function _onSelectionsChanged() {
+      if (!this.editor) {
+        return;
+      }
       var _this$editor$getSelec = this.editor.getSelection(),
         start = _this$editor$getSelec.start,
         end = _this$editor$getSelec.end;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-code-editor",
-  "version": "0.3.47",
+  "version": "0.3.49",
   "description": "",
   "keywords": [
     "libro",
@@ -32,7 +32,7 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-common": "^0.3.47",
+    "@difizen/libro-common": "^0.3.49",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "uuid": "^9.0.1"

package/src/code-editor-view.tsx

@@ -185,7 +185,7 @@ export class CodeEditorView extends BaseView {
   };
 
   override onViewUnmount = () => {
-    if (this.editor.hasFocus()) {
+    if (this.editor?.hasFocus()) {
       // 保存编辑器状态
       const editorState = this.editor.getState();
       this.codeEditorStateManager.updateEditorState(this.options.uuid, editorState);
@@ -193,7 +193,7 @@ export class CodeEditorView extends BaseView {
       this.editorHostRef = this.getEditorHost();
       this.editorHostRef?.current?.focus();
     }
-    this.editor.dispose();
+    this.editor?.dispose();
 
     const prevState = this.editorStatus;
     this.editorStatus = 'disposed';
@@ -219,7 +219,7 @@ export class CodeEditorView extends BaseView {
    * Get the model used by the widget.
    */
   get model(): IModel {
-    return this.editor.model;
+    return this.editor?.model || this.options.model;
   }
 
   /**
@@ -230,11 +230,11 @@ export class CodeEditorView extends BaseView {
       return;
     }
     super.dispose();
-    this.editor.dispose();
+    this.editor?.dispose();
   }
 
   protected onViewActive = (): void => {
-    this.editor.focus();
+    this.editor?.focus();
   };
 
   /**
@@ -242,7 +242,7 @@ export class CodeEditorView extends BaseView {
    */
   protected onResize(): void {
     if (this.isVisible) {
-      this.editor.resizeToFit();
+      this.editor?.resizeToFit();
     }
   }
 
@@ -261,6 +261,9 @@ export class CodeEditorView extends BaseView {
    * Handle a change in model selections.
    */
   protected _onSelectionsChanged(): void {
+    if (!this.editor) {
+      return;
+    }
     const { start, end } = this.editor.getSelection();
 
     if (start.column !== end.column || start.line !== end.line) {
@@ -285,7 +288,7 @@ export class CodeEditorView extends BaseView {
    * Handle the `'lm-dragenter'` event for the widget.
    */
   protected _evtDragEnter = (event: DragEvent): void => {
-    if (this.editor.getOption('readOnly') === true) {
+    if (this.editor?.getOption('readOnly') === true) {
       return;
     }
     const data = findTextData(event);