Merge branch 'main' into 8596-tabs-vertical-error

infor-design · Apr 8, 2024 · 8f67cb5 · 8f67cb5
2 parents f4fdaad + 878465b
commit 8f67cb5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -12,6 +12,10 @@
 - `[Cards]` Fixed title and button regression and position. ([#8602](https://github.com/infor-design/enterprise/issues/8602))
 - `[Contextual Action Panel]` Fixed added padding on contextual action panel. ([#8553](https://github.com/infor-design/enterprise/issues/8553))
 - `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
+- `[Datagrid]` Fixed search icon misalignment in dropwdown cells. ([#8515](https://github.com/infor-design/enterprise/issues/8515))
+- `[Datagrid]` Fixed an error editing on non first page in server side paging datagrid. ([#8537](https://github.com/infor-design/enterprise-ng/issues/1672))
+- `[Cards]` Fixed title and button regression and position. ([#8602](https://github.com/infor-design/enterprise/issues/8602))
+- `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
 - `[Tabs]` Fixed error in tab popup. ([#8596](https://github.com/infor-design/enterprise/issues/8596))
 
 ## v4.94.0

diff --git a/src/components/datagrid/_datagrid-new.scss b/src/components/datagrid/_datagrid-new.scss
@@ -803,7 +803,11 @@
 
 .datagrid-dropdown-list.extra-small-rowheight .trigger .icon {
   left: 4px !important;
-  top: 6px;
+  top: 8px;
+
+  &.search {
+    top: 3px;
+  }
 }
 
 .datagrid-dropdown-list.small-rowheight .trigger .icon {

diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss
@@ -4970,7 +4970,7 @@ td .btn-actions {
       &.search {
         height: 13px;
         left: 4px !important;
-        top: 0;
+        top: 1px;
       }
     }
   }
@@ -4989,17 +4989,18 @@ td .btn-actions {
     }
 
     &.dropdown-list .trigger .icon {
-      margin-top: 3.5px;
+      margin-top: 2px;
     }
   }
 
+  > .trigger .icon,
   .icon {
     color: $ids-color-font-base;
     left: 0 !important;
-    margin-top: 7px;
+    margin-top: 6px;
 
     &.search {
-      margin-top: 7px !important;
+      margin-top: 7px;
     }
   }
 }

diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js
@@ -11468,7 +11468,7 @@ Datagrid.prototype = {
       dataRowIndex = row;
     }
 
-    if (!isTreeGrid && this.settings.paging && this.pagerAPI.activePage > 1) {
+    if (!isTreeGrid && this.settings.paging && this.pagerAPI.activePage > 1 && !this.settings.source) {
       if (dataRowIndex < (this.pagerAPI.activePage - 1) * this.settings.pagesize) {
         dataRowIndex += (this.pagerAPI.activePage - 1) * this.settings.pagesize;
       }

diff --git a/src/components/dropdown/_dropdown-new.scss b/src/components/dropdown/_dropdown-new.scss
@@ -63,8 +63,11 @@ div.multiselect {
 .dropdown-list {
   &.small-rowheight {
     &.datagrid-dropdown-list .trigger .icon {
-    top: 7px;
-    margin-left: 2px;
+      margin-left: 2px;
+
+      &.search {
+        top: 1px;
+      }
     }
   }
 
@@ -420,13 +423,21 @@ html.is-firefox:not([dir='rtl']) {
       &.datagrid-dropdown-list .trigger .icon {
         top: 7.5px;
         margin-left: 0.5px;
+
+        &.search {
+          top: 1px;
+        }
       }
     }
 
     &.extra-small-rowheight {
       &.datagrid-dropdown-list .trigger .icon {
         top: 7px;
         margin-left: 0;
+
+        &.search {
+          top: 2px;
+        }
       }
     }