@carbon/react 1.6.0 → 1.8.0-rc.0

package/lib/components/InlineLoading/InlineLoading.js

@@ -25,8 +25,6 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var _excluded = ["className", "status", "iconDescription", "description", "onSuccess", "successDelay"];
 function InlineLoading(_ref) {
-  var _title, _title2;
-
   var className = _ref.className,
       _ref$status = _ref.status,
       status = _ref$status === void 0 ? 'active' : _ref$status,
@@ -40,10 +38,12 @@ function InlineLoading(_ref) {
   var loadingClasses = cx__default["default"]("".concat(prefix, "--inline-loading"), className);
 
   var getLoading = function getLoading() {
+    var iconLabel = iconDescription ? iconDescription : status;
+
     if (status === 'error') {
       return /*#__PURE__*/React__default["default"].createElement(iconsReact.ErrorFilled, {
         className: "".concat(prefix, "--inline-loading--error")
-      }, _title || (_title = /*#__PURE__*/React__default["default"].createElement("title", null, iconDescription)));
+      }, /*#__PURE__*/React__default["default"].createElement("title", null, iconLabel));
     }
 
     if (status === 'finished') {
@@ -54,13 +54,17 @@ function InlineLoading(_ref) {
       }, successDelay);
       return /*#__PURE__*/React__default["default"].createElement(iconsReact.CheckmarkFilled, {
         className: "".concat(prefix, "--inline-loading__checkmark-container")
-      }, _title2 || (_title2 = /*#__PURE__*/React__default["default"].createElement("title", null, iconDescription)));
+      }, /*#__PURE__*/React__default["default"].createElement("title", null, iconLabel));
     }
 
     if (status === 'inactive' || status === 'active') {
+      if (!iconDescription) {
+        iconLabel = status === 'active' ? 'loading' : 'not loading';
+      }
+
       return /*#__PURE__*/React__default["default"].createElement(Loading["default"], {
         small: true,
-        description: iconDescription,
+        description: iconLabel,
         withOverlay: false,
         active: status === 'active'
       });

package/lib/components/Loading/Loading.js

@@ -13,8 +13,8 @@ var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelper
 var cx = require('classnames');
 var PropTypes = require('prop-types');
 var React = require('react');
-var setupGetInstanceId = require('../../tools/setupGetInstanceId.js');
 var usePrefix = require('../../internal/usePrefix.js');
+var deprecate = require('../../prop-types/deprecate.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,14 +22,12 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _excluded = ["id", "active", "className", "withOverlay", "small", "description"];
-var getInstanceId = setupGetInstanceId["default"]();
+var _excluded = ["active", "className", "withOverlay", "small", "description"];
 
 function Loading(_ref) {
   var _cx, _cx2;
 
-  var id = _ref.id,
-      active = _ref.active,
+  var active = _ref.active,
       customClassName = _ref.className,
       withOverlay = _ref.withOverlay,
       small = _ref.small,
@@ -37,22 +35,13 @@ function Loading(_ref) {
       rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix.usePrefix();
-
-  var _useRef = React.useRef(getInstanceId()),
-      instanceId = _useRef.current;
-
   var loadingClassName = cx__default["default"](customClassName, (_cx = {}, _rollupPluginBabelHelpers.defineProperty(_cx, "".concat(prefix, "--loading"), true), _rollupPluginBabelHelpers.defineProperty(_cx, "".concat(prefix, "--loading--small"), small), _rollupPluginBabelHelpers.defineProperty(_cx, "".concat(prefix, "--loading--stop"), !active), _cx));
   var overlayClassName = cx__default["default"]((_cx2 = {}, _rollupPluginBabelHelpers.defineProperty(_cx2, "".concat(prefix, "--loading-overlay"), true), _rollupPluginBabelHelpers.defineProperty(_cx2, "".concat(prefix, "--loading-overlay--stop"), !active), _cx2));
-  var loadingId = id || "loading-id-".concat(instanceId);
   var loading = /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     "aria-atomic": "true",
-    "aria-labelledby": loadingId,
     "aria-live": active ? 'assertive' : 'off',
     className: loadingClassName
-  }), /*#__PURE__*/React__default["default"].createElement("label", {
-    id: loadingId,
-    className: "".concat(prefix, "--visually-hidden")
-  }, description), /*#__PURE__*/React__default["default"].createElement("svg", {
+  }), /*#__PURE__*/React__default["default"].createElement("svg", {
     className: "".concat(prefix, "--loading__svg"),
     viewBox: "0 0 100 100"
   }, /*#__PURE__*/React__default["default"].createElement("title", null, description), small ? /*#__PURE__*/React__default["default"].createElement("circle", {
@@ -90,7 +79,7 @@ Loading.propTypes = {
   /**
    * Provide an `id` to uniquely identify the label
    */
-  id: PropTypes__default["default"].string,
+  id: deprecate["default"](PropTypes__default["default"].string, "\nThe prop `id` is no longer needed."),
 
   /**
    * Specify whether you would like the small variant of <Loading>
@@ -106,7 +95,7 @@ Loading.defaultProps = {
   active: true,
   withOverlay: true,
   small: false,
-  description: 'Active loading indicator'
+  description: 'loading'
 };
 
 exports["default"] = Loading;