@foldkit/ui 0.168.0 → 0.169.0-canary.7ee214268c60

package/dist/menu/index.js

@@ -69,6 +69,7 @@ export const Message = defineMessageUnion({
     CompletedRestoreInert: {},
     CompletedScrollIntoView: {},
     CompletedClickItem: {},
+    ClickedButton: {},
     IgnoredMouseClick: {},
     SuppressedSpaceScroll: {},
     CompletedAnchorMenu: {},
@@ -275,16 +276,21 @@ export const update = (model, message) => {
         SuppressedSpaceScroll: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/menu/index.js#SuppressedSpaceScroll")),
         CompletedAnchorMenu: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/menu/index.js#CompletedAnchorMenu")),
         CompletedPortalMenuBackdrop: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/menu/index.js#CompletedPortalMenuBackdrop")),
-        Opened: ({ maybeActiveItemIndex }) => __foldkitBrandViewResult((openMenu(modifyFields(model, {
-            maybeActiveItemIndex: () => __foldkitBrandViewResult((maybeActiveItemIndex), "@foldkit/ui/menu/index.js#maybeActiveItemIndex~2"),
-            activationTrigger: () => __foldkitBrandViewResult((Option.match(maybeActiveItemIndex, {
-                onNone: () => __foldkitBrandViewResult(('Pointer'), "@foldkit/ui/menu/index.js#onNone"),
-                onSome: () => __foldkitBrandViewResult(('Keyboard'), "@foldkit/ui/menu/index.js#onSome"),
-            })), "@foldkit/ui/menu/index.js#activationTrigger"),
-            searchQuery: () => __foldkitBrandViewResult((''), "@foldkit/ui/menu/index.js#searchQuery~2"),
-            searchVersion: () => __foldkitBrandViewResult((0), "@foldkit/ui/menu/index.js#searchVersion~2"),
-            maybeLastPointerPosition: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeLastPointerPosition~2"),
-        }))), "@foldkit/ui/menu/index.js#Opened"),
+        Opened: ({ maybeActiveItemIndex }) => {
+            if (model.isOpen) {
+                return __foldkitBrandViewResult(({ model }), "@foldkit/ui/menu/index.js#Opened");
+            }
+            return __foldkitBrandViewResult((openMenu(modifyFields(model, {
+                maybeActiveItemIndex: () => __foldkitBrandViewResult((maybeActiveItemIndex), "@foldkit/ui/menu/index.js#maybeActiveItemIndex~2"),
+                activationTrigger: () => __foldkitBrandViewResult((Option.match(maybeActiveItemIndex, {
+                    onNone: () => __foldkitBrandViewResult(('Pointer'), "@foldkit/ui/menu/index.js#onNone"),
+                    onSome: () => __foldkitBrandViewResult(('Keyboard'), "@foldkit/ui/menu/index.js#onSome"),
+                })), "@foldkit/ui/menu/index.js#activationTrigger"),
+                searchQuery: () => __foldkitBrandViewResult((''), "@foldkit/ui/menu/index.js#searchQuery~2"),
+                searchVersion: () => __foldkitBrandViewResult((0), "@foldkit/ui/menu/index.js#searchVersion~2"),
+                maybeLastPointerPosition: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeLastPointerPosition~2"),
+            }))), "@foldkit/ui/menu/index.js#Opened");
+        },
         Closed: () => __foldkitBrandViewResult((closeMenu(model, closeWithFocusCommands)), "@foldkit/ui/menu/index.js#Closed"),
         BlurredItems: () => {
             if (Option.exists(model.maybeLastButtonPointerType, Equal.equals('mouse'))) {
@@ -400,6 +406,25 @@ export const update = (model, message) => {
                 maybeLastButtonPointerType: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeLastButtonPointerType~4"),
             }),
         }), "@foldkit/ui/menu/index.js#IgnoredMouseClick")),
