@multiplatform.one/forms 7.28.1 → 7.29.0

package/dist/jsx/shared/focusManagement.mjs

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from "react";
-import { isWeb } from "tamagui";
+import { isWeb, useDialogContext } from "tamagui";
 import { wasKeyboardFocus } from "@multiplatform.one/theme";
 const FOCUSABLE = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';
 const canUseDom = () => isWeb && typeof document !== "undefined";
@@ -103,5 +103,31 @@ function useSheetModalFocus(open, frameRef, skipReturnFocusRef) {
     };
   }, [open, frameRef, prevRef, generationRef, skipReturnFocusRef]);
 }
-export { useReturnFocusOnClose, useSheetModalFocus };
+const DIALOG_SHOW_FOCUS_EVENT = "mp.dialogShowFocus";
+function useDialogShowFocus(onOpenAutoFocus) {
+  const {
+    open,
+    contentId
+  } = useDialogContext();
+  useEffect(() => {
+    if (!open || !contentId || !canUseDom()) return;
+    const content = document.getElementById(contentId);
+    const focused = document.activeElement;
+    if (!content || !(focused instanceof HTMLElement)) return;
+    if (!content.contains(focused) || focused.tabIndex >= 0) return;
+    content.addEventListener(DIALOG_SHOW_FOCUS_EVENT, onOpenAutoFocus, {
+      once: true
+    });
+    content.dispatchEvent(new CustomEvent(DIALOG_SHOW_FOCUS_EVENT, {
+      cancelable: true
+    }));
+  }, [open, contentId]);
+}
+function DialogShowFocus({
+  onOpenAutoFocus
+}) {
+  useDialogShowFocus(onOpenAutoFocus);
+  return null;
+}
+export { DialogShowFocus, useDialogShowFocus, useReturnFocusOnClose, useSheetModalFocus };
 //# sourceMappingURL=focusManagement.mjs.map

package/dist/jsx/shared/focusManagement.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","isWeb","wasKeyboardFocus","FOCUSABLE","canUseDom","document","focusIsDropped","insideEl","ae","activeElement","body","documentElement","contains","useCaptureOnOpen","open","prevRef","wasOpenRef","generationRef","current","restoreLater","insideRef","skipReturnFocusRef","generation","restore","target","isConnected","focus","preventScroll","focusVisible","requestAnimationFrame","setTimeout","useReturnFocusOnClose","useSheetModalFocus","frameRef","frame","addEventListener","focusIn","first","querySelector","innerRaf","raf","onKeyDown","e","key","focusables","Array","from","querySelectorAll","filter","el","offsetWidth","offsetHeight","length","preventDefault","last","shiftKey","cancelAnimationFrame","removeEventListener"],"sources":["../../../src/shared/focusManagement.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","isWeb","useDialogContext","wasKeyboardFocus","FOCUSABLE","canUseDom","document","focusIsDropped","insideEl","ae","activeElement","body","documentElement","contains","useCaptureOnOpen","open","prevRef","wasOpenRef","generationRef","current","restoreLater","insideRef","skipReturnFocusRef","generation","restore","target","isConnected","focus","preventScroll","focusVisible","requestAnimationFrame","setTimeout","useReturnFocusOnClose","useSheetModalFocus","frameRef","frame","addEventListener","focusIn","first","querySelector","innerRaf","raf","onKeyDown","e","key","focusables","Array","from","querySelectorAll","filter","el","offsetWidth","offsetHeight","length","preventDefault","last","shiftKey","cancelAnimationFrame","removeEventListener","DIALOG_SHOW_FOCUS_EVENT","useDialogShowFocus","onOpenAutoFocus","contentId","content","getElementById","focused","HTMLElement","tabIndex","once","dispatchEvent","CustomEvent","cancelable","DialogShowFocus"],"sources":["../../../src/shared/focusManagement.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/shared/focusManagement.native.js

@@ -24,6 +24,8 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var focusManagement_exports = {};
 __export(focusManagement_exports, {
+  DialogShowFocus: () => DialogShowFocus,
+  useDialogShowFocus: () => useDialogShowFocus,
   useReturnFocusOnClose: () => useReturnFocusOnClose,
   useSheetModalFocus: () => useSheetModalFocus
 });
@@ -31,6 +33,15 @@ module.exports = __toCommonJS(focusManagement_exports);
 var import_react = require("react");
 var import_tamagui = require("tamagui");
 var import_theme = require("@multiplatform.one/theme");
+function _instanceof(left, right) {
+  "@swc/helpers - instanceof";
+
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
+}
 var FOCUSABLE = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';
 var canUseDom = function canUseDom2() {
   return import_tamagui.isWeb && typeof document !== "undefined";
@@ -144,4 +155,31 @@ function useSheetModalFocus(open, frameRef, skipReturnFocusRef) {
     };
   }, [open, frameRef, prevRef, generationRef, skipReturnFocusRef]);
 }
