@carbon/react 1.16.0 → 1.17.0-rc.1

package/es/components/Search/Search.js

@@ -5,185 +5,152 @@
  * 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 PropTypes from 'prop-types';
-import React__default, { Component } from 'react';
+import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, defineProperty as _defineProperty, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { Close, Search as Search$2 } from '@carbon/icons-react';
 import cx from 'classnames';
-import { Close, Search as Search$1 } from '@carbon/icons-react';
+import PropTypes from 'prop-types';
+import React__default, { useRef, useState } from 'react';
+import { focus } from '../../internal/focus/index.js';
+import { useId } from '../../internal/useId.js';
+import { usePrefix } from '../../internal/usePrefix.js';
 import { composeEventHandlers } from '../../tools/events.js';
+import { useMergedRefs } from '../../internal/useMergedRefs.js';
 import deprecate from '../../prop-types/deprecate.js';
-import { FeatureFlagContext } from '../FeatureFlags/index.js';
-import { PrefixContext } from '../../internal/usePrefix.js';
 import { match } from '../../internal/keyboard/match.js';
 import { Escape } from '../../internal/keyboard/keys.js';
 
 var _Close;
 
-var _excluded = ["className", "type", "id", "placeHolderText", "placeholder", "labelText", "closeButtonLabelText", "small", "size", "light", "disabled", "onChange", "onKeyDown", "renderIcon", "onClear", "onExpand"];
-
-var Search = /*#__PURE__*/function (_Component) {
-  _inherits(Search, _Component);
-
-  var _super = _createSuper(Search);
-
-  function Search() {
-    var _this;
-
-    _classCallCheck(this, Search);
+var _excluded = ["autoComplete", "className", "closeButtonLabelText", "defaultValue", "disabled", "id", "labelText", "light", "onChange", "onClear", "onKeyDown", "onExpand", "placeholder", "renderIcon", "role", "size", "type", "value"];
+var Search = /*#__PURE__*/React__default.forwardRef(function Search(_ref, forwardRef) {
+  var _cx, _cx2;
+
+  var _ref$autoComplete = _ref.autoComplete,
+      autoComplete = _ref$autoComplete === void 0 ? 'off' : _ref$autoComplete,
+      className = _ref.className,
+      _ref$closeButtonLabel = _ref.closeButtonLabelText,
+      closeButtonLabelText = _ref$closeButtonLabel === void 0 ? 'Clear search input' : _ref$closeButtonLabel,
+      defaultValue = _ref.defaultValue,
+      disabled = _ref.disabled,
+      id = _ref.id,
+      labelText = _ref.labelText,
+      light = _ref.light,
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$onClear = _ref.onClear,
+      onClear = _ref$onClear === void 0 ? function () {} : _ref$onClear,
+      onKeyDown = _ref.onKeyDown,
+      onExpand = _ref.onExpand,
+      _ref$placeholder = _ref.placeholder,
+      placeholder = _ref$placeholder === void 0 ? '' : _ref$placeholder,
+      renderIcon = _ref.renderIcon,
+      _ref$role = _ref.role,
+      role = _ref$role === void 0 ? 'searchbox' : _ref$role,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? 'md' : _ref$size,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'text' : _ref$type,
+      value = _ref.value,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var prefix = usePrefix();
+  var inputRef = useRef(null);
+  var ref = useMergedRefs([forwardRef, inputRef]);
+  var inputId = useId('search-input');
+  var uniqueId = id || inputId;
+  var searchId = "".concat(uniqueId, "-search");
+
+  var _useState = useState(value || defaultValue || false),
+      _useState2 = _slicedToArray(_useState, 2),
+      hasContent = _useState2[0],
+      setHasContent = _useState2[1];
+
+  var _useState3 = useState(value),
+      _useState4 = _slicedToArray(_useState3, 2),
+      prevValue = _useState4[0],
+      setPrevValue = _useState4[1];
+
+  var searchClasses = cx((_cx = {}, _defineProperty(_cx, "".concat(prefix, "--search"), true), _defineProperty(_cx, "".concat(prefix, "--search--sm"), size === 'sm'), _defineProperty(_cx, "".concat(prefix, "--search--md"), size === 'md'), _defineProperty(_cx, "".concat(prefix, "--search--lg"), size === 'lg'), _defineProperty(_cx, "".concat(prefix, "--search--light"), light), _defineProperty(_cx, "".concat(prefix, "--search--disabled"), disabled), _defineProperty(_cx, className, className), _cx));
+  var clearClasses = cx((_cx2 = {}, _defineProperty(_cx2, "".concat(prefix, "--search-close"), true), _defineProperty(_cx2, "".concat(prefix, "--search-close--hidden"), !hasContent), _cx2));
+
+  if (value !== prevValue) {
+    setHasContent(!!value);
+    setPrevValue(value);
+  }
 
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+  function clearInput() {
+    if (!value) {
+      inputRef.current.value = '';
     }
 
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      hasContent: _this.props.value || _this.props.defaultValue || false,
-      prevValue: _this.props.value
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "clearInput", function (evt) {
-      if (!_this.props.value) {
-        _this.input.value = '';
-
-        _this.props.onChange(evt);
-      } else {
-        var clearedEvt = Object.assign({}, evt.target, {
-          target: {
-            value: ''
-          }
-        });
-
-        _this.props.onChange(clearedEvt);
-      }
-
-      _this.props.onClear();
-
-      _this.setState({
-        hasContent: false
-      }, function () {
-        return _this.input.focus();
-      });
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "handleChange", function (evt) {
-      _this.setState({
-        hasContent: evt.target.value !== ''
-      });
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "handleKeyDown", function (evt) {
-      if (match(evt, Escape)) {
-        _this.clearInput(evt);
-      }
+    var inputTarget = Object.assign({}, inputRef.current, {
+      value: ''
     });
+    var clearedEvt = {
+      target: inputTarget,
+      type: 'change'
+    };
+    onChange(clearedEvt);
+    onClear();
+    setHasContent(false);
+    focus(inputRef);
+  }
 
-    return _this;
+  function handleChange(event) {
+    setHasContent(event.target.value !== '');
   }
 
-  _createClass(Search, [{
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-
-      var _this$props = this.props,
-          className = _this$props.className,
-          type = _this$props.type,
-          _this$props$id = _this$props.id,
-          id = _this$props$id === void 0 ? this._inputId = this._inputId || "search__input__id_".concat(Math.random().toString(36).substr(2)) : _this$props$id,
-          placeHolderText = _this$props.placeHolderText,
-          placeholder = _this$props.placeholder,
-          labelText = _this$props.labelText,
-          closeButtonLabelText = _this$props.closeButtonLabelText,
-          small = _this$props.small,
-          _this$props$size = _this$props.size,
-          size = _this$props$size === void 0 ? !small ? 'xl' : 'sm' : _this$props$size,
-          light = _this$props.light,
-          disabled = _this$props.disabled,
-          onChange = _this$props.onChange,
-          onKeyDown = _this$props.onKeyDown,
-          renderIcon = _this$props.renderIcon;
-          _this$props.onClear;
-          _this$props.onExpand;
-          var other = _objectWithoutProperties(_this$props, _excluded);
-
-      var hasContent = this.state.hasContent;
-      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, _classNames2;
-
-        var searchClasses = cx((_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "--search"), true), _defineProperty(_classNames, "".concat(prefix, "--search--sm"), size === 'sm'), _defineProperty(_classNames, "".concat(prefix, "--search--lg"), enabled ? size === 'md' : size === 'lg'), _defineProperty(_classNames, "".concat(prefix, "--search--xl"), enabled ? size === 'lg' : size === 'xl'), _defineProperty(_classNames, "".concat(prefix, "--search--light"), light), _defineProperty(_classNames, "".concat(prefix, "--search--disabled"), disabled), _defineProperty(_classNames, className, className), _classNames));
-        var clearClasses = cx((_classNames2 = {}, _defineProperty(_classNames2, "".concat(prefix, "--search-close"), true), _defineProperty(_classNames2, "".concat(prefix, "--search-close--hidden"), !hasContent), _classNames2));
-        var customIcon;
-
-        if (renderIcon) {
-          customIcon = /*#__PURE__*/React__default.cloneElement(renderIcon, {
-            className: "".concat(prefix, "--search-magnifier-icon")
-          });
-        }
-
-        var searchId = "".concat(id, "-search");
-        var searchIcon = renderIcon ? customIcon : /*#__PURE__*/React__default.createElement(Search$1, {
-          className: "".concat(prefix, "--search-magnifier-icon")
-        });
-        return /*#__PURE__*/React__default.createElement("div", {
-          role: "search",
-          "aria-labelledby": searchId,
-          className: searchClasses
-        }, /*#__PURE__*/React__default.createElement("div", {
-          className: "".concat(prefix, "--search-magnifier"),
-          ref: function ref(magnifier) {
-            _this2.magnifier = magnifier;
-          }
-        }, searchIcon), /*#__PURE__*/React__default.createElement("label", {
-          id: searchId,
-          htmlFor: id,
-          className: "".concat(prefix, "--label")
-        }, labelText), /*#__PURE__*/React__default.createElement("input", _extends({
-          role: "searchbox",
-          autoComplete: "off"
-        }, other, {
-          type: type,
-          disabled: disabled,
-          className: "".concat(prefix, "--search-input"),
-          id: id,
-          placeholder: placeHolderText || placeholder,
-          onChange: composeEventHandlers([onChange, _this2.handleChange]),
-          onKeyDown: composeEventHandlers([onKeyDown, _this2.handleKeyDown]),
-          ref: function ref(input) {
-            _this2.input = input;
-          }
-        })), /*#__PURE__*/React__default.createElement("button", {
-          className: clearClasses,
-          disabled: disabled,
-          onClick: _this2.clearInput,
-          type: "button",
-          "aria-label": closeButtonLabelText
-        }, _Close || (_Close = /*#__PURE__*/React__default.createElement(Close, null))));
-      });
-    }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(_ref, state) {
-      var value = _ref.value;
-      var prevValue = state.prevValue;
-      return prevValue === value ? null : {
-        hasContent: !!value,
-        prevValue: value
-      };
+  function handleKeyDown(event) {
+    if (match(event, Escape)) {
+      event.stopPropagation();
+      clearInput();
     }
-  }]);
+  }
 
-  return Search;
-}(Component);
+  return /*#__PURE__*/React__default.createElement("div", {
+    role: "search",
+    "aria-labelledby": searchId,
+    className: searchClasses
+  }, /*#__PURE__*/React__default.createElement("div", {
+    role: onExpand ? 'button' : null,
+    className: "".concat(prefix, "--search-magnifier"),
+    onClick: onExpand
+  }, /*#__PURE__*/React__default.createElement(CustomSearchIcon, {
+    icon: renderIcon
+  })), /*#__PURE__*/React__default.createElement("label", {
+    id: searchId,
+    htmlFor: uniqueId,
+    className: "".concat(prefix, "--label")
+  }, labelText), /*#__PURE__*/React__default.createElement("input", _extends({}, rest, {
+    autoComplete: autoComplete,
+    className: "".concat(prefix, "--search-input"),
+    defaultValue: defaultValue,
+    disabled: disabled,
+    role: role,
+    ref: ref,
+    id: uniqueId,
+    onChange: composeEventHandlers([onChange, handleChange]),
+    onKeyDown: composeEventHandlers([onKeyDown, handleKeyDown]),
+    placeholder: placeholder,
+    type: type,
+    value: value
+  })), /*#__PURE__*/React__default.createElement("button", {
+    "aria-label": closeButtonLabelText,
+    className: clearClasses,
+    disabled: disabled,
+    onClick: clearInput,
+    title: closeButtonLabelText,
+    type: "button"
+  }, _Close || (_Close = /*#__PURE__*/React__default.createElement(Close, null))));
+});
+Search.displayName = 'Search';
+Search.propTypes = {
+  /**
+   * Specify an optional value for the `autocomplete` property on the underlying
+   * `<input>`, defaults to "off"
+   */
+  autoComplete: PropTypes.string,
 
-_defineProperty(Search, "propTypes", {
   /**
    * Specify an optional className to be applied to the container node
    */
@@ -217,7 +184,7 @@ _defineProperty(Search, "propTypes", {
   /**
    * Specify light version or default version of this control
    */
-  light: PropTypes.bool,
+  light: deprecate(PropTypes.bool, 'The `light` prop for `Search` is no longer needed and has ' + 'been deprecated in v11 in favor of the new `Layer` component. It will be moved in the next major release.'),
 
   /**
    * Optional callback called when the search value changes.
@@ -230,14 +197,14 @@ _defineProperty(Search, "propTypes", {
   onClear: PropTypes.func,
 
   /**
-   * Provide a handler that is invoked on the key down event for the input
+   * Optional callback called when the magnifier icon is clicked in ExpandableSearch.
    */
-  onKeyDown: PropTypes.func,
+  onExpand: PropTypes.func,
 
   /**
-   * Deprecated in favor of `placeholder`
+   * Provide a handler that is invoked on the key down event for the input
    */
-  placeHolderText: deprecate(PropTypes.string, "\nThe prop `placeHolderText` for Search has been deprecated in favor of `placeholder`. Please use `placeholder` instead."),
+  onKeyDown: PropTypes.func,
 
   /**
    * Provide an optional placeholder text for the Search.
@@ -253,18 +220,14 @@ _defineProperty(Search, "propTypes", {
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
 
   /**
-   * Specify the search size
+   * Specify the role for the underlying `<input>`, defaults to `searchbox`
    */
-  size: PropTypes.oneOf(['sm', 'md', 'lg', 'xl']),
+  role: PropTypes.string,
 
   /**
-   * Specify whether the Search should be a small variant
+   * Specify the size of the Search
    */
-
-  /**
-   * Specify whether the load was successful
-   */
-  small: deprecate(PropTypes.bool, "\nThe prop `small` for Search has been deprecated in favor of `size`. Please use `size=\"sm\"` instead."),
+  size: PropTypes.oneOf(['sm', 'md', 'lg']),
 
   /**
    * Optional prop to specify the type of the `<input>`
@@ -275,16 +238,29 @@ _defineProperty(Search, "propTypes", {
    * Specify the value of the `<input>`
    */
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-});
+};
 
-_defineProperty(Search, "contextType", FeatureFlagContext);
+function CustomSearchIcon(_ref2) {
+  var icon = _ref2.icon;
+  var prefix = usePrefix();
 
-_defineProperty(Search, "defaultProps", {
-  type: 'text',
-  placeholder: '',
-  closeButtonLabelText: 'Clear search input',
-  onChange: function onChange() {},
-  onClear: function onClear() {}
-});
+  if (icon) {
+    return /*#__PURE__*/React__default.cloneElement(icon, {
+      className: "".concat(prefix, "--search-magnifier-icon")
+    });
+  }
+
+  return /*#__PURE__*/React__default.createElement(Search$2, {
+    className: "".concat(prefix, "--search-magnifier-icon")
+  });
+}
+
+CustomSearchIcon.propTypes = {
+  /**
+   * Rendered icon for the Search. Can be a React component class
+   */
+  icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+};
+var Search$1 = Search;
 
-export { Search as default };
+export { Search$1 as default };

package/es/components/Search/index.js

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

package/es/components/Tab/index.js

@@ -6,7 +6,7 @@
  */
 
 import * as FeatureFlags from '@carbon/feature-flags';
-import { Tab as Tab$2 } from '../Tabs/next/Tabs.js';
+import { Tab as Tab$2 } from '../Tabs/Tabs.js';
 import Tab$3 from './Tab.js';
 
 var Tab = FeatureFlags.enabled('enable-v11-release') ? Tab$2 : Tab$3;

package/es/components/Tabs/Tabs.Skeleton.js

@@ -11,14 +11,14 @@ import React__default from 'react';
 import cx from 'classnames';
 import { usePrefix } from '../../internal/usePrefix.js';
 
-var _excluded = ["className", "type"];
+var _excluded = ["className", "contained"];
 
 var _span;
 
 function Tab() {
   var prefix = usePrefix();
   return /*#__PURE__*/React__default.createElement("li", {
-    className: "".concat(prefix, "--tabs--scrollable__nav-item")
+    className: "".concat(prefix, "--tabs__nav-item")
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(prefix, "--tabs__nav-link")
   }, _span || (_span = /*#__PURE__*/React__default.createElement("span", null))));
@@ -26,15 +26,15 @@ function Tab() {
 
 function TabsSkeleton(_ref) {
   var className = _ref.className,
-      type = _ref.type,
+      contained = _ref.contained,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
-  var tabClasses = cx(className, "".concat(prefix, "--tabs"), "".concat(prefix, "--skeleton"), "".concat(prefix, "--tabs--scrollable"), _defineProperty({}, "".concat(prefix, "--tabs--scrollable--container"), type === 'container'));
+  var tabClasses = cx(className, "".concat(prefix, "--tabs"), "".concat(prefix, "--skeleton"), _defineProperty({}, "".concat(prefix, "--tabs--contained"), contained));
   return /*#__PURE__*/React__default.createElement("div", _extends({
     className: tabClasses
   }, rest), /*#__PURE__*/React__default.createElement("ul", {
-    className: "".concat(prefix, "--tabs--scrollable__nav")
+    className: "".concat(prefix, "--tabs__nav")
   }, Tab(), Tab(), Tab(), Tab(), Tab()));
 }
 
@@ -47,7 +47,7 @@ TabsSkeleton.propTypes = {
   /**
    * Provide the type of Tab
    */
-  type: PropTypes.oneOf(['', 'default', 'container'])
+  contained: PropTypes.bool
 };
 
 export { TabsSkeleton as default };