[EuiDataGrid] Introduce renderCustomToolbar, additionalDisplaySettings and allowResetButton customization options

src-docs/src/views/datagrid/toolbar/_grid.js

@@ -1,7 +1,12 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import { faker } from '@faker-js/faker';
 
-import { EuiDataGrid, EuiAvatar } from '../../../../../src/components';
+import {
+  EuiDataGrid,
+  EuiAvatar,
+  EuiFormRow,
+  EuiRange,
+} from '../../../../../src/components';
 
 const columns = [
   {
@@ -52,6 +57,8 @@ const DataGridStyle = ({
   showFullScreenSelector,
   allowDensity,
   allowRowHeight,
+  allowResetButton,
+  additionalDisplaySettings,
   allowHideColumns,
   allowOrderingColumns,
 }) => {
@@ -98,13 +105,41 @@ const DataGridStyle = ({
   const toggleDisplaySelector = useMemo(() => {
     if (
       showDisplaySelector === true &&
-      (allowDensity === false || allowRowHeight === false)
+      (allowDensity === false ||
+        allowRowHeight === false ||
+        allowResetButton === false ||
+        additionalDisplaySettings)
     ) {
-      return { allowDensity, allowRowHeight };
+      const customDisplaySetting = additionalDisplaySettings && (
+        <EuiFormRow label="Random Sample Size" display="columnCompressed">
+          <EuiRange
+            compressed
+            fullWidth
+            showInput
+            min={1}
+            max={100}
+            step={1}
+            value={10}
+            data-test-subj="randomSampleSize"
+          />
+        </EuiFormRow>
+      );
+      return {
+        allowDensity,
+        allowRowHeight,
+        allowResetButton,
+        additionalDisplaySettings: customDisplaySetting,
+      };
     } else {
       return showDisplaySelector;
     }
-  }, [showDisplaySelector, allowDensity, allowRowHeight]);
+  }, [
+    showDisplaySelector,
+    allowDensity,
+    allowRowHeight,
+    allowResetButton,
+    additionalDisplaySettings,
+  ]);
 
   const toolbarVisibilityOptions = {
     showColumnSelector: toggleColumnSelector,

src-docs/src/views/datagrid/toolbar/_props.tsx

@@ -13,6 +13,8 @@ const gridSnippets = {
   showDisplaySelector: `showDisplaySelector: {
   allowDensity: false;
   allowRowHeight: false;
+  allowResetButton: false;
+  additionalDisplaySettings: <EuiButtonEmpty size="xs" />;
 }`,
   showSortSelector: 'showSortSelector: false',
   showFullScreenSelector: 'showFullScreenSelector: false',

src-docs/src/views/datagrid/toolbar/datagrid_toolbar_example.js

@@ -9,6 +9,9 @@ const dataGridToolbarVisibilitySource = require('!!raw-loader!./_grid');
 import DataGridControls from './additional_controls';
 const dataGridControlsSource = require('!!raw-loader!./additional_controls');
 
+import DataGridCustomToolbar from './render_custom_toolbar';
+const dataGridCustomToolbarSource = require('!!raw-loader!./render_custom_toolbar');
+
 import ToolbarPropsTable from './_props';
 
 import {
@@ -17,6 +20,7 @@ import {
   EuiDataGridToolBarVisibilityColumnSelectorOptions,
   EuiDataGridToolBarVisibilityDisplaySelectorOptions,
   EuiDataGridToolBarAdditionalControlsLeftOptions,
+  EuiDataGridCustomToolbarProps,
 } from '!!prop-loader!../../../../../src/components/datagrid/data_grid_types';
 
 /* eslint-disable local/css-logical-properties */
@@ -185,6 +189,55 @@ export const DataGridToolbarExample = {
       },
       demo: <DataGridControls />,
     },
+    {
+      title: 'Completely custom toolbar rendering',
+      source: [
+        {
+          type: GuideSectionTypes.TSX,
+          code: dataGridCustomToolbarSource,
+        },
+      ],
+      text: (
+        <>
+          <p>
+            If more customized control over the toolbar is required than{' '}
+            <EuiCode>toolbarVisibility</EuiCode> or{' '}
+            <EuiCode>additionalControls</EuiCode> allows, you can use the{' '}
+            <EuiCode>renderCustomToolbar</EuiCode> prop to pass a component. The
+            default datagrid controls are passed back as parameters for optional
+            usage.
+          </p>
+          <p>
+            <EuiCode>renderCustomToolbar</EuiCode> should only be used when a
+            very custom layout (e.g. moving default buttons between sides,
+            interspering custom controls between default controls, custom
+            responsive behavior, etc.) is required. We would caution you to keep
+            consistency in mind also when customizing the toolbar: if using
+            multiple datagrid instances across your app, users will typically
+            want to reach for the same controls for each grid. Changing the
+            available controls inconsistently across your app may result in user
+            frustration.
+          </p>
+        </>
+      ),
+      demo: <DataGridCustomToolbar />,
+      props: {
+        EuiDataGridCustomToolbarProps,
+      },
+      snippet: `<EuiDataGrid
+  aria-label="Data grid with a custom toolbar and additional content in the display settings popover "
+  columns={columns}
+  columnVisibility={{ visibleColumns, setVisibleColumns }}
+  rowCount={rowCount}
+  renderCustomToolbar={({ displayControl }) => <div>Custom toolbar content {displayControl}</div>}
+  toolbarVisibility={{
+    showDisplaySelector: {
+      allowResetButton: false,
+      additionalDisplaySettings: <div>Custom settings content</div>
+    }
+  }}
+/>`,
+    },
     {
       title: 'Toolbar props',
       text: (

src-docs/src/views/datagrid/toolbar/render_custom_toolbar.tsx

@@ -0,0 +1,136 @@
+import React, { useCallback, useState } from 'react';
+import { css } from '@emotion/react';
+import { faker } from '@faker-js/faker';
+
+import {
+  EuiDataGrid,
+  EuiDataGridSorting,
+  EuiDataGridColumnSortingConfig,
+  EuiDataGridToolbarProps,
+  EuiButtonEmpty,
+  EuiFormRow,
+  EuiRange,
+  EuiFlexGroup,
+  EuiFlexItem,
+  euiScreenReaderOnly,
+} from '../../../../../src';
+
+const raw_data: Array<{ [key: string]: string }> = [];
+for (let i = 0; i < 5; i++) {
+  raw_data.push({
+    name: `${faker.person.lastName()}, ${faker.person.firstName()}`,
+    email: faker.internet.email(),
+    location: `${faker.location.city()}, ${faker.location.country()}`,
+    date: `${faker.date.past()}`,
+    amount: faker.commerce.price({ min: 1, max: 1000, dec: 2, symbol: '$' }),
+  });
+}
+const columns = [
+  { id: 'name', displayAsText: 'Name' },
+  { id: 'email', displayAsText: 'Email address' },
+  { id: 'location', displayAsText: 'Location' },
+  { id: 'date', displayAsText: 'Date' },
+  { id: 'amount', displayAsText: 'Amount' },
+];
+
+// Custom toolbar renderer
+const renderCustomToolbar: EuiDataGridToolbarProps['renderCustomToolbar'] = ({
+  hasRoomForGridControls,
+  columnControl,
+  columnSortingControl,
+  displayControl,
+  fullScreenControl,
+  keyboardShortcutsControl,
+}) => {
+  const mobileStyles =
+    !hasRoomForGridControls &&
+    css`
+      .euiDataGrid__controlBtn .euiButtonEmpty__text {
+        ${euiScreenReaderOnly()}
+      }
+    `;
+  return (
+    <EuiFlexGroup
+      responsive={false}
+      gutterSize="s"
+      justifyContent="spaceBetween"
+      alignItems="center"
+      css={mobileStyles}
+    >
+      <EuiFlexItem grow={false}>
+        {hasRoomForGridControls && (
+          <EuiButtonEmpty size="xs" color="primary">
+            Custom left side
+          </EuiButtonEmpty>
+        )}
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup responsive={false} gutterSize="s" alignItems="center">
+          <EuiFlexItem grow={false}>{columnControl}</EuiFlexItem>
+          <EuiFlexItem grow={false}>{columnSortingControl}</EuiFlexItem>
+          <EuiFlexItem grow={false}>{keyboardShortcutsControl}</EuiFlexItem>
+          <EuiFlexItem grow={false}>{displayControl}</EuiFlexItem>
+          <EuiFlexItem grow={false}>{fullScreenControl}</EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+// Some additional custom settings to show in the Display popover
+const AdditionalDisplaySettings = () => {
+  const [exampleSettingValue, setExampleSettingValue] = useState<number>(10);
+
+  return (
+    <EuiFormRow label="Example additional setting" display="columnCompressed">
+      <EuiRange
+        compressed
+        fullWidth
+        showInput
+        min={1}
+        max={100}
+        step={1}
+        value={exampleSettingValue}
+        data-test-subj="exampleAdditionalSetting"
+        onChange={(event) => {
+          setExampleSettingValue(Number(event.currentTarget.value));
+        }}
+      />
+    </EuiFormRow>
+  );
+};
+
+export default () => {
+  // Column visibility
+  const [visibleColumns, setVisibleColumns] = useState(() =>
+    columns.map(({ id }) => id)
+  );
+
+  // Sorting
+  const [sortingColumns, setSortingColumns] = useState<
+    EuiDataGridColumnSortingConfig[]
+  >([]);
+  const onSort = useCallback<EuiDataGridSorting['onSort']>((sortingColumns) => {
+    setSortingColumns(sortingColumns);
+  }, []);
+
+  return (
+    <EuiDataGrid
+      aria-label="Data grid custom toolbar demo"
+      columns={columns}
+      columnVisibility={{ visibleColumns, setVisibleColumns }}
+      sorting={{ columns: sortingColumns, onSort }}
+      rowCount={raw_data.length}
+      renderCellValue={({ rowIndex, columnId }) => raw_data[rowIndex][columnId]}
+      gridStyle={{ border: 'none', header: 'underline' }}
+      renderCustomToolbar={renderCustomToolbar}
+      toolbarVisibility={{
+        showDisplaySelector: {
+          allowResetButton: false,
+          additionalDisplaySettings: <AdditionalDisplaySettings />,
+        },
+      }}
+    />
+  );
+};

src-docs/src/views/datagrid/toolbar/visibility.js

@@ -46,6 +46,9 @@ const DataGrid = () => {
   const [showDisplaySelector, setShowDisplaySelector] = useState(true);
   const [allowDensity, setAllowDensity] = useState(true);
   const [allowRowHeight, setAllowRowHeight] = useState(true);
+  const [allowResetButton, setAllowResetButton] = useState(true);
+  const [additionalDisplaySettings, setAdditionalDisplaySettings] =
+    useState(false);
   const [showColumnSelector, setShowColumnSelector] = useState(true);
   const [allowHideColumns, setAllowHideColumns] = useState(true);
   const [allowOrderingColumns, setAllowOrderingColumns] = useState(true);
@@ -76,6 +79,12 @@ const DataGrid = () => {
   const onAllowRowHeightChange = (optionId) => {
     setAllowRowHeight(optionId === 'true');
   };
+  const onAllowResetButtonChange = (optionId) => {
+    setAllowResetButton(optionId === 'true');
+  };
+  const onAdditionalDisplaySettingsChange = (optionId) => {
+    setAdditionalDisplaySettings(optionId === 'true');
+  };
 
   const onShowKeyboardShortcutsChange = (optionId) => {
     setShowKeyboardShortcuts(optionId === 'true');
@@ -125,13 +134,27 @@ const DataGrid = () => {
   const toggleDisplaySelector = useMemo(() => {
     if (
       showDisplaySelector === true &&
-      (allowDensity === false || allowRowHeight === false)
+      (allowDensity === false ||
+        allowRowHeight === false ||
+        allowResetButton === false ||
+        additionalDisplaySettings)
     ) {
-      return { allowDensity, allowRowHeight };
+      return {
+        allowDensity,
+        allowRowHeight,
+        allowResetButton,
+        additionalDisplaySettings,
+      };
     } else {
       return showDisplaySelector;
     }
-  }, [showDisplaySelector, allowDensity, allowRowHeight]);
+  }, [
+    showDisplaySelector,
+    allowDensity,
+    allowRowHeight,
+    allowResetButton,
+    additionalDisplaySettings,
+  ]);
 
   const createItem = (name, buttonProps = {}) => {
     return (
@@ -234,6 +257,18 @@ const DataGrid = () => {
                       onChange: onAllowRowHeightChange,
                     })}
                   </li>
+                  <li>
+                    {createItem('Show reset button', {
+                      idSelected: allowResetButton.toString(),
+                      onChange: onAllowResetButtonChange,
+                    })}
+                  </li>
+                  <li>
+                    {createItem('Additional display settings', {
+                      idSelected: additionalDisplaySettings.toString(),
+                      onChange: onAdditionalDisplaySettingsChange,
+                    })}
+                  </li>
                 </ul>
               )}
 
@@ -266,6 +301,8 @@ const DataGrid = () => {
         showFullScreenSelector={showFullScreenSelector}
         allowDensity={allowDensity}
         allowRowHeight={allowRowHeight}
+        allowResetButton={allowResetButton}
+        additionalDisplaySettings={additionalDisplaySettings}
         allowHideColumns={allowHideColumns}
         allowOrderingColumns={allowOrderingColumns}
       />