@carbon/react 1.7.0 → 1.8.0-rc.0

package/es/components/RadioButton/RadioButton.js

@@ -5,89 +5,66 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { inherits as _inherits, createSuper as _createSuper, classCallCheck as _classCallCheck, defineProperty as _defineProperty, assertThisInitialized as _assertThisInitialized, createClass as _createClass, objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import cx from 'classnames';
+import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
 import React__default from 'react';
-import { warning } from '../../internal/warning.js';
-import uniqueId from '../../tools/uniqueId.js';
+import cx from 'classnames';
 import '../Text/index.js';
-import { PrefixContext } from '../../internal/usePrefix.js';
+import { usePrefix } from '../../internal/usePrefix.js';
+import { useId } from '../../internal/useId.js';
 import { Text } from '../Text/Text.js';
 
-var _excluded = ["className", "labelText", "labelPosition", "innerRef", "hideLabel"];
-
-var RadioButton = /*#__PURE__*/function (_React$Component) {
-  _inherits(RadioButton, _React$Component);
-
-  var _super = _createSuper(RadioButton);
-
-  function RadioButton() {
-    var _this;
-
-    _classCallCheck(this, RadioButton);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "prefix", _this.context);
-
-    _defineProperty(_assertThisInitialized(_this), "uid", _this.props.id || uniqueId());
-
-    _defineProperty(_assertThisInitialized(_this), "handleChange", function (evt) {
-      _this.props.onChange(_this.props.value, _this.props.name, evt);
-    });
-
-    return _this;
+var _excluded = ["className", "disabled", "hideLabel", "id", "labelPosition", "labelText", "name", "onChange", "value"];
+var RadioButton = /*#__PURE__*/React__default.forwardRef(function RadioButton(_ref, ref) {
+  var className = _ref.className,
+      disabled = _ref.disabled,
+      hideLabel = _ref.hideLabel,
+      id = _ref.id,
+      _ref$labelPosition = _ref.labelPosition,
+      labelPosition = _ref$labelPosition === void 0 ? 'right' : _ref$labelPosition,
+      _ref$labelText = _ref.labelText,
+      labelText = _ref$labelText === void 0 ? '' : _ref$labelText,
+      name = _ref.name,
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$value = _ref.value,
+      value = _ref$value === void 0 ? '' : _ref$value,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var prefix = usePrefix();
+  var uid = useId('radio-button');
+  var uniqueId = id || uid;
+
+  function handleOnChange(event) {
+    onChange(value, name, event);
   }
 
-  _createClass(RadioButton, [{
-    key: "render",
-    value: function render() {
-      var prefix = this.prefix;
-
-      var _this$props = this.props,
-          className = _this$props.className,
-          labelText = _this$props.labelText,
-          labelPosition = _this$props.labelPosition,
-          ref = _this$props.innerRef,
-          hideLabel = _this$props.hideLabel,
-          other = _objectWithoutProperties(_this$props, _excluded);
-
-      if (process.env.NODE_ENV !== "production") {
-        process.env.NODE_ENV !== "production" ? warning(labelPosition !== 'top' && labelPosition !== 'bottom', '`top`/`bottom` values for `labelPosition` property in the `RadioButton` component is deprecated ' + 'and being removed in the next release of `carbon-components-react`.') : void 0;
-      }
-
-      var innerLabelClasses = cx(_defineProperty({}, "".concat(prefix, "--visually-hidden"), hideLabel));
-      var wrapperClasses = cx(className, "".concat(prefix, "--radio-button-wrapper"), _defineProperty({}, "".concat(prefix, "--radio-button-wrapper--label-").concat(labelPosition), labelPosition !== 'right'));
-      return /*#__PURE__*/React__default.createElement("div", {
-        className: wrapperClasses
-      }, /*#__PURE__*/React__default.createElement("input", _extends({}, other, {
-        type: "radio",
-        className: "".concat(prefix, "--radio-button"),
-        onChange: this.handleChange,
-        id: this.uid,
-        ref: ref
-      })), /*#__PURE__*/React__default.createElement("label", {
-        htmlFor: this.uid,
-        className: "".concat(prefix, "--radio-button__label")
-      }, /*#__PURE__*/React__default.createElement("span", {
-        className: "".concat(prefix, "--radio-button__appearance")
-      }), labelText && /*#__PURE__*/React__default.createElement(Text, {
-        className: innerLabelClasses
-      }, labelText)));
-    }
-  }]);
-
-  return RadioButton;
-}(React__default.Component);
-
-_defineProperty(RadioButton, "propTypes", {
+  var innerLabelClasses = cx(_defineProperty({}, "".concat(prefix, "--visually-hidden"), hideLabel));
+  var wrapperClasses = cx(className, "".concat(prefix, "--radio-button-wrapper"), _defineProperty({}, "".concat(prefix, "--radio-button-wrapper--label-").concat(labelPosition), labelPosition !== 'right'));
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: wrapperClasses
+  }, /*#__PURE__*/React__default.createElement("input", _extends({}, rest, {
+    type: "radio",
+    className: "".concat(prefix, "--radio-button"),
+    onChange: handleOnChange,
+    id: uniqueId,
+    ref: ref,
+    disabled: disabled,
+    value: value,
+    name: name
+  })), /*#__PURE__*/React__default.createElement("label", {
+    htmlFor: uniqueId,
+    className: "".concat(prefix, "--radio-button__label")
+  }, /*#__PURE__*/React__default.createElement("span", {
+    className: "".concat(prefix, "--radio-button__appearance")
+  }), labelText && /*#__PURE__*/React__default.createElement(Text, {
+    className: innerLabelClasses
+  }, labelText)));
+});
+RadioButton.displayName = 'RadioButton';
+RadioButton.propTypes = {
   /**
-   * Specify whether the <RadioButton> is currently checked
+   * Specify whether the `<RadioButton>` is currently checked
    */
   checked: PropTypes.bool,
 
@@ -97,7 +74,7 @@ _defineProperty(RadioButton, "propTypes", {
   className: PropTypes.string,
 
   /**
-   * Specify whether the <RadioButton> should be checked by default
+   * Specify whether the `<RadioButton>` should be checked by default
    */
   defaultChecked: PropTypes.bool,
 
@@ -120,7 +97,7 @@ _defineProperty(RadioButton, "propTypes", {
    * Provide where label text should be placed
    * NOTE: `top`/`bottom` are deprecated
    */
-  labelPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
+  labelPosition: PropTypes.oneOf(['right', 'left']),
 
   /**
    * Provide label text to be read by screen readers when interacting with the
@@ -145,28 +122,10 @@ _defineProperty(RadioButton, "propTypes", {
   onClick: PropTypes.func,
 
   /**
-   * Specify the value of the <RadioButton>
+   * Specify the value of the `<RadioButton>`
    */
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-});
+};
+var RadioButton$1 = RadioButton;
 
-_defineProperty(RadioButton, "contextType", PrefixContext);
-
-_defineProperty(RadioButton, "defaultProps", {
-  labelText: '',
-  labelPosition: 'right',
-  onChange: function onChange() {},
-  value: ''
-});
-var RadioButtonClassic = (function () {
-  var forwardRef = function forwardRef(props, ref) {
-    return /*#__PURE__*/React__default.createElement(RadioButton, _extends({}, props, {
-      innerRef: ref
-    }));
-  };
-
-  forwardRef.displayName = 'RadioButton';
-  return /*#__PURE__*/React__default.forwardRef(forwardRef);
-})();
-
-export { RadioButton, RadioButtonClassic as default };
+export { RadioButton$1 as default };

package/es/components/RadioButton/index.js

@@ -5,11 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as FeatureFlags from '@carbon/feature-flags';
-import RadioButtonNext from './next/RadioButton.js';
-import RadioButtonClassic from './RadioButton.js';
-
-var RadioButton = FeatureFlags.enabled('enable-v11-release') ? RadioButtonNext : RadioButtonClassic;
-var RadioButton$1 = RadioButton;
-
-export { RadioButton$1 as default };
+import RadioButton from './RadioButton.js';
+export { default } from './RadioButton.js';

package/es/components/RadioButtonGroup/RadioButtonGroup.js

@@ -5,121 +5,87 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { inherits as _inherits, createSuper as _createSuper, classCallCheck as _classCallCheck, defineProperty as _defineProperty, assertThisInitialized as _assertThisInitialized, createClass as _createClass } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
-import React__default from 'react';
+import React__default, { useState } from 'react';
 import cx from 'classnames';
-import { warning } from '../../internal/warning.js';
 import { Legend } from '../Text/index.js';
-import { FeatureFlagContext } from '../FeatureFlags/index.js';
-import { PrefixContext } from '../../internal/usePrefix.js';
-
-var RadioButtonGroup = /*#__PURE__*/function (_React$Component) {
-  _inherits(RadioButtonGroup, _React$Component);
-
-  var _super = _createSuper(RadioButtonGroup);
-
-  function RadioButtonGroup() {
-    var _this;
-
-    _classCallCheck(this, RadioButtonGroup);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+import { usePrefix } from '../../internal/usePrefix.js';
+
+var RadioButtonGroup = /*#__PURE__*/React__default.forwardRef(function RadioButtonGroup(_ref, ref) {
+  var _classNames;
+
+  var children = _ref.children,
+      className = _ref.className,
+      defaultSelected = _ref.defaultSelected,
+      disabled = _ref.disabled,
+      _ref$labelPosition = _ref.labelPosition,
+      labelPosition = _ref$labelPosition === void 0 ? 'right' : _ref$labelPosition,
+      legendText = _ref.legendText,
+      name = _ref.name,
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$orientation = _ref.orientation,
+      orientation = _ref$orientation === void 0 ? 'horizontal' : _ref$orientation,
+      valueSelected = _ref.valueSelected;
+  var prefix = usePrefix();
+
+  var _useState = useState(valueSelected !== null && valueSelected !== void 0 ? valueSelected : defaultSelected),
+      _useState2 = _slicedToArray(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
+
+  var _useState3 = useState(valueSelected),
+      _useState4 = _slicedToArray(_useState3, 2),
+      prevValueSelected = _useState4[0],
+      setPrevValueSelected = _useState4[1];
+  /**
+   * prop + state alignment - getDerivedStateFromProps
+   * only update if selected prop changes
+   */
 
-    _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      selected: typeof _this.props.valueSelected !== 'undefined' ? _this.props.valueSelected : _this.props.defaultSelected
-    });
+  if (valueSelected !== prevValueSelected) {
+    setSelected(valueSelected);
+    setPrevValueSelected(valueSelected);
+  }
 
-    _defineProperty(_assertThisInitialized(_this), "getRadioButtons", function () {
-      var children = React__default.Children.map(_this.props.children, function (radioButton) {
-        var value = radioButton.props.value;
-        /* istanbul ignore if */
-
-        if (typeof radioButton.props.checked !== 'undefined') {
-          process.env.NODE_ENV !== "production" ? warning(false, "Instead of using the checked property on the RadioButton, set\n            the defaultSelected property or valueSelected property on the RadioButtonGroup.") : void 0;
-        }
-
-        return /*#__PURE__*/React__default.cloneElement(radioButton, {
-          name: _this.props.name,
-          key: value,
-          value: value,
-          onChange: _this.handleChange,
-          checked: value === _this.state.selected
-        });
+  function getRadioButtons() {
+    var mappedChildren = React__default.Children.map(children, function (radioButton) {
+      var value = radioButton.props.value;
+      return /*#__PURE__*/React__default.cloneElement(radioButton, {
+        name: name,
+        key: value,
+        value: value,
+        onChange: handleOnChange,
+        checked: value === selected
       });
-      return children;
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "handleChange", function (newSelection, value, evt) {
-      if (newSelection !== _this.state.selected) {
-        _this.setState({
-          selected: newSelection
-        });
-
-        _this.props.onChange(newSelection, _this.props.name, evt);
-      }
     });
-
-    return _this;
+    return mappedChildren;
   }
 
-  _createClass(RadioButtonGroup, [{
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-
-      var _this$props = this.props,
-          disabled = _this$props.disabled,
-          className = _this$props.className,
-          hideLegend = _this$props.hideLegend,
-          orientation = _this$props.orientation,
-          labelPosition = _this$props.labelPosition,
-          legendText = _this$props.legendText;
-      var scope = this.context;
-      var enabled;
-
-      if (scope.enabled) {
-        enabled = scope.enabled('enable-v11-release');
-      }
-
-      return /*#__PURE__*/React__default.createElement(PrefixContext.Consumer, null, function (prefix) {
-        var _classNames;
-
-        var wrapperClasses = cx("".concat(prefix, "--radio-button-group"), [enabled ? null : className], (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "--radio-button-group--").concat(orientation), orientation === 'vertical'), _defineProperty(_classNames, "".concat(prefix, "--radio-button-group--label-").concat(labelPosition), labelPosition), _classNames));
-        var legendClasses = cx("".concat(prefix, "--label"), _defineProperty({}, "".concat(prefix, "--visually-hidden"), hideLegend));
-        return /*#__PURE__*/React__default.createElement("div", {
-          className: enabled ? cx("".concat(prefix, "--form-item"), className) : "".concat(prefix, "--form-item")
-        }, /*#__PURE__*/React__default.createElement("fieldset", {
-          className: wrapperClasses,
-          disabled: disabled
-        }, legendText && /*#__PURE__*/React__default.createElement(Legend, {
-          className: legendClasses
-        }, legendText), _this2.getRadioButtons()));
-      });
+  function handleOnChange(newSelection, value, evt) {
+    if (newSelection !== selected) {
+      setSelected(newSelection);
+      onChange(newSelection, name, evt);
     }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(_ref, state) {
-      var valueSelected = _ref.valueSelected,
-          defaultSelected = _ref.defaultSelected;
-      var prevValueSelected = state.prevValueSelected;
-      return prevValueSelected === valueSelected ? null : {
-        selected: typeof valueSelected !== 'undefined' ? valueSelected : defaultSelected,
-        prevValueSelected: valueSelected
-      };
-    }
-  }]);
-
-  return RadioButtonGroup;
-}(React__default.Component);
+  }
 
-_defineProperty(RadioButtonGroup, "propTypes", {
+  var fieldsetClasses = cx("".concat(prefix, "--radio-button-group"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "--radio-button-group--").concat(orientation), orientation === 'vertical'), _defineProperty(_classNames, "".concat(prefix, "--radio-button-group--label-").concat(labelPosition), labelPosition), _classNames));
+  var wrapperClasses = cx("".concat(prefix, "--form-item"), className);
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: wrapperClasses,
+    ref: ref
+  }, /*#__PURE__*/React__default.createElement("fieldset", {
+    className: fieldsetClasses,
+    disabled: disabled
+  }, legendText && /*#__PURE__*/React__default.createElement(Legend, {
+    className: "".concat(prefix, "--label")
+  }, legendText), getRadioButtons()));
+});
+RadioButtonGroup.propTypes = {
   /**
-   * Provide a collection of <RadioButton> components to render in the group
+   * Provide a collection of `<RadioButton>` components to render in the group
    */
   children: PropTypes.node,
 
@@ -129,7 +95,7 @@ _defineProperty(RadioButtonGroup, "propTypes", {
   className: PropTypes.string,
 
   /**
-   * Specify the <RadioButton> to be selected by default
+   * Specify the `<RadioButton>` to be selected by default
    */
   defaultSelected: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 
@@ -138,11 +104,6 @@ _defineProperty(RadioButtonGroup, "propTypes", {
    */
   disabled: PropTypes.bool,
 
-  /**
-   * Specify whether the legend should be hidden, or not
-   */
-  hideLegend: PropTypes.bool,
-
   /**
    * Provide where label text should be placed
    */
@@ -174,17 +135,7 @@ _defineProperty(RadioButtonGroup, "propTypes", {
    * Specify the value that is currently selected in the group
    */
   valueSelected: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-});
-
-_defineProperty(RadioButtonGroup, "defaultProps", {
-  orientation: 'horizontal',
-  labelPosition: 'right',
-  hideLegend: false,
-  onChange:
-  /* istanbul ignore next */
-  function onChange() {}
-});
-
-_defineProperty(RadioButtonGroup, "contextType", FeatureFlagContext);
+};
+var RadioButtonGroup$1 = RadioButtonGroup;
 
-export { RadioButtonGroup as default };
+export { RadioButtonGroup$1 as default };

package/es/components/RadioButtonGroup/index.js

@@ -5,11 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as FeatureFlags from '@carbon/feature-flags';
-import RadioButtonGroupNext from './next/RadioButtonGroup.js';
-import RadioButtonGroup$2 from './RadioButtonGroup.js';
-
-var RadioButtonGroup = FeatureFlags.enabled('enable-v11-release') ? RadioButtonGroupNext : RadioButtonGroup$2;
-var RadioButtonGroup$1 = RadioButtonGroup;
-
-export { RadioButtonGroup$1 as default };
+import RadioButtonGroup from './RadioButtonGroup.js';
+export { default } from './RadioButtonGroup.js';

package/es/components/Slider/Slider.js

@@ -457,7 +457,8 @@ var Slider = /*#__PURE__*/function (_PureComponent) {
           "aria-valuemax": max,
           "aria-valuemin": min,
           "aria-valuenow": value,
-          style: thumbStyle
+          style: thumbStyle,
+          "aria-labelledby": labelId
         }), /*#__PURE__*/React__default.createElement("div", {
           className: "".concat(prefix, "--slider__track"),
           ref: function ref(node) {

package/es/components/Switch/Switch.js

@@ -115,7 +115,6 @@ Switch.propTypes = {
 };
 Switch.defaultProps = {
   selected: false,
-  text: 'Provide text',
   onClick: function onClick() {},
   onKeyDown: function onKeyDown() {}
 };

package/es/components/TreeView/TreeView.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, slicedToArray as _slicedToArray, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, slicedToArray as _slicedToArray, extends as _extends, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -69,12 +69,15 @@ function TreeView(_ref) {
           return selectedId !== nodeId;
         }));
       }
+
+      onSelect === null || onSelect === void 0 ? void 0 : onSelect(event, node);
     } else {
       setSelected([nodeId]);
       setActive(nodeId);
+      onSelect === null || onSelect === void 0 ? void 0 : onSelect(event, _objectSpread2({
+        activeNodeId: nodeId
+      }, node));
     }
-
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(event, node);
   }
 
   function handleFocusEvent(event) {
@@ -213,15 +216,20 @@ function TreeView(_ref) {
       }
     });
   }, [prefix]);
-  useEffect(function () {
-    if (preselected.length) {
-      setSelected(preselected);
-    }
 
-    if (prespecifiedActive) {
-      setActive(prespecifiedActive);
-    }
-  }, [preselected, prespecifiedActive]);
+  var useActiveAndSelectedOnMount = function useActiveAndSelectedOnMount() {
+    return useEffect(function () {
+      if (preselected.length) {
+        setSelected(preselected);
+      }
+
+      if (prespecifiedActive) {
+        setActive(prespecifiedActive);
+      }
+    }, []);
+  };
+
+  useActiveAndSelectedOnMount();
   var labelId = "".concat(treeId, "__label");
 
   var TreeLabel = function TreeLabel() {

package/es/components/UIShell/HeaderMenu.js

@@ -237,4 +237,4 @@ var HeaderMenuForwardRef = /*#__PURE__*/React__default.forwardRef(function (prop
 HeaderMenuForwardRef.displayName = 'HeaderMenu';
 var HeaderMenuForwardRef$1 = HeaderMenuForwardRef;
 
-export { HeaderMenuForwardRef$1 as default };
+export { HeaderMenu, HeaderMenuForwardRef$1 as default };

package/es/components/UIShell/HeaderMenuButton.js

@@ -56,6 +56,10 @@ HeaderMenuButton.propTypes = _objectSpread2(_objectSpread2({}, AriaLabelPropType
    * button
    */
   className: PropTypes.string,
+
+  /**
+   * Specify whether the menu button is "active".
+   */
   isActive: PropTypes.bool,
 
   /**

package/es/components/UIShell/SideNavLink.js

@@ -15,15 +15,16 @@ import SideNavItem from './SideNavItem.js';
 import SideNavLinkText from './SideNavLinkText.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
-var _excluded = ["className", "children", "renderIcon", "isActive", "large"];
+var _excluded = ["children", "className", "renderIcon", "isActive", "large"];
 var SideNavLink = /*#__PURE__*/React__default.forwardRef(function SideNavLink(_ref, ref) {
   var _cx;
 
-  var customClassName = _ref.className,
-      children = _ref.children,
+  var children = _ref.children,
+      customClassName = _ref.className,
       IconElement = _ref.renderIcon,
       isActive = _ref.isActive,
-      large = _ref.large,
+      _ref$large = _ref.large,
+      large = _ref$large === void 0 ? false : _ref$large,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
@@ -58,11 +59,7 @@ SideNavLink.propTypes = _objectSpread2(_objectSpread2({}, LinkPropTypes), {}, {
    * Provide an icon to render in the side navigation link. Should be a React class.
    */
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
-});
-SideNavLink.defaultProps = {
-  element: 'a',
-  large: false
-}; // eslint-disable-next-line react/display-name
+}); // eslint-disable-next-line react/display-name
 var SideNavLink$1 = SideNavLink;
 
 export { SideNavLink$1 as default };

package/es/index.js

@@ -18,7 +18,7 @@ export { ClassPrefix } from './components/ClassPrefix/index.js';
 export { default as CodeSnippetSkeleton } from './components/CodeSnippet/CodeSnippet.Skeleton.js';
 export { default as CodeSnippet } from './components/CodeSnippet/CodeSnippet.js';
 export { default as ComboBox } from './components/ComboBox/ComboBox.js';
-export { ModalFooter, ModalHeader } from './components/ComposedModal/index.js';
+export { ComposedModal, ModalFooter, ModalHeader } from './components/ComposedModal/index.js';
 export { default as ContentSwitcher } from './components/ContentSwitcher/index.js';
 export { default as Copy } from './components/Copy/Copy.js';
 export { default as CopyButton } from './components/CopyButton/CopyButton.js';
@@ -41,8 +41,7 @@ export { default as ListItem } from './components/ListItem/ListItem.js';
 export { default as Loading } from './components/Loading/Loading.js';
 export { default as Modal } from './components/Modal/index.js';
 export { default as ModalWrapper } from './components/ModalWrapper/ModalWrapper.js';
-export { FilterableMultiSelect } from './components/MultiSelect/index.js';
-export { ActionableNotification, InlineNotification, NotificationActionButton, NotificationButton, NotificationTextDetails, ToastNotification } from './components/Notification/index.js';
+import './components/MultiSelect/index.js';
 export { default as NumberInputSkeleton } from './components/NumberInput/NumberInput.Skeleton.js';
 export { default as NumberInput } from './components/NumberInput/NumberInput.js';
 export { default as OrderedList } from './components/OrderedList/OrderedList.js';
@@ -52,8 +51,8 @@ export { default as Pagination } from './components/Pagination/index.js';
 export { default as PaginationNav } from './components/PaginationNav/PaginationNav.js';
 export { default as PrimaryButton } from './components/PrimaryButton/PrimaryButton.js';
 export { ProgressIndicator } from './components/ProgressIndicator/index.js';
-export { default as RadioButton } from './components/RadioButton/index.js';
-export { default as RadioButtonGroup } from './components/RadioButtonGroup/index.js';
+export { default as RadioButton } from './components/RadioButton/RadioButton.js';
+export { default as RadioButtonGroup } from './components/RadioButtonGroup/RadioButtonGroup.js';
 export { default as Search } from './components/Search/index.js';
 export { default as SearchFilterButton } from './components/SearchFilterButton/SearchFilterButton.js';
 export { default as SearchLayoutButton } from './components/SearchLayoutButton/SearchLayoutButton.js';
@@ -135,13 +134,13 @@ export { default as unstable_PageSelector } from './components/Pagination/experi
 export { default as unstable_Pagination } from './components/Pagination/experimental/Pagination.js';
 export { default as ProgressBar } from './components/ProgressBar/ProgressBar.js';
 export { default as unstable_TreeNode } from './components/TreeView/TreeNode.js';
-export { default as ComposedModal, ModalBody } from './components/ComposedModal/ComposedModal.js';
 export { default as MultiSelect } from './components/MultiSelect/MultiSelect.js';
 export { default as TextInput } from './components/TextInput/TextInput.js';
 export { default as unstable_Menu } from './components/Menu/Menu.js';
 export { default as unstable_TreeView } from './components/TreeView/TreeView.js';
 export { default as Breadcrumb } from './components/Breadcrumb/Breadcrumb.js';
 export { default as BreadcrumbItem } from './components/Breadcrumb/BreadcrumbItem.js';
+export { ModalBody } from './components/ComposedModal/ComposedModal.js';
 export { default as Table } from './components/DataTable/Table.js';
 export { default as TableActionList } from './components/DataTable/TableActionList.js';
 export { default as TableBatchAction } from './components/DataTable/TableBatchAction.js';
@@ -164,9 +163,11 @@ export { default as TableToolbarSearch } from './components/DataTable/TableToolb
 export { default as TableToolbarMenu } from './components/DataTable/TableToolbarMenu.js';
 export { default as ErrorBoundary } from './components/ErrorBoundary/ErrorBoundary.js';
 export { ErrorBoundaryContext } from './components/ErrorBoundary/ErrorBoundaryContext.js';
+export { default as FilterableMultiSelect } from './components/MultiSelect/FilterableMultiSelect.js';
 export { Grid } from './components/Grid/Grid.js';
 export { ColumnHang } from './components/Grid/ColumnHang.js';
 export { FlexGrid } from './components/Grid/FlexGrid.js';
+export { ActionableNotification, InlineNotification, NotificationActionButton, NotificationButton, ToastNotification } from './components/Notification/Notification.js';
 export { default as ControlledPasswordInput } from './components/TextInput/ControlledPasswordInput.js';
 export { default as PasswordInput } from './components/TextInput/PasswordInput.js';
 export { ProgressStep } from './components/ProgressIndicator/ProgressIndicator.js';