+        ClickedButton: () => {
+            if (Option.exists(model.maybeLastButtonPointerType, Equal.equals('mouse'))) {
+                return __foldkitBrandViewResult(({
+                    model: modifyFields(model, {
+                        maybeLastButtonPointerType: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeLastButtonPointerType~5"),
+                    }),
+                }), "@foldkit/ui/menu/index.js#ClickedButton");
+            }
+            if (model.isOpen) {
+                return __foldkitBrandViewResult((closeMenu(model, closeWithFocusCommands)), "@foldkit/ui/menu/index.js#ClickedButton");
+            }
+            return __foldkitBrandViewResult((openMenu(modifyFields(model, {
+                maybeActiveItemIndex: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeActiveItemIndex~8"),
+                activationTrigger: () => __foldkitBrandViewResult(('Pointer'), "@foldkit/ui/menu/index.js#activationTrigger~5"),
+                searchQuery: () => __foldkitBrandViewResult((''), "@foldkit/ui/menu/index.js#searchQuery~6"),
+                searchVersion: () => __foldkitBrandViewResult((0), "@foldkit/ui/menu/index.js#searchVersion~5"),
+                maybeLastPointerPosition: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#maybeLastPointerPosition~5"),
+            }))), "@foldkit/ui/menu/index.js#ClickedButton");
+        },
     })), "@foldkit/ui/menu/index.js#update");
 };
 /** The anchor-positioning Mount this Menu renders on its panel. The panel is
@@ -440,7 +465,8 @@ export const PortalMenuBackdrop = Mount.define('PortalMenuBackdrop', {
     })), "@foldkit/ui/menu/index.js#execute~10"),
 });
 /** Programmatically opens the Menu, updating the Model and returning focus and
- *  modal Commands. Use this in domain-event handlers. */
+ *  modal Commands. When it is already open, returns the Model unchanged with
+ *  no Commands. Use this in domain-event handlers. */
 export const open = (model) => __foldkitBrandViewResult((update(model, Message.Opened({ maybeActiveItemIndex: Option.none() }))), "@foldkit/ui/menu/index.js#open");
 /** Programmatically closes the menu. If it is open, returns the closed Model
  *  with focus and modal Commands. If it is already closed, returns the Model
@@ -456,7 +482,7 @@ const internalView = () =>
 /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
 __foldkitBrandViewResult((menuViewImpl), "@foldkit/ui/menu/index.js#internalView");
 const menuViewImpl = defineView((model, viewInputs, h) => {
-    const { id, isOpen, animation: { transitionState }, maybeActiveItemIndex, searchQuery, maybeLastButtonPointerType, } = model;
+    const { id, isOpen, animation: { transitionState }, maybeActiveItemIndex, searchQuery, } = model;
     const { items, itemToConfig, isItemDisabled, itemToSearchText = (item) => __foldkitBrandViewResult((item), "@foldkit/ui/menu/index.js#anonymous~19"), isButtonDisabled, buttonContent, buttonClassName, buttonAttributes = [], itemsClassName, itemsAttributes = [], itemsScrollClassName, itemsScrollAttributes = [], backdropClassName, backdropAttributes = [], className, attributes = [], itemGroupKey, groupToHeading, groupClassName, groupAttributes = [], separatorClassName, separatorAttributes = [], anchor = {}, ariaLabel, ariaLabelledBy, } = viewInputs;
     const dispatchSelectedItem = (item, index) => __foldkitBrandViewResult((Message.SelectedItem({ index, item })), "@foldkit/ui/menu/index.js#dispatchSelectedItem");
     const isLeaving = transitionState === 'LeaveStart' || transitionState === 'LeaveAnimating';
@@ -497,31 +523,19 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
         screenY,
         timeStamp,
     }))), "@foldkit/ui/menu/index.js#handleButtonPointerDown");
-    const handleButtonClick = () => {
-        const isMouse = Option.exists(maybeLastButtonPointerType, type => __foldkitBrandViewResult((type === 'mouse'), "@foldkit/ui/menu/index.js#anonymous~29"));
-        if (isMouse) {
-            return __foldkitBrandViewResult((Message.IgnoredMouseClick()), "@foldkit/ui/menu/index.js#handleButtonClick");
-        }
-        else if (isOpen) {
-            return __foldkitBrandViewResult((Message.Closed()), "@foldkit/ui/menu/index.js#handleButtonClick");
-        }
-        else {
-            return __foldkitBrandViewResult((Message.Opened({ maybeActiveItemIndex: Option.none() })), "@foldkit/ui/menu/index.js#handleButtonClick");
-        }
-    };
     const handleSpaceKeyUp = (key) => __foldkitBrandViewResult((OptionExt.when(key === ' ', Message.SuppressedSpaceScroll())), "@foldkit/ui/menu/index.js#handleSpaceKeyUp");
-    const resolveActiveIndex = keyToIndex('ArrowDown', 'ArrowUp', items.length, Option.getOrElse(maybeActiveItemIndex, () => __foldkitBrandViewResult((0), "@foldkit/ui/menu/index.js#anonymous~30")), isDisabled);
+    const resolveActiveIndex = keyToIndex('ArrowDown', 'ArrowUp', items.length, Option.getOrElse(maybeActiveItemIndex, () => __foldkitBrandViewResult((0), "@foldkit/ui/menu/index.js#anonymous~29")), isDisabled);
     const searchForKey = (key) => {
         const nextQuery = searchQuery + key;
         const maybeTargetIndex = resolveTypeaheadMatch(items, nextQuery, maybeActiveItemIndex, isDisabled, itemToSearchText, String.isNonEmpty(searchQuery));
         return __foldkitBrandViewResult((Option.some(Message.Searched({ key, maybeTargetIndex }))), "@foldkit/ui/menu/index.js#searchForKey");
     };
-    const handleItemsKeyDown = (key) => __foldkitBrandViewResult((Match.value(key).pipe(Match.when('Escape', () => __foldkitBrandViewResult((Option.some(Message.Closed())), "@foldkit/ui/menu/index.js#anonymous~31")), Match.when('Enter', () => __foldkitBrandViewResult((Option.map(maybeActiveItemIndex, index => __foldkitBrandViewResult((Message.RequestedItemClick({ index })), "@foldkit/ui/menu/index.js#anonymous~33"))), "@foldkit/ui/menu/index.js#anonymous~32")), Match.when(' ', () => __foldkitBrandViewResult((String.isNonEmpty(searchQuery)
+    const handleItemsKeyDown = (key) => __foldkitBrandViewResult((Match.value(key).pipe(Match.when('Escape', () => __foldkitBrandViewResult((Option.some(Message.Closed())), "@foldkit/ui/menu/index.js#anonymous~30")), Match.when('Enter', () => __foldkitBrandViewResult((Option.map(maybeActiveItemIndex, index => __foldkitBrandViewResult((Message.RequestedItemClick({ index })), "@foldkit/ui/menu/index.js#anonymous~32"))), "@foldkit/ui/menu/index.js#anonymous~31")), Match.when(' ', () => __foldkitBrandViewResult((String.isNonEmpty(searchQuery)
         ? searchForKey(' ')
-        : Option.map(maybeActiveItemIndex, index => __foldkitBrandViewResult((Message.RequestedItemClick({ index })), "@foldkit/ui/menu/index.js#anonymous~35"))), "@foldkit/ui/menu/index.js#anonymous~34")), Match.whenOr('ArrowDown', 'ArrowUp', 'Home', 'End', 'PageUp', 'PageDown', () => __foldkitBrandViewResult((Option.some(Message.ActivatedItem({
+        : Option.map(maybeActiveItemIndex, index => __foldkitBrandViewResult((Message.RequestedItemClick({ index })), "@foldkit/ui/menu/index.js#anonymous~34"))), "@foldkit/ui/menu/index.js#anonymous~33")), Match.whenOr('ArrowDown', 'ArrowUp', 'Home', 'End', 'PageUp', 'PageDown', () => __foldkitBrandViewResult((Option.some(Message.ActivatedItem({
         index: resolveActiveIndex(key),
         activationTrigger: 'Keyboard',
-    }))), "@foldkit/ui/menu/index.js#anonymous~36")), Match.when(isPrintableKey, () => __foldkitBrandViewResult((searchForKey(key)), "@foldkit/ui/menu/index.js#anonymous~37")), Match.orElse(() => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#anonymous~38")))), "@foldkit/ui/menu/index.js#handleItemsKeyDown");
+    }))), "@foldkit/ui/menu/index.js#anonymous~35")), Match.when(isPrintableKey, () => __foldkitBrandViewResult((searchForKey(key)), "@foldkit/ui/menu/index.js#anonymous~36")), Match.orElse(() => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/menu/index.js#anonymous~37")))), "@foldkit/ui/menu/index.js#handleItemsKeyDown");
     const handleItemsPointerUp = (screenX, screenY, pointerType, timeStamp) => __foldkitBrandViewResult((OptionExt.when(pointerType === 'mouse', Message.ReleasedPointerOnItems({ screenX, screenY, timeStamp }))), "@foldkit/ui/menu/index.js#handleItemsPointerUp");
     const resolveButtonLabel = () => {
         if (Predicate.isNotUndefined(ariaLabel)) {
@@ -548,7 +562,7 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
                 h.OnPointerDown(handleButtonPointerDown),
                 h.OnKeyDownPreventDefault(handleButtonKeyDown),
                 h.OnKeyUpPreventDefault(handleSpaceKeyUp),
-                h.OnClick(handleButtonClick()),
+                h.OnClick(Message.ClickedButton()),
             ]),
         ...(isVisible
             ? [
@@ -587,7 +601,7 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
         ...itemsAttributes,
     ];
     const menuItems = Array.map(items, (item, index) => {
-        const isActiveItem = Option.exists(maybeActiveItemIndex, activeIndex => __foldkitBrandViewResult((activeIndex === index), "@foldkit/ui/menu/index.js#anonymous~40"));
+        const isActiveItem = Option.exists(maybeActiveItemIndex, activeIndex => __foldkitBrandViewResult((activeIndex === index), "@foldkit/ui/menu/index.js#anonymous~39"));
         const isDisabledItem = isDisabled(index);
         const itemConfig = itemToConfig(item, {
             isActive: isActiveItem,
@@ -611,13 +625,13 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
                                 index,
                                 screenX,
                                 screenY,
-                            }))), "@foldkit/ui/menu/index.js#anonymous~41")),
+                            }))), "@foldkit/ui/menu/index.js#anonymous~40")),
                         ]),
-                    h.OnPointerLeave(pointerType => __foldkitBrandViewResult((OptionExt.when(pointerType !== 'touch', Message.DeactivatedItem())), "@foldkit/ui/menu/index.js#anonymous~42")),
+                    h.OnPointerLeave(pointerType => __foldkitBrandViewResult((OptionExt.when(pointerType !== 'touch', Message.DeactivatedItem())), "@foldkit/ui/menu/index.js#anonymous~41")),
                 ]
                 : []),
             ...(itemConfig.className ? [h.Class(itemConfig.className)] : []),
-        ], [itemConfig.content])), "@foldkit/ui/menu/index.js#anonymous~39");
+        ], [itemConfig.content])), "@foldkit/ui/menu/index.js#anonymous~38");
     });
     const renderGroupedItems = () => {
         if (!itemGroupKey) {
@@ -626,7 +640,7 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
         const segments = groupContiguous(menuItems, (_, index) => __foldkitBrandViewResult((Array.get(items, index).pipe(Option.match({
             onNone: () => __foldkitBrandViewResult((''), "@foldkit/ui/menu/index.js#onNone~3"),
             onSome: item => __foldkitBrandViewResult((itemGroupKey(item, index)), "@foldkit/ui/menu/index.js#onSome~3"),
-        }))), "@foldkit/ui/menu/index.js#anonymous~43"));
+        }))), "@foldkit/ui/menu/index.js#anonymous~42"));
         return __foldkitBrandViewResult((Array.flatMap(segments, (segment, segmentIndex) => {
             const maybeHeading = Option.fromNullishOr(groupToHeading && groupToHeading(segment.key));
             const headingId = `${id}-heading-${segment.key}`;
@@ -660,7 +674,7 @@ const menuViewImpl = defineView((model, viewInputs, h) => {
                     ]),
                 ]
                 : [];
-            return __foldkitBrandViewResult(([...separator, groupElement]), "@foldkit/ui/menu/index.js#anonymous~44");
+            return __foldkitBrandViewResult(([...separator, groupElement]), "@foldkit/ui/menu/index.js#anonymous~43");
         })), "@foldkit/ui/menu/index.js#renderGroupedItems");
     };
     const backdrop = h.keyed('div')(`${id}-backdrop`, [

package/dist/menu/public.d.ts

@@ -1,4 +1,4 @@
-export { init, create, buttonId, Model, Message, OutMessage, type Selected, type SelectedItem, AnchorMenu, PortalMenuBackdrop, type CompletedDelayClearSearch, LockScroll, UnlockScroll, InertOthers, RestoreInert, FocusItems, FocusButton, ScrollIntoView, ClickItem, DelayClearSearch, DetectMovementOrAnimationEnd, type Opened, type Closed, type BlurredItems, type ActivatedItem, type DeactivatedItem, type MovedPointerOverItem, type RequestedItemClick, type Searched, type PressedPointerOnButton, type ReleasedPointerOnItems, type IgnoredMouseClick, type SuppressedSpaceScroll, } from './index.js';
+export { init, create, buttonId, Model, Message, OutMessage, type Selected, type SelectedItem, AnchorMenu, PortalMenuBackdrop, type CompletedDelayClearSearch, LockScroll, UnlockScroll, InertOthers, RestoreInert, FocusItems, FocusButton, ScrollIntoView, ClickItem, DelayClearSearch, DetectMovementOrAnimationEnd, type Opened, type Closed, type BlurredItems, type ActivatedItem, type DeactivatedItem, type MovedPointerOverItem, type RequestedItemClick, type Searched, type PressedPointerOnButton, type ReleasedPointerOnItems, type ClickedButton, type IgnoredMouseClick, type SuppressedSpaceScroll, } from './index.js';
 export type { ActivationTrigger, InitConfig, ViewInputs, ItemConfig, GroupHeading, Bundle, } from './index.js';
 export type { AnchorConfig } from '../anchor/index.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/menu/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/menu/public.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,EACV,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,UAAU,EACV,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,4BAA4B,EAC5B,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAA;AAEnB,YAAY,EACV,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACZ,MAAM,GACP,MAAM,YAAY,CAAA;AAEnB,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/menu/public.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,EACV,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,UAAU,EACV,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,4BAA4B,EAC5B,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAA;AAEnB,YAAY,EACV,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACZ,MAAM,GACP,MAAM,YAAY,CAAA;AAEnB,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/popover/index.d.ts

@@ -35,6 +35,7 @@ export declare const Message: import("foldkit/message").MessageUnion<{
     readonly CompletedUnlockScroll: {};
     readonly CompletedInertOthers: {};
     readonly CompletedRestoreInert: {};
+    readonly ClickedButton: {};
     readonly IgnoredMouseClick: {};
     readonly SuppressedSpaceScroll: {};
     readonly CompletedAnchorPopover: {};
@@ -56,6 +57,8 @@ export type RequestedOpen = typeof Message.RequestedOpen.Type;
 export type RequestedClose = typeof Message.RequestedClose.Type;
 export type BlurredPanel = typeof Message.BlurredPanel.Type;
 export type PressedPointerOnButton = typeof Message.PressedPointerOnButton.Type;
+/** A click on the Popover trigger button. */
+export type ClickedButton = typeof Message.ClickedButton.Type;
 export type IgnoredMouseClick = typeof Message.IgnoredMouseClick.Type;
 export type SuppressedSpaceScroll = typeof Message.SuppressedSpaceScroll.Type;
 export type Message = typeof Message.Type;
