@carbon/ibm-products 1.9.0 → 1.10.0

package/lib/components/DataSpreadsheet/DataSpreadsheetBody.js

@@ -11,6 +11,8 @@ exports.DataSpreadsheetBody = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -29,6 +31,8 @@ var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
 var _createCellSelectionArea = require("./createCellSelectionArea");
 
+var _checkActiveHeaderCell = require("./checkActiveHeaderCell");
+
 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; }
@@ -40,9 +44,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * LICENSE file in the root directory of this source tree.
  */
 var blockClass = "".concat(_settings.pkg.prefix, "--data-spreadsheet");
-
-var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
-  var defaultColumn = _ref.defaultColumn,
+var DataSpreadsheetBody = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var activeCellCoordinates = _ref.activeCellCoordinates,
+      defaultColumn = _ref.defaultColumn,
       getTableBodyProps = _ref.getTableBodyProps,
       id = _ref.id,
       prepareRow = _ref.prepareRow,
@@ -57,7 +61,8 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
       setClickAndHoldActive = _ref.setClickAndHoldActive,
       currentMatcher = _ref.currentMatcher,
       setCurrentMatcher = _ref.setCurrentMatcher;
-  // Create cell selection areas based on selectionAreas array
+  var currentMatcherRef = ref; // Create cell selection areas based on selectionAreas array
+
   (0, _react.useEffect)(function () {
     if (selectionAreas && selectionAreas.length) {
       selectionAreas.map(function (area) {
@@ -97,7 +102,6 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
           row: Number(cellButton.getAttribute('data-row-index')),
           column: Number(cellButton.getAttribute('data-column-index'))
         };
-        setCurrentMatcher(null);
         setSelectionAreas(function (prev) {
           var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
           var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
@@ -122,11 +126,16 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
           return;
         }
 
-        var newArray = selectionAreaClone.filter(function (item) {
-          return item.matcher !== currentMatcher;
+        var notYetCreatedSelections = selectionAreaClone.filter(function (item) {
+          return !item.areaCreated && item.matcher === currentMatcher;
         });
-        setCurrentMatcher(null);
-        setSelectionAreas(newArray);
+        var previouslyCreatedSelectionAreas = selectionAreaClone.filter(function (item) {
+          return item.point2 && item.areaCreated;
+        }); // We want to ensure that there is only ever one item in selectionAreas
+        // that has not been created yet. This item's point1 values will always
+        // be equal to the activeCellCoordinates
+
+        setSelectionAreas([].concat((0, _toConsumableArray2.default)(notYetCreatedSelections), (0, _toConsumableArray2.default)(previouslyCreatedSelectionAreas)));
       }
     };
 
@@ -134,7 +143,7 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
     return function () {
       document.removeEventListener('mouseup', handleMouseUp);
     };
-  }, [selectionAreas, currentMatcher, setSelectionAreas, setClickAndHoldActive, setCurrentMatcher]); // Make sure that if the cellSize prop changes, the active
+  }, [selectionAreas, currentMatcher, setSelectionAreas, setClickAndHoldActive, setCurrentMatcher, ref]); // Make sure that if the cellSize prop changes, the active
   // cell also gets updated with the new size
 
   (0, _react.useEffect)(function () {
@@ -147,67 +156,97 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
   }, [defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight]); // onClick fn for each cell in the data spreadsheet body,
   // adds the active cell highlight
 
-  var handleBodyCellClick = (0, _react.useCallback)(function (event, cell, columnIndex) {
-    var isHoldingCommandKey = event.metaKey || event.ctrlKey;
-    setContainerHasFocus(true);
-    var activeCoordinates = {
-      row: cell.row.index,
-      column: columnIndex
-    };
-    var tempMatcher = (0, _uuidv.default)();
-    setActiveCellCoordinates(activeCoordinates); // prevent multiple selections unless cmd key is held
-    // meaning that selectionAreas should only have one item by default
-
-    if (isHoldingCommandKey) {
-      setSelectionAreas(function (prev) {
-        return [].concat((0, _toConsumableArray2.default)(prev), [{
-          point1: activeCoordinates,
-          matcher: tempMatcher
-        }]);
-      });
-    } else {
-      // remove all previous cell selections
-      var cellSelections = spreadsheetBodyRef.current.querySelectorAll(".".concat(blockClass, "__selection-area--element"));
-      Array.from(cellSelections).forEach(function (element) {
-        return element.remove();
-      });
-      setSelectionAreas([{
-        point1: activeCoordinates,
-        matcher: tempMatcher
-      }]);
-    }
-
-    setCurrentMatcher(tempMatcher);
-    setClickAndHoldActive(true);
-  }, [setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher]);
-  var handleBodyCellHover = (0, _react.useCallback)(function (event, cell, columnIndex) {
-    if (clickAndHoldActive) {
-      var cellCoordinates = {
+  var handleBodyCellClick = (0, _react.useCallback)(function (cell, columnIndex) {
+    return function (event) {
+      event.preventDefault();
+      var isHoldingCommandKey = event.metaKey || event.ctrlKey;
+      var isHoldingShiftKey = event.shiftKey;
+      setContainerHasFocus(true);
+      var activeCoordinates = {
         row: cell.row.index,
         column: columnIndex
       };
-      setSelectionAreas(function (prev) {
-        var _selectionAreaClone$i, _selectionAreaClone$i2;
+      var tempMatcher = (0, _uuidv.default)(); // prevent multiple selections unless cmd key is held
+      // meaning that selectionAreas should only have one item by default
 
-        var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
+      if (isHoldingCommandKey) {
+        setActiveCellCoordinates(activeCoordinates);
+        setCurrentMatcher(tempMatcher);
+        setSelectionAreas(function (prev) {
+          return [].concat((0, _toConsumableArray2.default)(prev), [{
+            point1: activeCoordinates,
+            matcher: tempMatcher
+          }]);
+        });
+      } else if (isHoldingShiftKey) {
+        setContainerHasFocus(true);
+        var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(selectionAreas);
         var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
           return item.matcher === currentMatcher;
-        }); // No items in the array match up with the currentMatcher value
+        });
 
         if (indexOfItemToUpdate === -1) {
-          return prev;
-        } // Do not update state if you're still hovering on the same cell
+          // There is always a selectionArea with a point1 object that updates
+          // whenever the activeCellCoordinates update, we should always be able
+          // to find an index, but if we do not for some reason we should return
+          // at this point.
+          return;
+        } else {
+          // Update the selectionArea that was found, do not update currentMatcher
+          selectionAreaClone[indexOfItemToUpdate].point1 = activeCellCoordinates;
+          selectionAreaClone[indexOfItemToUpdate].point2 = activeCoordinates;
+          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
+          selectionAreaClone[indexOfItemToUpdate].matcher = currentMatcher;
+          setSelectionAreas(selectionAreaClone);
+        }
+      } else {
+        setActiveCellCoordinates(activeCoordinates); // remove all previous cell selections
 
+        var cellSelections = spreadsheetBodyRef.current.querySelectorAll(".".concat(blockClass, "__selection-area--element"));
+        (0, _toConsumableArray2.default)(cellSelections).forEach(function (element) {
+          return element.remove();
+        });
+        setSelectionAreas([{
+          point1: activeCoordinates,
+          matcher: tempMatcher
+        }]);
+        setCurrentMatcher(tempMatcher);
+      }
 
-        if (((_selectionAreaClone$i = selectionAreaClone[indexOfItemToUpdate].point2) === null || _selectionAreaClone$i === void 0 ? void 0 : _selectionAreaClone$i.row) === cellCoordinates.row && ((_selectionAreaClone$i2 = selectionAreaClone[indexOfItemToUpdate].point2) === null || _selectionAreaClone$i2 === void 0 ? void 0 : _selectionAreaClone$i2.column) === cellCoordinates.column) {
-          return prev;
-        }
+      currentMatcherRef.current = tempMatcher;
+      setClickAndHoldActive(true);
+    };
+  }, [currentMatcherRef, currentMatcher, activeCellCoordinates, selectionAreas, setActiveCellCoordinates, setSelectionAreas, setContainerHasFocus, setClickAndHoldActive, setCurrentMatcher]);
+  var handleBodyCellHover = (0, _react.useCallback)(function (cell, columnIndex) {
+    return function () {
+      if (clickAndHoldActive) {
+        var cellCoordinates = {
+          row: cell.row.index,
+          column: columnIndex
+        };
+        setSelectionAreas(function (prev) {
+          var _selectionAreaClone$i, _selectionAreaClone$i2;
 
-        selectionAreaClone[indexOfItemToUpdate].point2 = cellCoordinates;
-        selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
-        return selectionAreaClone;
-      });
-    }
+          var selectionAreaClone = (0, _deepCloneObject.deepCloneObject)(prev);
+          var indexOfItemToUpdate = selectionAreaClone.findIndex(function (item) {
+            return item.matcher === currentMatcher;
+          }); // No items in the array match up with the currentMatcher value
+
+          if (indexOfItemToUpdate === -1) {
+            return prev;
+          } // Do not update state if you're still hovering on the same cell
+
+
+          if (((_selectionAreaClone$i = selectionAreaClone[indexOfItemToUpdate].point2) === null || _selectionAreaClone$i === void 0 ? void 0 : _selectionAreaClone$i.row) === cellCoordinates.row && ((_selectionAreaClone$i2 = selectionAreaClone[indexOfItemToUpdate].point2) === null || _selectionAreaClone$i2 === void 0 ? void 0 : _selectionAreaClone$i2.column) === cellCoordinates.column) {
+            return prev;
+          }
+
+          selectionAreaClone[indexOfItemToUpdate].point2 = cellCoordinates;
+          selectionAreaClone[indexOfItemToUpdate].areaCreated = false;
+          return selectionAreaClone;
+        });
+      }
+    };
   }, [clickAndHoldActive, currentMatcher, setSelectionAreas]); // Renders each cell in the spreadsheet body
 
   var RenderRow = (0, _react.useCallback)(function (_ref2) {
@@ -225,7 +264,7 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
       "data-row-index": index,
       "data-column-index": "header",
       type: "button",
-      className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element")),
+      className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__td-th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__td-th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'row'))),
       style: {
         width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth
       }
