@xh/hoist 74.0.0 → 74.1.1

package/utils/impl/MenuItems.ts

@@ -0,0 +1,57 @@
+import {isMenuItem, MenuItemLike} from '@xh/hoist/core';
+import {menuDivider, menuItem} from '@xh/hoist/kit/blueprint';
+import {MenuItemProps} from '@blueprintjs/core';
+import {wait} from '@xh/hoist/promise';
+import {isOmitted} from '@xh/hoist/utils/impl/IsOmitted';
+import {filterConsecutiveMenuSeparators} from '@xh/hoist/utils/impl/Separators';
+import {clone, isEmpty} from 'lodash';
+import {ReactNode} from 'react';
+
+/**
+ * Parse MenuItem configs into Blueprint MenuItems.
+ *
+ * Note this is currently used in a few limited places and is not generally applied to all menu-
+ * like components in Hoist. In particular, it is not used by the `menu` component re-exported from
+ * Blueprint. See https://github.com/xh/hoist-react/issues/2400 covering TBD work to more fully
+ * standardize a Hoist menu component that might then incorporate this processing.
+ *
+ * @internal
+ */
+export function parseMenuItems(items: MenuItemLike[]): ReactNode[] {
+    items = items.map(item => {
+        if (!isMenuItem(item)) return item;
+
+        item = clone(item);
+        item.items = clone(item.items);
+        item.prepareFn?.(item);
+        return item;
+    });
+
+    return items
+        .filter(it => !isMenuItem(it) || (!it.hidden && !isOmitted(it)))
+        .filter(filterConsecutiveMenuSeparators())
+        .map(item => {
+            if (item === '-') return menuDivider();
+            if (!isMenuItem(item)) return item;
+
+            const {actionFn} = item;
+
+            // Create menuItem from config
+            const cfg: MenuItemProps = {
+                text: item.text,
+                icon: item.icon,
+                intent: item.intent,
+                className: item.className,
+                onClick: actionFn ? e => wait().then(() => actionFn(e)) : null, // do async to allow menu to close
+                disabled: item.disabled
+            };
+
+            // Recursively parse any submenus
+            if (!isEmpty(item.items)) {
+                cfg.children = parseMenuItems(item.items);
+                cfg.popoverProps = {openOnTargetFocus: false};
+            }
+
+            return menuItem(cfg);
+        });
+}

package/utils/impl/index.ts

@@ -8,3 +8,4 @@ export * from './Separators';
 export * from './TimeZone';
 export * from './Equals';
 export * from './IsOmitted';
+export * from './MenuItems';

package/utils/js/LangUtils.ts

@@ -178,7 +178,7 @@ export function apiDeprecated(name: string, opts: APIWarnOptions = {}) {
 
     const v = opts.v ?? 'a future release',
         msg = opts.msg ? ` ${opts.msg}.` : '',
-        warn = `The use of '${name}' has been deprecated and will be removed in ${v}.${msg}`;
+        warn = `The use of '${name}' has been deprecated and will be removed in ${v}. ${msg}`;
     if (!_seenWarnings[warn]) {
         console.warn(warn);
         _seenWarnings[warn] = true;