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

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

@@ -1,8 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-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 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) { _defineProperty(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; }
 
 /**
  * Copyright IBM Corp. 2022, 2022
@@ -18,21 +23,31 @@ import { Edit, Checkmark, Close, // EditOff,
 WarningFilled } from '@carbon/react/icons';
 import { pkg, carbon } from '../../settings';
 import { getDevtoolsProps } from '../../global/js/utils/devtools';
-var componentName = 'InlineEditV2';
-var blockClass = "".concat(pkg.prefix, "--inline-edit-v2");
-export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
+var componentName = 'EditInPlace';
+var blockClass = "".concat(pkg.prefix, "--edit-in-place");
+var defaults = {
+  tooltipAlignment: 'top',
+  size: 'sm'
+};
+export var EditInPlace = /*#__PURE__*/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 = _objectWithoutProperties(_ref, _excluded);
 
@@ -54,20 +69,27 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var inputRef = useRef(null);
   var canSave = value !== initialValue && !invalid;
   var escaping = useRef(false);
+  var tipAlignIsObject = _typeof(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;
+  }, {});
   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);
@@ -149,7 +171,7 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
   return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     ref: ref
   }, getDevtoolsProps(componentName)), /*#__PURE__*/React.createElement("div", {
-    className: cx(blockClass, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--focused"), focused), _defineProperty(_cx, "".concat(blockClass, "--invalid"), invalid), _cx)),
+    className: cx(blockClass, "".concat(blockClass, "--").concat(size), (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--focused"), focused), _defineProperty(_cx, "".concat(blockClass, "--invalid"), invalid), _defineProperty(_cx, "".concat(blockClass, "--inherit-type"), inheritTypography), _defineProperty(_cx, "".concat(blockClass, "--overflows"), inputRef.current && inputRef.current.scrollWidth > inputRef.current.offsetWidth), _cx)),
     onFocus: onFocusHandler,
     onBlur: onBlurHandler
   }, /*#__PURE__*/React.createElement("label", {
@@ -157,7 +179,7 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     htmlFor: id
   }, labelText), /*#__PURE__*/React.createElement("input", {
     id: id,
-    className: cx("".concat(blockClass, "__text-input"), "".concat(carbon.prefix, "--text-input"), "".concat(carbon.prefix, "--text-input--sm")),
+    className: cx("".concat(blockClass, "__text-input"), "".concat(carbon.prefix, "--text-input"), "".concat(carbon.prefix, "--text-input--").concat(size)),
     type: "text",
     value: value,
     onChange: onChangeHandler,
@@ -165,12 +187,16 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     ,
     onKeyDown: onKeyHandler
   }), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(blockClass, "__ellipsis"),
+    "aria-hidden": !focused
+  }, "\u2026"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__toolbar")
-  }, focused ? /*#__PURE__*/React.createElement(React.Fragment, null, invalid && /*#__PURE__*/React.createElement(WarningFilled, {
+  }, invalid && /*#__PURE__*/React.createElement(WarningFilled, {
     size: 16,
     className: "".concat(blockClass, "__warning-icon")
-  }), /*#__PURE__*/React.createElement(IconButton, {
-    size: "sm",
+  }), focused ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IconButton, {
+    align: tipAlignments.cancel,
+    size: size,
     label: cancelLabel,
     onClick: onCancelHandler,
     kind: "ghost",
@@ -180,7 +206,8 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React.createElement(Close, {
     size: 16
   })), /*#__PURE__*/React.createElement(IconButton, {
-    size: "sm",
+    align: tipAlignments.save,
+    size: size,
     label: saveLabel,
     onClick: onSaveHandler,
     kind: "ghost",
@@ -191,8 +218,9 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React.createElement(Checkmark, {
     size: 16
   }))) : /*#__PURE__*/React.createElement(IconButton, {
-    className: "".concat(blockClass, "__btn ").concat(blockClass, "__btn-edit"),
-    size: "sm",
+    align: tipAlignments.edit,
+    className: cx("".concat(blockClass, "__btn"), "".concat(blockClass, "__btn-edit"), _defineProperty({}, "".concat(blockClass, "__btn-edit--always-visible"), editAlwaysVisible)),
+    size: size,
     label: editLabel,
     onClick: onFocusHandler,
     kind: "ghost",
@@ -200,18 +228,32 @@ export var InlineEditV2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     key: "edit"
   }, /*#__PURE__*/React.createElement(Edit, {
     size: 16
-  })))), focused && invalid && /*#__PURE__*/React.createElement("p", {
+  })))), invalid && /*#__PURE__*/React.createElement("p", {
     className: "".concat(blockClass, "__warning-text")
-  }, invalidLabel));
+  }, invalidText !== null && invalidText !== void 0 ? invalidText : deprecated_invalidLabel));
 });
