@carbon/ibm-products 1.32.0 → 1.33.0

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
 
@@ -80,7 +81,7 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
     };
   }, []);
   (0, _react.useEffect)(function () {
-    if (containerHasFocus && !isEditing) {
+    if (ref && containerHasFocus && !isEditing) {
       ref.current.onkeydown = ref.current.onkeyup = function (event) {
         // If keydown, we will add the new key to the keysPressedList array
         if (event.type === 'keydown') {
@@ -132,15 +133,15 @@ var useMultipleKeyTracking = function useMultipleKeyTracking(_ref) {
     // or is currently in edit mode
 
 
-    if (!containerHasFocus || isEditing) {
+    if (ref && !containerHasFocus || isEditing) {
       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,7 +50,7 @@ var TableContainer = _carbonComponentsReact.DataTable.TableContainer,
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 
 var DatagridContent = function DatagridContent(_ref) {
-  var _getTableProps;
+  var _cx4;
 
   var datagridState = _ref.datagridState;
 
@@ -71,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;
@@ -85,7 +90,7 @@ var DatagridContent = function DatagridContent(_ref) {
     // and swapped out with an input, i.e. text, number, selection, or date picker
 
 
-    if (target.closest(".".concat(blockClass, "__inline-edit-button")) || target.closest(".".concat(blockClass, "__inline-edit--select"))) {
+    if (target.closest(".".concat(blockClass, "__inline-edit-button")) || target.closest(".".concat(blockClass, "__inline-edit--select")) || target.closest(".".concat(blockClass, "__row-size-button"))) {
       return;
     }
 
@@ -95,16 +100,55 @@ var DatagridContent = function DatagridContent(_ref) {
     });
   });
 
+  var renderTable = function renderTable() {
+    var _getTableProps;
+
+    return /*#__PURE__*/_react.default.createElement(Table, (0, _extends2.default)({}, getTableProps(), {
+      className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
+      role: withInlineEdit && 'grid',
+      tabIndex: withInlineEdit && 0,
+      onKeyDown: withInlineEdit ? function (event) {
+        return (0, _handleGridKeyPress.handleGridKeyPress)({
+          event: event,
+          dispatch: dispatch,
+          state: state,
+          instance: datagridState,
+          keysPressedList: keysPressedList,
+          usingMac: usingMac
+        });
+      } : null,
+      onFocus: withInlineEdit ? function () {
+        return (0, _handleGridFocus.handleGridFocus)(state, dispatch);
+      } : null
+    }), /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
+      rows: rows
+    })));
+  };
+
   var _useMultipleKeyTracki = (0, _hooks2.useMultipleKeyTracking)({
-    ref: multiKeyTrackingRef,
+    ref: withInlineEdit ? multiKeyTrackingRef : null,
     containerHasFocus: gridActive,
     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", {
@@ -112,28 +156,9 @@ var DatagridContent = function DatagridContent(_ref) {
     ref: gridAreaRef
   }, leftPanel && leftPanel.isOpen && /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__datagridLeftPanel")
-  }, leftPanel.panelContent), /*#__PURE__*/_react.default.createElement("div", {
+  }, leftPanel.panelContent), withInlineEdit ? /*#__PURE__*/_react.default.createElement("div", {
     ref: multiKeyTrackingRef
-  }, /*#__PURE__*/_react.default.createElement(Table, (0, _extends2.default)({}, getTableProps(), {
-    className: (0, _classnames.default)(withVirtualScroll ? '' : "".concat(blockClass, "__table-simple"), "".concat(blockClass, "__vertical-align-").concat(verticalAlign), (0, _defineProperty2.default)({}, "".concat(blockClass, "__variable-row-height"), variableRowHeight), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-with-inline-edit"), withInlineEdit), (0, _defineProperty2.default)({}, "".concat(blockClass, "__table-grid-active"), gridActive), (_getTableProps = getTableProps()) === null || _getTableProps === void 0 ? void 0 : _getTableProps.className),
-    role: withInlineEdit && 'grid',
-    tabIndex: withInlineEdit && 0,
-    onKeyDown: withInlineEdit ? function (event) {
-      return (0, _handleGridKeyPress.handleGridKeyPress)({
-        event: event,
-        dispatch: dispatch,
-        state: state,
-        instance: datagridState,
-        keysPressedList: keysPressedList,
-        usingMac: usingMac
-      });
-    } : null,
-    onFocus: withInlineEdit ? function () {
-      return (0, _handleGridFocus.handleGridFocus)(state, dispatch);
-    } : null
-  }), /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState), /*#__PURE__*/_react.default.createElement(_DatagridBody.default, (0, _extends2.default)({}, datagridState, {
-    rows: rows
-  })))))), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && DatagridPagination(datagridState), CustomizeColumnsModal && /*#__PURE__*/_react.default.createElement(CustomizeColumnsModal, {
+  }, renderTable()) : renderTable())), (rows === null || rows === void 0 ? void 0 : rows.length) > 0 && !isFetching && DatagridPagination && DatagridPagination(datagridState), CustomizeColumnsModal && /*#__PURE__*/_react.default.createElement(CustomizeColumnsModal, {
     instance: datagridState
   }));
 };
@@ -143,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,
@@ -155,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/DatagridRow.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,7 +15,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _carbonComponentsReact = require("carbon-components-react");
 
