@difizen/libro-code-editor 0.2.10 → 0.2.11

package/es/code-editor-info-manager.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="react" resolution-mode="require"/>
 export declare class CodeEditorInfoManager {
-    editorHostRefMap: Map<string, any>;
+    editorHostRefMap: Map<string, React.RefObject<HTMLDivElement>>;
     constructor();
-    setEditorHostRef(id: string, ref: any): void;
-    getEditorHostRef(id: string): any;
+    setEditorHostRef(id: string, ref: React.RefObject<HTMLDivElement>): void;
+    getEditorHostRef(id: string): import("react").RefObject<HTMLDivElement> | undefined;
 }
 //# sourceMappingURL=code-editor-info-manager.d.ts.map

package/es/code-editor-info-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-editor-info-manager.d.ts","sourceRoot":"","sources":["../src/code-editor-info-manager.ts"],"names":[],"mappings":"AAEA,qBACa,qBAAqB;IAChC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;;IAMnC,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG;IAQrC,gBAAgB,CAAC,EAAE,EAAE,MAAM;CAM5B"}
+{"version":3,"file":"code-editor-info-manager.d.ts","sourceRoot":"","sources":["../src/code-editor-info-manager.ts"],"names":[],"mappings":";AAEA,qBACa,qBAAqB;IAChC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;;IAM/D,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IAQjE,gBAAgB,CAAC,EAAE,EAAE,MAAM;CAM5B"}

package/es/code-editor-manager.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" resolution-mode="require"/>
 import type { Contribution } from '@difizen/mana-app';
 import { ViewManager } from '@difizen/mana-app';
 import { CodeEditorInfoManager } from './code-editor-info-manager.js';
