@domicile-desktop/component-library 0.0.0-alpha-321ecd608c5d → 0.0.0-alpha-2c643f7c4b7b

package/package.json

@@ -2,8 +2,8 @@
   "dependencies": {
     "@base-ui/react": "^1.8.0",
     "@cprussin/option-result": "^2.0.1",
-    "@domicile-desktop/sdk": "0.0.0-alpha-321ecd608c5d",
-    "@domicile-desktop/system-apps": "0.0.0-alpha-321ecd608c5d",
+    "@domicile-desktop/sdk": "0.0.0-alpha-2c643f7c4b7b",
+    "@domicile-desktop/system-apps": "0.0.0-alpha-2c643f7c4b7b",
     "@phosphor-icons/react": "^2.1.10"
   },
   "description": "React components and the Panda CSS design system that Domicile's shells are built from.",
@@ -104,5 +104,5 @@
     "test:unit": "bun test"
   },
   "type": "module",
-  "version": "0.0.0-alpha-321ecd608c5d"
+  "version": "0.0.0-alpha-2c643f7c4b7b"
 }

package/src/ModalDialog/ModalDialog.tsx

@@ -1,6 +1,11 @@
 import { Dialog as BaseDialog } from "@base-ui/react/dialog";
 import { XIcon } from "@phosphor-icons/react/dist/ssr/X";
-import type { ComponentProps, ReactElement, ReactNode } from "react";
+import type {
+  ComponentProps,
+  KeyboardEvent,
+  ReactElement,
+  ReactNode,
+} from "react";
 import { css, cva } from "../../styled-system/css";
 import { center, flex, hstack } from "../../styled-system/patterns";
 import { Button } from "../Button/Button";
@@ -105,6 +110,7 @@ const ModalDialogComponent = ({
               data-placement={placement}
               data-size={size}
               data-surface={surface}
+              onKeyDown={moveFooterFocus}
             >
               {title !== undefined && (
                 <header
@@ -324,3 +330,45 @@ const footerStyles = hstack({
   paddingBlockStart: 3,
   paddingInline: 4,
 });
+
+/**
+ * Moves focus between the footer's enabled buttons on Left, Right, Home and
+ * End, when one of them has focus. Left and Right wrap. Focus only moves, so
+ * no key here answers a dialog.
+ */
+const moveFooterFocus = (event: KeyboardEvent<HTMLElement>) => {
+  const buttons = [
+    ...event.currentTarget.querySelectorAll<HTMLButtonElement>(
+      ":scope > footer button:not(:disabled)",
+    ),
+  ];
+  const targets: readonly EventTarget[] = buttons;
+  const index = targets.indexOf(event.target);
+  if (index !== -1) {
+    const target = footerKeyTarget(event.key, buttons, index);
+    if (target !== undefined) {
+      event.preventDefault();
+      target.focus();
+    }
+  }
+};
+
+/** The button `key` moves to from `buttons[index]`, or `undefined` for other keys. */
+const footerKeyTarget = (
+  key: string,
+  buttons: HTMLButtonElement[],
+  index: number,
+): HTMLButtonElement | undefined => {
+  switch (key) {
+    case "ArrowLeft":
+      return buttons.at(index - 1);
+    case "ArrowRight":
+      return buttons.at((index + 1) % buttons.length);
+    case "Home":
+      return buttons.at(0);
+    case "End":
+      return buttons.at(-1);
+    default:
+      return undefined;
+  }
+};