@carbon/ibm-products 1.32.1 → 1.33.0

package/es/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -24,7 +24,7 @@ import { usePreviousValue } from '../../../../../../global/js/hooks';
 import { prepareProps } from '../../../../../../global/js/utils/props-helper';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var InlineEditCell = function InlineEditCell(_ref) {
-  var _cx3;
+  var _config$validator, _cx3;
 
   var cell = _ref.cell,
       config = _ref.config,
@@ -89,7 +89,24 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       return item.id === columnId;
     });
     setCellLabel(typeof columnLabel.Header === 'string' ? columnLabel.Header : 'Inline edit cell label'); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []); // If you are in edit mode and click outside of the cell,
+  }, []); // Reverts cellValue back to initialValue when exiting edit mode via clicking outside
+  // of the cell (either on a regular cell or clicking into another inline edit cell) and the
+  // edit input is in an invalid state
+
+  useEffect(function () {
+    if ((previousState === null || previousState === void 0 ? void 0 : previousState.editId) === cellId && !editId || (previousState === null || previousState === void 0 ? void 0 : previousState.editId) === cellId && cellId !== editId) {
+      var _ref3 = config || {},
+          validator = _ref3.validator;
+
+      var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
+
+      if (isInvalid) {
+        setCellValue(initialValue);
+        saveCellData(initialValue);
+        return;
+      }
+    }
+  }, [previousState === null || previousState === void 0 ? void 0 : previousState.editId, editId, cellId, cellValue, config, initialValue, saveCellData]); // If you are in edit mode and click outside of the cell,
   // this changes the cell back to the InlineEditButton
 
   useEffect(function () {
@@ -201,6 +218,16 @@ export var InlineEditCell = function InlineEditCell(_ref) {
               return;
             }
 
+            var _ref4 = config || {},
+                validator = _ref4.validator;
+
+            var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue); // If an invalid state is detected, Tab/Enter should not do anything
+            // until the input has a valid state once again
+
+            if (isInvalid) {
+              return;
+            }
+
             var newCellId = getNewCellId(key);
             saveCellData(cellValue);
             setInitialValue(cellValue);
@@ -251,8 +278,8 @@ export var InlineEditCell = function InlineEditCell(_ref) {
   };
 
   var renderSelectCell = function renderSelectCell() {
-    var _ref3 = config || {},
-        inputProps = _ref3.inputProps;
+    var _ref5 = config || {},
+        inputProps = _ref5.inputProps;
 
     return /*#__PURE__*/React.createElement(Dropdown, _extends({
       id: cellId,
@@ -288,8 +315,8 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       },
       downshiftProps: {
         onStateChange: function onStateChange(downshiftState) {
-          var _ref4 = downshiftState || {},
-              isOpen = _ref4.isOpen; // !isOpen does not work in this case because a state change occurs on hover of the
+          var _ref6 = downshiftState || {},
+              isOpen = _ref6.isOpen; // !isOpen does not work in this case because a state change occurs on hover of the
           // menu items and isOpen is changed to undefined which causes dispatch to be called unexpectedly
 
 
@@ -390,6 +417,55 @@ export var InlineEditCell = function InlineEditCell(_ref) {
     return null;
   };
 
+  var renderNumberInput = function renderNumberInput() {
+    var _ref7 = config || {},
+        validator = _ref7.validator;
+
+    return /*#__PURE__*/React.createElement(NumberInput, _extends({
+      placeholder: placeholder,
+      label: cellLabel
+    }, inputProps, {
+      id: cellId,
+      hideLabel: true,
+      defaultValue: cellValue,
+      invalid: validator === null || validator === void 0 ? void 0 : validator(cellValue),
+      invalidText: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.invalidText) || 'Provide missing invalidText',
+      onChange: function onChange(event) {
+        setCellValue(event.imaginaryTarget.value);
+
+        if (inputProps.onChange) {
+          inputProps.onChange(event.imaginaryTarget.value);
+        }
+      },
+      ref: numberInputRef
+    }));
+  };
+
+  var renderTextInput = function renderTextInput() {
+    var _ref8 = config || {},
+        validator = _ref8.validator;
+
+    var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
+    return /*#__PURE__*/React.createElement(TextInput, _extends({
+      labelText: cellLabel,
+      placeholder: placeholder
+    }, inputProps, {
+      id: cellId,
+      hideLabel: true,
+      defaultValue: cellValue,
+      invalid: isInvalid,
+      invalidText: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.invalidText) || 'Provide missing invalidText',
+      onChange: function onChange(event) {
+        setCellValue(event.target.value);
+
+        if (inputProps.onChange) {
+          inputProps.onChange(event.target.value);
+        }
+      },
+      ref: textInputRef
+    }));
+  };
+
   return (
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
@@ -402,7 +478,7 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       "data-inline-type": type,
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
-      className: cx("".concat(blockClass, "__inline-edit--outer-cell-button"), (_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), _defineProperty(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), _cx3))
+      className: cx("".concat(blockClass, "__inline-edit--outer-cell-button"), (_cx3 = {}, _defineProperty(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), _defineProperty(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), _defineProperty(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), config === null || config === void 0 ? void 0 : (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue)), _cx3))
     }, !inEditMode && /*#__PURE__*/React.createElement(InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
@@ -415,37 +491,7 @@ export var InlineEditCell = function InlineEditCell(_ref) {
       totalInlineEditColumns: totalInlineEditColumns,
       totalColumns: totalColumns,
       type: type
-    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React.createElement(React.Fragment, null, type === 'text' && /*#__PURE__*/React.createElement(TextInput, _extends({
-      labelText: cellLabel,
-      placeholder: placeholder
-    }, inputProps, {
-      id: cellId,
-      hideLabel: true,
-      defaultValue: cellValue,
-      onChange: function onChange(event) {
-        setCellValue(event.target.value);
-
-        if (inputProps.onChange) {
-          inputProps.onChange(event.target.value);
-        }
-      },
-      ref: textInputRef
-    })), type === 'number' && /*#__PURE__*/React.createElement(NumberInput, _extends({
-      placeholder: placeholder,
-      label: cellLabel
-    }, inputProps, {
-      id: cellId,
-      hideLabel: true,
-      defaultValue: cellValue,
-      onChange: function onChange(event) {
-        setCellValue(event.imaginaryTarget.value);
-
-        if (inputProps.onChange) {
-          inputProps.onChange(event.imaginaryTarget.value);
-        }
-      },
-      ref: numberInputRef
-    })), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
+    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/React.createElement(React.Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
 };
 InlineEditCell.propTypes = {

package/es/components/Datagrid/Datagrid/addons/InlineEdit/handleGridKeyPress.js

@@ -35,11 +35,11 @@ export var handleGridKeyPress = function handleGridKeyPress(_ref) {
         type: 'EXIT_EDIT_MODE',
         payload: activeCellId
       });
+      var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
+      inlineEditArea.focus();
     }
 
     event.preventDefault();
-    var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
-    inlineEditArea.focus();
     return;
   }
 

package/es/components/Datagrid/Datagrid/addons/InlineEdit/handleMultipleKeys.js

@@ -6,6 +6,7 @@
  */
 import { includesResourceKey } from '../../../../DataSpreadsheet/utils/handleMultipleKeys';
 import { pkg } from '../../../../../settings';
+import { getFocusableElements } from '../../../../../global/js/utils/getFocusableElements';
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 export var handleMultipleKeys = function handleMultipleKeys(_ref) {
   var usingMac = _ref.usingMac,
@@ -62,5 +63,25 @@ export var handleMultipleKeys = function handleMultipleKeys(_ref) {
         });
       }, 250);
     }
