@carbon/ibm-products 2.0.0-rc.26 → 2.0.0-rc.28

package/lib/components/Datagrid/Datagrid/DatagridRefBody.js

@@ -30,7 +30,9 @@ var DatagridRefBody = function DatagridRefBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
       rows = datagridState.rows,
       prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/_react.default.createElement("tbody", (0, _extends2.default)({}, getTableBodyProps(), {
+  return /*#__PURE__*/_react.default.createElement("tbody", (0, _extends2.default)({}, getTableBodyProps({
+    role: false
+  }), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);

package/lib/components/Datagrid/Datagrid/DatagridRow.js

@@ -80,7 +80,9 @@ var DatagridRow = function DatagridRow(datagridState) {
 
   return /*#__PURE__*/_react.default.createElement(_react2.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(blockClass, "__carbon-row-expandable"), row.canExpand), (0, _defineProperty2.default)(_cx, "".concat(_settings.carbon.prefix, "--data-table--selected"), row.isSelected), _cx))
-  }, row.getRowProps(), {
+  }, row.getRowProps({
+    role: false
+  }), {
     key: row.id,
     onMouseEnter: function onMouseEnter(event) {
       if (!withNestedRows) {
@@ -114,7 +116,9 @@ var DatagridRow = function DatagridRow(datagridState) {
       }
     }
   }), row.cells.map(function (cell, index) {
-    var cellProps = cell.getCellProps();
+    var cellProps = cell.getCellProps({
+      role: false
+    });
     var children = cellProps.children,
         restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
 

package/lib/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js

@@ -120,7 +120,8 @@ var SelectAllWithToggle = function SelectAllWithToggle(_ref) {
       }, props));
     },
     size: "sm",
-    ariaLabel: allRowsLabel
+    ariaLabel: allRowsLabel,
+    menuOptionsClass: "".concat(blockClass, "__select-all-toggle-overflow")
   }, /*#__PURE__*/_react.default.createElement(_react2.OverflowMenuItem, {
     itemText: allPageRowsLabel,
     requireTitle: true,

package/lib/components/Datagrid/Datagrid/DatagridSimpleBody.js

@@ -29,7 +29,9 @@ var DatagridSimpleBody = function DatagridSimpleBody(datagridState) {
   var getTableBodyProps = datagridState.getTableBodyProps,
       rows = datagridState.rows,
       prepareRow = datagridState.prepareRow;
-  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
+  return /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps({
+    role: false
+  }), {
     className: (0, _classnames.default)("".concat(blockClass, "__simple-body"), getTableBodyProps().className)
   }), rows.map(function (row) {
     prepareRow(row);

package/lib/components/Datagrid/Datagrid/DatagridToolbar.js

@@ -19,7 +19,7 @@ var _icons = require("@carbon/react/icons");
 
 var _react2 = require("@carbon/react");
 
-var _reactResizeDetector = require("react-resize-detector");
+var _useResizeObserver2 = require("../../../global/js/hooks/useResizeObserver");
 
 var _ButtonMenu = require("../../ButtonMenu");
 
@@ -157,9 +157,10 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
 };
 
 var DatagridToolbar = function DatagridToolbar(datagridState) {
-  var _useResizeDetector = (0, _reactResizeDetector.useResizeDetector)(),
-      width = _useResizeDetector.width,
-      ref = _useResizeDetector.ref;
+  var ref = (0, _react.useRef)(null);
+
+  var _useResizeObserver = (0, _useResizeObserver2.useResizeObserver)(ref),
+      width = _useResizeObserver.width;
 
   var DatagridActions = datagridState.DatagridActions,
       DatagridBatchActions = datagridState.DatagridBatchActions,

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -25,7 +25,7 @@ var _DatagridHead = _interopRequireDefault(require("./DatagridHead"));
 
 var _layout = require("@carbon/layout");
 
-var _reactResizeDetector = require("react-resize-detector");
+var _useResizeObserver = require("../../../global/js/hooks/useResizeObserver");
 
 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); }
 
@@ -73,9 +73,8 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
     gridRefElement.style.width = gridRefElement === null || gridRefElement === void 0 ? void 0 : gridRefElement.clientWidth;
   };
 
-  (0, _reactResizeDetector.useResizeDetector)({
-    onResize: handleVirtualGridResize,
-    targetRef: gridRef
+  (0, _useResizeObserver.useResizeObserver)(gridRef, {
+    callback: handleVirtualGridResize
   });
 
   var syncScroll = function syncScroll(e) {
@@ -101,7 +100,9 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       width: (_gridRef$current = gridRef.current) === null || _gridRef$current === void 0 ? void 0 : _gridRef$current.clientWidth,
       overflow: 'hidden'
     }
-  }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps(), {
+  }, /*#__PURE__*/_react.default.createElement(_DatagridHead.default, datagridState)), /*#__PURE__*/_react.default.createElement(_react2.TableBody, (0, _extends2.default)({}, getTableBodyProps({
+    role: false
+  }), {
     onScroll: function onScroll(e) {
       return syncScroll(e);
     }

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js

@@ -73,9 +73,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
       secondaryActionLabel = _ref$secondaryActionL === void 0 ? 'Cancel' : _ref$secondaryActionL,
       setAllFilters = _ref.setAllFilters,
       _ref$data = _ref.data,
-      data = _ref$data === void 0 ? [] : _ref$data;
-
+      data = _ref$data === void 0 ? [] : _ref$data,
+      _ref$initialFilters = _ref.initialFilters,
+      initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
+  //  Save the initial filters we only need the filters once when it loads
+  var initialFiltersRef = (0, _react2.useRef)(initialFilters);
   /** State */
+
   var _useState = (0, _react2.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       open = _useState2[0],
@@ -85,7 +89,8 @@ var FilterFlyout = function FilterFlyout(_ref) {
     updateMethod: updateMethod,
     filters: filters,
     setAllFilters: setAllFilters,
-    variation: _constants.FLYOUT
+    variation: _constants.FLYOUT,
+    initialFilters: initialFiltersRef.current
   }),
       filtersState = _useFilters.filtersState,
       prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
@@ -235,6 +240,15 @@ FilterFlyout.propTypes = {
    */
   flyoutIconDescription: _propTypes.default.string,
 
+  /**
+   * Filters that should be applied on load
+   */
+  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
+
   /**
    * Callback when the apply button is clicked
    */

package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js

@@ -87,9 +87,13 @@ var FilterPanel = function FilterPanel(_ref) {
       _ref$searchLabelText = _ref.searchLabelText,
       searchLabelText = _ref$searchLabelText === void 0 ? 'Filter search' : _ref$searchLabelText,
       _ref$searchPlaceholde = _ref.searchPlaceholder,
-      searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde;
-
+      searchPlaceholder = _ref$searchPlaceholde === void 0 ? 'Find filters' : _ref$searchPlaceholde,
+      _ref$initialFilters = _ref.initialFilters,
+      initialFilters = _ref$initialFilters === void 0 ? [] : _ref$initialFilters;
+  //  Save the initial filters we only need the filters once
+  var initialFiltersRef = (0, _react.useRef)(initialFilters);
   /** State */
+
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       showDividerLine = _useState2[0],
@@ -99,7 +103,8 @@ var FilterPanel = function FilterPanel(_ref) {
     updateMethod: updateMethod,
     filters: filterSections,
     setAllFilters: setAllFilters,
-    variation: _constants.PANEL
+    variation: _constants.PANEL,
+    initialFilters: initialFiltersRef.current
   }),
       filtersState = _useFilters.filtersState,
       prevFiltersObjectArrayRef = _useFilters.prevFiltersObjectArrayRef,
@@ -255,13 +260,14 @@ var FilterPanel = function FilterPanel(_ref) {
       height: getScrollableContainerHeight()
     },
     onScroll: onInnerContainerScroll
-  }, filterSections.map(function (_ref2) {
+  }, filterSections.map(function (_ref2, index) {
     var _ref2$categoryTitle = _ref2.categoryTitle,
         categoryTitle = _ref2$categoryTitle === void 0 ? null : _ref2$categoryTitle,
         _ref2$filters = _ref2.filters,
         filters = _ref2$filters === void 0 ? [] : _ref2$filters,
         hasAccordion = _ref2.hasAccordion;
     return /*#__PURE__*/_react.default.createElement("div", {
+      key: index,
       className: "".concat(componentClass, "__category")
     }, categoryTitle && /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(componentClass, "__category-title")
@@ -283,6 +289,15 @@ FilterPanel.propTypes = {
   closeIconDescription: _propTypes.default.string,
   filterPanelMinHeight: _propTypes.default.number,
   filterSections: _propTypes.default.array,
+
+  /**
+   * Filters that should be applied on load
+   */
+  initialFilters: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    type: _propTypes.default.string.isRequired,
+    value: _propTypes.default.any.isRequired
+  })),
   onApply: _propTypes.default.func,
   onCancel: _propTypes.default.func,
   onPanelClose: _propTypes.default.func,

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js

@@ -40,15 +40,16 @@ var useFilters = function useFilters(_ref) {
       _ref$filters = _ref.filters,
       filters = _ref$filters === void 0 ? [] : _ref$filters,
       setAllFilters = _ref.setAllFilters,
-      variation = _ref.variation;
+      variation = _ref.variation,
+      initialFilters = _ref.initialFilters;
 
   /** State */
-  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters, variation),
+  var _useInitialStateFromF = (0, _useInitialStateFromFilters.default)(filters, variation, initialFilters),
       _useInitialStateFromF2 = (0, _slicedToArray2.default)(_useInitialStateFromF, 2),
       filtersState = _useInitialStateFromF2[0],
       setFiltersState = _useInitialStateFromF2[1];
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(initialFilters),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       filtersObjectArray = _useState2[0],
       setFiltersObjectArray = _useState2[1]; // When using batch actions we have to store the filters to then apply them later
@@ -66,8 +67,10 @@ var useFilters = function useFilters(_ref) {
   };
 
   var reset = function reset() {
-    // Get the initial values for the filters
-    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation);
+    // When we reset we want the "initialFilters" to be an empty array
+    var resetFiltersArray = []; // Get the initial values for the filters
+
+    var initialFiltersState = (0, _utils.getInitialStateFromFilters)(filters, variation, resetFiltersArray);
     var initialFiltersObjectArray = []; // Set the state to the initial values
 
     setFiltersState(initialFiltersState);
@@ -147,6 +150,17 @@ var useFilters = function useFilters(_ref) {
 
         filtersObjectArrayCopy.splice(_index2, 1);
       }
+    } else if (type === _constants.NUMBER) {
+      // If the value is empty remove it from the filtersObjectArray
+      if (value === '') {
+        // Find the column that uses number and displays an empty string
+        var _index3 = filtersObjectArrayCopy.findIndex(function (filter) {
+          return filter.id === column;
+        }); // Remove it from the filters array
+
+
+        filtersObjectArrayCopy.splice(_index3, 1);
+      }
     }
 
     setFiltersObjectArray(filtersObjectArrayCopy); // // Automatically apply the filters if the updateMethod is instant

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useInitialStateFromFilters.js

@@ -24,8 +24,9 @@ var _utils = require("../utils");
  */
 var useInitialStateFromFilters = function useInitialStateFromFilters(filters) {
   var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.FLYOUT;
+  var initialFilters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
 
-  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation)),
+  var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, initialFilters)),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       state = _useState2[0],
       setState = _useState2[1];

package/lib/components/Datagrid/Datagrid/addons/Filtering/utils.js

@@ -13,9 +13,22 @@ var _constants = require("./constants");
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-// This functions takes the filters passed in and makes an object to track it's state
+var applyInitialFilters = function applyInitialFilters(filterState, initialFilters) {
+  Object.keys(filterState).forEach(function (key) {
+    var hasInitialFilter = initialFilters.find(function (filter) {
+      return filter.id === key;
+    });
+
+    if (hasInitialFilter) {
+      filterState[key].value = hasInitialFilter.value;
+    }
+  });
+}; // This functions takes the filters passed in and makes an object to track it's state
+
+
 var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
   var variation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.FLYOUT;
+  var initialFilters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var initialFilterState = {};
 
   var setInitialState = function setInitialState(_ref) {
@@ -76,6 +89,10 @@ var getInitialStateFromFilters = function getInitialStateFromFilters(filters) {
     console.error('No variation passed into useInitialStateFromFilters');
   }
 
+  if (initialFilters.length > 0) {
+    applyInitialFilters(initialFilterState, initialFilters);
+  }
+
   return initialFilterState;
 };
 

package/lib/components/Datagrid/useFiltering.js

@@ -76,11 +76,13 @@ var useFiltering = function useFiltering(hooks) {
         setAllFilters = instance.setAllFilters,
         setFilter = instance.setFilter,
         headers = instance.headers,
-        data = instance.data;
+        data = instance.data,
+        state = instance.state;
     var defaultProps = {
       variation: 'flyout',
       updateMethod: _constants.BATCH,
-      panelIconDescription: 'Open filter panel'
+      panelIconDescription: 'Open filter panel',
+      initialFilters: state.filters
     };
 
     var getFilterFlyoutProps = function getFilterFlyoutProps() {

package/lib/components/Datagrid/useOnRowClick.js

@@ -33,9 +33,19 @@ var useOnRowClick = function useOnRowClick(hooks) {
         }
       };
 
+      var onKeyDown = function onKeyDown(event) {
+        var key = event.key;
+
+        if (key === 'Enter') {
+          onClick();
+        }
+      };
+
       return [props, {
-        onClick: onClick
+        onClick: onClick,
+        onKeyDown: onKeyDown
       }, {
+        tabIndex: 0,
         style: {
           cursor: 'pointer'
         }

package/lib/components/Datagrid/useSelectRows.js

@@ -99,6 +99,7 @@ var SelectRow = function SelectRow(datagridState) {
       radio = datagridState.radio,
       toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
       onRadioSelect = datagridState.onRadioSelect,
+      onRowSelect = datagridState.onRowSelect,
       columns = datagridState.columns,
       withStickyColumn = datagridState.withStickyColumn;
 
@@ -139,6 +140,7 @@ var SelectRow = function SelectRow(datagridState) {
       }
 
       onChange(e);
+      onRowSelect === null || onRowSelect === void 0 ? void 0 : onRowSelect(row, e);
     },
     id: "".concat(tableId, "-").concat(row.index),
     name: "".concat(tableId, "-").concat(row.index, "-name"),

package/lib/components/{InlineEditV2/InlineEditV2.js → EditInPlace/EditInPlace.js}

@@ -2,17 +2,19 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InlineEditV2 = void 0;
+exports.deprecatedProps = exports.EditInPlace = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -31,27 +33,41 @@ var _settings = require("../../settings");
 
 var _devtools = require("../../global/js/utils/devtools");
 
-var _excluded = ["cancelLabel", "editLabel", "id", "invalid", "invalidLabel", "labelText", "onCancel", "onChange", "onSave", "saveLabel", "value"];
+var _excluded = ["cancelLabel", "editAlwaysVisible", "editLabel", "id", "inheritTypography", "invalid", "invalidLabel", "invalidText", "labelText", "onCancel", "onChange", "onSave", "saveLabel", "size", "tooltipAlignment", "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); }
 
-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; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
+
+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; }
 
-var componentName = 'InlineEditV2';
-var blockClass = "".concat(_settings.pkg.prefix, "--inline-edit-v2");
-var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+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 componentName = 'EditInPlace';
+var blockClass = "".concat(_settings.pkg.prefix, "--edit-in-place");
+var defaults = {
+  tooltipAlignment: 'top',
+  size: 'sm'
+};
+var EditInPlace = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _cx;
 
   var cancelLabel = _ref.cancelLabel,
+      editAlwaysVisible = _ref.editAlwaysVisible,
       editLabel = _ref.editLabel,
       id = _ref.id,
+      inheritTypography = _ref.inheritTypography,
       invalid = _ref.invalid,
-      invalidLabel = _ref.invalidLabel,
+      deprecated_invalidLabel = _ref.invalidLabel,
+      invalidText = _ref.invalidText,
       labelText = _ref.labelText,
       onCancel = _ref.onCancel,
       onChange = _ref.onChange,
       onSave = _ref.onSave,
       saveLabel = _ref.saveLabel,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? defaults.size : _ref$size,
+      tooltipAlignment = _ref.tooltipAlignment,
       value = _ref.value,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
@@ -73,20 +89,27 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var inputRef = (0, _react.useRef)(null);
   var canSave = value !== initialValue && !invalid;
   var escaping = (0, _react.useRef)(false);
+  var tipAlignIsObject = (0, _typeof2.default)(tooltipAlignment) === 'object';
+  var tipAlignments = ['edit', 'save', 'cancel'].reduce(function (acc, tips) {
+    var _ref2;
+
+    acc[tips] = (_ref2 = tipAlignIsObject ? tooltipAlignment[tips] : tooltipAlignment) !== null && _ref2 !== void 0 ? _ref2 : defaults.tooltipAlignment;
+    return acc;
+  }, {});
   (0, _react.useEffect)(function () {
     if (!initialValue && !dirtyInput) {
       setInitialValue(value);
     }
   }, [initialValue, dirtyInput, value]);
 
-  var isTargetingChild = function isTargetingChild(_ref2) {
-    var currentTarget = _ref2.currentTarget,
-        relatedTarget = _ref2.relatedTarget;
+  var isTargetingChild = function isTargetingChild(_ref3) {
+    var currentTarget = _ref3.currentTarget,
+        relatedTarget = _ref3.relatedTarget;
     return currentTarget.contains(relatedTarget);
   };
 
-  var onChangeHandler = function onChangeHandler(_ref3) {
-    var target = _ref3.target;
+  var onChangeHandler = function onChangeHandler(_ref4) {
+    var target = _ref4.target;
 
     if (!dirtyInput) {
       setDirtyInput(true);
@@ -168,7 +191,7 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     ref: ref
   }, (0, _devtools.getDevtoolsProps)(componentName)), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(blockClass, (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--focused"), focused), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--invalid"), invalid), _cx)),
+    className: (0, _classnames.default)(blockClass, "".concat(blockClass, "--").concat(size), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--focused"), focused), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--invalid"), invalid), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--inherit-type"), inheritTypography), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--overflows"), inputRef.current && inputRef.current.scrollWidth > inputRef.current.offsetWidth), _cx)),
     onFocus: onFocusHandler,
     onBlur: onBlurHandler
   }, /*#__PURE__*/_react.default.createElement("label", {
@@ -176,7 +199,7 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     htmlFor: id
   }, labelText), /*#__PURE__*/_react.default.createElement("input", {
     id: id,
-    className: (0, _classnames.default)("".concat(blockClass, "__text-input"), "".concat(_settings.carbon.prefix, "--text-input"), "".concat(_settings.carbon.prefix, "--text-input--sm")),
+    className: (0, _classnames.default)("".concat(blockClass, "__text-input"), "".concat(_settings.carbon.prefix, "--text-input"), "".concat(_settings.carbon.prefix, "--text-input--").concat(size)),
     type: "text",
     value: value,
     onChange: onChangeHandler,
@@ -184,12 +207,16 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     ,
     onKeyDown: onKeyHandler
   }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(blockClass, "__ellipsis"),
+    "aria-hidden": !focused
+  }, "\u2026"), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(blockClass, "__toolbar")
-  }, focused ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, invalid && /*#__PURE__*/_react.default.createElement(_icons.WarningFilled, {
+  }, invalid && /*#__PURE__*/_react.default.createElement(_icons.WarningFilled, {
     size: 16,
     className: "".concat(blockClass, "__warning-icon")
-  }), /*#__PURE__*/_react.default.createElement(_react2.IconButton, {
-    size: "sm",
+  }), focused ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_react2.IconButton, {
+    align: tipAlignments.cancel,
+    size: size,
     label: cancelLabel,
     onClick: onCancelHandler,
     kind: "ghost",
@@ -199,7 +226,8 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }, /*#__PURE__*/_react.default.createElement(_icons.Close, {
     size: 16
   })), /*#__PURE__*/_react.default.createElement(_react2.IconButton, {
-    size: "sm",
+    align: tipAlignments.save,
+    size: size,
     label: saveLabel,
     onClick: onSaveHandler,
     kind: "ghost",
@@ -210,8 +238,9 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   }, /*#__PURE__*/_react.default.createElement(_icons.Checkmark, {
     size: 16
   }))) : /*#__PURE__*/_react.default.createElement(_react2.IconButton, {
-    className: "".concat(blockClass, "__btn ").concat(blockClass, "__btn-edit"),
-    size: "sm",
+    align: tipAlignments.edit,
+    className: (0, _classnames.default)("".concat(blockClass, "__btn"), "".concat(blockClass, "__btn-edit"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__btn-edit--always-visible"), editAlwaysVisible)),
+    size: size,
     label: editLabel,
     onClick: onFocusHandler,
     kind: "ghost",
@@ -219,19 +248,36 @@ var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     key: "edit"
   }, /*#__PURE__*/_react.default.createElement(_icons.Edit, {
     size: 16
-  })))), focused && invalid && /*#__PURE__*/_react.default.createElement("p", {
+  })))), invalid && /*#__PURE__*/_react.default.createElement("p", {
     className: "".concat(blockClass, "__warning-text")
-  }, invalidLabel));
+  }, invalidText !== null && invalidText !== void 0 ? invalidText : deprecated_invalidLabel));
 });
