[EuiDataGrid] Add several new footer/header customization APIs + bonus cleanup

src-docs/src/views/datagrid/_snippets.tsx

@@ -11,6 +11,7 @@ inMemory={{ level: 'sorting' }}`,
     id: 'A', // required
     display: <>Column A <EuiIcon type="dot" /></>, // optional column header rendering
     displayAsText: 'Column A', // column header as plain text
+    displayHeaderCellProps: { className: 'eui-textCenter' }, // optional column header cell props
     initialWidth: 150, // starting width of 150px
     isResizable: false, // prevents the user from resizing width
     isExpandable: false, // doesn't allow clicking in to see the content in a popup
@@ -33,16 +34,22 @@ inMemory={{ level: 'sorting' }}`,
   {
     id: 'selection',
     width: 31,
-    headerCellRender: () => <span>Select a Row</span>,
+    headerCellRender: () => <span>Select a row</span>,
+    headerCellProps: { className: 'eui-textCenter' },
     rowCellRender: () => <div><EuiCheckbox ... /></div>,
+    footerCellRender: () => <span>Select a row</span>,
+    footerCellProps: { className: 'eui-textCenter' },
   },
 ]}`,
   trailingControlColumns: `trailingControlColumns={[
   {
     id: 'actions',
     width: 40,
-    headerCellRender: () => null,
+    headerCellRender: () => 'Actions',
+    headerCellProps: { className: 'euiScreenReaderOnly' },
     rowCellRender: MyGridActionsComponent,
+    footerCellRender: () => null,
+    footerCellProps: { data-test-subj: 'emptyFooterCell' },
   },
 ]}`,
   renderCellValue: 'renderCellValue={({ rowIndex, columnId }) => {}}',

src-docs/src/views/datagrid/schema_columns/datagrid_columns_example.js

@@ -293,8 +293,7 @@ schemaDetectors={[
           <p>
             The footer row is defined by passing{' '}
             <EuiCode>renderFooterCellValue</EuiCode> function prop into{' '}
-            <strong>EuiDataGrid</strong>.{' '}
-            <EuiCode>renderFooterCellValue</EuiCode> acts like a React
+            <strong>EuiDataGrid</strong>. This function acts like a React
             component, receiving{' '}
             <EuiCode>EuiDataGridCellValueElementProps</EuiCode> and returning a
             React node.
@@ -304,6 +303,10 @@ schemaDetectors={[
             expansion on cells without content with{' '}
             <EuiCode>setCellProps({'{ isExpandable: false }'})</EuiCode>.
           </p>
+          <p>
+            Control columns will render empty footer cells by default, unless a
+            custom <EuiCode>footerCellRender</EuiCode> function is passed.
+          </p>
         </Fragment>
       ),
       props: {

src-docs/src/views/datagrid/schema_columns/footer_row.js

@@ -3,6 +3,8 @@ import { faker } from '@faker-js/faker';
 
 import {
   EuiDataGrid,
+  EuiCheckbox,
+  EuiButtonIcon,
   EuiSwitch,
   EuiFlexGroup,
   EuiFlexItem,
@@ -14,7 +16,7 @@ for (let i = 1; i < 20; i++) {
   raw_data.push({
     name: `${faker.name.lastName()}, ${faker.name.firstName()} ${faker.name.suffix()}`,
     date: `${faker.date.past()}`,
-    amount: faker.commerce.price(),
+    amount: `$${faker.commerce.price()}`,
     phone: faker.phone.number(),
     version: faker.system.semver(),
   });
@@ -65,6 +67,47 @@ const columns = [
   },
 ];
 
+const leadingControlColumns = [
+  {
+    id: 'selection',
+    width: 32,
+    // Check state doesn't actually work - this is just a static example
+    headerCellRender: () => (
+      <EuiCheckbox
+        id="selectAllHeader"
+        aria-label="Select all rows"
+        onChange={() => {}}
+      />
+    ),
+    rowCellRender: ({ rowIndex }) => (
+      <EuiCheckbox
+        id={`selectRow${rowIndex}`}
+        aria-label="Select this row"
+        onChange={() => {}}
+      />
+    ),
+    footerCellRender: () => (
+      <EuiCheckbox
+        id="selectAllFooter"
+        aria-label="Select all rows"
+        onChange={() => {}}
+      />
+    ),
+  },
+];
+const trailingControlColumns = [
+  {
+    id: 'actions',
+    width: 36,
+    headerCellRender: () => (
+      <span className="euiScreenReaderOnly">Actions</span>
+    ),
+    rowCellRender: () => (
+      <EuiButtonIcon aria-label="Show actions" iconType="boxesHorizontal" />
+    ),
+  },
+];
+
 const footerCellValues = {
   amount: `Total: ${raw_data
     .reduce((acc, { amount }) => acc + Number(amount.split('$')[1]), 0)
@@ -125,6 +168,8 @@ export default () => {
           aria-label="Data grid footer row demo"
           columns={columns}
           columnVisibility={{ visibleColumns, setVisibleColumns }}
+          leadingControlColumns={leadingControlColumns}
+          trailingControlColumns={trailingControlColumns}
           rowCount={raw_data.length}
           renderCellValue={RenderCellValue}
           renderFooterCellValue={

src/components/datagrid/__snapshots__/data_grid.test.tsx.snap

@@ -1071,7 +1071,7 @@ Array [
               role="row"
             >
               <div
-                class="euiDataGridHeaderCell euiDataGridHeaderCell--controlColumn"
+                class="euiDataGridHeaderCell euiDataGridHeaderCell--controlColumn leadingControlCol"
                 data-gridcell-column-id="leading"
                 data-gridcell-column-index="0"
                 data-gridcell-row-index="-1"
@@ -1194,7 +1194,7 @@ Array [
                 </p>
               </div>
               <div
-                class="euiDataGridHeaderCell euiDataGridHeaderCell--controlColumn"
+                class="euiDataGridHeaderCell euiDataGridHeaderCell--controlColumn trailingControlCol"
                 data-gridcell-column-id="trailing"
                 data-gridcell-column-index="3"
                 data-gridcell-row-index="-1"

src/components/datagrid/_index.scss

@@ -2,7 +2,7 @@
 @import 'mixins';
 @import 'data_grid';
 @import 'body/header/data_grid_header_row';
-@import 'body/data_grid_footer_row';
+@import 'body/footer/data_grid_footer_row';
 @import 'body/header/data_grid_column_resizer';
 @import 'data_grid_data_row';
 @import 'controls/data_grid_toolbar';

src/components/datagrid/body/data_grid_body.tsx

@@ -13,20 +13,17 @@ import React, {
   createContext,
   useContext,
   useEffect,
-  useMemo,
   useRef,
-  useState,
 } from 'react';
 import {
   GridChildComponentProps,
   VariableSizeGrid as Grid,
   VariableSizeGridProps,
 } from 'react-window';
-import { useMutationObserver } from '../../observer/mutation_observer';
 import { useResizeObserver } from '../../observer/resize_observer';
 import { EuiDataGridCell } from './data_grid_cell';
-import { EuiDataGridFooterRow } from './data_grid_footer_row';
-import { EuiDataGridHeaderRow } from './header';
+import { useDataGridHeader } from './header';
+import { useDataGridFooter } from './footer';
 import { DataGridCellPopoverContext } from './data_grid_cell_popover';
 import {
   EuiDataGridBodyProps,
@@ -41,7 +38,6 @@ import {
 } from '../utils/grid_height_width';
 import { useDefaultColumnWidth, useColumnWidths } from '../utils/col_widths';
 import { useRowHeightUtils, useDefaultRowHeight } from '../utils/row_heights';
-import { useHeaderFocusWorkaround } from '../utils/focus';
 import { useScrollBars, useScroll } from '../utils/scrolling';
 import { DataGridSortingContext } from '../utils/sorting';
 import { IS_JEST_ENVIRONMENT } from '../../../utils';
@@ -284,33 +280,11 @@ export const EuiDataGridBody: FunctionComponent<EuiDataGridBodyProps> = (
   });
 
   /**
-   * Header
+   * Header & footer
    */
-  const [headerRowRef, setHeaderRowRef] = useState<HTMLDivElement | null>(null);
-  useMutationObserver(headerRowRef, handleHeaderMutation, {
-    subtree: true,
-    childList: true,
-  });
-  const { height: headerRowHeight } = useResizeObserver(headerRowRef, 'height');
-
-  const headerRow = useMemo(() => {
-    return (
-      <EuiDataGridHeaderRow
-        ref={setHeaderRowRef}
-        switchColumnPos={switchColumnPos}
-        setVisibleColumns={setVisibleColumns}
-        leadingControlColumns={leadingControlColumns}
-        trailingControlColumns={trailingControlColumns}
-        columns={columns}
-        columnWidths={columnWidths}
-        defaultColumnWidth={defaultColumnWidth}
-        setColumnWidth={setColumnWidth}
-        schema={schema}
-        schemaDetectors={schemaDetectors}
-        headerIsInteractive={headerIsInteractive}
-      />
-    );
-  }, [
+  const { headerRow, headerRowHeight } = useDataGridHeader({
+    headerIsInteractive,
+    handleHeaderMutation,
     switchColumnPos,
     setVisibleColumns,
     leadingControlColumns,
@@ -321,47 +295,21 @@ export const EuiDataGridBody: FunctionComponent<EuiDataGridBodyProps> = (
     setColumnWidth,
     schema,
     schemaDetectors,
-    headerIsInteractive,
-  ]);
-
-  useHeaderFocusWorkaround(headerIsInteractive);
+  });
 
-  /**
-   * Footer
-   */
-  const [footerRowRef, setFooterRowRef] = useState<HTMLDivElement | null>(null);
-  const { height: footerRowHeight } = useResizeObserver(footerRowRef, 'height');
-
-  const footerRow = useMemo(() => {
-    if (renderFooterCellValue == null) return null;
-    return (
-      <EuiDataGridFooterRow
-        ref={setFooterRowRef}
-        leadingControlColumns={leadingControlColumns}
-        trailingControlColumns={trailingControlColumns}
-        columns={columns}
-        schema={schema}
-        columnWidths={columnWidths}
-        defaultColumnWidth={defaultColumnWidth}
-        renderCellValue={renderFooterCellValue}
-        renderCellPopover={renderCellPopover}
-        rowIndex={visibleRowCount}
-        visibleRowIndex={visibleRowCount}
-        interactiveCellId={interactiveCellId}
-      />
-    );
-  }, [
-    columnWidths,
-    columns,
-    defaultColumnWidth,
-    interactiveCellId,
-    leadingControlColumns,
+  const { footerRow, footerRowHeight } = useDataGridFooter({
     renderFooterCellValue,
     renderCellPopover,
-    schema,
+    rowIndex: visibleRowCount,
+    visibleRowIndex: visibleRowCount,
+    interactiveCellId,
+    leadingControlColumns,
     trailingControlColumns,
-    visibleRowCount,
-  ]);
+    columns,
+    columnWidths,
+    defaultColumnWidth,
+    schema,
+  });
 
   /**
    * Handle scrolling cells fully into view