@dashforge/tw 1.5.0 → 1.5.2

package/CHANGELOG.md

@@ -12,6 +12,29 @@ This project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 > duplicated intentionally — no shared "lowest common denominator" headless
 > layer.
 
+## [1.5.2] — 2026-08-30
+
+### Fixed
+
+- **`<Select>` — the selected-option checkmark no longer stretches.** The
+  `listItemIndicator` slot set a width (`w-4`) but no height, so its inline
+  SVG (a `viewBox`-only `<svg>`) was stretched to the option row's height by
+  the flex layout — an oversized, distorted checkmark whenever the dropdown
+  was open. Added the missing `h-4`.
+
+## [1.5.1] — 2026-08-15
+
+Patch: fixes the label ordering of the `tooltip` help icon relative to
+the required asterisk.
+
+### Fixed
+
+- **`tooltip` + `required` ordering** — the required `*` is part of the
+  primary label block and now always precedes the help `ⓘ`. Previously the
+  icon rendered between the label and the asterisk (`Label ⓘ *`); it now
+  reads `Label * ⓘ` (and `ⓘ Label *` for `position: 'before'`). Applies to
+  every form input.
+
 ## [1.5.0] — 2026-08-15
 
 Adds a label-help **`tooltip`** prop to every form input. No breaking

package/dist/index.esm.js

