@textbus/adapter-vue 4.0.0-alpha.23 → 4.0.0-alpha.26

package/bundles/adapter.d.ts

@@ -1,13 +1,13 @@
 import { DefineComponent, Ref, VNode } from 'vue';
 import { Subject } from '@tanbo/stream';
-import { Component, ComponentInstance, ExtractComponentInstanceType, Slot, VElement, VTextNode } from '@textbus/core';
+import { Component, Slot, VElement, VTextNode } from '@textbus/core';
 import { DomAdapter } from '@textbus/platform-browser';
-export interface ViewComponentProps<T extends Component = Component> {
-    component: ExtractComponentInstanceType<T>;
+export interface ViewComponentProps<T extends Component> {
+    component: T;
     rootRef: Ref<HTMLElement | undefined>;
 }
 export interface VueAdapterComponents {
-    [key: string]: DefineComponent<ViewComponentProps>;
+    [key: string]: DefineComponent<ViewComponentProps<any>>;
 }
 /**
  * Textbus 桥接 Vue 渲染能力适配器，用于在 Vue 项目中渲染 Textbus 数据
@@ -16,7 +16,8 @@ export declare class Adapter extends DomAdapter<VNode, VNode> {
     onViewUpdated: Subject<void>;
     private components;
     private componentRefs;
+    private componentRendingStack;
     constructor(components: VueAdapterComponents, mount: (host: HTMLElement, root: VNode) => (void | (() => void)));
-    componentRender(component: ComponentInstance): VNode;
-    slotRender(slot: Slot, slotHostRender: (children: Array<VElement | VTextNode | ComponentInstance>) => VElement, renderEnv?: any): VNode;
+    componentRender(component: Component): VNode;
+    slotRender(slot: Slot, slotHostRender: (children: Array<VElement | VTextNode | Component>) => VElement, renderEnv?: any): VNode;
 }

package/bundles/index.esm.js

@@ -13,6 +13,7 @@ class Adapter extends DomAdapter {
         this.onViewUpdated = new Subject();
         this.components = {};
         this.componentRefs = new WeakMap();
+        this.componentRendingStack = [];
         Object.keys(components).forEach(key => {
             const vueComponent = components[key];
             const setup = vueComponent.setup;
@@ -53,15 +54,21 @@ class Adapter extends DomAdapter {
                 rootRef = ref();
                 this.componentRefs.set(component, rootRef);
             }
-            return h(comp, {
+            component.__slots__.length = 0;
+            this.componentRendingStack.push(component);
+            const vNode = h(comp, {
                 component,
                 rootRef,
                 key: component.id
             });
+            this.componentRendingStack.pop();
+            return vNode;
         }
         throw adapterError(`cannot found view component \`${component.name}\`!`);
     }
     slotRender(slot, slotHostRender, renderEnv) {
+        const context = this.componentRendingStack[this.componentRendingStack.length - 1];
+        context.__slots__.push(slot);
         const vElement = slot.toTree(slotHostRender, renderEnv);
         this.slotRootVElementCaches.set(slot, vElement);
         const vNodeToJSX = (vNode) => {

package/bundles/index.js

@@ -15,6 +15,7 @@ class Adapter extends platformBrowser.DomAdapter {
         this.onViewUpdated = new stream.Subject();
         this.components = {};
         this.componentRefs = new WeakMap();
+        this.componentRendingStack = [];
         Object.keys(components).forEach(key => {
             const vueComponent = components[key];
             const setup = vueComponent.setup;
@@ -55,15 +56,21 @@ class Adapter extends platformBrowser.DomAdapter {
                 rootRef = vue.ref();
                 this.componentRefs.set(component, rootRef);
             }
-            return vue.h(comp, {
+            component.__slots__.length = 0;
+            this.componentRendingStack.push(component);
+            const vNode = vue.h(comp, {
                 component,
                 rootRef,
                 key: component.id
             });
+            this.componentRendingStack.pop();
+            return vNode;
         }
         throw adapterError(`cannot found view component \`${component.name}\`!`);
     }
     slotRender(slot, slotHostRender, renderEnv) {
+        const context = this.componentRendingStack[this.componentRendingStack.length - 1];
+        context.__slots__.push(slot);
         const vElement = slot.toTree(slotHostRender, renderEnv);
         this.slotRootVElementCaches.set(slot, vElement);
         const vNodeToJSX = (vNode) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/adapter-vue",
-  "version": "4.0.0-alpha.23",
+  "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,8 +26,8 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@textbus/core": "^4.0.0-alpha.23",
-    "@textbus/platform-browser": "^4.0.0-alpha.23",
+    "@textbus/core": "^4.0.0-alpha.26",
+    "@textbus/platform-browser": "^4.0.0-alpha.26",
     "vue": "^3.3.4"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "9e6009fcccc582cc91aca24e39af5a64e012f07e"
+  "gitHead": "36aff3db9897ccd73ba4533972991d537778bd6e"
 }