From 848a2e74bdade3e0dbdc4613bcfcd92f1b88b8c0 Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 11:06:59 -0400 Subject: [PATCH 1/6] Tooltip #809 Signed-off-by: keskami --- .../__snapshots__/data_grid.test.tsx.snap | 498 ++++++++++-------- .../datagrid/data_grid_header_cell.tsx | 3 + 2 files changed, 268 insertions(+), 233 deletions(-) diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap index bb537ef767..334040e439 100644 --- a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap +++ b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap @@ -1051,82 +1051,90 @@ Array [ data-test-subj="dataGridHeader" role="row" > -
-
+
- +
+ A +
+ + +
-
-
+
-
+
- +
+ B +
+ + +
-
+
-
-
+
- +
+ A +
+ + +
-
-
+
-
+
- +
+ B +
+ + +
-
+
-
-
+
- +
+ Column A +
+ + +
-
-
+
-
+
- + + +
-
+
-
-
+
- +
+ A +
+ + +
-
-
+
-
+
- +
+ B +
+ + +
-
+
)}
+ ); }; From ee9586b6f75c4e03f2a6caeea9ff30df1106000b Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 11:07:42 -0400 Subject: [PATCH 2/6] Tooltip #809 Signed-off-by: keskami --- .../datagrid/data_grid_header_cell.tsx | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/src/components/datagrid/data_grid_header_cell.tsx b/src/components/datagrid/data_grid_header_cell.tsx index 2666356435..dc82c2e8ba 100644 --- a/src/components/datagrid/data_grid_header_cell.tsx +++ b/src/components/datagrid/data_grid_header_cell.tsx @@ -313,71 +313,71 @@ export const OuiDataGridHeaderCell: FunctionComponent -
- {column.isResizable !== false && width != null ? ( - - ) : null} +
+ {column.isResizable !== false && width != null ? ( + + ) : null} - {sorting && sorting.columns.length >= 2 && ( - -
{sortString}
- - )} - {!showColumnActions ? ( - <> - {sortingArrow} -
- {display || displayAsText || id} -
- - ) : ( - - setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) - }> - {sortingArrow} -
- {display || displayAsText || id} -
- = 2 && ( + +
{sortString}
+ + )} + {!showColumnActions ? ( + <> + {sortingArrow} +
+ {display || displayAsText || id} +
+ + ) : ( + + setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) + }> + {sortingArrow} +
+ {display || displayAsText || id} +
+ + + } + isOpen={isPopoverOpen} + closePopover={() => setIsPopoverOpen(false)}> +
+ - - } - isOpen={isPopoverOpen} - closePopover={() => setIsPopoverOpen(false)}> -
- -
- - )} -
+
+ + )} +
); }; From 494d4dfc63fb47cfc65435f9dd8afb98d7f815d3 Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 16:16:26 -0400 Subject: [PATCH 3/6] CHANGELOG updated Signed-off-by: keskami --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3646ba851..3d8073a276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ - Adjust background color of OuiToolTip in `next` theme ([#1004](https://github.com/opensearch-project/oui/pull/1004)) - Add new `middle-out` order prop option to `OuiPaletteColorBlind` ([#856](https://github.com/opensearch-project/oui/pull/856)) - Add new icons for OpenSearch Dashboards v2.10.0 ([#1014](https://github.com/opensearch-project/oui/pull/1014)) +- Add Tooltip to DataGrid header cell ([[#809](https://github.com/opensearch-project/oui/issues/809)]) ### 🐛 Bug Fixes From 617ce9bcea2794b78361b81d68d10513e0ed2928 Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 16:21:40 -0400 Subject: [PATCH 4/6] revert Signed-off-by: keskami --- CHANGELOG.md | 1 - .../datagrid/data_grid_header_cell.tsx | 129 +++++++++--------- 2 files changed, 63 insertions(+), 67 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d8073a276..a3646ba851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,7 +58,6 @@ - Adjust background color of OuiToolTip in `next` theme ([#1004](https://github.com/opensearch-project/oui/pull/1004)) - Add new `middle-out` order prop option to `OuiPaletteColorBlind` ([#856](https://github.com/opensearch-project/oui/pull/856)) - Add new icons for OpenSearch Dashboards v2.10.0 ([#1014](https://github.com/opensearch-project/oui/pull/1014)) -- Add Tooltip to DataGrid header cell ([[#809](https://github.com/opensearch-project/oui/issues/809)]) ### 🐛 Bug Fixes diff --git a/src/components/datagrid/data_grid_header_cell.tsx b/src/components/datagrid/data_grid_header_cell.tsx index dc82c2e8ba..af0d6b8f7e 100644 --- a/src/components/datagrid/data_grid_header_cell.tsx +++ b/src/components/datagrid/data_grid_header_cell.tsx @@ -55,7 +55,6 @@ import { DataGridFocusContext, DataGridSortingContext, } from './data_grid_context'; -import { OuiToolTip } from '../tool_tip'; export interface OuiDataGridHeaderCellProps extends Omit< @@ -312,72 +311,70 @@ export const OuiDataGridHeaderCell: FunctionComponent -
- {column.isResizable !== false && width != null ? ( - - ) : null} +
+ {column.isResizable !== false && width != null ? ( + + ) : null} - {sorting && sorting.columns.length >= 2 && ( - -
{sortString}
- - )} - {!showColumnActions ? ( - <> - {sortingArrow} -
- {display || displayAsText || id} -
- - ) : ( - - setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) - }> - {sortingArrow} -
- {display || displayAsText || id} -
- - - } - isOpen={isPopoverOpen} - closePopover={() => setIsPopoverOpen(false)}> -
- = 2 && ( + +
{sortString}
+ + )} + {!showColumnActions ? ( + <> + {sortingArrow} +
+ {display || displayAsText || id} +
+ + ) : ( + + setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) + }> + {sortingArrow} +
+ {display || displayAsText || id} +
+ -
- - )} -
- + + } + isOpen={isPopoverOpen} + closePopover={() => setIsPopoverOpen(false)}> +
+ +
+ + )} +
); }; From c054ae78c9d7b5cff436b870a905ae23c895c025 Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 16:22:01 -0400 Subject: [PATCH 5/6] Data Grid - Column Headers - Add tooltip on hover #809 Signed-off-by: keskami --- .../datagrid/data_grid_header_cell.tsx | 129 +++++++++--------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/src/components/datagrid/data_grid_header_cell.tsx b/src/components/datagrid/data_grid_header_cell.tsx index af0d6b8f7e..dc82c2e8ba 100644 --- a/src/components/datagrid/data_grid_header_cell.tsx +++ b/src/components/datagrid/data_grid_header_cell.tsx @@ -55,6 +55,7 @@ import { DataGridFocusContext, DataGridSortingContext, } from './data_grid_context'; +import { OuiToolTip } from '../tool_tip'; export interface OuiDataGridHeaderCellProps extends Omit< @@ -311,70 +312,72 @@ export const OuiDataGridHeaderCell: FunctionComponent - {column.isResizable !== false && width != null ? ( - - ) : null} + +
+ {column.isResizable !== false && width != null ? ( + + ) : null} - {sorting && sorting.columns.length >= 2 && ( - -
{sortString}
- - )} - {!showColumnActions ? ( - <> - {sortingArrow} -
- {display || displayAsText || id} -
- - ) : ( - - setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) - }> - {sortingArrow} -
- {display || displayAsText || id} -
- = 2 && ( + +
{sortString}
+ + )} + {!showColumnActions ? ( + <> + {sortingArrow} +
+ {display || displayAsText || id} +
+ + ) : ( + + setIsPopoverOpen((isPopoverOpen) => !isPopoverOpen) + }> + {sortingArrow} +
+ {display || displayAsText || id} +
+ + + } + isOpen={isPopoverOpen} + closePopover={() => setIsPopoverOpen(false)}> +
+ - - } - isOpen={isPopoverOpen} - closePopover={() => setIsPopoverOpen(false)}> -
- -
- - )} -
+
+ + )} +
+ ); }; From d356c6e67967566541750f2bde5459cfec5709c3 Mon Sep 17 00:00:00 2001 From: keskami Date: Tue, 31 Oct 2023 16:25:31 -0400 Subject: [PATCH 6/6] CHANGELOG updated Signed-off-by: keskami --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3646ba851..3d8073a276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ - Adjust background color of OuiToolTip in `next` theme ([#1004](https://github.com/opensearch-project/oui/pull/1004)) - Add new `middle-out` order prop option to `OuiPaletteColorBlind` ([#856](https://github.com/opensearch-project/oui/pull/856)) - Add new icons for OpenSearch Dashboards v2.10.0 ([#1014](https://github.com/opensearch-project/oui/pull/1014)) +- Add Tooltip to DataGrid header cell ([[#809](https://github.com/opensearch-project/oui/issues/809)]) ### 🐛 Bug Fixes