@textbus/platform-browser 3.0.2 → 3.0.4

package/bundles/_utils/env.d.ts

@@ -2,3 +2,4 @@ export declare const isWindows: () => boolean;
 export declare const isMac: () => boolean;
 export declare const isSafari: () => boolean;
 export declare const isFirefox: () => boolean;
+export declare const isMobileBrowser: () => boolean;

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

@@ -45,6 +45,7 @@ export declare class NativeInput extends Input {
     private nativeRange;
     private isSafari;
     private isMac;
+    private isMobileBrowser;
     private isSougouPinYin;
     constructor(injector: Injector, parser: Parser, scheduler: Scheduler, selection: Selection, keyboard: Keyboard, renderer: Renderer, commander: Commander, controller: Controller);
     focus(nativeRange: Range): void;

package/bundles/core/types.d.ts

@@ -57,7 +57,13 @@ export interface CompositionState {
     data: string;
 }
 export declare abstract class Input {
+    /**
+     * @experimental
+     */
     abstract composition: boolean;
+    /**
+     * @experimental
+     */
     abstract compositionState: CompositionState | null;
     abstract onReady: Promise<void>;
     abstract caret: Caret;

package/bundles/index.esm.js

@@ -102,6 +102,7 @@ const isWindows = () => /win(dows|32|64)/i.test(navigator.userAgent);
 const isMac = () => /mac os/i.test(navigator.userAgent);
 const isSafari = () => /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent);
 const isFirefox = () => /Firefox/.test(navigator.userAgent);
+const isMobileBrowser = () => /Android|iPhone|iPad/.test(navigator.userAgent);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2022,6 +2023,7 @@ let NativeInput = class NativeInput extends Input {
         this.nativeRange = null;
         this.isSafari = isSafari();
         this.isMac = isMac();
+        this.isMobileBrowser = isMobileBrowser();
         this.isSougouPinYin = false; // 有 bug 版本搜狗拼音
         this.documentView = injector.get(VIEW_DOCUMENT);
         if (!controller.readonly) {
@@ -2196,7 +2198,13 @@ let NativeInput = class NativeInput extends Input {
             }
             isCompositionEnd = ev.inputType === 'insertFromComposition';
             if (isCompositionEnd && this.composition) {
-                return null;
+                if (this.isMobileBrowser) {
+                    this.composition = false;
+                    this.compositionState = null;
+                }
+                else {
+                    return null;
+                }
             }
             if (this.isSafari) {
                 if (ev.inputType === 'insertText' || isCompositionEnd) {
@@ -2209,7 +2217,9 @@ let NativeInput = class NativeInput extends Input {
             return null;
         }), filter(text => {
             return text;
-        })), this.isSafari ? new Observable() : fromEvent(input, 'compositionend').pipe(map(ev => {
+        })), (!this.isMobileBrowser && this.isSafari) ? new Observable() : fromEvent(input, 'compositionend').pipe(filter(() => {
+            return this.composition;
+        }), map(ev => {
             isCompositionEnd = true;
             ev.preventDefault();
             return ev.data;
@@ -2825,4 +2835,4 @@ class Viewer extends Starter {
     }
 }
 
-export { CollaborateCursor, CollaborateSelectionAwarenessDelegate, DomRenderer, EDITOR_OPTIONS, Input, MagicInput, NativeInput, OutputTranslator, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, Viewer, createElement, createTextNode, getLayoutRectByRange, isFirefox, isMac, isSafari, isWindows };
+export { CollaborateCursor, CollaborateSelectionAwarenessDelegate, DomRenderer, EDITOR_OPTIONS, Input, MagicInput, NativeInput, OutputTranslator, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, Viewer, createElement, createTextNode, getLayoutRectByRange, isFirefox, isMac, isMobileBrowser, isSafari, isWindows };

package/bundles/index.js

@@ -104,6 +104,7 @@ const isWindows = () => /win(dows|32|64)/i.test(navigator.userAgent);
 const isMac = () => /mac os/i.test(navigator.userAgent);
 const isSafari = () => /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent);
 const isFirefox = () => /Firefox/.test(navigator.userAgent);
+const isMobileBrowser = () => /Android|iPhone|iPad/.test(navigator.userAgent);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2024,6 +2025,7 @@ exports.NativeInput = class NativeInput extends Input {
         this.nativeRange = null;
         this.isSafari = isSafari();
         this.isMac = isMac();
+        this.isMobileBrowser = isMobileBrowser();
         this.isSougouPinYin = false; // 有 bug 版本搜狗拼音
         this.documentView = injector.get(VIEW_DOCUMENT);
         if (!controller.readonly) {
@@ -2198,7 +2200,13 @@ exports.NativeInput = class NativeInput extends Input {
             }
             isCompositionEnd = ev.inputType === 'insertFromComposition';
             if (isCompositionEnd && this.composition) {
-                return null;
+                if (this.isMobileBrowser) {
+                    this.composition = false;
+                    this.compositionState = null;
+                }
+                else {
+                    return null;
+                }
             }
             if (this.isSafari) {
                 if (ev.inputType === 'insertText' || isCompositionEnd) {
@@ -2211,7 +2219,9 @@ exports.NativeInput = class NativeInput extends Input {
             return null;
         }), stream.filter(text => {
             return text;
-        })), this.isSafari ? new stream.Observable() : stream.fromEvent(input, 'compositionend').pipe(stream.map(ev => {
+        })), (!this.isMobileBrowser && this.isSafari) ? new stream.Observable() : stream.fromEvent(input, 'compositionend').pipe(stream.filter(() => {
+            return this.composition;
+        }), stream.map(ev => {
             isCompositionEnd = true;
             ev.preventDefault();
             return ev.data;
@@ -2839,5 +2849,6 @@ exports.createTextNode = createTextNode;
 exports.getLayoutRectByRange = getLayoutRectByRange;
 exports.isFirefox = isFirefox;
 exports.isMac = isMac;
+exports.isMobileBrowser = isMobileBrowser;
 exports.isSafari = isSafari;
 exports.isWindows = isWindows;

package/bundles/viewer.d.ts

@@ -60,12 +60,7 @@ export declare class Viewer extends Starter {
     /**
      * 获取编辑器所有资源
      */
-    getResources(): {
-        styleSheets: string[];
-        styleSheet: string;
-        links: Record<string, string>[];
-        scripts: string[];
-    };
+    getResources(): Resources;
     /**
      * 获取 HTML 格式的内容
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "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",
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "01d6397297fa0999b4ef6ffef3ae36b37118ad44"
+  "gitHead": "6de95d0f7ff105c27834abd7e552f62bc109d5d8"
 }