@simplybusiness/mobius 5.29.6 → 5.29.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.29.7
+
+### Patch Changes
+
+- e51bebd: improve Combobox ARIA props
+
 ## 5.29.6
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -1289,19 +1289,25 @@ var Option = ({
 var import_jsx_runtime11 = require("react/jsx-runtime");
 var Listbox = ({
   id,
+  isOpen = false,
   options,
   highlightedIndex,
   highlightedGroupIndex,
   onOptionSelect,
   optionComponent
 }) => {
-  const classes = (0, import_classnames2.default)("mobius-combobox__list");
+  const classes = (0, import_classnames2.default)("mobius-combobox__list", {
+    "mobius-combobox__list--hidden": !isOpen
+  });
   function getOptionId(option, groupIndex, index) {
     if (typeof option === "object" && "id" in option && typeof option.id === "string") {
       return option.id;
     }
     return isOptionGroup(options) ? `${id}-option-${groupIndex}-${index}` : `${id}-option-${index}`;
   }
+  if (!isOpen) {
+    return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { role: "listbox", id, className: classes });
+  }
   if (options && options.length === 0) {
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { role: "listbox", id, className: classes, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: "mobius-combobox__no-options", children: "No options" }) });
   }
@@ -1552,7 +1558,6 @@ var ComboboxInner = (0, import_react25.forwardRef)(
       highlightLastOption,
       clearHighlight
     } = useComboboxHighlight(filteredOptions);
-    const showListbox = isOpen && filteredOptions && filteredOptions.length > 0;
     const inputRef = ref || fallbackRef;
     const listboxId = (0, import_react25.useId)();
     const statusId = (0, import_react25.useId)();
@@ -1712,18 +1717,19 @@ var ComboboxInner = (0, import_react25.forwardRef)(
           "aria-describedby": isLoading ? statusId : void 0,
           "aria-autocomplete": "list",
           "aria-haspopup": "listbox",
-          "aria-controls": showListbox ? listboxId : void 0,
-          "aria-expanded": showListbox ? true : void 0,
+          "aria-controls": listboxId,
+          "aria-expanded": isOpen,
           "aria-activedescendant": highlightedIndex === -1 ? void 0 : getHighlightedOptionId(),
           prefixInside: icon,
           ref: inputRef,
           errorMessage: errorMessage || error3?.message || void 0
         }
       ),
-      showListbox && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
         Listbox,
         {
           id: listboxId,
+          isOpen,
           isLoading,
           options: filteredOptions,
           highlightedIndex,
@@ -3246,7 +3252,7 @@ var NumberField = (0, import_react57.forwardRef)((props, ref) => {
       max: maxValue ?? void 0,
       step,
       ref,
-      defaultValue: defaultValue != null ? defaultValue.toString() : defaultValue
+      defaultValue: defaultValue != null ? defaultValue?.toString() : defaultValue
     }
   );
 });
@@ -3609,8 +3615,8 @@ var Radio = (0, import_react63.forwardRef)(
 Radio.displayName = "Radio";
 
 // src/components/Radio/RadioGroup.tsx
-var import_react64 = require("react");
 var import_dedupe39 = __toESM(require("classnames/dedupe"));
+var import_react64 = require("react");
 var import_jsx_runtime51 = require("react/jsx-runtime");
 var getDefaultVal = (children, defaultValue) => {
   if (Array.isArray(children) && defaultValue) {
@@ -3632,12 +3638,13 @@ var RadioGroup = (0, import_react64.forwardRef)((props, ref) => {
     errorMessage,
     children,
     defaultValue,
+    value,
     isReadOnly,
     name,
     onChange,
     ...rest
   } = props;
-  const defaultSelected = getDefaultVal(children, defaultValue);
+  const defaultSelected = getDefaultVal(children, defaultValue || value);
   const [selected, setSelected] = (0, import_react64.useState)(defaultSelected);
   const validationClasses = useValidationClasses({
     validationState,