@xh/hoist 80.0.0-SNAPSHOT.1768251400948 → 80.0.0-SNAPSHOT.1768251669499

package/desktop/cmp/dash/canvas/DashCanvasModel.ts

@@ -4,7 +4,6 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
-import {wait} from '@xh/hoist/promise';
 import type {LayoutItem} from 'react-grid-layout';
 import {Persistable, PersistableState, PersistenceProvider, XH} from '@xh/hoist/core';
 import {required} from '@xh/hoist/data';
@@ -18,7 +17,6 @@ import {createObservableRef} from '@xh/hoist/utils/react';
 import {
     defaultsDeep,
     find,
-    omit,
     uniqBy,
     times,
     without,
@@ -43,12 +41,11 @@ export interface DashCanvasConfig extends DashConfig<DashCanvasViewSpec, DashCan
     rowHeight?: number;
 
     /**
-     * Whether views should "compact" vertically, horizontally or wrap
+     * Whether views should "compact" vertically or horizontally
      * to condense space. Default `true` defaults to vertical compaction.
-     * Use `wrap` with caution.  It only works well if all items are 1 row high.
      * See react-grid-layout docs for more information.
-     */
-    compact?: boolean | 'vertical' | 'horizontal' | 'wrap';
+     * */
+    compact?: boolean | 'vertical' | 'horizontal';
 
     /** Between items [x,y] in pixels. Default `[10, 10]`. */
     margin?: [number, number];
@@ -63,35 +60,6 @@ export interface DashCanvasConfig extends DashConfig<DashCanvasViewSpec, DashCan
      * Whether a grid background should be shown. Default false.
      */
     showGridBackground?: boolean;
-
-    /**
-     * Whether the canvas should accept drag-and-drop of views from outside
-     * the canvas. Default false.
-     */
-    allowsDrop?: boolean;
-
-    /**
-     * Optional callback to invoke after a view is successfully dropped onto the canvas.
-     */
-    onDropDone?: (viewModel: DashCanvasViewModel) => void;
-
-    /**
-     * Optional callback to invoke when an item is dragged over the canvas. This may be used to
-     * customize how the size of the dropping placeholder is calculated. The callback should
-     * return an object with optional properties indicating the desired width, height (in grid units),
-     * and offset (in pixels) of the dropping placeholder.  The method's signature is the same as
-     * the `onDropDragOver` prop of ReactGridLayout.
-     * Returning `false` will prevent the dropping placeholder from being shown, and prevents a drop.
-     * Returning `void` will use the default behavior, which is to size the placeholder as per the
-     * `dropConfig.defaultItem` specification.
-     */
-    onDropDragOver?: (e: DragEvent) => OnDropDragOverResult;
-
-    /**
-     * Whether an overlay with an Add View button should be rendered
-     * when the canvas is empty. Default true.
-     */
-    showAddViewButtonWhenEmpty?: boolean;
 }
 
 export interface DashCanvasItemState {
@@ -108,16 +76,6 @@ export interface DashCanvasItemLayout {
     h: number;
 }
 
-export type OnDropDragOverResult =
-    | {
-          w?: number;
-          h?: number;
-          dragOffsetX?: number;
-          dragOffsetY?: number;
-      }
-    | false
-    | void;
-
 /**
  * Model for {@link DashCanvas}, managing all configurable options for the component and publishing
  * the observable state of its current widgets and their layout.
@@ -131,21 +89,16 @@ export class DashCanvasModel
     //------------------------------
     @bindable columns: number;
     @bindable rowHeight: number;
-    @bindable compact: 'vertical' | 'horizontal' | 'wrap';
+    @bindable compact: 'vertical' | 'horizontal';
     @bindable.ref margin: [number, number]; // [x, y]
     @bindable.ref containerPadding: [number, number]; // [x, y]
     @bindable showGridBackground: boolean;
     @bindable rglHeight: number;
-    @bindable showAddViewButtonWhenEmpty: boolean;
 
     //-----------------------------
     // Public properties
     //-----------------------------
-    DROPPING_ELEM_ID = '__dropping-elem__';
     maxRows: number;
-    allowsDrop: boolean;
-    onDropDone: (viewModel: DashCanvasViewModel) => void;
-    draggedInView: DashCanvasItemState;
 
     /** Current number of rows in canvas */
     get rows(): number {
@@ -165,27 +118,21 @@ export class DashCanvasModel
     private isLoadingState: boolean;
 
     get rglLayout() {
-        return this.layout
-            .map(it => {
-                const dashCanvasView = this.getView(it.i);
-
-                // `dashCanvasView` will not be found if `it` is a dropping element.
-                if (!dashCanvasView) return null;
-
-                const {autoHeight, viewSpec} = dashCanvasView;
-
-                return {
-                    ...it,
-                    resizeHandles: autoHeight
-                        ? ['w', 'e']
-                        : ['s', 'w', 'e', 'n', 'sw', 'nw', 'se', 'ne'],
-                    maxH: viewSpec.maxHeight,
-                    minH: viewSpec.minHeight,
-                    maxW: viewSpec.maxWidth,
-                    minW: viewSpec.minWidth
-                };
-            })
-            .filter(Boolean);
+        return this.layout.map(it => {
+            const dashCanvasView = this.getView(it.i),
+                {autoHeight, viewSpec} = dashCanvasView;
+
+            return {
+                ...it,
+                resizeHandles: autoHeight
+                    ? ['w', 'e']
+                    : ['s', 'w', 'e', 'n', 'sw', 'nw', 'se', 'ne'],
+                maxH: viewSpec.maxHeight,
+                minH: viewSpec.minHeight,
+                maxW: viewSpec.maxWidth,
+                minW: viewSpec.minWidth
+            };
+        });
     }
 
     constructor({
@@ -205,11 +152,7 @@ export class DashCanvasModel
         maxRows = Infinity,
         containerPadding = margin,
         extraMenuItems,
-        showGridBackground = false,
-        showAddViewButtonWhenEmpty = true,
-        allowsDrop = false,
-        onDropDone,
-        onDropDragOver
+        showGridBackground = false
     }: DashCanvasConfig) {
         super();
         makeObservable(this);
@@ -257,10 +200,6 @@ export class DashCanvasModel
         this.addViewButtonText = addViewButtonText;
         this.extraMenuItems = extraMenuItems;
         this.showGridBackground = showGridBackground;
-        this.showAddViewButtonWhenEmpty = showAddViewButtonWhenEmpty;
-        this.allowsDrop = allowsDrop;
-        this.onDropDone = onDropDone;
-        if (onDropDragOver) this.onDropDragOver = onDropDragOver;
 
         this.loadState(initialState);
         this.state = this.buildState();
@@ -398,59 +337,6 @@ export class DashCanvasModel
         this.getView(id)?.ensureVisible();
     }
 
-    onDrop(rglLayout: LayoutItem[], layoutItem: LayoutItem, evt: Event) {
-        throwIf(
-            !this.draggedInView,
-            `No draggedInView set on DashCanvasModel prior to onDrop operation.
-            Typically a developer would set this in response to dragstart events from
-             a DashViewTray or similar component.`
-        );
-
-        const droppingItem: any = rglLayout.find(it => it.i === this.DROPPING_ELEM_ID);
-        if (!droppingItem) {
-            // if `onDropDragOver` returned false, we won't have a dropping item
-            // and we cancel the drop
-            this.draggedInView = null;
-            return;
-        }
-
-        const {viewSpecId, title, state} = this.draggedInView,
-            layout = omit(layoutItem, 'i'),
-            newViewModel: DashCanvasViewModel = this.addViewInternal(viewSpecId, {
-                title,
-                state,
-                layout
-            });
-
-        // Change ID of dropping item to the new view's id
-        // so that the new view goes where the dropping item is.
-        droppingItem.i = newViewModel.id;
-
-        // must wait a tick for RGL to settle
-        wait().then(() => {
-            this.draggedInView = null;
-            this.onRglLayoutChange(rglLayout);
-            this.onDropDone?.(newViewModel);
-        });
-    }
-
-    setDraggedInView(view?: DashCanvasItemState) {
-        this.draggedInView = view;
-    }
-
-    onDropDragOver(evt: DragEvent): OnDropDragOverResult {
-        if (!this.draggedInView) return false;
-
-        return {
-            w: this.draggedInView.layout.w,
-            h: this.draggedInView.layout.h
-        };
-    }
-
-    getViewsBySpecId(id) {
-        return this.viewModels.filter(it => it.viewSpec.id === id);
-    }
-
     //------------------------
     // Persistable Interface
     //------------------------
@@ -527,12 +413,6 @@ export class DashCanvasModel
 
     onRglLayoutChange(rglLayout: LayoutItem[]) {
         rglLayout = rglLayout.map(it => pick(it, ['i', 'x', 'y', 'w', 'h']));
-
-        // Early out if RGL is changing layout as user is dragging droppable
-        // item around the canvas.  This will be called again once dragging
-        // has stopped and user has dropped the item onto the canvas.
-        if (rglLayout.some(it => it.i === this.DROPPING_ELEM_ID)) return;
-
         this.setLayout(rglLayout);
     }
 
@@ -616,6 +496,10 @@ export class DashCanvasModel
         return some(this.viewSpecs, {id});
     }
 
+    private getViewsBySpecId(id) {
+        return this.viewModels.filter(it => it.viewSpec.id === id);
+    }
+
     private getNextAvailablePosition({
         width,
         height,

package/dynamics/desktop.ts

@@ -15,7 +15,6 @@
  *
  * See the platform specific AppContainer where these implementations are actually provided.
  */
-export let collapsibleSetButton = null;
 export let ColChooserModel = null;
 export let ColumnHeaderFilterModel = null;
 export let ModalSupportModel = null;
@@ -38,7 +37,6 @@ export let DynamicTabSwitcherModel = null;
  * Not for Application use.
  */
 export function installDesktopImpls(impls) {
-    collapsibleSetButton = impls.collapsibleSetButton;
     ColChooserModel = impls.ColChooserModel;
     ColumnHeaderFilterModel = impls.ColumnHeaderFilterModel;
     ModalSupportModel = impls.ModalSupportModel;

package/dynamics/mobile.ts

@@ -15,7 +15,6 @@
  *
  * See the platform specific AppContainer where these implementations are actually provided.
  */
-export let collapsibleSetButton = null;
 export let ColChooserModel = null;
 export let colChooser = null;
 export let zoneMapper = null;
@@ -31,7 +30,6 @@ export let maskImpl = null;
  * Not for Application use.
  */
 export function installMobileImpls(impls) {
-    collapsibleSetButton = impls.collapsibleSetButton;
     ColChooserModel = impls.ColChooserModel;
     colChooser = impls.colChooser;
     zoneMapper = impls.zoneMapper;

package/mobile/appcontainer/AppContainer.ts

@@ -18,7 +18,6 @@ import {pinPadImpl} from '@xh/hoist/mobile/cmp/pinpad/impl/PinPad';
 import {storeFilterFieldImpl} from '@xh/hoist/mobile/cmp/store/impl/StoreFilterField';
 import {tabContainerImpl} from '@xh/hoist/mobile/cmp/tab/impl/TabContainer';
 import {zoneMapper} from '@xh/hoist/mobile/cmp/zoneGrid/impl/ZoneMapper';
-import {collapsibleSetButton} from '@xh/hoist/mobile/cmp/button/CollapsibleSetButton';
 import {elementFromContent, useOnMount} from '@xh/hoist/utils/react';
 import {isEmpty} from 'lodash';
 import {aboutDialog} from './AboutDialog';
@@ -35,7 +34,6 @@ import {toastSource} from './ToastSource';
 import {versionBar} from './VersionBar';
 
 installMobileImpls({
-    collapsibleSetButton,
     tabContainerImpl,
     storeFilterFieldImpl,
     pinPadImpl,

package/mobile/cmp/header/AppBar.scss

@@ -18,6 +18,17 @@
     display: flex;
   }
 
+  .xh-app-menu-button__user-profile {
+    border-radius: 50%;
+    border: 1px solid var(--xh-appbar-title-color);
+    cursor: pointer;
+    height: 28px;
+    font-size: var(--xh-font-size-small-em);
+    line-height: 27px;
+    text-align: center;
+    width: 28px;
+  }
+
   .xh-button {
     background: transparent !important;
     color: var(--xh-appbar-title-color) !important;

package/mobile/cmp/header/AppMenuButton.ts

@@ -4,11 +4,14 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
-import {hoistCmp, MenuItemLike, XH} from '@xh/hoist/core';
+import {div} from '@xh/hoist/cmp/layout';
+import {hoistCmp, HoistProps, HoistUser, MenuItemLike, XH} from '@xh/hoist/core';
 import {Icon} from '@xh/hoist/icon';
 import {menuButton, MenuButtonProps} from '@xh/hoist/mobile/cmp/menu';
 import '@xh/hoist/mobile/register';
 import {withDefault} from '@xh/hoist/utils/js';
+import {isFunction} from 'lodash';
+import {ReactNode} from 'react';
 
 export interface AppMenuButtonProps extends MenuButtonProps {
     /** Array of app-specific MenuItems or configs to create them. */
@@ -37,8 +40,17 @@ export interface AppMenuButtonProps extends MenuButtonProps {
 
     /** True to hide the About button */
     hideAboutItem?: boolean;
+
+    /**
+     * Replace the default hamburger icon with a user profile representation. Set to true to render
+     * the user's initials from their `HoistUser.displayName`. Alternately, provide a custom
+     * function to render an alternate compact string or element for the current user.
+     */
+    renderWithUserProfile?: boolean | RenderWithUserProfileCustomFn;
 }
 
+type RenderWithUserProfileCustomFn = (user: HoistUser) => ReactNode;
+
 /**
  * A top-level application drop down menu, which installs a standard set of menu items for common
  * application actions. Application specific items can be displayed before these standard items.
@@ -62,11 +74,13 @@ export const [AppMenuButton, appMenuButton] = hoistCmp.withFactory<AppMenuButton
             hideOptionsItem,
             hideThemeItem,
             hideAboutItem,
+            renderWithUserProfile,
             ...rest
         } = props;
 
         return menuButton({
             className,
+            icon: renderWithUserProfile ? userProfile({renderWithUserProfile}) : Icon.menu(),
             menuItems: buildMenuItems(props),
             menuClassName: 'xh-app-menu',
             popoverProps: {popoverClassName: 'xh-app-menu-popover'},
@@ -78,6 +92,20 @@ export const [AppMenuButton, appMenuButton] = hoistCmp.withFactory<AppMenuButton
 //---------------------------
 // Implementation
 //---------------------------
+const userProfile = hoistCmp.factory<
+    HoistProps & {renderWithUserProfile: true | RenderWithUserProfileCustomFn}
+>({
+    model: false,
+    render({renderWithUserProfile}) {
+        return div({
+            className: 'xh-app-menu-button__user-profile',
+            item: isFunction(renderWithUserProfile)
+                ? renderWithUserProfile(XH.getUser())
+                : XH.getUserInitials()
+        });
+    }
+});
+
 function buildMenuItems({
     hideOptionsItem,
     hideFeedbackItem,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "80.0.0-SNAPSHOT.1768251400948",
+  "version": "80.0.0-SNAPSHOT.1768251669499",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",
@@ -62,11 +62,11 @@
     "moment": "~2.30.1",
     "numbro": "~2.5.0",
     "onsenui": "~2.12.8",
-    "qs": "~6.14.1",
+    "qs": "~6.14.0",
     "react-beautiful-dnd": "~13.1.0",
     "react-dates": "~21.8.0",
     "react-dropzone": "~10.2.2",
-    "react-grid-layout": "2.2.2",
+    "react-grid-layout": "2.1.1",
     "react-markdown": "~10.1.0",
     "react-onsenui": "~1.13.2",
     "react-popper": "~2.3.0",

package/styles/vars.scss

@@ -205,13 +205,14 @@ body {
   //---------
   --xh-appbar-bg: var(--appbar-bg, var(--xh-bg-alt));
   --xh-appbar-border-color: var(--appbar-border-color, transparent);
+  --xh-appbar-box-shadow: var(--appbar-box-shadow, #{0 0 0 1px rgb(17 20 24 / 10%), 0 1px 1px rgb(17 20 24 / 20%)});
   --xh-appbar-color: var(--appbar-color, var(--xh-text-color));
   --xh-appbar-height: var(--appbar-height, 42);
   --xh-appbar-height-px: calc(var(--xh-appbar-height) * 1px);
   --xh-appbar-title-color: var(--appbar-title-color, #{mc('blue-grey', '700')});
   --xh-appbar-title-font-size: var(--appbar-title-font-size, calc(var(--xh-font-size) * 1.9));
   --xh-appbar-title-font-size-px: calc(var(--xh-appbar-title-font-size) * 1px);
-  --xh-appbar-box-shadow: var(--appbar-box-shadow, #{0 0 0 1px rgb(17 20 24 / 10%), 0 1px 1px rgb(17 20 24 / 20%)});
+  --xh-appbar-user-profile-hover-color: var(--appbar-user-profile-hover-color, var(--xh-orange));
 
   &.xh-dark {
     --xh-appbar-border-color: var(--appbar-border-color, #{mc('blue-grey', '700')});

package/svc/IdentityService.ts

@@ -30,16 +30,28 @@ export class IdentityService extends HoistService {
         }
     }
 
-    /** Current acting user (see authUser for notes on impersonation) */
+    /** @returns current acting user (see authUser for notes on impersonation) */
     get user(): HoistUser {
         return this._apparentUser;
     }
 
-    /** Current acting user's username. */
+    /** @returns current acting user's username. */
     get username(): string {
         return this.user?.username ?? null;
     }
 
+    /** @returns current acting user's initials, based on displayName. */
+    get userInitials(): string {
+        // Handle common case of displayName being left as an email address.
+        const [displayName] = this.user.displayName.split('@'),
+            nameParts = displayName.split(/[\s.]+/);
+
+        return nameParts
+            .map(part => part.charAt(0).toUpperCase())
+            .join('')
+            .substring(0, XH.isMobileApp ? 2 : 3);
+    }
+
     /**
      * Actual user who authenticated to the web application.
      * This will be the same as the user except when an administrator is impersonation another