@linzjs/step-ag-grid 30.4.1 → 30.4.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "30.4.1",
+  "version": "30.4.3",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/components/Grid.tsx

@@ -771,8 +771,7 @@ export const Grid = <TData extends GridBaseRow = GridBaseRow>({
           } else {
             r = compareNaturalInsensitive(value1, value2);
           }
-          // secondary compare as primary sort column rows are equal
-          return r === 0 ? compareNaturalInsensitive(node1.data?.id, node2.data?.id) : r;
+          return r;
         };
       }
       const adjustedColDef = {

package/src/stories/grid/GridSorting.stories.tsx

@@ -82,14 +82,14 @@ const GridReadOnlyTemplate: StoryFn<typeof Grid<ITestRow>> = (props: GridProps<I
         colId: 'customComparatorText',
         headerName: 'Cust. comp. id as text',
         valueFormatter: ({ data }) => data?.text ?? '',
-        comparator: (_v1, _v2, n1, n2) => compareNaturalInsensitive(String(n1.data?.id), String(n2.data?.id)) ?? 0,
+        comparator: (_v1, _v2, n1, n2) => compareNaturalInsensitive(String(n1.data?.id), String(n2.data?.id)),
       }),
       GridCell({
         colId: 'customComparatorNumeric',
-        headerName: 'Cust. comp. abs number',
+        headerName: 'Cust. comp. number',
         valueFormatter: ({ data }) => String(data?.numeric ?? ''),
         comparator: (_v1, _v2, n1, n2) => {
-          return compareNaturalInsensitive(n1.data?.numeric, n2.data?.numeric) ?? 0;
+          return compareNaturalInsensitive(n1.data?.numeric, n2.data?.numeric);
         },
       }),
     ],
@@ -148,16 +148,8 @@ Sorting.play = async (context) => {
   await test('numeric', ['–', '-1.1', '1', '2.01', '2.1', '2.21', '3', '3', '11', '21']);
   await test('numeric', ['21', '11', '3', '3', '2.21', '2.1', '2.01', '1', '-1.1', '–']);
 
-  await test(
-    'text',
-    ['–', '2', '10', 'ade', 'ade', 'b', 'b', 'cdc', 'e', 'e'],
-    ['1006', '1002', '1003', '1000', '1009', '1004', '1005', '1001', '1007', '1008'],
-  );
-  await test(
-    'text',
-    ['e', 'e', 'cdc', 'b', 'b', 'ade', 'ade', '10', '2', '–'],
-    ['1008', '1007', '1001', '1005', '1004', '1009', '1000', '1003', '1002', '1006'],
-  );
+  await test('text', ['–', '2', '10', 'ade', 'ade', 'b', 'b', 'cdc', 'e', 'e']);
+  await test('text', ['e', 'e', 'cdc', 'b', 'b', 'ade', 'ade', '10', '2', '–']);
 
   await test('customComparatorText', null, [
     '1000',

package/src/styles/react-menu-customisations.scss

@@ -15,7 +15,7 @@
     @include lui.font-regular();
   }
 
-  li[role="menuitem"]:hover {
+  li[role="menuitem"]:not(.szh-menu__item--disabled):hover {
     background-color: lui.$polar;
   }