@xuda.io/runtime-bundle 1.0.1018 → 1.0.1020

package/js/xuda-runtime-slim.js

@@ -2677,6 +2677,8 @@ func.common.sha256 = async function (str) {
   const bytes = new Uint8Array(buf);
   return [...bytes].map((b) => b.toString(16).padStart(2, '0')).join('');
 };
+
+glb.new_xu_render = true;
  glb.DEBUG_INFO_OBJ = {};
 // var CONNECTION_ATTEMPTS = 0;
 glb.APP_INFO = {};
@@ -12467,300 +12469,310 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
       set_value();
       return {};
     },
-    'xu-render-org': async function ($elm, val, from_panel) {
-      var value = await func.common.get_cast_val(SESSION_ID, 'common fx', 'xu-render', 'bool', val.value);
-      const init_render = function () {
-        if (!value) {
-          var cloned_$div = $elm.clone(true);
+    'xu-render': async function ($elm, val, from_panel) {
+      const old_render = async function () {
+        var value = await func.common.get_cast_val(SESSION_ID, 'common fx', 'xu-render', 'bool', val.value);
+        const init_render = function () {
+          if (!value) {
+            var cloned_$div = $elm.clone(true);
+
+            let $xurender = $('<xurender>').attr('xu-ui-id', $elm.attr('xu-ui-id')).attr('hidden', true).appendTo($container).hide();
+            let original_data_obj = {
+              $container: cloned_$div,
+              nodeP: _.cloneDeep(nodeP),
+              parent_infoP,
+              paramsP,
+              keyP,
+              parent_nodeP,
+              $root_container,
+            };
+            $xurender.data('xuData', cloned_$div.data().xuData);
+            $xurender.data().xuData.original_data_obj = original_data_obj;
+            $xurender.data().xuData.xurender_node = cloned_$div;
+            $xurender.data().xuAttributes = nodeP.attributes || {};
+            $xurender.hide();
 
-          let $xurender = $('<xurender>').attr('xu-ui-id', $elm.attr('xu-ui-id')).attr('hidden', true).appendTo($container).hide();
-          let original_data_obj = {
-            $container: cloned_$div,
-            nodeP: _.cloneDeep(nodeP),
-            parent_infoP,
-            paramsP,
-            keyP,
-            parent_nodeP,
-            $root_container,
-          };
-          $xurender.data('xuData', cloned_$div.data().xuData);
-          $xurender.data().xuData.original_data_obj = original_data_obj;
-          $xurender.data().xuData.xurender_node = cloned_$div;
-          $xurender.data().xuAttributes = nodeP.attributes || {};
-          $xurender.hide();
+            $elm.remove();
+            return { abort: true };
+          }
+          return {};
+        };
 
-          $elm.remove();
-          return { abort: true };
-        }
-        return {};
-      };
+        const post_render = async function () {
+          if (value) {
+            try {
+              // abort if already rended
+              if ($elm[0].tagName !== 'XURENDER' && $elm?.length) {
+                return func.events.delete_job(SESSION_ID, jobNoP);
+              }
 
-      const post_render = async function () {
-        if (value) {
-          try {
-            // abort if already rended
-            if ($elm[0].tagName !== 'XURENDER' && $elm?.length) {
-              return func.events.delete_job(SESSION_ID, jobNoP);
-            }
+              let original_data_obj = $elm.data().xuData.original_data_obj;
 
-            let original_data_obj = $elm.data().xuData.original_data_obj;
+              if (!original_data_obj) {
+                func.events.delete_job(SESSION_ID, jobNoP);
+                return { delete_job: jobNoP };
+              }
 
-            if (!original_data_obj) {
-              func.events.delete_job(SESSION_ID, jobNoP);
-              return { delete_job: jobNoP };
-            }
+              const new_$div = await func.UI.screen.render_ui_tree(
+                SESSION_ID,
+                $elm, //original_data_obj.$container,
+                _.cloneDeep(original_data_obj.nodeP),
+                original_data_obj.parent_infoP,
+                original_data_obj.paramsP,
+                jobNoP,
+                null,
+                original_data_obj.keyP,
+                null,
+                original_data_obj.parent_nodeP,
+                null,
+                original_data_obj.$root_container,
+              );
 
-            const new_$div = await func.UI.screen.render_ui_tree(
-              SESSION_ID,
-              $elm, //original_data_obj.$container,
-              _.cloneDeep(original_data_obj.nodeP),
-              original_data_obj.parent_infoP,
-              original_data_obj.paramsP,
-              jobNoP,
-              null,
-              original_data_obj.keyP,
-              null,
-              original_data_obj.parent_nodeP,
-              null,
-              original_data_obj.$root_container,
-            );
+              new_$div.data().xuData.original_data_obj = original_data_obj;
+              new_$div.data().xuData.xurender_node = $elm.clone(true);
+              new_$div.data().xuAttributes = $elm.data().xuAttributes || {};
 
-            new_$div.data().xuData.original_data_obj = original_data_obj;
-            new_$div.data().xuData.xurender_node = $elm.clone(true);
-            new_$div.data().xuAttributes = $elm.data().xuAttributes || {};
+              const replace = async function () {
+                $elm.replaceWith(new_$div);
+                if (from_panel) {
+                  const xuPanelWrapper = _.clone(new_$div.data().xuPanelWrapper);
+                  $elm.parent().data().xuPanelWrapper = xuPanelWrapper;
+                  $elm.replaceWith(new_$div.children());
+                }
 
-            const replace = async function () {
-              $elm.replaceWith(new_$div);
-              if (from_panel) {
-                const xuPanelWrapper = _.clone(new_$div.data().xuPanelWrapper);
-                $elm.parent().data().xuPanelWrapper = xuPanelWrapper;
-                $elm.replaceWith(new_$div.children());
-              }
+                if (val.fields_arr) {
+                  return await func.UI.screen.refresh_xu_attributes(SESSION_ID, val.fields_arr, val.jobNoP, new_$div);
+                }
+                func.events.delete_job(SESSION_ID, jobNoP);
+              };
 
-              if (val.fields_arr) {
-                return await func.UI.screen.refresh_xu_attributes(SESSION_ID, val.fields_arr, val.jobNoP, new_$div);
-              }
-              func.events.delete_job(SESSION_ID, jobNoP);
-            };
+              if ($elm && func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', $elm.data().xuData.xu_id).length) {
+                if (new_$div.data().xuData.paramsP) {
+                  return await replace();
+                }
 
-            if ($elm && func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', $elm.data().xuData.xu_id).length) {
-              if (new_$div.data().xuData.paramsP) {
-                return await replace();
+                func.events.delete_job(SESSION_ID, jobNoP);
               }
-
+            } catch (error) {
               func.events.delete_job(SESSION_ID, jobNoP);
             }
-          } catch (error) {
+            return;
+          }
+          // if (!value) {
+          if ($elm.prop('tagName') === 'XURENDER') {
             func.events.delete_job(SESSION_ID, jobNoP);
+            return;
           }
-          return;
-        }
-        // if (!value) {
-        if ($elm.prop('tagName') === 'XURENDER') {
-          func.events.delete_job(SESSION_ID, jobNoP);
-          return;
-        }
 
-        let tmp_$div = $('<div>');
+          let tmp_$div = $('<div>');
 
-        let $xurender = $('<xurender>').attr('xu-ui-id', $elm.attr('xu-ui-id')).appendTo(tmp_$div).hide();
-        // was true before
-        if ($elm.data().xuData.xurender_node) {
-          $xurender.data({
-            xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
-            xuData: $elm.data().xuData.xurender_node.data().xuData || {},
-          });
-        } else {
-          // default new state
+          let $xurender = $('<xurender>').attr('xu-ui-id', $elm.attr('xu-ui-id')).appendTo(tmp_$div).hide();
+          // was true before
+          if ($elm.data().xuData.xurender_node) {
+            $xurender.data({
+              xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
+              xuData: $elm.data().xuData.xurender_node.data().xuData || {},
+            });
+          } else {
+            // default new state
 
-          $xurender.data({
-            xuAttributes: $elm.data().xuAttributes || {},
-            xuData: $elm.data().xuData || {},
-          });
-          const original_data_obj = {
-            nodeP: _.cloneDeep($elm.data().xuData.node_org),
-            paramsP: $elm.data().xuData.paramsP,
-            $container: $elm.clone(true),
-            parent_infoP: parent_infoP,
-          };
+            $xurender.data({
+              xuAttributes: $elm.data().xuAttributes || {},
+              xuData: $elm.data().xuData || {},
+            });
+            const original_data_obj = {
+              nodeP: _.cloneDeep($elm.data().xuData.node_org),
+              paramsP: $elm.data().xuData.paramsP,
+              $container: $elm.clone(true),
+              parent_infoP: parent_infoP,
+            };
 
-          $xurender.data().xuData.original_data_obj = original_data_obj;
-        }
+            $xurender.data().xuData.original_data_obj = original_data_obj;
+          }
 
-        $elm.replaceWith(tmp_$div.children());
-        func.events.delete_job(SESSION_ID, jobNoP);
-        // }
+          $elm.replaceWith(tmp_$div.children());
+          func.events.delete_job(SESSION_ID, jobNoP);
+          // }
+        };
+        if (is_init) {
+          return init_render();
+        }
+        return await post_render();
       };
-      if (is_init) {
-        return init_render();
-      }
-      return await post_render();
-    },
-    'xu-render': async function ($elm, val, from_panel) {
-      var value = await func.common.get_cast_val(SESSION_ID, 'common fx', 'xu-render', 'bool', val.value);
-      const init_render = async function () {
-        if (!value) {
-          const cloned_$div = $elm.clone(true);
 
-          const xu_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
+      const new_render = async function () {
+        var value = await func.common.get_cast_val(SESSION_ID, 'common fx', 'xu-render', 'bool', val.value);
+        const init_render = async function () {
+          nodeP.xu_render_made = value;
+          if (!value) {
+            // const cloned_$div = $elm.clone(true);
+
+            // const xu_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
+
+            // let $xurender = $('<xurender>').attr('xu-ui-id', xu_ui_id).attr('hidden', true).appendTo($container).hide();
+            // let original_data_obj = {
+            //   force_render: true,
+            //   $container: cloned_$div,
+            //   nodeP: _.cloneDeep(nodeP),
+            //   parent_infoP,
+            //   paramsP,
+            //   keyP,
+            //   parent_nodeP,
+            //   $root_container,
+            // };
+            // $xurender.data('xuData', cloned_$div.data().xuData);
+            // $xurender.data().xuData.original_data_obj = original_data_obj;
+            // $xurender.data().xuData.xurender_node = cloned_$div;
+            // $xurender.data().xuAttributes = nodeP.attributes || {};
+            // $xurender.hide();
+
+            // $elm.remove();
+            // nodeP.xu_render_made = true;
+            return { xu_render_in_process: true };
+          }
+          return {};
+        };
 
-          let $xurender = $('<xurender>').attr('xu-ui-id', xu_ui_id).attr('hidden', true).appendTo($container).hide();
-          let original_data_obj = {
-            force_render: true,
-            $container: cloned_$div,
-            nodeP: _.cloneDeep(nodeP),
-            parent_infoP,
-            paramsP,
-            keyP,
-            parent_nodeP,
-            $root_container,
-          };
-          $xurender.data('xuData', cloned_$div.data().xuData);
-          $xurender.data().xuData.original_data_obj = original_data_obj;
-          $xurender.data().xuData.xurender_node = cloned_$div;
-          $xurender.data().xuAttributes = nodeP.attributes || {};
-          $xurender.hide();
+        const post_render = async function () {
+          if (value) {
+            try {
+              // abort if already rended
+              if ($elm[0].tagName !== 'XURENDER' && $elm?.length) {
+                return func.events.delete_job(SESSION_ID, jobNoP);
+              }
 
-          $elm.remove();
-          return { abort: true };
-        }
-        return {};
-      };
+              let original_data_obj = $elm.data().xuData.original_data_obj;
 
-      const post_render = async function () {
-        if (value) {
-          try {
-            // abort if already rended
-            if ($elm[0].tagName !== 'XURENDER' && $elm?.length) {
-              return func.events.delete_job(SESSION_ID, jobNoP);
-            }
+              if (!original_data_obj) {
+                func.events.delete_job(SESSION_ID, jobNoP);
+                return { delete_job: jobNoP };
+              }
 
-            let original_data_obj = $elm.data().xuData.original_data_obj;
+              ////////////
+              const cache_str = await get_xu_render_cache_str(SESSION_ID, paramsP.dsSessionP);
+              const xu_ui_id = $elm.attr('xu-ui-id');
+              let new_$div = UI_WORKER_OBJ?.xu_render_cache?.[xu_ui_id]?.[cache_str]?.$container.clone(true);
 
-            if (!original_data_obj) {
-              func.events.delete_job(SESSION_ID, jobNoP);
-              return { delete_job: jobNoP };
-            }
+              /////////////
+              // let new_$div = original_data_obj.$container.clone(true);
 
-            ////////////
-            const cache_str = await get_xu_render_cache_str(SESSION_ID, paramsP.dsSessionP);
-            const xu_ui_id = $elm.attr('xu-ui-id');
-            let new_$div = UI_WORKER_OBJ?.xu_render_cache?.[xu_ui_id]?.[cache_str]?.$container.clone(true);
+              if (original_data_obj.force_render || !new_$div) {
+                new_$div = await func.UI.screen.render_ui_tree(
+                  SESSION_ID,
+                  $elm, //original_data_obj.$container,
+                  _.cloneDeep(original_data_obj.nodeP),
+                  original_data_obj.parent_infoP,
+                  original_data_obj.paramsP,
+                  jobNoP,
+                  null,
+                  original_data_obj.keyP,
+                  null,
+                  original_data_obj.parent_nodeP,
+                  null,
+                  original_data_obj.$root_container,
+                );
+              }
+              ////////////
+              if (!UI_WORKER_OBJ.xu_render_cache[xu_ui_id]) {
+                UI_WORKER_OBJ.xu_render_cache[xu_ui_id] = {};
+              }
+              UI_WORKER_OBJ.xu_render_cache[xu_ui_id][cache_str] = original_data_obj;
+              //////////////
+              new_$div.data().xuData.original_data_obj = original_data_obj;
+              new_$div.data().xuData.xurender_node = $elm.clone(true);
+              new_$div.data().xuAttributes = $elm.data().xuAttributes || {};
+
+              const replace = async function () {
+                $elm.replaceWith(new_$div);
+                if (from_panel) {
+                  const xuPanelWrapper = _.clone(new_$div.data().xuPanelWrapper);
+                  $elm.parent().data().xuPanelWrapper = xuPanelWrapper;
+                  $elm.replaceWith(new_$div.children());
+                }
 
-            /////////////
-            // let new_$div = original_data_obj.$container.clone(true);
+                if (val.fields_arr) {
+                  return await func.UI.screen.refresh_xu_attributes(SESSION_ID, val.fields_arr, val.jobNoP, new_$div);
+                }
+                func.events.delete_job(SESSION_ID, jobNoP);
+              };
 
-            if (original_data_obj.force_render || !new_$div) {
-              new_$div = await func.UI.screen.render_ui_tree(
-                SESSION_ID,
-                $elm, //original_data_obj.$container,
-                _.cloneDeep(original_data_obj.nodeP),
-                original_data_obj.parent_infoP,
-                original_data_obj.paramsP,
-                jobNoP,
-                null,
-                original_data_obj.keyP,
-                null,
-                original_data_obj.parent_nodeP,
-                null,
-                original_data_obj.$root_container,
-              );
-            }
-            ////////////
-            if (!UI_WORKER_OBJ.xu_render_cache[xu_ui_id]) {
-              UI_WORKER_OBJ.xu_render_cache[xu_ui_id] = {};
-            }
-            UI_WORKER_OBJ.xu_render_cache[xu_ui_id][cache_str] = original_data_obj;
-            //////////////
-            new_$div.data().xuData.original_data_obj = original_data_obj;
-            new_$div.data().xuData.xurender_node = $elm.clone(true);
-            new_$div.data().xuAttributes = $elm.data().xuAttributes || {};
-
-            const replace = async function () {
-              $elm.replaceWith(new_$div);
-              if (from_panel) {
-                const xuPanelWrapper = _.clone(new_$div.data().xuPanelWrapper);
-                $elm.parent().data().xuPanelWrapper = xuPanelWrapper;
-                $elm.replaceWith(new_$div.children());
-              }
+              if ($elm && func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', $elm.data().xuData.xu_id).length) {
+                if (new_$div.data().xuData.paramsP) {
+                  return await replace();
+                }
 
-              if (val.fields_arr) {
-                return await func.UI.screen.refresh_xu_attributes(SESSION_ID, val.fields_arr, val.jobNoP, new_$div);
+                func.events.delete_job(SESSION_ID, jobNoP);
               }
+            } catch (error) {
               func.events.delete_job(SESSION_ID, jobNoP);
-            };
+            }
+            return;
+          }
 
-            if ($elm && func.UI.utils.find_in_element_data('xuData', $(SESSION_OBJ[SESSION_ID].root_element), 'xu_id', $elm.data().xuData.xu_id).length) {
-              if (new_$div.data().xuData.paramsP) {
-                return await replace();
-              }
+          /////////// !value ///////////
 
-              func.events.delete_job(SESSION_ID, jobNoP);
-            }
-          } catch (error) {
+          if ($elm.prop('tagName') === 'XURENDER') {
             func.events.delete_job(SESSION_ID, jobNoP);
+            return;
           }
-          return;
-        }
 
-        /////////// !value ///////////
+          let tmp_$div = $('<div>');
+          // const xu_ui_id = $elm.attr('xu-ui-id');
+          const xu_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
 
-        if ($elm.prop('tagName') === 'XURENDER') {
-          func.events.delete_job(SESSION_ID, jobNoP);
-          return;
-        }
+          let $xurender = $('<xurender>').attr('xu-ui-id', xu_ui_id).appendTo(tmp_$div).hide();
+          // // was true before
+          // if ($elm.data().xuData.xurender_node) {
+          //   $xurender.data({
+          //     xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
+          //     xuData: $elm.data().xuData.xurender_node.data().xuData || {},
+          //   });
+          // } else {
+          // default new state
 
-        let tmp_$div = $('<div>');
-        // const xu_ui_id = $elm.attr('xu-ui-id');
-        const xu_ui_id = await generate_xu_ui_id(SESSION_ID, nodeP, $container, paramsP, keyP);
-
-        let $xurender = $('<xurender>').attr('xu-ui-id', xu_ui_id).appendTo(tmp_$div).hide();
-        // // was true before
-        // if ($elm.data().xuData.xurender_node) {
-        //   $xurender.data({
-        //     xuAttributes: $elm.data().xuData.xurender_node.data().xuAttributes || {},
-        //     xuData: $elm.data().xuData.xurender_node.data().xuData || {},
-        //   });
-        // } else {
-        // default new state
-
-        $xurender.data({
-          xuAttributes: $elm.data().xuAttributes || {},
-          xuData: $elm.data().xuData || {},
-        });
-        // const original_data_obj = {
-        //   nodeP: _.cloneDeep($elm.data().xuData.node_org),
-        //   paramsP: $elm.data().xuData.paramsP,
-        //   $container: $elm.clone(true),
-        //   parent_infoP: parent_infoP,
-        // };
-        const cloned_$div = $elm.clone(true);
-        let original_data_obj = {
-          force_render: false,
-          $container: cloned_$div,
-          nodeP: cloned_$div.data().xuData.node_org,
-          parent_infoP,
-          paramsP,
-          keyP,
-          parent_nodeP, //:cloned_$div.data().xuData.original_data_obj.parent_nodeP,
-          $root_container,
-        };
+          $xurender.data({
+            xuAttributes: $elm.data().xuAttributes || {},
+            xuData: $elm.data().xuData || {},
+          });
+          // const original_data_obj = {
+          //   nodeP: _.cloneDeep($elm.data().xuData.node_org),
+          //   paramsP: $elm.data().xuData.paramsP,
+          //   $container: $elm.clone(true),
+          //   parent_infoP: parent_infoP,
+          // };
+          const cloned_$div = $elm.clone(true);
+          let original_data_obj = {
+            force_render: false,
+            $container: cloned_$div,
+            nodeP: cloned_$div.data().xuData.node_org,
+            parent_infoP,
+            paramsP,
+            keyP,
+            parent_nodeP, //:cloned_$div.data().xuData.original_data_obj.parent_nodeP,
+            $root_container,
+          };
 
-        $xurender.data().xuData.original_data_obj = original_data_obj;
+          $xurender.data().xuData.original_data_obj = original_data_obj;
 
-        const cache_str = await get_xu_render_cache_str(SESSION_ID, paramsP.dsSessionP);
-        if (!UI_WORKER_OBJ.xu_render_cache[xu_ui_id]) {
-          UI_WORKER_OBJ.xu_render_cache[xu_ui_id] = {};
+          const cache_str = await get_xu_render_cache_str(SESSION_ID, paramsP.dsSessionP);
+          if (!UI_WORKER_OBJ.xu_render_cache[xu_ui_id]) {
+            UI_WORKER_OBJ.xu_render_cache[xu_ui_id] = {};
+          }
+          UI_WORKER_OBJ.xu_render_cache[xu_ui_id][cache_str] = original_data_obj;
+          // }
+          $elm.replaceWith(tmp_$div.children());
+          func.events.delete_job(SESSION_ID, jobNoP);
+        };
+        if (is_init) {
+          return await init_render();
         }
-        UI_WORKER_OBJ.xu_render_cache[xu_ui_id][cache_str] = original_data_obj;
-        // }
-        $elm.replaceWith(tmp_$div.children());
-        func.events.delete_job(SESSION_ID, jobNoP);
+        return await post_render();
       };
-      if (is_init) {
-        return await init_render();
+
+      if (glb.new_xu_render) {
+        return new_render();
       }
-      return await post_render();
+      return old_render();
     },
     'xu-show': async function ($elm, val) {
       var value = await func.common.get_cast_val(SESSION_ID, 'common fx', 'xu-show', 'bool', val.value);
@@ -13319,22 +13331,6 @@ func.UI.screen.set_attributes_new = async function (SESSION_ID, is_skeleton, $ro
         continue;
       }
 
-      // if (!nodeP.attributes || !nodeP.attributes[attr] & !nodeP.attributes[`xu-exp:${attr}`]) {
-      //   continue;
-      // }
-
-      // if (_.isEmpty(nodeP.attributes)) {
-      //   break;
-      // }
-
-      // if (typeof nodeP.attributes[attr] === 'undefined') {
-      //   continue;
-      // }
-
-      // if (typeof func.UI.screen.fix_val_defaults(attr, (await get_xuExp(attr)) || nodeP.attributes[attr]) === 'undefined') {
-      //   continue;
-      // }
-
       if (!nodeP?.attributes?.hasOwnProperty(attr) && !nodeP?.attributes?.hasOwnProperty(`xu-exp:${attr}`)) {
         continue;
       }
@@ -13359,7 +13355,6 @@ func.UI.screen.set_attributes_new = async function (SESSION_ID, is_skeleton, $ro
         {
           key: attr,
 
-          // value: (await get_xuExp(attr)) || func.UI.screen.fix_val_defaults(attr, nodeP.attributes[attr]),
           value: await get_attr_value(attr),
         },
         is_init,
@@ -13933,6 +13928,11 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
     // debugger;
   }
 
+  ///////////
+  if (glb.new_xu_render) {
+  }
+
+  ///////////
   var is_mobile = glb.MOBILE_ARR.includes(paramsP.screenInfo.properties?.menuType) ? true : false;
 
   const get_element_info = function () {
@@ -14085,6 +14085,7 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
         node_promises.push(
           new Promise(async (resolve, reject) => {
             const ret = await func.UI.screen.render_ui_tree(SESSION_ID, $divP, nodeP.children[key], parent_infoP, paramsP, jobNoP, is_skeleton, Number(key), null, nodeP, null, $root_container);
+            debugger;
             resolve();
           }),
         );
@@ -14755,13 +14756,27 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
   };
 
   const draw_html_element = async function (element) {
-    const done = async function () {
-      return $div;
+    let temp_$container = $('<tmp>');
+    if (!glb.new_xu_render) {
+      temp_$container = $container;
+    }
+    const done = async function (ret) {
+      if (glb.new_xu_render) {
+        if (ret.xu_render_in_process) {
+          debugger;
+          $container.append(temp_$container.children());
+          return $div;
+        } else {
+          return $div;
+        }
+      } else {
+        return $div;
+      }
     };
     if (!element || element === 'script') return await done();
     let str = '';
 
-    var $div = await func.UI.screen.create_container(SESSION_ID, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, prop, null, null, element, null, str);
+    var $div = await func.UI.screen.create_container(SESSION_ID, $root_container, nodeP, temp_$container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, prop, null, null, element, null, str);
 
     $div.hover(
       function (e) {
@@ -14777,8 +14792,10 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
       });
     }
 
-    let ret = await func.UI.screen.set_attributes_new(SESSION_ID, is_skeleton, $root_container, nodeP, $container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, $div, true);
-    if (ret.abort || nodeP.tagName === 'svg' || !_.isEmpty(nodeP?.attributes?.['xu-text']) || !_.isEmpty(nodeP?.attributes?.['xu-html']) || !_.isEmpty(nodeP?.attributes?.['xu-exp:xu-text']) || !_.isEmpty(nodeP?.attributes?.['xu-exp:xu-html'])) return await done();
+    let ret = await func.UI.screen.set_attributes_new(SESSION_ID, is_skeleton, $root_container, nodeP, temp_$container, paramsP, parent_infoP, jobNoP, keyP, parent_nodeP, $div, true);
+    if (ret.abort || nodeP.tagName === 'svg' || !_.isEmpty(nodeP?.attributes?.['xu-text']) || !_.isEmpty(nodeP?.attributes?.['xu-html']) || !_.isEmpty(nodeP?.attributes?.['xu-exp:xu-text']) || !_.isEmpty(nodeP?.attributes?.['xu-exp:xu-html'])) {
+      return await done();
+    }
     // check if iterator made to prevent children render
 
     if (nodeP?.attributes?.['xu-viewport'] == 'true') {
@@ -14848,7 +14865,7 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
           //   $div.html(UI_WORKER_OBJ.cache[$div.attr('xu-ui-id')]);
           // } else {
           hover_in($div);
-          ui_job_id = func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'render_viewport', { $div, nodeP, parent_infoP, $root_container, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, $container }, null, null, paramsP.dsSessionP);
+          ui_job_id = func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'render_viewport', { $div, nodeP, parent_infoP, $root_container, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, temp_$container }, null, null, paramsP.dsSessionP);
           // }
           observer_outViewport.observe($div[0]);
         });
@@ -14872,11 +14889,19 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
       };
       xu_viewport();
     } else {
-      await iterate_child($div, nodeP, parent_infoP, $root_container);
+      if (glb.new_xu_render) {
+        if (ret.xu_render_in_process) {
+          iterate_child($div, nodeP, parent_infoP, $root_container);
+        } else {
+          await iterate_child($div, nodeP, parent_infoP, $root_container);
+        }
+      } else {
+        await iterate_child($div, nodeP, parent_infoP, $root_container);
+      }
     }
 
     // const ret_iterate_child = await iterate_child($div, nodeP, parent_infoP, null, $root_container);
-    return await done();
+    return await done(ret);
   };
 
   if (nodeP.content && nodeP.attributes) {