@difizen/libro-raw-cell 0.2.0 → 0.2.1

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

@@ -1,12 +1,12 @@
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
+import { CellService, LibroEditorCellView, LibroContextKey } from '@difizen/libro-core';
 import { ViewManager } from '@difizen/mana-app';
 import React from 'react';
 import type { LibroRawCellModel } from './raw-cell-model.js';
 export declare class LibroRawCellView extends LibroEditorCellView {
-    protected readonly lirboContextKey: LirboContextKey;
+    protected readonly libroContextKey: LibroContextKey;
     model: LibroRawCellModel;
     view: React.ForwardRefExoticComponent<React.RefAttributes<HTMLDivElement>>;
     viewManager: ViewManager;

package/es/raw-cell-view.js

@@ -22,7 +22,7 @@ function _initializerWarningHelper(descriptor, context) { throw new Error('Decor
 /* eslint-disable @typescript-eslint/parameter-properties */
 
 import { CodeEditorManager } from '@difizen/libro-code-editor';
-import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
+import { CellService, LibroEditorCellView, LibroContextKey } from '@difizen/libro-core';
 import { getOrigin, prop, useInject, watch } from '@difizen/mana-app';
 import { view, ViewInstance, ViewManager, ViewOption, ViewRender } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
@@ -54,14 +54,14 @@ var CodeEditorViewComponent = /*#__PURE__*/React.forwardRef(function CodeEditorV
     children: /*#__PURE__*/_jsx(CellEditorMemo, {})
   });
 });
-export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view'), _dec3 = inject(LirboContextKey), _dec4 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroEditorCellView) {
+export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view'), _dec3 = inject(LibroContextKey), _dec4 = prop(), _dec(_class = _dec2(_class = (_class2 = /*#__PURE__*/function (_LibroEditorCellView) {
   _inherits(LibroRawCellView, _LibroEditorCellView);
   var _super = _createSuper(LibroRawCellView);
   function LibroRawCellView(options, cellService, viewManager, codeEditorManager) {
     var _this;
     _classCallCheck(this, LibroRawCellView);
     _this = _super.call(this, options, cellService);
-    _initializerDefineProperty(_this, "lirboContextKey", _descriptor, _assertThisInitialized(_this));
+    _initializerDefineProperty(_this, "libroContextKey", _descriptor, _assertThisInitialized(_this));
     _this.view = CodeEditorViewComponent;
     _this.viewManager = void 0;
     _this.codeEditorManager = void 0;
@@ -107,8 +107,8 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
         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,
           lineNumbers: false,
           foldGutter: false,
           lineWrap: 'on',
@@ -153,9 +153,9 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              watch(this.parent.model, 'readOnly', function () {
+              watch(this.parent.model, 'inputEditable', function () {
                 var _this2$editorView;
-                (_this2$editorView = _this2.editorView) === null || _this2$editorView === void 0 || _this2$editorView.editor.setOption('readOnly', _this2.parent.model.readOnly);
+                (_this2$editorView = _this2.editorView) === null || _this2$editorView === void 0 || _this2$editorView.editor.setOption('readOnly', !_this2.parent.model.inputEditable);
               });
             case 1:
             case "end":
@@ -179,9 +179,9 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
     value: function focusEditor() {
       var _this$editorView, _this$parent$model$ac2;
       //选中cell、编辑模式、非只读时才focus
-      if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.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.lirboContextKey.commandModeEnabled === true &&
+      if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.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.readOnly === false) {
+      this.parent.model.inputEditable) {
         var _this$editorView2, _this$editorView3, _this$editorView4;
         (_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 || _this$editorView2.editor.setOption('styleActiveLine', true);
         (_this$editorView3 = this.editorView) === null || _this$editorView3 === void 0 || _this$editorView3.editor.setOption('highlightActiveLineGutter', true);
@@ -190,7 +190,7 @@ export var LibroRawCellView = (_dec = transient(), _dec2 = view('raw-cell-view')
     }
   }]);
   return LibroRawCellView;
-}(LibroEditorCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "lirboContextKey", [_dec3], {
+}(LibroEditorCellView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "libroContextKey", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-raw-cell",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "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.1",
+    "@difizen/libro-common": "^0.2.1",
+    "@difizen/libro-core": "^0.2.1",
     "@difizen/mana-app": "latest"
   },
   "peerDependencies": {
-    "react": "^18.2.0"
+    "react": ">=16"
   },
   "devDependencies": {
     "@types/react": "^18.2.25"

package/src/raw-cell-view.tsx

@@ -3,7 +3,7 @@
 import type { CodeEditorViewOptions, CodeEditorView } from '@difizen/libro-code-editor';
 import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService, LibroEditorCellView, LirboContextKey } from '@difizen/libro-core';
+import { CellService, LibroEditorCellView, LibroContextKey } from '@difizen/libro-core';
 import { getOrigin, prop, useInject, watch } from '@difizen/mana-app';
 import {
   view,
@@ -43,7 +43,7 @@ const CodeEditorViewComponent = React.forwardRef<HTMLDivElement>(
 @transient()
 @view('raw-cell-view')
 export class LibroRawCellView extends LibroEditorCellView {
-  @inject(LirboContextKey) protected readonly lirboContextKey: LirboContextKey;
+  @inject(LibroContextKey) protected readonly libroContextKey: LibroContextKey;
   declare model: LibroRawCellModel;
   override view = CodeEditorViewComponent;
 
@@ -80,8 +80,8 @@ export class LibroRawCellView extends LibroEditorCellView {
       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,
         lineNumbers: false,
         foldGutter: false,
         lineWrap: 'on',
@@ -102,8 +102,8 @@ export class LibroRawCellView extends LibroEditorCellView {
   }
 
   protected async afterEditorReady() {
-    watch(this.parent.model, 'readOnly', () => {
-      this.editorView?.editor.setOption('readOnly', this.parent.model.readOnly);
+    watch(this.parent.model, 'inputEditable', () => {
+      this.editorView?.editor.setOption('readOnly', !this.parent.model.inputEditable);
     });
   }
 
@@ -126,8 +126,8 @@ export class LibroRawCellView extends LibroEditorCellView {
       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);