@xh/hoist 71.0.0-SNAPSHOT.1733266596001 → 71.0.0-SNAPSHOT.1733347475493

package/desktop/cmp/viewmanager/ViewManager.ts

@@ -5,7 +5,8 @@
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
 
-import {fragment, hbox} from '@xh/hoist/cmp/layout';
+import {box, fragment, hbox} from '@xh/hoist/cmp/layout';
+import {spinner} from '@xh/hoist/cmp/spinner';
 import {hoistCmp, HoistProps, uses} from '@xh/hoist/core';
 import {ViewManagerModel} from '@xh/hoist/cmp/viewmanager';
 import {button, ButtonProps} from '@xh/hoist/desktop/cmp/button';
@@ -92,7 +93,12 @@ const menuButton = hoistCmp.factory<ViewManagerModel>({
         return button({
             className: 'xh-view-manager__menu-button',
             text: view.info?.name ?? `Default ${startCase(typeDisplayName)}`,
-            icon: !isLoading ? Icon.bookmark() : Icon.spinner({className: 'fa-spin'}),
+            icon: !isLoading
+                ? Icon.bookmark()
+                : box({
+                      item: spinner({width: 13, height: 13, style: {margin: 'auto'}}),
+                      width: 16.25
+                  }),
             rightIcon: Icon.chevronDown(),
             outlined: true,
             ...rest

package/desktop/cmp/viewmanager/ViewMenu.ts

@@ -5,12 +5,14 @@
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
 
-import {div, filler, fragment, hbox, span} from '@xh/hoist/cmp/layout';
+import {box, div, filler, fragment, hbox, span} from '@xh/hoist/cmp/layout';
+import {spinner} from '@xh/hoist/cmp/spinner';
 import {hoistCmp} from '@xh/hoist/core';
 import {ViewManagerModel, ViewInfo} from '@xh/hoist/cmp/viewmanager';
 import {switchInput} from '@xh/hoist/desktop/cmp/input';
 import {Icon} from '@xh/hoist/icon';
 import {menu, menuDivider, menuItem} from '@xh/hoist/kit/blueprint';
+import {wait} from '@xh/hoist/promise';
 import {consumeEvent, pluralize} from '@xh/hoist/utils/js';
 import {isEmpty, startCase} from 'lodash';
 import {ReactNode} from 'react';
@@ -34,7 +36,8 @@ export const viewMenu = hoistCmp.factory<ViewManagerProps>({
             views,
             isValueDirty,
             privateViews,
-            globalViews
+            globalViews,
+            loadModel
         } = model;
 
         const pluralName = pluralize(startCase(typeDisplayName)),
@@ -138,10 +141,17 @@ export const viewMenu = hoistCmp.factory<ViewManagerProps>({
                     onClick: () => model.openManageDialog()
                 }),
                 menuItem({
-                    icon: Icon.refresh(),
+                    icon: !loadModel.isPending
+                        ? Icon.refresh()
+                        : box({
+                              height: 20,
+                              item: spinner({width: 16.25, height: 16.25})
+                          }),
+                    disabled: loadModel.isPending,
                     text: `Refresh ${pluralName}`,
                     onClick: e => {
-                        model.refreshAsync();
+                        // Ensure at least 100ms delay to render spinner
+                        Promise.all([wait(100), model.refreshAsync()]).linkTo(loadModel);
                         consumeEvent(e);
                     }
                 })

package/package.json

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