@xh/hoist 80.0.0-SNAPSHOT.1767973504648 → 80.0.0-SNAPSHOT.1767982629403

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/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTabModel.ts

@@ -6,7 +6,7 @@
  */
 import {GridFilterModel, GridModel} from '@xh/hoist/cmp/grid';
 import {HoistModel, managed} from '@xh/hoist/core';
-import {FieldFilterSpec} from '@xh/hoist/data';
+import type {FieldFilterOperator, FieldFilterSpec} from '@xh/hoist/data';
 import {checkbox} from '@xh/hoist/desktop/cmp/input';
 import {Icon} from '@xh/hoist/icon';
 import {action, bindable, computed, makeObservable, observable} from '@xh/hoist/mobx';
@@ -73,12 +73,12 @@ export class ValuesTabModel extends HoistModel {
         return this.fieldSpec.values;
     }
 
-    get valueCount() {
-        return this.fieldSpec.valueCount;
+    get allValuesCount() {
+        return this.fieldSpec.allValuesCount;
     }
 
     get hasHiddenValues() {
-        return this.values.length < this.valueCount;
+        return this.values.length < this.allValuesCount;
     }
 
     get sortIcon() {
@@ -193,24 +193,24 @@ export class ValuesTabModel extends HoistModel {
         );
     }
 
-    private getFilter() {
-        const {gridFilterModel, pendingValues, values, valueCount, field} = this,
+    private getFilter(): FieldFilterSpec {
+        const {gridFilterModel, pendingValues, values, allValuesCount, field} = this,
             included = pendingValues.map(it => gridFilterModel.fromDisplayValue(it)),
             excluded = difference(values, pendingValues).map(it =>
                 gridFilterModel.fromDisplayValue(it)
             );
 
-        if (included.length === valueCount || excluded.length === valueCount) {
+        if (included.length === allValuesCount || excluded.length === allValuesCount) {
             return null;
         }
 
         const {fieldType} = this.headerFilterModel;
-        let arr, op;
+        let arr: any[], op: FieldFilterOperator;
         if (fieldType === 'tags') {
             arr = included;
             op = 'includes';
         } else {
-            const weight = valueCount <= 10 ? 2.5 : 1; // Prefer '=' for short lists
+            const weight = allValuesCount <= 10 ? 2.5 : 1; // Prefer '=' for short lists
             op = included.length > excluded.length * weight ? '!=' : '=';
             arr = op === '=' ? included : excluded;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "80.0.0-SNAPSHOT.1767973504648",
+  "version": "80.0.0-SNAPSHOT.1767982629403",
   "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/svc/InspectorService.ts

@@ -5,6 +5,7 @@
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
 import {HoistService, managed, persist, XH} from '@xh/hoist/core';
+import {Store} from '@xh/hoist/data';
 import {action, bindable, makeObservable, observable} from '@xh/hoist/mobx';
 import {wait} from '@xh/hoist/promise';
 import {Timer} from '@xh/hoist/utils/async';
@@ -59,8 +60,8 @@ export class InspectorService extends HoistService {
     @managed
     statsUpdateTimer: Timer;
 
-    private _syncRun = 0;
-    private _idToSyncRun = new Map();
+    private _syncRun: number = 0;
+    private _idToSyncRun = new Map<string, number>();
 
     constructor() {
         super();
@@ -196,7 +197,7 @@ export class InspectorService extends HoistService {
                     created: inst._created,
                     isHoistService: inst.isHoistService,
                     isHoistModel: inst.isHoistModel,
-                    isStore: inst.isStore,
+                    isStore: Store.isStore(inst),
                     isLinked: inst.isLinked,
                     isXhImpl: inst.xhImpl,
                     hasLoadSupport: inst.loadSupport != null,
@@ -211,7 +212,7 @@ export class InspectorService extends HoistService {
     }
 
     @action
-    setActiveInstances(ai) {
+    setActiveInstances(ai: InspectorInstanceData[]) {
         this.activeInstances = ai;
     }
 
@@ -229,7 +230,7 @@ export class InspectorService extends HoistService {
 
 interface InspectorInstanceData {
     className: string;
-    created: Date;
+    created: number;
     isHoistModel: boolean;
     isHoistService: boolean;
     isStore: boolean;