-InlineEditV2 = pkg.checkComponentEnabled(InlineEditV2, componentName);
-InlineEditV2.displayName = componentName;
-InlineEditV2.propTypes = {
+EditInPlace = pkg.checkComponentEnabled(EditInPlace, componentName);
+EditInPlace.displayName = componentName;
+export var deprecatedProps = {
+  /**
+   * **Deprecated**
+   * invalidLabel was misnamed, using invalidText to match Carbon
+   */
+  invalidText: PropTypes.string
+};
+var alignPropType = PropTypes.oneOf(['top', 'top-left', 'top-right', 'bottom', 'bottom-left', 'bottom-right', 'left', 'right']);
+EditInPlace.propTypes = _objectSpread({
   /**
    * label for cancel button
    */
   cancelLabel: PropTypes.string.isRequired,
 
+  /**
+   * By default the edit icon is shown on hover only.
+   */
+  editAlwaysVisible: PropTypes.bool,
+
+  /**
   /**
    * label for edit button
    */
@@ -222,6 +264,15 @@ InlineEditV2.propTypes = {
    */
   id: PropTypes.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.bool,
+
   /**
    * determines if the input is invalid
    */
@@ -230,7 +281,7 @@ InlineEditV2.propTypes = {
   /**
    * text that is displayed if the input is invalid
    */
-  invalidLabel: PropTypes.string,
+  invalidText: PropTypes.string,
 
   /**
    * Provide the text that will be read by a screen reader when visiting this control
@@ -267,13 +318,24 @@ InlineEditV2.propTypes = {
    */
   saveLabel: PropTypes.string.isRequired,
 
+  /**
+   * vertical size of control
+   */
+  size: PropTypes.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.oneOfType([alignPropType, PropTypes.shape({
+    cancel: alignPropType,
+    edit: alignPropType,
+    save: alignPropType
+  })]),
+
   /**
    * current value of the input
    */
   value: PropTypes.string.isRequired
-};
-InlineEditV2.defaultProps = {
-  invalid: false,
-  invalidLabel: '' // readOnly: false,
-
-};
+}, deprecatedProps);

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

@@ -4,4 +4,4 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export { InlineEdit } from './InlineEdit';
+export { EditInPlace } from './EditInPlace';

package/es/components/ExpressiveCard/ExpressiveCard.js

@@ -46,12 +46,12 @@ ExpressiveCard.propTypes = {
   /**
    * Optional header description
    */
-  description: PropTypes.string,
+  description: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
 
   /**
    * Optional label for the top of the card
    */
-  label: PropTypes.string,
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
 
   /**
    * Optional media content like an image to be placed in the card
@@ -126,6 +126,6 @@ ExpressiveCard.propTypes = {
   /**
    * Title that's displayed at the top of the card
    */
-  title: PropTypes.string
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node])
 };
 ExpressiveCard.displayName = componentName;

package/es/components/PageHeader/PageHeader.js

@@ -18,7 +18,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { spacing10, baseFontSize } from '@carbon/layout';
 import cx from 'classnames';
-import { useResizeDetector } from 'react-resize-detector';
+import { useResizeObserver } from '../../global/js/hooks/useResizeObserver';
 import { FlexGrid, Column, Row, Button, Tag } from '@carbon/react';
 import { breakpoints } from '@carbon/layout';
 import { useWindowResize, useNearestScroll } from '../../global/js/hooks';
