@carbon/ibm-products 2.0.0-rc.5 → 2.0.0-rc.7

package/es/components/OptionsTile/OptionsTile.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "className", "enabled", "invalid", "invalidText", "locked", "lockedText", "onToggle", "open", "size", "summary", "title", "titleId", "warn", "warnText"];
+var _excluded = ["children", "className", "enabled", "invalid", "invalidText", "locked", "lockedText", "onChange", "onToggle", "open", "size", "summary", "title", "titleId", "warn", "warnText"];
 
 /**
  * Copyright IBM Corp. 2021, 2022
@@ -17,7 +17,8 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { getDevtoolsProps } from '../../global/js/utils/devtools';
 import uuidv4 from '../../global/js/utils/uuidv4';
-import { pkg } from '../../settings'; // Carbon and package components we use.
+import { pkg } from '../../settings';
+import { useControllableState } from '../../global/js/hooks'; // Carbon and package components we use.
 
 import { Toggle } from '@carbon/react';
 import { ChevronDown, Locked, WarningAltFilled, WarningFilled } from '@carbon/react/icons';
@@ -28,6 +29,7 @@ var componentName = 'OptionsTile'; // NOTE: the component SCSS is not imported h
 // Default values for props
 
 var defaults = {
+  onChange: function onChange() {},
   size: 'xl'
 };
 /**
@@ -42,6 +44,8 @@ export var OptionsTile = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       invalidText = _ref.invalidText,
       locked = _ref.locked,
       lockedText = _ref.lockedText,
+      _ref$onChange = _ref.onChange,
+      _onChange = _ref$onChange === void 0 ? defaults.onChange : _ref$onChange,
       onToggle = _ref.onToggle,
       open = _ref.open,
       _ref$size = _ref.size,
@@ -55,18 +59,24 @@ export var OptionsTile = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
   var _useState = useState(open),
       _useState2 = _slicedToArray(_useState, 2),
-      isOpen = _useState2[0],
-      setIsOpen = _useState2[1];
+      prevIsOpen = _useState2[0],
+      setPrevIsOpen = _useState2[1];
 
-  var _useState3 = useState(open),
+  var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
-      prevIsOpen = _useState4[0],
-      setPrevIsOpen = _useState4[1];
-
-  var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      closing = _useState6[0],
-      setClosing = _useState6[1];
+      closing = _useState4[0],
+      setClosing = _useState4[1];
+
+  var _useControllableState = useControllableState({
+    value: open,
+    defaultValue: open || null,
+    onChange: function onChange(value) {
+      return _onChange(value);
+    }
+  }),
+      _useControllableState2 = _slicedToArray(_useControllableState, 2),
+      isOpen = _useControllableState2[0],
+      setIsOpen = _useControllableState2[1];
 
   var detailsRef = useRef(null);
   var contentRef = useRef(null);
@@ -297,6 +307,12 @@ OptionsTile.propTypes = {
    */
   lockedText: PropTypes.string,
 
