@xh/hoist 75.0.0-SNAPSHOT.1753458616250 → 75.0.0-SNAPSHOT.1753474244586

package/appcontainer/AppContainerModel.ts

@@ -40,7 +40,7 @@ import {
     TrackService,
     WebSocketService
 } from '@xh/hoist/svc';
-import {checkMinVersion, throwIf} from '@xh/hoist/utils/js';
+import {checkMinVersion, createSingleton, throwIf} from '@xh/hoist/utils/js';
 import {compact, isEmpty} from 'lodash';
 import {AboutDialogModel} from './AboutDialogModel';
 import {BannerSourceModel} from './BannerSourceModel';
@@ -197,7 +197,7 @@ export class AppContainerModel extends HoistModel {
 
             // Check auth, locking out, or showing login if possible
             this.setAppState('AUTHENTICATING');
-            XH.authModel = new this.appSpec.authModelClass();
+            XH.authModel = createSingleton(this.appSpec.authModelClass);
             const isAuthenticated = await XH.authModel.completeAuthAsync();
             if (!isAuthenticated) {
                 throwIf(
@@ -287,8 +287,7 @@ export class AppContainerModel extends HoistModel {
             await wait(XH.isDevelopmentMode ? 300 : 1);
 
             this.setAppState('INITIALIZING_APP');
-            const modelClass: any = this.appSpec.modelClass;
-            this.appModel = modelClass.instance = new modelClass();
+            this.appModel = createSingleton(this.appSpec.modelClass);
             await this.appModel.initAsync();
             this.startRouter();
             this.startOptionsDialog();

package/build/types/cmp/grid/Grid.d.ts

@@ -119,7 +119,7 @@ export declare class GridLocalModel extends HoistModel {
         nodeA: any;
         nodeB: any;
     }) => number;
-    doWithPreservedState({ expansion, filters }: PlainObject, fn: any): void;
+    doWithPreservedState({ filters }: PlainObject, fn: any): void;
     readFilterState(): import("@ag-grid-community/core").FilterModel;
     writeFilterState(filterState: any): void;
     processCellForClipboard: ({ value, node, column }: ProcessCellForExportParams) => any;

package/build/types/utils/js/LangUtils.d.ts

@@ -44,6 +44,16 @@ export declare function warnIf(condition: any, message: any): void;
  * Log an error to the console if a condition evaluates as truthy.
  */
 export declare function errorIf(condition: any, message: any): void;
+/**
+ * Instantiate a singleton object of a class, and place a reference to the created
+ * object in a static property on the class.
+ *
+ * This pattern is useful to allow gaining typed references to the singleton via import
+ * and is used for creating the singleton HoistServices, AuthModel, and AppModel.
+ *
+ * @param clazz -- Class (i.e. Constructor) of singleton object to be created.
+ */
+export declare function createSingleton<T>(clazz: new () => T): T;
 export interface APIWarnOptions {
     /**
      * If provided and undefined, this method will be a no-op.

package/cmp/grid/Grid.ts

@@ -767,12 +767,9 @@ export class GridLocalModel extends HoistModel {
         return gridModel.groupSortFn(nodeA.key, nodeB.key, nodeA.field, {gridModel, nodeA, nodeB});
     };
 
-    doWithPreservedState({expansion, filters}: PlainObject, fn) {
-        const {agGridModel} = this.model,
-            expandState = expansion ? agGridModel.getExpandState() : null,
-            filterState = filters ? this.readFilterState() : null;
+    doWithPreservedState({filters}: PlainObject, fn) {
+        const filterState = filters ? this.readFilterState() : null;
         fn();
-        if (expandState) agGridModel.setExpandState(expandState);
         if (filterState) this.writeFilterState(filterState);
     }
 

package/cmp/grid/GridModel.ts

@@ -645,13 +645,6 @@ export class GridModel extends HoistModel {
             debounce: 500
         });
 
-        this.addReaction({
-            track: () => [this.expandLevel, this.isReady],
-            run: () => {
-                this.agApi?.setGridOption('groupDefaultExpanded', this.expandLevel);
-            }
-        });
-
         if (!isEmpty(rest)) {
             const keys = keysIn(rest);
             throw XH.exception(
@@ -1043,6 +1036,28 @@ export class GridModel extends HoistModel {
     @action
     expandToLevel(level: number) {
         this.expandLevel = level;
+
+        // 0) Not rendered, we are done.
+        const {agApi} = this;
+        if (!agApi) return;
+
+        // 1) Update rendered grid.
+        if (agApi.getGridOption('groupDefaultExpanded') != level) {
+            // If the ag default is *not* set to this level just set it.  This somewhat
+            // mysteriously (but efficiently) changes the currently rendered rows as well.
+            agApi.setGridOption('groupDefaultExpanded', level);
+        } else if (level == 0 || level >= this.maxDepth) {
+            // otherwise api methods available.
+            level == 0 ? agApi.collapseAll() : agApi.expandAll();
+        } else {
+            // Otherwise, *toggle* the default.
+            // Surprisingly, this appears to be the only efficient way to do the bulk operation.
+            agApi.setGridOption('groupDefaultExpanded', 0);
+            agApi.setGridOption('groupDefaultExpanded', level);
+        }
+
+        // 2) Finally, be sure to update our state snapshot.
+        this.noteAgExpandStateChange();
     }
 
     /**

package/core/impl/InstallServices.ts

@@ -6,7 +6,7 @@
  */
 import {HoistService, HoistServiceClass, Some, XH} from '@xh/hoist/core';
 import {instanceManager} from '@xh/hoist/core/impl/InstanceManager';
-import {throwIf} from '@xh/hoist/utils/js';
+import {createSingleton, throwIf} from '@xh/hoist/utils/js';
 import {camelCase, castArray} from 'lodash';
 
 /**
@@ -30,7 +30,7 @@ export async function installServicesAsync(serviceClasses: Some<HoistServiceClas
     const notSvc = serviceClasses.find((it: any) => !it.isHoistService);
     throwIf(notSvc, `Cannot initialize ${notSvc?.name} - does not extend HoistService`);
 
-    const svcs = serviceClasses.map(serviceClass => new serviceClass());
+    const svcs = serviceClasses.map(c => createSingleton(c));
     await initServicesInternalAsync(svcs);
 
     svcs.forEach(svc => {
@@ -43,7 +43,6 @@ export async function installServicesAsync(serviceClasses: Some<HoistServiceClas
                 install the same service twice.`
         );
         XH[name] = svc;
-        (clazz as any).instance = svc;
         instanceManager.registerService(svc);
     });
 }

package/package.json

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