[terra-table] Fix exception case for single row selection with collapsible sections

packages/terra-framework-docs/src/terra-dev-site/test/table/TableSingleRowSelectionAndCollapsibleSections.test.jsx

@@ -0,0 +1,156 @@
+import React, { useState, useCallback } from 'react';
+import Table from 'terra-table';
+
+const tableData = {
+  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',
+    isCollapsible: true,
+    isCollapsed: false,
+    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',
+    isCollapsible: true,
+    isCollapsed: false,
+    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' },
+        ],
+      },
+    ],
+  }],
+};
+
+const TableSingleRowSelectionAndCollapsibleSections = () => {
+  const rowHeaderIndex = 0;
+  const { cols } = tableData;
+  const [tableSections, setTableSections] = useState(tableData.sections);
+
+  const handleSectionSelect = (sectionId) => {
+    const newSections = [...tableSections];
+    const sectionIndex = newSections.findIndex(section => section.id === sectionId);
+
+    if (sectionIndex > -1) {
+      newSections[sectionIndex].isCollapsed = !newSections[sectionIndex].isCollapsed;
+    }
+
+    setTableSections(newSections);
+  };
+
+  // const onRowSelect = useCallback((rowSelection) => {
+  //   const { rowId } = rowSelection;
+
+  //   const newRowData = [...rowData];
+
+  //   const dataRowToUpdate = newRowData.find(row => row.id === rowId);
+
+  //   newRowData.forEach((row) => {
+  //     if (row.id !== dataRowToUpdate.id) {
+  //       // eslint-disable-next-line no-return-assign, no-param-reassign
+  //       row.isSelected = false;
+  //     }
+  //   });
+
+  //   dataRowToUpdate.isSelected = !dataRowToUpdate.isSelected;
+
+  //   setRowData(newRowData);
+  // }, [rowData]);
+
+  const onRowSelect = useCallback((rowSelection) => {
+    const { sectionId, rowId } = rowSelection;
+
+    const newSections = [...tableSections];
+    const currentSection = newSections.find(section => section.id === sectionId);
+
+    const currentSectionRows = [...currentSection.rows];
+    const dataRowToUpdate = currentSectionRows.find(row => row.id === rowId);
+
+    newSections.forEach((section) => {
+      const sectionRowData = [...section.rows];
+      sectionRowData.forEach((row) => {
+        if (row.id !== dataRowToUpdate.id) {
+          // eslint-disable-next-line no-return-assign, no-param-reassign
+          row.isSelected = false;
+        }
+      });
+
+      // eslint-disable-next-line no-param-reassign
+      section.rows = sectionRowData;
+    });
+
+    dataRowToUpdate.isSelected = !dataRowToUpdate.isSelected;
+    setTableSections(newSections);
+  }, [tableSections]);
+
+  return (
+    <Table
+      id="table-with-single-row-selection"
+      overflowColumns={cols}
+      sections={tableSections}
+      rowHeaderIndex={rowHeaderIndex}
+      columnWidth="180px"
+      ariaLabel="Table with Single Row Selection And Collapsible Sections"
+      rowSelectionMode="single" // Prop to turn row selection mode on/off
+      onRowSelect={onRowSelect} // For row selection, consumer must provide a callback that the Worklist Data Grid will call when the user selects one or more rows.
+      onSectionSelect={handleSectionSelect}
+    />
+  );
+};
+
+export default TableSingleRowSelectionAndCollapsibleSections;

packages/terra-menu/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Added
+  * Added test for `terra-table` to cover exception occurring with collapsible sections and single row select mode.
+
 ## 6.92.0 - (April 17, 2024)
 
 * Changed

packages/terra-table/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Fixed
+  * Fixed an exception case when using collapsible sections with single selection mode.
+
 ## 5.21.0 - (April 17, 2024)
 
 * Added

packages/terra-table/src/Table.jsx

@@ -419,15 +419,21 @@ function Table(props) {
       let selectionUpdateAriaMessage = '';
 
       if (rowSelectionsAdded.length === 1) {
-        const selectedRowLabel = tableRef.current.querySelector(`tr[data-row-id='${rowSelectionsAdded[0]}']`).getAttribute('aria-rowindex');
-        selectionUpdateAriaMessage = intl.formatMessage({ id: 'Terra.table.row-selection-template' }, { row: selectedRowLabel });
+        const selectedRowElement = tableRef.current.querySelector(`tr[data-row-id='${rowSelectionsAdded[0]}']`);
+        if (selectedRowElement) {
+          const selectedRowLabel = selectedRowElement.getAttribute('aria-rowindex');
+          selectionUpdateAriaMessage = intl.formatMessage({ id: 'Terra.table.row-selection-template' }, { row: selectedRowLabel });
+        }
       } else if (rowSelectionsAdded.length > 1) {
         selectionUpdateAriaMessage = intl.formatMessage({ id: 'Terra.table.multiple-rows-selected' }, { rowCount: rowSelectionsAdded.length });
       }
 
       if (rowSelectionsRemoved.length === 1) {
-        const unselectedRowLabel = tableRef.current.querySelector(`tr[data-row-id='${rowSelectionsRemoved[0]}']`).getAttribute('aria-rowindex');
-        selectionUpdateAriaMessage += intl.formatMessage({ id: 'Terra.table.row-selection-cleared-template' }, { row: unselectedRowLabel });
+        const unselectedRowElement = tableRef.current.querySelector(`tr[data-row-id='${rowSelectionsRemoved[0]}']`);
+        if (unselectedRowElement) {
+          const unselectedRowLabel = unselectedRowElement.getAttribute('aria-rowindex');
+          selectionUpdateAriaMessage += intl.formatMessage({ id: 'Terra.table.row-selection-cleared-template' }, { row: unselectedRowLabel });
+        }
       } else if (rowSelectionsRemoved.length > 1) {
         selectionUpdateAriaMessage += intl.formatMessage({ id: 'Terra.table.multiple-rows-unselected' }, { rowCount: rowSelectionsRemoved.length });
       }

packages/terra-table/tests/wdio/table-spec.js

@@ -294,6 +294,24 @@ Terra.describeViewports('Table', ['medium', 'large'], () => {
     });
   });
 
+  describe('With single row selection and collapsible sections', () => {
+    const rowSelectionTableSelector = '#table-with-single-row-selection';
+
+    beforeEach(() => {
+      browser.url('/raw/tests/cerner-terra-framework-docs/table/table-single-row-selection-and-collapsible-sections');
+    });
+
+    it('validates hovering over a selectable row', () => {
+      browser.$$('tbody tr')[1].$$('td')[0].click();
+
+      browser.$$('tbody tr')[0].$$('th button')[0].click();
+
+      browser.$$('tbody tr')[3].$$('td')[0].click();
+
+      Terra.validates.element('row-single-selection-with-collapsible-sections', { selector: rowSelectionTableSelector });
+    });
+  });
+
   describe('Table with Large Text Data', () => {
     beforeEach(() => {
       browser.url('/raw/tests/cerner-terra-framework-docs/table/table-with-large-data');