@@ -237,17 +276,13 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
       }, cell.getCellProps(), {
         className: (0, _classnames.default)("".concat(blockClass, "__td"), "".concat(blockClass, "__body--td"), "".concat(blockClass, "--interactive-cell-element")),
         key: "cell_".concat(index),
-        onMouseDown: function onMouseDown(event) {
-          return handleBodyCellClick(event, cell, index);
-        },
-        onMouseOver: function onMouseOver(event) {
-          return handleBodyCellHover(event, cell, index);
-        },
+        onMouseDown: handleBodyCellClick(cell, index),
+        onMouseOver: handleBodyCellHover(cell, index),
         onFocus: function onFocus() {},
         type: "button"
       }), cell.render('Cell'));
     }));
-  }, [prepareRow, rows, defaultColumn.rowHeaderWidth, handleBodyCellClick, handleBodyCellHover]);
+  }, [prepareRow, rows, defaultColumn.rowHeaderWidth, handleBodyCellClick, handleBodyCellHover, activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row, selectionAreas]);
   var spreadsheetBodyRef = (0, _react.useRef)();
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: spreadsheetBodyRef,
@@ -259,10 +294,17 @@ var DataSpreadsheetBody = function DataSpreadsheetBody(_ref) {
     itemSize: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight,
     width: totalColumnsWidth + scrollBarSize
   }, RenderRow));
