@wavemaker/app-ng-runtime 11.5.2-next.141017 → 11.5.2-next.141021

app-ng-runtime/components/data/table/fesm2020/index.mjs

@@ -349,6 +349,7 @@ class TableComponent extends StylableComponent {
         this.items = [];
         this.rowActions = [];
         this.shownavigation = false;
+        this.showFirstRow = false;
         this.documentClickBind = noop;
         this.prevFilterExpression = [];
         this.fieldDefs = [];
@@ -515,7 +516,7 @@ class TableComponent extends StylableComponent {
                 });
             },
             // assigns the items on capture phase of the click handler.
-            assignSelectedItems: (row, e, isRowSelected) => {
+            assignSelectedItems: (row, e, rowInfo) => {
                 this.ngZone.run(() => {
                     /*
                      * in case of single select, update the items with out changing the reference.
@@ -523,8 +524,11 @@ class TableComponent extends StylableComponent {
                      */
                     if (this.multiselect) {
                         //Fix for [WMS-25110]: Add row to items list only if the row is selected
-                        if (_.findIndex(this.items, row) === -1 && (isRowSelected === undefined || isRowSelected == true)) {
+                        if (_.findIndex(this.items, row) === -1 && (rowInfo?._selected === undefined || rowInfo?._selected == true || (this.gridfirstrowselect && rowInfo?.rowId == 0 && !this.showFirstRow))) {
                             this.items.push(row);
+                            if (rowInfo?.rowId == 0) {
+                                this.showFirstRow = true;
+                            }
                         }
                     }
                     else {
@@ -1776,7 +1780,8 @@ class TableComponent extends StylableComponent {
                     }
                 }
                 // for Static Variables with Retain State enabled, prevent Table from rendering more than once
-                if (!(_.get(this.datasource, 'category') === 'wm.Variable' && this._pageLoad && this.getConfiguredState() !== 'none')) {
+                // Fix for [WMS-25284]: Render table that is inside list widget and bound to static Variable
+                if (!(_.get(this.datasource, 'category') === 'wm.Variable' && this._pageLoad && this.getConfiguredState() !== 'none') || (this.parentList && _.startsWith(this.binddataset, 'item'))) {
                     this.watchVariableDataSet(nv);
                 }
                 break;