+  } // Shift + Tab
+  // This should remove the active grid state
+
+
+  if ((keysPressedList.includes('ShiftLeft') || keysPressedList.includes('ShiftRight')) && keysPressedList.includes('Tab')) {
+    dispatch({
+      type: 'REMOVE_GRID_ACTIVE_FOCUS',
+      payload: activeCellId
+    });
+    var tableElement = document.querySelector("#".concat(instance.tableId));
+    var datagridFocusableElements = getFocusableElements(tableElement);
+    var indexOfTable = datagridFocusableElements.findIndex(function (item) {
+      return item instanceof HTMLTableElement;
+    });
+
+    if (indexOfTable && Number.isFinite(indexOfTable)) {
+      var _datagridFocusableEle;
+
+      (_datagridFocusableEle = datagridFocusableElements[indexOfTable]) === null || _datagridFocusableEle === void 0 ? void 0 : _datagridFocusableEle.focus();
+    }
   }
 };

package/es/components/Datagrid/utils/getInlineEditColumns.js

@@ -31,25 +31,43 @@ export var getInlineEditColumns = function getInlineEditColumns() {
     accessor: 'firstName',
     inlineEdit: {
       type: 'text',
-      inputProps: {} // These props are passed to the Carbon component used for inline editing
-
+      // required for including validation, this is used to set the invalid prop internally
+      validator: function validator(n) {
+        return n.length >= 40;
+      },
+      // These props are passed to the Carbon component used for inline editing
+      inputProps: {
+        invalidText: 'Invalid text, character count must be less than 40'
+      }
     }
   }, {
     Header: 'Last Name',
     accessor: 'lastName',
     inlineEdit: {
       type: 'text',
-      inputProps: {} // These props are passed to the Carbon component used for inline editing
-
+      // required for including validation, this is used to set the invalid prop internally
+      validator: function validator(n) {
+        return n.length >= 40;
+      },
+      // These props are passed to the Carbon component used for inline editing
+      inputProps: {
+        invalidText: 'Invalid text, character count must be less than 40'
+      }
     }
   }, {
     Header: 'Age',
     accessor: 'age',
     width: 120,
     inlineEdit: {
+      // required for including validation, this is used to set the invalid prop internally
+      validator: function validator(n) {
+        return n && n < 18;
+      },
       type: 'number',
-      inputProps: {} // These props are passed to the Carbon component used for inline editing
-
+      // These props are passed to the Carbon component used for inline editing
+      inputProps: {
+        invalidText: 'Invalid number, must be 18 or greater'
+      }
     }
   }, {
     Header: 'Visits',
@@ -86,7 +104,7 @@ export var getInlineEditColumns = function getInlineEditColumns() {
         // These props are passed to the Carbon component used for inline editing
         items: inlineEditSelectItems,
         onChange: function onChange(item) {
-          return console.log(item);
+          console.log(item);
         }
       }
     }

