From 40c89873fd4c58a78b969d303a891f4bd6885649 Mon Sep 17 00:00:00 2001 From: Charles McDonald Date: Tue, 14 Nov 2023 08:50:40 -0600 Subject: [PATCH 1/3] [terra-table] Fixed screenreader issue due to space in headers attribute --- packages/terra-table/CHANGELOG.md | 1 + packages/terra-table/src/Table.jsx | 2 +- .../terra-table/src/subcomponents/Cell.jsx | 6 +- .../terra-table/tests/jest/Table.test.jsx | 229 +- .../jest/__snapshots__/Table.test.jsx.snap | 16740 +--------------- 5 files changed, 279 insertions(+), 16699 deletions(-) diff --git a/packages/terra-table/CHANGELOG.md b/packages/terra-table/CHANGELOG.md index d8fd8788bcf..dee9babcc66 100644 --- a/packages/terra-table/CHANGELOG.md +++ b/packages/terra-table/CHANGELOG.md @@ -7,6 +7,7 @@ * Fixed * Fixed tab index issues in the column header cells. + * Fixed screenreader issue due to space in the headers attribute. ## 5.1.1-alpha.1 - (November 9, 2023) diff --git a/packages/terra-table/src/Table.jsx b/packages/terra-table/src/Table.jsx index c77cc87428b..d9e678da065 100644 --- a/packages/terra-table/src/Table.jsx +++ b/packages/terra-table/src/Table.jsx @@ -273,7 +273,7 @@ function Table(props) { } // eslint-disable-next-line no-param-reassign - currentSection.sectionRowIndex = 0; + currentSection.sectionRowIndex = rowCount; return rowCount + currentSection.rows.length; }; const tableRowCount = tableSections.reduce(tableSectionReducer, 1); diff --git a/packages/terra-table/src/subcomponents/Cell.jsx b/packages/terra-table/src/subcomponents/Cell.jsx index a3b284e33fc..91f34039c97 100644 --- a/packages/terra-table/src/subcomponents/Cell.jsx +++ b/packages/terra-table/src/subcomponents/Cell.jsx @@ -300,8 +300,8 @@ function Cell(props) { } // Determine table cell header attribute values - const sectionHeaderId = sectionId ? `${tableId}-${sectionId}` : ''; - const rowHeaderId = !isRowHeader ? `${tableId}-rowheader-${rowId}` : ''; + const sectionHeaderId = sectionId ? `${tableId}-${sectionId} ` : ''; + const rowHeaderId = !isRowHeader ? `${tableId}-rowheader-${rowId} ` : ''; const columnHeaderId = `${tableId}-${columnId}`; return ( @@ -310,7 +310,7 @@ function Cell(props) { ref={isGridContext ? cellRef : undefined} aria-selected={isSelected || undefined} aria-label={ariaLabel} - headers={`${sectionHeaderId} ${rowHeaderId} ${columnHeaderId}`} + headers={`${sectionHeaderId}${rowHeaderId}${columnHeaderId}`} tabIndex={isGridContext ? -1 : undefined} className={className} {...(isRowHeader && { scope: 'row', role: 'rowheader' })} diff --git a/packages/terra-table/tests/jest/Table.test.jsx b/packages/terra-table/tests/jest/Table.test.jsx index 49074e98479..8e666976004 100644 --- a/packages/terra-table/tests/jest/Table.test.jsx +++ b/packages/terra-table/tests/jest/Table.test.jsx @@ -7,6 +7,7 @@ import { v4 as uuidv4 } from 'uuid'; import ColumnHeader from '../../src/subcomponents/ColumnHeader'; import ColumnHeaderCell from '../../src/subcomponents/ColumnHeaderCell'; +import Section from '../../src/subcomponents/Section'; import GridContext, { GridConstants } from '../../src/utils/GridContext'; import ERRORS from '../../src/utils/constants'; import Row from '../../src/subcomponents/Row'; @@ -56,6 +57,78 @@ const tableData = { ], }; +const tableSectionData = { + cols: [ + { + id: 'Column-0', displayName: 'Patient', sortIndicator: 'ascending', isSelectable: true, + }, + { + id: 'Column-1', displayName: 'Location', isSelectable: true, + }, + { id: 'Column-2', displayName: 'Illness Severity', isSelectable: true }, + { id: 'Column-3', displayName: 'Visit' }, + { id: 'Column-4', displayName: 'Allergy' }, + { id: 'Column-5', displayName: 'Primary Contact' }, + + ], + sections: [{ + id: 'section-0', + text: 'Test Section', + rows: [ + { + id: '1', + cells: [ + { content: 'Fleck, Arthur' }, + { content: '1007-MTN' }, + { content: 'Unstable' }, + { content: 'Inpatient, 2 months' }, + { content: '' }, + { content: 'Quinzell, Harleen' }, + ], + }, + { + id: '2', + cells: [ + { content: 'Wayne, Bruce' }, + { content: '1007-MTN-DR' }, + { content: 'Stable' }, + { content: 'Outpatient, 2 days' }, + { content: 'Phytochemicals' }, + { content: 'Grayson, Richard' }, + ], + }, + ], + }, + { + id: 'section-1', + text: 'Test Section #2', + rows: [ + { + id: '3', + cells: [ + { content: 'Parker, Peter' }, + { content: '1007-MTN' }, + { content: 'Unstable' }, + { content: 'Inpatient, 2 months' }, + { content: '' }, + { content: 'Octopus, Doctor' }, + ], + }, + { + id: '4', + cells: [ + { content: 'Stark, Tony' }, + { content: '1007-MTN-DR' }, + { content: 'Stable' }, + { content: 'Outpatient, 2 days' }, + { content: 'Phytochemicals' }, + { content: 'America, Captain' }, + ], + }, + ], + }], +}; + let mockSpyUuid; beforeAll(() => { jest.spyOn(console, 'error').mockImplementation(); @@ -107,10 +180,11 @@ describe('Table', () => { ); // Find column headers - const columnHeader = wrapper.find(ColumnHeaderCell); + const columnHeaderCell = wrapper.find(ColumnHeaderCell).at(0); + expect(columnHeaderCell.props().id).toBe('table-rowSelectionColumn'); // Simulate onMouseDown event on row selection column header - columnHeader.at(0).simulate('mouseDown'); + columnHeaderCell.simulate('mouseDown'); // Validate mock function was called from simulated click event expect(mockColumnSelect).not.toHaveBeenCalled(); @@ -118,6 +192,139 @@ describe('Table', () => { expect(wrapper).toMatchSnapshot(); }); + it('verifies ARIA attributes for a table with sections', () => { + const wrapper = mountWithIntl( + , + ); + + // Validate table properties + const table = wrapper.find('table'); + expect(table.props().id).toBe('test-terra-table'); + expect(table.props().role).toBe('table'); + expect(table.props()['aria-rowcount']).toBe(7); + + // Validate column header id attribute + const columnHeaderCell = wrapper.find('.column-header').at(0); + expect(columnHeaderCell.props().id).toBe('test-terra-table-Column-0'); + + // Retrieve first section + const tableSections = wrapper.find(Section); + const section1 = tableSections.at(0); + + // Validate section header row of the first section + const section1HeaderRow = section1.find('.header'); + expect(section1HeaderRow.props()['aria-rowindex']).toBe(2); + + // Validate table header element of the first section + const sectionHeader1 = section1HeaderRow.find('th'); + expect(sectionHeader1.props().id).toBe('test-terra-table-section-0'); + expect(sectionHeader1.props().colSpan).toBe(tableSectionData.cols.length); + expect(sectionHeader1.props().scope).toBe('col'); + + // Validate rows of the first section + const section1Row1 = section1.find('.row').at(0); + expect(section1Row1.props()['aria-rowindex']).toBe(3); + expect(section1Row1.props()['data-row-id']).toBe('1'); + const section1Row2 = section1.find('.row').at(1); + expect(section1Row2.props()['aria-rowindex']).toBe(4); + expect(section1Row2.props()['data-row-id']).toBe('2'); + + // Validate cells of the first row + const row1Cell1 = section1Row1.find('.cell').at(0); + expect(row1Cell1.props().headers).toBe('test-terra-table-section-0 test-terra-table-Column-0'); + expect(row1Cell1.props().id).toBe('test-terra-table-rowheader-1'); + const row1Cell2 = section1Row1.find('.cell').at(1); + expect(row1Cell2.props().headers).toBe('test-terra-table-section-0 test-terra-table-rowheader-1 test-terra-table-Column-1'); + + // Retrieve second section + const section2 = tableSections.at(1); + + // Validate section header row of the second section + const section2HeaderRow = section2.find('.header'); + expect(section2HeaderRow.props()['aria-rowindex']).toBe(5); + + // Validate table header element of the second section + const sectionHeader2 = section2HeaderRow.find('th'); + expect(sectionHeader2.props().id).toBe('test-terra-table-section-1'); + expect(sectionHeader2.props().colSpan).toBe(tableSectionData.cols.length); + expect(sectionHeader2.props().scope).toBe('col'); + + // Validate rows of the second section + const section2Row1 = section2.find('.row').at(0); + expect(section2Row1.props()['aria-rowindex']).toBe(6); + expect(section2Row1.props()['data-row-id']).toBe('3'); + const section2Row2 = section2.find('.row').at(1); + expect(section2Row2.props()['aria-rowindex']).toBe(7); + expect(section2Row2.props()['data-row-id']).toBe('4'); + + // Validate cells of the first row + const section2Row1Cell1 = section2Row1.find('.cell').at(0); + expect(section2Row1Cell1.props().headers).toBe('test-terra-table-section-1 test-terra-table-Column-0'); + expect(section2Row1Cell1.props().id).toBe('test-terra-table-rowheader-3'); + const section2Row1Cell2 = section2Row1.find('.cell').at(1); + expect(section2Row1Cell2.props().headers).toBe('test-terra-table-section-1 test-terra-table-rowheader-3 test-terra-table-Column-1'); + }); + + it('verifies ARIA attributes for a table without sections', () => { + const wrapper = mountWithIntl( +
, + ); + + // Validate table properties + const table = wrapper.find('table'); + expect(table.props().id).toBe('test-terra-table'); + expect(table.props().role).toBe('table'); + expect(table.props()['aria-rowcount']).toBe(5); + + // Validate column header id attribute + const columnHeaderCell = wrapper.find('.column-header').at(0); + expect(columnHeaderCell.props().id).toBe('test-terra-table-Column-0'); + + // Retrieve first section + const tableSections = wrapper.find(Section); + const section1 = tableSections.at(0); + + // Validate section header row of the first section + const section1HeaderRow = section1.find('.header'); + expect(section1HeaderRow).toHaveLength(0); + + // Validate rows of the first section + const row1 = section1.find('.row').at(0); + expect(row1.props()['aria-rowindex']).toBe(2); + expect(row1.props()['data-row-id']).toBe('1'); + const row2 = section1.find('.row').at(1); + expect(row2.props()['aria-rowindex']).toBe(3); + expect(row2.props()['data-row-id']).toBe('2'); + const row3 = section1.find('.row').at(2); + expect(row3.props()['aria-rowindex']).toBe(4); + expect(row3.props()['data-row-id']).toBe('3'); + const row4 = section1.find('.row').at(3); + expect(row4.props()['aria-rowindex']).toBe(5); + expect(row4.props()['data-row-id']).toBe('4'); + + // Validate cells of the first row + const row1Cell1 = row1.find('.cell').at(0); + expect(row1Cell1.props().headers).toBe('test-terra-table-Column-0'); + expect(row1Cell1.props().id).toBe('test-terra-table-rowheader-1'); + const row1Cell2 = row1.find('.cell').at(1); + expect(row1Cell2.props().headers).toBe('test-terra-table-rowheader-1 test-terra-table-Column-1'); + + // Validate cells of the second row + const row2Cell1 = row2.find('.cell').at(0); + expect(row2Cell1.props().headers).toBe('test-terra-table-Column-0'); + expect(row2Cell1.props().id).toBe('test-terra-table-rowheader-2'); + const row2Cell2 = row2.find('.cell').at(1); + expect(row2Cell2.props().headers).toBe('test-terra-table-rowheader-2 test-terra-table-Column-1'); + }); + it('verifies row selection column header not selectable without callback', () => { const mockColumnSelect = jest.fn(); @@ -140,8 +347,6 @@ describe('Table', () => { // Validate mock function was called from simulated click event expect(mockColumnSelect).toHaveBeenCalled(); - - expect(wrapper).toMatchSnapshot(); }); it('verifies onCellSelect callback is triggered when space is pressed on a masked cell', () => { @@ -168,8 +373,6 @@ describe('Table', () => { // Validate mock function was called from simulated click event expect(mockCellSelect).toHaveBeenCalled(); - - expect(wrapper).toMatchSnapshot(); }); it('verifies onCellSelect callback is triggered when space is pressed on a non-selectable cell', () => { @@ -196,8 +399,6 @@ describe('Table', () => { // Validate mock function was called from simulated click event expect(mockCellSelect).toHaveBeenCalled(); - - expect(wrapper).toMatchSnapshot(); }); it('verifies that the column widths are set properly in the colgroup', () => { @@ -215,8 +416,6 @@ describe('Table', () => { // Verify that column headers are not present const column = wrapper.find('col').get(0); expect(column.props.style.width).toBe('150px'); - - expect(wrapper).toMatchSnapshot(); }); }); @@ -301,8 +500,6 @@ describe('Row Selection', () => { const hiddenText = wrapper.find('VisuallyHiddenText').at(1); expect(hiddenText.props().text).toBe('Terra.table.row-selection-template'); - - expect(wrapper).toMatchSnapshot(); }); it('verifies row selection row unselected update', () => { @@ -331,8 +528,6 @@ describe('Row Selection', () => { const hiddenText = wrapper.find('VisuallyHiddenText').at(1); expect(hiddenText.props().text).toBe('Terra.table.row-selection-cleared-template'); - - expect(wrapper).toMatchSnapshot(); }); it('verifies row selection all row selection single selction', () => { @@ -360,8 +555,6 @@ describe('Row Selection', () => { const hiddenText = wrapper.find('VisuallyHiddenText').at(1); expect(hiddenText.props().text).toBe('Terra.table.all-rows-selected'); - - expect(wrapper).toMatchSnapshot(); }); it('verifies row selection all rows unselected update', () => { @@ -380,8 +573,6 @@ describe('Row Selection', () => { const hiddenText = wrapper.find('VisuallyHiddenText').at(1); expect(hiddenText.props().text).toBe('Terra.table.all-rows-unselected'); - - expect(wrapper).toMatchSnapshot(); }); it('verifies row selection all rows unselected single unselect', () => { @@ -404,8 +595,6 @@ describe('Row Selection', () => { const hiddenText = wrapper.find('VisuallyHiddenText').at(1); expect(hiddenText.props().text).toBe('Terra.table.all-rows-unselected'); - - expect(wrapper).toMatchSnapshot(); }); }); diff --git a/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap b/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap index b2002d3d760..fdc050aacb2 100644 --- a/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap +++ b/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap @@ -1,16425 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Row Selection verifies row selection all row selection single selction 1`] = ` - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
-
- - Vitals - -
- 		-
- - March 16 - -
- 		-
- - March 17 - -
-
-
- -
- 		-
- Heart Rate Monitored (bpm) -
- 		-
- - Terra.table.blank - -
- 		-
- - Terra.table.maskedCell - -
-
- - - - - - Terra.table.all-rows-selected - - - - - - - - -`; - -exports[`Row Selection verifies row selection all rows unselected single unselect 1`] = ` - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
-
- - Vitals - -
- 		-
- - March 16 - -
- 		-
- - March 17 - -
-
-
- -
- 		-
- Heart Rate Monitored (bpm) -
- 		-
- - Terra.table.blank - -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Temperature Oral (degC) -
- 		-
- 36.7 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Cardiac Index (L/min/m2) -
- 		-
- 2.25 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Oxygen Flow Rate (L/min) -
- 		-
- 63 -
- 		-
- 47 -
-
- - - - - - Terra.table.all-rows-unselected - - - - - - - - -`; - -exports[`Row Selection verifies row selection all rows unselected update 1`] = ` - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- -
-
-
-
- - Vitals - -
- 		-
- - March 16 - -
- 		-
- - March 17 - -
-
- - - - - - Terra.table.all-rows-unselected - - - - - - - - -`; - -exports[`Row Selection verifies row selection row selection update 1`] = ` - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
-
- - Vitals - -
- 		-
- - March 16 - -
- 		-
- - March 17 - -
-
-
- -
- 		-
- Heart Rate Monitored (bpm) -
- 		-
- - Terra.table.blank - -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Temperature Oral (degC) -
- 		-
- 36.7 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Cardiac Index (L/min/m2) -
- 		-
- 2.25 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Oxygen Flow Rate (L/min) -
- 		-
- 63 -
- 		-
- 47 -
-
- - - - - - Terra.table.row-selection-template - - - - - - - - - -`; - -exports[`Row Selection verifies row selection row unselected update 1`] = ` - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
-
- - Vitals - -
- 		-
- - March 16 - -
- 		-
- - March 17 - -
-
-
- -
- 		-
- Heart Rate Monitored (bpm) -
- 		-
- - Terra.table.blank - -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Temperature Oral (degC) -
- 		-
- 36.7 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Cardiac Index (L/min/m2) -
- 		-
- 2.25 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Oxygen Flow Rate (L/min) -
- 		-
- 63 -
- 		-
- 47 -
-
- - - - - - Terra.table.row-selection-cleared-template - - - - - - - - -`; - -exports[`Table verifies onCellSelect callback is triggered when space is pressed on a masked cell 1`] = ` -Array [ - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - Vitals - -
- 		-
- - March 16 - -
-
-
-
- - March 17 - -
-
- -
- Heart Rate Monitored (bpm) -
- - 		- -
- - Terra.table.blank - -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Temperature Oral (degC) -
- - 		- -
- 36.7 -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Cardiac Index (L/min/m2) -
- - 		- -
- 2.25 -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Oxygen Flow Rate (L/min) -
- - 		- -
- 63 -
- - 		- -
- 47 -
- -
- - - - - - Terra.table.row-selection-template - - - - - - - - , - ",", -] -`; - -exports[`Table verifies onCellSelect callback is triggered when space is pressed on a non-selectable cell 1`] = ` -Array [ - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - Vitals - -
- 		-
- - March 16 - -
-
-
-
- - March 17 - -
-
- -
- Heart Rate Monitored (bpm) -
- - 		- -
- - Terra.table.blank - -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Temperature Oral (degC) -
- - 		- -
- 36.7 -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Cardiac Index (L/min/m2) -
- - 		- -
- 2.25 -
- - 		- -
- - Terra.table.maskedCell - -
- -
- -
- Oxygen Flow Rate (L/min) -
- - 		- -
- 63 -
- - 		- -
- 47 -
- -
- - - - - - Terra.table.row-selection-template - - - - - - - - , - ",", -] -`; - -exports[`Table verifies row selection column header not selectable without callback 1`] = ` - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- 		-
- - Vitals - -
- 		-
- - March 16 - -
-
-
-
- - March 17 - -
-
-
- -
- 		-
- Heart Rate Monitored (bpm) -
- 		-
- - Terra.table.blank - -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Temperature Oral (degC) -
- 		-
- 36.7 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Cardiac Index (L/min/m2) -
- 		-
- 2.25 -
- 		-
- - Terra.table.maskedCell - -
-
-
- -
- 		-
- Oxygen Flow Rate (L/min) -
- 		-
- 63 -
- 		-
- 47 -
-
- - - - - - Terra.table.row-selection-template - - - - - - - - -`; - exports[`Table verifies row selection column header selection 1`] = ` `; - -exports[`Table verifies that the column widths are set properly in the colgroup 1`] = ` -
- - - - - - - - - - -
- - - -
-`; From bb76254e0aee92079a730e9d6010bca489fb7f44 Mon Sep 17 00:00:00 2001 From: Charles McDonald Date: Tue, 14 Nov 2023 11:26:39 -0600 Subject: [PATCH 2/3] Resolve Jest test issues. --- .../tests/jest/DataGrid.test.jsx | 2 +- .../jest/__snapshots__/DataGrid.test.jsx.snap | 490 ++-- .../WorklistDataGrid.test.jsx.snap | 2270 ++++++++--------- .../terra-table/src/subcomponents/Cell.jsx | 4 +- .../jest/__snapshots__/Cell.test.jsx.snap | 24 +- 5 files changed, 1395 insertions(+), 1395 deletions(-) diff --git a/packages/terra-data-grid/tests/jest/DataGrid.test.jsx b/packages/terra-data-grid/tests/jest/DataGrid.test.jsx index 752ce0cb3b6..f563579627f 100644 --- a/packages/terra-data-grid/tests/jest/DataGrid.test.jsx +++ b/packages/terra-data-grid/tests/jest/DataGrid.test.jsx @@ -96,7 +96,7 @@ describe('DataGrid', () => { expect(rowComponent.key).toEqual(data.id); expect(rowComponent.props.onCellSelect).toBeDefined(); expect(rowComponent.props.rowHeaderIndex).toEqual(0); - expect(rowComponent.props.rowIndex).toEqual(rowIndex + 1); + expect(rowComponent.props.rowIndex).toEqual(rowIndex + 2); expect(rowComponent.props.cells).toEqual(data.cells); }; diff --git a/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap b/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap index 273311850ca..4a42126b0a1 100644 --- a/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap +++ b/packages/terra-data-grid/tests/jest/__snapshots__/DataGrid.test.jsx.snap @@ -1470,7 +1470,7 @@ exports[`DataGrid verifies onCellSelect callback is triggered when space is pres }, ] } - sectionRowIndex={0} + sectionRowIndex={1} tableId="test-terra-data-grid-table" > { if (!isFocusTrapEnabled) { onCellSelect({ - sectionId, rowId, rowIndex, columnId, columnIndex, isShiftPressed: event.shiftKey, isCellSelectable: (!isMasked && isSelectable), + sectionId, rowId, rowIndex: (rowIndex - 1), columnId, columnIndex, isShiftPressed: event.shiftKey, isCellSelectable: (!isMasked && isSelectable), }); } }); @@ -238,7 +238,7 @@ function Cell(props) { case KeyCode.KEY_SPACE: if (onCellSelect) { onCellSelect({ - sectionId, rowId, rowIndex, columnId, columnIndex, isShiftPressed: event.shiftKey, isCellSelectable: (!isMasked && isSelectable), + sectionId, rowId, rowIndex: (rowIndex - 1), columnId, columnIndex, isShiftPressed: event.shiftKey, isCellSelectable: (!isMasked && isSelectable), }); } diff --git a/packages/terra-table/tests/jest/__snapshots__/Cell.test.jsx.snap b/packages/terra-table/tests/jest/__snapshots__/Cell.test.jsx.snap index 0cb3ff8a345..11e99708b00 100644 --- a/packages/terra-table/tests/jest/__snapshots__/Cell.test.jsx.snap +++ b/packages/terra-table/tests/jest/__snapshots__/Cell.test.jsx.snap @@ -56,7 +56,7 @@ exports[`Cell renders a pinned cell 1`] = ` > ) is created when isRowHeader prop is false 1`] = ` ) is created when isRowHeade exports[`Cell verifies that only a row header cell () is created when isRowHeader prop is true 1`] = ` ) is created when isRowH exports[`Cell verifies that the cell rendered is marked blank when the cell content is empty 1`] = ` Date: Wed, 15 Nov 2023 12:23:37 -0600 Subject: [PATCH 3/3] Resolve Jest snapshot merge issue --- .../terra-table/tests/jest/__snapshots__/Table.test.jsx.snap | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap b/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap index fdc050aacb2..3d4aea073b5 100644 --- a/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap +++ b/packages/terra-table/tests/jest/__snapshots__/Table.test.jsx.snap @@ -249,6 +249,7 @@ exports[`Table verifies row selection column header selection 1`] = ` aria-rowcount={5} className="table" id="test-terra-table" + onKeyDown={[Function]} role="table" >