@textbus/adapter-vue 4.0.0-alpha.36 → 4.0.0-alpha.38

package/bundles/index.esm.js

@@ -40,7 +40,10 @@ class Adapter extends DomAdapter {
                 });
                 onUpdated(() => {
                     var _a;
-                    self.componentRendingStack.pop();
+                    const context = self.componentRendingStack[self.componentRendingStack.length - 1];
+                    if (context === component) {
+                        self.componentRendingStack.pop();
+                    }
                     component.changeMarker.rendered();
                     self.onViewUpdated.next();
                     if (!(((_a = self.componentRefs.get(component)) === null || _a === void 0 ? void 0 : _a.value) instanceof HTMLElement)) {
@@ -54,6 +57,7 @@ class Adapter extends DomAdapter {
                 const result = setup(props);
                 if (typeof result === 'function') {
                     return function () {
+                        component.__slots__.forEach(i => self.renderedSlotCache.delete(i));
                         component.__slots__.length = 0;
                         self.componentRendingStack.push(component);
                         return result();
@@ -89,8 +93,15 @@ class Adapter extends DomAdapter {
         throw adapterError(`cannot found view component \`${component.name}\`!`);
     }
     slotRender(slot, slotHostRender, renderEnv) {
+        var _a;
         const context = this.componentRendingStack[this.componentRendingStack.length - 1];
-        context.__slots__.push(slot);
+        if (context) {
+            context.__slots__.push(slot);
+        }
+        else if (!this.renderedSlotCache.has(slot)) {
+            throw adapterError(`Unrendered slots must be rendered together with the corresponding "${((_a = slot.parent) === null || _a === void 0 ? void 0 : _a.name) || 'unknown'}" component`);
+        }
+        this.renderedSlotCache.set(slot, true);
         const vElement = slot.toTree(slotHostRender, renderEnv);
         this.slotRootVElementCaches.set(slot, vElement);
         const vNodeToJSX = (vNode) => {

package/bundles/index.js

@@ -42,7 +42,10 @@ class Adapter extends platformBrowser.DomAdapter {
                 });
                 vue.onUpdated(() => {
                     var _a;
-                    self.componentRendingStack.pop();
+                    const context = self.componentRendingStack[self.componentRendingStack.length - 1];
+                    if (context === component) {
+                        self.componentRendingStack.pop();
+                    }
                     component.changeMarker.rendered();
                     self.onViewUpdated.next();
                     if (!(((_a = self.componentRefs.get(component)) === null || _a === void 0 ? void 0 : _a.value) instanceof HTMLElement)) {
@@ -56,6 +59,7 @@ class Adapter extends platformBrowser.DomAdapter {
                 const result = setup(props);
                 if (typeof result === 'function') {
                     return function () {
+                        component.__slots__.forEach(i => self.renderedSlotCache.delete(i));
                         component.__slots__.length = 0;
                         self.componentRendingStack.push(component);
                         return result();
@@ -91,8 +95,15 @@ class Adapter extends platformBrowser.DomAdapter {
         throw adapterError(`cannot found view component \`${component.name}\`!`);
     }
     slotRender(slot, slotHostRender, renderEnv) {
+        var _a;
         const context = this.componentRendingStack[this.componentRendingStack.length - 1];
-        context.__slots__.push(slot);
+        if (context) {
+            context.__slots__.push(slot);
+        }
+        else if (!this.renderedSlotCache.has(slot)) {
+            throw adapterError(`Unrendered slots must be rendered together with the corresponding "${((_a = slot.parent) === null || _a === void 0 ? void 0 : _a.name) || 'unknown'}" component`);
+        }
+        this.renderedSlotCache.set(slot, true);
         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.36",
+  "version": "4.0.0-alpha.38",
   "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.36",
-    "@textbus/platform-browser": "^4.0.0-alpha.36",
+    "@textbus/core": "^4.0.0-alpha.38",
+    "@textbus/platform-browser": "^4.0.0-alpha.38",
     "vue": "^3.3.4"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "dbcf24938a558780bc752cdcd3633d0e21a7a0d9"
+  "gitHead": "6fd37c779309331bbe5ef1b93b2c3d0d47735636"
 }