package/es/components/Datagrid/utils/makeData.js

@@ -65,6 +65,14 @@ var renderStatusIcon = function renderStatusIcon(statusChance) {
   return /*#__PURE__*/React.createElement(StatusIcon, iconProps);
 };
 
+var renderDocLink = function renderDocLink(statusChance) {
+  var docLinkObj = {
+    href: statusChance > 0.66 ? 'http://carbondesignsystem.com/' : statusChance > 0.33 ? 'https://pages.github.ibm.com/cdai-design/pal/' : 'http://carbon-for-ibm-products.netlify.app/',
+    text: statusChance > 0.66 ? 'Carbon Design System' : statusChance > 0.33 ? 'Carbon for IBM Products PAL' : 'Carbon for IBM Products storybook'
+  };
+  return docLinkObj;
+};
+
 var newPerson = function newPerson() {
   var statusChance = Math.random();
   var initialChartTypeIndex = getRandomInteger(0, 2);
@@ -169,7 +177,8 @@ var newPerson = function newPerson() {
     chartType: initialChartTypeIndex === 0 ? inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? inlineEditSelectItems[1] : inlineEditSelectItems[2],
     activeSince: statusChance > 0.66 ? activeSinceDate : statusChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
     bonus: "$\r".concat(getRandomInteger(100, 500, 2)),
-    status_icon: renderStatusIcon(statusChance)
+    status_icon: renderStatusIcon(statusChance),
+    doc_link: renderDocLink(statusChance)
   };
 };
 

package/lib/components/CreateTearsheetNarrow/CreateTearsheetNarrow.js