-};
-
+});
 exports.DataSpreadsheetBody = DataSpreadsheetBody;
 DataSpreadsheetBody.propTypes = {
+  /**
+   * Object containing the active cell coordinates
+   */
+  activeCellCoordinates: _propTypes.default.shape({
+    row: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+    column: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
+  }),
+
   /**
    * Is the user clicking and holding in the data spreadsheet body
    */

package/lib/components/DataSpreadsheet/DataSpreadsheetHeader.js

@@ -9,6 +9,8 @@ exports.DataSpreadsheetHeader = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -17,6 +19,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _settings = require("../../settings");
 
+var _checkActiveHeaderCell = require("./checkActiveHeaderCell");
+
 /**
  * Copyright IBM Corp. 2022, 2022
  *
@@ -26,8 +30,10 @@ var _settings = require("../../settings");
 var blockClass = "".concat(_settings.pkg.prefix, "--data-spreadsheet");
 
 var DataSpreadsheetHeader = function DataSpreadsheetHeader(_ref) {
-  var defaultColumn = _ref.defaultColumn,
-      headerGroups = _ref.headerGroups;
+  var activeCellCoordinates = _ref.activeCellCoordinates,
+      defaultColumn = _ref.defaultColumn,
+      headerGroups = _ref.headerGroups,
+      selectionAreas = _ref.selectionAreas;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(blockClass, "__header--container"))
   }, headerGroups.map(function (headerGroup, index) {
@@ -40,7 +46,7 @@ var DataSpreadsheetHeader = function DataSpreadsheetHeader(_ref) {
       "data-column-index": "header",
       type: "button",
       tabIndex: -1,
-      className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element")),
+      className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'header' && (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'header')),
       style: {
         width: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeaderWidth,
         height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
@@ -55,7 +61,7 @@ var DataSpreadsheetHeader = function DataSpreadsheetHeader(_ref) {
           height: defaultColumn === null || defaultColumn === void 0 ? void 0 : defaultColumn.rowHeight
         }
       }, column.getHeaderProps(), {
-        className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element")),
+        className: (0, _classnames.default)("".concat(blockClass, "__th"), "".concat(blockClass, "--interactive-cell-element"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__th--active-header"), (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === index || (0, _checkActiveHeaderCell.checkActiveHeaderCell)(index, selectionAreas, 'column'))),
         type: "button"
       }), column.render('Header'));
     }));
@@ -64,6 +70,14 @@ var DataSpreadsheetHeader = function DataSpreadsheetHeader(_ref) {
 
 exports.DataSpreadsheetHeader = DataSpreadsheetHeader;
 DataSpreadsheetHeader.propTypes = {
+  /**
+   * Object containing the active cell coordinates
+   */
+  activeCellCoordinates: _propTypes.default.shape({
+    row: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+    column: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])
+  }),
+
   /**
    * Default spreadsheet sizing values
    */
