carbon-react 104.7.1 → 104.7.2

package/lib/__internal__/checkable-input/checkable-input.component.js

@@ -63,8 +63,8 @@ const CheckableInput = ({
   } = (0, _react.useRef)(inputId || (0, _guid.default)());
   const {
     labelId,
-    tooltipId,
     fieldHelpId,
+    validationIconId,
     ariaDescribedBy,
     ariaLabelledBy
   } = (0, _useInputAccessibility.default)({
@@ -73,7 +73,6 @@ const CheckableInput = ({
     warning,
     info,
     label,
-    labelHelp,
     fieldHelp
   });
   const isRadio = type === "radio";
@@ -82,7 +81,6 @@ const CheckableInput = ({
     error,
     fieldHelp,
     fieldHelpInline,
-    tooltipId,
     fieldHelpId,
     id,
     info,
@@ -96,6 +94,7 @@ const CheckableInput = ({
     name: id,
     reverse,
     warning,
+    validationIconId,
     // We don't want an asterisk on each radio control, only the legend
     // However, we still want the input element to receive the required prop
     isRequired: isRadio ? undefined : required,

package/lib/__internal__/form-field/form-field.component.d.ts

@@ -1,5 +1,5 @@
 export default FormField;
-declare function FormField({ children, disabled, fieldHelp: fieldHelpContent, fieldHelpInline, error, warning, info, tooltipId, fieldHelpId, helpTabIndex, label, labelId, labelAlign, labelHelp, labelHelpIcon, labelInline, labelSpacing, labelWidth, id, reverse, isOptional, useValidationIcon, adaptiveLabelBreakpoint, isRequired, ...rest }: {
+declare function FormField({ children, disabled, fieldHelp: fieldHelpContent, fieldHelpInline, error, warning, info, tooltipId, fieldHelpId, helpTabIndex, label, labelId, labelAlign, labelHelp, labelHelpIcon, labelInline, labelSpacing, labelWidth, id, reverse, isOptional, useValidationIcon, adaptiveLabelBreakpoint, isRequired, validationIconId, ...rest }: {
     [x: string]: any;
     children: any;
     disabled: any;
@@ -25,6 +25,7 @@ declare function FormField({ children, disabled, fieldHelp: fieldHelpContent, fi
     useValidationIcon: any;
     adaptiveLabelBreakpoint: any;
     isRequired: any;
+    validationIconId: any;
 }): JSX.Element;
 declare namespace FormField {
     const propTypes: {
@@ -58,6 +59,8 @@ declare namespace FormField {
         adaptiveLabelBreakpoint: PropTypes.Requireable<number>;
         /** Flag to configure component as mandatory */
         isRequired: PropTypes.Requireable<boolean>;
+        /** Id of the validation icon */
+        validationIconId: PropTypes.Requireable<string>;
     };
 }
 import PropTypes from "prop-types";

package/lib/__internal__/form-field/form-field.component.js

@@ -60,6 +60,7 @@ const FormField = ({
   useValidationIcon,
   adaptiveLabelBreakpoint,
   isRequired,
+  validationIconId,
   ...rest
 }) => {
   const context = (0, _react.useContext)(_tab.TabContext);
@@ -103,7 +104,8 @@ const FormField = ({
     useValidationIcon: useValidationIcon,
     pr: !reverse ? labelSpacing : undefined,
     pl: reverse ? labelSpacing : undefined,
-    isRequired: isRequired
+    isRequired: isRequired,
+    validationIconId: validationIconId
   }, label), fieldHelpInline && fieldHelp, !reverse && children), !fieldHelpInline && fieldHelp);
 };
 
@@ -150,7 +152,10 @@ FormField.propTypes = {
   adaptiveLabelBreakpoint: _propTypes.default.number,
 
   /** Flag to configure component as mandatory */
-  isRequired: _propTypes.default.bool
+  isRequired: _propTypes.default.bool,
+
+  /** Id of the validation icon */
+  validationIconId: _propTypes.default.string
 };
 var _default = FormField;
 exports.default = _default;

package/lib/__internal__/form-field/form-field.d.ts

@@ -33,6 +33,8 @@ export interface CommonFormFieldPropTypes
   labelWidth?: number;
   /** If true the label switches position with the input */
   reverse?: boolean;
+  /** Id of the validation icon */
+  validationIconId?: string;
 }
 
 export interface FormFieldPropTypes extends CommonFormFieldPropTypes {

package/lib/__internal__/input-icon-toggle/input-icon-toggle.component.d.ts

@@ -1,5 +1,5 @@
 export default InputIconToggle;
-declare function InputIconToggle({ disabled, readOnly, size, inputIcon: type, onClick, onFocus, onBlur, onMouseDown, error, warning, info, useValidationIcon, align, iconTabIndex, tooltipId, }: {
+declare function InputIconToggle({ disabled, readOnly, size, inputIcon: type, onClick, onFocus, onBlur, onMouseDown, error, warning, info, useValidationIcon, align, iconTabIndex, validationIconId, }: {
     disabled: any;
     readOnly: any;
     size: any;
@@ -14,7 +14,7 @@ declare function InputIconToggle({ disabled, readOnly, size, inputIcon: type, on
     useValidationIcon: any;
     align: any;
     iconTabIndex: any;
-    tooltipId: any;
+    validationIconId: any;
 }): JSX.Element | null;
 declare namespace InputIconToggle {
     namespace propTypes {
@@ -32,7 +32,7 @@ declare namespace InputIconToggle {
         const align: PropTypes.Requireable<string>;
         const useValidationIcon: PropTypes.Requireable<boolean>;
         const iconTabIndex: PropTypes.Requireable<number>;
-        const tooltipId: PropTypes.Requireable<string>;
+        const validationIconId: PropTypes.Requireable<string>;
     }
 }
 import PropTypes from "prop-types";

package/lib/__internal__/input-icon-toggle/input-icon-toggle.component.js

@@ -41,7 +41,7 @@ const InputIconToggle = ({
   useValidationIcon,
   align,
   iconTabIndex,
-  tooltipId
+  validationIconId
 }) => {
   if (useValidationIcon && !disabled && shouldDisplayValidationIcon({
     error,
@@ -60,7 +60,7 @@ const InputIconToggle = ({
       onBlur: onBlur,
       isPartOfInput: true,
       tabIndex: iconTabIndex,
-      tooltipId: tooltipId,
+      iconId: validationIconId,
       tooltipPosition: align === "right" ? "left" : "right"
     }));
   }
@@ -74,8 +74,7 @@ const InputIconToggle = ({
       onMouseDown: onMouseDown,
       tabIndex: iconTabIndex
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-      type: type,
-      tooltipId: tooltipId
+      type: type
     }));
   }
 
@@ -97,7 +96,9 @@ InputIconToggle.propTypes = {
   align: _propTypes.default.oneOf(["left", "right"]),
   useValidationIcon: _propTypes.default.bool,
   iconTabIndex: _propTypes.default.number,
-  tooltipId: _propTypes.default.string
+
+  /** Id of the validation icon */
+  validationIconId: _propTypes.default.string
 };
 var _default = InputIconToggle;
 exports.default = _default;

package/lib/__internal__/input-icon-toggle/input-icon-toggle.d.ts

@@ -16,6 +16,8 @@ export interface InputIconToggleProps {
   useValidationIcon?: boolean;
   iconTabIndex?: number;
   tooltipId?: string;
+  /** Id of the validation icon */
+  validationIconId?: string;
 }
 declare function InputIconToggle(props: InputIconToggleProps): JSX.Element;
 

package/lib/__internal__/label/label.component.d.ts

@@ -1,5 +1,5 @@
 declare var _default: React.MemoExoticComponent<{
-    ({ disabled, inline, align, width, optional, labelId, tooltipId, children, error, warning, info, help, helpIcon, helpTabIndex, useValidationIcon, htmlFor, pr, pl, isRequired, }: {
+    ({ disabled, inline, align, width, optional, labelId, tooltipId, children, error, warning, info, help, helpIcon, helpTabIndex, useValidationIcon, htmlFor, pr, pl, isRequired, validationIconId, }: {
         disabled: any;
         inline: any;
         align?: string | undefined;
@@ -19,6 +19,7 @@ declare var _default: React.MemoExoticComponent<{
         pr: any;
         pl: any;
         isRequired: any;
+        validationIconId: any;
     }): JSX.Element;
     propTypes: {
         /** Label width */
@@ -59,6 +60,8 @@ declare var _default: React.MemoExoticComponent<{
         pl: PropTypes.Requireable<number>;
         /** Flag to configure component as mandatory */
         isRequired: PropTypes.Requireable<boolean>;
+        /** Id of the validation icon */
+        validationIconId: PropTypes.Requireable<string>;
     };
 }>;
 export default _default;

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

@@ -63,11 +63,11 @@ const Label = ({
   htmlFor,
   pr,
   pl,
-  isRequired
+  isRequired,
+  validationIconId
 }) => {
+  const [isFocused, setFocus] = (0, _react.useState)(false);
   const {
-    hasFocus,
-    hasMouseOver,
     onMouseEnter,
     onMouseLeave
   } = (0, _react.useContext)(_inputBehaviour.InputContext);
@@ -87,6 +87,11 @@ const Label = ({
   };
 
   const icon = () => {
+    const wrapperProps = {
+      onFocus: () => setFocus(true),
+      onBlur: () => setFocus(false)
+    };
+
     if (useValidationIcon && shouldDisplayValidationIcon({
       error,
       warning,
@@ -100,6 +105,7 @@ const Label = ({
         inline
       });
       return /*#__PURE__*/_react.default.createElement(_iconWrapper.default, null, /*#__PURE__*/_react.default.createElement(_validationIcon.default, {
+        iconId: validationIconId,
         tooltipId: tooltipId,
         error: error,
         warning: warning,
@@ -109,11 +115,11 @@ const Label = ({
       }));
     }
 
-    return help && /*#__PURE__*/_react.default.createElement(_iconWrapper.default, null, /*#__PURE__*/_react.default.createElement(_help.default, {
+    return help && /*#__PURE__*/_react.default.createElement(_iconWrapper.default, wrapperProps, /*#__PURE__*/_react.default.createElement(_help.default, {
       tooltipId: tooltipId,
       tabIndex: helpTabIndex,
       type: helpIcon,
-      isFocused: hasFocus || hasMouseOver
+      isFocused: isFocused
     }, help));
   };
 
@@ -191,7 +197,10 @@ Label.propTypes = {
   pl: _propTypes.default.oneOf([1, 2]),
 
   /** Flag to configure component as mandatory */
-  isRequired: _propTypes.default.bool
+  isRequired: _propTypes.default.bool,
+
+  /** Id of the validation icon */
+  validationIconId: _propTypes.default.string
 };
 
 var _default = /*#__PURE__*/_react.default.memo(Label);

package/lib/__internal__/label/label.d.ts

@@ -34,6 +34,8 @@ export interface LabelPropTypes extends ValidationPropTypes {
   pr?: 1 | 2;
   /** Padding left, integer multiplied by base spacing constant (8) */
   pl?: 1 | 2;
+  /** Id of the validation icon */
+  validationIconId?: string;
 }
 
 declare function Label(props: LabelPropTypes): JSX.Element;

package/lib/__internal__/tooltip-provider/index.js

@@ -5,12 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TooltipProvider = exports.TooltipContext = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _guid = _interopRequireDefault(require("../utils/helpers/guid/guid"));
+
 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 TooltipContext = /*#__PURE__*/_react.default.createContext({});
 
 exports.TooltipContext = TooltipContext;
@@ -21,18 +27,22 @@ const TooltipProvider = ({
   helpAriaLabel,
   focusable = true,
   tooltipVisible,
-  disabled = false,
+  disabled,
   target
-}) => /*#__PURE__*/_react.default.createElement(TooltipContext.Provider, {
-  value: {
-    tooltipPosition,
-    helpAriaLabel,
-    focusable,
-    tooltipVisible,
-    disabled,
-    target
-  }
-}, children);
+}) => {
+  const tooltipId = (0, _react.useRef)((0, _guid.default)());
+  return /*#__PURE__*/_react.default.createElement(TooltipContext.Provider, {
+    value: {
+      tooltipPosition,
+      helpAriaLabel,
+      focusable,
+      tooltipVisible,
+      disabled,
+      tooltipId,
+      target
+    }
+  }, children);
+};
 
 exports.TooltipProvider = TooltipProvider;
 TooltipProvider.propTypes = {

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

@@ -139,7 +139,7 @@ Help.propTypes = { ...marginPropTypes,
   /** A path for the anchor */
   href: _propTypes.default.string,
 
-  /** Overrides the visibility of the Tooltip if true */
+  /** A boolean received from IconWrapper */
   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;
-  /** Overrides the visibility of the Tooltip if true */
+  /** A boolean received from IconWrapper */
   isFocused?: boolean;
   /** Overrides the default tabindex of the component */
   tabIndex?: number | string;

package/lib/components/textarea/textarea.component.js

@@ -105,7 +105,7 @@ const Textarea = ({
 
   const {
     labelId,
-    tooltipId,
+    validationIconId,
     fieldHelpId,
     ariaDescribedBy,
     ariaLabelledBy
@@ -115,7 +115,6 @@ const Textarea = ({
     warning,
     info,
     label,
-    labelHelp,
     fieldHelp
   });
   (0, _react.useEffect)(() => {
@@ -176,7 +175,6 @@ const Textarea = ({
     labelWidth: labelWidth,
     labelHelp: labelHelp,
     labelSpacing: labelSpacing,
-    tooltipId: tooltipId,
     isRequired: props.required,
     useValidationIcon: validationOnLabel,
     adaptiveLabelBreakpoint: adaptiveLabelBreakpoint
@@ -214,6 +212,7 @@ const Textarea = ({
     error: error,
     warning: warning,
     info: info,
+    validationIconId: validationIconId,
     useValidationIcon: !validationOnLabel
   }))), characterCount())));
 };

package/lib/components/textbox/textbox.component.js

@@ -94,7 +94,7 @@ const Textbox = ({
   const [maxLength, characterCount] = (0, _useCharacterCount.default)(value, characterLimit, warnOverLimit, enforceCharacterLimit);
   const {
     labelId: internalLabelId,
-    tooltipId,
+    validationIconId,
     fieldHelpId,
     ariaDescribedBy
   } = (0, _useInputAccessibility.default)({
@@ -111,7 +111,6 @@ const Textbox = ({
     helpAriaLabel: helpAriaLabel,
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_inputBehaviour.InputBehaviour, null, /*#__PURE__*/_react.default.createElement(_formField.default, _extends({
-    tooltipId: tooltipId,
     disabled: disabled,
     fieldHelp: fieldHelp,
     fieldHelpId: fieldHelpId,
@@ -133,7 +132,8 @@ const Textbox = ({
     isRequired: required,
     "data-component": dataComponent,
     "data-role": dataRole,
-    "data-element": dataElement
+    "data-element": dataElement,
+    validationIconId: validationIconId
   }, (0, _utils.filterStyledSystemMarginProps)(props)), /*#__PURE__*/_react.default.createElement(_input.InputPresentation, {
     align: align,
     disabled: disabled,
@@ -182,7 +182,7 @@ const Textbox = ({
     size: size,
     useValidationIcon: !validationOnLabel,
     warning: warning,
-    tooltipId: tooltipId
+    validationIconId: validationIconId
   }))), characterCount));
 };
 

package/lib/hooks/__internal__/useInputAccessibility/useInputAccessibility.d.ts

@@ -1,14 +1,13 @@
-export default function useInputAccessibility({ id, error, warning, info, label, labelHelp, fieldHelp, }: {
+export default function useInputAccessibility({ id, error, warning, info, label, fieldHelp, }: {
     id: any;
     error: any;
     warning: any;
     info: any;
     label: any;
-    labelHelp: any;
     fieldHelp: any;
 }): {
     labelId: string | undefined;
-    tooltipId: string | undefined;
+    validationIconId: string | undefined;
     fieldHelpId: string | undefined;
     ariaDescribedBy: string;
     ariaLabelledBy: string | undefined;

package/lib/hooks/__internal__/useInputAccessibility/useInputAccessibility.js

@@ -11,17 +11,16 @@ function useInputAccessibility({
   warning,
   info,
   label,
-  labelHelp,
   fieldHelp
 }) {
   const labelId = label ? `${id}-label` : undefined;
-  const tooltipId = [error, warning, info, labelHelp].filter(validation => typeof validation === "string").length ? `${id}-tooltip` : undefined;
+  const validationIconId = [error, warning, info].filter(validation => typeof validation === "string").length ? `${id}-validation-icon` : undefined;
   const fieldHelpId = fieldHelp ? `${id}-field-help` : undefined;
-  const ariaDescribedBy = [fieldHelpId, tooltipId].filter(Boolean).join(" ");
+  const ariaDescribedBy = [fieldHelpId, validationIconId].filter(Boolean).join(" ");
   const ariaLabelledBy = labelId;
   return {
     labelId,
-    tooltipId,
+    validationIconId,
     fieldHelpId,
     ariaDescribedBy,
     ariaLabelledBy

package/package.json

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