@difizen/libro-code-cell 0.2.0 → 0.2.2

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

@@ -3,7 +3,7 @@ import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-
 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, LirboContextKey } from '@difizen/libro-core';
+import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, LibroContextKey } from '@difizen/libro-core';
 import type { ViewSize } from '@difizen/mana-app';
 import { DisposableCollection } from '@difizen/mana-app';
 import { ViewManager, Deferred } from '@difizen/mana-app';
@@ -11,7 +11,7 @@ import type { LibroCodeCellModel } from './code-cell-model.js';
 export declare const CellEditorMemo: import("react").NamedExoticComponent<{}>;
 export declare class LibroCodeCellView extends LibroExecutableCellView {
     protected toDisposeOnEditor: DisposableCollection;
-    protected readonly lirboContextKey: LirboContextKey;
+    protected readonly libroContextKey: LibroContextKey;
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     viewManager: ViewManager;
     codeEditorManager: CodeEditorManager;

package/es/code-cell-view.js

@@ -29,7 +29,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import { isOutput } from '@difizen/libro-common';
-import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, VirtualizedManagerHelper, LirboContextKey } from '@difizen/libro-core';
+import { CellService, EditorStatus, LibroExecutableCellView, LibroOutputArea, VirtualizedManagerHelper, LibroContextKey } from '@difizen/libro-core';
 import { Disposable } from '@difizen/mana-app';
 import { DisposableCollection } from '@difizen/mana-app';
 import { getOrigin, inject, prop, transient, useInject, view, ViewInstance, ViewManager, ViewOption, ViewRender, watch, Deferred } from '@difizen/mana-app';
@@ -85,7 +85,7 @@ var CodeEditorViewComponent = /*#__PURE__*/forwardRef(function CodeEditorViewCom
     children: /*#__PURE__*/_jsx(CellEditorMemo, {})
   });
 });
-export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-cell-view'), _dec3 = inject(LirboContextKey), _dec4 = prop(), _dec5 = prop(), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroExecutableCellV) {
+export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-cell-view'), _dec3 = inject(LibroContextKey), _dec4 = prop(), _dec5 = prop(), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroExecutableCellV) {
   _inherits(LibroCodeCellView, _LibroExecutableCellV);
   var _super = _createSuper(LibroCodeCellView);
   function LibroCodeCellView(options, cellService, viewManager, codeEditorManager) {
@@ -94,7 +94,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     _classCallCheck(this, LibroCodeCellView);
     _this = _super.call(this, options, cellService);
     _this.toDisposeOnEditor = new DisposableCollection();
-    _initializerDefineProperty(_this, "lirboContextKey", _descriptor, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "libroContextKey", _descriptor, _assertThisInitialized(_this));
     _this.view = CodeEditorViewComponent;
     _this.viewManager = void 0;
     _this.codeEditorManager = void 0;
@@ -244,8 +244,8 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
         editorHostId: this.parent.id + this.id,
         model: this.model,
         config: {
-          readOnly: this.parent.model.readOnly,
-          editable: !this.parent.model.readOnly,
+          readOnly: !this.parent.model.inputEditable,
+          editable: this.parent.model.inputEditable,
           placeholder: '请输入代码'
         }
       };
@@ -310,9 +310,9 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.focusEditor();
-              this.toDisposeOnEditor.push(watch(this.parent.model, 'readOnly', function () {
+              this.toDisposeOnEditor.push(watch(this.parent.model, 'inputEditable', function () {
                 var _this4$editorView;
-                (_this4$editorView = _this4.editorView) === null || _this4$editorView === void 0 || (_this4$editorView = _this4$editorView.editor) === null || _this4$editorView === void 0 || _this4$editorView.setOption('readOnly', getOrigin(_this4.parent.model.readOnly));
+                (_this4$editorView = _this4.editorView) === null || _this4$editorView === void 0 || (_this4$editorView = _this4$editorView.editor) === null || _this4$editorView === void 0 || _this4$editorView.setOption('readOnly', getOrigin(!_this4.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 _this4.hasModal = val;
@@ -339,9 +339,9 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     value: function focusEditor() {
       var _this$editorView4, _this$parent$model$ac;
       //选中cell、编辑模式、非只读时才focus
-      if ((_this$editorView4 = this.editorView) !== null && _this$editorView4 !== void 0 && _this$editorView4.editor && this.editorView.editorStatus === 'ready' && ((_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.parent.model.commandMode && this.lirboContextKey.commandModeEnabled === true &&
+      if ((_this$editorView4 = this.editorView) !== null && _this$editorView4 !== void 0 && _this$editorView4.editor && this.editorView.editorStatus === 'ready' && ((_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.parent.model.commandMode && this.libroContextKey.commandModeEnabled === true &&
       // 排除弹窗等情况
-      this.parent.model.readOnly === false) {
+      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);
@@ -356,7 +356,7 @@ export var LibroCodeCellView = (_dec = transient(), _dec2 = view('code-editor-ce
     }
   }]);
   return LibroCodeCellView;
-}(LibroExecutableCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "lirboContextKey", [_dec3], {
+}(LibroExecutableCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "libroContextKey", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-code-cell",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "",
   "keywords": [
     "libro",
@@ -32,13 +32,13 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-code-editor": "^0.2.0",
-    "@difizen/libro-common": "^0.2.0",
-    "@difizen/libro-core": "^0.2.0",
+    "@difizen/libro-code-editor": "^0.2.2",
+    "@difizen/libro-common": "^0.2.2",
+    "@difizen/libro-core": "^0.2.2",
     "@difizen/mana-app": "latest"
   },
   "peerDependencies": {
-    "react": "^18.2.0"
+    "react": ">=16"
   },
   "devDependencies": {
     "@types/react": "^18.2.25"

package/src/code-cell-view.tsx

@@ -16,7 +16,7 @@ import {
   LibroExecutableCellView,
   LibroOutputArea,
   VirtualizedManagerHelper,
-  LirboContextKey,
+  LibroContextKey,
 } from '@difizen/libro-core';
 import type { ViewSize } from '@difizen/mana-app';
 import { Disposable } from '@difizen/mana-app';
@@ -103,7 +103,7 @@ const CodeEditorViewComponent = forwardRef<HTMLDivElement>(
 @view('code-editor-cell-view')
 export class LibroCodeCellView extends LibroExecutableCellView {
   protected toDisposeOnEditor = new DisposableCollection();
-  @inject(LirboContextKey) protected readonly lirboContextKey: LirboContextKey;
+  @inject(LibroContextKey) protected readonly libroContextKey: LibroContextKey;
   override view = CodeEditorViewComponent;
 
   viewManager: ViewManager;
@@ -231,8 +231,8 @@ export class LibroCodeCellView extends LibroExecutableCellView {
       editorHostId: this.parent.id + this.id,
       model: this.model,
       config: {
-        readOnly: this.parent.model.readOnly,
-        editable: !this.parent.model.readOnly,
+        readOnly: !this.parent.model.inputEditable,
+        editable: this.parent.model.inputEditable,
         placeholder: '请输入代码',
       },
     };
@@ -268,10 +268,10 @@ export class LibroCodeCellView extends LibroExecutableCellView {
   protected async afterEditorReady() {
     this.focusEditor();
     this.toDisposeOnEditor.push(
-      watch(this.parent.model, 'readOnly', () => {
+      watch(this.parent.model, 'inputEditable', () => {
         this.editorView?.editor?.setOption(
           'readOnly',
-          getOrigin(this.parent.model.readOnly),
+          getOrigin(!this.parent.model.inputEditable),
         );
       }),
     );
@@ -292,8 +292,8 @@ export class LibroCodeCellView extends LibroExecutableCellView {
       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.libroContextKey.commandModeEnabled === true && // 排除弹窗等情况
+      this.parent.model.inputEditable
     ) {
       this.editorView?.editor.setOption('styleActiveLine', true);
       this.editorView?.editor.setOption('highlightActiveLineGutter', true);