@@ -23,7 +25,16 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _settings = require("../../../settings");
 
+var _InlineEditContext = require("./addons/InlineEdit/InlineEditContext/InlineEditContext");
+
+var _getCellIdAsObject = require("./addons/InlineEdit/InlineEditContext/getCellIdAsObject");
+
 var _excluded = ["children"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
 var TableRow = _carbonComponentsReact.DataTable.TableRow,
     TableCell = _carbonComponentsReact.DataTable.TableCell; // eslint-disable-next-line react/prop-types
@@ -32,8 +43,14 @@ var DatagridRow = function DatagridRow(datagridState) {
   var _cx;
 
   var row = datagridState.row;
+
+  var _useContext = (0, _react.useContext)(_InlineEditContext.InlineEditContext),
+      state = _useContext.state;
+
+  var activeCellId = state.activeCellId;
+  var activeCellObject = activeCellId && (0, _getCellIdAsObject.getCellIdAsObject)(activeCellId);
   return /*#__PURE__*/_react.default.createElement(TableRow, (0, _extends2.default)({
-    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
+    className: (0, _classnames.default)("".concat(blockClass, "__carbon-row"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-hover-active"), activeCellObject && row.index === activeCellObject.row), _cx))
   }, row.getRowProps(), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {

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();
+    }
   }
 };
 

package/lib/components/Datagrid/Datagrid/addons/RowSize/RowSizeDropdown.js

@@ -60,7 +60,7 @@ var RowSizeDropdown = function RowSizeDropdown(_ref) {
       return setIsOpen(!isOpen);
     },
     iconDescription: legendText,
-    className: (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(blockClass, "__row-size-button--open"), isOpen))
+    className: (0, _classnames.default)("".concat(blockClass, "__row-size-button"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__row-size-button--open"), isOpen))
   }), isOpen && /*#__PURE__*/React.createElement(_RowSizeRadioGroup.default, (0, _extends2.default)({}, props, {
     legendText: legendText,
     buttonRef: buttonRef,

package/lib/components/Datagrid/Datagrid/addons/RowSize/RowSizeRadioGroup.js

@@ -113,7 +113,7 @@ var getDropdownPosition = function getDropdownPosition(buttonEle) {
 
   if (parent instanceof HTMLElement) {
     var top = buttonEle.offsetTop + buttonEle.offsetHeight;
-    var right = parent.offsetWidth - parent.offsetLeft - (buttonEle.offsetLeft + buttonEle.offsetWidth);
+    var right = parent.offsetWidth - parent.offsetLeft - buttonEle.offsetLeft;
     return {
       top: top,
       right: right

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

@@ -41,25 +41,43 @@ 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',
@@ -96,7 +114,7 @@ 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/lib/components/Datagrid/utils/makeData.js

@@ -13,16 +13,25 @@ var _react = _interopRequireDefault(require("react"));
 
 var _namor = _interopRequireDefault(require("namor"));
 
+var _StatusIcon = require("../../StatusIcon");
+
 var _getInlineEditColumns = require("./getInlineEditColumns");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var getRandomInteger = function getRandomInteger(min, max) {
-  min = Math.ceil(min);
-  max = Math.floor(max);
-  return Math.floor(Math.random() * (max - min + 1)) + min;
+var getRandomInteger = function getRandomInteger(min, max, decimalPlaces) {
+  var roundedMin = Math.ceil(min);
+  var roundedMax = Math.floor(max);
+  var randomNumber = Math.random() * (max - min) + min;
+
+  if (!decimalPlaces) {
+    return Math.floor(Math.random() * (roundedMax - roundedMin + 1)) + roundedMin;
+  }
+
+  var power = Math.pow(10, decimalPlaces);
+  return Math.floor(randomNumber * power) / power;
 };
 
 var makeData = function makeData() {
@@ -57,6 +66,24 @@ var range = function range(len) {
 
 exports.range = range;
 
+var renderStatusIcon = function renderStatusIcon(statusChance) {
+  var iconProps = {
+    size: 'sm',
+    theme: 'light',
+    kind: statusChance > 0.66 ? 'critical' : statusChance > 0.33 ? 'minor-warning' : 'normal',
+    iconDescription: statusChance > 0.66 ? 'Critical' : statusChance > 0.33 ? 'Minor warning' : 'Normal'
+  };
+  return /*#__PURE__*/_react.default.createElement(_StatusIcon.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);
@@ -159,7 +186,10 @@ var newPerson = function newPerson() {
     }),
     status: statusChance > 0.66 ? 'relationship' : statusChance > 0.33 ? 'complicated' : 'single',
     chartType: initialChartTypeIndex === 0 ? _getInlineEditColumns.inlineEditSelectItems[0] : initialChartTypeIndex === 1 ? _getInlineEditColumns.inlineEditSelectItems[1] : _getInlineEditColumns.inlineEditSelectItems[2],
-    activeSince: statusChance > 0.66 ? activeSinceDate : statusChance > 0.33 ? yesterdayDate : twoDaysAgoDate
+    activeSince: statusChance > 0.66 ? activeSinceDate : statusChance > 0.33 ? yesterdayDate : twoDaysAgoDate,
+    bonus: "$\r".concat(getRandomInteger(100, 500, 2)),
+    status_icon: renderStatusIcon(statusChance),
+    doc_link: renderDocLink(statusChance)
   };
 };