@@ -39,7 +39,7 @@ var defaults = {
   narrowGrid: false
 };
 export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var _withoutBackground, _enableBreadcrumbScro, _ref6, _cx2, _ref7, _cx4, _cx7;
+  var _withoutBackground, _enableBreadcrumbScro, _ref7, _cx2, _ref8, _cx4, _cx7;
 
   var actionBarItems = _ref.actionBarItems,
       actionBarMenuOptionsClass = _ref.actionBarMenuOptionsClass,
@@ -195,7 +195,9 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   /* istanbul ignore next */
 
 
-  var handleResizeActionBarColumn = function handleResizeActionBarColumn(width) {
+  var handleResizeActionBarColumn = function handleResizeActionBarColumn(_ref4) {
+    var width = _ref4.width;
+
     /* don't know how to test resize */
 
     /* istanbul ignore next */
@@ -280,8 +282,8 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [headerRef, enableBreadcrumbScroll, metrics, metrics.breadcrumbRowHeight, metrics.breadcrumbRowSpaceBelow, metrics.breadcrumbTitleHeight, metrics.breadcrumbRowWidth, metrics.headerHeight, metrics.headerWidth, metrics.headerOffset, metrics.headerTopValue, metrics.navigationRowHeight, navigation, scrollYValue, tags]);
   useNearestScroll(headerRef, // on scroll or various layout changes check updates if needed
   // istanbul ignore next
-  function (_ref4) {
-    var current = _ref4.current;
+  function (_ref5) {
+    var current = _ref5.current;
     setPageHeaderStyles(function (prev) {
       return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, "--".concat(blockClass, "--breadcrumb-top"), "".concat(metrics.headerOffset, "px")));
     });
@@ -297,8 +299,8 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     document.documentElement.style.setProperty("--".concat(blockClass, "--tagset-tooltip-offset"), "".concat(tagsetTooltipOffset, "px"));
     setScrollYValue(current.scrollY);
   }, [metrics.headerHeight, metrics.headerTopValue, metrics.headerOffset, enableBreadcrumbScroll]);
