@wavemaker/app-ng-runtime 11.14.1-3.6306 → 11.14.1-32.647748

package/scripts/datatable/datatable.js

@@ -583,6 +583,8 @@ $.widget('wm.datatable', {
         var self = this, preparedData,$tbody,pageStartIndex = self.getPageStartIndex(),
             startRowIndex = self.options.startRowIndex,
             isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
+            var $activeRow = self.gridElement.find('tr.row-editing:not(.always-new-row)').first();
+            var index = $activeRow.index();
             if(isScrollorOnDemand) {
                 $tbody = this.gridElement;
                 if(this.renderTableOnViewLess) {
@@ -638,6 +640,16 @@ $.widget('wm.datatable', {
             this.options.setIsDataUpdatedByUser(false);
             this.options.clearActionRowIndex();
         }
+        if(this.options.editmode===this.CONSTANTS.QUICK_EDIT){
+            if (index>=0) {
+                const $newActiveRow = self.gridElement.find('tr').eq(index);
+                if ($newActiveRow && $newActiveRow.length) {
+                    $newActiveRow.addClass('active');
+                    $newActiveRow.trigger('click', [undefined, {action: 'edit', skipFocus:false}]);
+                    self.setActiveRow($newActiveRow);
+                    self.focusActiveRow();
+                }
+            }}
         return $tbody;
     },
 
@@ -724,6 +736,10 @@ $.widget('wm.datatable', {
             colExpression = colDef.customExpression,
             styles = "text-align: " + colDef.textAlignment + ";position: relative;"
 
+        if (!_.isUndefined(colDef.show) && !colDef.show) {
+            styles += "display: none;";
+        }
+
         $htm = $('<td class="' + classes + '" data-col-id="' + colId + '" role="cell" tabindex="0"></td>');
         this._setStyles($htm, styles);
 
@@ -1057,7 +1073,9 @@ $.widget('wm.datatable', {
                 'value': '',
                 'event': null
             },
-            compiledCellTemplates: {}
+            compiledCellTemplates: {},
+            // MEMORY LEAK FIX: Store bound function for proper event listener cleanup
+            // boundRowClickHandlerOnCapture: null
         });
         // TODO: Variable loading status is getting updated before dataset update. This is resulting in loader going off before data is rendered.
         // Need to update code with suitable fix. For now 250ms is added as workaround
@@ -1117,6 +1135,144 @@ $.widget('wm.datatable', {
         this._setGridEditMode(false);
         this.toggleNewRowActions(false);
     },
+    /*
+     * Updates internal state (options.data, preparedData, custom expressions,
+     * conditional class watchers, and summary row) without a full DOM re-render.
+     * Used during quickedit inline save for model variables to avoid focus loss.
+     */
+    softRefreshData: function (newData) {
+        // With pagination, navigator / selection can emit the same page twice in one
+        // save cycle. Full refresh skipped duplicate data via isEqual on option set;
+        // soft refresh must do the same or onDataRender (datarender) fires twice.
+        if (this.options.data && newData && _.isEqual(this.options.data, newData)) {
+            return;
+        }
+
+        var self = this,
+            isScrollOrOnDemand = this.options.isNavTypeScrollOrOndemand(),
+            pageStartIndex = this.getPageStartIndex(),
+            startRowIndex = this.options.startRowIndex || 0,
+            selectedMap = {},
+            preparedData;
+
+        // Preserve _selected state before _prepareData rebuilds preparedData
+        this.preparedData.forEach(function (data, i) {
+            if (data._selected) {
+                selectedMap[i] = true;
+            }
+        });
+
+        this.options.data = newData;
+        this._prepareData();
+
+        // Restore _selected state on new preparedData
+        Object.keys(selectedMap).forEach(function (i) {
+            if (self.preparedData[i]) {
+                self.preparedData[i]._selected = true;
+            }
+        });
+
+        if (isScrollOrOnDemand) {
+            preparedData = this.preparedData.slice(pageStartIndex);
+        } else {
+            preparedData = this.preparedData;
+        }
+
+        // Update existing custom expression view contexts in-place
+        // so Angular change detection picks up new data without DOM manipulation.
+        if (_.isFunction(this.options.updateCustomExpressionContexts)) {
+            this.options.updateCustomExpressionContexts(preparedData);
+        }
+
+        // Update plain text cells with fresh data from preparedData.
+        // hideRowEditMode runs before softRefreshData and may restore cells
+        // before preparedData is updated, leaving them with stale values.
+        self.gridElement.find('tr.' + self.options.cssClassNames.tableRow + ':not(.always-new-row)').each(function () {
+            var $row = $(this),
+                rowId = +$row.attr('data-row-id'),
+                rowData = self.preparedData[rowId];
+            if (!rowData) return;
+
+            $row.find('td.' + self.options.cssClassNames.tableCell + ':not(.cell-editing)').each(function () {
+                var $cell = $(this),
+                    colId = +$cell.attr('data-col-id'),
+                    colDef = self.preparedHeaderData[colId],
+                    value;
+
+                if (colDef && !colDef.customExpression && colDef.type !== 'custom') {
+                    value = _.get(rowData, colDef.field);
+                    var newText;
+                    if (self.Utils.isDefined(value) && value !== null) {
+                        newText = '' + value;
+                    } else if (self.options.filterNullRecords && value === null) {
+                        newText = 'null';
+                    } else {
+                        newText = '';
+                    }
+                    if ($cell.text() !== newText) {
+                        $cell.text(newText);
+                        $cell.attr('title', newText);
+                    }
+                }
+            });
+        });
+
+        // Re-register conditional class watchers with fresh row clones
+        _.forEach(preparedData, function (row, index) {
+            var _row = _.clone(row),
+                rowIndex = isScrollOrOnDemand ? startRowIndex + index - 1 : index;
+            _row.$index = rowIndex + 1;
+
+            self.options.registerRowNgClassWatcher(_row, rowIndex);
+
+            self.preparedHeaderData.forEach(function (colDef, colId) {
+                self.options.registerColNgClassWatcher(_row, colDef, rowIndex, colId);
+            });
+        });
+
+        // Reset action state flags (mirrors _getGridTemplate cleanup)
+        if (!this.options.isdynamictable) {
+            this.options.setLastActionPerformed(this.options.ACTIONS.DEFAULT);
+            this.options.setIsDataUpdatedByUser(false);
+            this.options.clearActionRowIndex();
+        }
+
+        // Refresh row action buttons and expansion buttons with updated row data.
+        // Scope to data rows only — exclude always-new-row which has no backing data entry.
+        var $dataRows = self.gridElement.find('tr.' + self.options.cssClassNames.tableRow + ':not(.always-new-row)');
+        this.options.clearRowActions();
+        this._appendRowExpansionButtons($dataRows);
+        this._appendRowActions($dataRows);
+        // Regenerated action / expansion DOM — re-bind handlers (attachEventHandlers only runs on full render).
+        this._bindRowActionsAndExpansionClickHandlers($dataRows);
+
+        // Re-render summary row if present
+        if (this.options.summaryRow) {
+            var $summaryRowHtm = $(this._getSummaryRowTemplate());
+            this.tableContainer.find('tfoot').remove();
+            if (this.options.data.length) {
+                this.tableContainer.append($summaryRowHtm);
+            }
+            this.gridFooter = this.tableContainer.find('tfoot');
+        }
+
+        // Invalidate row detail (expansion) cache so collapse+re-expand
+        // creates fresh views with updated data.
+        if (_.isFunction(this.options.invalidateRowDetailCache)) {
+            this.options.invalidateRowDetailCache(preparedData);
+        }
+
+        // Refresh this.items with fresh data references from the updated dataset
+        // so that selecteditem / currentItem reflect the new values.
+        if (_.isFunction(this.options.refreshSelectedItems)) {
+            this.options.refreshSelectedItems();
+        }
+
+        // Fire datarender event callback
+        if (_.isFunction(this.options.onDataRender)) {
+            this.options.onDataRender();
+        }
+    },
     //Populate row data with default data
     setDefaultRowData: function (rowData) {
         _.forEach(this.preparedHeaderData, function (colDef) {
@@ -1336,6 +1492,12 @@ $.widget('wm.datatable', {
             }
         }
     },
+    refreshColumnWidths: function () {
+        if (this.gridContainer.width() > 0) {
+            this.tableContainer.children('colgroup').children('col').css('width', '');
+        }
+        this.setColGroupWidths();
+    },
     /*Set the default widths for the colgroup*/
     setColGroupWidths: function () {
         var self = this,
@@ -1669,8 +1831,8 @@ $.widget('wm.datatable', {
     },
 
     /* Selects a row. */
-    selectRow: function (row, value) {
-        var rowIndex = _.isNumber(row) ? row : this.Utils.getObjectIndex(this.options.data, row),
+    selectRow: function (row, value,index) {
+        var rowIndex =index?index:( _.isNumber(row) ? row : this.Utils.getObjectIndex(this.options.data, row)),
             selector,
             $row;
         if (rowIndex !== -1) {
@@ -1982,8 +2144,8 @@ $.widget('wm.datatable', {
         var $firstEl,
             $target = e && $(e.target),
             $focusEl;
-        //If focused directly on the cell, focus the input in the cell
-        if ($target && $target.hasClass('app-datagrid-cell')) {
+        //If focused directly on the cell, focus the input in the cell (only when the element is still in the DOM)
+        if ($target && $target.hasClass('app-datagrid-cell') && document.body.contains($target[0])) {
             $firstEl = $target.find('input');
         } else {
             if (!$el) {
@@ -1999,7 +2161,7 @@ $.widget('wm.datatable', {
             if (!$firstEl.length) {
                 $firstEl = $($el).first().find('select');
             }
-            if(!($(e.target).find('td').first().hasClass('td.cell-editing'))){
+            if(!($(e?.target).find('td').first().hasClass('td.cell-editing'))){
                 $firstEl=$el.find('td');
             }
         }
@@ -2035,9 +2197,9 @@ $.widget('wm.datatable', {
         this.toggleNewRowActions(false);
     },
     //Method to save a row which is in editable state
-    saveRow: function (callBack) {
+    saveRow: function (callBack, skipFocus) {
         this.gridElement.find('tr.app-datagrid-row.row-editing:not(.always-new-row)').each(function () {
-            $(this).trigger('click', [undefined, {action: 'save', skipSelect: true, noMsg: true, success: callBack}]);
+            $(this).trigger('click', [undefined, {action: 'save', skipSelect: true, noMsg: true, skipFocus: skipFocus, success: callBack}]);
         });
     },
     //Method to make row editable with widgets
@@ -2095,10 +2257,11 @@ $.widget('wm.datatable', {
         });
 
         $editableElements = $row.find('td.cell-editing');
-        $editableElements.on('click', function (e) {
+        // PERFORMANCE FIX: Use event delegation on row instead of individual cell listeners
+        $row.on('click.cellEdit', 'td.cell-editing', function (e) {
             e.stopPropagation();
         });
-        $editableElements.on('keydown', function (e) {
+        $row.on('keydown.cellEdit', 'td.cell-editing', function (e) {
             //To prevent up and down arrows, navigating to other rows in edit mode
             if ((e.which === 38 || e.which === 40) && (e.currentTarget && !e.currentTarget.closest('.always-new-row'))) {
                 e.stopPropagation();
@@ -2140,6 +2303,10 @@ $.widget('wm.datatable', {
         var rowId = parseInt($row.attr('data-row-id'), 10);
         return rowId >= this.preparedData.length || $row.hasClass('always-new-row');
     },
+    _getWmVariableRowLocator: function (rowId) {
+        var liveRow = this.options.data[parseInt(rowId, 10)];
+        return (liveRow && liveRow.$$wmSourceListIndex != null) ? liveRow.$$wmSourceListIndex : (liveRow || parseInt(rowId, 10));
+    },
     /* Toggles the edit state of a row. */
     toggleEditRow: function (e, options) {
         if($(e.target).closest('.app-menu').length) {
@@ -2167,7 +2334,8 @@ $.widget('wm.datatable', {
             $requiredEls,
             alwaysNewRow = $row.hasClass('always-new-row'),
             advancedEdit = self.options.editmode === self.CONSTANTS.QUICK_EDIT,
-            editOptions = {};
+            editOptions = {},
+            rowindex=$row.attr('data-row-id');
 
         // when a row is edited set actionrow variables
         this.options.setActionRowIndex($row.attr('data-row-id'));
@@ -2178,7 +2346,8 @@ $.widget('wm.datatable', {
             if (_.isFunction(options.success)) {
                 options.success(skipFocus, error);
             }
-            if (!advancedEdit || self.options.actionsEnabled.edit) {
+            // [WMS-31104] Do not refocus this table when the save was initiated from outside (e.g. clicking another table).
+            if (!skipFocus && !options.skipFocus && (!advancedEdit || self.options.actionsEnabled.edit)) {
                 self.focusActiveRow();
             }
         }
@@ -2189,7 +2358,7 @@ $.widget('wm.datatable', {
         }
         //Select the current edited row
         if (options.selectRow) {
-            this.selectRow(rowData, true);
+            this.selectRow(rowData, true,rowindex);
         }
         e = e || {};
         e.data = e.data || {};
@@ -2205,6 +2374,43 @@ $.widget('wm.datatable', {
                 });
                 return;
             }
+            if (advancedEdit) {
+                // [WMS-31104] Close/save row in another quick-edit table before editing this row.
+                $(document).find('tr.app-datagrid-row.always-new-row.row-editing').filter(function () {
+                    return $(this).closest(self.element).length === 0;
+                }).each(function () {
+                    var $newRow = $(this),
+                        $otherGrid = $newRow.closest('.app-datagrid');
+                    if ($otherGrid.length) {
+                        $otherGrid.datatable('resetNewRow', $newRow);
+                    }
+                });
+                // [WMS-31104] Save the editing row in another table before opening the clicked row in this table.
+                var $otherEditingRow = $(document).find('tr.app-datagrid-row.row-editing:not(.always-new-row)').filter(function () {
+                    return $(this).closest(self.element).length === 0;
+                }).first();
+                if ($otherEditingRow.length) {
+                    var rowId = $row.attr('data-row-id');
+                    $otherEditingRow.trigger('click', [undefined, {
+                        action: 'save',
+                        $row: $otherEditingRow,
+                        skipSelect: true,
+                        noMsg: true,
+                        skipFocus: true,
+                        success: function () {
+                            var $liveRow = self.gridElement.find('tr.app-datagrid-row[data-row-id="' + rowId + '"]');
+                            var $targetRow = $liveRow.length ? $liveRow : $row;
+                            self.toggleEditRow(e, _.extend({}, options, {
+                                action: 'edit',
+                                $row: $targetRow,
+                                skipFocus: true,
+                                focusAfterCrossTableSave: true
+                            }));
+                        }
+                    }]);
+                    return;
+                }
+            }
             $row.addClass('row-editing');
             if (_.isFunction(this.options.beforeRowUpdate)) {
                 this.options.beforeRowUpdate(rowData, e);
@@ -2245,6 +2451,12 @@ $.widget('wm.datatable', {
             if (_.isFunction(this.options.onFormRender)) {
                 this.options.onFormRender($row, e, options.operation || action, $row.hasClass('always-new-row'));
             }
+            // [WMS-31104] Focus target row after widgets render when edit opened from another table save.
+            if (options.focusAfterCrossTableSave) {
+                self.options.timeoutCall(function () {
+                    self.setFocusOnElement(undefined, $row.find('td.cell-editing'), true);
+                });
+            }
         } else {
             $editableElements = $row.find('td.cell-editing');
             isNewRow = self._isNewRow($row);
@@ -2257,6 +2469,10 @@ $.widget('wm.datatable', {
                 }
 
                 if (isDataChanged) {
+                    editOptions.skipFocus = options.skipFocus;
+                    if (options.skipFocus) {
+                        self.options.activeRow = undefined;
+                    }
                     $editableElements.each(function () {
                         var $el = $(this),
                             colId = $el.attr('data-col-id'),
@@ -2344,6 +2560,10 @@ $.widget('wm.datatable', {
                                 return;
                             }
                         }
+                        var ds = this.options.getDataSource && this.options.getDataSource();
+                        if (ds && ds.category === 'wm.Variable') {
+                            editOptions.rowindex = self._getWmVariableRowLocator(rowindex);
+                        }
                         this.options.afterRowUpdate(rowData, e, onSaveSuccess, editOptions);
                     }
                 } else {
@@ -2380,6 +2600,8 @@ $.widget('wm.datatable', {
 
         this.disableActions(false);
         $row.removeClass('row-editing');
+        // PERFORMANCE FIX: Remove namespaced event listeners from row
+        $row.off('.cellEdit');
         $editableElements.off('click');
         $editableElements.each(function () {
             var $el = $(this),
@@ -2428,6 +2650,8 @@ $.widget('wm.datatable', {
             $saveButton = $row.find('.save-edit-row-button'),
             self = this;
         $row.removeClass('row-editing');
+        // PERFORMANCE FIX: Remove namespaced event listeners from row
+        $row.off('.cellEdit');
         $editableElements.off('click');
         this.disableActions(false);
         this._setGridEditMode(false);
@@ -2491,6 +2715,10 @@ $.widget('wm.datatable', {
                 return;
             }
         }
+        var deleteDs = this.options.getDataSource && this.options.getDataSource();
+        if (deleteDs && deleteDs.category === 'wm.Variable') {
+            options.rowindex = this._getWmVariableRowLocator(rowId);
+        }
         if (_.isFunction(this.options.onRowDelete)) {
             className = this.options.cssClassNames.deleteRow;
             isActiveRow = $row.attr('class').indexOf('active') !== -1;
@@ -2848,7 +3076,7 @@ $.widget('wm.datatable', {
         var $cell = $target.closest('td.app-datagrid-cell'),
             $editCells;
 
-        if ($cell.is(':last-child')) {
+        if ($cell.is(':last-child') || $cell.nextAll('td.app-datagrid-cell:visible').length === 0) {
             return true;
         }
 
@@ -2869,6 +3097,28 @@ $.widget('wm.datatable', {
             this.sortHandler(event);
         }
     },
+    /**
+     * Binds jQuery handlers on save/cancel row-action buttons and row-expansion controls.
+     * Must run after DOM for those controls is replaced (e.g. softRefreshData).
+     */
+    _bindRowActionsAndExpansionClickHandlers: function ($scope) {
+        var self = this;
+        if (this.options.rowActions.length) {
+            $scope.find('.cancel-edit-row-button').off('click');
+            $scope.find('.save-edit-row-button').off('click');
+            $scope.find('.cancel-edit-row-button').on('click', {action: 'cancel'}, this.toggleEditRow.bind(this));
+            $scope.find('.save-edit-row-button').on('click', {action: 'save'}, this.toggleEditRow.bind(this));
+        }
+        $scope.find('[data-identifier="rowExpansionButtons"]').off('click');
+        $scope.find('[data-identifier="rowExpansionButtons"]').on('click', function (e) {
+            var $row = $(e.target).closest('tr.app-datagrid-row');
+            if ($(this).find('.app-button').attr('disabled')) {
+                return;
+            }
+            self.toggleExpandRow(+$row.attr('data-row-id'), undefined, e);
+        });
+    },
+
     /* Attaches all event handlers for the table. */
     attachEventHandlers: function ($htm) {
         var $header = this.gridHeaderElement,
@@ -2876,8 +3126,17 @@ $.widget('wm.datatable', {
 
         if (this.options.enableRowSelection) {
             $htm[0].removeEventListener('click', this.rowClickHandlerOnCapture.bind(this));
+            // MEMORY LEAK FIX: Remove old listener if exists before adding new one
+            // if (this.boundRowClickHandlerOnCapture && $htm[0]) {
+            //     $htm[0].removeEventListener('click', this.boundRowClickHandlerOnCapture, true);
+            // }
             $htm.off();
             $htm[0].addEventListener('click', this.rowClickHandlerOnCapture.bind(this));
+
+            // MEMORY LEAK FIX: Store bound function reference for proper removal
+            // this.boundRowClickHandlerOnCapture = this.rowClickHandlerOnCapture.bind(this);
+            // $htm[0].addEventListener('click', this.boundRowClickHandlerOnCapture, true);
+
             // add js click handler for capture phase in order to first listen on grid and
             // assign selectedItems so that any child actions can have access to the selectedItems.
             $htm.on('click', this.rowSelectionHandler.bind(this));
@@ -2913,16 +3172,14 @@ $.widget('wm.datatable', {
                 }
             }
         }
-        if (this.options.rowActions.length) {
-            $htm.find('.cancel-edit-row-button').off('click');
-            $htm.find('.save-edit-row-button').off('click');
-            $htm.find('.cancel-edit-row-button').on('click', {action: 'cancel'}, this.toggleEditRow.bind(this));
-            $htm.find('.save-edit-row-button').on('click', {action: 'save'}, this.toggleEditRow.bind(this));
-        }
+        this._bindRowActionsAndExpansionClickHandlers($htm);
         if (self.options.editmode === self.CONSTANTS.QUICK_EDIT) {
             $htm.on('focus', 'tr.app-datagrid-row', function (e) {
                 var $row = $(e.currentTarget);
                 if (!$row.hasClass('row-editing')) {
+                    if(e.target===e.currentTarget && (e.which===0||!e.which)) {
+                        return;
+                    }
                     self.toggleEditRow(e, { $row: $row, action: 'edit'});
                 }
             });
@@ -2938,6 +3195,25 @@ $.widget('wm.datatable', {
                     isRelatedTargetGridAction = $relatedTarget.closest('div.app-datagrid-actions').length>0,
                     invalidTargets = '.row-editing:not(".always-new-row"), .row-action-button, .app-datagrid-cell, .caption, button.btn-time, button.btn-date';
 
+                // [WMS-31104] Do not insert the new row when focus moves to another table; that table's row-click handler will reset it.
+                if ($row.hasClass('always-new-row')
+                        && $relatedTarget.length
+                        && !$relatedTarget.closest(self.element).length
+                        && $relatedTarget.closest('.app-datagrid').length) {
+                    return;
+                }
+                // Focus moved to a date/time picker — the row is still being edited, do not save.
+                if ($relatedTarget.closest('bs-datepicker-container, .btn-date, .btn-time').length) {
+                    return;
+                }
+                // [WMS-31104] For regular rows, do not save on focusout when focus leaves this table; the outside-click handler handles it.
+                // The new row (always-new-row) is excluded from this guard so Tab-key save still works when focus moves to pagination.
+                if (!$row.hasClass('always-new-row')
+                        && $relatedTarget.length
+                        && !$relatedTarget.closest(self.element).length) {
+                    return;
+                }
+
                 //Check if the focus out element is outside the grid or some special elements
                 function isInvalidTarget() {
                     if (!$relatedTarget.closest('.app-grid').length) {
@@ -2961,7 +3237,7 @@ $.widget('wm.datatable', {
                 // triggered from the Row Actions
                 if (!isTargetGridAction && !isTargetRowAction) {
                     //Save the row on last column of the data table. Do not save the row if focus is out of input file.
-                    if (!isLastColumn || (isLastColumn && e.relatedTarget === null) || $target.hasClass("file-upload")) {
+                    if (!isLastColumn || (isLastColumn && (e.relatedTarget === null || $(e.target).is('tr.app-datagrid-row'))) || $target.hasClass("file-upload")) {
                         return;
                     }
                 }
@@ -2979,15 +3255,6 @@ $.widget('wm.datatable', {
             });
         }
 
-        // row selection
-        $htm.find('[data-identifier="rowExpansionButtons"]').off("click");
-        $htm.find('[data-identifier="rowExpansionButtons"]').on('click', function (e) {
-            var $row = $(e.target).closest('tr.app-datagrid-row');
-            if ($(this).find('.app-button').attr('disabled')) {
-                return;
-            }
-            self.toggleExpandRow(+$row.attr('data-row-id'), undefined, e);
-        });
     },
     expandRow: function(rowId) {
         this.toggleExpandRow(rowId, true)
@@ -3511,7 +3778,11 @@ $.widget('wm.datatable', {
             this.dataStatusContainer.hide();
         } else {
             // [WMS-23839] always show load more btn if show view less btn is true
-            if (this.options.isNavTypeScrollOrOndemand() && (state === 'nodata' || ((this.options.getCurrentPage() == this.options.getPageCount())  && !this.options.showviewlessbutton))) {
+            if (this.options.isNavTypeScrollOrOndemand() &&
+                (state === 'nodata' ||
+                 (this.options.getCurrentPage && typeof this.options.getCurrentPage === 'function' &&
+                  this.options.getPageCount && typeof this.options.getPageCount === 'function' &&
+                  (this.options.getCurrentPage() == this.options.getPageCount()) && !this.options.showviewlessbutton))) {
                 this.element.find('.on-demand-datagrid a').hide();
             }
             this.dataStatusContainer.show();
@@ -3521,7 +3792,9 @@ $.widget('wm.datatable', {
                 if (state === 'nodata') {
                     this.dataStatusContainer.css('height', 'auto');
                     this.dataStatus.contentHeight = 0;
-                }  else if (this.options.isNavTypeScrollOrOndemand() && this.options.getCurrentPage() > 1){
+                }  else if (this.options.isNavTypeScrollOrOndemand() &&
+                           this.options.getCurrentPage && typeof this.options.getCurrentPage === 'function' &&
+                           this.options.getCurrentPage() > 1){
                     // showing the loading icon only for the first page
                     // from second page there is another loader which is being shown instead of LoadMore btn
                     this.dataStatusContainer.hide();
@@ -3531,7 +3804,9 @@ $.widget('wm.datatable', {
                     this.dataStatusContainer.css('height', this.dataStatus.height > this.dataStatus.contentHeight ? 'auto' : this.dataStatus.contentHeight);
                 }
             }
-            if (!isScrollOrOndemand || (isScrollOrOndemand && this.options.getCurrentPage() === 1)) {
+            if (!isScrollOrOndemand || (isScrollOrOndemand &&
+                this.options.getCurrentPage && typeof this.options.getCurrentPage === 'function' &&
+                this.options.getCurrentPage() === 1)) {
                 this.gridContainer.addClass("show-msg");
             }
         } else {
@@ -3650,6 +3925,34 @@ $.widget('wm.datatable', {
     },
 
     _destroy: function () {
+        // MEMORY LEAK FIX: Remove native event listener using stored bound function
+        // if (this.gridElement && this.gridElement[0] && this.boundRowClickHandlerOnCapture) {
+        //     this.gridElement[0].removeEventListener('click', this.boundRowClickHandlerOnCapture, true);
+        //     this.boundRowClickHandlerOnCapture = null;
+        // }
+
+        // MEMORY LEAK FIX: Remove all jQuery event handlers
+        if (this.gridHeaderElement) {
+            this.gridHeaderElement.off();
+        }
+        if (this.gridElement) {
+            this.gridElement.off();
+        }
+        if (this.gridSearch) {
+            this.gridSearch.off();
+        }
+        if (this.tableContainer) {
+            this.tableContainer.off();
+        }
+        if (this.gridContainer) {
+            this.gridContainer.off();
+        }
+
+        // MEMORY LEAK FIX: Clear all internal structures
+        this.preparedData = [];
+        this.preparedHeaderData = [];
+        this.compiledCellTemplates = {};
+
         this.element.text('');
         window.clearTimeout(this.refreshGridTimeout);
     }