-exports.InlineEditV2 = InlineEditV2;
-exports.InlineEditV2 = InlineEditV2 = _settings.pkg.checkComponentEnabled(InlineEditV2, componentName);
-InlineEditV2.displayName = componentName;
-InlineEditV2.propTypes = {
+exports.EditInPlace = EditInPlace;
+exports.EditInPlace = EditInPlace = _settings.pkg.checkComponentEnabled(EditInPlace, componentName);
+EditInPlace.displayName = componentName;
+var deprecatedProps = {
+  /**
+   * **Deprecated**
+   * invalidLabel was misnamed, using invalidText to match Carbon
+   */
+  invalidText: _propTypes.default.string
+};
+exports.deprecatedProps = deprecatedProps;
+
+var alignPropType = _propTypes.default.oneOf(['top', 'top-left', 'top-right', 'bottom', 'bottom-left', 'bottom-right', 'left', 'right']);
+
+EditInPlace.propTypes = _objectSpread({
   /**
    * label for cancel button
    */
   cancelLabel: _propTypes.default.string.isRequired,
 
+  /**
+   * By default the edit icon is shown on hover only.
+   */
+  editAlwaysVisible: _propTypes.default.bool,
+
+  /**
   /**
    * label for edit button
    */
@@ -242,6 +288,15 @@ InlineEditV2.propTypes = {
    */
   id: _propTypes.default.string.isRequired,
 
+  /**
+   * inheritTypography - causes the text entry field to inherit typography settings
+   * assigned to the container. This is useful when editing titles for instance.
+   *
+   * NOTE: The size property limits the vertical size of the input element.
+   * Inherited font's should be selected to fit within the size selected.
+   */
+  inheritTypography: _propTypes.default.bool,
+
   /**
    * determines if the input is invalid
    */
@@ -250,7 +305,7 @@ InlineEditV2.propTypes = {
   /**
    * text that is displayed if the input is invalid
    */
-  invalidLabel: _propTypes.default.string,
+  invalidText: _propTypes.default.string,
 
   /**
    * Provide the text that will be read by a screen reader when visiting this control
@@ -287,13 +342,24 @@ InlineEditV2.propTypes = {
    */
   saveLabel: _propTypes.default.string.isRequired,
 
+  /**
+   * vertical size of control
+   */
+  size: _propTypes.default.oneOf(['sm', 'md', 'lg']),
+
+  /**
+   * tooltipAlignment from the standard tooltip. Default center.
+   *
+   * Can be passed either as one of tooltip options or as an object specifying cancel, edit and save separately
+   */
+  tooltipAlignment: _propTypes.default.oneOfType([alignPropType, _propTypes.default.shape({
+    cancel: alignPropType,
+    edit: alignPropType,
+    save: alignPropType
+  })]),
+
   /**
    * current value of the input
    */
   value: _propTypes.default.string.isRequired
-};
-InlineEditV2.defaultProps = {
-  invalid: false,
-  invalidLabel: '' // readOnly: false,
-
-};
+}, deprecatedProps);

package/lib/components/{InlineEdit → EditInPlace}/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "InlineEdit", {
+Object.defineProperty(exports, "EditInPlace", {
   enumerable: true,
   get: function get() {
-    return _InlineEdit.InlineEdit;
+    return _EditInPlace.EditInPlace;
   }
 });
 
-var _InlineEdit = require("./InlineEdit");
+var _EditInPlace = require("./EditInPlace");