ms-data-grid 0.0.145 → 0.0.147

package/fesm2022/ms-data-grid.mjs

@@ -4778,10 +4778,16 @@ class DataGridComponent {
             setTimeout(() => {
                 const dropdownMenu = document.querySelector('.cell-editing-dropdown-menu');
                 if (dropdownMenu) {
-                    const rect = dropdownMenu.getBoundingClientRect();
-                    const windowHeight = this.dataGridContainer.nativeElement?.offsetHeight;
-                    if (rect.bottom > windowHeight) {
-                        dropdownMenu.style.top = `-${rect.height}px`;
+                    const menuHeight = dropdownMenu.offsetHeight;
+                    const containerRect = this.dataGridContainer.nativeElement.getBoundingClientRect();
+                    const menuRect = dropdownMenu.getBoundingClientRect();
+                    const spaceBelow = containerRect.bottom - menuRect.top;
+                    const spaceAbove = menuRect.top - containerRect.top - (this.showFilterRow && this.showColumnsGrouping ? this.headerRowHeight * 3 : (this.showFilterRow || this.showColumnsGrouping ? this.headerRowHeight * 2 : this.headerRowHeight)) - (this.showRowsGrouping ? this.topFilterRowHeight : 0);
+                    if (spaceBelow >= menuHeight) {
+                        dropdownMenu.style.top = '100%';
+                    }
+                    else if (spaceAbove >= menuHeight) {
+                        dropdownMenu.style.top = `-${menuHeight}px`;
                     }
                     else {
                         dropdownMenu.style.top = '100%';
@@ -4841,7 +4847,7 @@ class DataGridComponent {
         this.editingKey = null;
         this.cdr.detectChanges();
         const current = this.getNestedValue(row, column?.field);
-        if (!current || (column.type == 'email' && !this.validateEmail(current))) {
+        if ((column.type == 'email' && !this.validateEmail(current))) {
             const originalRow = this.originalDataSet.find(item => ((item.id && item.id == row.id) || (item.id && item.id == row._id)));
             const original = this.getNestedValue(originalRow, column?.field);
             this.setNestedValue(row, column, original);
@@ -4947,7 +4953,7 @@ class DataGridComponent {
             }
         }
         if (this.originalDataSet && Array.isArray(this.originalDataSet)) {
-            const originalRowIndex = this.originalDataSet.findIndex(r => r.id === obj.id || r._id === obj._id);
+            const originalRowIndex = this.originalDataSet.findIndex(r => (r?.id && r?.id === obj?.id) || (r?._id && r._id === obj._id));
             if (originalRowIndex !== -1) {
                 const originalParent = keys.reduce((acc, key) => acc[key] ??= {}, this.originalDataSet[originalRowIndex]);
                 if (originalParent && lastKey) {