@textbus/platform-browser 5.0.0-alpha.1 → 5.0.0-alpha.11

package/bundles/index.esm.js

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
-import { Slot, Textbus, Adapter, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Component, Registry } from '@textbus/core';
-import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
+import { Slot, Textbus, Adapter, Controller, Selection, RootComponentRef, Scheduler, ContentType, Event, invokeListener, Keyboard, Commander, makeError, NativeSelectionBridge, FocusManager, Component, Registry } from '@textbus/core';
+import { Subject, filter, fromEvent, delay, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 import { InjectionToken, Injectable, Inject, Optional } from '@viewfly/core';
 
 function createElement(tagName, options = {}) {
@@ -383,7 +383,7 @@ class DomAdapter extends Adapter {
  * Textbus PC 端选区桥接实现
  */
 let SelectionBridge = class SelectionBridge {
-    constructor(config, textbus, controller, selection, rootComponentRef, input, domAdapter) {
+    constructor(config, textbus, controller, selection, rootComponentRef, input, scheduler, domAdapter) {
         Object.defineProperty(this, "config", {
             enumerable: true,
             configurable: true,
@@ -408,6 +408,12 @@ let SelectionBridge = class SelectionBridge {
             writable: true,
             value: input
         });
+        Object.defineProperty(this, "scheduler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: scheduler
+        });
         Object.defineProperty(this, "domAdapter", {
             enumerable: true,
             configurable: true,
@@ -792,7 +798,15 @@ let SelectionBridge = class SelectionBridge {
                 }
             }));
         }
-        this.subs.push(fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+        let isUpdating = false;
+        this.subs.push(this.scheduler.onDocChange.subscribe(() => {
+            isUpdating = true;
+        }), this.scheduler.onDocChanged.pipe(delay()).subscribe(() => {
+            isUpdating = false;
+        }), fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+            if (isUpdating) {
+                return;
+            }
             if (this.syncSelectionFromNativeSelectionChange) {
                 this.syncSelection(connector);
             }
@@ -835,7 +849,7 @@ let SelectionBridge = class SelectionBridge {
             this.getCorrectedPosition(nativeRange.endContainer, nativeRange.endOffset, isFocusEnd);
         if ([Node.ELEMENT_NODE, Node.TEXT_NODE].includes((_a = nativeRange.commonAncestorContainer) === null || _a === void 0 ? void 0 : _a.nodeType) &&
             startPosition && endPosition) {
-            const abstractSelection = isFocusEnd ? {
+            const abstractSelection = connector.beforeChange(isFocusEnd ? {
                 anchorSlot: startPosition.slot,
                 anchorOffset: startPosition.offset,
                 focusSlot: endPosition.slot,
@@ -845,7 +859,12 @@ let SelectionBridge = class SelectionBridge {
                 focusOffset: startPosition.offset,
                 anchorSlot: endPosition.slot,
                 anchorOffset: endPosition.offset
-            };
+            });
+            if (!abstractSelection) {
+                this.selectionChangeEvent.next(null);
+                connector.setSelection(null);
+                return;
+            }
             const { focus, anchor } = this.getPositionByRange(abstractSelection);
             if (focus && anchor) {
                 let start = anchor;
@@ -1050,6 +1069,7 @@ SelectionBridge = __decorate([
         Selection,
         RootComponentRef,
         Input,
+        Scheduler,
         DomAdapter])
 ], SelectionBridge);
 

package/bundles/index.js

@@ -385,7 +385,7 @@ class DomAdapter extends core$1.Adapter {
  * Textbus PC 端选区桥接实现
  */
 exports.SelectionBridge = class SelectionBridge {
-    constructor(config, textbus, controller, selection, rootComponentRef, input, domAdapter) {
+    constructor(config, textbus, controller, selection, rootComponentRef, input, scheduler, domAdapter) {
         Object.defineProperty(this, "config", {
             enumerable: true,
             configurable: true,
@@ -410,6 +410,12 @@ exports.SelectionBridge = class SelectionBridge {
             writable: true,
             value: input
         });
+        Object.defineProperty(this, "scheduler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: scheduler
+        });
         Object.defineProperty(this, "domAdapter", {
             enumerable: true,
             configurable: true,
@@ -794,7 +800,15 @@ exports.SelectionBridge = class SelectionBridge {
                 }
             }));
         }
-        this.subs.push(stream.fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+        let isUpdating = false;
+        this.subs.push(this.scheduler.onDocChange.subscribe(() => {
+            isUpdating = true;
+        }), this.scheduler.onDocChanged.pipe(stream.delay()).subscribe(() => {
+            isUpdating = false;
+        }), stream.fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+            if (isUpdating) {
+                return;
+            }
             if (this.syncSelectionFromNativeSelectionChange) {
                 this.syncSelection(connector);
             }
@@ -837,7 +851,7 @@ exports.SelectionBridge = class SelectionBridge {
             this.getCorrectedPosition(nativeRange.endContainer, nativeRange.endOffset, isFocusEnd);
         if ([Node.ELEMENT_NODE, Node.TEXT_NODE].includes((_a = nativeRange.commonAncestorContainer) === null || _a === void 0 ? void 0 : _a.nodeType) &&
             startPosition && endPosition) {
-            const abstractSelection = isFocusEnd ? {
+            const abstractSelection = connector.beforeChange(isFocusEnd ? {
                 anchorSlot: startPosition.slot,
                 anchorOffset: startPosition.offset,
                 focusSlot: endPosition.slot,
@@ -847,7 +861,12 @@ exports.SelectionBridge = class SelectionBridge {
                 focusOffset: startPosition.offset,
                 anchorSlot: endPosition.slot,
                 anchorOffset: endPosition.offset
-            };
+            });
+            if (!abstractSelection) {
+                this.selectionChangeEvent.next(null);
+                connector.setSelection(null);
+                return;
+            }
             const { focus, anchor } = this.getPositionByRange(abstractSelection);
             if (focus && anchor) {
                 let start = anchor;
@@ -1052,6 +1071,7 @@ exports.SelectionBridge = __decorate([
         core$1.Selection,
         core$1.RootComponentRef,
         Input,
+        core$1.Scheduler,
         DomAdapter])
 ], exports.SelectionBridge);
 

package/bundles/parser.d.ts

@@ -75,13 +75,13 @@ export declare class Parser {
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot | Component<import("@textbus/core").State>;
+    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot<Record<string, any>> | Component<import("@textbus/core").State>;
     /**
      * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
-    parse(html: string | HTMLElement, rootSlot: Slot): Slot;
+    parse(html: string | HTMLElement, rootSlot: Slot): Slot<Record<string, any>>;
     private readComponent;
     private readText;
     private readFormats;

package/bundles/selection-bridge.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from '@tanbo/stream';
-import { NativeSelectionBridge, NativeSelectionConnector, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection, Textbus } from '@textbus/core';
+import { NativeSelectionBridge, NativeSelectionConnector, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection, Textbus, Scheduler } from '@textbus/core';
 import { Rect } from './_utils/uikit';
 import { Input } from './types';
 import { ViewOptions } from './browser-module';
@@ -12,6 +12,7 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     private selection;
     private rootComponentRef;
     private input;
+    private scheduler;
     private domAdapter;
     onSelectionChange: Observable<Range | null>;
     nativeSelection: globalThis.Selection;
@@ -25,7 +26,7 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     private docContainer;
     private cacheCaretPositionTimer;
     private oldCaretPosition;
-    constructor(config: ViewOptions, textbus: Textbus, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, domAdapter: DomAdapter);
+    constructor(config: ViewOptions, textbus: Textbus, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, scheduler: Scheduler, domAdapter: DomAdapter);
     connect(connector: NativeSelectionConnector): void;
     disConnect(): void;
     getRect(location: SelectionPosition): Rect | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.11",
   "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",
@@ -26,14 +26,14 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.7",
-    "@textbus/core": "^5.0.0-alpha.1",
+    "@textbus/core": "^5.0.0-alpha.11",
     "@viewfly/core": "^2.0.0-alpha.3"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^23.0.2",
-    "@rollup/plugin-typescript": "^9.0.2",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-typescript": "^12.1.2",
     "rimraf": "^3.0.2",
-    "rollup": "^3.2.5",
+    "rollup": "4.22.4",
     "tslib": "^2.4.1"
   },
   "author": {
@@ -47,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "97fad583844a41a761a107ff8500039c178ec321"
+  "gitHead": "2b84bdb66f554f2d1e3fce4ff3fbd4105acb4c08"
 }