@@ -124,9 +124,9 @@ CreateTearsheetNarrow.propTypes = {
   formDescription: _propTypes.default.node,
 
   /**
-   * Specifies a required field that provides a title for a form
+   * Specifies an optional field that provides a title for a form
    */
-  formTitle: _propTypes.default.node.isRequired,
+  formTitle: _propTypes.default.node,
 
   /**
    * A label for the tearsheet, displayed in the header area of the tearsheet

package/lib/components/DataSpreadsheet/hooks/useMultipleKeyTracking.js

@@ -49,7 +49,8 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
 
   var previousState = (0, _hooks.usePreviousValue)({
     isEditing: isEditing,
-    windowFocused: windowFocused
+    windowFocused: windowFocused,
+    containerHasFocus: containerHasFocus
   }); // useEffect to check for window focus, if window loses focus
   // we need to clear out the keysPressedList
 
@@ -136,11 +137,11 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
       ref.current.onkeydown = undefined;
       ref.current.onkeyup = undefined;
 
-      if (!(previousState !== null && previousState !== void 0 && previousState.isEditing) && isEditing) {
+      if (!(previousState !== null && previousState !== void 0 && previousState.isEditing) && isEditing || previousState !== null && previousState !== void 0 && previousState.containerHasFocus && !containerHasFocus) {
         setKeysPressedList([]);
       }
     }
-  }, [keysPressedList, containerHasFocus, ref, isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing, windowFocused, previousState === null || previousState === void 0 ? void 0 : previousState.windowFocused, usingMac]);
+  }, [keysPressedList, containerHasFocus, ref, isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.isEditing, previousState === null || previousState === void 0 ? void 0 : previousState.containerHasFocus, windowFocused, previousState === null || previousState === void 0 ? void 0 : previousState.windowFocused, usingMac]);
   return {
     keysPressedList: keysPressedList,
     windowFocused: windowFocused,

package/lib/components/Datagrid/Datagrid/DatagridContent.js

@@ -21,6 +21,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _carbonComponentsReact = require("carbon-components-react");
 
+var _layout = require("@carbon/layout");
+
 var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
 
 var _DatagridBody = _interopRequireDefault(require("./DatagridBody"));
@@ -48,6 +50,8 @@ var TableContainer = _carbonComponentsReact.DataTable.TableContainer,
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var DatagridContent = function DatagridContent(_ref) {
+  var _cx4;
+
   var datagridState = _ref.datagridState;
 
   var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
@@ -69,7 +73,10 @@ var DatagridContent = function DatagridContent(_ref) {
       gridTitle = datagridState.gridTitle,
       gridDescription = datagridState.gridDescription,
       useDenseHeader = datagridState.useDenseHeader,
-      withInlineEdit = datagridState.withInlineEdit;
+      withInlineEdit = datagridState.withInlineEdit,
+      tableId = datagridState.tableId,
+      DatagridActions = datagridState.DatagridActions,
+      totalColumnsWidth = datagridState.totalColumnsWidth;
   var rows = DatagridPagination && datagridState.page || datagridState.rows;
   var gridActive = state.gridActive,
       editId = state.editId;
@@ -124,10 +131,24 @@ var DatagridContent = function DatagridContent(_ref) {
     isEditing: !!editId
   }),
       keysPressedList = _useMultipleKeyTracki.keysPressedList,
-      usingMac = _useMultipleKeyTracki.usingMac;
+      usingMac = _useMultipleKeyTracki.usingMac; // Provides a width for the region outline for useInlineEdit
+
 
+  (0, _react.useEffect)(function () {
+    if (!withInlineEdit) {
+      return;
+    }
+
+    var gridElement = document.querySelector("#".concat(tableId));
+    var tableHeader = document.querySelector(".".concat(_settings.carbon.prefix, "--data-table-header"));
+    gridElement.style.setProperty("--".concat(blockClass, "--grid-width"), (0, _layout.px)(totalColumnsWidth + 32));
+
+    if (gridActive) {
+      gridElement.style.setProperty("--".concat(blockClass, "--grid-header-height"), (0, _layout.px)((tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.clientHeight) || 0));
+    }
+  }, [withInlineEdit, tableId, totalColumnsWidth, datagridState, gridActive]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TableContainer, {
-    className: (0, _classnames.default)("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : ''),
+    className: (0, _classnames.default)("".concat(blockClass, "__grid-container"), withVirtualScroll || fullHeightDatagrid ? "".concat(blockClass, "__full-height") : '', DatagridPagination ? "".concat(blockClass, "__with-pagination") : '', useDenseHeader ? "".concat(blockClass, "__dense-header") : '', (_cx4 = {}, (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-grid-active"), gridActive), (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-inline-edit"), withInlineEdit), (0, _defineProperty2.default)(_cx4, "".concat(blockClass, "__grid-container-grid-active--without-toolbar"), withInlineEdit && !DatagridActions), _cx4)),
     title: gridTitle,
     description: gridDescription
   }, /*#__PURE__*/_react.default.createElement(_DatagridToolbar.default, datagridState), /*#__PURE__*/_react.default.createElement("div", {
@@ -147,6 +168,7 @@ DatagridContent.propTypes = {
   datagridState: _propTypes.default.shape({
     getTableProps: _propTypes.default.func,
     withVirtualScroll: _propTypes.default.bool,
+    DatagridActions: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
     DatagridPagination: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
     CustomizeColumnsModal: _propTypes.default.element,
     isFetching: _propTypes.default.bool,
@@ -159,6 +181,8 @@ DatagridContent.propTypes = {
     gridTitle: _propTypes.default.node,
     gridDescription: _propTypes.default.node,
     page: _propTypes.default.arrayOf(_propTypes.default.object),
-    rows: _propTypes.default.arrayOf(_propTypes.default.object)
+    rows: _propTypes.default.arrayOf(_propTypes.default.object),
+    tableId: _propTypes.default.string,
+    totalColumnsWidth: _propTypes.default.number
   })
 };

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -46,7 +46,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var InlineEditCell = function InlineEditCell(_ref) {
-  var _cx3;
+  var _config$validator, _cx3;
 
   var cell = _ref.cell,
       config = _ref.config,
@@ -111,7 +111,24 @@ var InlineEditCell = function InlineEditCell(_ref) {
       return item.id === columnId;
     });
     setCellLabel(typeof columnLabel.Header === 'string' ? columnLabel.Header : 'Inline edit cell label'); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []); // If you are in edit mode and click outside of the cell,
+  }, []); // Reverts cellValue back to initialValue when exiting edit mode via clicking outside
+  // of the cell (either on a regular cell or clicking into another inline edit cell) and the
+  // edit input is in an invalid state
+
+  (0, _react.useEffect)(function () {
+    if ((previousState === null || previousState === void 0 ? void 0 : previousState.editId) === cellId && !editId || (previousState === null || previousState === void 0 ? void 0 : previousState.editId) === cellId && cellId !== editId) {
+      var _ref3 = config || {},
+          validator = _ref3.validator;
+
+      var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
+
+      if (isInvalid) {
+        setCellValue(initialValue);
+        saveCellData(initialValue);
+        return;
+      }
+    }
+  }, [previousState === null || previousState === void 0 ? void 0 : previousState.editId, editId, cellId, cellValue, config, initialValue, saveCellData]); // If you are in edit mode and click outside of the cell,
   // this changes the cell back to the InlineEditButton
 
   (0, _react.useEffect)(function () {
@@ -223,6 +240,16 @@ var InlineEditCell = function InlineEditCell(_ref) {
               return;
             }
 
+            var _ref4 = config || {},
+                validator = _ref4.validator;
+
+            var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue); // If an invalid state is detected, Tab/Enter should not do anything
+            // until the input has a valid state once again
+
+            if (isInvalid) {
+              return;
+            }
+
             var newCellId = getNewCellId(key);
             saveCellData(cellValue);
             setInitialValue(cellValue);
@@ -273,8 +300,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
   };
 
   var renderSelectCell = function renderSelectCell() {
-    var _ref3 = config || {},
-        inputProps = _ref3.inputProps;
+    var _ref5 = config || {},
+        inputProps = _ref5.inputProps;
 
     return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Dropdown, (0, _extends2.default)({
       id: cellId,
@@ -310,8 +337,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
       },
       downshiftProps: {
         onStateChange: function onStateChange(downshiftState) {
-          var _ref4 = downshiftState || {},
-              isOpen = _ref4.isOpen; // !isOpen does not work in this case because a state change occurs on hover of the
+          var _ref6 = downshiftState || {},
+              isOpen = _ref6.isOpen; // !isOpen does not work in this case because a state change occurs on hover of the
           // menu items and isOpen is changed to undefined which causes dispatch to be called unexpectedly
 
 
@@ -412,6 +439,55 @@ var InlineEditCell = function InlineEditCell(_ref) {
     return null;
   };
 
+  var renderNumberInput = function renderNumberInput() {
+    var _ref7 = config || {},
+        validator = _ref7.validator;
+
+    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.NumberInput, (0, _extends2.default)({
+      placeholder: placeholder,
+      label: cellLabel
+    }, inputProps, {
+      id: cellId,
+      hideLabel: true,
+      defaultValue: cellValue,
+      invalid: validator === null || validator === void 0 ? void 0 : validator(cellValue),
+      invalidText: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.invalidText) || 'Provide missing invalidText',
+      onChange: function onChange(event) {
+        setCellValue(event.imaginaryTarget.value);
+
+        if (inputProps.onChange) {
+          inputProps.onChange(event.imaginaryTarget.value);
+        }
+      },
+      ref: numberInputRef
+    }));
+  };
+
+  var renderTextInput = function renderTextInput() {
+    var _ref8 = config || {},
+        validator = _ref8.validator;
+
+    var isInvalid = validator === null || validator === void 0 ? void 0 : validator(cellValue);
+    return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, (0, _extends2.default)({
+      labelText: cellLabel,
+      placeholder: placeholder
+    }, inputProps, {
+      id: cellId,
+      hideLabel: true,
+      defaultValue: cellValue,
+      invalid: isInvalid,
+      invalidText: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.invalidText) || 'Provide missing invalidText',
+      onChange: function onChange(event) {
+        setCellValue(event.target.value);
+
+        if (inputProps.onChange) {
+          inputProps.onChange(event.target.value);
+        }
+      },
+      ref: textInputRef
+    }));
+  };
+
   return (
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
@@ -424,7 +500,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       "data-inline-type": type,
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
-      className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--outer-cell-button"), (_cx3 = {}, (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), _cx3))
+      className: (0, _classnames.default)("".concat(blockClass, "__inline-edit--outer-cell-button"), (_cx3 = {}, (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), (0, _defineProperty2.default)(_cx3, "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), config === null || config === void 0 ? void 0 : (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue)), _cx3))
     }, !inEditMode && /*#__PURE__*/_react.default.createElement(_InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
@@ -437,37 +513,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       totalInlineEditColumns: totalInlineEditColumns,
       totalColumns: totalColumns,
       type: type
-    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, type === 'text' && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TextInput, (0, _extends2.default)({
-      labelText: cellLabel,
-      placeholder: placeholder
-    }, inputProps, {
-      id: cellId,
-      hideLabel: true,
-      defaultValue: cellValue,
-      onChange: function onChange(event) {
-        setCellValue(event.target.value);
-
-        if (inputProps.onChange) {
-          inputProps.onChange(event.target.value);
-        }
-      },
-      ref: textInputRef
-    })), type === 'number' && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.NumberInput, (0, _extends2.default)({
-      placeholder: placeholder,
-      label: cellLabel
-    }, inputProps, {
-      id: cellId,
-      hideLabel: true,
-      defaultValue: cellValue,
-      onChange: function onChange(event) {
-        setCellValue(event.imaginaryTarget.value);
-
-        if (inputProps.onChange) {
-          inputProps.onChange(event.imaginaryTarget.value);
-        }
-      },
-      ref: numberInputRef
-    })), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
+    }), !nonEditCell && inEditMode && cellId === activeCellId && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, type === 'text' && renderTextInput(), type === 'number' && renderNumberInput(), type === 'selection' && renderSelectCell(), type === 'date' && renderDateCell()))
   );
 };
 

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/handleGridKeyPress.js

