@difizen/libro-code-cell 0.1.3 → 0.1.4

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

@@ -1,11 +1,11 @@
 /// <reference types="react" resolution-mode="require"/>
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
-import { CodeEditorManager, CodeEditorSettings } from '@difizen/libro-code-editor';
+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 { ViewManager } from '@difizen/mana-app';
-import { Deferred } from '@difizen/mana-app';
+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 {
@@ -23,10 +23,10 @@ export declare class LibroCodeCellView extends LibroExecutableCellView {
     get editorReady(): Promise<void>;
     protected outputAreaDeferred: Deferred<LibroOutputArea>;
     get outputAreaReady(): Promise<LibroOutputArea>;
-    protected codeEditorSettings: CodeEditorSettings;
     renderEditor: () => import("react/jsx-runtime").JSX.Element | null;
+    onViewResize(size: ViewSize): void;
     calcEditorAreaHeight(): number;
-    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, codeEditorManager: CodeEditorManager, codeEditorSettings: CodeEditorSettings);
+    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, codeEditorManager: CodeEditorManager);
     outputWatch(): void;
     toJSON(): LibroCell;
     onViewMount(): 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,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACnF,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,EAQL,WAAW,EAIZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AA6C/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;IAED,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAExC,YAAY,uDAKnB;IAMF,oBAAoB;gBAqBE,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB,EACnC,kBAAkB,EAAE,kBAAkB;IA8B3D,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,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"}

package/es/code-cell-view.js

@@ -27,12 +27,11 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 /* eslint-disable @typescript-eslint/no-parameter-properties */
 /* eslint-disable @typescript-eslint/parameter-properties */
 
-import { CodeEditorManager, CodeEditorSettings } from '@difizen/libro-code-editor';
+import { CodeEditorManager } from '@difizen/libro-code-editor';
 import { isOutput } from '@difizen/libro-common';
 import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, VirtualizedManagerHelper } from '@difizen/libro-core';
-import { getOrigin, inject, prop, transient, useInject, view, ViewInstance, ViewManager, ViewOption, ViewRender, watch } from '@difizen/mana-app';
-import { Deferred } from '@difizen/mana-app';
-import { useEffect, useMemo, useRef, memo, forwardRef } from 'react';
+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";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 function countLines(inputString) {
@@ -52,14 +51,12 @@ var CellEditor = function CellEditor() {
       instance.editor = getOrigin((_instance$editorView2 = instance.editorView) === null || _instance$editorView2 === void 0 ? void 0 : _instance$editorView2.editor);
     }
   }, [instance, (_instance$editorView3 = instance.editorView) === null || _instance$editorView3 === void 0 ? void 0 : _instance$editorView3.editor]);
