@xuda.io/runtime-bundle 1.0.865 → 1.0.867

package/js/xuda-runtime-bundle.js

@@ -24718,7 +24718,13 @@ var SCREEN_BLOCKER_OBJ = {};
 var IS_PROGRESS_SCREEN_OPEN = null;
 // var UI_ENGINE_OBJ = null;
 
-var UI_WORKER_OBJ = { jobs: [], num: 9000, cache: {}, viewport_height_set_ids: [], pending_for_viewport_render: {} };
+var UI_WORKER_OBJ = {
+  jobs: [],
+  num: 9000,
+  cache: {},
+  viewport_height_set_ids: [],
+  //  pending_for_viewport_render: {}
+};
 
 glb.html5_events_handler = [
   'onabort',
@@ -27860,7 +27866,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         }
 
         if ($div.hasClass('viewport_height')) {
-          $div.addClass('viewport_height');
+          $div.data().xuData.viewport_height = $div.height();
           $div.css('height', 'unset');
         }
       }
@@ -27870,7 +27876,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
     set_viewport_height: async function () {
       const { $elm, height } = queue_obj?.paramsP || {};
 
-      $elm.children().css('height', height);
+      // $elm.children().css('height', height);
 
       $.each($elm.children(), function (key, elm) {
         if (!$(elm).height() && !$(elm).children()) {
@@ -31192,16 +31198,16 @@ func.UI.screen.init = async function (SESSION_ID, prog_id, sourceScreenP, callin
 
     let ret_screen_loading = await func.UI.screen.screen_loading_done(SESSION_ID, params, ret_render_$container, jobNoP);
 
-    for (const [container_xu_ui_id, val] of Object.entries(UI_WORKER_OBJ.pending_for_viewport_render)) {
-      const height = val.base_$div.height();
-      if (height) {
-        const total_height = height * val.data.length || 1;
-        if (total_height > val.$container.height()) {
-          val.$container.css('height', height * val.data.length);
-        }
-      }
-      debugger;
-    }
+    // for (const [container_xu_ui_id, val] of Object.entries(UI_WORKER_OBJ.pending_for_viewport_render)) {
+    //   const height = val.base_$div.height();
+    //   if (height) {
+    //     const total_height = height * val.data.length || 1;
+    //     if (total_height > val.$container.height()) {
+    //       val.$container.css('height', height * val.data.length);
+    //     }
+    //   }
+    //   debugger;
+    // }
 
     return ret_screen_loading;
   }
@@ -34442,26 +34448,26 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
     // check if iterator made to prevent children render
 
     if (nodeP?.attributes?.['xu-viewport'] == 'true') {
-      const xu_viewport = async function () {
-        const data = { $div: $div.clone(true), nodeP, parent_infoP, $root_container, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, $container };
-        const container_id = $container.attr('xu-ui-id');
-        if (!UI_WORKER_OBJ.pending_for_viewport_render[container_id]) {
-          UI_WORKER_OBJ.pending_for_viewport_render[container_id] = { base_$div: $div, data: [], $container };
-          await iterate_child($div, nodeP, parent_infoP, $root_container);
-        } else {
-          $div.remove();
-        }
-        UI_WORKER_OBJ.pending_for_viewport_render[container_id].data.push(data);
-
-        // if (!$div.children().length) {
-        //   // render the first element to determine height
-        //   await iterate_child($div, nodeP, parent_infoP, $root_container);
-        //   // hover_in($div);
-        //   // func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'render_viewport', data, null, null, paramsP.dsSessionP);
-        // } else {
-        // }
-      };
-      const xu_viewport_old = function () {
+      // const xu_viewport = async function () {
+      //   const data = { $div: $div.clone(true), nodeP, parent_infoP, $root_container, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, $container };
+      //   const container_id = $container.attr('xu-ui-id');
+      //   if (!UI_WORKER_OBJ.pending_for_viewport_render[container_id]) {
+      //     UI_WORKER_OBJ.pending_for_viewport_render[container_id] = { base_$div: $div, data: [], $container };
+      //     await iterate_child($div, nodeP, parent_infoP, $root_container);
+      //   } else {
+      //     $div.remove();
+      //   }
+      //   UI_WORKER_OBJ.pending_for_viewport_render[container_id].data.push(data);
+
+      //   // if (!$div.children().length) {
+      //   //   // render the first element to determine height
+      //   //   await iterate_child($div, nodeP, parent_infoP, $root_container);
+      //   //   // hover_in($div);
+      //   //   // func.UI.worker.add_to_queue(SESSION_ID, 'gui event', 'render_viewport', data, null, null, paramsP.dsSessionP);
+      //   // } else {
+      //   // }
+      // };
+      const xu_viewport = function () {
         const observer_inViewport = new IntersectionObserver(
           function (entries) {
             entries.forEach((entry) => {
@@ -34523,6 +34529,10 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
           if ($div.children().length) {
             UI_WORKER_OBJ.cache[$div.attr('xu-ui-id')] = $div.children().clone(true);
             $div.empty();
+            const height = $div.data().xuData.viewport_height;
+            if (typeof height !== 'undefined') {
+              $div.css('height', height);
+            }
           }
           // $div.addClass('skeleton');
           observer_inViewport.observe($div[0]);
@@ -34530,7 +34540,7 @@ func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, p
         $div.addClass('skeleton');
         observer_inViewport.observe($div[0]);
       };
-      await xu_viewport_old();
+      xu_viewport();
     } else {
       await iterate_child($div, nodeP, parent_infoP, $root_container);
     }