+var DIALOG_SHOW_FOCUS_EVENT = "mp.dialogShowFocus";
+function useDialogShowFocus(onOpenAutoFocus) {
+  var {
+    open,
+    contentId
+  } = (0, import_tamagui.useDialogContext)();
+  (0, import_react.useEffect)(function () {
+    if (!open || !contentId || !canUseDom()) return;
+    var content = document.getElementById(contentId);
+    var focused = document.activeElement;
+    if (!content || !_instanceof(focused, HTMLElement)) return;
+    if (!content.contains(focused) || focused.tabIndex >= 0) return;
+    content.addEventListener(DIALOG_SHOW_FOCUS_EVENT, onOpenAutoFocus, {
+      once: true
+    });
+    content.dispatchEvent(new CustomEvent(DIALOG_SHOW_FOCUS_EVENT, {
+      cancelable: true
+    }));
+  }, [open, contentId]);
+}
+function DialogShowFocus(param) {
+  var {
+    onOpenAutoFocus
+  } = param;
+  useDialogShowFocus(onOpenAutoFocus);
+  return null;
+}
 //# sourceMappingURL=focusManagement.native.js.map

package/dist/jsx/shared/focusManagement.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","focusManagement_exports","useReturnFocusOnClose","useSheetModalFocus","module","exports","import_react","require","import_tamagui","import_theme","FOCUSABLE","canUseDom","canUseDom2","isWeb","document","focusIsDropped","insideEl","ae","activeElement","body","documentElement","contains","useCaptureOnOpen","open","prevRef","useRef","wasOpenRef","generationRef","current","restoreLater","insideRef","skipReturnFocusRef","generation","restore","restore2","_ref","isConnected","focus","preventScroll","focusVisible","wasKeyboardFocus","requestAnimationFrame","setTimeout","useEffect","frameRef","frame","addEventListener"],"sources":["../../../src/shared/focusManagement.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","focusManagement_exports","DialogShowFocus","useDialogShowFocus","useReturnFocusOnClose","useSheetModalFocus","module","exports","import_react","require","import_tamagui","import_theme","_instanceof","left","right","Symbol","hasInstance","FOCUSABLE","canUseDom","canUseDom2","isWeb","document","focusIsDropped","insideEl","ae","activeElement","body","documentElement","contains","useCaptureOnOpen","open","prevRef","useRef","wasOpenRef","generationRef","current","restoreLater","insideRef","skipReturnFocusRef","generation","restore","restore2","_ref","isConnected","focus","preventScroll","focusVisible","wasKeyboardFocus","requestAnimationFrame","setTimeout","useEffect","frameRef","frame","addEventListener","focusIn","focusIn2","first","querySelector"],"sources":["../../../src/shared/focusManagement.ts"],"sourcesContent":[null],"mappings":"AAoCA,YAAS;;AACT,IAAAA,SAAS,GAAOC,MAAA,CAAAC,cAAA;AAChB,IAAAC,gBAAS,GAAAF,MAAA,CAAAG,wBAAwB;AAEjC,IAAAC,iBACE,GAAAJ,MAAA,CAAAK,mBAAA;AAEF,IAAAC,YAAM,GAAYN,MAAM,CAAAO,SAAS,CAAAC,cAAO;AAExC,IAAAC,QAAS,GAAAA,CAAAC,MAAA,EAAeC,GAAA;EACtB,SAAMC,IAAK,IAAAD,GAAS,EACpBZ,SAAW,CAAAW,MAAO,EAAAE,IAAA;IAASC,GAAA,EAAAF,GAAQ,CAAAC,IAAA,CAAO;IAAAE,UAAS;EAAA;AAGnD;AACA,IAAAC,WAAO,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;EACT,IAAAF,IAAA,WAAAA,IAAA,wBAAAA,IAAA;IAGA,KAAS,IAAAG,GAAA,IAAAhB,iBAAgC,CAAAa,IAAA,GACvC,IAAM,CAAAX,YAAU,CAAAe,IAA2B,CAAIL,EAAA,EAAAI,GAAA,KAAAA,GAAA,KAAAF,MAAA,EACzCnB,SAAA,CAAAiB,EAAA,EAAaI,GAAA;MAAOP,GAAA,EAAKA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAjB,gBAAA,CAAAe,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EAC/B;EACA,OAAIE,EAAA;AACF;AACA,IAAAM,YAAY,GAACC,GAAA,IAAWR,WAAS,CAAAhB,SAAA;EAAAyB,KAAA;AAAA,IAAAD,GAAA;AAC/B,IAAAE,uBAAkB;AAAShB,QAC7B,CAAAgB,uBAAA;EACAC,eAAW,EAAAA,CAAA,KAAUA,eAAA;EACvBC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EACAC,qBAAkB,EAAAA,CAAA,KAAAA,qBAAc;EAClCC,kBAAA,EAAAA,CAAA,KAAAA;AAEA;AAMEC,MAAA,CAAAC,OAAM,GAAAT,YAAa,CAAAG,uBAAc;AACjC,IAAAO,YAAM,GAAUC,OAAM;AAIpB,IAAAC,cAAK,GAAaD,OAAA;AAClB,IAAAE,YAAI,GAAAF,OAAA,2BAA6C;AACjD,SAAAG,WAAeA,CAAAC,IAAA,EAAQC,KAAA;EACvB,2BAAuB;;EACvB,IAAAA,KAAI,YAAe,OAAAC,MAAW,gBAAkB,IAAAD,KAAA,CAAAC,MAAA,CAAAC,WAAA;IAC9C,SAAOF,KAAA,CAAMC,MAAA,CAAAC,WAAA,EAAAH,IAAA;EAAA,OACX;IAAe,OACfA,IAAA,YAAcC,KAAA;EAAiB;AAChB;AACnB,IACFG,SAAA;AAGA,IAAAC,SAAA,YAAsBC,UAAMA,CAAA;EAC5B,OAAAT,cAAoB,CAAAU,KAAG,WAAAC,QAAA;AACzB;AAGO,SAASC,eAAAC,QAAsB;EACpC,IAAAC,EAAM,GAAEH,QAAS,CAAAI,aAAc;EAC/B,KAAAD,EAAA,IAAUA,EAAA,KAAMH,QAAA,CAAAK,IAAA,IAAAF,EAAA,KAAAH,QAAA,CAAAM,eAAA;EACd,IAAAJ,QAAK,KAAU,QAAMA,QAAM,uBAAAA,QAAA,CAAAK,QAAA,CAAAJ,EAAA;EAC3B,YAAO;AAAwE;AAEnF,SAAAK,iBAAAC,IAAA;EAQO,IAAAC,OAAS,OAAAvB,YACd,CAAAwB,MACA,MACA;EAEA,IAAAC,UAAQ,GAAS,IAAAzB,YAAc,CAAAwB,MAAI;EACnC,IAAAE,aAAgB,OAAA1B,YAAA,CAAAwB,MAAA;EACd,IAAAd,SAAK,IAAU;IACf,IAAAY,IAAM,KAAAG,UAAiB,CAAAE,OAAA,EAAAD,aAAA,CAAAC,OAAA;IACvB,IAAIL,IAAC,KAAAG,UAAgB,CAAAE,OAAM;MACzBJ,OAAO,CAAAI,OAAM,GAAAd,QAAa,CAAAI,aAAS;IACrC;IAGAQ,UAAM,CAAAE,OAAU,GAAAL,IAAM;EACpB;EACA;IACAC,OAAA;IACAG;EAAmF;AAIrF;AACA,SAAAE,YAAYA,CAAAL,OAAA,EAAAG,aAA4B,EAAAG,SAAA,EAAAC,kBAAA;EACtC,IAAAC,UAAA,GAAWL,aAAA,CAAAC,OAAsB;EAAO,IACzCK,OAAA,YAAAC,SAAA;IAGD,IAAAC,IAAM;IACJ,KAAAxB,SAAM,EAAQ;IACd,KAAAoB,kBAAmB,KAAM,IAAK,IAAAA,kBAAM,KAA8B,KAAS,CAAC,GAAE,SAAAA,kBAAA,CAAAH,OAAA,KAAAD,aAAA,CAAAC,OAAA,KAAAI,UAAA;IAAA,IAC5ErD,MAAC,GAAO6C,OAAG,CAAAI,OAAA;IAAqC,IAClD,CAAAjD,MAAA,KAAAA,MAAA,CAAAyD,WAAA;IACA,IAAArB,cAAgB,EAAAoB,IAAA,GAAQL,SAAA,aAAAA,SAAA,uBAAAA,SAAA,CAAAF,OAAA,cAAAO,IAAA,cAAAA,IAAA;MACtBxD,MAAE,CAAA0D,KAAA;QACFC,aAAA;QACFC,YAAA,MAAAnC,YAAA,CAAAoC,gBAAA;MACA;IACA;EACA;EACAC,qBAAM,aAAa;IACjB,OAAEA,qBAAe,CAAAR,OAAA;EACjB;EAAWS,UACb,CAAAT,OAAc;AACZ;AACA,SAAApC,qBAAYA,CAAA0B,IAAA,EAAAQ,kBAAA;EAAA,IACd;IAAAP,OAAA;IAAAG;EAAA,IAAAL,gBAAA,CAAAC,IAAA;EAAA,EACF,EAAAtB,YAAA,CAAA0C,SAAA;IACA,KAAAhC,SAAM,OAAAY,IAAiB;IACvB,OAAO,YAAM;MACX,OAAAM,YAAA,CAAAL,OAAwB,EAAAG,aAAA,UAAAI,kBAAA;IACxB;EACA,IACAR,IAAA,EACFC,OAAA,EACFG,aAAU,EACZI,kBAAA,CAEA;AAaO;AACL,SAAMjC,kBAAkBA,CAAAyB,IAAI,EAAAqB,QAAA,EAAAb,kBAAiB;EAC7C;IAAAP,OAAU;IAAAG;EAAM,IAAAL,gBAAA,CAAAC,IAAA;EACd,IAAAtB,YAAc,CAAA0C,SAAA,cAAc;IAC5B,KAAAhC,SAAM,EAAU,KAAAY,IAAS;IACzB,IAAAsB,KAAM,GAAAD,QAAU,CAAAhB,OAAS;IACzB,IAAI,CAACiB,KAAA,WAAaA,KAAA,CAAAC,gBAAmB,eAAc;MACnD,OAAK,YAAQ;QACb,OAAQjB,YAAA,CAAAL,OAAiB,EAAAG,aAAA,EAAAiB,QAAyB,EAAAb,kBAAyB;MAC3E;IACF;IACF,IAAAgB,OAAA,YAAAC,SAAA;MAGO,IAAS,CAAArC,SAAA;MACd,IAAAkC,KAAA,CAAAxB,QAAA,CAAAP,QAAA,CAAAI,aAAA;MAGO,IAAA+B,KAAA,GAAAJ,KAAA,CAAAK,aAAA,CAAAxC,SAAA;MACP,CAAAuC,KAAA,SAAmB,IAAAA,KAAA,UAAe,IAAAA,KAAA,GAAAJ,KAAA,EAAAR,KAAA;QAClCC,aAAO;QACTC,YAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/forms",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "Cross-platform form components with URL state management",
   "keywords": [
     "cross-platform",
@@ -57,10 +57,10 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.19",
-    "@multiplatform.one/platform": "7.28.1",
-    "@multiplatform.one/router": "7.28.1",
-    "@multiplatform.one/table-primitives": "7.28.1",
-    "@multiplatform.one/theme": "7.28.1",
+    "@multiplatform.one/platform": "7.29.0",
+    "@multiplatform.one/router": "7.29.0",
+    "@multiplatform.one/table-primitives": "7.29.0",
+    "@multiplatform.one/theme": "7.29.0",
     "@phosphor-icons/react": "^2.1.10",
     "@tamagui/get-font-sized": "2.7.6",
     "@tamagui/get-token": "2.7.6",
@@ -79,9 +79,9 @@
     "tamagui": "2.7.6"
   },
   "devDependencies": {
-    "@multiplatform.one/config": "7.28.1",
-    "@multiplatform.one/storybook": "7.28.1",
-    "@multiplatform.one/test-utils": "7.28.1",
+    "@multiplatform.one/config": "7.29.0",
+    "@multiplatform.one/storybook": "7.29.0",
+    "@multiplatform.one/test-utils": "7.29.0",
     "@tamagui/build": "2.7.6",
     "@tamagui/config": "2.7.6",
     "@tamagui/vite-plugin": "2.7.6",

package/src/AdaptivePopup/AdaptivePopup.spec.tsx

@@ -1,10 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { fireEvent, waitFor } from "@testing-library/react";
-import { renderWithProviders } from "@multiplatform.one/test-utils";
+import { modelFirstFocusableShow, renderWithProviders } from "@multiplatform.one/test-utils";
 import { OVERLAY_BREAKPOINT } from "@multiplatform.one/theme";
 import { useState, type ReactNode } from "react";
 import { Text } from "tamagui";
 import { Button } from "../Button";
+import { Input } from "../fields/Input";
 import { AdaptivePopup, pickAdaptivePopupFace } from "./index";
 
 /**
@@ -418,3 +419,45 @@ describe("AdaptivePopup drawer contract (LC-48 / DG-OVL-01 / overlay ground)", (
     expect(surface()?.getAttribute("data-drawer-attached-radius")).toBe("0");
   });
 });
+
+// MPO-470: in Chromium and WebKit, <dialog>.show() focuses the first focusable
+// descendant, which here is the tabindex=-1 surface itself (Firefox and the HTML
+// spec take the first tab stop). FocusScope then saw focus inside and never ran
+// the popup's field focus, so typing right after open went nowhere. jsdom has
+// no show(), so modelFirstFocusableShow stands in for Chromium's.
+
+describe("AdaptivePopup open focus behind <dialog>.show() (MPO-470)", () => {
+  let restoreShow = () => {};
+  beforeEach(() => {
+    setViewportWidth(1440);
+    restoreShow = modelFirstFocusableShow();
+  });
+  afterEach(() => restoreShow());
+
+  function FieldPopup({ face }: { face: "dialog" | "drawer" }) {
+    const [open, setOpen] = useState(false);
+    return (
+      <AdaptivePopup
+        open={open}
+        onOpenChange={setOpen}
+        face={face}
+        title="Edit Profile"
+        trigger={<Button>Open Popup</Button>}
+      >
+        <Input inputProps={{ "aria-label": "Name" }} />
+      </AdaptivePopup>
+    );
+  }
+
+  it.each(["dialog", "drawer"] as const)(
+    "%s: moves focus off the surface onto the first field",
+    async (face) => {
+      const result = renderWithProviders(<FieldPopup face={face} />);
+      press(result.container.querySelector("[role='button']") as Element);
+      await waitFor(() => expect(surface()?.getAttribute("data-adaptive-popup-mode")).toBe(face));
+      const field = document.querySelector("input[aria-label='Name']");
+      expect(field).not.toBeNull();
+      await waitFor(() => expect(document.activeElement).toBe(field));
+    },
+  );
+});

package/src/AdaptivePopup/index.tsx

@@ -17,7 +17,11 @@ import {
 } from "tamagui";
 import { X } from "@tamagui/lucide-icons-2";
 import { formCommonColors } from "../shared/colorRamps";
-import { useReturnFocusOnClose, useSheetModalFocus } from "../shared/focusManagement";
+import {
+  DialogShowFocus,
+  useReturnFocusOnClose,
+  useSheetModalFocus,
+} from "../shared/focusManagement";
 import { useSheetEscapeDismiss } from "../shared/useSheetEscapeDismiss";
 import { zIndex } from "../shared/zIndex";
 import { useViewportGtSm } from "../FloatingPanel";
@@ -158,6 +162,16 @@ function PopupCloseButton({ onPress }: { onPress: () => void }) {
   );
 }
 
+function focusFirstField(event: Event) {
+  const root = event.currentTarget as HTMLElement | null;
+  const field = root?.querySelector<HTMLElement>(
+    "input, textarea, select, [contenteditable='true']",
+  );
+  if (!field) return;
+  event.preventDefault();
+  field.focus({ preventScroll: true });
+}
+
 export function AdaptivePopup({
   open,
   onOpenChange,
@@ -398,15 +412,7 @@ export function AdaptivePopup({
             enterStyle={{ opacity: 0, x: slideFromEnd }}
             exitStyle={{ opacity: 0, x: slideFromEnd }}
             {...knobProps.panelPadding}
-            onOpenAutoFocus={(event) => {
-              const root = event.currentTarget as unknown as HTMLElement | null;
-              const field = root?.querySelector<HTMLElement>(
-                "input, textarea, select, [contenteditable='true']",
-              );
-              if (!field) return;
-              event.preventDefault();
-              field.focus({ preventScroll: true });
-            }}
+            onOpenAutoFocus={focusFirstField}
             onCloseAutoFocus={(event) => {
               // LC-48: Dialog.Trigger is the wrapper View (tabIndex -1), not
               // the painted Button. Prevent Radix restoring there so
@@ -415,6 +421,7 @@ export function AdaptivePopup({
             }}
           >
             {body}
+            <DialogShowFocus onOpenAutoFocus={focusFirstField} />
           </Dialog.Content>
         </Dialog.Portal>
       </Dialog>
@@ -459,15 +466,7 @@ export function AdaptivePopup({
           maxHeight={maxHeight}
           width="90vw"
           {...knobProps.panelPadding}
-          onOpenAutoFocus={(event) => {
-            const root = event.currentTarget as unknown as HTMLElement | null;
-            const field = root?.querySelector<HTMLElement>(
-              "input, textarea, select, [contenteditable='true']",
-            );
-            if (!field) return;
-            event.preventDefault();
-            field.focus({ preventScroll: true });
-          }}
+          onOpenAutoFocus={focusFirstField}
           onCloseAutoFocus={(event) => {
             // LC-48: Dialog.Trigger is the wrapper View (tabIndex -1), not
             // the painted Button. Prevent Radix restoring there so
@@ -476,6 +475,7 @@ export function AdaptivePopup({
           }}
         >
           {body}
+          <DialogShowFocus onOpenAutoFocus={focusFirstField} />
         </Dialog.Content>
       </Dialog.Portal>
     </Dialog>

package/src/Button/Button.outlinedAccentInk.spec.tsx

@@ -0,0 +1,152 @@
+/**
+ * @vitest-environment jsdom
+ *
+ * MPO-447: under fillStyle outlined a `theme="accent"` Button (the portal's
+ * Sign in) sits on its host with no fill, and its label kept the accent
+ * sub-theme's on-fill `$color`, 1.06:1 on the light page. The accent slot is
+ * solid by palette shape (defaults/accent.ts), so no step of its own ramp
+ * reads on the page in both schemes; MPO-40 re-anchored only the solid
+ * intents (error, warning, success) to `$color11`. The label and the frame's
+ * `color` (currentColor glyphs) now take the host's readable accent ink.
+ *
+ * The `accent` intent stays filled under an outlined preset (SB-E-01,
+ * intents.ts), so the knob channel only reaches `theme="accent"`; an explicit
+ * `outlined` prop reaches both.
+ *
+ * jsdom cascades no Tamagui CSS, so this reads what the nodes ask for: the
+ * atomic `_col-` class, the injected rule behind it, and for a `var(--token)`
+ * rule the house theme table of the scope that paints it.
+ */
+
+import { cleanup, render, screen } from "@testing-library/react";
+import {
+  aaTextContrastRatio,
+  createDefaultThemeConfig,
+  createThemesBuilder,
+  defaultAccentTheme,
+  defaultBaseTheme,
+  defaultBuilderOptions,
+  measureContrast,
+  Preset,
+} from "@multiplatform.one/theme";
+import type { ReactElement } from "react";
+import { TamaguiProvider, YStack } from "tamagui";
+import { afterEach, describe, expect, it } from "vitest";
+import { Button, type ButtonProps } from "./index";
+
+afterEach(cleanup);
+
+const houseConfig = createDefaultThemeConfig();
+const houseThemes = createThemesBuilder(
+  defaultBaseTheme,
+  defaultAccentTheme,
+  defaultBuilderOptions,
+).themes() as Record<string, Record<string, string>>;
+
+const SCHEMES = ["light", "dark"] as const;
+type Scheme = (typeof SCHEMES)[number];
+const HOST_SURFACES = ["background", "color1", "color2"] as const;
+const CASES: { name: string; props: Partial<ButtonProps>; knob: boolean }[] = [
+  {
+    name: 'theme="accent" under the fillStyle outlined knob',
+    props: { theme: "accent" },
+    knob: true,
+  },
+  { name: 'theme="accent" outlined', props: { theme: "accent", outlined: true }, knob: false },
+  { name: "accent outlined", props: { accent: true, outlined: true }, knob: false },
+];
+
+function houseRender(ui: ReactElement, scheme: Scheme, knob: boolean) {
+  const body = <YStack backgroundColor="$background">{ui}</YStack>;
+  return render(
+    <TamaguiProvider config={houseConfig.tamagui} defaultTheme={scheme} disableInjectCSS>
+      {knob ? <Preset overrides={{ fillStyle: "outlined" }}>{body}</Preset> : body}
+    </TamaguiProvider>,
+  );
+}
+
+function injectedRuleValue(className: string, property: string): string {
+  for (const sheet of Array.from(document.styleSheets)) {
+    for (const rule of Array.from(sheet.cssRules)) {
+      if (!(rule instanceof CSSStyleRule)) continue;
+      if (!rule.selectorText.endsWith(`.${className}`)) continue;
+      const value = rule.style.getPropertyValue(property);
+      if (value) return value.trim();
+    }
+  }
+  throw new Error(`no injected ${property} rule for .${className}`);
+}
+
+/** The innermost Tamagui theme scope painting `el`, e.g. `accent_Button`. */
+function scopeOf(el: Element): string | null {
+  for (let node: Element | null = el; node; node = node.parentElement) {
+    const names = Array.from(node.classList)
+      .filter((c) => c.startsWith("t_") && c !== "t_sub_theme")
+      .map((c) => c.slice(2))
+      .filter((c) => c !== "light" && c !== "dark");
+    if (names.length) return names.sort((a, b) => b.length - a.length)[0];
+  }
+  return null;
+}
+
+function resolveInScope(value: string, scheme: Scheme, scope: string | null): string {
+  const token = value.match(/^var\(--([\w-]+)\)$/)?.[1];
+  if (!token) return value;
+  const chain: string[] = [];
+  if (scope) {
+    const parts = scope.split("_");
+    for (let i = parts.length; i > 0; i--) chain.push(`${scheme}_${parts.slice(0, i).join("_")}`);
+  }
+  chain.push(scheme);
+  for (const name of chain) {
+    const hit = houseThemes[name]?.[token];
+    if (hit) return hit;
+  }
+  throw new Error(`--${token} resolves in none of ${chain.join(", ")}`);
+}
+
+function paintedColor(el: Element, scheme: Scheme): string {
+  const cls = Array.from(el.classList).find(
+    (c) => c.startsWith("_col-") && !/^_col-0(hover|active|focus|press)/.test(c),
+  );
+  if (!cls) throw new Error(`${el.tagName} carries no _col- class`);
+  return resolveInScope(injectedRuleValue(cls, "color"), scheme, scopeOf(el));
+}
+
+describe("MPO-447: an outlined accent Button's label reads on its host", () => {
+  for (const scheme of SCHEMES) {
+    for (const c of CASES) {
+      it(`${scheme} ${c.name}: label and glyph ink clear 4.5:1 on every host surface`, () => {
+        houseRender(<Button {...c.props}>Sign in</Button>, scheme, c.knob);
+        const label = screen.getByText("Sign in");
+        const frame = label.closest("[role=button]") as Element;
+        for (const [part, el] of [
+          ["label", label],
+          ["frame", frame],
+        ] as const) {
+          const ink = paintedColor(el, scheme);
+          for (const surface of HOST_SURFACES) {
+            const ground = houseThemes[scheme][surface];
+            const ratio = measureContrast({ foreground: ink, background: ground }).ratio;
+            expect(
+              ratio,
+              `${part} ${ink} on ${scheme}.${surface} ${ground}: ${ratio.toFixed(2)}:1`,
+            ).toBeGreaterThanOrEqual(aaTextContrastRatio);
+          }
+        }
+      });
+    }
+  }
+
+  for (const scheme of SCHEMES) {
+    for (const c of [
+      { name: 'theme="accent"', props: { theme: "accent" }, knob: false },
+      { name: "accent under the fillStyle outlined knob", props: { accent: true }, knob: true },
+    ] as const) {
+      it(`${scheme}: a filled ${c.name} Button keeps its on-fill label`, () => {
+        houseRender(<Button {...c.props}>Filled</Button>, scheme, c.knob);
+        expect(screen.getByText("Filled").className).toMatch(/_col-color\b/);
+      });
+    }
+  }
+});

package/src/Button/index.tsx

@@ -21,6 +21,7 @@ import {
   sizeRecipeFromHeight,
   solidButtonIntents,
   solidPaletteThemes,
+  useAccentOnSurface,
   useResolvedKnobs,
   type RecipeFamilyName,
   type SizeRecipe,
@@ -427,6 +428,7 @@ export function Button({
   // page-scope `$outlineColor` literal (DG-A11Y-01; see focusVisibleStyle).
   const parentScopeTheme = useTheme();
   const pageOutlineColor = parentScopeTheme.outlineColor?.val as string | undefined;
+  const hostAccentInk = useAccentOnSurface();
   const grouped = useControlGrouped();
   const sizeProp = (props as { size?: SizeTokens | number }).size;
   const resolvedSize = sizeProp ?? knobProps.sizeToken;
@@ -540,7 +542,16 @@ export function Button({
   // (measured 1.02–1.06:1 on the page in both schemes). At the default
   // textAccent (`high`, textColor undefined) the label must re-anchor to the
   // same readable text tier the frame uses.
-  const outlinedIntentInk = Boolean(outlined && intent && solidButtonIntents.has(intent));
+  const outlinedIntentInk = Boolean(
+    outlined && activeThemeName && solidButtonIntents.has(activeThemeName),
+  );
+  // MPO-447: a solid-palette theme (accent) has no readable-on-page step at
+  // all, `$color11` included, so an outlined one takes its ink from the host:
+  // the accent that clears AA there, or host-scoped text under a textAccent.
+  const outlinedOnHost = Boolean(
+    outlined && activeThemeName && solidPaletteThemes.has(activeThemeName),
+  );
+  const outlinedInk = outlinedOnHost ? hostAccentInk : outlinedIntentInk ? "$color11" : undefined;
 
   const resolvedRole: ButtonActionRole | undefined = actionRole ?? (accent ? "primary" : undefined);
   const labelFromParts =
@@ -568,9 +579,11 @@ export function Button({
       {...knobProps.body}
       {...(nested ? knobProps.label : { fontSize: recipe.fontSize })}
       {...(textColor
-        ? { color: textColor }
-        : outlinedIntentInk
-          ? { color: "$color11" }
+        ? outlinedOnHost
+          ? hostScoped({ color: textColor })
+          : { color: textColor }
+        : outlinedInk
+          ? { color: outlinedInk }
           : undefined)}
       // LC-40: on the washed disabled chrome the label leaves the on-fill
       // foreground for the wash's AA ink (keepLabel keeps >=4.5:1).
@@ -719,9 +732,7 @@ export function Button({
       // Solid-intent sub-themes carry the on-fill foreground as `$color`
       // (LC-05); outlined frames sit on the page, so re-anchor inherited
       // text/icon color (currentColor) to the hue's readable text tier.
-      {...(outlined && intent && solidButtonIntents.has(intent)
-        ? { color: "$color11" }
-        : undefined)}
+      {...(outlinedInk ? { color: outlinedInk } : undefined)}
       // LC-40 DISABLED-VISIBLE: keepLabel washes the chrome (muted fill/
       // border) while label/glyphs re-anchor to the lowest AA text tier
       // (`color` inherits into currentColor icons); dimWhole dims the

package/src/Chip/index.tsx

@@ -10,6 +10,7 @@ import {
   resolveRadiusClass,
   sizeRecipeForToken,
   stackRadiusProps,
+  useLegibleInkOn,
   useResolvedKnobs,
   type GroupOrientation,
   type GroupPosition,
@@ -416,7 +417,10 @@ export function Chip({
     }
   };
 
-  const textColor = colors.text;
+  // Selected paints the family's step 8, where step-12 ink misses AA in dark
+  // (#c2e6ff on #2870bd, 3.88:1); the fill keeps its ink only while it reads.
+  const selectedInk = useLegibleInkOn(colors.fill, colors.text);
+  const textColor = (selected ? selectedInk : colors.text) as ColorTokens;
   const borderColor = selected
     ? "transparent"
     : variant === "outline"
@@ -434,9 +438,10 @@ export function Chip({
   // 1.32:1 on the dark tint — the "invisible ✕" regression). useTheme gives
   // the scheme-aware value for the same step-12 ink the label uses.
   const theme = useTheme();
-  const glyphInk =
-    (theme as Record<string, { val?: string } | undefined>)[(textColor as string).replace("$", "")]
-      ?.val ?? "currentColor";
+  const glyphInk = (textColor as string).startsWith("$")
+    ? ((theme as Record<string, { val?: string } | undefined>)[(textColor as string).slice(1)]
+        ?.val ?? "currentColor")
+    : (textColor as string);
   // Undifferentiated "Remove" fails when a row holds many chips (UX-019);
   // interpolate the label whenever it is a plain string.
   const dismissLabel =

package/src/ContextualSaveBar/UnsavedChangesDialog.spec.tsx

@@ -7,9 +7,10 @@
  * outside click from dismissing a destructive confirm. Those are the parts a
  * refactor of the save bar would carry away without noticing.
  */
-import { cleanup, fireEvent } from "@testing-library/react";
-import { renderWithProviders } from "@multiplatform.one/test-utils";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, screen, waitFor } from "@testing-library/react";
+import { modelFirstFocusableShow, renderWithProviders } from "@multiplatform.one/test-utils";
+import { useState } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { UnsavedChangesDialog } from "./UnsavedChangesDialog";
 
 afterEach(cleanup);
@@ -165,3 +166,49 @@ describe("UnsavedChangesDialog", () => {
     expect(cssOf(dialog() as HTMLElement, "max-width")).toBe("440px");
   });
 });
+
+// MPO-472: Chromium and WebKit's <dialog>.show() focuses the first focusable
+// descendant, and the panel is tabindex=-1, so those two opened on the panel
+// while Firefox and the HTML spec open on Keep editing, the first tab stop.
+// Keep editing is the alertdialog's least destructive action, the one tamagui's
+// AlertDialog.Cancel takes on open, so every browser opens there.
+describe("UnsavedChangesDialog open focus", () => {
+  function LeavePage() {
+    const [open, setOpen] = useState(false);
+    return (
+      <>
+        <button type="button" onClick={() => setOpen(true)}>
+          Leave the page
+        </button>
+        <UnsavedChangesDialog
+          open={open}
+          fieldCount={2}
+          onKeepEditing={() => setOpen(false)}
+          onDiscard={() => setOpen(false)}
+        />
+      </>
+    );
+  }
+
+  it("opens on Keep editing", async () => {
+    renderWithProviders(<LeavePage />);
+    fireEvent.click(screen.getByRole("button", { name: "Leave the page" }));
+    await waitFor(() => expect(dialog()).not.toBeNull());
+    await waitFor(() => expect(document.activeElement).toBe(button("data-mp-savebar-keep")));
+  });
+
+  describe("behind <dialog>.show()", () => {
+    let restoreShow = () => {};
+    beforeEach(() => {
+      restoreShow = modelFirstFocusableShow();
+    });
+    afterEach(() => restoreShow());
+
+    it("moves focus off the panel onto Keep editing", async () => {
+      renderWithProviders(<LeavePage />);
+      fireEvent.click(screen.getByRole("button", { name: "Leave the page" }));
+      await waitFor(() => expect(dialog()).not.toBeNull());
+      await waitFor(() => expect(document.activeElement).toBe(button("data-mp-savebar-keep")));
+    });
+  });
+});