@homebound/beam 2.333.0 → 2.333.1

package/dist/inputs/TreeSelectField/TreeSelectField.js

@@ -115,13 +115,26 @@ function TreeSelectFieldBase(props) {
             return areAllSelected;
         }
         initialOptions.forEach(areAllChildrenSelected);
+        // Given a child option, determine if the parent is selected.
+        const isParentSelected = (option) => {
+            var _a;
+            const parents = (_a = (0, utils_1.findOption)(initialOptions, (0, Value_1.valueToKey)(getOptionValue(option)), getOptionValue)) === null || _a === void 0 ? void 0 : _a.parents;
+            if (!parents)
+                return false;
+            return parents.some((parent) => selectedKeys.includes((0, Value_1.valueToKey)(getOptionValue(parent))));
+        };
         return {
             selectedKeys,
             inputValue: selectedOptions.length === 1
                 ? getOptionLabel(selectedOptions[0])
-                : selectedOptions.length === 0
-                    ? nothingSelectedText
-                    : "",
+                : isReadOnly && selectedOptions.length > 0
+                    ? selectedOptions
+                        .filter((o) => !isParentSelected(o))
+                        .map(getOptionLabel)
+                        .join(", ")
+                    : selectedOptions.length === 0
+                        ? nothingSelectedText
+                        : "",
             filteredOptions,
             selectedOptions,
             allOptions: initialOptions,

package/dist/inputs/internal/ComboBoxBase.js

@@ -56,7 +56,7 @@ function ComboBoxBase(props) {
     // Do a one-time initialize of fieldState
     const [fieldState, setFieldState] = (0, react_1.useState)(() => {
         return {
-            inputValue: getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText),
+            inputValue: getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText, isReadOnly),
             searchValue: undefined,
             optionsLoading: false,
         };
@@ -179,10 +179,10 @@ function ComboBoxBase(props) {
         else {
             setFieldState((prevState) => ({
                 ...prevState,
-                inputValue: getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText),
+                inputValue: getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText, isReadOnly),
             }));
         }
-    }, [state.isOpen, selectedOptions, getOptionLabel, multiselect, nothingSelectedText]);
+    }, [state.isOpen, selectedOptions, getOptionLabel, multiselect, nothingSelectedText, isReadOnly]);
     // For the most part, the returned props contain `aria-*` and `id` attributes for accessibility purposes.
     const { buttonProps: triggerProps, inputProps, listBoxProps, labelProps, } = (0, react_aria_1.useComboBox)({
         ...comboBoxProps,
@@ -213,12 +213,14 @@ function ComboBoxBase(props) {
     return ((0, jsx_runtime_1.jsxs)("div", { css: Css_1.Css.df.fdc.w100.maxw(fieldMaxWidth).if(labelStyle === "left").maxw100.$, ref: comboBoxRef, children: [(0, jsx_runtime_1.jsx)(ComboBoxInput_1.ComboBoxInput, { ...otherProps, fullWidth: fullWidth, buttonProps: buttonProps, buttonRef: triggerRef, inputProps: inputProps, inputRef: inputRef, inputWrapRef: inputWrapRef, listBoxRef: listBoxRef, state: state, labelProps: labelProps, selectedOptions: selectedOptions, getOptionValue: getOptionValue, getOptionLabel: getOptionLabel, contrast: contrast, nothingSelectedText: nothingSelectedText, borderless: borderless, tooltip: (0, components_1.resolveTooltip)(disabled, undefined, readOnly), resetField: resetField }), state.isOpen && ((0, jsx_runtime_1.jsx)(internal_1.Popover, { triggerRef: triggerRef, popoverRef: popoverRef, positionProps: positionProps, onClose: () => state.close(), isOpen: state.isOpen, minWidth: 200, children: (0, jsx_runtime_1.jsx)(ListBox_1.ListBox, { ...listBoxProps, positionProps: positionProps, state: state, listBoxRef: listBoxRef, selectedOptions: selectedOptions, getOptionLabel: getOptionLabel, getOptionValue: (o) => (0, Value_1.valueToKey)(getOptionValue(o)), contrast: contrast, horizontalLayout: labelStyle === "left", loading: fieldState.optionsLoading, disabledOptionsWithReasons: disabledOptionsWithReasons }) }))] }));
 }
 exports.ComboBoxBase = ComboBoxBase;
-function getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText) {
+function getInputValue(selectedOptions, getOptionLabel, multiselect, nothingSelectedText, readOnly) {
     return selectedOptions.length === 1
         ? getOptionLabel(selectedOptions[0])
-        : multiselect && selectedOptions.length === 0
-            ? nothingSelectedText
-            : "";
+        : readOnly && selectedOptions.length > 0
+            ? selectedOptions.map(getOptionLabel).join(", ")
+            : multiselect && selectedOptions.length === 0
+                ? nothingSelectedText
+                : "";
 }
 /** Transforms/simplifies `optionsOrLoad` into just options, with unsetLabel maybe added. */
 function initializeOptions(optionsOrLoad, getOptionValue, unsetLabel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebound/beam",
-  "version": "2.333.0",
+  "version": "2.333.1",
   "author": "Homebound",
   "license": "MIT",
   "main": "dist/index.js",