@carbon/react 1.0.0-rc.0 → 1.0.2

package/es/components/DataTable/TableToolbarSearch.js

@@ -11,10 +11,9 @@ import PropTypes from 'prop-types';
 import React__default, { useRef, useState, useMemo, useEffect } from 'react';
 import Search from '../Search/index.js';
 import setupGetInstanceId from './tools/instanceId.js';
-import deprecate from '../../prop-types/deprecate.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
-var _excluded = ["className", "searchContainerClass", "onChange", "onClear", "translateWithId", "placeHolderText", "placeholder", "labelText", "expanded", "defaultExpanded", "defaultValue", "disabled", "onExpand", "persistent", "persistant", "id", "onBlur", "onFocus"];
+var _excluded = ["className", "searchContainerClass", "onChange", "onClear", "translateWithId", "placeholder", "labelText", "expanded", "defaultExpanded", "defaultValue", "disabled", "onExpand", "persistent", "id", "onBlur", "onFocus"];
 var getInstanceId = setupGetInstanceId();
 var translationKeys = {
   'carbon.table.toolbar.search.label': 'Filter table',
@@ -33,7 +32,6 @@ var TableToolbarSearch = function TableToolbarSearch(_ref) {
       onChangeProp = _ref.onChange,
       onClear = _ref.onClear,
       t = _ref.translateWithId,
-      placeHolderText = _ref.placeHolderText,
       placeholder = _ref.placeholder,
       labelText = _ref.labelText,
       expandedProp = _ref.expanded,
@@ -42,7 +40,6 @@ var TableToolbarSearch = function TableToolbarSearch(_ref) {
       disabled = _ref.disabled,
       onExpand = _ref.onExpand,
       persistent = _ref.persistent,
-      persistant = _ref.persistant,
       id = _ref.id,
       onBlur = _ref.onBlur,
       onFocus = _ref.onFocus,
@@ -83,13 +80,13 @@ var TableToolbarSearch = function TableToolbarSearch(_ref) {
     }
   }, //eslint-disable-next-line react-hooks/exhaustive-deps
   []);
-  var searchClasses = cx(className, (_cx = {}, _defineProperty(_cx, searchContainerClass, searchContainerClass), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-active"), expanded), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-disabled"), disabled), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-expandable"), !persistent || !persistent && !persistant), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-persistent"), persistent || persistant), _cx));
+  var searchClasses = cx(className, (_cx = {}, _defineProperty(_cx, searchContainerClass, searchContainerClass), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-active"), expanded), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-disabled"), disabled), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-expandable"), !persistent), _defineProperty(_cx, "".concat(prefix, "--toolbar-search-container-persistent"), persistent), _cx));
 
   var handleExpand = function handleExpand(event) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !expanded;
 
     if (!disabled) {
-      if (!controlled && (!persistent || !persistent && !persistant)) {
+      if (!controlled && !persistent) {
         setExpandedState(value);
       }
 
@@ -121,7 +118,7 @@ var TableToolbarSearch = function TableToolbarSearch(_ref) {
     value: value,
     id: typeof id !== 'undefined' ? id : uniqueId.toString(),
     labelText: labelText || t('carbon.table.toolbar.search.label'),
-    placeholder: placeHolderText || placeholder || t('carbon.table.toolbar.search.placeholder'),
+    placeholder: placeholder || t('carbon.table.toolbar.search.placeholder'),
     onChange: onChange,
     onClear: onClear,
     onFocus: onFocus ? function (event) {
@@ -199,18 +196,12 @@ TableToolbarSearch.propTypes = {
    * input as the second.
    */
   onFocus: PropTypes.func,
-  persistant: deprecate(PropTypes.bool, "\nThe prop `persistant` for TableToolbarSearch has been deprecated in favor of `persistent`. Please use `persistent` instead."),
 
   /**
    * Whether the search should be allowed to expand
    */
   persistent: PropTypes.bool,
 
-  /**
-   * Deprecated in favor of `placeholder`
-   */
-  placeHolderText: deprecate(PropTypes.string, "\nThe prop `placeHolderText` for TableToolbarSearch has been deprecated in favor of `placeholder`. Please use `placeholder` instead."),
-
   /**
    * Provide an optional placeholder text for the Search component
    */

package/es/components/DatePickerInput/next/DatePickerInput.js

@@ -5,17 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, objectSpread2 as _objectSpread2, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { WarningFilled, WarningAltFilled, Calendar } from '@carbon/icons-react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React__default from 'react';
 import { usePrefix } from '../../../internal/usePrefix.js';
-import deprecate from '../../../prop-types/deprecate.js';
 
-var _excluded = ["datePickerType", "disabled", "helperText", "hideLabel", "id", "invalid", "invalidText", "labelText", "onClick", "onChange", "pattern", "placeholder", "size", "type", "warn", "warnText"],
-    _excluded2 = ["openCalendar", "iconDescription"],
-    _excluded3 = ["datePickerType", "invalid", "warn"];
+var _excluded = ["datePickerType", "disabled", "helperText", "hideLabel", "id", "invalid", "invalidText", "labelText", "onClick", "onChange", "pattern", "placeholder", "size", "type", "warn", "warnText"];
 var DatePickerInput = /*#__PURE__*/React__default.forwardRef(function DatePickerInput(props, ref) {
   var _cx, _cx2, _cx4;
 
@@ -66,18 +63,12 @@ var DatePickerInput = /*#__PURE__*/React__default.forwardRef(function DatePicker
   var helperTextClasses = cx("".concat(prefix, "--form__helper-text"), _defineProperty({}, "".concat(prefix, "--form__helper-text--disabled"), disabled));
   var inputClasses = cx("".concat(prefix, "--date-picker__input"), (_cx4 = {}, _defineProperty(_cx4, "".concat(prefix, "--date-picker__input--").concat(size), size), _defineProperty(_cx4, "".concat(prefix, "--date-picker__input--invalid"), invalid), _cx4));
   var containerClasses = cx("".concat(prefix, "--date-picker-container"), _defineProperty({}, "".concat(prefix, "--date-picker--nolabel"), !labelText));
-
-  var _rest = _objectSpread2({}, rest),
-      openCalendar = _rest.openCalendar,
-      iconDescription = _rest.iconDescription,
-      other = _objectWithoutProperties(_rest, _excluded2);
-
-  var input = invalid ? /*#__PURE__*/React__default.createElement("input", _extends({}, other, datePickerInputProps, {
+  var input = invalid ? /*#__PURE__*/React__default.createElement("input", _extends({}, rest, datePickerInputProps, {
     disabled: disabled,
     ref: ref,
     "data-invalid": true,
     className: inputClasses
-  })) : /*#__PURE__*/React__default.createElement("input", _extends({}, other, datePickerInputProps, {
+  })) : /*#__PURE__*/React__default.createElement("input", _extends({}, rest, datePickerInputProps, {
     disabled: disabled,
     className: inputClasses,
     ref: ref
@@ -91,9 +82,7 @@ var DatePickerInput = /*#__PURE__*/React__default.forwardRef(function DatePicker
     className: wrapperClasses
   }, input, /*#__PURE__*/React__default.createElement(DatePickerIcon, {
     datePickerType: datePickerType,
-    iconDescription: iconDescription,
     invalid: invalid,
-    openCalendar: openCalendar,
     warn: warn
   })), invalid && /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(prefix, "--form-requirement")
@@ -128,11 +117,6 @@ DatePickerInput.propTypes = {
    */
   hideLabel: PropTypes.bool,
 
-  /**
-   * The description of the calendar icon.
-   */
-  iconDescription: deprecate(PropTypes.string, "\nThe prop `iconDescriptionInput` for DatePickerInput has been deprecated and is no longer used"),
-
   /**
    * Specify an id that uniquely identifies the `<input>`
    */
@@ -165,11 +149,6 @@ DatePickerInput.propTypes = {
    */
   onClick: PropTypes.func,
 
-  /**
-   * Provide a function to be called when the input field is clicked
-   */
-  openCalendar: deprecate(PropTypes.func, "\nThe prop `openCalendar` for DatePickerInput has been deprecated and is no longer used"),
-
   /**
    * Provide a regular expression that the input value must match
    */
@@ -214,9 +193,7 @@ DatePickerInput.propTypes = {
 function DatePickerIcon(_ref) {
   var datePickerType = _ref.datePickerType,
       invalid = _ref.invalid,
-      warn = _ref.warn,
-      rest = _objectWithoutProperties(_ref, _excluded3);
-
+      warn = _ref.warn;
   var prefix = usePrefix();
 
   if (datePickerType === 'simple' && !invalid && !warn) {
@@ -237,11 +214,9 @@ function DatePickerIcon(_ref) {
 
   return /*#__PURE__*/React__default.createElement(Calendar, {
     className: "".concat(prefix, "--date-picker__icon"),
-    "aria-label": rest.iconDescription,
-    onClick: rest.openCalendar,
     role: "img",
     "aria-hidden": "true"
-  }, rest.iconDescription && /*#__PURE__*/React__default.createElement("title", null, rest.iconDescription));
+  });
 }
 
 DatePickerIcon.propTypes = {

package/es/components/Dropdown/Dropdown.Skeleton.js

@@ -9,22 +9,18 @@ import { objectWithoutProperties as _objectWithoutProperties, defineProperty as
 import PropTypes from 'prop-types';
 import React__default from 'react';
 import cx from 'classnames';
-import deprecate from '../../prop-types/deprecate.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 import { ListBoxSize } from '../ListBox/ListBoxPropTypes.js';
 
-var _excluded = ["className", "size", "inline"];
+var _excluded = ["className", "size"];
 
 var DropdownSkeleton = function DropdownSkeleton(_ref) {
-  var _cx;
-
   var className = _ref.className,
-      size = _ref.size;
-      _ref.inline;
-      var rest = _objectWithoutProperties(_ref, _excluded);
+      size = _ref.size,
+      rest = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
-  var wrapperClasses = cx(className, (_cx = {}, _defineProperty(_cx, "".concat(prefix, "--skeleton"), true), _defineProperty(_cx, "".concat(prefix, "--dropdown-v2"), true), _defineProperty(_cx, "".concat(prefix, "--list-box"), true), _defineProperty(_cx, "".concat(prefix, "--form-item"), true), _defineProperty(_cx, "".concat(prefix, "--list-box--").concat(size), size), _cx));
+  var wrapperClasses = cx(className, "".concat(prefix, "--skeleton"), "".concat(prefix, "--dropdown-v2"), "".concat(prefix, "--list-box"), "".concat(prefix, "--form-item"), _defineProperty({}, "".concat(prefix, "--list-box--").concat(size), size));
   return /*#__PURE__*/React__default.createElement("div", _extends({
     className: wrapperClasses
   }, rest), /*#__PURE__*/React__default.createElement("div", {
@@ -40,11 +36,6 @@ DropdownSkeleton.propTypes = {
    */
   className: PropTypes.string,
 
-  /**
-   * Specify whether you want the inline version of this control
-   */
-  inline: deprecate(PropTypes.bool, "The `inline` prop has been deprecated and will\n    be removed in the next major release. To specify the inline variant of Dropdown, please use the `type` prop."),
-
   /**
    * Specify the size of the ListBox.
    */

package/es/components/Dropdown/Dropdown.js

@@ -12,9 +12,7 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import { WarningFilled, WarningAltFilled, Checkmark } from '@carbon/icons-react';
 import '../ListBox/index.js';
-import { mapDownshiftProps } from '../../tools/createPropAdapter.js';
 import mergeRefs from '../../tools/mergeRefs.js';
-import deprecate from '../../prop-types/deprecate.js';
 import { useFeatureFlag } from '../FeatureFlags/index.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 import ListBox from '../ListBox/ListBox.js';
@@ -61,14 +59,16 @@ var Dropdown = /*#__PURE__*/React__default.forwardRef(function Dropdown(_ref, re
       other = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
-  var selectProps = mapDownshiftProps(_objectSpread2(_objectSpread2({}, downshiftProps), {}, {
+
+  var selectProps = _objectSpread2(_objectSpread2({}, downshiftProps), {}, {
     items: items,
     itemToString: itemToString,
     initialSelectedItem: initialSelectedItem,
     onSelectedItemChange: onSelectedItemChange
-  })); // only set selectedItem if the prop is defined. Setting if it is undefined
+  }); // only set selectedItem if the prop is defined. Setting if it is undefined
   // will overwrite default selected items from useSelect
 
+
   if (controlledSelectedItem !== undefined) {
     selectProps.selectedItem = controlledSelectedItem;
   }
@@ -219,11 +219,6 @@ Dropdown.propTypes = {
    */
   initialSelectedItem: PropTypes.oneOfType([PropTypes.object, PropTypes.string, PropTypes.number]),
 
-  /**
-   * Specify whether you want the inline version of this control
-   */
-  inline: deprecate(PropTypes.bool, "The `inline` prop has been deprecated and will\n    be removed in the next major release. To specify the inline variant of Dropdown, please use the `type` prop."),
-
   /**
    * Specify if the currently selected value is invalid.
    */

package/es/components/ExpandableSearch/ExpandableSearch.js

@@ -6,7 +6,7 @@
  */
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useState, useRef, useEffect } from 'react';
+import React__default, { useState, useRef } from 'react';
 import cx from 'classnames';
 import Search from '../Search/index.js';
 import { usePrefix } from '../../internal/usePrefix.js';
@@ -17,6 +17,11 @@ function ExpandableSearch(props) {
       expanded = _useState2[0],
       setExpanded = _useState2[1];
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      hasContent = _useState4[0],
+      setHasContent = _useState4[1];
+
   var searchRef = useRef(null);
   var prefix = usePrefix();
 
@@ -29,36 +34,25 @@ function ExpandableSearch(props) {
   function handleBlur(evt) {
     var relatedTargetIsAllowed = evt.relatedTarget && evt.relatedTarget.classList.contains("".concat(prefix, "--search-close"));
 
-    if (expanded && !relatedTargetIsAllowed && !searchRef.current.state.hasContent) {
+    if (expanded && !relatedTargetIsAllowed && !hasContent) {
       setExpanded(false);
     }
   }
 
-  useEffect(function () {
-    var _searchRef$current2;
-
-    function focusInput() {
-      var _searchRef$current;
-
-      if (!expanded && (_searchRef$current = searchRef.current) !== null && _searchRef$current !== void 0 && _searchRef$current.input) {
-        searchRef.current.input.focus();
-      }
-    }
-
-    if ((_searchRef$current2 = searchRef.current) !== null && _searchRef$current2 !== void 0 && _searchRef$current2.magnifier) {
-      var magnifier = searchRef.current.magnifier;
-      magnifier.addEventListener('click', focusInput);
-      return function () {
-        magnifier.removeEventListener('click', focusInput);
-      };
-    }
-  }, [expanded, searchRef]);
   var classes = cx("".concat(prefix, "--search--expandable"), _defineProperty({}, "".concat(prefix, "--search--expanded"), expanded), props.className);
   return /*#__PURE__*/React__default.createElement(Search, _extends({}, props, {
     ref: searchRef,
     className: classes,
     onFocus: handleFocus,
-    onBlur: handleBlur
+    onBlur: handleBlur,
+    onChange: function onChange(event) {
+      setHasContent(event.target.value !== '');
+    },
+    onExpand: function onExpand() {
+      var _searchRef$current$fo, _searchRef$current;
+
+      (_searchRef$current$fo = (_searchRef$current = searchRef.current).focus) === null || _searchRef$current$fo === void 0 ? void 0 : _searchRef$current$fo.call(_searchRef$current);
+    }
   }));
 }
 

package/es/components/FormGroup/FormGroup.js

@@ -5,14 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
 import React__default from 'react';
 import cx from 'classnames';
-import { useFeatureFlag } from '../FeatureFlags/index.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
-var _excluded = ["legendId", "legendText", "invalid", "children", "className", "message", "messageText", "hasMargin"];
+var _excluded = ["legendId", "legendText", "invalid", "children", "className", "message", "messageText"];
 
 var FormGroup = function FormGroup(_ref) {
   var legendId = _ref.legendId,
@@ -22,14 +21,10 @@ var FormGroup = function FormGroup(_ref) {
       className = _ref.className,
       message = _ref.message,
       messageText = _ref.messageText,
-      hasMargin = _ref.hasMargin,
       other = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
-  var enabled = useFeatureFlag('enable-v11-release');
-  var classNamesLegend = cx("".concat(prefix, "--label"), [enabled ? null : className]); // TODO - remove `fieldset--no-margin` in v11
-
-  var classNamesFieldset = cx("".concat(prefix, "--fieldset"), className, _defineProperty({}, "".concat(prefix, "--fieldset--no-margin"), !hasMargin));
+  var classNamesFieldset = cx("".concat(prefix, "--fieldset"), className);
   return /*#__PURE__*/React__default.createElement("fieldset", _extends({}, invalid && {
     'data-invalid': ''
   }, {
@@ -37,7 +32,7 @@ var FormGroup = function FormGroup(_ref) {
   }, other, {
     "aria-labelledby": other['aria-labelledby'] || legendId
   }), /*#__PURE__*/React__default.createElement("legend", {
-    className: classNamesLegend,
+    className: "".concat(prefix, "--label"),
     id: legendId || other['aria-labelledby']
   }, legendText), children, message ? /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(prefix, "--form__requirements")
@@ -55,11 +50,6 @@ FormGroup.propTypes = {
    */
   className: PropTypes.string,
 
-  /**
-   * Specify whether or not the FormGroup should provide bottom margin
-   */
-  hasMargin: PropTypes.bool,
-
   /**
    * Specify whether the <FormGroup> is invalid
    */

package/es/components/IconButton/index.js

@@ -35,7 +35,6 @@ var IconButton = /*#__PURE__*/React__default.forwardRef(function IconButton(prop
     label: label,
     leaveDelayMs: leaveDelayMs
   }, /*#__PURE__*/React__default.createElement(Button, _extends({}, rest, {
-    hasIconOnly: true,
     kind: kind,
     ref: ref,
     size: size

package/es/components/InlineLoading/InlineLoading.js

@@ -10,18 +10,16 @@ import React__default from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { ErrorFilled, CheckmarkFilled } from '@carbon/icons-react';
-import deprecate from '../../prop-types/deprecate.js';
 import Loading from '../Loading/Loading.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
-var _excluded = ["className", "success", "status", "iconDescription", "description", "onSuccess", "successDelay"];
+var _excluded = ["className", "status", "iconDescription", "description", "onSuccess", "successDelay"];
 function InlineLoading(_ref) {
   var _title, _title2;
 
   var className = _ref.className,
-      success = _ref.success,
       _ref$status = _ref.status,
-      status = _ref$status === void 0 ? success ? 'finished' : 'active' : _ref$status,
+      status = _ref$status === void 0 ? 'active' : _ref$status,
       iconDescription = _ref.iconDescription,
       description = _ref.description,
       onSuccess = _ref.onSuccess,
@@ -101,11 +99,6 @@ InlineLoading.propTypes = {
    */
   status: PropTypes.oneOf(['inactive', 'active', 'finished', 'error']),
 
-  /**
-   * Specify whether the load was successful
-   */
-  success: deprecate(PropTypes.bool, "\nThe prop `success` for InlineLoading has been deprecated in favor of `status`. Please use `status=\"finished\"` instead."),
-
   /**
    * Provide a delay for the `setTimeout` for success
    */

package/es/components/ListBox/ListBox.js

@@ -11,6 +11,11 @@ import React__default from 'react';
 import PropTypes from 'prop-types';
 import { ListBoxSize, ListBoxType } from './ListBoxPropTypes.js';
 import { usePrefix } from '../../internal/usePrefix.js';
+import ListBoxField from './ListBoxField.js';
+import ListBoxMenu from './ListBoxMenu.js';
+import ListBoxMenuIcon from './ListBoxMenuIcon.js';
+import ListBoxMenuItem from './ListBoxMenuItem.js';
+import ListBoxSelection from './ListBoxSelection.js';
 
 var _excluded = ["children", "className", "disabled", "type", "size", "invalid", "invalidText", "warn", "warnText", "light", "isOpen"];
 
@@ -124,6 +129,11 @@ ListBox.defaultProps = {
   disabled: false,
   type: 'default'
 };
+ListBox.Field = ListBoxField;
+ListBox.Menu = ListBoxMenu;
+ListBox.MenuIcon = ListBoxMenuIcon;
+ListBox.MenuItem = ListBoxMenuItem;
+ListBox.Selection = ListBoxSelection;
 var ListBox$1 = ListBox;
 
 export { ListBox$1 as default };

package/es/components/Modal/next/Modal.js

@@ -13,7 +13,6 @@ import { Close } from '@carbon/icons-react';
 import toggleClass from '../../../tools/toggleClass.js';
 import Button from '../../Button/Button.js';
 import ButtonSet from '../../ButtonSet/ButtonSet.js';
-import deprecate from '../../../prop-types/deprecate.js';
 import requiredIfGivenPropIsTruthy from '../../../prop-types/requiredIfGivenPropIsTruthy.js';
 import wrapFocus, { elementOrParentIsFloatingMenu } from '../../../internal/wrapFocus.js';
 import setupGetInstanceId from '../../../tools/setupGetInstanceId.js';
@@ -21,10 +20,10 @@ import { usePrefix } from '../../../internal/usePrefix.js';
 
 var _Modal$propTypes;
 
-var _excluded = ["children", "className", "modalHeading", "modalLabel", "modalAriaLabel", "passiveModal", "hasForm", "secondaryButtonText", "primaryButtonText", "open", "onRequestClose", "onRequestSubmit", "onSecondarySubmit", "iconDescription", "primaryButtonDisabled", "danger", "alert", "secondaryButtons", "selectorPrimaryFocus", "selectorsFloatingMenus", "shouldSubmitOnEnter", "size", "hasScrollingContent", "closeButtonLabel", "preventCloseOnClickOutside"];
+var _excluded = ["children", "className", "modalHeading", "modalLabel", "modalAriaLabel", "passiveModal", "secondaryButtonText", "primaryButtonText", "open", "onRequestClose", "onRequestSubmit", "onSecondarySubmit", "primaryButtonDisabled", "danger", "alert", "secondaryButtons", "selectorPrimaryFocus", "selectorsFloatingMenus", "shouldSubmitOnEnter", "size", "hasScrollingContent", "closeButtonLabel", "preventCloseOnClickOutside"];
 var getInstanceId = setupGetInstanceId();
 var Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
-  var _classNames, _classNames3;
+  var _classNames;
 
   var children = _ref.children,
       className = _ref.className,
@@ -32,14 +31,12 @@ var Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
       modalLabel = _ref.modalLabel,
       modalAriaLabel = _ref.modalAriaLabel,
       passiveModal = _ref.passiveModal,
-      hasForm = _ref.hasForm,
       secondaryButtonText = _ref.secondaryButtonText,
       primaryButtonText = _ref.primaryButtonText,
       open = _ref.open,
       onRequestClose = _ref.onRequestClose,
       onRequestSubmit = _ref.onRequestSubmit,
       onSecondarySubmit = _ref.onSecondarySubmit,
-      iconDescription = _ref.iconDescription,
       primaryButtonDisabled = _ref.primaryButtonDisabled,
       danger = _ref.danger,
       alert = _ref.alert,
@@ -109,13 +106,13 @@ var Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
   var onSecondaryButtonClick = onSecondarySubmit ? onSecondarySubmit : onRequestClose;
   var modalClasses = cx("".concat(prefix, "--modal"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "--modal-tall"), !passiveModal), _defineProperty(_classNames, 'is-visible', open), _defineProperty(_classNames, "".concat(prefix, "--modal--danger"), danger), _defineProperty(_classNames, className, className), _classNames));
   var containerClasses = cx("".concat(prefix, "--modal-container"), _defineProperty({}, "".concat(prefix, "--modal-container--").concat(size), size));
-  var contentClasses = cx("".concat(prefix, "--modal-content"), (_classNames3 = {}, _defineProperty(_classNames3, "".concat(prefix, "--modal-content--with-form"), hasForm), _defineProperty(_classNames3, "".concat(prefix, "--modal-scroll-content"), hasScrollingContent), _classNames3));
+  var contentClasses = cx("".concat(prefix, "--modal-content"), _defineProperty({}, "".concat(prefix, "--modal-scroll-content"), hasScrollingContent));
   var footerClasses = cx("".concat(prefix, "--modal-footer"), _defineProperty({}, "".concat(prefix, "--modal-footer--three-button"), Array.isArray(secondaryButtons) && secondaryButtons.length === 2));
   var modalButton = /*#__PURE__*/React__default.createElement("button", {
     className: modalCloseButtonClass,
     type: "button",
     onClick: onRequestClose,
-    title: ariaLabel ? ariaLabel : iconDescription,
+    title: ariaLabel,
     "aria-label": closeButtonLabel ? closeButtonLabel : 'close',
     ref: button
   }, /*#__PURE__*/React__default.createElement(Close, {
@@ -243,7 +240,7 @@ Modal.propTypes = (_Modal$propTypes = {
    * Should go hand in hand with the danger prop.
    */
   alert: PropTypes.bool
-}, _defineProperty(_Modal$propTypes, 'aria-label', requiredIfGivenPropIsTruthy('hasScrollingContent', PropTypes.string)), _defineProperty(_Modal$propTypes, "children", PropTypes.node), _defineProperty(_Modal$propTypes, "className", PropTypes.string), _defineProperty(_Modal$propTypes, "closeButtonLabel", PropTypes.string), _defineProperty(_Modal$propTypes, "danger", PropTypes.bool), _defineProperty(_Modal$propTypes, "focusTrap", deprecate(PropTypes.bool, "\nThe prop `focusTrap` for Modal has been deprecated, as the feature of `focusTrap` runs by default.")), _defineProperty(_Modal$propTypes, "hasForm", deprecate(PropTypes.bool, "\nThe prop `hasForm` for Modal has been deprecated, as the feature of `hasForm` runs by default.")), _defineProperty(_Modal$propTypes, "hasScrollingContent", PropTypes.bool), _defineProperty(_Modal$propTypes, "iconDescription", deprecate(PropTypes.string, 'The iconDescription prop is no longer needed and can be safely removed. This prop will be removed in the next major release of Carbon.')), _defineProperty(_Modal$propTypes, "id", PropTypes.string), _defineProperty(_Modal$propTypes, "modalAriaLabel", PropTypes.string), _defineProperty(_Modal$propTypes, "modalHeading", PropTypes.node), _defineProperty(_Modal$propTypes, "modalLabel", PropTypes.node), _defineProperty(_Modal$propTypes, "onKeyDown", PropTypes.func), _defineProperty(_Modal$propTypes, "onRequestClose", PropTypes.func), _defineProperty(_Modal$propTypes, "onRequestSubmit", PropTypes.func), _defineProperty(_Modal$propTypes, "onSecondarySubmit", PropTypes.func), _defineProperty(_Modal$propTypes, "open", PropTypes.bool), _defineProperty(_Modal$propTypes, "passiveModal", PropTypes.bool), _defineProperty(_Modal$propTypes, "preventCloseOnClickOutside", PropTypes.bool), _defineProperty(_Modal$propTypes, "primaryButtonDisabled", PropTypes.bool), _defineProperty(_Modal$propTypes, "primaryButtonText", PropTypes.node), _defineProperty(_Modal$propTypes, "secondaryButtonText", PropTypes.node), _defineProperty(_Modal$propTypes, "secondaryButtons", function secondaryButtons(props, propName, componentName) {
+}, _defineProperty(_Modal$propTypes, 'aria-label', requiredIfGivenPropIsTruthy('hasScrollingContent', PropTypes.string)), _defineProperty(_Modal$propTypes, "children", PropTypes.node), _defineProperty(_Modal$propTypes, "className", PropTypes.string), _defineProperty(_Modal$propTypes, "closeButtonLabel", PropTypes.string), _defineProperty(_Modal$propTypes, "danger", PropTypes.bool), _defineProperty(_Modal$propTypes, "hasScrollingContent", PropTypes.bool), _defineProperty(_Modal$propTypes, "id", PropTypes.string), _defineProperty(_Modal$propTypes, "modalAriaLabel", PropTypes.string), _defineProperty(_Modal$propTypes, "modalHeading", PropTypes.node), _defineProperty(_Modal$propTypes, "modalLabel", PropTypes.node), _defineProperty(_Modal$propTypes, "onKeyDown", PropTypes.func), _defineProperty(_Modal$propTypes, "onRequestClose", PropTypes.func), _defineProperty(_Modal$propTypes, "onRequestSubmit", PropTypes.func), _defineProperty(_Modal$propTypes, "onSecondarySubmit", PropTypes.func), _defineProperty(_Modal$propTypes, "open", PropTypes.bool), _defineProperty(_Modal$propTypes, "passiveModal", PropTypes.bool), _defineProperty(_Modal$propTypes, "preventCloseOnClickOutside", PropTypes.bool), _defineProperty(_Modal$propTypes, "primaryButtonDisabled", PropTypes.bool), _defineProperty(_Modal$propTypes, "primaryButtonText", PropTypes.node), _defineProperty(_Modal$propTypes, "secondaryButtonText", PropTypes.node), _defineProperty(_Modal$propTypes, "secondaryButtons", function secondaryButtons(props, propName, componentName) {
   if (props.secondaryButtons) {
     if (!Array.isArray(props.secondaryButtons) || props.secondaryButtons.length !== 2) {
       return new Error("".concat(propName, " needs to be an array of two button config objects"));

package/es/components/MultiSelect/FilterableMultiSelect.js

@@ -16,7 +16,6 @@ import { defaultFilterItems } from '../ComboBox/tools/filter.js';
 import { sortingPropTypes } from './MultiSelectPropTypes.js';
 import '../ListBox/index.js';
 import Selection from '../../internal/Selection.js';
-import { mapDownshiftProps } from '../../tools/createPropAdapter.js';
 import { defaultItemToString } from './tools/itemToString.js';
 import mergeRefs from '../../tools/mergeRefs.js';
 import setupGetInstanceId from '../../tools/setupGetInstanceId.js';
@@ -221,7 +220,7 @@ var FilterableMultiSelect = /*#__PURE__*/function (_React$Component) {
             var selectedItems = _ref2.selectedItems,
                 onItemChange = _ref2.onItemChange,
                 _clearSelection = _ref2.clearSelection;
-            return /*#__PURE__*/React__default.createElement(Downshift, _extends({}, mapDownshiftProps(downshiftProps), {
+            return /*#__PURE__*/React__default.createElement(Downshift, _extends({}, downshiftProps, {
               highlightedIndex: highlightedIndex,
               id: id,
               isOpen: isOpen,

package/es/components/MultiSelect/MultiSelect.js

@@ -18,7 +18,6 @@ import { defaultItemToString } from './tools/itemToString.js';
 import { defaultCompareItems, defaultSortItems } from './tools/sorting.js';
 import { useSelection } from '../../internal/Selection.js';
 import setupGetInstanceId from '../../tools/setupGetInstanceId.js';
-import { mapDownshiftProps } from '../../tools/createPropAdapter.js';
 import mergeRefs from '../../tools/mergeRefs.js';
 import { useFeatureFlag } from '../FeatureFlags/index.js';
 import { usePrefix } from '../../internal/usePrefix.js';
@@ -108,7 +107,7 @@ var MultiSelect = /*#__PURE__*/React__default.forwardRef(function MultiSelect(_r
       onItemChange = _useSelection.onItemChange,
       clearSelection = _useSelection.clearSelection;
 
-  var _useSelect = useSelect(mapDownshiftProps(_objectSpread2(_objectSpread2({}, downshiftProps), {}, {
+  var _useSelect = useSelect(_objectSpread2(_objectSpread2({}, downshiftProps), {}, {
     highlightedIndex: highlightedIndex,
     isOpen: isOpen,
     itemToString: function itemToString(items) {
@@ -119,7 +118,7 @@ var MultiSelect = /*#__PURE__*/React__default.forwardRef(function MultiSelect(_r
     onStateChange: onStateChange,
     selectedItem: controlledSelectedItems,
     items: items
-  }))),
+  })),
       getToggleButtonProps = _useSelect.getToggleButtonProps,
       getLabelProps = _useSelect.getLabelProps,
       getMenuProps = _useSelect.getMenuProps,

package/es/components/MultiSelect/next/FilterableMultiSelect.js

@@ -16,7 +16,6 @@ import { defaultFilterItems } from '../../ComboBox/tools/filter.js';
 import { sortingPropTypes } from '../MultiSelectPropTypes.js';
 import '../../ListBox/index.js';
 import Selection from '../../../internal/Selection.js';
-import { mapDownshiftProps } from '../../../tools/createPropAdapter.js';
 import { defaultItemToString } from '../tools/itemToString.js';
 import mergeRefs from '../../../tools/mergeRefs.js';
 import { useId } from '../../../internal/useId.js';
@@ -202,7 +201,7 @@ var FilterableMultiSelect = /*#__PURE__*/React__default.forwardRef(function Filt
       var selectedItems = _ref3.selectedItems,
           onItemChange = _ref3.onItemChange,
           _clearSelection = _ref3.clearSelection;
-      return /*#__PURE__*/React__default.createElement(Downshift, _extends({}, mapDownshiftProps(downshiftProps), {
+      return /*#__PURE__*/React__default.createElement(Downshift, _extends({}, downshiftProps, {
         highlightedIndex: highlightedIndex,
         id: id,
         isOpen: isOpen,