carbon-react 101.4.2 → 101.4.3

package/lib/__internal__/label/label.component.js

@@ -65,8 +65,9 @@ const Label = ({
   pl,
   isRequired
 }) => {
-  const [isFocused, setFocus] = (0, _react.useState)(false);
   const {
+    hasFocus,
+    hasMouseOver,
     onMouseEnter,
     onMouseLeave
   } = (0, _react.useContext)(_inputBehaviour.InputContext);
@@ -86,11 +87,6 @@ const Label = ({
   };
 
   const icon = () => {
-    const wrapperProps = {
-      onFocus: () => setFocus(true),
-      onBlur: () => setFocus(false)
-    };
-
     if (useValidationIcon && shouldDisplayValidationIcon({
       error,
       warning,
@@ -113,11 +109,11 @@ const Label = ({
       }));
     }
 
-    return help && /*#__PURE__*/_react.default.createElement(_iconWrapper.default, wrapperProps, /*#__PURE__*/_react.default.createElement(_help.default, {
+    return help && /*#__PURE__*/_react.default.createElement(_iconWrapper.default, null, /*#__PURE__*/_react.default.createElement(_help.default, {
       tooltipId: tooltipId,
       tabIndex: helpTabIndex,
       type: helpIcon,
-      isFocused: isFocused
+      isFocused: hasFocus || hasMouseOver
     }, help));
   };
 

package/lib/__internal__/validations/validation-icon.component.js

@@ -91,7 +91,8 @@ const ValidationIcon = ({
     onBlur: e => {
       setTriggeredByIcon(false);
       if (onBlur) onBlur(e);
-    }
+    },
+    isPartOfInput: isPartOfInput
   }, (0, _utils.filterStyledSystemMarginProps)(rest)), /*#__PURE__*/_react.default.createElement(_icon.default, {
     key: `${validationType}-icon`,
     type: validationType,

package/lib/__internal__/validations/validation-icon.style.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _styledSystem = require("styled-system");
 
@@ -15,9 +15,13 @@ var _icon = _interopRequireDefault(require("../../components/icon/icon.style"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 const ValidationIconStyle = _styledComponents.default.span`
   background: none;
-  cursor: pointer;
+  cursor: default;
   display: flex;
   align-items: center;
   margin-top: 0;
@@ -25,6 +29,12 @@ const ValidationIconStyle = _styledComponents.default.span`
   border: 0;
   outline: none;
 
+  ${({
+  isPartOfInput
+}) => isPartOfInput && (0, _styledComponents.css)`
+      cursor: pointer;
+    `}
+
   ${_icon.default}:before {
     color: ${({
   validationType,

package/lib/components/help/help.component.js

@@ -139,7 +139,7 @@ Help.propTypes = { ...marginPropTypes,
   /** A path for the anchor */
   href: _propTypes.default.string,
 
-  /** A boolean received from IconWrapper */
+  /** Overrides the visibility of the Tooltip if true */
   isFocused: _propTypes.default.bool,
 
   /** <a href="https://brand.sage.com/d/NdbrveWvNheA/foundations#/icons/icons" target="_blank">List of supported icons</a>

package/lib/components/help/help.d.ts

@@ -13,7 +13,7 @@ export interface HelpProps extends MarginProps {
   helpId?: string;
   /** A path for the anchor */
   href?: string;
-  /** A boolean received from IconWrapper */
+  /** Overrides the visibility of the Tooltip if true */
   isFocused?: boolean;
   /** Overrides the default tabindex of the component */
   tabIndex?: number | string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "101.4.2",
+  "version": "101.4.3",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {