@textbus/platform-browser 4.0.0-alpha.24 → 4.0.0-alpha.26

package/bundles/browser-module.d.ts

@@ -1,4 +1,4 @@
-import { Component, ComponentInstance, ComponentLiteral, Module, Textbus } from '@textbus/core';
+import { ComponentConstructor, Component, ComponentLiteral, Module, Textbus } from '@textbus/core';
 import { Provider } from '@viewfly/core';
 import { AttributeLoader, ComponentLoader, FormatLoader } from './parser';
 import { DomAdapter } from './dom-adapter';
@@ -34,14 +34,14 @@ export declare class BrowserModule implements Module {
      * @param rootComponentLoader 文档根组件加载器
      * @param textbus
      */
-    readDocumentByHTML(html: string, rootComponentLoader: ComponentLoader, textbus: Textbus): ComponentInstance;
+    readDocumentByHTML(html: string, rootComponentLoader: ComponentLoader, textbus: Textbus): Component;
     /**
      * 将组件数据解析到组件实例中
      * @param data 要解析的 JSON 数据
      * @param rootComponent 根组件
      * @param textbus
      */
-    readDocumentByComponentLiteral(data: ComponentLiteral, rootComponent: Component, textbus: Textbus): ComponentInstance;
+    readDocumentByComponentLiteral(data: ComponentLiteral, rootComponent: ComponentConstructor, textbus: Textbus): Component;
     setup(): () => void;
     onAfterStartup(textbus: Textbus): void;
     private static createLayout;

package/bundles/dom-adapter.d.ts

@@ -1,4 +1,4 @@
-import { ComponentInstance, Slot, ViewAdapter, NodeLocation, VElement, VTextNode, Textbus } from '@textbus/core';
+import { Component, Slot, ViewAdapter, NodeLocation, VElement, VTextNode, Textbus } from '@textbus/core';
 /**
  * Textbus PC 端浏览器渲染能力桥接器抽象类，提供了 DOM 元素查询能力，具体渲染能力由各前端框架实现相应桥接
  */
@@ -7,42 +7,42 @@ export declare abstract class DomAdapter<ViewComponent, ViewElement> extends Vie
     host: HTMLElement;
     protected componentRootElementCaches: {
         set: {
-            (key: ComponentInstance<unknown, unknown, unknown>, value: HTMLElement): void;
-            (key: HTMLElement, value: ComponentInstance<unknown, unknown, unknown>): void;
+            (key: Component<import("@textbus/core").State>, value: HTMLElement): void;
+            (key: HTMLElement, value: Component<import("@textbus/core").State>): void;
         };
         get: {
-            (key: ComponentInstance<unknown, unknown, unknown>): HTMLElement;
-            (key: HTMLElement): ComponentInstance<unknown, unknown, unknown>;
+            (key: Component<import("@textbus/core").State>): HTMLElement;
+            (key: HTMLElement): Component<import("@textbus/core").State>;
         };
-        remove: (key: HTMLElement | ComponentInstance<unknown, unknown, unknown>) => void;
+        remove: (key: HTMLElement | Component<import("@textbus/core").State>) => void;
     };
     protected slotRootNativeElementCaches: {
         set: {
-            (key: Slot<any>, value: HTMLElement): void;
-            (key: HTMLElement, value: Slot<any>): void;
+            (key: Slot, value: HTMLElement): void;
+            (key: HTMLElement, value: Slot): void;
         };
         get: {
-            (key: Slot<any>): HTMLElement;
-            (key: HTMLElement): Slot<any>;
+            (key: Slot): HTMLElement;
+            (key: HTMLElement): Slot;
         };
-        remove: (key: HTMLElement | Slot<any>) => void;
+        remove: (key: HTMLElement | Slot) => void;
     };
-    protected slotRootVElementCaches: WeakMap<Slot<any>, VElement>;
+    protected slotRootVElementCaches: WeakMap<Slot, VElement>;
     protected constructor(mount: (host: HTMLElement, viewComponent: ViewComponent, textbus: Textbus) => (void | (() => void)));
-    render(rootComponent: ComponentInstance, textbus: Textbus): void | (() => void);
-    abstract componentRender(component: ComponentInstance): ViewComponent;
-    abstract slotRender(slot: Slot, slotHostRender: (children: Array<VElement | VTextNode | ComponentInstance>) => VElement, renderEnv: any): ViewElement;
+    render(rootComponent: Component, textbus: Textbus): void | (() => void);
+    abstract componentRender(component: Component): ViewComponent;
+    abstract slotRender(slot: Slot, slotHostRender: (children: Array<VElement | VTextNode | Component>) => VElement, renderEnv: any): ViewElement;
     copy(): void;
     /**
      * 根据组件获取组件的根 DOM 节点
      * @param component
      */
-    getNativeNodeByComponent(component: ComponentInstance): HTMLElement | null;
+    getNativeNodeByComponent(component: Component): HTMLElement | null;
     /**
      * 根据 DOM 节点，获对对应的组件根节点，如传入的 DOM 节点不为组件的根节点，则返回 null
      * @param node
      */
-    getComponentByNativeNode(node: HTMLElement): ComponentInstance | null;
+    getComponentByNativeNode(node: HTMLElement): Component | null;
     /**
      * 根据插槽获取插槽的根 DOM 节点
      * @param slot

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, ComponentInstance, VElement, VTextNode, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Registry } from '@textbus/core';
+import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, Component, VElement, VTextNode, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Registry } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 import { InjectionToken, Injectable, Inject, Optional } from '@viewfly/core';
 
@@ -323,7 +323,7 @@ class DomAdapter extends ViewAdapter {
             }
         });
         this.componentRootElementCaches = createBidirectionalMapping(a => {
-            return a instanceof ComponentInstance;
+            return a instanceof Component;
         });
         this.slotRootNativeElementCaches = createBidirectionalMapping(a => {
             return a instanceof Slot;
@@ -422,7 +422,7 @@ function getLocation(target, tree, vNodeTree) {
         const child = vNodeTree.children[i];
         const nativeChild = tree.childNodes[i];
         if (nativeChild === target) {
-            if (child instanceof ComponentInstance) {
+            if (child instanceof Component) {
                 const index = child.parent.indexOf(child);
                 return {
                     slot: child.parent,
@@ -752,7 +752,7 @@ let SelectionBridge = class SelectionBridge {
             this.input.composition ||
             selection.rangeCount === 0 ||
             !this.docContainer.contains(selection.anchorNode) ||
-            this.rootComponentRef.component.slots.length === 0) {
+            this.rootComponentRef.component.__slots__.length === 0) {
             return;
         }
         const rawRange = selection.getRangeAt(0);
@@ -761,14 +761,14 @@ let SelectionBridge = class SelectionBridge {
         const isFocusStart = selection.focusNode === nativeRange.startContainer && selection.focusOffset === nativeRange.startOffset;
         if (!this.docContainer.contains(selection.focusNode)) {
             if (isFocusEnd) {
-                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.slots.first);
+                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.__slots__.first);
                 if (!nativeNode) {
                     return;
                 }
                 nativeRange.setEndAfter(nativeNode.lastChild);
             }
             else {
-                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.slots.last);
+                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.__slots__.last);
                 if (!nativeNode) {
                     return;
                 }
@@ -2366,7 +2366,7 @@ class BrowserModule {
     readDocumentByHTML(html, rootComponentLoader, textbus) {
         const parser = textbus.get(Parser);
         const doc = parser.parseDoc(html, rootComponentLoader);
-        if (doc instanceof ComponentInstance) {
+        if (doc instanceof Component) {
             return doc;
         }
         throw browserErrorFn('rootComponentLoader must return a component instance.');

package/bundles/index.js

@@ -325,7 +325,7 @@ class DomAdapter extends core$1.ViewAdapter {
             }
         });
         this.componentRootElementCaches = core$1.createBidirectionalMapping(a => {
-            return a instanceof core$1.ComponentInstance;
+            return a instanceof core$1.Component;
         });
         this.slotRootNativeElementCaches = core$1.createBidirectionalMapping(a => {
             return a instanceof core$1.Slot;
@@ -424,7 +424,7 @@ function getLocation(target, tree, vNodeTree) {
         const child = vNodeTree.children[i];
         const nativeChild = tree.childNodes[i];
         if (nativeChild === target) {
-            if (child instanceof core$1.ComponentInstance) {
+            if (child instanceof core$1.Component) {
                 const index = child.parent.indexOf(child);
                 return {
                     slot: child.parent,
@@ -754,7 +754,7 @@ exports.SelectionBridge = class SelectionBridge {
             this.input.composition ||
             selection.rangeCount === 0 ||
             !this.docContainer.contains(selection.anchorNode) ||
-            this.rootComponentRef.component.slots.length === 0) {
+            this.rootComponentRef.component.__slots__.length === 0) {
             return;
         }
         const rawRange = selection.getRangeAt(0);
@@ -763,14 +763,14 @@ exports.SelectionBridge = class SelectionBridge {
         const isFocusStart = selection.focusNode === nativeRange.startContainer && selection.focusOffset === nativeRange.startOffset;
         if (!this.docContainer.contains(selection.focusNode)) {
             if (isFocusEnd) {
-                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.slots.first);
+                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.__slots__.first);
                 if (!nativeNode) {
                     return;
                 }
                 nativeRange.setEndAfter(nativeNode.lastChild);
             }
             else {
-                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.slots.last);
+                const nativeNode = this.domAdapter.getNativeNodeBySlot(this.rootComponentRef.component.__slots__.last);
                 if (!nativeNode) {
                     return;
                 }
@@ -2368,7 +2368,7 @@ class BrowserModule {
     readDocumentByHTML(html, rootComponentLoader, textbus) {
         const parser = textbus.get(exports.Parser);
         const doc = parser.parseDoc(html, rootComponentLoader);
-        if (doc instanceof core$1.ComponentInstance) {
+        if (doc instanceof core$1.Component) {
             return doc;
         }
         throw browserErrorFn('rootComponentLoader must return a component instance.');

package/bundles/parser.d.ts

@@ -1,4 +1,4 @@
-import { Attribute, ComponentInstance, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
+import { Attribute, Component, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
 import { ViewOptions } from './browser-module';
 /**
  * 插槽解析器
@@ -20,7 +20,7 @@ export interface ComponentLoader {
     /** 识别组件的匹配方法 */
     match(element: HTMLElement): boolean;
     /** 读取组件内容的方法 */
-    read(element: HTMLElement, textbus: Textbus, slotParser: SlotParser): ComponentInstance | Slot | void;
+    read(element: HTMLElement, textbus: Textbus, slotParser: SlotParser): Component | Slot | void;
 }
 export interface FormatLoaderReadResult<T = FormatValue> {
     formatter: Formatter<T>;
@@ -76,13 +76,13 @@ export declare class Parser {
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<unknown, unknown, unknown>;
+    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot | Component<import("@textbus/core").State>;
     /**
      * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
-    parse(html: string | HTMLElement, rootSlot: Slot): Slot<any>;
+    parse(html: string | HTMLElement, rootSlot: Slot): Slot;
     private readComponent;
     private readText;
     private readFormats;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.26",
   "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,7 +26,7 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@textbus/core": "^4.0.0-alpha.24",
+    "@textbus/core": "^4.0.0-alpha.26",
     "@viewfly/core": "^0.6.0",
     "reflect-metadata": "^0.1.13"
   },
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "3456cd519a3c3daca4a437af97db4b57d34ad740"
+  "gitHead": "36aff3db9897ccd73ba4533972991d537778bd6e"
 }