Merge remote-tracking branch 'origin' into table-single-row-select

packages/terra-data-grid/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+Changed
+  * Updated Table component to use new `rowSelectionMode` prop instead of `hasSelectableRows`.
+
+## 1.2.0 - (November 20, 2023)
+
 * Fixed
   * Fixed issue where focus was given to the column header instead of its button element.
   * Fixed issue where row selection was being announced twice in Worklist Data Grid.
@@ -10,9 +15,8 @@
   * Added `hasVisibleColumnHeaders` prop for FlowsheetDataGrid to toggle visibility of column headers.
   * Added section support to FlowsheetDataGrid.
 
-Changed
-  * Updated all columns and cells to be selectable in FlowsheetDataGrid, as `isSelectable` prop is not supported for columns or cells.
-  * Updated Table component to use new `rowSelectionMode` prop instead of `hasSelectableRows`.
+* Changed
+  * Updated all cells to be selectable and columns unselectable in FlowsheetDataGrid, as `isSelectable` prop is not supported for columns or cells.
 
 ## 1.1.0 - (November 9, 2023)
 

packages/terra-data-grid/package.json

@@ -1,7 +1,7 @@
 {
   "name": "terra-data-grid",
   "main": "lib/index.js",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Package containing data grid container components that enable users to navigate the grid information using directional navigation keys.",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
     "classnames": "^2.2.5",
     "keycode-js": "^3.1.0",
     "prop-types": "^15.5.8",
-    "terra-table": "^5.1.1-alpha.1",
+    "terra-table": "^5.1.1-alpha.2",
     "terra-visually-hidden-text": "^2.36.0"
   },
   "devDependencies": {

packages/terra-data-grid/src/FlowsheetDataGrid.jsx

@@ -131,7 +131,7 @@ function FlowsheetDataGrid(props) {
   const inShiftDirectionalMode = useRef(false);
   const flowsheetColumns = useMemo(() => columns.map(column => ({
     ...column,
-    isSelectable: true,
+    isSelectable: false,
     isResizable: false,
   })), [columns]);
 

packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx

@@ -54,7 +54,7 @@ const dataFile = {
 };
 
 describe('FlowsheetDataGrid', () => {
-  it('renders the row header column as pinned and remaining columns as overflow, all columns as not resizable and all columns and row cells as selectable', () => {
+  it('renders the row header column as pinned and remaining columns as overflow, all columns as not resizable or selectable and all row cells as selectable', () => {
     const wrapper = shallowWithIntl(
       <FlowsheetDataGrid
         id="test-terra-flowsheet-data-grid"
@@ -69,7 +69,7 @@ describe('FlowsheetDataGrid', () => {
         displayName: 'Vitals',
         id: 'Column-0',
         isResizable: false,
-        isSelectable: true,
+        isSelectable: false,
       },
     ];
 
@@ -78,13 +78,13 @@ describe('FlowsheetDataGrid', () => {
         displayName: 'March 16',
         id: 'Column-1',
         isResizable: false,
-        isSelectable: true,
+        isSelectable: false,
       },
       {
         displayName: 'March 17',
         id: 'Column-2',
         isResizable: false,
-        isSelectable: true,
+        isSelectable: false,
       },
     ];
 

packages/terra-data-grid/tests/jest/__snapshots__/FlowsheetDataGrid.test.jsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FlowsheetDataGrid renders the row header column as pinned and remaining columns as overflow, all columns as not resizable and all columns and row cells as selectable 1`] = `
+exports[`FlowsheetDataGrid renders the row header column as pinned and remaining columns as overflow, all columns as not resizable or selectable and all row cells as selectable 1`] = `
 <div
   className="flowsheet-data-grid-container"
   onKeyUp={[Function]}
@@ -19,13 +19,13 @@ exports[`FlowsheetDataGrid renders the row header column as pinned and remaining
           "displayName": "March 16",
           "id": "Column-1",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
         Object {
           "displayName": "March 17",
           "id": "Column-2",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
       ]
     }
@@ -35,7 +35,7 @@ exports[`FlowsheetDataGrid renders the row header column as pinned and remaining
           "displayName": "Vitals",
           "id": "Column-0",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
       ]
     }
@@ -141,13 +141,13 @@ exports[`FlowsheetDataGrid replaces non-header empty, null, or "--" cell content
           "displayName": "March 16",
           "id": "Column-1",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
         Object {
           "displayName": "March 17",
           "id": "Column-2",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
       ]
     }
@@ -157,7 +157,7 @@ exports[`FlowsheetDataGrid replaces non-header empty, null, or "--" cell content
           "displayName": "Vitals",
           "id": "Column-0",
           "isResizable": false,
-          "isSelectable": true,
+          "isSelectable": false,
         },
       ]
     }

packages/terra-data-grid/tests/wdio/flowsheet-data-grid-spec.js

@@ -38,9 +38,8 @@ Terra.describeViewports('FlowsheetDataGrid', ['medium', 'large'], () => {
       });
 
       it('renders a default flowsheet data grid', () => {
-        browser.$$('thead tr')[0].$$('th')[0].moveTo(); // Explicitly hover over the first column to generate consistent screenshots.
         browser.keys(['Tab']); // Cell 0,0 gets focus
-        expect(browser.$('tr.column-header-row th:nth-child(1) div[role=button]').isFocused()).toBe(true);
+        expect(browser.$('tr.column-header-row th:nth-child(1)').isFocused()).toBe(true);
         Terra.validates.element('default-flowsheet-data-grid', { selector: defaultSelector });
       });
     });
@@ -141,7 +140,7 @@ Terra.describeViewports('FlowsheetDataGrid', ['medium', 'large'], () => {
       moveCurrentPositionBy(-3, 0);
       releaseShiftKey();
 
-      expect(browser.$('tr.column-header-row th:nth-child(2) div[role=button]').isFocused()).toBe(true);
+      expect(browser.$('tr.column-header-row th:nth-child(2)').isFocused()).toBe(true);
       Terra.validates.element('selection-arrows-range-3-1-to-1-1-focus-0-1', { selector: defaultSelector });
     });
 

packages/terra-framework-docs/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.45.0 - (November 20, 2023)
+
 * Added
   * Added example to `terra-table` to show column states and sorting;
   * Added new test for Terra Slider component for long field labels.

packages/terra-framework-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerner/terra-framework-docs",
-  "version": "1.44.0",
+  "version": "1.45.0",
   "description": "Contains documentation for packages in the terra-framework monorepo",
   "main": "index.js",
   "publishConfig": {
@@ -44,7 +44,7 @@
     "terra-collapsible-menu-view": "^6.84.0",
     "terra-compact-interactive-list": "^0.1.0",
     "terra-content-container": "^3.0.0",
-    "terra-data-grid": "^1.1.0",
+    "terra-data-grid": "^1.2.0",
     "terra-date-input": "^1.46.0",
     "terra-date-picker": "^4.93.0",
     "terra-date-time-picker": "^4.99.0",
@@ -72,9 +72,9 @@
     "terra-slide-group": "^4.33.0",
     "terra-slide-panel": "^3.46.0",
     "terra-slide-panel-manager": "^5.84.0",
-    "terra-slider": "^1.1.0",
+    "terra-slider": "^1.1.1",
     "terra-spacer": "^3.59.0",
-    "terra-table": "^5.1.1-alpha.1",
+    "terra-table": "^5.1.1-alpha.2",
     "terra-tabs": "^7.11.2",
     "terra-text": "^4.49.0",
     "terra-theme-context": "^1.8.0",

packages/terra-slider/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## Unreleased
+
+## 1.1.1 - (November 20, 2023)
+
 * Fix
   * Fixed wrapping issue for min/max labels on slider.
 

packages/terra-slider/package.json

@@ -1,7 +1,7 @@
 {
   "name": "terra-slider",
   "main": "lib/Slider.js",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Terra Slider component provides users a way to select a value from a given range by sliding a thumb along a bar to track the value.",
   "repository": {
     "type": "git",

packages/terra-table/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.1.1-alpha.2 - (November 20, 2023)
+
 * Breaking Changes
   * Renamed `hasColumnHeaders` prop to `hasVisibleColumnHeaders`.
   * Renamed `hasSelectableRows` prop to `rowSelectionMode` with an enumeration.

packages/terra-table/package.json

@@ -1,7 +1,7 @@
 {
   "name": "terra-table",
   "main": "lib/index.js",
-  "version": "5.1.1-alpha.1",
+  "version": "5.1.1-alpha.2",
   "description": "The Terra Table component provides user a way to display data in an accessible table format.",
   "repository": {
     "type": "git",