@@ -13,7 +14,7 @@ export declare class CodeEditorManager {
     protected codeEditorInfoManager: CodeEditorInfoManager;
     protected readonly codeEditorSettings: CodeEditorSettings;
     protected stateCache: Map<string, EditorState>;
-    setEditorHostRef(id: string, ref: any): void;
+    setEditorHostRef(id: string, ref: React.RefObject<HTMLDivElement>): void;
     protected findCodeEditorProvider(model: IModel): CodeEditorContribution<any>;
     /**
      * 获取默认配置

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

@@ -1 +1 @@
-{"version":3,"file":"code-editor-manager.d.ts","sourceRoot":"","sources":["../src/code-editor-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAY,WAAW,EAA8B,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBACa,iBAAiB;IAE5B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACtF,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAE3D,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG;IAIrC,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM;IAS9C;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM;IAIpC;;;;OAIG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAO3B,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;CAgBpF"}
+{"version":3,"file":"code-editor-manager.d.ts","sourceRoot":"","sources":["../src/code-editor-manager.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAY,WAAW,EAA8B,MAAM,mBAAmB,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBACa,iBAAiB;IAE5B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACtF,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAE3D,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IAIjE,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM;IAS9C;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM;IAIpC;;;;OAIG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAO3B,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;CAgBpF"}

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

@@ -19,7 +19,7 @@ export declare class CodeEditorView extends BaseView {
     protected classlist: string[];
     protected options: CodeEditorViewOptions;
     protected modalChangeEmitter: Emitter<any>;
-    protected editorHostRef: any;
+    protected editorHostRef: React.RefObject<HTMLDivElement> | null | undefined;
     get onModalChange(): import("@difizen/mana-app").Event<any>;
     /**
      * Get the editor wrapped by the widget.
@@ -38,7 +38,7 @@ export declare class CodeEditorView extends BaseView {
      * Construct a new code editor widget.
      */
     constructor(options: CodeEditorViewOptions, codeEditorInfoManager: CodeEditorInfoManager);
-    protected getEditorHost(): any;
+    protected getEditorHost(): import("react").RefObject<HTMLDivElement> | null | undefined;
     onViewMount(): Promise<void>;
     removeChildNodes: (parent: any) => void;
     onViewUnmount: () => void;

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":"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"}
+{"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

@@ -222,7 +222,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
     key: "onViewMount",
     value: function () {
       var _onViewMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this2 = this;
+        var _this$editorHostRef3,
+          _this2 = this;
         var state, settings, cursorPosition, selections, prevState;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -236,8 +237,8 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
               state = _context.sent;
               settings = this.codeEditorSettings.getUserEditorSettings();
               this.editorHostRef = this.getEditorHost();
-              if (!(this.editorHostRef.current && this.options.factory)) {
-                _context.next = 23;
+              if (!((_this$editorHostRef3 = this.editorHostRef) !== null && _this$editorHostRef3 !== void 0 && _this$editorHostRef3.current && this.options.factory)) {
+                _context.next = 25;
                 break;
               }
               this.editor = this.options.factory(_objectSpread(_objectSpread({}, this.options), {}, {
@@ -273,6 +274,12 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
               if (this.options.autoFocus) {
                 this.editor.focus();
               }
+              if (this.editorHostRef.current) {
+                _context.next = 19;
+                break;
+              }
+              return _context.abrupt("return");
+            case 19:
               this.editorHostRef.current.addEventListener('focus', this.onViewActive);
               this.editorHostRef.current.addEventListener('dragenter', this._evtDragEnter);
               this.editorHostRef.current.addEventListener('dragleave', this._evtDragLeave);
@@ -281,7 +288,7 @@ export var CodeEditorView = (_dec = transient(), _dec2 = view('code-editor-view'
               this.toDispose.push(this.codeEditorSettings.onCodeEditorSettingsChange(function (e) {
                 _this2.editor.setOption(e.key, e.value);
               }));
-            case 23:
+            case 25:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-code-editor",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "",
   "keywords": [
     "libro",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
-    "@difizen/libro-common": "^0.2.10",
+    "@difizen/libro-common": "^0.2.11",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {

package/src/code-editor-info-manager.ts

@@ -2,13 +2,13 @@ import { singleton } from '@difizen/mana-app';
 
 @singleton()
 export class CodeEditorInfoManager {
-  editorHostRefMap: Map<string, any>;
+  editorHostRefMap: Map<string, React.RefObject<HTMLDivElement>>;
 
   constructor() {
     this.editorHostRefMap = new Map();
   }
 
-  setEditorHostRef(id: string, ref: any) {
+  setEditorHostRef(id: string, ref: React.RefObject<HTMLDivElement>) {
     if (!this.editorHostRefMap) {
       this.editorHostRefMap = new Map();
     }

package/src/code-editor-manager.ts

@@ -18,7 +18,7 @@ export class CodeEditorManager {
   @inject(CodeEditorSettings) protected readonly codeEditorSettings: CodeEditorSettings;
   protected stateCache: Map<string, EditorState> = new Map();
 
-  setEditorHostRef(id: string, ref: any) {
+  setEditorHostRef(id: string, ref: React.RefObject<HTMLDivElement>) {
     this.codeEditorInfoManager.setEditorHostRef(id, ref);
   }
 

package/src/code-editor-view.tsx

@@ -73,7 +73,7 @@ export class CodeEditorView extends BaseView {
 
   protected modalChangeEmitter = new Emitter();
 
-  protected editorHostRef: any;
+  protected editorHostRef: React.RefObject<HTMLDivElement> | null | undefined;
 
   get onModalChange() {
     return this.modalChangeEmitter.event;
@@ -123,7 +123,7 @@ export class CodeEditorView extends BaseView {
 
     this.editorHostRef = this.getEditorHost();
 
-    if (this.editorHostRef.current && this.options.factory) {
+    if (this.editorHostRef?.current && this.options.factory) {
       this.editor = this.options.factory(
         {
           ...this.options,
@@ -160,6 +160,10 @@ export class CodeEditorView extends BaseView {
         this.editor.focus();
       }
 
+      if (!this.editorHostRef.current) {
+        return;
+      }
+
       this.editorHostRef.current.addEventListener('focus', this.onViewActive);
       this.editorHostRef.current.addEventListener('dragenter', this._evtDragEnter);
       this.editorHostRef.current.addEventListener('dragleave', this._evtDragLeave);