+  /**
+   * Provide a function which will be called each time the user
+   * toggles the open state of the OptionsTile.
+   */
+  onChange: PropTypes.func,
+
   /**
    * Provide a function which will be called each time the user
    * interacts with the toggle.

package/es/global/js/hooks/index.js

@@ -13,4 +13,5 @@ export { useCreateComponentStepChange } from './useCreateComponentStepChange';
 export { usePreviousValue } from './usePreviousValue';
 export { useResetCreateComponent } from './useResetCreateComponent';
 export { useRetrieveStepData } from './useRetrieveStepData';
-export { useValidCreateStepCount } from './useValidCreateStepCount';
+export { useValidCreateStepCount } from './useValidCreateStepCount';
+export { useControllableState } from './useControllableState';

package/es/global/js/hooks/useControllableState.js

@@ -0,0 +1,83 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+/**
+ * Copyright IBM Corp. 2016, 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.
+ */
+import { useEffect, useRef, useState } from 'react';
+import pconsole from '../utils/pconsole';
+/**
+ * This custom hook simplifies the behavior of a component if it has state that
+ * can be both controlled and uncontrolled. It functions identical to a
+ * useState() hook and provides [state, setState] for you to use. You can use
+ * the `onChange` argument to allow updates to the `state` to be communicated to
+ * owners of controlled components.
+ *
+ * Note: this hook will warn if a component is switching from controlled to
+ * uncontrolled, or vice-versa.
+ *
+ * @param {object} config
+ * @param {string} config.name - the name of the custom component
+ * @param {any} config.defaultValue - the default value used for the state. This will be
+ * the fallback value used if `value` is not defined.
+ * @param {Function} config.onChange - an optional function that is called when
+ * the value of the state changes. This is useful for communicating to parents of
+ * controlled components that the value is requesting to be changed.
+ * @param {any} config.value - a controlled value. Omitting this means that the state is
+ * uncontrolled
+ * @returns {[any, Function]}
+ */
+
+export function useControllableState(_ref) {
+  var defaultValue = _ref.defaultValue,
+      _ref$name = _ref.name,
+      name = _ref$name === void 0 ? 'custom' : _ref$name,
+      onChange = _ref.onChange,
+      value = _ref.value;
+
+  var _useState = useState(value !== null && value !== void 0 ? value : defaultValue),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      internalSetState = _useState2[1];
+
+  var controlled = useRef(null);
+
+  if (controlled.current === null) {
+    controlled.current = value !== undefined;
+  }
+
+  function setState(stateOrUpdater) {
+    var value = typeof stateOrUpdater === 'function' ? stateOrUpdater(state) : stateOrUpdater;
+
+    if (controlled.current === false) {
+      internalSetState(value);
+    }
+
+    if (onChange) {
+      onChange(value);
+    }
+  }
+
+  useEffect(function () {
+    var controlledValue = value !== undefined; // Uncontrolled -> Controlled
+    // If the component prop is uncontrolled, the prop value should be undefined
+
+    if (controlled.current === false && controlledValue) {
+      pconsole.warn("A component is changing an uncontrolled %s component to be controlled.\n          This is likely caused by the value changing to a defined value\n          from undefined. Decide between using a controlled or uncontrolled\n          value for the lifetime of the component.\n          More info: https://reactjs.org/link/controlled-components");
+    } // Controlled -> Uncontrolled
+    // If the component prop is controlled, the prop value should be defined
+
+
+    if (controlled.current === true && !controlledValue) {
+      pconsole.warn("A component is changing a controlled %s component to be uncontrolled.\n        'This is likely caused by the value changing to an undefined value\n        'from a defined one. Decide between using a controlled or\n        'uncontrolled value for the lifetime of the component.\n        'More info: https://reactjs.org/link/controlled-components");
+    }
+  }, [name, value]);
+
+  if (controlled.current === true) {
+    return [value, setState];
+  }
+
+  return [state, setState];
+}

package/lib/components/ActionSet/ActionSet.js

@@ -25,7 +25,7 @@ var _propsHelper = require("../../global/js/utils/props-helper");
 
 var _react2 = require("@carbon/react");
 
-var _excluded = ["className", "disabled", "kind", "label", "loading"],
+var _excluded = ["className", "disabled", "kind", "label", "loading", "isExpressive"],
     _excluded2 = ["actions", "buttonSize", "className", "size"];
 
 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; }
@@ -36,15 +36,19 @@ var blockClass = "".concat(_settings.pkg.prefix, "--action-set");
 var componentName = 'ActionSet'; // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 var ActionSetButton = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
+  var _ref2;
+
   var className = _ref.className,
       disabled = _ref.disabled,
       kind = _ref.kind,
       label = _ref.label,
       loading = _ref.loading,
