pawa-ssr 1.2.8 → 1.2.9

package/index.js

@@ -132,6 +132,7 @@ const useInnerContext=()=>{
   }
 }
 
+
 const $state = (initialValue) => {
   const state = { value: null };
   if (typeof initialValue === 'function') {
@@ -882,17 +883,29 @@ const attributeHandler =async (el, attr) => {
     string.forEach(v => singleElement.add(v))
   }
   setSingle('img','br')
+  const partlyPawajsDirective=new Set()
+  export const addToPartlyDirective=(...partly)=>{
+    partly.forEach((v)=>{
+      partlyPawajsDirective.add(v)
+    })
+  }
+  addToPartlyDirective('else','else-if','case')
+  const checkIfRemove=(el)=>{
+    for (const v of partlyPawajsDirective) {
+      if(el.hasAttribute(v)) return true
+    }
+    return false
+  } 
 /**
  * 
  * @param {PawaElement | HTMLElement} el 
  * @param {object} contexts 
  */
 export const render =async (el, contexts = {},stream) => {
-  // If the element is not connected and has no parent, it means it was removed (e.g. by If directive)
-  if (!el.isConnected && !el.parentNode) {
+  
+  if (!el.parentNode && checkIfRemove(el)) {
     return
   }
-  
   const isStream=store.getStore().stream
   if(el.hasAttribute('only-client')){
     el.removeAttribute('only-client')
@@ -933,17 +946,17 @@ export const render =async (el, contexts = {},stream) => {
    const startObject={}
    //get startsWith plugin
    if (!el._avoidPawaRender) {
-    startsWithSet.forEach( starts=>{
-    
-    el._attributes.forEach(attr =>{
-      if(attr.name.startsWith(starts)){
-        startAttribute=true
-        startObject[attr.name]=starts
-      }
-    })
-   })
-   }
-     for (const fn of renderAfterPawa) {
+     startsWithSet.forEach( starts=>{
+       
+       el._attributes.forEach(attr =>{
+         if(attr.name.startsWith(starts)){
+           startAttribute=true
+           startObject[attr.name]=starts
+          }
+        })
+      })
+    }
+    for (const fn of renderAfterPawa) {
       try {
         await fn(el)
       } catch (error) {
@@ -954,14 +967,14 @@ export const render =async (el, contexts = {},stream) => {
       
       const attributes = Array.from(el.attributes);
       for(const attr of attributes){
-          if (directives[attr.name]) {
-              await directives[attr.name](el,attr,stream)  
-          }else if(attr.value.includes('@{')){
-            await  attributeHandler(el,attr)
-          }else if (attr.name.startsWith('state-')) {
-             directives['state-'](el,attr)
-          }
-          else if(fullNamePlugin.has(attr.name)) {
+        if (directives[attr.name]) {
+          await directives[attr.name](el,attr,stream)  
+        }else if(attr.value.includes('@{')){
+          await  attributeHandler(el,attr)
+        }else if (attr.name.startsWith('state-')) {
+          directives['state-'](el,attr)
+        }
+        else if(fullNamePlugin.has(attr.name)) {
           if(externalPlugin[attr.name]){
             const plugin= externalPlugin[attr.name]
             try{
@@ -991,6 +1004,7 @@ export const render =async (el, contexts = {},stream) => {
         }
           
       }
+      // If the element is not connected and has no parent, it means it was removed (e.g. by If directive)
       if(el.tagName === 'TEMPLATE'){
         await templates(el,stream)
         return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawa-ssr",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "type":"module",
   "description": "pawajs ssr libary",
   "main": "index.js",