-  useWindowResize(function (_ref5) {
-    var current = _ref5.current;
+  useWindowResize(function (_ref6) {
+    var current = _ref6.current;
     // on window resize and other updates some values may have changed
     checkUpdateVerticalSpace();
     setWidthIsNarrow(current.innerWidth / 16 < parseInt(breakpoints.md.width)); // small (below medium) media query
@@ -348,15 +350,11 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       utilSetCollapsed(collapseHeader, metrics.headerOffset, metrics.headerTopValue);
     }
   }, [collapseHeader, metrics.headerOffset, metrics.headerTopValue]);
-  useResizeDetector({
-    onResize: handleResizeActionBarColumn,
-    targetRef: sizingContainerRef,
-    handleWidth: true
+  useResizeObserver(sizingContainerRef, {
+    callback: handleResizeActionBarColumn
   });
-  useResizeDetector({
-    onResize: handleResize,
-    targetRef: headerRef,
-    handleHeight: true
+  useResizeObserver(headerRef, {
+    callback: handleResize
   }); // Determine what form of title to display in the breadcrumb
 
   var breadcrumbItemForTitle = utilGetBreadcrumbItemForTitle(blockClass, collapseTitle, title);
@@ -364,7 +362,7 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     className: "".concat(blockClass, "--offset-top-measuring-element"),
     ref: offsetTopMeasuringRef
   }), /*#__PURE__*/React.createElement("section", _extends({}, rest, {
-    className: cx([blockClass, "".concat(blockClass, "--no-margins-below-row"), className, (_ref6 = {}, _defineProperty(_ref6, "".concat(blockClass, "--has-navigation"), navigation || tags), _defineProperty(_ref6, "".concat(blockClass, "--has-navigation-tags-only"), !navigation && tags), _ref6)]),
+    className: cx([blockClass, "".concat(blockClass, "--no-margins-below-row"), className, (_ref7 = {}, _defineProperty(_ref7, "".concat(blockClass, "--has-navigation"), navigation || tags), _defineProperty(_ref7, "".concat(blockClass, "--has-navigation-tags-only"), !navigation && tags), _ref7)]),
     style: pageHeaderStyles,
     ref: headerRef
   }, getDevtoolsProps(componentName)), /*#__PURE__*/React.createElement(FlexGrid, {
@@ -386,7 +384,7 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     breadcrumbs: breadcrumbs && breadcrumbItemForTitle ? breadcrumbs.concat(breadcrumbItemForTitle) : breadcrumbItemForTitle ? [breadcrumbItemForTitle] : breadcrumbs // breadcrumbs may be null or undefined
 
   }) : null), /*#__PURE__*/React.createElement(Column, {
-    className: cx(["".concat(blockClass, "__action-bar-column ").concat(blockClass, "__action-bar-column--background"), (_ref7 = {}, _defineProperty(_ref7, "".concat(blockClass, "__action-bar-column--has-page-actions"), pageActions), _defineProperty(_ref7, "".concat(blockClass, "__action-bar-column--influenced-by-collapse-button"), spaceForCollapseButton), _ref7)])
+    className: cx(["".concat(blockClass, "__action-bar-column ").concat(blockClass, "__action-bar-column--background"), (_ref8 = {}, _defineProperty(_ref8, "".concat(blockClass, "__action-bar-column--has-page-actions"), pageActions), _defineProperty(_ref8, "".concat(blockClass, "__action-bar-column--influenced-by-collapse-button"), spaceForCollapseButton), _ref8)])
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(blockClass, "__action-bar-column-content"),
     ref: sizingContainerRef
@@ -446,8 +444,9 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     showAllTagsLabel: showAllTagsLabel,
     tags: tags,
     overflowClassName: "".concat(blockClass, "__navigation-tags-overflow")
-  })) : null) : null), hasCollapseButton ? /*#__PURE__*/React.createElement(Button, {
-    className: cx("".concat(blockClass, "__collapse-expand-toggle"), _defineProperty({}, "".concat(blockClass, "__collapse-expand-toggle--collapsed"), fullyCollapsed)),
+  })) : null) : null), hasCollapseButton ? /*#__PURE__*/React.createElement("div", {
+    className: cx("".concat(blockClass, "__collapse-expand-toggle"), _defineProperty({}, "".concat(blockClass, "__collapse-expand-toggle--collapsed"), fullyCollapsed))
+  }, /*#__PURE__*/React.createElement(Button, {
     hasIconOnly: true,
     iconDescription:
     /* istanbul ignore next */
@@ -463,7 +462,7 @@ export var PageHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     tooltipPosition: "bottom",
     tooltipAlignment: "end",
     type: "button"
-  }) : null));
+  })) : null));
 
   function thePageActions(isBreadcrumbRow, inBreadcrumbRow) {
     if (pageActions) {
@@ -542,8 +541,8 @@ PageHeader.propTypes = _objectSpread({
    *
    * NOTE: This prop is required if actionBarItems are supplied
    */
-  actionBarOverflowAriaLabel: PropTypes.string.isRequired.if(function (_ref9) {
-    var actionBarItems = _ref9.actionBarItems;
+  actionBarOverflowAriaLabel: PropTypes.string.isRequired.if(function (_ref10) {
+    var actionBarItems = _ref10.actionBarItems;
     return actionBarItems && actionBarItems.length > 0;
   }),
 
@@ -578,8 +577,8 @@ PageHeader.propTypes = _objectSpread({
    * If the user supplies breadcrumbs then this property is required.
    * It is used in an overflow menu when there is insufficient space to display all breadcrumbs inline.
    */
-  breadcrumbOverflowAriaLabel: PropTypes.string.isRequired.if(function (_ref10) {
-    var breadcrumbs = _ref10.breadcrumbs;
+  breadcrumbOverflowAriaLabel: PropTypes.string.isRequired.if(function (_ref11) {
+    var breadcrumbs = _ref11.breadcrumbs;
     return breadcrumbs && breadcrumbs.length > 0;
   }),
 
@@ -618,8 +617,8 @@ PageHeader.propTypes = _objectSpread({
     /**
      * A text version of the `label` for display, required if `label` is not a string.
      */
-    title: PropTypes.string.isRequired.if(function (_ref11) {
-      var label = _ref11.label;
+    title: PropTypes.string.isRequired.if(function (_ref12) {
+      var label = _ref12.label;
       return typeof label !== 'string';
     })
   })),
@@ -649,9 +648,9 @@ PageHeader.propTypes = _objectSpread({
    * If `hasCollapseHeaderToggle` is set and `withoutBackground` is unset/falsy then assistive text is
    * required for both the expend and collapse states of the button component used.
    */
-  collapseHeaderIconDescription: PropTypes.string.isRequired.if(function (_ref12) {
-    var withoutBackground = _ref12.withoutBackground,
-        hasCollapseHeaderToggle = _ref12.hasCollapseHeaderToggle;
+  collapseHeaderIconDescription: PropTypes.string.isRequired.if(function (_ref13) {
+    var withoutBackground = _ref13.withoutBackground,
+        hasCollapseHeaderToggle = _ref13.hasCollapseHeaderToggle;
     return !withoutBackground && hasCollapseHeaderToggle;
   }),
 
@@ -671,9 +670,9 @@ PageHeader.propTypes = _objectSpread({
    * If `hasCollapseHeaderToggle` is set and `withoutBackground` is unset/falsy then assistive text is
    * required for both the expend and collapse states of the button component used.
    */
-  expandHeaderIconDescription: PropTypes.string.isRequired.if(function (_ref13) {
-    var withoutBackground = _ref13.withoutBackground,
-        hasCollapseHeaderToggle = _ref13.hasCollapseHeaderToggle;
+  expandHeaderIconDescription: PropTypes.string.isRequired.if(function (_ref14) {
+    var withoutBackground = _ref14.withoutBackground,
+        hasCollapseHeaderToggle = _ref14.hasCollapseHeaderToggle;
     return !withoutBackground && hasCollapseHeaderToggle;
   }),
 
@@ -744,8 +743,8 @@ PageHeader.propTypes = _objectSpread({
    *
    * NOTE: This prop is required if pageActions are supplied
    */
-  pageActionsOverflowLabel: PropTypes.node.isRequired.if(function (_ref14) {
-    var pageActions = _ref14.pageActions;
+  pageActionsOverflowLabel: PropTypes.node.isRequired.if(function (_ref15) {
+    var pageActions = _ref15.pageActions;
     return pageActions && pageActions.length > 0 && !pageActions.content;
   }),
 
@@ -808,14 +807,17 @@ PageHeader.propTypes = _objectSpread({
     loading: PropTypes.bool,
     // inline edit version properties
     editableLabel: PropTypes.string,
-    // .isRequired.if(inlineEditRequired),
+    // .isRequired.if(editInPlaceRequired),
     id: PropTypes.string,
-    // .isRequired.if(inlineEditRequired),
+    // .isRequired.if(editInPlaceRequired),
+    onCancel: PropTypes.func,
     onChange: PropTypes.func,
     onSave: PropTypes.func,
     cancelDescription: PropTypes.string,
-    //.isRequired.if(inlineEditRequired),
-    saveDescription: PropTypes.string //.isRequired.if(inlineEditRequired),
+    //.isRequired.if(editInPlaceRequired),
+    editDescription: PropTypes.string,
+    // .isRequired.if(editInPlaceRequired),
+    saveDescription: PropTypes.string //.isRequired.if(editInPlaceRequired),
     // Update docgen if changed
 
   }), PropTypes.string, PropTypes.shape({

package/es/components/PageHeader/PageHeaderTitle.js

@@ -1,12 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["text", "content", "loading", "icon", "asText", "onChange", "onSave", "editDescription", "editableLabel", "revertDescription", "saveDescription"];
+var _excluded = ["text", "content", "loading", "icon", "asText", "onChange", "onSave", "editDescription", "editableLabel", "cancelDescription", "saveDescription"];
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { SkeletonText } from '@carbon/react';
-import { InlineEdit } from '../';
+import { EditInPlace } from '../';
 /**
  *
  * Utility component used by Page Header
@@ -29,7 +29,7 @@ export var PageHeaderTitle = function PageHeaderTitle(_ref) {
       onSave = title.onSave,
       editDescription = title.editDescription,
       editableLabel = title.editableLabel,
-      revertDescription = title.revertDescription,
+      cancelDescription = title.cancelDescription,
       saveDescription = title.saveDescription,
       rest = _objectWithoutProperties(title, _excluded);
 
@@ -47,17 +47,17 @@ export var PageHeaderTitle = function PageHeaderTitle(_ref) {
       className: "".concat(blockClass, "__title-icon")
     }) : null, loading ? /*#__PURE__*/React.createElement(SkeletonText, {
       className: "".concat(blockClass, "__title-skeleton")
-    }) : isEditable ? /*#__PURE__*/React.createElement(InlineEdit, _extends({
-      v1: true,
-      hideLabel: true,
+    }) : isEditable ? /*#__PURE__*/React.createElement(EditInPlace, _extends({
+      tooltipAlignment: "bottom",
       value: text,
-      editDescription: editDescription,
+      cancelLabel: cancelDescription,
+      editLabel: editDescription,
+      saveLabel: saveDescription,
+      labelText: editableLabel,
       onChange: onChange,
       onSave: onSave,
-      labelText: editableLabel,
-      revertDescription: revertDescription,
-      saveDescription: saveDescription,
-      buttonTooltipPosition: "bottom"
+      size: "md",
+      inheritTypography: true
     }, rest)) : /*#__PURE__*/React.createElement("span", {
       title: !loading ? asText : null
     }, text));
@@ -71,7 +71,7 @@ export var PageHeaderTitle = function PageHeaderTitle(_ref) {
     title: titleText
   }, titleInnards);
 };
-export var inlineEditRequired = function inlineEditRequired(_ref2) {
+export var editInPlaceRequired = function editInPlaceRequired(_ref2) {
   var onSave = _ref2.onSave;
   return !!onSave;
 };
@@ -97,7 +97,7 @@ PageHeaderTitle.propTypes = {
    *    - onSave: function to process a confirmed change
    *    - editDescription: description for edit button
    *    - editableLabel: label for edit required if onSave supplied
-   *    - revertDescription: description for edit revert button
+   *    - cancelDescription: description for edit cancel button
    *    - saveDescription: description for edit save button
    * - Object containing user defined contents. These must fit within the area defined for the title in both main part of the header and the breadcrumb.
    *    - content: title or name of current location shown in main part of page header
@@ -110,13 +110,13 @@ PageHeaderTitle.propTypes = {
     icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
     loading: PropTypes.bool,
     // inline edit version properties
-    editDescription: PropTypes.string.isRequired.if(inlineEditRequired),
-    editableLabel: PropTypes.string.isRequired.if(inlineEditRequired),
-    id: PropTypes.string.isRequired.if(inlineEditRequired),
+    editDescription: PropTypes.string.isRequired.if(editInPlaceRequired),
+    editableLabel: PropTypes.string.isRequired.if(editInPlaceRequired),
+    id: PropTypes.string.isRequired.if(editInPlaceRequired),
     onChange: PropTypes.func,
     onSave: PropTypes.func,
-    revertDescription: PropTypes.string.isRequired.if(inlineEditRequired),
-    saveDescription: PropTypes.string.isRequired.if(inlineEditRequired) // Update docgen if changed
+    cancelDescription: PropTypes.string.isRequired.if(editInPlaceRequired),
+    saveDescription: PropTypes.string.isRequired.if(editInPlaceRequired) // Update docgen if changed
 
   }), PropTypes.string, PropTypes.shape({
     content: PropTypes.node.isRequired,

package/es/components/ProductiveCard/ProductiveCard.js

@@ -75,12 +75,12 @@ ProductiveCard.propTypes = {
   /**
    * Optional header description
    */
-  description: PropTypes.string,
+  description: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
 
   /**
    * Optional label for the top of the card
    */
-  label: PropTypes.string,
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
 
   /**
    * Provides the callback for a clickable card
@@ -130,7 +130,7 @@ ProductiveCard.propTypes = {
   /**
    * Title that's displayed at the top of the card
    */
-  title: PropTypes.string,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
 
   /**
    * Determines title size