[Suggested refactor] Move defaultComparator to data_grid_schema

cee-chen · cee-chen · commit 041eeb276974 · 2021-09-01T11:33:42.000-07:00
- since comparators are schema related, and data_grid_schema contains several other similar utility exports/fns

- goal is to continue making data_grid_body more encapsulated/focused on (e.g.) display logic and letting other components handle the detailed sort logic

+ unit tests will be written later for data_grid_schema
diff --git a/src/components/datagrid/body/data_grid_body.tsx b/src/components/datagrid/body/data_grid_body.tsx
@@ -33,6 +33,7 @@ import {
   DataGridSortingContext,
   DataGridWrapperRowsContext,
 } from '../data_grid_context';
+import { defaultComparator } from '../data_grid_schema';
 import { EuiDataGridFooterRow } from './data_grid_footer_row';
 import { EuiDataGridHeaderRow } from './header';
 import {
@@ -47,14 +48,6 @@ import {
 
 export const VIRTUALIZED_CONTAINER_CLASS = 'euiDataGrid__virtualized';
 
-const defaultComparator: NonNullable<
-  EuiDataGridSchemaDetector['comparator']
-> = (a, b, direction) => {
-  if (a < b) return direction === 'asc' ? -1 : 1;
-  if (a > b) return direction === 'asc' ? 1 : -1;
-  return 0;
-};
-
 const Cell: FunctionComponent<GridChildComponentProps> = ({
   columnIndex,
   rowIndex: visibleRowIndex,
diff --git a/src/components/datagrid/data_grid_schema.tsx b/src/components/datagrid/data_grid_schema.tsx
@@ -210,6 +210,14 @@ export const schemaDetectors: EuiDataGridSchemaDetector[] = [
   },
 ];
 
+export const defaultComparator: NonNullable<
+  EuiDataGridSchemaDetector['comparator']
+> = (a, b, direction) => {
+  if (a < b) return direction === 'asc' ? -1 : 1;
+  if (a > b) return direction === 'asc' ? 1 : -1;
+  return 0;
+};
+
 function scoreValueBySchemaType(
   value: string,
   schemaDetectors: EuiDataGridSchemaDetector[] = []