-  var editorAreaHeight = useMemo(function () {
-    return instance.calcEditorAreaHeight();
-  }, [instance.model.value]);
   if (virtualizedManager.isVirtualized) {
     instance.renderEditorIntoVirtualized = true;
     if (instance.setEditorHost) {
       instance.setEditorHost(editorRef);
     }
+    var editorAreaHeight = instance.calcEditorAreaHeight();
     return /*#__PURE__*/_jsx("div", {
       style: {
         height: "".concat(editorAreaHeight || 0, "px"),
@@ -89,7 +86,7 @@ var CodeEditorViewComponent = /*#__PURE__*/forwardRef(function CodeEditorViewCom
 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) {
   _inherits(LibroCodeCellView, _LibroExecutableCellV);
   var _super = _createSuper(LibroCodeCellView);
-  function LibroCodeCellView(options, cellService, viewManager, codeEditorManager, codeEditorSettings) {
+  function LibroCodeCellView(options, cellService, viewManager, codeEditorManager) {
     var _options$cell;
     var _this;
     _classCallCheck(this, LibroCodeCellView);
@@ -105,7 +102,6 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     _initializerDefineProperty(_this, "editorStatus", _descriptor5, _assertThisInitialized(_this));
     _this.editorViewReadyDeferred = new Deferred();
     _this.outputAreaDeferred = new Deferred();
-    _this.codeEditorSettings = void 0;
     _this.renderEditor = function () {
       if (_this.editorView) {
         return /*#__PURE__*/_jsx(ViewRender, {
@@ -163,7 +159,6 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     _this.options = options;
     _this.viewManager = viewManager;
     _this.codeEditorManager = codeEditorManager;
-    _this.codeEditorSettings = codeEditorSettings;
     _this.outputs = (_options$cell = options.cell) === null || _options$cell === void 0 ? void 0 : _options$cell.outputs;
     _this.className = _this.className + ' code';
 
@@ -201,7 +196,6 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     }()).catch(console.error);
     return _this;
   }
-  LibroCodeCellView = inject(CodeEditorSettings)(LibroCodeCellView, undefined, 4) || LibroCodeCellView;
   LibroCodeCellView = inject(CodeEditorManager)(LibroCodeCellView, undefined, 3) || LibroCodeCellView;
   LibroCodeCellView = inject(ViewManager)(LibroCodeCellView, undefined, 2) || LibroCodeCellView;
   LibroCodeCellView = inject(CellService)(LibroCodeCellView, undefined, 1) || LibroCodeCellView;
@@ -216,27 +210,27 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     get: function get() {
       return this.outputAreaDeferred.promise;
     }
+  }, {
+    key: "onViewResize",
+    value: function onViewResize(size) {
+      if (size.height) {
+        this.editorAreaHeight = size.height;
+      }
+    }
   }, {
     key: "calcEditorAreaHeight",
-    value:
-    // onViewResize(size: ViewSize) {
-    //   if (size.height) this.editorAreaHeight = size.height;
-    // }
-    function calcEditorAreaHeight() {
-      // if (
-      //   this.editorStatus === EditorStatus.NOTLOADED ||
-      //   this.editorStatus === EditorStatus.LOADING
-      // ) {
-
-      var _this$codeEditorManag = this.codeEditorManager.getUserEditorConfig(this.model),
-        lineHeight = _this$codeEditorManag.lineHeight,
-        paddingTop = _this$codeEditorManag.paddingTop,
-        paddingBottom = _this$codeEditorManag.paddingBottom,
-        scrollBarHeight = _this$codeEditorManag.scrollBarHeight;
-      var codeHeight = countLines(this.model.value) * (lineHeight || 20);
-      var editorPadding = paddingTop + paddingBottom;
-      var editorAreaHeight = codeHeight + editorPadding + scrollBarHeight;
-      this.editorAreaHeight = editorAreaHeight;
+    value: function calcEditorAreaHeight() {
+      if (this.editorStatus === EditorStatus.NOTLOADED || this.editorStatus === EditorStatus.LOADING) {
+        var _this$codeEditorManag = this.codeEditorManager.getUserEditorConfig(this.model),
+          lineHeight = _this$codeEditorManag.lineHeight,
+          paddingTop = _this$codeEditorManag.paddingTop,
+          paddingBottom = _this$codeEditorManag.paddingBottom,
+          scrollBarHeight = _this$codeEditorManag.scrollBarHeight;
+        var codeHeight = countLines(this.model.value) * (lineHeight !== null && lineHeight !== void 0 ? lineHeight : 20);
+        var editorPadding = paddingTop + paddingBottom;
+        var editorAreaHeight = codeHeight + editorPadding + scrollBarHeight;
+        this.editorAreaHeight = editorAreaHeight;
+      }
 
       // 编辑器已经加载的情况下cell高度都由对它的高度监听得到。
       return this.editorAreaHeight;

package/package.json

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

package/src/code-cell-view.tsx

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-parameter-properties */
 /* eslint-disable @typescript-eslint/parameter-properties */
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
-import { CodeEditorManager, CodeEditorSettings } from '@difizen/libro-code-editor';
+import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { ICodeCell, IOutput } from '@difizen/libro-common';
 import { isOutput } from '@difizen/libro-common';
 import type {
@@ -17,6 +17,7 @@ import {
   LibroOutputArea,
   VirtualizedManagerHelper,
 } from '@difizen/libro-core';
+import type { ViewSize } from '@difizen/mana-app';
 import {
   getOrigin,
   inject,
@@ -29,9 +30,9 @@ import {
   ViewOption,
   ViewRender,
   watch,
+  Deferred,
 } from '@difizen/mana-app';
-import { Deferred } from '@difizen/mana-app';
-import { useEffect, useMemo, useRef, memo, forwardRef } from 'react';
+import { useEffect, useRef, memo, forwardRef } from 'react';
 
 import type { LibroCodeCellModel } from './code-cell-model.js';
 
@@ -54,16 +55,14 @@ const CellEditor: React.FC = () => {
     }
   }, [instance, instance.editorView?.editor]);
 
-  const editorAreaHeight = useMemo(() => {
-    return instance.calcEditorAreaHeight();
-  }, [instance.model.value]);
-
   if (virtualizedManager.isVirtualized) {
     instance.renderEditorIntoVirtualized = true;
     if (instance.setEditorHost) {
       instance.setEditorHost(editorRef);
     }
 
+    const editorAreaHeight = instance.calcEditorAreaHeight();
+
     return (
       <div
         style={{
@@ -136,8 +135,6 @@ export class LibroCodeCellView extends LibroExecutableCellView {
     return this.outputAreaDeferred.promise;
   }
 
-  protected codeEditorSettings: CodeEditorSettings;
-
   override renderEditor = () => {
     if (this.editorView) {
       return <ViewRender view={this.editorView} />;
@@ -145,25 +142,27 @@ export class LibroCodeCellView extends LibroExecutableCellView {
     return null;
   };
 
-  // onViewResize(size: ViewSize) {
-  //   if (size.height) this.editorAreaHeight = size.height;
-  // }
+  override onViewResize(size: ViewSize) {
+    if (size.height) {
+      this.editorAreaHeight = size.height;
+    }
+  }
 
   calcEditorAreaHeight() {
-    // if (
-    //   this.editorStatus === EditorStatus.NOTLOADED ||
-    //   this.editorStatus === EditorStatus.LOADING
-    // ) {
-
-    const { lineHeight, paddingTop, paddingBottom, scrollBarHeight } =
-      this.codeEditorManager.getUserEditorConfig(this.model);
+    if (
+      this.editorStatus === EditorStatus.NOTLOADED ||
+      this.editorStatus === EditorStatus.LOADING
+    ) {
+      const { lineHeight, paddingTop, paddingBottom, scrollBarHeight } =
+        this.codeEditorManager.getUserEditorConfig(this.model);
 
-    const codeHeight = countLines(this.model.value) * (lineHeight || 20);
-    const editorPadding = paddingTop + paddingBottom;
+      const codeHeight = countLines(this.model.value) * (lineHeight ?? 20);
+      const editorPadding = paddingTop + paddingBottom;
 
-    const editorAreaHeight = codeHeight + editorPadding + scrollBarHeight;
+      const editorAreaHeight = codeHeight + editorPadding + scrollBarHeight;
 
-    this.editorAreaHeight = editorAreaHeight;
+      this.editorAreaHeight = editorAreaHeight;
+    }
 
     // 编辑器已经加载的情况下cell高度都由对它的高度监听得到。
     return this.editorAreaHeight;
@@ -174,13 +173,11 @@ export class LibroCodeCellView extends LibroExecutableCellView {
     @inject(CellService) cellService: CellService,
     @inject(ViewManager) viewManager: ViewManager,
     @inject(CodeEditorManager) codeEditorManager: CodeEditorManager,
-    @inject(CodeEditorSettings) codeEditorSettings: CodeEditorSettings,
   ) {
     super(options, cellService);
     this.options = options;
     this.viewManager = viewManager;
     this.codeEditorManager = codeEditorManager;
-    this.codeEditorSettings = codeEditorSettings;
 
     this.outputs = options.cell?.outputs as IOutput[];
     this.className = this.className + ' code';