+      _ref$isExpressive = _ref.isExpressive,
+      isExpressive = _ref$isExpressive === void 0 ? true : _ref$isExpressive,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_react2.Button, (0, _extends2.default)({}, rest, {
-    isExpressive: true,
-    className: (0, _classnames.default)(className, ["".concat(blockClass, "__action-button"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost' || kind === 'danger--ghost')]),
+    isExpressive: isExpressive,
+    className: (0, _classnames.default)(className, ["".concat(blockClass, "__action-button"), (_ref2 = {}, (0, _defineProperty2.default)(_ref2, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost' || kind === 'danger--ghost'), (0, _defineProperty2.default)(_ref2, "".concat(blockClass, "__action-button--expressive"), isExpressive), _ref2)]),
     disabled: disabled || loading || false,
     kind: kind,
     ref: ref

package/lib/components/AddSelect/add-select-utils.js

@@ -104,7 +104,7 @@ var getFilteredItems = function getFilteredItems(useNormalizedItems, normalizedI
 
     if (searchTerm || globalFiltersApplied) {
       var results = itemIds.reduce(function (prev, cur) {
-        if (normalizedItems[cur].title.toLowerCase().includes(searchTerm)) {
+        if (normalizedItems[cur].title.toLowerCase().includes(searchTerm.toLowerCase())) {
           prev.push(normalizedItems[cur]);
         }
 
@@ -151,7 +151,7 @@ var getFilteredItems = function getFilteredItems(useNormalizedItems, normalizedI
   } else {
     if (searchTerm) {
       return items.entries.filter(function (item) {
-        return item.title.toLowerCase().includes(searchTerm);
+        return item.title.toLowerCase().includes(searchTerm.toLowerCase());
       });
     }
 

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

@@ -140,7 +140,7 @@ var DatagridContent = function DatagridContent(_ref) {
     }
 
     var gridElement = document.querySelector("#".concat(tableId));
-    var tableHeader = document.querySelector(".".concat(_settings.carbon.prefix, "--data-table-header"));
+    var tableHeader = gridElement === null || gridElement === void 0 ? void 0 : gridElement.querySelector(".".concat(_settings.carbon.prefix, "--data-table-header"));
     gridElement.style.setProperty("--".concat(blockClass, "--grid-width"), (0, _layout.px)(totalColumnsWidth + 32));
 
     if (gridActive) {

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

@@ -50,7 +50,7 @@ var DatagridRow = function DatagridRow(datagridState) {
   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), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__carbon-row-hover-active"), activeCellObject && row.index === activeCellObject.row), _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(blockClass, "__carbon-row-expandable"), row.canExpand), (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) {
@@ -61,7 +61,7 @@ var DatagridRow = function DatagridRow(datagridState) {
       var hoverRow = event.target.closest(".".concat(blockClass, "__carbon-row-expanded"));
       hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.classList.remove("".concat(blockClass, "__carbon-row-expanded-hover-active"));
     }
-  }), row.cells.map(function (cell) {
+  }), row.cells.map(function (cell, index) {
     var cellProps = cell.getCellProps();
     var children = cellProps.children,
         restProps = (0, _objectWithoutProperties2.default)(cellProps, _excluded);
@@ -76,7 +76,7 @@ var DatagridRow = function DatagridRow(datagridState) {
     }
 
     return /*#__PURE__*/_react.default.createElement(TableCell, (0, _extends2.default)({
-      className: "".concat(blockClass, "__cell")
+      className: (0, _classnames.default)("".concat(blockClass, "__cell"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__expandable-row-cell"), row.canExpand && index === 0))
     }, restProps, {
       key: cell.column.id
     }), content);

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

@@ -58,7 +58,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
 
   var selectedFlatRows = datagridState.selectedFlatRows,
       toggleAllRowsSelected = datagridState.toggleAllRowsSelected,
-      toolbarBatchActions = datagridState.toolbarBatchActions;
+      toolbarBatchActions = datagridState.toolbarBatchActions,
+      setGlobalFilter = datagridState.setGlobalFilter;
   var totalSelected = selectedFlatRows && selectedFlatRows.length; // Get initial width of batch actions container,
   // used to measure when all items are put inside
   // the ButtonMenu
@@ -135,7 +136,8 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
     shouldShowBatchActions: totalSelected > 0,
     totalSelected: totalSelected,
     onCancel: function onCancel() {
-      return toggleAllRowsSelected(false);
+      toggleAllRowsSelected(false);
+      setGlobalFilter(null);
     }
   }, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
     if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length === 3) {

package/lib/components/Datagrid/useNestedRowExpander.js

@@ -9,6 +9,8 @@ exports.default = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -38,7 +40,11 @@ var useNestedRowExpander = function useNestedRowExpander(hooks) {
         var _cx;
 
         var row = _ref.row;
-        return row.canExpand && /*#__PURE__*/_react.default.createElement("span", row.getToggleRowExpandedProps(), /*#__PURE__*/_react.default.createElement(_icons.ChevronRight, {
+        return row.canExpand && /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({
+          type: "button",
+          "aria-label": "Expand current row",
+          className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
+        }, row.getToggleRowExpandedProps()), /*#__PURE__*/_react.default.createElement(_icons.ChevronRight, {
           className: (0, _classnames.default)("".concat(blockClass, "__expander-icon"), (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--not-open"), !row.isExpanded), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__expander-icon--open"), row.isExpanded), _cx))
         }));
       },

package/lib/components/Datagrid/useRowExpander.js

@@ -9,10 +9,16 @@ exports.default = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _icons = require("@carbon/react/icons");
 
+var _settings = require("../../settings");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
 /* eslint-disable react/prop-types */
 
 /*
@@ -22,16 +28,22 @@ var _icons = require("@carbon/react/icons");
  * US Government Users Restricted Rights - Use, duplication or disclosure
  * restricted by GSA ADP Schedule Contract with IBM Corp.
  */
+var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
+
 var useRowExpander = function useRowExpander(hooks) {
   var visibleColumns = function visibleColumns(columns) {
     var expanderColumn = {
       id: 'expander',
       Cell: function Cell(_ref) {
         var row = _ref.row;
-        return row.canExpand && /*#__PURE__*/_react.default.createElement("span", row.getToggleRowExpandedProps(), row.isExpanded ? /*#__PURE__*/_react.default.createElement(_icons.ChevronUp, {
-          size: 16
+        return row.canExpand && /*#__PURE__*/_react.default.createElement("button", (0, _extends2.default)({
+          type: "button",
+          "aria-label": "Expand current row",
+          className: (0, _classnames.default)("".concat(blockClass, "__row-expander"), "".concat(_settings.carbon.prefix, "--btn"), "".concat(_settings.carbon.prefix, "--btn--ghost"))
+        }, row.getToggleRowExpandedProps()), row.isExpanded ? /*#__PURE__*/_react.default.createElement(_icons.ChevronUp, {
+          className: "".concat(blockClass, "__row-expander--icon")
         }) : /*#__PURE__*/_react.default.createElement(_icons.ChevronDown, {
-          size: 16
+          className: "".concat(blockClass, "__row-expander--icon")
         }));
       },
       width: 48,

package/lib/components/OptionsTile/OptionsTile.js

@@ -29,13 +29,15 @@ var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
 
 var _settings = require("../../settings");
 
+var _hooks = require("../../global/js/hooks");
+
 var _react2 = require("@carbon/react");
 
 var _icons = require("@carbon/react/icons");
 
 var carbonMotion = _interopRequireWildcard(require("@carbon/motion"));
 
-var _excluded = ["children", "className", "enabled", "invalid", "invalidText", "locked", "lockedText", "onToggle", "open", "size", "summary", "title", "titleId", "warn", "warnText"];
+var _excluded = ["children", "className", "enabled", "invalid", "invalidText", "locked", "lockedText", "onChange", "onToggle", "open", "size", "summary", "title", "titleId", "warn", "warnText"];
 
 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); }
 
@@ -47,6 +49,7 @@ var componentName = 'OptionsTile'; // NOTE: the component SCSS is not imported h
 // Default values for props
 
 var defaults = {
+  onChange: function onChange() {},
   size: 'xl'
 };
 /**
@@ -61,6 +64,8 @@ var OptionsTile = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       invalidText = _ref.invalidText,
       locked = _ref.locked,
       lockedText = _ref.lockedText,
+      _ref$onChange = _ref.onChange,
+      _onChange = _ref$onChange === void 0 ? defaults.onChange : _ref$onChange,
       onToggle = _ref.onToggle,
       open = _ref.open,
       _ref$size = _ref.size,
@@ -74,18 +79,24 @@ var OptionsTile = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
 
   var _useState = (0, _react.useState)(open),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      isOpen = _useState2[0],
-      setIsOpen = _useState2[1];
+      prevIsOpen = _useState2[0],
+      setPrevIsOpen = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(open),
+  var _useState3 = (0, _react.useState)(false),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      prevIsOpen = _useState4[0],
-      setPrevIsOpen = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(false),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      closing = _useState6[0],
-      setClosing = _useState6[1];
+      closing = _useState4[0],
+      setClosing = _useState4[1];
+
+  var _useControllableState = (0, _hooks.useControllableState)({
+    value: open,
+    defaultValue: open || null,
+    onChange: function onChange(value) {
+      return _onChange(value);
+    }
+  }),
+      _useControllableState2 = (0, _slicedToArray2.default)(_useControllableState, 2),
+      isOpen = _useControllableState2[0],
+      setIsOpen = _useControllableState2[1];
 
   var detailsRef = (0, _react.useRef)(null);
   var contentRef = (0, _react.useRef)(null);
@@ -318,6 +329,12 @@ OptionsTile.propTypes = {
    */
   lockedText: _propTypes.default.string,
 
+  /**
+   * Provide a function which will be called each time the user
+   * toggles the open state of the OptionsTile.
+   */
+  onChange: _propTypes.default.func,
+
   /**
    * Provide a function which will be called each time the user
    * interacts with the toggle.

package/lib/global/js/hooks/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "useClickOutside", {
     return _useClickOutside.useClickOutside;
   }
 });
+Object.defineProperty(exports, "useControllableState", {
+  enumerable: true,
+  get: function get() {
+    return _useControllableState.useControllableState;
+  }
+});
 Object.defineProperty(exports, "useCreateComponentFocus", {
   enumerable: true,
   get: function get() {
@@ -88,4 +94,6 @@ var _useResetCreateComponent = require("./useResetCreateComponent");
 
 var _useRetrieveStepData = require("./useRetrieveStepData");
 
-var _useValidCreateStepCount = require("./useValidCreateStepCount");
+var _useValidCreateStepCount = require("./useValidCreateStepCount");
+
+var _useControllableState = require("./useControllableState");

package/lib/global/js/hooks/useControllableState.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useControllableState = useControllableState;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+var _pconsole = _interopRequireDefault(require("../utils/pconsole"));
+
+/**
+ * Copyright IBM Corp. 2016, 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.
+ */
+
+/**
+ * This custom hook simplifies the behavior of a component if it has state that
+ * can be both controlled and uncontrolled. It functions identical to a
+ * useState() hook and provides [state, setState] for you to use. You can use
+ * the `onChange` argument to allow updates to the `state` to be communicated to
+ * owners of controlled components.
+ *
+ * Note: this hook will warn if a component is switching from controlled to
+ * uncontrolled, or vice-versa.
+ *
+ * @param {object} config
+ * @param {string} config.name - the name of the custom component
+ * @param {any} config.defaultValue - the default value used for the state. This will be
+ * the fallback value used if `value` is not defined.
+ * @param {Function} config.onChange - an optional function that is called when
+ * the value of the state changes. This is useful for communicating to parents of
+ * controlled components that the value is requesting to be changed.
+ * @param {any} config.value - a controlled value. Omitting this means that the state is
+ * uncontrolled
+ * @returns {[any, Function]}
+ */
+function useControllableState(_ref) {
+  var defaultValue = _ref.defaultValue,
+      _ref$name = _ref.name,
+      name = _ref$name === void 0 ? 'custom' : _ref$name,
+      onChange = _ref.onChange,
+      value = _ref.value;
+
+  var _useState = (0, _react.useState)(value !== null && value !== void 0 ? value : defaultValue),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      state = _useState2[0],
+      internalSetState = _useState2[1];
+
+  var controlled = (0, _react.useRef)(null);
+
+  if (controlled.current === null) {
+    controlled.current = value !== undefined;
+  }
+
+  function setState(stateOrUpdater) {
+    var value = typeof stateOrUpdater === 'function' ? stateOrUpdater(state) : stateOrUpdater;
+
+    if (controlled.current === false) {
+      internalSetState(value);
+    }
+
+    if (onChange) {
+      onChange(value);
+    }
+  }
+
+  (0, _react.useEffect)(function () {
+    var controlledValue = value !== undefined; // Uncontrolled -> Controlled
+    // If the component prop is uncontrolled, the prop value should be undefined
+
+    if (controlled.current === false && controlledValue) {
+      _pconsole.default.warn("A component is changing an uncontrolled %s component to be controlled.\n          This is likely caused by the value changing to a defined value\n          from undefined. Decide between using a controlled or uncontrolled\n          value for the lifetime of the component.\n          More info: https://reactjs.org/link/controlled-components");
+    } // Controlled -> Uncontrolled
+    // If the component prop is controlled, the prop value should be defined
+
+
+    if (controlled.current === true && !controlledValue) {
+      _pconsole.default.warn("A component is changing a controlled %s component to be uncontrolled.\n        'This is likely caused by the value changing to an undefined value\n        'from a defined one. Decide between using a controlled or\n        'uncontrolled value for the lifetime of the component.\n        'More info: https://reactjs.org/link/controlled-components");
+    }
+  }, [name, value]);
+
+  if (controlled.current === true) {
+    return [value, setState];
+  }
+
+  return [state, setState];
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.5",
+  "version": "2.0.0-rc.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -94,5 +94,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "53c78f2c4c8144b4fbedd9ba12c119c8bc2b8bda"
+  "gitHead": "85f73a55da546c111f110732a27921769d970c03"
 }

package/scss/components/ActionSet/_action-set.scss

@@ -22,15 +22,20 @@ $action-set-block-class: #{c4p-settings.$pkg-prefix}--action-set;
 .#{$action-set-block-class} .#{$action-set-block-class}__action-button {
   @include type.type-style('body-short-01');
 
-  height: $spacing-10;
   align-items: center;
-  padding-top: $spacing-05;
-  padding-bottom: $spacing-07;
   margin: 0;
+
+  &.#{$action-set-block-class}__action-button--expressive {
+    height: $spacing-10;
+    padding-top: $spacing-05;
+    padding-bottom: $spacing-07;
+  }
 }
 
 .#{$action-set-block-class}.#{c4p-settings.$carbon-prefix}--btn-set
-  .#{$action-set-block-class}__action-button.#{c4p-settings.$carbon-prefix}--btn.#{c4p-settings.$carbon-prefix}--btn--expressive {
+  .#{$action-set-block-class}__action-button.#{c4p-settings.$carbon-prefix}--btn.#{c4p-settings.$carbon-prefix}--btn--expressive,
+.#{$action-set-block-class}.#{c4p-settings.$carbon-prefix}--btn-set
+  .#{$action-set-block-class}__action-button.#{c4p-settings.$carbon-prefix}--btn {
   max-width: none;
 }
 

package/scss/components/Datagrid/styles/_useExpandedRow.scss

@@ -6,7 +6,7 @@
 * restricted by GSA ADP Schedule Contract with IBM Corp.
 */
 
-@use '../../../global/styles/project-settings';
+@use '../../../global/styles/project-settings' as c4p-settings;
 @use '@carbon/styles/scss/theme' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use './variables';
@@ -40,3 +40,21 @@
   width: 100%;
   @include shared-pseudo-styles();
 }
+
+.#{variables.$block-class}__carbon-row.#{variables.$block-class}__carbon-row-expandable
+  .#{variables.$block-class}__cell.#{variables.$block-class}__expandable-row-cell {
+  padding: $spacing-03;
+  padding-right: 0;
+}
+
+.#{variables.$block-class}__row-expander.#{c4p-settings.$carbon-prefix}--btn {
+  display: flex;
+  width: $spacing-07;
+  height: $spacing-07;
+  min-height: $spacing-07;
+  justify-content: center;
+  padding: 0;
+  .#{variables.$block-class}__row-expander--icon {
+    fill: $layer-selected-inverse;
+  }
+}

package/scss/components/Datagrid/styles/_useNestedRows.scss

@@ -33,3 +33,20 @@
   td:first-child {
   border-bottom: none;
 }
+
+.#{$block-class} .#{$block-class}__carbon-row-expandable {
+  position: relative;
+}
+
+.#{$block-class}
+  tr.#{$block-class}__carbon-nested-row
+  + :not(tr.#{$block-class}__carbon-nested-row)::before {
+  position: absolute;
+  /* stylelint-disable-next-line carbon/layout-token-use */
+  top: -1px;
+  left: 0;
+  width: 100%;
+  height: 1px;
+  background-color: $border-subtle;
+  content: '';
+}