@xh/hoist 71.0.0-SNAPSHOT.1736185761842 → 71.0.0-SNAPSHOT.1736187551916

package/build/types/cmp/viewmanager/ViewManagerModel.d.ts

@@ -183,7 +183,9 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
      */
     private constructor();
     doLoadAsync(loadSpec: LoadSpec): Promise<void>;
-    selectViewAsync(info: ViewInfo): Promise<void>;
+    selectViewAsync(info: ViewInfo, opts?: {
+        alertUnsavedChanges: boolean;
+    }): Promise<void>;
     saveAsAsync(spec: ViewCreateSpec): Promise<void>;
     saveAsync(): Promise<void>;
     resetAsync(): Promise<void>;

package/cmp/viewmanager/ViewManagerModel.ts

@@ -346,18 +346,23 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         }
     }
 
-    async selectViewAsync(info: ViewInfo): Promise<void> {
+    async selectViewAsync(info: ViewInfo, opts = {alertUnsavedChanges: true}): Promise<void> {
         // ensure any pending auto-save gets completed
         if (this.isValueDirty && this.isViewAutoSavable) {
             await this.maybeAutoSaveAsync();
         }
 
         // if still dirty, require confirm
-        if (this.isValueDirty && this.view.isOwned && !(await this.confirmDiscardChangesAsync())) {
+        if (
+            opts.alertUnsavedChanges &&
+            this.isValueDirty &&
+            this.view.isOwned &&
+            !(await this.confirmDiscardChangesAsync())
+        ) {
             return;
         }
 
-        return this.loadViewAsync(info);
+        await this.loadViewAsync(info).catch(e => this.handleException(e));
     }
 
     async saveAsAsync(spec: ViewCreateSpec): Promise<void> {

package/desktop/cmp/viewmanager/ViewMenu.ts

@@ -63,7 +63,7 @@ function getNavMenuItems(model: ViewManagerModel): ReactNode[] {
                 className: 'xh-view-manager__menu-item',
                 icon: view.isDefault ? Icon.check() : Icon.placeholder(),
                 text: `Default ${startCase(typeDisplayName)}`,
-                onClick: () => model.selectViewAsync(null).catchDefault()
+                onClick: () => model.selectViewAsync(null)
             })
         );
     }
@@ -168,6 +168,6 @@ function viewMenuItem(view: ViewInfo, model: ViewManagerModel): ReactNode {
         text: view.name,
         title: title.join(' | '),
         icon,
-        onClick: () => model.selectViewAsync(view).catchDefault()
+        onClick: () => model.selectViewAsync(view)
     });
 }

package/desktop/cmp/viewmanager/dialog/ManageDialogModel.ts

@@ -86,7 +86,7 @@ export class ManageDialogModel extends HoistModel {
     }
 
     activateSelectedViewAndClose() {
-        this.viewManagerModel.selectViewAsync(this.selectedView).catchDefault();
+        this.viewManagerModel.selectViewAsync(this.selectedView);
         this.close();
     }
 

package/package.json

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