@fieldia/core 0.29.0 → 0.30.0

package/src/lib/record/form.mjs

@@ -3640,7 +3640,14 @@ function indexLayout(root, functions) {
             ...(does.length ? { does } : {}),
             source,
         });
-        // A button's menu: each item a button of the record, hidden with it.
+        // A menu's built-in Archive shows while the record is active, Unarchive while it is not.
+        const builtin = source.builtin;
+        if (builtin === 'archive' || builtin === 'unarchive') {
+            const own = index.get(source.id);
+            const mine = own.invisible;
+            own.invisible = { ...mine, evaluate: (context, env) => (context['active'] === false) !== (builtin === 'unarchive') || mine.evaluate(context, env) };
+        }
+        // A button's menu, and a menu inside a menu: each item a button of the record, hidden with it.
         if (kind === 'button')
             for (const item of source.menu ?? [])
                 add(item, source.id, 'button', { invisible: item.invisible });
@@ -3749,16 +3756,10 @@ function indexLayout(root, functions) {
         walk(head?.band?.children ?? [], root.id);
         if (root.sidePanel)
             add(root.sidePanel, root.id, 'other', { invisible: root.sidePanel.invisible });
-        // The gear menu's items are buttons of the record; Archive shows while it is active, Unarchive while it is not.
-        for (const item of root.toolbar?.menu ?? []) {
+        // The gear menu's items are buttons of the record — those of a menu inside it too, hidden with the item that opens
+        // it (add's own); Archive shows while it is active, Unarchive while it is not.
+        for (const item of root.toolbar?.menu ?? [])
             add(item, root.id, 'button', { invisible: item.invisible });
-            if (item.builtin === 'archive' || item.builtin === 'unarchive') {
-                const own = index.get(item.id);
-                const mine = own.invisible;
-                const archived = item.builtin === 'unarchive';
-                own.invisible = { ...mine, evaluate: (context, env) => (context['active'] === false) !== archived || mine.evaluate(context, env) };
-            }
-        }
         if (root.attachmentPreview)
             add({ id: '#preview', ...root.attachmentPreview }, root.id, 'other', { invisible: root.attachmentPreview.invisible });
     }