@multiplatform.one/forms 7.7.6 → 7.8.0

package/dist/jsx/shared/focusManagement.mjs

@@ -12,17 +12,24 @@ function focusIsDropped(insideEl) {
 function useCaptureOnOpen(open) {
   const prevRef = useRef(null);
   const wasOpenRef = useRef(false);
+  const generationRef = useRef(0);
   if (canUseDom()) {
+    if (open !== wasOpenRef.current) generationRef.current += 1;
     if (open && !wasOpenRef.current) {
       prevRef.current = document.activeElement;
     }
     wasOpenRef.current = open;
   }
-  return prevRef;
+  return {
+    prevRef,
+    generationRef
+  };
 }
-function restoreLater(prevRef, insideRef) {
+function restoreLater(prevRef, generationRef, insideRef, skipReturnFocusRef) {
+  const generation = generationRef.current;
   const restore = () => {
     if (!canUseDom()) return;
+    if (skipReturnFocusRef?.current || generationRef.current !== generation) return;
     const target = prevRef.current;
     if (!target || !target.isConnected) return;
     if (focusIsDropped(insideRef?.current ?? null)) {
@@ -35,20 +42,26 @@ function restoreLater(prevRef, insideRef) {
   requestAnimationFrame(() => requestAnimationFrame(restore));
   setTimeout(restore, 320);
 }
-function useReturnFocusOnClose(open) {
-  const prevRef = useCaptureOnOpen(open);
+function useReturnFocusOnClose(open, skipReturnFocusRef) {
+  const {
+    prevRef,
+    generationRef
+  } = useCaptureOnOpen(open);
   useEffect(() => {
     if (!canUseDom() || !open) return;
-    return () => restoreLater(prevRef);
-  }, [open, prevRef]);
+    return () => restoreLater(prevRef, generationRef, void 0, skipReturnFocusRef);
+  }, [open, prevRef, generationRef, skipReturnFocusRef]);
 }
-function useSheetModalFocus(open, frameRef) {
-  const prevRef = useCaptureOnOpen(open);
+function useSheetModalFocus(open, frameRef, skipReturnFocusRef) {
+  const {
+    prevRef,
+    generationRef
+  } = useCaptureOnOpen(open);
   useEffect(() => {
     if (!canUseDom() || !open) return;
     const frame = frameRef.current;
     if (!frame || typeof frame.addEventListener !== "function") {
-      return () => restoreLater(prevRef, frameRef);
+      return () => restoreLater(prevRef, generationRef, frameRef, skipReturnFocusRef);
     }
     const focusIn = () => {
       if (!canUseDom()) return;
@@ -86,9 +99,9 @@ function useSheetModalFocus(open, frameRef) {
       cancelAnimationFrame(raf);
       cancelAnimationFrame(innerRaf);
       frame.removeEventListener("keydown", onKeyDown);
-      restoreLater(prevRef, frameRef);
+      restoreLater(prevRef, generationRef, frameRef, skipReturnFocusRef);
     };
-  }, [open, frameRef, prevRef]);
+  }, [open, frameRef, prevRef, generationRef, skipReturnFocusRef]);
 }
 export { 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","current","restoreLater","insideRef","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","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":[]}

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

@@ -44,18 +44,25 @@ function focusIsDropped(insideEl) {
 function useCaptureOnOpen(open) {
   var prevRef = (0, import_react.useRef)(null);
   var wasOpenRef = (0, import_react.useRef)(false);
+  var generationRef = (0, import_react.useRef)(0);
   if (canUseDom()) {
+    if (open !== wasOpenRef.current) generationRef.current += 1;
     if (open && !wasOpenRef.current) {
       prevRef.current = document.activeElement;
     }
     wasOpenRef.current = open;
   }
-  return prevRef;
+  return {
+    prevRef,
+    generationRef
+  };
 }
-function restoreLater(prevRef, insideRef) {
+function restoreLater(prevRef, generationRef, insideRef, skipReturnFocusRef) {
+  var generation = generationRef.current;
   var restore = function restore2() {
     var _ref;
     if (!canUseDom()) return;
+    if ((skipReturnFocusRef === null || skipReturnFocusRef === void 0 ? void 0 : skipReturnFocusRef.current) || generationRef.current !== generation) return;
     var target = prevRef.current;
     if (!target || !target.isConnected) return;
     if (focusIsDropped((_ref = insideRef === null || insideRef === void 0 ? void 0 : insideRef.current) !== null && _ref !== void 0 ? _ref : null)) {
@@ -70,23 +77,29 @@ function restoreLater(prevRef, insideRef) {
   });
   setTimeout(restore, 320);
 }
-function useReturnFocusOnClose(open) {
-  var prevRef = useCaptureOnOpen(open);
+function useReturnFocusOnClose(open, skipReturnFocusRef) {
+  var {
+    prevRef,
+    generationRef
+  } = useCaptureOnOpen(open);
   (0, import_react.useEffect)(function () {
     if (!canUseDom() || !open) return;
     return function () {
-      return restoreLater(prevRef);
+      return restoreLater(prevRef, generationRef, void 0, skipReturnFocusRef);
     };
-  }, [open, prevRef]);
+  }, [open, prevRef, generationRef, skipReturnFocusRef]);
 }
-function useSheetModalFocus(open, frameRef) {
-  var prevRef = useCaptureOnOpen(open);
+function useSheetModalFocus(open, frameRef, skipReturnFocusRef) {
+  var {
+    prevRef,
+    generationRef
+  } = useCaptureOnOpen(open);
   (0, import_react.useEffect)(function () {
     if (!canUseDom() || !open) return;
     var frame = frameRef.current;
     if (!frame || typeof frame.addEventListener !== "function") {
       return function () {
-        return restoreLater(prevRef, frameRef);
+        return restoreLater(prevRef, generationRef, frameRef, skipReturnFocusRef);
       };
     }
     var focusIn = function focusIn2() {
@@ -127,8 +140,8 @@ function useSheetModalFocus(open, frameRef) {
       cancelAnimationFrame(raf);
       cancelAnimationFrame(innerRaf);
       frame.removeEventListener("keydown", onKeyDown);
-      restoreLater(prevRef, frameRef);
+      restoreLater(prevRef, generationRef, frameRef, skipReturnFocusRef);
     };
-  }, [open, frameRef, prevRef]);
+  }, [open, frameRef, prevRef, generationRef, skipReturnFocusRef]);
 }
 //# 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","current","restoreLater","insideRef","restore","restore2","_ref","isConnected","focus","preventScroll","focusVisible","wasKeyboardFocus","requestAnimationFrame","setTimeout","useEffect","frameRef","frame","addEventListener","focusIn","focusIn2"],"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","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":"AAiCA,YAAS;;AACT,IAAAA,SAAS,GAAAC,MAAa,CAAAC,cAAA;AACtB,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,qBAAW,EAAUA,CAAA,KAAAA,qBAAA;EACvBC,kBAAA,EAAAA,CAAA,KAAAA;AACA;AACFC,MAAA,CAAAC,OAAA,GAAAP,YAAA,CAAAG,uBAAA;AAEA,IAAAK,YAAS,GAAAC,OACP,QACA;AAIA,IAAAC,cAAM,GAAaD,OAAA,UAAc;AACjC,IAAAE,YAAM,GAAUF,OAAM;AAIpB,IAAAG,SAAK,8IAAa;AAClB,IAAAC,SAAI,YAAAC,UAAoBA,CAAA;EACxB,OAAAJ,cAAe,CAAAK,KAAQ,WAAAC,QAAA;AACvB;AACA,SAAIC,cAAeA,CAAAC,QAAA,EAAW;EAC5B,IAAAC,EAAA,GAAAH,QAAa,CAAAI,aAAA;EAAA,KAAAD,EACX,IAAAA,EAAA,KAAAH,QAAe,CAAAK,IAAA,IAAAF,EAAA,KAAAH,QAAA,CAAAM,eAAA;EAAA,IAAAJ,QACf,SAAc,IAAAA,QAAA,KAAiB,kBAAAA,QAAA,CAAAK,QAAA,CAAAJ,EAAA;EAAA,OAChB;AAAA;AACnB,SACFK,iBAAAC,IAAA;EAGA,IAAAC,OAAA,OAAAlB,YAA4B,CAAAmB,MAAA;EAC5B,IAAAC,UAAW,OAASpB,YAAG,CAAAmB,MAAA;EACzB,IAAAE,aAAA,OAAArB,YAAA,CAAAmB,MAAA;EAGO,IAAAd,SAAS;IACd,IAAMY,IAAE,KAAAG,UAAS,CAAAE,OAAc,EAAID,aAAA,CAAAC,OAAqB;IACxD,IAAAL,IAAU,KAAAG,UAAM,CAAAE,OAAA;MACdJ,OAAK,CAAAI,OAAU,GAAKd,QAAO,CAAAI,aAAA;IAC3B;IACFQ,UAAU,CAAAE,OAAS,GAAAL,IAAA;EACrB;EAQO,OAAS;IAKdC,OAAQ;IACRG;EACE;AACA;AACA,SAAKE,YAASA,CAAAL,OAAO,EAAMG,aAAA,EAAAG,SAAqB,EAAAC,kBAAY;EAC1D,IAAAC,UAAO,GAAML,aAAa,CAAAC,OAAA;EAAoD,IAChFK,OAAA,YAAAC,SAAA;IAGA,IAAAC,IAAM;IACJ,KAAAxB,SAAK,IAAU;IACf,KAAAoB,kBAAmB,SAAS,IAAAA,kBAAgB,uBAAAA,kBAAA,CAAAH,OAAA,KAAAD,aAAA,CAAAC,OAAA,KAAAI,UAAA;IAC5C,IAAA9C,MAAM,GAAAsC,OAAQ,CAAAI,OAAM;IACpB,IAAC,CAAA1C,MAAA,IAAS,CAAAA,MAAO,CAAAkD,WAAQ;IAC3B,IAAArB,cAAA,EAAAoB,IAAA,GAAAL,SAAA,aAAAA,SAAA,uBAAAA,SAAA,CAAAF,OAAA,cAAAO,IAAA,cAAAA,IAAA;MAGAjD,MAAI,CAAAmD,KAAA,CAAW;QACfC,aAAY;QACVC,YAAW,MAAA9B,YAAA,CAAsB+B,gBAAO;MACzC;IAGD;EACE;EACAC,qBAAM,aAAmB;IAAqD,OAC3EA,qBAAU,CAAcR,OAAK,CAAG;EAAe;EAElDS,UAAK,CAAAT,OAAA,EAAW;AACd;AACA,SAAA/B,sBAAAqB,IAAA,EAAAQ,kBAAA;EAAA,IACF;IAAAP,OAAA;IAAAG;EAAA,IAAAL,gBAAA,CAAAC,IAAA;EACA,IAAAjB,YAAM,CAAAqC,SAAQ,cAAY;IAC1B,KAAAhC,SAAM,CAAO,MAAAY,IAAA,EAAW;IACxB,mBAAgB;MAChB,OAAMM,YAAa,CAAAL,OAAA,EAAAG,aAAqB,UAAYI,kBAAQ;IAC1D;EACA,IAAWR,IACb,EACEC,OAAE,EACFG,aAAM,EAAMI,kBACd,EACF;AACA;AACA,SAAA5B,kBAAaA,CAAAoB,IAAA,EAAAqB,QAAA,EAAAb,kBAAA;EACX;IAAAP,OAAA;IAAAG;EAAwB,IAAAL,gBAAA,CAAAC,IAAA;EACxB,IAAAjB,YAAA,CAAAqC,SAAqB,cAAQ;IAC7B,KAAAhC,SAAM,OAAAY,IAAA;IACN,IAAAsB,KAAA,GAAAD,QAAa,CAAAhB,OAAS;IACxB,KAAAiB,KAAA,WAAAA,KAAA,CAAAC,gBAAA;MACE,OAAM,YAAU;QACtB,OAAAjB,YAAA,CAAAL,OAAA,EAAAG,aAAA,EAAAiB,QAAA,EAAAb,kBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/forms",
-  "version": "7.7.6",
+  "version": "7.8.0",
   "description": "Cross-platform form components with URL state management",
   "keywords": [
     "cross-platform",
@@ -70,9 +70,10 @@
     "perfect-freehand": "^1.2.3",
     "react-native-svg": "15.15.4",
     "tamagui": "2.7.6",
-    "@multiplatform.one/router": "7.7.6",
-    "@multiplatform.one/table-primitives": "7.7.6",
-    "@multiplatform.one/theme": "7.7.6"
+    "@multiplatform.one/platform": "7.8.0",
+    "@multiplatform.one/router": "7.8.0",
+    "@multiplatform.one/table-primitives": "7.8.0",
+    "@multiplatform.one/theme": "7.8.0"
   },
   "devDependencies": {
     "@tamagui/build": "2.7.6",
@@ -94,9 +95,9 @@
     "react-i18next": "^16.6.6",
     "react-native-web": "^0.21.2",
     "vitest": "^4.1.5",
-    "@multiplatform.one/config": "7.7.6",
-    "@multiplatform.one/storybook": "7.7.6",
-    "@multiplatform.one/test-utils": "7.7.6"
+    "@multiplatform.one/test-utils": "7.8.0",
+    "@multiplatform.one/storybook": "7.8.0",
+    "@multiplatform.one/config": "7.8.0"
   },
   "peerDependencies": {
     "@react-native-community/datetimepicker": ">=8.0.1",

package/src/Button/Button.labelInk.spec.tsx

@@ -62,9 +62,8 @@ function labelNode(text: string): HTMLElement {
 }
 
 /**
- * One implementation of the arithmetic (the point of exporting
- * `measureContrast`), and the REPORTED 2-decimal ratio, so the number a
- * failure prints is the number the verdict used.
+ * Use the canonical unrounded measurement so a below-floor pair cannot
+ * pass through display rounding.
  */
 function pageRatio(ink: string, ground: string, label: string): number {
   return measureContrast({ foreground: ink, background: ground, label }).ratio;
@@ -159,21 +158,22 @@ describe("Button MPO-40 outlined intent label ink", () => {
     }
   });
 
-  // PINNED MISS — MPO-40's own secondary finding, still OPEN.
+  // CLOSED — MPO-40's secondary finding, fixed by the palette step.
   //
   // Fixing the plumbing (the arm above) was necessary, not sufficient. On
   // $color2 — the surface every gallery board is shot on — light warning
-  // and success $color11 are under mpo's own floor, and those are exactly
-  // the numbers button-anatomy already prints for its CONTRACT row. The
-  // step that would close them is a PALETTE change (Radix yellow-11
-  // #9e6c00 / green-11 #218358), owned by the contrast-floor lane, not by
-  // the Button. colorRules.ts pins the same warning miss on the intent's
-  // own color1 (#fcfcf7, 4.44:1); this pins it on the page ground.
+  // and success $color11 sat UNDER mpo's own floor at 4.34 and 4.48, and
+  // those were exactly the numbers button-anatomy printed for its CONTRACT
+  // row. This block used to assert the miss, and said in as many words that
+  // stepping the palette should break it rather than be re-baselined away.
   //
-  // These numbers are asserted EXACTLY on purpose. Step the palette and
-  // this test fails, which is the reminder to re-measure the board and
-  // tick MPO-40's contrast criterion — never a regression to re-baseline.
-  it("light warning/success $color11 are STILL under 4.5:1 on the $color2 page surface", () => {
+  // The palette stepped: `intentInkFloor` in theme/createThemes.ts darkens
+  // light yellow-11 (#9e6c00 -> #996900) and green-11 (#218358 -> #1c8257)
+  // by the smallest hue-holding amount that clears the floor here. So the
+  // assertion is inverted rather than deleted — the ground and the exact
+  // ratios stay pinned, because $color2 is the STRICTEST base surface and a
+  // future re-lightening has to fail somewhere loud.
+  it("light warning/success $color11 now clear 4.5:1 on the $color2 page surface", () => {
     const ground = houseThemes.light.color2;
     const measured = Object.fromEntries(
       INTENTS.map((intent): [string, number] => [
@@ -187,10 +187,13 @@ describe("Button MPO-40 outlined intent label ink", () => {
     );
     expect(measured, `light.color2 is ${ground}`).toEqual({
       error: 4.95,
-      warning: 4.34,
-      success: 4.48,
+      warning: 4.56,
+      success: 4.55,
     });
-    expect(measured.warning).toBeLessThan(aaTextContrastRatio);
-    expect(measured.success).toBeLessThan(aaTextContrastRatio);
+    for (const intent of INTENTS) {
+      expect(measured[intent], `light_${intent} on light.color2`).toBeGreaterThanOrEqual(
+        aaTextContrastRatio,
+      );
+    }
   });
 });

package/src/Button/Button.outlinedChannel.spec.tsx

@@ -0,0 +1,46 @@
+/**
+ * @vitest-environment jsdom
+ *
+ * MPO-91: the forms Button's outlined chrome cannot be requested through a
+ * channel the component ignores.
+ *
+ * `ButtonFrame` is `styled(View)` and declares only an `outlined` BOOLEAN.
+ * `variant="outlined"` was never read, but `ButtonProps` inherited it from
+ * `TamaguiButtonProps`, so 75 call sites across 29 files typechecked, rendered
+ * FILLED, and said nothing. The type now Omits `variant`, and this spec pins
+ * both halves of that: the type refuses it (checked by `tsgo --noEmit`), and
+ * the runtime genuinely ignores it, so the refusal is honest rather than
+ * cosmetic.
+ *
+ * jsdom cannot cascade Tamagui CSS — assertions read the atomic border-color
+ * classes the FRAME emits, the same idiom as Button.filledBorder.spec.tsx.
+ */
+
+import { renderWithProviders } from "@multiplatform.one/test-utils";
+import { cleanup, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+import { Button } from "./index";
+
+afterEach(cleanup);
+
+function frame(): HTMLElement {
+  return screen.getByRole("button");
+}
+
+describe("Button outlined channel (MPO-91)", () => {
+  it("the outlined boolean is the channel, and it paints $borderColor", () => {
+    renderWithProviders(<Button outlined>Outlined</Button>);
+    expect(frame().className).toMatch(/_btc-borderColor\b/);
+  });
+
+  it("the type refuses variant, so a dead pass cannot come back silently", () => {
+    // THE GUARD. If someone re-adds `variant` to ButtonProps this stops being
+    // an error and `tsgo --noEmit` fails on the unused directive — which is
+    // the point: the failure is loud either way.
+    // @ts-expect-error MPO-91: `variant` is Omitted from ButtonProps on purpose.
+    renderWithProviders(<Button variant="outlined">Refused</Button>);
+    // ...and the refusal is honest: it really does render filled.
+    expect(frame().className).toMatch(/_btc-transparent\b/);
+    expect(frame().className).not.toMatch(/_btc-borderColor\b/);
+  });
+});

package/src/Button/Button.sizeLadder.spec.tsx

@@ -4,7 +4,8 @@
  * MPO-46 AC-1: the painted Button, not the recipe source, matches the
  * measured Tamagui v5 table at $2/$3/$4/$6. Radius used to sit on the
  * borderRadius knob (flat 9px); it must step with the size token, and
- * gap must equal that painted radius at every size and every knob stop.
+ * default gap matches that table. Corner shape overrides preserve the
+ * internal spacing rather than jamming or separating the icon and label.
  */
 
 import { renderWithProviders } from "@multiplatform.one/test-utils";
@@ -106,7 +107,7 @@ describe("MPO-46 painted Button size ladder", () => {
     }
   });
 
-  it("gap equals radius at every borderRadius knob stop", () => {
+  it("corner overrides preserve the measured internal gap", () => {
     for (const [stop, px] of Object.entries(KNOB_STOPS) as [keyof typeof KNOB_STOPS, number][]) {
       renderWithProviders(
         <Preset overrides={{ borderRadius: stop }}>
@@ -117,7 +118,7 @@ describe("MPO-46 painted Button size ladder", () => {
       );
       const frame = screen.getByRole("button");
       expect(radiusPx(frame), `${stop} radius`).toBe(px);
-      expect(gapPx(frame), `${stop} gap`).toBe(px);
+      expect(gapPx(frame), `${stop} gap`).toBe(MEASURED.$4.radius);
       cleanup();
     }
   });

package/src/Button/Button.stories.tsx

@@ -8,6 +8,7 @@ import {
 } from "@multiplatform.one/theme";
 import { Button as TamaguiButton, Paragraph, XStack, YStack, useTheme } from "tamagui";
 import { Button } from "./index";
+import { useState } from "react";
 
 const pressed = (name: string) => () => action(name)();
 
@@ -44,6 +45,25 @@ const meta: Meta<typeof Button> = {
 export default meta;
 type Story = StoryObj<typeof Button>;
 
+function DestructiveContrastExample({ disabled = false }: { disabled?: boolean }) {
+  const [presses, setPresses] = useState(0);
+  return (
+    <YStack data-lc-clicks={presses}>
+      <Button error disabled={disabled} onPress={() => setPresses((value) => value + 1)}>
+        Delete
+      </Button>
+    </YStack>
+  );
+}
+
+export const DestructiveEnabled: Story = {
+  render: () => <DestructiveContrastExample />,
+};
+
+export const DestructiveDisabled: Story = {
+  render: () => <DestructiveContrastExample disabled />,
+};
+
 export const Basic: Story = {
   name: "Main",
   args: {

package/src/Button/index.tsx

@@ -56,8 +56,8 @@ import { useControlGrouped } from "../shared/groupContext";
  * Coordinated size recipe (Polaris slim/medium/large, Primer s/m/l, Linear
  * 28/32/40, Spectrum S/M, M3 XS/S). Height, pad, type, icon, gap and radius
  * step together from the size table. The borderRadius knob is an override
- * that retargets both painted radius and inner gap (`resolveControlRadius`).
- * Density is a different axis (pad/gap only).
+ * of painted corners only (`resolveControlRadius`); internal gap keeps the
+ * icon and label grouped. Density selects the same-height compact family.
  *
  * GENERATED (LC-75 / LC-80): Button consumes `recipeFamilies.control` — the
  * handwritten mirror table this file used to carry drifted (md font 13 vs the
@@ -239,7 +239,29 @@ export const ButtonFrame = styled(View, {
   },
 });
 
-export interface ButtonProps extends Omit<TamaguiButtonProps, "form" | "icon" | "iconAfter"> {
+/**
+ * MPO-91: `variant` is Omitted, and that Omit IS the guard.
+ *
+ * `ButtonFrame` is `styled(View)` and declares only an `outlined` BOOLEAN, so
+ * `variant="outlined"` was never read — it landed on the frame as an unread
+ * prop and the button rendered FILLED. Because `TamaguiButtonProps` carries
+ * `variant`, the inherited type advertised a channel this component ignores,
+ * so 75 call sites across 29 files typechecked, rendered wrong, and said
+ * nothing. Declaring the prop and dropping it on the floor is the lying API
+ * MPO-81 refused to ship.
+ *
+ * Omitting it turns every one of those call sites into a compile error instead
+ * of a silent no-op, which is what stops the prop coming back. The house
+ * channel is the `outlined` boolean.
+ *
+ * `@multiplatform.one/components`' Button still accepts `variant` and maps it
+ * onto `outlined` — that shim is the documented raw-tamagui compat hatch, and
+ * it declares the prop itself rather than inheriting it from here.
+ */
+export interface ButtonProps extends Omit<
+  TamaguiButtonProps,
+  "form" | "icon" | "iconAfter" | "variant"
+> {
   action?: "submit" | "reset";
   form?: AnyFormApi;
   loading?: boolean;
@@ -650,7 +672,6 @@ export function Button({
       circular={!nested && isCircular ? true : undefined}
       chromeless={selectedFill ? false : chromeless}
       selected={selectedFill || undefined}
-      {...(outlined ? { variant: "outlined" as const } : undefined)}
       {...(!isCircular || nested
         ? {
             paddingHorizontal: padX,

package/src/Chip/Chip.spec.tsx

@@ -161,7 +161,9 @@ describe("Chip", () => {
 
   it("selected chip renders a leading check when no icon is passed", () => {
     const result = renderWithProviders(<Chip selected>On</Chip>);
-    expect(result.container.querySelector("svg")).not.toBeNull();
+    const fill = result.container.querySelector("svg")?.getAttribute("fill");
+    expect(fill).toBeTruthy();
+    expect(fill?.startsWith("$")).toBe(false);
   });
 
   it("onPress fires from the chip body and does not fire dismiss", () => {

package/src/Chip/index.tsx

@@ -436,11 +436,7 @@ export function Chip({
       ? t("Remove {{label}}", { label: String(children) })
       : t("Remove");
   const leading =
-    icon !== undefined ? (
-      icon
-    ) : selected ? (
-      <CheckIcon size={iconSize} color={textColor as string} />
-    ) : null;
+    icon !== undefined ? icon : selected ? <CheckIcon size={iconSize} color={glyphInk} /> : null;
 
   const onBodyKeyDown = ((e: KeyboardEvent) => {
     if ((e.key === "Enter" || e.key === " ") && onPress) {

package/src/FieldLayout.stories.tsx

@@ -1,10 +1,14 @@
 import { action } from "@multiplatform.one/storybook";
 import type { Meta, StoryObj } from "@storybook/react-native-web-vite";
 import { useForm } from "@tanstack/react-form";
+import { useState } from "react";
+import { Preset } from "@multiplatform.one/theme";
 import { Input as TamaguiInput, Paragraph, YStack, XStack } from "tamagui";
 import { Button } from "./Button";
 import { Form } from "./Form";
 import { Field, FieldLayout } from "./fieldLayout";
+import { Input } from "./fields/Input";
+import { Checkbox } from "./fields/Checkbox";
 
 const meta: Meta<typeof FieldLayout> = {
   title: "Forms/FieldLayout",
@@ -39,6 +43,43 @@ export const Basic: Story = {
   ),
 };
 
+/** Shared message order with real controls, including the inline checkbox row. */
+export const MessageOrder: Story = {
+  render: () => {
+    const Example = () => {
+      const [showErrors, setShowErrors] = useState(false);
+      return (
+        <YStack gap="$4" width="100%" maxWidth={480}>
+          <Input
+            id="message-top"
+            label="Contact"
+            helperText="Use an address where we can reach you"
+            error={showErrors ? "Enter a contact address" : undefined}
+          />
+          <Preset overrides={{ fieldLabelPlacement: "side" }}>
+            <Input
+              id="message-side"
+              label="Office"
+              helperText="Use the office name shown on your account"
+              error={showErrors ? "Enter your office name" : undefined}
+            />
+          </Preset>
+          <Checkbox
+            id="message-inline"
+            label="Accept terms"
+            helperText="Read the terms before continuing"
+            error={showErrors ? "Accept the terms to continue" : undefined}
+          />
+          <Button onPress={() => setShowErrors((shown) => !shown)}>
+            {showErrors ? "Show helpers" : "Show validation"}
+          </Button>
+        </YStack>
+      );
+    };
+    return <Example />;
+  },
+};
+
 export const ErrorStates: Story = {
   render: () => (
     <YStack gap="$6" maxWidth={360}>

package/src/FloatingPanel/FloatingPanel.native.spec.tsx

@@ -57,6 +57,60 @@ function panel(open: boolean) {
 }
 
 describe("FloatingPanel native presentation lifecycle", () => {
+  it("keeps full-field triggers stretched and allows content-sized composite adornments", () => {
+    for (const triggerSizing of [undefined, "content"] as const) {
+      const result = renderWithProviders(
+        <FloatingPanel
+          open={false}
+          onOpenChange={onOpenChange}
+          trigger={<Text>Country</Text>}
+          triggerSizing={triggerSizing}
+          triggerA11y={{ label: "Country code" }}
+        >
+          <Text>row</Text>
+        </FloatingPanel>,
+      );
+      const trigger = result.getByRole("button", { name: "Country code" });
+      expect(getComputedStyle(trigger).width).toBe(triggerSizing === "content" ? "" : "100%");
+      expect(getComputedStyle(trigger).alignSelf).toBe("stretch");
+      expect(getComputedStyle(trigger.parentElement!).width).toBe(
+        triggerSizing === "content" ? "" : "100%",
+      );
+      result.unmount();
+    }
+  });
+
+  it("composes native readiness with entrance and ignores late closed or unmounted events", () => {
+    const onNativeShow = vi.fn();
+    const example = (open: boolean) => (
+      <FloatingPanel
+        open={open}
+        onOpenChange={onOpenChange}
+        onNativeShow={onNativeShow}
+        trigger={<Text>Pick</Text>}
+      >
+        <Text>row</Text>
+      </FloatingPanel>
+    );
+    const result = renderWithProviders(example(true));
+    expect(Animated.timing).toHaveBeenCalledTimes(1);
+    expect(onNativeShow).not.toHaveBeenCalled();
+    const shown = modal.onShow;
+    act(() => shown?.());
+    expect(onNativeShow).toHaveBeenCalledTimes(1);
+    expect(Animated.timing).toHaveBeenCalledTimes(1);
+    result.rerender(example(false));
+    act(() => shown?.());
+    expect(onNativeShow).toHaveBeenCalledTimes(1);
+    result.rerender(example(true));
+    const nextShown = modal.onShow;
+    act(() => nextShown?.());
+    expect(onNativeShow).toHaveBeenCalledTimes(2);
+    result.unmount();
+    act(() => nextShown?.());
+    expect(onNativeShow).toHaveBeenCalledTimes(2);
+  });
+
   it("enters without onShow and ignores onShow for the same presentation", () => {
     renderWithProviders(panel(true));
     expect(Animated.timing).toHaveBeenCalledTimes(1);