@@ -76,5 +90,10 @@ DataSpreadsheetHeader.propTypes = {
   /**
    * Headers provided from useTable hook
    */
-  headerGroups: _propTypes.default.arrayOf(_propTypes.default.object)
+  headerGroups: _propTypes.default.arrayOf(_propTypes.default.object),
+
+  /**
+   * All of the cell selection area items
+   */
+  selectionAreas: _propTypes.default.arrayOf(_propTypes.default.object)
 };

package/lib/components/DataSpreadsheet/checkActiveHeaderCell.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkActiveHeaderCell = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _deepCloneObject = require("../../global/js/utils/deepCloneObject");
+
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+// Determines if a row or column header cell should receive a highlight/active background color
+// Check each object in selectionAreas and see if the headerIndex is between
+// point1.row and point2.row, inclusive
+var checkActiveHeaderCell = function checkActiveHeaderCell(headerIndex, selectionAreas, headerType) {
+  var areasCloned = (0, _deepCloneObject.deepCloneObject)(selectionAreas);
+  var activeRowIndexes = [];
+  areasCloned.forEach(function (area) {
+    var _area$point, _area$point2, _area$point3, _area$point4;
+
+    var greatestRowIndex = Math.max((_area$point = area.point1) === null || _area$point === void 0 ? void 0 : _area$point[headerType], (_area$point2 = area.point2) === null || _area$point2 === void 0 ? void 0 : _area$point2[headerType]);
+    var lowestRowIndex = Math.min((_area$point3 = area.point1) === null || _area$point3 === void 0 ? void 0 : _area$point3[headerType], (_area$point4 = area.point2) === null || _area$point4 === void 0 ? void 0 : _area$point4[headerType]);
+
+    for (var i = lowestRowIndex; i <= greatestRowIndex; i++) {
+      activeRowIndexes.push(i);
+    }
+  });
+  var activeRowIndexesNoDuplicates = (0, _toConsumableArray2.default)(new Set(activeRowIndexes));
+
+  if (areasCloned !== null && areasCloned !== void 0 && areasCloned.length && activeRowIndexesNoDuplicates.includes(headerIndex)) {
+    return true;
+  }
+
+  return false;
+};
+
+exports.checkActiveHeaderCell = checkActiveHeaderCell;

package/lib/components/DataSpreadsheet/createActiveCellFn.js

@@ -24,7 +24,8 @@ var createActiveCellFn = function createActiveCellFn(_ref) {
       _ref$blockClass = _ref.blockClass,
       blockClass = _ref$blockClass === void 0 ? "".concat(_settings.pkg.prefix, "--data-spreadsheet") : _ref$blockClass,
       onActiveCellChange = _ref.onActiveCellChange,
-      activeCellValue = _ref.activeCellValue;
+      activeCellValue = _ref.activeCellValue,
+      handleActiveCellMouseEnter = _ref.handleActiveCellMouseEnter;
 
   if (!coords) {
     return;
@@ -39,6 +40,7 @@ var createActiveCellFn = function createActiveCellFn(_ref) {
   };
   var activeCellButton = (contextRef === null || contextRef === void 0 ? void 0 : contextRef.current.querySelector(".".concat(blockClass, "__active-cell--highlight"))) || document.createElement('button');
   activeCellButton.classList.add("".concat(blockClass, "__active-cell--highlight"), "".concat(blockClass, "--interactive-cell-element"));
+  activeCellButton.addEventListener('mouseenter', handleActiveCellMouseEnter);
   activeCellButton.style.width = (0, _layout.px)(placementElement === null || placementElement === void 0 ? void 0 : placementElement.offsetWidth);
   activeCellButton.style.height = (0, _layout.px)(placementElement === null || placementElement === void 0 ? void 0 : placementElement.offsetHeight);
   activeCellButton.style.left = (0, _layout.px)(relativePosition.left);

package/lib/components/InlineEdit/InlineEdit.js

@@ -31,7 +31,7 @@ var _carbonComponentsReact = require("carbon-components-react");
 
 var _iconsReact = require("@carbon/icons-react");
 
-var _excluded = ["cancelDescription", "className", "disabled", "editAlwaysVisible", "editDescription", "id", "invalid", "invalidText", "labelText", "light", "onCancel", "onSave", "onChange", "placeholder", "saveDescription", "size", "value", "warn", "warnText"];
+var _excluded = ["cancelDescription", "className", "disabled", "editAlwaysVisible", "editDescription", "id", "invalid", "invalidText", "labelText", "light", "onCancel", "onSave", "onChange", "placeholder", "saveDescription", "size", "value"];
 
 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); }
 
