@xh/hoist 67.0.0-SNAPSHOT.1724719449021 → 67.0.0-SNAPSHOT.1724967981403

package/CHANGELOG.md

@@ -23,6 +23,8 @@
 * `GridModel` will now accept `contextMenu: false` to omit context menus.
 * New bindable `AppContainerModel.intializingLoadMaskMessage` property to allow apps to customize
   the loading mask message shown during app initialization.
+* Enhanced `select` component with new `emptyValue` prop, allowing for a custom value to be returned
+  when the control is empty (vs default of `null`). Expected usage is `[]` when `enableMulti:true`.
 
 ### 🐞 Bug Fixes
 

package/build/types/desktop/cmp/input/Select.d.ts

@@ -14,6 +14,11 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     createMessageFn?: (query: string) => string;
     /** True (default) to close the menu after each selection. */
     closeMenuOnSelect?: boolean;
+    /**
+     * Value to use when the input is empty (default `null`).
+     * Recommended usage is `[]` when `enableMulti` is true to ensure value is always an array.
+     */
+    emptyValue?: any;
     /** True to show a "clear" button at the right of the control. */
     enableClear?: boolean;
     /** True to accept and commit input values not present in options or returned by a query. */
@@ -26,8 +31,8 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     /** True to allow entry/selection of multiple values - "tag picker" style. */
     enableMulti?: boolean;
     /**
-     * True to enable tooltips on selected values. Enable when the space
-     * available to the select component might not support showing the value's full text.
+     * True to enable tooltips on selected values. Enable when the space available to the
+     * component might not support showing the value's full text.
      */
     enableTooltips?: boolean;
     /**

package/desktop/appcontainer/LockoutPanel.ts

@@ -39,14 +39,18 @@ const unauthorizedMessage = hoistCmp.factory<AppContainerModel>({
     render({model}) {
         const {identityService} = XH,
             {appSpec, appStateModel} = model,
+            {isImpersonating} = identityService,
             user = XH.getUser(),
+            authMsg = isImpersonating
+                ? `You are impersonating ${user.username}`
+                : `You are logged in as ${user.username}`,
             roleMsg = isEmpty(user.roles)
                 ? 'no roles assigned'
                 : `the roles [${user.roles.join(', ')}]`;
 
         return div(
             p(appStateModel.accessDeniedMessage ?? ''),
-            p(`You are logged in as ${user.username} and have ${roleMsg}.`),
+            p(`${authMsg} and have ${roleMsg}.`),
             p({
                 item: appSpec.lockoutMessage,
                 omit: !appSpec.lockoutMessage
@@ -60,7 +64,7 @@ const unauthorizedMessage = hoistCmp.factory<AppContainerModel>({
                 }),
                 hspacer(5),
                 button({
-                    omit: !identityService.isImpersonating,
+                    omit: !isImpersonating,
                     icon: Icon.impersonate(),
                     text: 'End Impersonation',
                     minimal: false,

package/desktop/cmp/input/Select.ts

@@ -28,7 +28,7 @@ import {
 } from '@xh/hoist/kit/react-select';
 import {action, bindable, makeObservable, observable, override} from '@xh/hoist/mobx';
 import {wait} from '@xh/hoist/promise';
-import {elemWithin, getTestId, TEST_ID, throwIf, withDefault, mergeDeep} from '@xh/hoist/utils/js';
+import {elemWithin, getTestId, mergeDeep, TEST_ID, throwIf, withDefault} from '@xh/hoist/utils/js';
 import {createObservableRef, getLayoutProps} from '@xh/hoist/utils/react';
 import classNames from 'classnames';
 import debouncePromise from 'debounce-promise';
@@ -52,6 +52,12 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     /** True (default) to close the menu after each selection. */
     closeMenuOnSelect?: boolean;
 
+    /**
+     * Value to use when the input is empty (default `null`).
+     * Recommended usage is `[]` when `enableMulti` is true to ensure value is always an array.
+     */
+    emptyValue?: any;
+
     /** True to show a "clear" button at the right of the control. */
     enableClear?: boolean;
 
@@ -68,8 +74,8 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     enableMulti?: boolean;
 
     /**
-     * True to enable tooltips on selected values. Enable when the space
-     * available to the select component might not support showing the value's full text.
+     * True to enable tooltips on selected values. Enable when the space available to the
+     * component might not support showing the value's full text.
      */
     enableTooltips?: boolean;
 
@@ -236,6 +242,10 @@ class SelectInputModel extends HoistInputModel {
         return !!this.componentProps.enableMulti;
     }
 
+    get emptyValue(): any {
+        return this.componentProps.emptyValue ?? null;
+    }
+
     get filterMode(): boolean {
         return this.componentProps.enableFilter ?? true;
     }
@@ -424,11 +434,10 @@ class SelectInputModel extends HoistInputModel {
     // (Exception for a null value, which we will only accept if explicitly present in options.)
     override toInternal(external) {
         if (this.multiMode) {
-            if (external == null) external = []; // avoid [null]
+            if (external == null || isEqual(external, this.emptyValue)) external = []; // avoid [null]
             return castArray(external).map(it => this.findOption(it, !isNil(it)));
         }
-
-        return this.findOption(external, !isNil(external));
+        return this.findOption(external, !isNil(external) && !isEqual(external, this.emptyValue));
     }
 
     private findOption(value, createIfNotFound, options = this.internalOptions) {
@@ -446,10 +455,10 @@ class SelectInputModel extends HoistInputModel {
     }
 
     override toExternal(internal) {
-        if (isNil(internal)) return null;
+        if (isNil(internal)) return this.emptyValue;
 
         if (this.multiMode) {
-            if (isEmpty(internal)) return null;
+            if (isEmpty(internal)) return this.emptyValue;
             return castArray(internal).map(it => it.value);
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "67.0.0-SNAPSHOT.1724719449021",
+  "version": "67.0.0-SNAPSHOT.1724967981403",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",