@hitachivantara/uikit-react-core 5.92.0 → 5.93.0

package/dist/cjs/Badge/Badge.styles.cjs

@@ -3,7 +3,19 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
 const uikitStyles = require("@hitachivantara/uikit-styles");
 const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvBadge", {
-  root: { position: "relative", "&>*": { float: "left" } },
+  root: {
+    position: "relative",
+    "&>*": { float: "left" },
+    ":has($badgeIcon)": {
+      width: "fit-content",
+      height: "fit-content",
+      "&>div:first-child": {
+        minWidth: 32,
+        minHeight: 32,
+        "--icsize": "100%"
+      }
+    }
+  },
   /** class applied to the badge container when it has content */
   badgeContainer: {},
   /** class applied to the badge */

package/dist/cjs/Banner/BannerContent/BannerContent.styles.cjs

@@ -8,7 +8,7 @@ const { useClasses, staticClasses } = uikitReactUtils.createClasses("HvBannerCon
     width: "100%",
     position: "relative",
     gap: uikitStyles.theme.space.xs,
-    borderRadius: uikitStyles.theme.radii.none
+    borderRadius: 0
   },
   success: {},
   warning: {},

package/dist/cjs/BaseDropdown/BaseDropdown.cjs

@@ -189,6 +189,7 @@ const BaseDropdown = React.forwardRef(function BaseDropdown2(props, ref) {
         classes,
         containerId,
         onClickAway: handleOutside,
+        disablePortal,
         onContainerKeyDown: handleContainerKeyDown,
         children
       }

package/dist/cjs/BaseInput/validations.cjs

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../FormElement/utils.cjs");
 const isNumeric = (num) => (
   // to prevent Number( <spaces> ) = 0
   num.trim().length > 0 && !Number.isNaN(Number(num))
@@ -9,27 +8,22 @@ const isEmail = (email) => {
   const regexp = /^[^\\s]+[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?[.])+[a-z0-9](?:[a-z0-9-]*[a-z0-9])$/i;
   return regexp.test(email);
 };
-const validationTypes = Object.freeze({
-  none: "none",
-  number: "number",
-  email: "email"
-});
 const computeValidationType = (type) => {
   switch (type) {
     case "number":
-      return validationTypes.number;
+      return "number";
     case "email":
-      return validationTypes.email;
+      return "email";
     default:
-      return validationTypes.none;
+      return "none";
   }
 };
-const hasBuiltInValidations = (required, validationType, minCharQuantity, maxCharQuantity, validation, inputProps) => required || validationType !== validationTypes.none || minCharQuantity != null || maxCharQuantity != null || validation != null || inputProps?.required != null || inputProps?.minLength != null || inputProps?.maxLength != null || inputProps?.min != null || inputProps?.max != null || inputProps?.type != null && inputProps?.type !== "text" && inputProps?.type !== "password" || inputProps?.pattern != null;
+const hasBuiltInValidations = (required, validationType, minCharQuantity, maxCharQuantity, validation, inputProps) => required || validationType !== "none" || minCharQuantity != null || maxCharQuantity != null || validation != null || inputProps?.required != null || inputProps?.minLength != null || inputProps?.maxLength != null || inputProps?.min != null || inputProps?.max != null || inputProps?.type != null && inputProps?.type !== "text" && inputProps?.type !== "password" || inputProps?.pattern != null;
 const computeValidationState = (inputValidity, isEmptyValue) => {
   if (inputValidity.valid && isEmptyValue) {
-    return utils.validationStates.standBy;
+    return "standBy";
   }
-  return inputValidity.valid ? utils.validationStates.valid : utils.validationStates.invalid;
+  return inputValidity.valid ? "valid" : "invalid";
 };
 const computeValidationMessage = (inputValidity, errorMessages) => {
   if (inputValidity.valid) {
@@ -79,13 +73,13 @@ const validateInput = (input, required, minCharQuantity, maxCharQuantity, valida
       inputValidity.valid = false;
     }
     switch (validationType) {
-      case validationTypes.number:
+      case "number":
         if (!isNumeric(value)) {
           inputValidity.typeMismatch = true;
           inputValidity.valid = false;
         }
         break;
-      case validationTypes.email:
+      case "email":
         if (!isEmail(value)) {
           inputValidity.typeMismatch = true;
           inputValidity.valid = false;
@@ -112,4 +106,3 @@ exports.computeValidationState = computeValidationState;
 exports.computeValidationType = computeValidationType;
 exports.hasBuiltInValidations = hasBuiltInValidations;
 exports.validateInput = validateInput;
-exports.validationTypes = validationTypes;

package/dist/cjs/BaseSwitch/BaseSwitch.styles.cjs

@@ -91,7 +91,7 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvBaseSwitc
   },
   readOnly: {},
   focusVisible: {
-    borderRadius: "8px",
+    borderRadius: uikitStyles.theme.radii.round,
     ...focusUtils.outlineStyles
   }
 });

package/dist/cjs/Button/Button.styles.cjs

@@ -30,20 +30,21 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvButton",
     border: "1px solid transparent",
     borderRadius: `var(--radius, ${uikitStyles.theme.radii.base})`,
     padding: uikitStyles.theme.spacing(0, "sm"),
+    // remove icon container spacing
+    "--icsize": "auto",
     "& $startIcon, & $endIcon": {
       flexShrink: 0,
       lineHeight: 0,
-      marginTop: -1,
-      marginBottom: -1
+      minWidth: 16
     }
   },
   /** applied to the _left_ icon container */
   startIcon: {
-    marginLeft: uikitStyles.theme.spacing(-1)
+    marginRight: 8
   },
   /** applied to the _right_ icon container */
   endIcon: {
-    marginRight: uikitStyles.theme.spacing(-1)
+    marginLeft: 8
   },
   focusVisible: {},
   /** applied to the root element when disabled */
@@ -61,6 +62,7 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvButton",
   icon: {
     margin: 0,
     padding: 0,
+    flexShrink: 0,
     width: "var(--HvButton-height, fit-content)"
   },
   /** applied to the root element when using the `contained` variant */

package/dist/cjs/Calendar/CalendarHeader/CalendarHeader.cjs

@@ -36,9 +36,8 @@ const HvCalendarHeader = (props) => {
   const [isValidValue, setIsValidValue] = React.useState(
     inputValue.length === 0 || inputValue && utils.isDate(new Date(inputValue))
   );
-  const validateInput = (incomingValid) => incomingValid === void 0 || utils.isDate(new Date(incomingValid));
   React.useEffect(() => {
-    const valid = validateInput(localValue);
+    const valid = !localValue || utils.isDate(new Date(localValue));
     setIsValidValue(valid);
     if (valid) {
       if (!localValue) {

package/dist/cjs/Card/Card.cjs

@@ -12,23 +12,24 @@ const HvCard = React.forwardRef(function HvCard2(props, ref) {
     className,
     children,
     icon,
-    selectable = false,
-    selected = false,
+    selectable,
+    selected,
     statusColor = "sema0",
     bgcolor,
     ...others
   } = uikitReactUtils.useDefaultProps("HvCard", props);
   const { classes, cx } = Card_styles.useClasses(classesProp);
-  const barColor = statusColor !== "sema0" && statusColor || selected && "text" || "border";
+  const barColor = statusColor !== "sema0" && statusColor || selected && "text" || void 0;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
       ref,
       style: uikitReactUtils.mergeStyles(style, {
         "--bg-color": uikitStyles.getColor(bgcolor),
-        "--bar-height": `${selected ? 4 : 2}px`,
+        "--bar-height": selected && "4px",
         "--bar-color": uikitStyles.getColor(barColor)
       }),
+      "data-color": statusColor,
       className: cx(
         "HvIsCardGridElement",
         classes.root,

package/dist/cjs/Card/Card.styles.cjs

@@ -8,7 +8,9 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvCard", {
     overflow: "visible",
     position: "relative",
     outline: `1px solid ${uikitStyles.theme.colors.border}`,
-    borderRadius: `0px 0px ${uikitStyles.theme.radii.round} ${uikitStyles.theme.radii.round}`,
+    "--rt": 0,
+    "--rb": uikitStyles.theme.radii.round,
+    borderRadius: `var(--rt) var(--rt) var(--rb) var(--rb)`,
     backgroundColor: "var(--bg-color)",
     "&:focus-visible": {
       ...focusUtils.outlineStyles
@@ -39,8 +41,8 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvCard", {
     right: uikitStyles.theme.space.xs
   },
   semanticBar: {
-    backgroundColor: "var(--bar-color)",
-    height: "var(--bar-height)",
+    backgroundColor: `var(--bar-color, ${uikitStyles.theme.colors.border})`,
+    height: "var(--bar-height, 2px)",
     width: "100%",
     top: -1,
     right: 0

package/dist/cjs/Card/Header/Header.styles.cjs

@@ -5,7 +5,8 @@ const uikitStyles = require("@hitachivantara/uikit-styles");
 const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvCardHeader", {
   root: {
     position: "relative",
-    padding: uikitStyles.theme.spacing("12px", "xs", "sm", "sm")
+    padding: uikitStyles.theme.spacing("12px", "xs", "sm", "sm"),
+    gap: uikitStyles.theme.space.xs
   },
   titleShort: {
     ...uikitStyles.theme.typography.label,
@@ -21,8 +22,7 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvCardHeade
   },
   content: {},
   action: {
-    margin: 0,
-    paddingLeft: uikitStyles.theme.space.xs
+    margin: 0
   }
 });
 exports.staticClasses = staticClasses;

package/dist/cjs/CheckBox/CheckBox.cjs

@@ -7,8 +7,8 @@ const useControlled = require("../hooks/useControlled.cjs");
 const useUniqueId = require("../hooks/useUniqueId.cjs");
 const setId = require("../utils/setId.cjs");
 const CheckBox_styles = require("./CheckBox.styles.cjs");
-const utils = require("../FormElement/utils.cjs");
 const BaseCheckBox = require("../BaseCheckBox/BaseCheckBox.cjs");
+const utils = require("../FormElement/utils.cjs");
 const FormElement = require("../FormElement/FormElement.cjs");
 const Label = require("../FormElement/Label/Label.cjs");
 const WarningText = require("../FormElement/WarningText/WarningText.cjs");

package/dist/cjs/CheckBoxGroup/CheckBoxGroup.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
+const LabelContainer = require("../FormElement/LabelContainer.cjs");
 const useControlled = require("../hooks/useControlled.cjs");
 const useUniqueId = require("../hooks/useUniqueId.cjs");
 const CounterLabel = require("../utils/CounterLabel.cjs");
@@ -10,8 +11,6 @@ const multiSelectionEventHandler = require("../utils/multiSelectionEventHandler.
 const setId = require("../utils/setId.cjs");
 const CheckBoxGroup_styles = require("./CheckBoxGroup.styles.cjs");
 const FormElement = require("../FormElement/FormElement.cjs");
-const Label = require("../FormElement/Label/Label.cjs");
-const InfoMessage = require("../FormElement/InfoMessage/InfoMessage.cjs");
 const CheckBox = require("../CheckBox/CheckBox.cjs");
 const WarningText = require("../FormElement/WarningText/WarningText.cjs");
 const computeSelectAllState = (selected, total) => {
@@ -179,16 +178,18 @@ const HvCheckBoxGroup = React.forwardRef(
         readOnly,
         className: cx(classes.root, className),
         children: [
-          label && /* @__PURE__ */ jsxRuntime.jsx(
-            Label.HvLabel,
+          /* @__PURE__ */ jsxRuntime.jsx(
+            LabelContainer.HvLabelContainer,
             {
-              showGutter: true,
-              id: setId.setId(elementId, "label"),
               label,
-              className: classes.label
+              description,
+              labelId: setId.setId(elementId, "label"),
+              descriptionId: setId.setId(elementId, "description"),
+              classes: {
+                label: classes.label
+              }
             }
           ),
-          description && /* @__PURE__ */ jsxRuntime.jsx(InfoMessage.HvInfoMessage, { id: setId.setId(elementId, "description"), children: description }),
           /* @__PURE__ */ jsxRuntime.jsxs(
             "div",
             {

package/dist/cjs/ColorPicker/ColorPicker.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
+const LabelContainer = require("../FormElement/LabelContainer.cjs");
 const useControlled = require("../hooks/useControlled.cjs");
 const useLabels = require("../hooks/useLabels.cjs");
 const useUniqueId = require("../hooks/useUniqueId.cjs");
@@ -13,8 +14,6 @@ const PresetColors = require("./PresetColors/PresetColors.cjs");
 const Picker = require("./Picker/Picker.cjs");
 const SavedColors = require("./SavedColors/SavedColors.cjs");
 const FormElement = require("../FormElement/FormElement.cjs");
-const Label = require("../FormElement/Label/Label.cjs");
-const InfoMessage = require("../FormElement/InfoMessage/InfoMessage.cjs");
 const BaseDropdown = require("../BaseDropdown/BaseDropdown.cjs");
 const Panel = require("../Panel/Panel.cjs");
 const Typography = require("../Typography/Typography.cjs");
@@ -80,8 +79,6 @@ const HvColorPicker = React.forwardRef(
       defaultSavedColorsValue
     );
     const elementId = useUniqueId.useUniqueId(id);
-    const hasLabel = label != null;
-    const hasDescription = description != null;
     const handleToggle = (_, open) => {
       setIsOpen(open);
     };
@@ -126,25 +123,20 @@ const HvColorPicker = React.forwardRef(
         required,
         className: cx(classes.root, className),
         children: [
-          (hasLabel || hasDescription) && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: classes.labelContainer, children: [
-            hasLabel && /* @__PURE__ */ jsxRuntime.jsx(
-              Label.HvLabel,
-              {
-                showGutter: true,
-                id: setId.setId(elementId, "label"),
-                label,
-                className: classes.label
-              }
-            ),
-            hasDescription && /* @__PURE__ */ jsxRuntime.jsx(
-              InfoMessage.HvInfoMessage,
-              {
-                id: setId.setId(elementId, "description"),
-                className: classes.description,
-                children: description
+          /* @__PURE__ */ jsxRuntime.jsx(
+            LabelContainer.HvLabelContainer,
+            {
+              label,
+              description,
+              labelId: setId.setId(elementId, "label"),
+              descriptionId: setId.setId(elementId, "description"),
+              classes: {
+                root: classes.labelContainer,
+                label: classes.label,
+                description: classes.description
               }
-            )
-          ] }),
+            }
+          ),
           /* @__PURE__ */ jsxRuntime.jsx(
             BaseDropdown.HvBaseDropdown,
             {

package/dist/cjs/ColorPicker/ColorPicker.styles.cjs

@@ -3,10 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
 const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvColorPicker", {
   root: {},
-  labelContainer: {
-    display: "flex",
-    alignItems: "flex-start"
-  },
+  labelContainer: {},
   label: {},
   description: {},
   headerColorValue: {

package/dist/cjs/DatePicker/DatePicker.cjs

@@ -5,6 +5,7 @@ const React = require("react");
 const utils$1 = require("@mui/material/utils");
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
 const utils = require("../Calendar/utils.cjs");
+const LabelContainer = require("../FormElement/LabelContainer.cjs");
 const useControlled = require("../hooks/useControlled.cjs");
 const useLabels = require("../hooks/useLabels.cjs");
 const useUniqueId = require("../hooks/useUniqueId.cjs");
@@ -16,11 +17,9 @@ const useVisibleDate = require("./useVisibleDate.cjs");
 const utils$2 = require("./utils.cjs");
 const Calendar = require("../Calendar/Calendar.cjs");
 const Button = require("../Button/Button.cjs");
-const utils$3 = require("../FormElement/utils.cjs");
 const FormElement = require("../FormElement/FormElement.cjs");
-const Label = require("../FormElement/Label/Label.cjs");
-const InfoMessage = require("../FormElement/InfoMessage/InfoMessage.cjs");
 const BaseDropdown = require("../BaseDropdown/BaseDropdown.cjs");
+const utils$3 = require("../FormElement/utils.cjs");
 const WarningText = require("../FormElement/WarningText/WarningText.cjs");
 const ActionBar = require("../ActionBar/ActionBar.cjs");
 const DEFAULT_LABELS = {
@@ -233,8 +232,6 @@ const HvDatePicker = React.forwardRef(
     ] });
     const dateValue = rangeMode ? { startDate, endDate } : startDate;
     const dateString = utils$2.getDateLabel(dateValue, rangeMode, locale);
-    const hasLabel = label != null;
-    const hasDescription = description != null;
     const canShowError = ariaErrorMessage == null && (status !== void 0 && statusMessage !== void 0 || status === void 0 && required);
     const isStateInvalid = utils$3.isInvalid(validationState);
     let errorMessageId;
@@ -254,25 +251,20 @@ const HvDatePicker = React.forwardRef(
         readOnly,
         ...others,
         children: [
-          (hasLabel || hasDescription) && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: classes.labelContainer, children: [
-            hasLabel && /* @__PURE__ */ jsxRuntime.jsx(
-              Label.HvLabel,
-              {
-                showGutter: true,
-                id: setId.setId(elementId, "label"),
-                label,
-                className: classes.label
-              }
-            ),
-            hasDescription && /* @__PURE__ */ jsxRuntime.jsx(
-              InfoMessage.HvInfoMessage,
-              {
-                id: setId.setId(elementId, "description"),
-                className: classes.description,
-                children: description
+          /* @__PURE__ */ jsxRuntime.jsx(
+            LabelContainer.HvLabelContainer,
+            {
+              label,
+              description,
+              labelId: setId.setId(elementId, "label"),
+              descriptionId: setId.setId(elementId, "description"),
+              classes: {
+                root: classes.labelContainer,
+                label: classes.label,
+                description: classes.description
               }
-            )
-          ] }),
+            }
+          ),
           /* @__PURE__ */ jsxRuntime.jsxs(
             BaseDropdown.HvBaseDropdown,
             {

package/dist/cjs/DatePicker/DatePicker.styles.cjs

@@ -11,10 +11,7 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvDatePicke
   },
   leftContainer: {},
   rightContainer: {},
-  labelContainer: {
-    display: "flex",
-    alignItems: "flex-start"
-  },
+  labelContainer: {},
   label: {},
   description: {},
   error: {},

package/dist/cjs/DotPagination/DotPagination.styles.cjs

@@ -43,7 +43,7 @@ const { useClasses, staticClasses } = uikitReactUtils.createClasses("HvDotPagina
       backgroundColor: "currentcolor",
       width: "1em",
       height: "1em",
-      borderRadius: "50%"
+      borderRadius: uikitStyles.theme.radii.full
     }
   }
 });

package/dist/cjs/Dropdown/Dropdown.cjs

@@ -4,6 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const utils$1 = require("@mui/material/utils");
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
+const LabelContainer = require("../FormElement/LabelContainer.cjs");
 const useControlled = require("../hooks/useControlled.cjs");
 const useLabels = require("../hooks/useLabels.cjs");
 const useUniqueId = require("../hooks/useUniqueId.cjs");
@@ -13,11 +14,9 @@ const setId = require("../utils/setId.cjs");
 const Dropdown_styles = require("./Dropdown.styles.cjs");
 const utils = require("./utils.cjs");
 const List = require("./List/List.cjs");
-const utils$2 = require("../FormElement/utils.cjs");
 const FormElement = require("../FormElement/FormElement.cjs");
-const Label = require("../FormElement/Label/Label.cjs");
-const InfoMessage = require("../FormElement/InfoMessage/InfoMessage.cjs");
 const BaseDropdown = require("../BaseDropdown/BaseDropdown.cjs");
+const utils$2 = require("../FormElement/utils.cjs");
 const WarningText = require("../FormElement/WarningText/WarningText.cjs");
 const Typography = require("../Typography/Typography.cjs");
 const DEFAULT_LABELS = {
@@ -196,8 +195,6 @@ const HvDropdown = generic.fixedForwardRef(function HvDropdown2(props, ref) {
       }
     );
   };
-  const hasLabel = label != null;
-  const hasDescription = description != null;
   const canShowError = ariaErrorMessage == null && (status !== void 0 && statusMessage !== void 0 || status === void 0 && required);
   const isStateInvalid = utils$2.isInvalid(validationState);
   let errorMessageId;
@@ -222,25 +219,20 @@ const HvDropdown = generic.fixedForwardRef(function HvDropdown2(props, ref) {
       ),
       ...others,
       children: [
-        (hasLabel || hasDescription) && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: classes.labelContainer, children: [
-          hasLabel && /* @__PURE__ */ jsxRuntime.jsx(
-            Label.HvLabel,
-            {
-              showGutter: true,
-              id: setId.setId(elementId, "label"),
-              label,
-              className: classes.label
-            }
-          ),
-          hasDescription && /* @__PURE__ */ jsxRuntime.jsx(
-            InfoMessage.HvInfoMessage,
-            {
-              id: setId.setId(elementId, "description"),
-              className: classes.description,
-              children: description
+        /* @__PURE__ */ jsxRuntime.jsx(
+          LabelContainer.HvLabelContainer,
+          {
+            label,
+            description,
+            labelId: setId.setId(elementId, "label"),
+            descriptionId: setId.setId(elementId, "description"),
+            classes: {
+              root: classes.labelContainer,
+              label: classes.label,
+              description: classes.description
             }
-          )
-        ] }),
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsx(
           BaseDropdown.HvBaseDropdown,
           {
@@ -296,7 +288,7 @@ const HvDropdown = generic.fixedForwardRef(function HvDropdown2(props, ref) {
                 hasTooltips,
                 singleSelectionToggle,
                 "aria-label": ariaLabel,
-                "aria-labelledby": hasLabel ? setId.setId(elementId, "label") : void 0,
+                "aria-labelledby": label ? setId.setId(elementId, "label") : void 0,
                 height,
                 maxHeight,
                 virtualized,

package/dist/cjs/Dropdown/Dropdown.styles.cjs

@@ -8,7 +8,7 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvDropdown"
     position: "relative",
     display: "inline-block"
   },
-  labelContainer: { display: "flex", alignItems: "flex-start" },
+  labelContainer: {},
   label: {},
   description: {},
   error: {},

package/dist/cjs/FileUploader/DropZone/DropZone.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const uikitReactUtils = require("@hitachivantara/uikit-react-utils");
+const LabelContainer = require("../../FormElement/LabelContainer.cjs");
 const useLabels = require("../../hooks/useLabels.cjs");
 const useUniqueId = require("../../hooks/useUniqueId.cjs");
 const icons = require("../../icons.cjs");
@@ -11,8 +12,6 @@ const setId = require("../../utils/setId.cjs");
 const utils = require("../utils.cjs");
 const DropZone_styles = require("./DropZone.styles.cjs");
 const context = require("../../FormElement/context.cjs");
-const Label = require("../../FormElement/Label/Label.cjs");
-const InfoMessage = require("../../FormElement/InfoMessage/InfoMessage.cjs");
 const DEFAULT_LABELS = {
   /** Extensions of the accepted file types */
   acceptedFiles: "",
@@ -99,23 +98,26 @@ const HvDropZone = (props) => {
     });
     onFilesAdded?.(newFiles);
   };
+  const description = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    Number.isInteger(maxFileSize) && `${labels.sizeWarning} ${utils.convertUnits(maxFileSize)}`,
+    labels.acceptedFiles || accept && ` (${accept?.replaceAll(",", ", ")})`
+  ] });
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    !hideLabels && /* @__PURE__ */ jsxRuntime.jsxs("div", { id, className: classes.dropZoneLabelsGroup, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        Label.HvLabel,
-        {
-          showGutter: true,
-          id: setId.setId(id, "input-file-label"),
-          htmlFor: setId.setId(id, "input-file"),
-          label: label ?? labels?.dropzone,
-          className: classes.dropZoneLabel
+    !hideLabels && /* @__PURE__ */ jsxRuntime.jsx(
+      LabelContainer.HvLabelContainer,
+      {
+        id,
+        label: label ?? labels.dropzone,
+        description,
+        inputId: setId.setId(id, "input-file"),
+        labelId: setId.setId(id, "input-file-label"),
+        descriptionId: setId.setId(id, "description"),
+        classes: {
+          root: classes.dropZoneLabelsGroup,
+          label: classes.dropZoneLabel
         }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsxs(InfoMessage.HvInfoMessage, { id: setId.setId(id, "description"), children: [
-        Number.isInteger(maxFileSize) && `${labels?.sizeWarning} ${utils.convertUnits(maxFileSize)}`,
-        labels?.acceptedFiles ? labels.acceptedFiles : accept && ` (${accept?.replaceAll(",", ", ")})`
-      ] })
-    ] }),
+      }
+    ),
     /* @__PURE__ */ jsxRuntime.jsxs(
       "div",
       {

package/dist/cjs/FileUploader/DropZone/DropZone.styles.cjs

@@ -21,9 +21,6 @@ const { staticClasses, useClasses } = uikitReactUtils.createClasses("HvDropZone"
     }
   },
   dropZoneLabelsGroup: {
-    display: "flex",
-    justifyContent: "start",
-    "& label:nth-of-type(1)": {},
     "& p:nth-of-type(2)": {
       marginLeft: "auto"
     }