@@ -72,8 +72,6 @@ var InlineEdit = /*#__PURE__*/_react.default.forwardRef(function (_ref, refIn) {
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? defaults.size : _ref$size,
       value = _ref.value,
-      warn = _ref.warn,
-      warnText = _ref.warnText,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var refInput = (0, _react.useRef)(null);
   var localRef = (0, _react.useRef)(null);
@@ -89,9 +87,11 @@ var InlineEdit = /*#__PURE__*/_react.default.forwardRef(function (_ref, refIn) {
       internalValue = _useState4[0],
       setInternalValue = _useState4[1];
 
-  var showValidation = invalid || warn;
-  var validationText = invalidText || warnText;
-  var validationIcon = showValidation ? invalid ? /*#__PURE__*/_react.default.createElement(_iconsReact.WarningFilled16, null) : /*#__PURE__*/_react.default.createElement(_iconsReact.WarningAltFilled16, null) : null;
+  var showValidation = invalid; // || warn;
+
+  var validationText = invalidText; // || warnText;
+
+  var validationIcon = showValidation ? /*#__PURE__*/_react.default.createElement(_iconsReact.WarningFilled16, null) : null;
 
   var doSetEditing = function doSetEditing(value) {
     if (value === false) {
@@ -243,7 +243,7 @@ var InlineEdit = /*#__PURE__*/_react.default.forwardRef(function (_ref, refIn) {
     _react.default.createElement("div", {
       className: (0, _classnames.default)(blockClass, // Apply the block class to the main HTML element
       className, // Apply any supplied class names to the main HTML element.
-      "".concat(blockClass, "--").concat(size), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--disabled"), disabled), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--editing"), editing), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--invalid"), invalid), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--warn"), warn), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--light"), light), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--overflows"), refInput.current && refInput.current.scrollWidth > refInput.current.offsetWidth), _cx)),
+      "".concat(blockClass, "--").concat(size), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--disabled"), disabled), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--editing"), editing), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--invalid"), invalid), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--light"), light), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--overflows"), refInput.current && refInput.current.scrollWidth > refInput.current.offsetWidth), _cx)),
       onClick: handleEdit // disabled eslint for click handler
       ,
       onBlur: handleBlur,
@@ -375,14 +375,14 @@ InlineEdit.propTypes = {
   /**
    * method called on input event (it's a React thing onChange behaves like on input).
    *
-   * NOTE: caller to handle invalid/warn states and associated text
+   * NOTE: caller to handle invalid states and associated text
    */
   onChange: _propTypes.default.func,
 
   /**
    * method called on change event
    *
-   * NOTE: caller to handle invalid/warn states and associated text
+   * NOTE: caller to handle invalid states and associated text
    */
   onSave: _propTypes.default.func,
 
@@ -404,15 +404,5 @@ InlineEdit.propTypes = {
   /**
    * initial/unedited value
    */
-  value: _propTypes.default.string,
-
-  /**
-   * set warn state for input
-   */
-  warn: _propTypes.default.bool,
-
-  /**
-   * text shown when warn true
-   */
-  warnText: _propTypes.default.string
+  value: _propTypes.default.string
 };

package/lib/components/OptionsTile/OptionsTile.js

@@ -204,9 +204,19 @@ var OptionsTile = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     } else if (locked) {
       Icon = _iconsReact.Locked16;
       summaryClasses.push("".concat(blockClass, "__summary--locked"));
+
+      if (!text) {
+        text = lockedText;
+      }
+    }
+
+    var hasValidationState = invalid || warn || locked;
+    var summaryHidden = !hasValidationState && enabled === false;
+
+    if (summaryHidden) {
+      summaryClasses.push("".concat(blockClass, "__summary--hidden"));
     }
 
-    var summaryHidden = enabled === false;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(blockClass, "__title")
     }, /*#__PURE__*/_react.default.createElement("h6", {