@@ -775,22 +775,34 @@ const tooltipVariants = tv({
     });
 }
 /**
- * Compose a label node with its help-tooltip trigger. Pass the resolved
- * config (from {@link resolveFieldTooltip}) or `null`. Returns the plain
- * label when there is no tooltip.
- */ function renderLabelWithTooltip(label, config) {
-    if (!config) return label;
+ * Compose the primary label block — `label` plus its optional `required`
+ * mark — with the help-tooltip trigger. The required asterisk stays part
+ * of the primary block; the `ⓘ` is secondary and sits before/after that
+ * whole block. Returns the plain primary block when there is no tooltip.
+ *
+ * @param label - the label node.
+ * @param config - resolved tooltip config (from {@link resolveFieldTooltip}) or `null`.
+ * @param requiredMark - the required-asterisk node (or falsy), rendered as
+ *   part of the primary block, immediately after the label.
+ */ function renderLabelWithTooltip(label, config, requiredMark) {
+    const primary = requiredMark ? jsxs(Fragment, {
+        children: [
+            label,
+            requiredMark
+        ]
+    }) : label;
+    if (!config) return primary;
     const trigger = jsx(LabelTooltipTrigger, {
         config: config
     });
     return config.position === 'before' ? jsxs(Fragment, {
         children: [
             trigger,
-            label
+            primary
         ]
     }) : jsxs(Fragment, {
         children: [
-            label,
+            primary,
             trigger
         ]
     });
@@ -1139,17 +1151,14 @@ const tooltipVariants = tv({
     return jsxs("div", {
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: inputId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsxs("div", {
                 className: cn(v.inputWrapper(), themeSlotProps == null ? void 0 : (_themeSlotProps_inputWrapper = themeSlotProps.inputWrapper) == null ? void 0 : _themeSlotProps_inputWrapper.className, slotProps == null ? void 0 : (_slotProps_inputWrapper = slotProps.inputWrapper) == null ? void 0 : _slotProps_inputWrapper.className),
@@ -1953,17 +1962,14 @@ const tooltipVariants = tv({
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         "aria-describedby": resolvedHelperText ? helperId : undefined,
         children: [
-            label && jsxs("div", {
+            label && jsx("div", {
                 id: labelId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx(RadixRadioGroup.Root, _extends({
                 name: name
@@ -2237,17 +2243,14 @@ const tooltipVariants = tv({
     return jsxs("div", {
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: inputId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx("div", {
                 className: cn(v.inputWrapper(), themeSlotProps == null ? void 0 : (_themeSlotProps_inputWrapper = themeSlotProps.inputWrapper) == null ? void 0 : _themeSlotProps_inputWrapper.className, slotProps == null ? void 0 : (_slotProps_inputWrapper = slotProps.inputWrapper) == null ? void 0 : _slotProps_inputWrapper.className),
@@ -2583,17 +2586,14 @@ const tooltipVariants = tv({
     return jsxs("div", {
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: inputId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsxs("div", {
                 className: cn(v.inputWrapper(), themeSlotProps == null ? void 0 : (_themeSlotProps_inputWrapper = themeSlotProps.inputWrapper) == null ? void 0 : _themeSlotProps_inputWrapper.className, slotProps == null ? void 0 : (_slotProps_inputWrapper = slotProps.inputWrapper) == null ? void 0 : _slotProps_inputWrapper.className),
@@ -2868,18 +2868,15 @@ const tooltipVariants = tv({
     return jsxs("div", {
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 id: labelId,
                 htmlFor: inputId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsxs("div", {
                 className: cn(v.slotsRow(), themeSlotProps == null ? void 0 : (_themeSlotProps_slotsRow = themeSlotProps.slotsRow) == null ? void 0 : _themeSlotProps_slotsRow.className, slotProps == null ? void 0 : (_slotProps_slotsRow = slotProps.slotsRow) == null ? void 0 : _slotProps_slotsRow.className),
@@ -3782,18 +3779,15 @@ const defaultGetOptionDisabled = (option)=>Boolean(option.disabled);
         ref: rootRef,
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 id: labelId,
                 htmlFor: `${baseId}-input`,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsxs("div", {
                 className: cn(v.inputWrapper(), // Multi mode: let chips wrap and replace the fixed `h-*`
@@ -4515,17 +4509,14 @@ function CalendarIcon$2() {
         "data-testid": testId,
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: fieldId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx(Popover, {
                 open: isOpen,
@@ -4802,17 +4793,14 @@ function ClockIcon() {
         "data-testid": testId,
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: fieldId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx(Popover, {
                 open: isOpen,
@@ -5134,17 +5122,14 @@ const DATETIME_PATTERN = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2})/;
         "data-testid": testId,
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: fieldId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx(Popover, {
                 open: isOpen,
@@ -5694,17 +5679,14 @@ function formatRange(range, locale) {
         "data-testid": testId,
         className: cn(v.root(), sx, themeSlotProps == null ? void 0 : (_themeSlotProps_root = themeSlotProps.root) == null ? void 0 : _themeSlotProps_root.className, slotProps == null ? void 0 : (_slotProps_root = slotProps.root) == null ? void 0 : _slotProps_root.className),
         children: [
-            label && jsxs("label", {
+            label && jsx("label", {
                 htmlFor: fieldId,
                 className: cn(v.label(), themeSlotProps == null ? void 0 : (_themeSlotProps_label = themeSlotProps.label) == null ? void 0 : _themeSlotProps_label.className, slotProps == null ? void 0 : (_slotProps_label = slotProps.label) == null ? void 0 : _slotProps_label.className),
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        "aria-hidden": "true",
-                        className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    "aria-hidden": "true",
+                    className: cn(v.requiredMark(), themeSlotProps == null ? void 0 : (_themeSlotProps_requiredMark = themeSlotProps.requiredMark) == null ? void 0 : _themeSlotProps_requiredMark.className, slotProps == null ? void 0 : (_slotProps_requiredMark = slotProps.requiredMark) == null ? void 0 : _slotProps_requiredMark.className),
+                    children: "*"
+                }))
             }),
             jsx(Popover, {
                 open: isOpen,
@@ -10096,7 +10078,7 @@ Slider.displayName = 'Slider';
             'data-[disabled=true]:opacity-50 data-[disabled=true]:cursor-not-allowed'
         ],
         listItemIndicator: [
-            'shrink-0 w-4 text-primary-700',
+            'shrink-0 w-4 h-4 text-primary-700',
             'opacity-0 data-[selected=true]:opacity-100'
         ],
         emptyState: 'px-3 py-2 text-sm text-neutral-500',
@@ -10612,16 +10594,13 @@ Slider.displayName = 'Slider';
         className: rootClasses,
         "data-testid": testId,
         children: [
-            label != null && jsxs("label", {
+            label != null && jsx("label", {
                 htmlFor: controlId,
                 className: labelClasses,
-                children: [
-                    renderLabelWithTooltip(label, tooltipConfig),
-                    required && jsx("span", {
-                        className: requiredMarkClasses,
-                        children: "*"
-                    })
-                ]
+                children: renderLabelWithTooltip(label, tooltipConfig, required && jsx("span", {
+                    className: requiredMarkClasses,
+                    children: "*"
+                }))
             }),
             jsxs(RadixPopover.Root, {
                 open: isOpen,
@@ -19427,6 +19406,6 @@ function SearchIcon(props) {
  */ // ───── Components ─────
 /**
  * Package version (synced with `package.json` at publish time).
- */ const VERSION = '1.5.0';
+ */ const VERSION = '1.5.2';
 
 export { AVATAR_SOFT_FALLBACK, AVATAR_TONE_FALLBACK, Accordion, Alert, AlertTitle, AppShell, AspectRatio, Autocomplete, Avatar, AvatarGroup, Badge, Box, Breadcrumbs, Button, Calendar, Card, CardActionArea, CardContent, Checkbox, Chip, ConfirmDialogProvider, Container, DRAWER_SIZE_PRESETS, DataGrid, DatePicker, DateRangePicker, DateTimePicker, Dialog, Divider, Drawer, Grid, ICON_BUTTON_BASE, ICON_BUTTON_SIZE_OVERRIDES, IconButton, Image, LeftNav, Link, Menu, MenuContent, MenuItem, MenuLabel, MenuSeparator, MenuSkeleton, MenuTrigger, NumberField, OTPField, Pagination, Popover, Progress, RadioGroup, RenderButton, RenderChip, RenderText, RenderTwoLine, RowActionsMenu, SPINNER_COLORS, SPINNER_STROKE_WIDTH, SPINNER_TRACK_OPACITY, Select, Skeleton, Slider, SnackbarProvider, Spinner, Stack, Step, Stepper, Switch, Table, Tabs, TextField, Textarea, TimePicker, Tooltip, TopBar, Typography, VERSION, Video, VisuallyHidden, accordionVariants, alertVariants, appShellVariants, autocompleteVariants, avatarVariants, badgeVariants, boxVariants, breadcrumbsVariants, buttonVariants, calendarDayVariants, calendarVariants, checkboxVariants, chipVariants, cn, confirmDialogVariants, containerVariants, dataGridVariants, datePickerVariants, dateRangeDayVariants, dateRangePickerVariants, dateTimePickerVariants, dialogVariants, dividerLineVariants, dividerVariants, drawerVariants, getNestedValue, gridVariants, imageVariants, leftNavVariants, linkVariants, menuVariants, numberFieldVariants, otpFieldVariants, paginationVariants, popoverVariants, progressVariants, radioGroupVariants, selectVariants, skeletonVariants, sliderVariants, snackbarVariants, spinnerVariants, stackVariants, stepperVariants, switchVariants, tableVariants, tabsVariants, textFieldVariants, textareaVariants, timePickerVariants, tooltipVariants, topBarVariants, typographyVariants, useAccessState, useConfirm, useSnackbar, useStep, videoVariants };

package/dist/src/components/Autocomplete/Autocomplete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Autocomplete.d.ts","sourceRoot":"","sources":["../../../../src/components/Autocomplete/Autocomplete.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AA8FjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAG,kBAAkB,EACvD,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,kDAi6BlC"}
+{"version":3,"file":"Autocomplete.d.ts","sourceRoot":"","sources":["../../../../src/components/Autocomplete/Autocomplete.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AA8FjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAG,kBAAkB,EACvD,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,kDAo6BlC"}

package/dist/src/components/DatePicker/DatePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DatePicker/DatePicker.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAqD7D;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,kDAyOjD"}
+{"version":3,"file":"DatePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DatePicker/DatePicker.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAqD7D;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,kDA4OjD"}

package/dist/src/components/DateRangePicker/DateRangePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateRangePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DateRangePicker/DateRangePicker.tsx"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAoQvE;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,oBAAoB,kDAyN3D"}
+{"version":3,"file":"DateRangePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DateRangePicker/DateRangePicker.tsx"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAoQvE;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,oBAAoB,kDA4N3D"}

package/dist/src/components/DateTimePicker/DateTimePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DateTimePicker/DateTimePicker.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AA8ErE;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,mBAAmB,kDAsPzD"}
+{"version":3,"file":"DateTimePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/DateTimePicker/DateTimePicker.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AA8ErE;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,mBAAmB,kDAyPzD"}

package/dist/src/components/NumberField/NumberField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NumberField.d.ts","sourceRoot":"","sources":["../../../../src/components/NumberField/NumberField.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAuC/D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,kDAwQlD"}
+{"version":3,"file":"NumberField.d.ts","sourceRoot":"","sources":["../../../../src/components/NumberField/NumberField.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAuC/D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,kDA2QlD"}

package/dist/src/components/OTPField/OTPField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OTPField.d.ts","sourceRoot":"","sources":["../../../../src/components/OTPField/OTPField.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgBvE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,kDAgN5C"}
+{"version":3,"file":"OTPField.d.ts","sourceRoot":"","sources":["../../../../src/components/OTPField/OTPField.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAgBvE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,kDAmN5C"}

package/dist/src/components/RadioGroup/RadioGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RadioGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,kDA+PhD"}
+{"version":3,"file":"RadioGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,kDAkQhD"}

package/dist/src/components/Select/Select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../../src/components/Select/Select.tsx"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,YAAY,EAElB,MAAM,OAAO,CAAC;AAYf,OAAO,KAAK,EAIV,WAAW,EACX,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAulB3B;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM,EAA8B,CAAC,CAAC,SAAS,WAAW,GAAG,MAAM,EAC9E,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;CAAE,KAC3D,YAAY,GAAG,IAAI,CAAC"}
+{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../../src/components/Select/Select.tsx"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,YAAY,EAElB,MAAM,OAAO,CAAC;AAYf,OAAO,KAAK,EAIV,WAAW,EACX,WAAW,EACZ,MAAM,mBAAmB,CAAC;AA0lB3B;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM,EAA8B,CAAC,CAAC,SAAS,WAAW,GAAG,MAAM,EAC9E,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;CAAE,KAC3D,YAAY,GAAG,IAAI,CAAC"}

package/dist/src/components/TextField/TextField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextField.d.ts","sourceRoot":"","sources":["../../../../src/components/TextField/TextField.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,kDA0N9C"}
+{"version":3,"file":"TextField.d.ts","sourceRoot":"","sources":["../../../../src/components/TextField/TextField.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,kDA6N9C"}

package/dist/src/components/Textarea/Textarea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Textarea.d.ts","sourceRoot":"","sources":["../../../../src/components/Textarea/Textarea.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,kDA4K5C"}
+{"version":3,"file":"Textarea.d.ts","sourceRoot":"","sources":["../../../../src/components/Textarea/Textarea.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,kDA+K5C"}

package/dist/src/components/TimePicker/TimePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TimePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/TimePicker/TimePicker.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAkB7D;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,kDA6OjD"}
+{"version":3,"file":"TimePicker.d.ts","sourceRoot":"","sources":["../../../../src/components/TimePicker/TimePicker.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAkB7D;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,kDAgPjD"}

package/dist/src/components/_shared/fieldTooltip.d.ts

@@ -35,9 +35,15 @@ export declare function normalizeFieldTooltip(tooltip: FieldTooltipProp | undefi
  */
 export declare function resolveFieldTooltip(instance: FieldTooltipProp | undefined, themeDefault: FieldTooltipProp | undefined): FieldTooltipConfig | null;
 /**
- * Compose a label node with its help-tooltip trigger. Pass the resolved
- * config (from {@link resolveFieldTooltip}) or `null`. Returns the plain
- * label when there is no tooltip.
+ * Compose the primary label block — `label` plus its optional `required`
+ * mark — with the help-tooltip trigger. The required asterisk stays part
+ * of the primary block; the `ⓘ` is secondary and sits before/after that
+ * whole block. Returns the plain primary block when there is no tooltip.
+ *
+ * @param label - the label node.
+ * @param config - resolved tooltip config (from {@link resolveFieldTooltip}) or `null`.
+ * @param requiredMark - the required-asterisk node (or falsy), rendered as
+ *   part of the primary block, immediately after the label.
  */
-export declare function renderLabelWithTooltip(label: ReactNode, config: FieldTooltipConfig | null): ReactNode;
+export declare function renderLabelWithTooltip(label: ReactNode, config: FieldTooltipConfig | null, requiredMark?: ReactNode): ReactNode;
 //# sourceMappingURL=fieldTooltip.d.ts.map

package/dist/src/components/_shared/fieldTooltip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fieldTooltip.d.ts","sourceRoot":"","sources":["../../../../src/components/_shared/fieldTooltip.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,oDAAoD;AACpD,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,OAAO,EAAE,SAAS,CAAC;IACnB,4DAA4D;IAC5D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC9B,sDAAsD;IACtD,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;CAC5C;AAED,iFAAiF;AACjF,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,kBAAkB,CAAC;AAE3D,qEAAqE;AACrE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,GAAG,SAAS,GACpC,kBAAkB,GAAG,IAAI,CAG3B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,YAAY,EAAE,gBAAgB,GAAG,SAAS,GACzC,kBAAkB,GAAG,IAAI,CAO3B;AA0CD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,kBAAkB,GAAG,IAAI,GAChC,SAAS,CAcX"}
+{"version":3,"file":"fieldTooltip.d.ts","sourceRoot":"","sources":["../../../../src/components/_shared/fieldTooltip.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,oDAAoD;AACpD,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,OAAO,EAAE,SAAS,CAAC;IACnB,4DAA4D;IAC5D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC9B,sDAAsD;IACtD,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;CAC5C;AAED,iFAAiF;AACjF,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,kBAAkB,CAAC;AAE3D,qEAAqE;AACrE,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,GAAG,SAAS,GACpC,kBAAkB,GAAG,IAAI,CAG3B;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,YAAY,EAAE,gBAAgB,GAAG,SAAS,GACzC,kBAAkB,GAAG,IAAI,CAO3B;AA0CD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,kBAAkB,GAAG,IAAI,EACjC,YAAY,CAAC,EAAE,SAAS,GACvB,SAAS,CAsBX"}

package/dist/src/index.d.ts

@@ -195,5 +195,5 @@ export type { VariantProps } from 'tailwind-variants';
 /**
  * Package version (synced with `package.json` at publish time).
  */
-export declare const VERSION = "1.5.0";
+export declare const VERSION = "1.5.2";
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashforge/tw",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "private": false,
   "type": "module",
   "main": "./dist/index.esm.js",
@@ -35,15 +35,15 @@
     "tailwind-merge": "^3.0.0",
     "tailwind-variants": "^3.1.1",
     "@dashforge/calendar-core": "1.0.0",
+    "@dashforge/ui-core": "1.0.0",
     "@dashforge/forms": "1.0.0",
-    "@dashforge/rbac": "1.0.0",
-    "@dashforge/ui-core": "1.0.0"
+    "@dashforge/rbac": "1.0.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",
     "tailwindcss": ">=3.4.1",
-    "@dashforge/tw-tokens": "1.2.0",
-    "@dashforge/tw-theme": "1.2.0"
+    "@dashforge/tw-theme": "1.2.0",
+    "@dashforge/tw-tokens": "1.2.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "*",