@@ -42,11 +42,11 @@ var handleGridKeyPress = function handleGridKeyPress(_ref) {
         type: 'EXIT_EDIT_MODE',
         payload: activeCellId
       });
+      var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
+      inlineEditArea.focus();
     }
 
     event.preventDefault();
-    var inlineEditArea = document.querySelector("#".concat(instance.tableId, " .").concat(blockClass, "__table-with-inline-edit"));
-    inlineEditArea.focus();
     return;
   }
 

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/handleMultipleKeys.js

@@ -9,6 +9,8 @@ var _handleMultipleKeys = require("../../../../DataSpreadsheet/utils/handleMulti
 
 var _settings = require("../../../../../settings");
 
+var _getFocusableElements = require("../../../../../global/js/utils/getFocusableElements");
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -72,6 +74,26 @@ var handleMultipleKeys = function handleMultipleKeys(_ref) {
         });
       }, 250);
     }
+  } // Shift + Tab
+  // This should remove the active grid state
+
+
+  if ((keysPressedList.includes('ShiftLeft') || keysPressedList.includes('ShiftRight')) && keysPressedList.includes('Tab')) {
+    dispatch({
+      type: 'REMOVE_GRID_ACTIVE_FOCUS',
+      payload: activeCellId
+    });
+    var tableElement = document.querySelector("#".concat(instance.tableId));
+    var datagridFocusableElements = (0, _getFocusableElements.getFocusableElements)(tableElement);
+    var indexOfTable = datagridFocusableElements.findIndex(function (item) {
+      return item instanceof HTMLTableElement;
+    });
+
+    if (indexOfTable && Number.isFinite(indexOfTable)) {
+      var _datagridFocusableEle;
+
+      (_datagridFocusableEle = datagridFocusableElements[indexOfTable]) === null || _datagridFocusableEle === void 0 ? void 0 : _datagridFocusableEle.focus();
+    }
   }
 };