@textbus/platform-browser 3.0.0-alpha.38 → 3.0.0-alpha.39

package/bundles/core/magic-input.d.ts

@@ -49,6 +49,9 @@ export declare class MagicInput extends Input {
     composition: boolean;
     onReady: Promise<void>;
     caret: ExperimentalCaret;
+    set disabled(b: boolean);
+    get disabled(): boolean;
+    private _disabled;
     private container;
     private subscription;
     private doc;

package/bundles/core/native-input.d.ts

@@ -34,6 +34,9 @@ export declare class NativeInput extends Input {
     caret: NativeCaret;
     composition: boolean;
     onReady: Promise<void>;
+    set disabled(b: boolean);
+    get disabled(): boolean;
+    private _disabled;
     private documentView;
     private nativeSelection;
     private subscription;

package/bundles/core/types.d.ts

@@ -55,6 +55,7 @@ export declare abstract class Input {
     abstract composition: boolean;
     abstract onReady: Promise<void>;
     abstract caret: Caret;
+    abstract disabled: boolean;
     abstract focus(nativeRange: Range, reFlash: boolean): void;
     abstract blur(): void;
     abstract destroy(): void;

package/bundles/index.esm.js

@@ -515,7 +515,8 @@ let SelectionBridge = class SelectionBridge {
         if (this.ignoreSelectionChange ||
             this.input.composition ||
             selection.rangeCount === 0 ||
-            !this.docContainer.contains(selection.anchorNode)) {
+            !this.docContainer.contains(selection.anchorNode) ||
+            this.rootComponentRef.component.slots.length === 0) {
             return;
         }
         const rawRange = selection.getRangeAt(0);
@@ -525,12 +526,24 @@ let SelectionBridge = class SelectionBridge {
         if (!this.docContainer.contains(selection.focusNode)) {
             if (isFocusEnd) {
                 const vEle = this.renderer.getVNodeBySlot(this.rootComponentRef.component.slots.first);
+                if (!vEle) {
+                    return;
+                }
                 const nativeNode = this.renderer.getNativeNodeByVNode(vEle);
+                if (!nativeNode) {
+                    return;
+                }
                 nativeRange.setEndAfter(nativeNode.lastChild);
             }
             else {
                 const vEle = this.renderer.getVNodeBySlot(this.rootComponentRef.component.slots.last);
+                if (!vEle) {
+                    return;
+                }
                 const nativeNode = this.renderer.getNativeNodeByVNode(vEle);
+                if (!nativeNode) {
+                    return;
+                }
                 nativeRange.setStartBefore(nativeNode.firstChild);
             }
         }
@@ -1538,6 +1551,15 @@ class ExperimentalCaret {
  * Textbus PC 端输入实现
  */
 let MagicInput = class MagicInput extends Input {
+    set disabled(b) {
+        this._disabled = b;
+        if (b && this.textarea) {
+            this.textarea.disabled = b;
+        }
+    }
+    get disabled() {
+        return this._disabled;
+    }
     constructor(parser, keyboard, commander, selection, controller, scheduler, injector) {
         super();
         this.parser = parser;
@@ -1549,6 +1571,7 @@ let MagicInput = class MagicInput extends Input {
         this.injector = injector;
         this.composition = false;
         this.caret = new ExperimentalCaret(this.scheduler, this.injector.get(VIEW_MASK));
+        this._disabled = false;
         this.container = this.createEditableFrame();
         this.subscription = new Subscription();
         this.textarea = null;
@@ -1577,7 +1600,9 @@ let MagicInput = class MagicInput extends Input {
     }
     focus(range, restart) {
         var _a;
-        this.caret.show(range, restart);
+        if (!this.disabled) {
+            this.caret.show(range, restart);
+        }
         if (this.controller.readonly) {
             return;
         }
@@ -1610,6 +1635,7 @@ let MagicInput = class MagicInput extends Input {
         const doc = this.doc;
         const contentBody = doc.body;
         const textarea = doc.createElement('textarea');
+        textarea.disabled = this.disabled;
         contentBody.appendChild(textarea);
         this.textarea = textarea;
         this.subscription.add(fromEvent(textarea, 'blur').subscribe(() => {
@@ -1879,6 +1905,15 @@ class NativeCaret {
     }
 }
 let NativeInput = class NativeInput extends Input {
+    set disabled(b) {
+        this._disabled = b;
+        if (b && !this.controller.readonly) {
+            this.documentView.contentEditable = b ? 'true' : 'false';
+        }
+    }
+    get disabled() {
+        return this._disabled;
+    }
     constructor(injector, parser, scheduler, selection, keyboard, commander, controller) {
         super();
         this.injector = injector;
@@ -1891,6 +1926,7 @@ let NativeInput = class NativeInput extends Input {
         this.caret = new NativeCaret(this.scheduler);
         this.composition = false;
         this.onReady = Promise.resolve();
+        this._disabled = false;
         this.nativeSelection = document.getSelection();
         this.subscription = new Subscription();
         this.nativeRange = null;

package/bundles/index.js

@@ -517,7 +517,8 @@ exports.SelectionBridge = class SelectionBridge {
         if (this.ignoreSelectionChange ||
             this.input.composition ||
             selection.rangeCount === 0 ||
-            !this.docContainer.contains(selection.anchorNode)) {
+            !this.docContainer.contains(selection.anchorNode) ||
+            this.rootComponentRef.component.slots.length === 0) {
             return;
         }
         const rawRange = selection.getRangeAt(0);
@@ -527,12 +528,24 @@ exports.SelectionBridge = class SelectionBridge {
         if (!this.docContainer.contains(selection.focusNode)) {
             if (isFocusEnd) {
                 const vEle = this.renderer.getVNodeBySlot(this.rootComponentRef.component.slots.first);
+                if (!vEle) {
+                    return;
+                }
                 const nativeNode = this.renderer.getNativeNodeByVNode(vEle);
+                if (!nativeNode) {
+                    return;
+                }
                 nativeRange.setEndAfter(nativeNode.lastChild);
             }
             else {
                 const vEle = this.renderer.getVNodeBySlot(this.rootComponentRef.component.slots.last);
+                if (!vEle) {
+                    return;
+                }
                 const nativeNode = this.renderer.getNativeNodeByVNode(vEle);
+                if (!nativeNode) {
+                    return;
+                }
                 nativeRange.setStartBefore(nativeNode.firstChild);
             }
         }
@@ -1540,6 +1553,15 @@ class ExperimentalCaret {
  * Textbus PC 端输入实现
  */
 exports.MagicInput = class MagicInput extends Input {
+    set disabled(b) {
+        this._disabled = b;
+        if (b && this.textarea) {
+            this.textarea.disabled = b;
+        }
+    }
+    get disabled() {
+        return this._disabled;
+    }
     constructor(parser, keyboard, commander, selection, controller, scheduler, injector) {
         super();
         this.parser = parser;
@@ -1551,6 +1573,7 @@ exports.MagicInput = class MagicInput extends Input {
         this.injector = injector;
         this.composition = false;
         this.caret = new ExperimentalCaret(this.scheduler, this.injector.get(VIEW_MASK));
+        this._disabled = false;
         this.container = this.createEditableFrame();
         this.subscription = new stream.Subscription();
         this.textarea = null;
@@ -1579,7 +1602,9 @@ exports.MagicInput = class MagicInput extends Input {
     }
     focus(range, restart) {
         var _a;
-        this.caret.show(range, restart);
+        if (!this.disabled) {
+            this.caret.show(range, restart);
+        }
         if (this.controller.readonly) {
             return;
         }
@@ -1612,6 +1637,7 @@ exports.MagicInput = class MagicInput extends Input {
         const doc = this.doc;
         const contentBody = doc.body;
         const textarea = doc.createElement('textarea');
+        textarea.disabled = this.disabled;
         contentBody.appendChild(textarea);
         this.textarea = textarea;
         this.subscription.add(stream.fromEvent(textarea, 'blur').subscribe(() => {
@@ -1881,6 +1907,15 @@ class NativeCaret {
     }
 }
 exports.NativeInput = class NativeInput extends Input {
+    set disabled(b) {
+        this._disabled = b;
+        if (b && !this.controller.readonly) {
+            this.documentView.contentEditable = b ? 'true' : 'false';
+        }
+    }
+    get disabled() {
+        return this._disabled;
+    }
     constructor(injector, parser, scheduler, selection, keyboard, commander, controller) {
         super();
         this.injector = injector;
@@ -1893,6 +1928,7 @@ exports.NativeInput = class NativeInput extends Input {
         this.caret = new NativeCaret(this.scheduler);
         this.composition = false;
         this.onReady = Promise.resolve();
+        this._disabled = false;
         this.nativeSelection = document.getSelection();
         this.subscription = new stream.Subscription();
         this.nativeRange = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-alpha.38",
+  "version": "3.0.0-alpha.39",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@tanbo/di": "^1.1.4",
     "@tanbo/stream": "^1.1.8",
-    "@textbus/core": "^3.0.0-alpha.38",
+    "@textbus/core": "^3.0.0-alpha.39",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "5a467be66bf6ed9feca7e3c591bfbc73600e69f9"
+  "gitHead": "049b7797052dbf0e430571ff47d25e289086028b"
 }