@textbus/platform-browser 3.1.16 → 3.1.18

package/bundles/dom-support/parser.d.ts

@@ -21,7 +21,7 @@ export interface ComponentLoader {
     /** 识别组件的匹配方法 */
     match(element: HTMLElement): boolean;
     /** 读取组件内容的方法 */
-    read(element: HTMLElement, context: Injector, slotParser: SlotParser): ComponentInstance | Slot;
+    read(element: HTMLElement, injector: Injector, slotParser: SlotParser): ComponentInstance | Slot;
 }
 export interface FormatLoaderReadResult<T extends FormatValue> {
     formatter: Formatter<T>;

package/bundles/index.esm.js

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { InjectionToken, Injectable, Inject, Injector, Optional } from '@tanbo/di';
-import { VTextNode, VElement, Controller, Selection, RootComponentRef, Renderer, Scheduler, Slot, ContentType, Event, invokeListener, Keyboard, Commander, makeError, Starter, NativeRenderer, NativeSelectionBridge, OutputRenderer, Registry, History } from '@textbus/core';
+import { VTextNode, VElement, Controller, Selection, RootComponentRef, Renderer, Scheduler, Slot, ContentType, Event, invokeListener, Keyboard, Commander, makeError, Starter, NativeRenderer, NativeSelectionBridge, OutputRenderer, History, Registry } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 
 function createElement(tagName, options = {}) {
@@ -2182,44 +2182,70 @@ let NativeInput = class NativeInput extends Input {
     handleMobileInput(input) {
         let isCompositionStart = true;
         let startIndex;
-        this.subscription.add(fromEvent(input, 'beforeinput').subscribe(ev => {
+        const compositionStart = () => {
+            this.composition = true;
+            this.compositionState = null;
+            startIndex = this.selection.startOffset;
+            const startSlot = this.selection.startSlot;
+            const event = new Event(startSlot, {
+                index: startIndex
+            });
+            invokeListener(startSlot.parent, 'onCompositionStart', event);
+        };
+        const compositionUpdate = (data) => {
+            const startSlot = this.selection.startSlot;
+            this.compositionState = {
+                slot: startSlot,
+                index: startIndex,
+                data
+            };
+            const event = new Event(startSlot, {
+                index: startIndex,
+                data
+            });
+            invokeListener(startSlot.parent, 'onCompositionUpdate', event);
+        };
+        const compositionEnd = (data) => {
+            this.composition = false;
+            if (data) {
+                this.commander.write(data);
+            }
+            const startSlot = this.selection.startSlot;
+            if (startSlot) {
+                const event = new Event(startSlot, null);
+                invokeListener(startSlot.parent, 'onCompositionEnd', event);
+            }
+        };
+        this.subscription.add(fromEvent(input, 'compositionstart').subscribe(() => {
+            compositionStart();
+        }), fromEvent(input, 'compositionupdate').subscribe(ev => {
+            compositionUpdate(ev.data);
+        }), fromEvent(input, 'compositionend').subscribe(ev => {
+            compositionEnd(ev.data);
+        }), fromEvent(input, 'beforeinput').subscribe(ev => {
             var _a;
             switch (ev.inputType) {
                 case 'insertText':
                     if (ev.data) {
                         this.commander.write(ev.data);
+                        ev.preventDefault();
                     }
                     break;
                 case 'insertCompositionText':
                     if (isCompositionStart) {
                         isCompositionStart = false;
-                        this.composition = true;
-                        this.compositionState = null;
-                        startIndex = this.selection.startOffset;
-                        const startSlot = this.selection.startSlot;
-                        const event = new Event(startSlot, {
-                            index: startIndex
-                        });
-                        invokeListener(startSlot.parent, 'onCompositionStart', event);
+                        compositionStart();
                     }
                     else {
-                        const startSlot = this.selection.startSlot;
-                        this.compositionState = {
-                            slot: startSlot,
-                            index: startIndex,
-                            data: ev.data
-                        };
-                        const event = new Event(startSlot, {
-                            index: startIndex,
-                            data: ev.data
-                        });
-                        invokeListener(startSlot.parent, 'onCompositionUpdate', event);
+                        compositionUpdate(ev.data || '');
                     }
                     break;
                 case 'deleteCompositionText':
+                    this.composition = false;
                     break;
                 case 'deleteContentBackward':
                 case 'insertReplacementText': {
+                    this.composition = false;
                     const range = ev.getTargetRanges()[0];
                     const location = this.renderer.getLocationByNativeNode(range.startContainer);
                     const startSlot = this.selection.startSlot;
@@ -2233,17 +2259,11 @@ let NativeInput = class NativeInput extends Input {
                     }
                     break;
                 }
-                case 'insertFromComposition': {
-                    if (ev.data) {
-                        this.commander.write(ev.data);
-                    }
-                    const startSlot = this.selection.startSlot;
-                    if (startSlot) {
-                        const event = new Event(startSlot, null);
-                        invokeListener(startSlot.parent, 'onCompositionEnd', event);
-                    }
-                    break;
-                }
+                //
+                // case 'insertFromComposition': {
+                //   compositionEnd(ev.data || '')
+                //   break
+                // }
             }
         }));
     }
@@ -2628,6 +2648,14 @@ class Viewer extends Starter {
         const rootComponentRef = this.get(RootComponentRef);
         return rootComponentRef.component.toJSON();
     }
+    /**
+     * 清空内容
+     */
+    clear() {
+        this.replaceContent('');
+        const history = this.get(History);
+        history.clear();
+    }
     /**
      * 销毁编辑器
      */

package/bundles/index.js

@@ -2184,44 +2184,70 @@ exports.NativeInput = class NativeInput extends Input {
     handleMobileInput(input) {
         let isCompositionStart = true;
         let startIndex;
-        this.subscription.add(stream.fromEvent(input, 'beforeinput').subscribe(ev => {
+        const compositionStart = () => {
+            this.composition = true;
+            this.compositionState = null;
+            startIndex = this.selection.startOffset;
+            const startSlot = this.selection.startSlot;
+            const event = new core.Event(startSlot, {
+                index: startIndex
+            });
+            core.invokeListener(startSlot.parent, 'onCompositionStart', event);
+        };
+        const compositionUpdate = (data) => {
+            const startSlot = this.selection.startSlot;
+            this.compositionState = {
+                slot: startSlot,
+                index: startIndex,
+                data
+            };
+            const event = new core.Event(startSlot, {
+                index: startIndex,
+                data
+            });
+            core.invokeListener(startSlot.parent, 'onCompositionUpdate', event);
+        };
+        const compositionEnd = (data) => {
+            this.composition = false;
+            if (data) {
+                this.commander.write(data);
+            }
+            const startSlot = this.selection.startSlot;
+            if (startSlot) {
+                const event = new core.Event(startSlot, null);
+                core.invokeListener(startSlot.parent, 'onCompositionEnd', event);
+            }
+        };
+        this.subscription.add(stream.fromEvent(input, 'compositionstart').subscribe(() => {
+            compositionStart();
+        }), stream.fromEvent(input, 'compositionupdate').subscribe(ev => {
+            compositionUpdate(ev.data);
+        }), stream.fromEvent(input, 'compositionend').subscribe(ev => {
+            compositionEnd(ev.data);
+        }), stream.fromEvent(input, 'beforeinput').subscribe(ev => {
             var _a;
             switch (ev.inputType) {
                 case 'insertText':
                     if (ev.data) {
                         this.commander.write(ev.data);
+                        ev.preventDefault();
                     }
                     break;
                 case 'insertCompositionText':
                     if (isCompositionStart) {
                         isCompositionStart = false;
-                        this.composition = true;
-                        this.compositionState = null;
-                        startIndex = this.selection.startOffset;
-                        const startSlot = this.selection.startSlot;
-                        const event = new core.Event(startSlot, {
-                            index: startIndex
-                        });
-                        core.invokeListener(startSlot.parent, 'onCompositionStart', event);
+                        compositionStart();
                     }
                     else {
-                        const startSlot = this.selection.startSlot;
-                        this.compositionState = {
-                            slot: startSlot,
-                            index: startIndex,
-                            data: ev.data
-                        };
-                        const event = new core.Event(startSlot, {
-                            index: startIndex,
-                            data: ev.data
-                        });
-                        core.invokeListener(startSlot.parent, 'onCompositionUpdate', event);
+                        compositionUpdate(ev.data || '');
                     }
                     break;
                 case 'deleteCompositionText':
+                    this.composition = false;
                     break;
                 case 'deleteContentBackward':
                 case 'insertReplacementText': {
+                    this.composition = false;
                     const range = ev.getTargetRanges()[0];
                     const location = this.renderer.getLocationByNativeNode(range.startContainer);
                     const startSlot = this.selection.startSlot;
@@ -2235,17 +2261,11 @@ exports.NativeInput = class NativeInput extends Input {
                     }
                     break;
                 }
-                case 'insertFromComposition': {
-                    if (ev.data) {
-                        this.commander.write(ev.data);
-                    }
-                    const startSlot = this.selection.startSlot;
-                    if (startSlot) {
-                        const event = new core.Event(startSlot, null);
-                        core.invokeListener(startSlot.parent, 'onCompositionEnd', event);
-                    }
-                    break;
-                }
+                //
+                // case 'insertFromComposition': {
+                //   compositionEnd(ev.data || '')
+                //   break
+                // }
             }
         }));
     }
@@ -2630,6 +2650,14 @@ class Viewer extends core.Starter {
         const rootComponentRef = this.get(core.RootComponentRef);
         return rootComponentRef.component.toJSON();
     }
+    /**
+     * 清空内容
+     */
+    clear() {
+        this.replaceContent('');
+        const history = this.get(core.History);
+        history.clear();
+    }
     /**
      * 销毁编辑器
      */

package/bundles/viewer.d.ts

@@ -69,6 +69,10 @@ export declare class Viewer extends Starter {
      * 获取 JSON 格式的内容
      */
     getJSON(): ComponentLiteral;
+    /**
+     * 清空内容
+     */
+    clear(): void;
     /**
      * 销毁编辑器
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "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.9",
-    "@textbus/core": "^3.1.16",
+    "@textbus/core": "^3.1.18",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "bb32dc210effd50d0d90c51974184477e6504bd4"
+  "gitHead": "b7f5adca5b1e8268bdcfa9f0358d399c8ebfcd30"
 }