@@ -69,7 +72,15 @@ export declare const OutMessage: import("foldkit/message").MessageUnion<{
 export type OutMessage = typeof OutMessage.Type;
 export type Opened = typeof OutMessage.Opened.Type;
 export type Closed = typeof OutMessage.Closed.Type;
-/** Configuration for creating a popover model with `init`. `isAnimated` enables animation coordination (default `false`). `isModal` locks page scroll and inerts other elements when open (default `false`). `contentFocus` hands focus ownership to the consumer. The panel is not focusable and does not close on blur, so the consumer must focus a descendant on open and close the popover on its own blur rules (default `false`). */
+/** Configuration for creating a Popover Model with `init`.
+ *
+ *  `isAnimated` enables animation coordination. `isModal` locks page scroll
+ *  and marks other elements inert while the Popover is open. Both default to
+ *  `false`.
+ *
+ *  With `contentFocus: true`, the panel has no tab stop and focus leaving
+ *  it does not close the Popover. Focus a descendant when opening and
+ *  handle focus leaving the content in the application. Defaults to `false`. */
 export type InitConfig = Readonly<{
     id: string;
     isAnimated?: boolean;
@@ -166,6 +177,8 @@ export declare const update: (model: Model, message: Message) => Readonly<{
         readonly _tag: "PressedPointerOnButton";
         readonly pointerType: string;
         readonly button: number;
+    } | {
+        readonly _tag: "ClickedButton";
     } | {
         readonly _tag: "IgnoredMouseClick";
     } | {
@@ -237,7 +250,8 @@ export declare const PortalPopoverBackdrop: Mount.MountDefinitionNoArgs<"PortalP
     readonly _tag: "CompletedPortalPopoverBackdrop";
 }>;
 /** Programmatically opens the Popover, updating the Model and returning
- *  focus and modal Commands plus an `Opened` OutMessage. */
+ *  focus and modal Commands plus an `Opened` OutMessage. When it is already
+ *  open, it is a no-op: no Commands and no OutMessage. */
 export declare const open: (model: Model) => UpdateReturn;
 /** Programmatically closes the popover. When it was open, updates the Model
  *  and returns focus and modal Commands plus a `Closed` OutMessage. When it
@@ -248,7 +262,7 @@ export declare const close: (model: Model) => UpdateReturn;
  *  - `button`: attribute bundle for the trigger button.
  *  - `panel`: attribute bundle for the floating panel. Includes the
  *    anchor Mount that positions the panel via Floating UI, ARIA
- *    linkage to the button, and panel keydown/blur handlers.
+ *    linkage to the button, and panel keydown and focus-leave handlers.
  *  - `backdrop`: attribute bundle for the modal backdrop. Includes the
  *    portal Mount that moves the backdrop to document.body. Inside a
  *    `<dialog>`, it moves the backdrop to directly before the element it
@@ -303,6 +317,8 @@ export declare const view: import("foldkit/submodel").View<{
     readonly _tag: "PressedPointerOnButton";
     readonly pointerType: string;
     readonly button: number;
+} | {
+    readonly _tag: "ClickedButton";
 } | {
     readonly _tag: "IgnoredMouseClick";
 } | {

package/dist/popover/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/popover/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/popover/index.ts"],"names":[],"mappings":"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"}

package/dist/popover/index.js

@@ -43,6 +43,7 @@ export const Message = defineMessageUnion({
     CompletedUnlockScroll: {},
     CompletedInertOthers: {},
     CompletedRestoreInert: {},
+    ClickedButton: {},
     IgnoredMouseClick: {},
     SuppressedSpaceScroll: {},
     CompletedAnchorPopover: {},
@@ -174,6 +175,9 @@ export const update = (model, message) => {
     ];
     const closeWithoutFocusCommands = Array.getSomes([maybeUnlockScroll, maybeRestoreInert]);
     const openPopover = (baseModel) => {
+        if (baseModel.isOpen) {
+            return __foldkitBrandViewResult(({ model: baseModel }), "@foldkit/ui/popover/index.js#openPopover");
+        }
         if (model.isAnimated) {
             const popoverOpen = Update.combine(baseModel, [
                 stepModel => (__foldkitBrandViewResult(({ model: stepModel, commands: openCommands }), "@foldkit/ui/popover/index.js#anonymous~3")),
@@ -253,6 +257,19 @@ export const update = (model, message) => {
         SuppressedSpaceScroll: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/popover/index.js#SuppressedSpaceScroll")),
         CompletedAnchorPopover: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/popover/index.js#CompletedAnchorPopover")),
         CompletedPortalPopoverBackdrop: () => (__foldkitBrandViewResult(({ model }), "@foldkit/ui/popover/index.js#CompletedPortalPopoverBackdrop")),
+        ClickedButton: () => {
+            if (Option.exists(model.maybeLastButtonPointerType, Equal.equals('mouse'))) {
+                return __foldkitBrandViewResult(({
+                    model: modifyFields(model, {
+                        maybeLastButtonPointerType: () => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/popover/index.js#maybeLastButtonPointerType~5"),
+                    }),
+                }), "@foldkit/ui/popover/index.js#ClickedButton");
+            }
+            if (model.isOpen) {
+                return __foldkitBrandViewResult((closePopover(model, closeWithFocusCommands)), "@foldkit/ui/popover/index.js#ClickedButton");
+            }
+            return __foldkitBrandViewResult((openPopover(model)), "@foldkit/ui/popover/index.js#ClickedButton");
+        },
     })), "@foldkit/ui/popover/index.js#update");
 };
 /** The anchor-positioning Mount this Popover renders on its panel. Exposed so
@@ -291,7 +308,8 @@ export const PortalPopoverBackdrop = Mount.define('PortalPopoverBackdrop', {
     })), "@foldkit/ui/popover/index.js#execute~7"),
 });
 /** Programmatically opens the Popover, updating the Model and returning
- *  focus and modal Commands plus an `Opened` OutMessage. */
+ *  focus and modal Commands plus an `Opened` OutMessage. When it is already
+ *  open, it is a no-op: no Commands and no OutMessage. */
 export const open = (model) => __foldkitBrandViewResult((update(model, Message.RequestedOpen())), "@foldkit/ui/popover/index.js#open");
 /** Programmatically closes the popover. When it was open, updates the Model
  *  and returns focus and modal Commands plus a `Closed` OutMessage. When it
@@ -299,7 +317,7 @@ export const open = (model) => __foldkitBrandViewResult((update(model, Message.R
 export const close = (model) => __foldkitBrandViewResult((update(model, Message.RequestedClose())), "@foldkit/ui/popover/index.js#close");
 /** Renders a headless popover with a trigger button and a floating panel. */
 export const view = defineView((model, viewInputs, h) => {
-    const { id, isOpen, contentFocus, animation: { transitionState }, maybeLastButtonPointerType, } = model;
+    const { id, isOpen, contentFocus, animation: { transitionState }, } = model;
     const { anchor, toView, isDisabled, focusSelector, arrowPadding, ariaLabel, ariaLabelledBy, } = viewInputs;
     const isLeaving = transitionState === 'LeaveStart' || transitionState === 'LeaveAnimating';
     const isVisible = isOpen || isLeaving;
@@ -320,20 +338,8 @@ export const view = defineView((model, viewInputs, h) => {
     ]), "@foldkit/ui/popover/index.js#anonymous~18")), Match.orElse(() => __foldkitBrandViewResult(([]), "@foldkit/ui/popover/index.js#anonymous~19")));
     const handleButtonKeyDown = (key) => __foldkitBrandViewResult((Match.value(key).pipe(Match.whenOr('Enter', ' ', 'ArrowDown', () => __foldkitBrandViewResult((Option.some(isOpen ? Message.RequestedClose() : Message.RequestedOpen())), "@foldkit/ui/popover/index.js#anonymous~20")), Match.when('Escape', () => __foldkitBrandViewResult((OptionExt.when(isOpen, Message.RequestedClose())), "@foldkit/ui/popover/index.js#anonymous~21")), Match.orElse(() => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/popover/index.js#anonymous~22")))), "@foldkit/ui/popover/index.js#handleButtonKeyDown");
     const handleButtonPointerDown = (pointerType, button) => __foldkitBrandViewResult((Option.some(Message.PressedPointerOnButton({ pointerType, button }))), "@foldkit/ui/popover/index.js#handleButtonPointerDown");
-    const handleButtonClick = () => {
-        const isMouse = Option.exists(maybeLastButtonPointerType, type => __foldkitBrandViewResult((type === 'mouse'), "@foldkit/ui/popover/index.js#anonymous~23"));
-        if (isMouse) {
-            return __foldkitBrandViewResult((Message.IgnoredMouseClick()), "@foldkit/ui/popover/index.js#handleButtonClick");
-        }
-        else if (isOpen) {
-            return __foldkitBrandViewResult((Message.RequestedClose()), "@foldkit/ui/popover/index.js#handleButtonClick");
-        }
-        else {
-            return __foldkitBrandViewResult((Message.RequestedOpen()), "@foldkit/ui/popover/index.js#handleButtonClick");
-        }
-    };
     const handleSpaceKeyUp = (key) => __foldkitBrandViewResult((OptionExt.when(key === ' ', Message.SuppressedSpaceScroll())), "@foldkit/ui/popover/index.js#handleSpaceKeyUp");
-    const handlePanelKeyDown = (key) => __foldkitBrandViewResult((Match.value(key).pipe(Match.when('Escape', () => __foldkitBrandViewResult((Option.some(Message.RequestedClose())), "@foldkit/ui/popover/index.js#anonymous~24")), Match.orElse(() => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/popover/index.js#anonymous~25")))), "@foldkit/ui/popover/index.js#handlePanelKeyDown");
+    const handlePanelKeyDown = (key) => __foldkitBrandViewResult((Match.value(key).pipe(Match.when('Escape', () => __foldkitBrandViewResult((Option.some(Message.RequestedClose())), "@foldkit/ui/popover/index.js#anonymous~23")), Match.orElse(() => __foldkitBrandViewResult((Option.none()), "@foldkit/ui/popover/index.js#anonymous~24")))), "@foldkit/ui/popover/index.js#handlePanelKeyDown");
     const resolveButtonLabel = () => {
         if (Predicate.isNotUndefined(ariaLabel)) {
             return __foldkitBrandViewResult(([h.AriaLabel(ariaLabel)]), "@foldkit/ui/popover/index.js#resolveButtonLabel");
@@ -358,7 +364,7 @@ export const view = defineView((model, viewInputs, h) => {
                 h.OnPointerDown(handleButtonPointerDown),
                 h.OnKeyDownPreventDefault(handleButtonKeyDown),
                 h.OnKeyUpPreventDefault(handleSpaceKeyUp),
-                h.OnClick(handleButtonClick()),
+                h.OnClick(Message.ClickedButton()),
             ]),
         ...(isVisible
             ? [
@@ -383,7 +389,7 @@ export const view = defineView((model, viewInputs, h) => {
             ? []
             : [
                 h.OnKeyDownPreventDefault(handlePanelKeyDown),
-                ...(contentFocus ? [] : [h.OnBlur(Message.BlurredPanel())]),
+                ...(contentFocus ? [] : [h.OnFocusLeave(Message.BlurredPanel())]),
             ]),
     ];
     const backdropAttributes = [

package/dist/popover/public.d.ts

@@ -1,4 +1,4 @@
-export { init, update, open, close, view, buttonId, arrowId, Model, Message, OutMessage, type Opened, type Closed, type RequestedOpen, type RequestedClose, AnchorPopover, PortalPopoverBackdrop, LockScroll, UnlockScroll, InertOthers, RestoreInert, FocusPanel, FocusButton, DetectMovementOrAnimationEnd, type BlurredPanel, type PressedPointerOnButton, type IgnoredMouseClick, type SuppressedSpaceScroll, } from './index.js';
+export { init, update, open, close, view, buttonId, arrowId, Model, Message, OutMessage, type Opened, type Closed, type RequestedOpen, type RequestedClose, AnchorPopover, PortalPopoverBackdrop, LockScroll, UnlockScroll, InertOthers, RestoreInert, FocusPanel, FocusButton, DetectMovementOrAnimationEnd, type BlurredPanel, type PressedPointerOnButton, type ClickedButton, type IgnoredMouseClick, type SuppressedSpaceScroll, } from './index.js';
 export type { InitConfig, ViewInputs, RenderInfo } from './index.js';
 export type { AnchorConfig } from '../anchor/index.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/popover/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/popover/public.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,UAAU,EACV,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,aAAa,EACb,qBAAqB,EACrB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,4BAA4B,EAC5B,KAAK,YAAY,EACjB,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAA;AAEnB,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEpE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/popover/public.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,UAAU,EACV,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,aAAa,EACb,qBAAqB,EACrB,UAAU,EACV,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,4BAA4B,EAC5B,KAAK,YAAY,EACjB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAA;AAEnB,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEpE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/test/apps/disabledButton.d.ts

@@ -71,10 +71,6 @@ export declare const update: (model: Model, message: Message) => Readonly<{
     } | {
         readonly _tag: "GotDialogMessage";
         readonly message: {
-            readonly _tag: "RequestedClose";
-        } | {
-            readonly _tag: "RequestedOpen";
-        } | {
             readonly _tag: "CompletedCloseDialog";
         } | {
             readonly _tag: "CompletedReleaseDialogResources";
@@ -95,6 +91,10 @@ export declare const update: (model: Model, message: Message) => Readonly<{
             } | {
                 readonly _tag: "Showed";
             };
+        } | {
+            readonly _tag: "RequestedClose";
+        } | {
+            readonly _tag: "RequestedOpen";
         } | {
             readonly _tag: "SucceededAcquireResources";
         } | {

package/dist/toast/index.d.ts

@@ -314,6 +314,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly threshold: number;
         }>;
     }, message: {
+        readonly _tag: "DismissedAll";
+    } | {
+        readonly _tag: "PressedEscape";
+    } | {
         readonly _tag: "Added";
         readonly entry: {
             readonly id: string;
@@ -392,10 +396,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
         readonly _tag: "ReleasedSwipePointer";
         readonly pointerId: number;
         readonly clientX: number;
-    } | {
-        readonly _tag: "DismissedAll";
-    } | {
-        readonly _tag: "PressedEscape";
     }) => Readonly<{
         model: {
             readonly id: string;
@@ -437,6 +437,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             }>;
         };
         commands?: import("foldkit/update").Commands<{
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -515,10 +519,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, never>;
         outMessage?: {
             readonly _tag: "DismissedToast";
@@ -609,6 +609,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             }>;
         };
         commands?: import("foldkit/update").Commands<{
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -687,10 +691,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, never>;
         outMessage?: {
             readonly _tag: "DismissedToast";
@@ -776,6 +776,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             }>;
         };
         commands?: import("foldkit/update").Commands<{
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -854,10 +858,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, never>;
         outMessage?: {
             readonly _tag: "DismissedToast";
@@ -943,6 +943,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             }>;
         };
         commands?: import("foldkit/update").Commands<{
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -1021,10 +1025,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, never>;
         outMessage?: {
             readonly _tag: "DismissedToast";
@@ -1071,6 +1071,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
                 readonly threshold: number;
             }>;
         }, {
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -1149,10 +1153,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, {
             readonly isSwipeEnabled: boolean;
             readonly isAnyDragging: boolean;
@@ -1198,6 +1198,10 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
                 readonly threshold: number;
             }>;
         }, {
+            readonly _tag: "DismissedAll";
+        } | {
+            readonly _tag: "PressedEscape";
+        } | {
             readonly _tag: "Added";
             readonly entry: {
                 readonly id: string;
@@ -1276,10 +1280,6 @@ export declare const make: <A, I>(payloadSchema: Schema.Codec<A, I>) => {
             readonly _tag: "ReleasedSwipePointer";
             readonly pointerId: number;
             readonly clientX: number;
-        } | {
-            readonly _tag: "DismissedAll";
-        } | {
-            readonly _tag: "PressedEscape";
         }, {
             readonly isSwipeEnabled: boolean;
             readonly isAnyDragging: boolean;

package/dist/tooltip/tooltip.d.ts

@@ -103,8 +103,6 @@ export declare const view: import("foldkit/submodel").View<{
     readonly pendingShowVersion: number;
     readonly maybeLastPointerType: Option.Option<string>;
 }, {
-    readonly _tag: "PressedEscape";
-} | {
     readonly _tag: "CompletedWaitBeforeShowing";
     readonly version: number;
 } | {
@@ -117,6 +115,8 @@ export declare const view: import("foldkit/submodel").View<{
     readonly _tag: "FocusedTrigger";
 } | {
     readonly _tag: "LeftTrigger";
+} | {
+    readonly _tag: "PressedEscape";
 } | {
     readonly _tag: "PressedPointerOnTrigger";
     readonly pointerType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foldkit/ui",
-  "version": "0.168.0",
+  "version": "0.169.0-canary.7ee214268c60",
   "description": "Headless, accessible UI components for Foldkit",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,16 +134,16 @@
   ],
   "peerDependencies": {
     "effect": "4.0.0",
-    "foldkit": ">=0.167.0"
+    "foldkit": "0.169.0-canary.7ee214268c60"
   },
   "dependencies": {
     "@floating-ui/dom": "^1.8.0"
   },
   "devDependencies": {
     "@effect/vitest": "4.0.0",
-    "@foldkit/vite-plugin": "0.27.1",
+    "@foldkit/vite-plugin": "0.28.0-canary.7ee214268c60",
     "effect": "4.0.0",
-    "foldkit": "0.168.0",
+    "foldkit": "0.169.0-canary.7ee214268c60",
     "happy-dom": "^20.14.5",
     "rimraf": "^6.1.3",
     "typescript": "^7.0.2",