@multiplatform.one/forms 6.7.0 → 7.0.0

package/dist/cjs/shared/i18n.cjs

@@ -0,0 +1,46 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var i18n_exports = {};
+__export(i18n_exports, {
+  useTranslation: () => useTranslation
+});
+module.exports = __toCommonJS(i18n_exports);
+var ReactI18next = __toESM(require("react-i18next"));
+const useTranslation = (...args) => {
+  const impl = ReactI18next.useTranslation;
+  if (typeof impl !== "function") {
+    throw new Error("[@multiplatform.one/forms] react-i18next is not installed, but a component that translates its built-in copy was rendered. Add react-i18next and i18next to your app's dependencies (they are optional peers so apps that never render these components can omit them).");
+  }
+  return impl(...args);
+};

package/dist/cjs/shared/i18n.native.js

@@ -0,0 +1,52 @@
+"use strict";
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var i18n_exports = {};
+__export(i18n_exports, {
+  useTranslation: () => useTranslation
+});
+module.exports = __toCommonJS(i18n_exports);
+var ReactI18next = __toESM(require("react-i18next"));
+var useTranslation = function useTranslation2() {
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+  var impl = ReactI18next.useTranslation;
+  if (typeof impl !== "function") {
+    throw new Error("[@multiplatform.one/forms] react-i18next is not installed, but a component that translates its built-in copy was rendered. Add react-i18next and i18next to your app's dependencies (they are optional peers so apps that never render these components can omit them).");
+  }
+  return impl(...args);
+};
+//# sourceMappingURL=i18n.native.js.map

package/dist/cjs/shared/i18n.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","i18n_exports","__export","useTranslation","module","exports","ReactI18next","__toESM","require","useTranslation2","_len","arguments","length","args","Array","_key","impl","Error"],"sources":["../../../src/shared/i18n.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,YAAA;AAAAC,QAAA,CAAAD,YAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA8B,CAAAK,YAAA;AAYvB,IAAAK,YAAM,GAAAC,OAAkB,CAAAC,OAAI,gBAAoB;AACrD,IAAAL,cAAc,YACXM,gBAAA;EACH,KAAI,IAAAC,IAAO,GAAAC,SAAS,CAAAC,MAAY,EAAAC,IAAA,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;IAC9BF,IAAA,CAAAE,IAAM,CAAI,GAAAJ,SAAA,CAAAI,IAAA;EAAA;EACR,IAIFC,IAAA,GAAAV,YAAA,CAAAH,cAAA;EACF,WAAAa,IAAA;IACA,MAAO,IAAKC,KAAG,0QAAI;EACrB","ignoreList":[]}

package/dist/cjs/shared/utils.cjs

@@ -38,11 +38,12 @@ module.exports = __toCommonJS(utils_exports);
 var import_react = require("react");
 var import_theme = require("@multiplatform.one/theme");
 var import_tamagui = require("tamagui");
-var import_get_token = require("@tamagui/get-token");
 var import_Form = require("../Form/index.cjs");
 var import_validateOn = require("../Form/validateOn.cjs");
 function getFieldHeight(sizeToken, rows = 1) {
-  return Math.round((0, import_tamagui.getVariableValue)((0, import_get_token.getSize)(sizeToken)) * rows);
+  return (0, import_theme.sizeRecipeForToken)(String(sizeToken), {
+    touch: (0, import_theme.isTouchSurface)()
+  }).height * rows;
 }
 function clampRadius(radiusToken, maxTokenNum, fallback) {
   if (!radiusToken) return fallback;

package/dist/cjs/shared/utils.native.js

@@ -40,12 +40,13 @@ module.exports = __toCommonJS(utils_exports);
 var import_react = require("react");
 var import_theme = require("@multiplatform.one/theme");
 var import_tamagui = require("tamagui");
-var import_get_token = require("@tamagui/get-token");
 var import_Form = require("../Form/index.native.js");
 var import_validateOn = require("../Form/validateOn.native.js");
 function getFieldHeight(sizeToken) {
   var rows = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 1;
-  return Math.round((0, import_tamagui.getVariableValue)((0, import_get_token.getSize)(sizeToken)) * rows);
+  return (0, import_theme.sizeRecipeForToken)(String(sizeToken), {
+    touch: (0, import_theme.isTouchSurface)()
+  }).height * rows;
 }
 function clampRadius(radiusToken, maxTokenNum, fallback) {
   if (!radiusToken) return fallback;

package/dist/cjs/shared/utils.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","utils_exports","__export","clampRadiusForControl","clampRadiusForLargeComponent","clampRadiusInStateProps","getElevationWrapperProps","getFieldError","getFieldHeight","getOTPCellRadius","mergeFieldHandler","stripRadiusFromStateProps","useFormField","useResolvedValidators","module","exports","import_react","require","import_theme","import_tamagui","import_get_token","import_Form","import_validateOn","sizeToken","rows","arguments","length","Math","round","getVariableValue","getSize","clampRadius","radiusToken","maxTokenNum","fallback","startsWith","num","Number","parseInt","slice","webShadow","$1","$2","$4","nativeShadow","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","elevationKeyAlias","elevationToProps","token","_elevationKeyAlias_String","key","String","isWeb","style","boxShadow","knobProps","elevationRecipe","_elevationRecipe_hoverKnobProps","_elevationRecipe_pressKnobProps","_elevationRecipe_focusVisibleKnobProps","_elevationRecipe_hoverKnobProps1","_elevationRecipe_pressKnobProps1","_elevationRecipe_focusVisibleKnobProps1","hoverKnobProps","pressKnobProps","focusVisibleKnobProps","props","overflow","hoverStyle","pressStyle","focusVisibleStyle","transition","animation","formContext","useFormContext","resolvedForm","form","resolved","useResolvedKnobs","compact","generatedId","useId","id","field","propError","fieldError","state","meta","errors","defaultIsEmpty","defaultIsEmpty2","v","required","validators","label","name","isEmpty","validateOn","hasSubmitted","useFormValidate","effective","resolveEffectiveValidateOn"],"sources":["../../../src/shared/utils.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","utils_exports","__export","clampRadiusForControl","clampRadiusForLargeComponent","clampRadiusInStateProps","getElevationWrapperProps","getFieldError","getFieldHeight","getOTPCellRadius","mergeFieldHandler","stripRadiusFromStateProps","useFormField","useResolvedValidators","module","exports","import_react","require","import_theme","import_tamagui","import_Form","import_validateOn","sizeToken","rows","arguments","length","sizeRecipeForToken","String","touch","isTouchSurface","height","clampRadius","radiusToken","maxTokenNum","fallback","startsWith","num","Number","parseInt","slice","webShadow","$1","$2","$4","nativeShadow","shadowColor","shadowOffset","width","shadowOpacity","shadowRadius","elevation","elevationKeyAlias","elevationToProps","token","_elevationKeyAlias_String","key","isWeb","style","boxShadow","knobProps","elevationRecipe","_elevationRecipe_hoverKnobProps","_elevationRecipe_pressKnobProps","_elevationRecipe_focusVisibleKnobProps","_elevationRecipe_hoverKnobProps1","_elevationRecipe_pressKnobProps1","_elevationRecipe_focusVisibleKnobProps1","hoverKnobProps","pressKnobProps","focusVisibleKnobProps","props","overflow","hoverStyle","pressStyle","focusVisibleStyle","transition","animation","formContext","useFormContext","resolvedForm","form","resolved","useResolvedKnobs","compact","generatedId","useId","id","field","propError","fieldError","state","meta","errors","defaultIsEmpty","defaultIsEmpty2","v","required","validators","label","name","isEmpty"],"sources":["../../../src/shared/utils.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/themedPrimitives.cjs

@@ -25,37 +25,25 @@ __export(themedPrimitives_exports, {
   ThemedTextArea: () => ThemedTextArea
 });
 module.exports = __toCommonJS(themedPrimitives_exports);
-var import_get_font_sized = require("@tamagui/get-font-sized");
-var import_get_token = require("@tamagui/get-token");
+var import_theme = require("@multiplatform.one/theme");
 var import_tamagui = require("tamagui");
 const textAreaSizeWithoutRadius = (val, extras) => {
   const {
     props
   } = extras;
-  const size = val || "$true";
-  const fontStyle = (0, import_get_font_sized.getFontSized)(size, extras);
-  if (!fontStyle) return {};
-  const {
-    lineHeight: _lh,
-    ...safeFontStyle
-  } = !import_tamagui.isWeb && fontStyle ? fontStyle : {
-    lineHeight: void 0,
-    ...fontStyle
-  };
-  const lines = props.rows ?? props.numberOfLines;
-  const height = typeof lines === "number" ? lines * (0, import_tamagui.getVariableValue)(fontStyle.lineHeight) : "auto";
-  const paddingVertical = (0, import_get_token.getSpace)(size, {
-    shift: -2,
-    bounds: [2]
-  });
-  const paddingHorizontal = (0, import_get_token.getSpace)(size, {
-    shift: -1,
-    bounds: [2]
+  const recipe = (0, import_theme.sizeRecipeForToken)(String(val || "$true"), {
+    touch: (0, import_theme.isTouchSurface)()
   });
+  const lineHeight = Math.round(recipe.fontSize * 1.25);
+  const lines = props.rows ?? props.numberOfLines;
+  const height = typeof lines === "number" ? lines * lineHeight + recipe.gap * 2 : "auto";
   return {
-    ...safeFontStyle,
-    paddingVertical,
-    paddingHorizontal,
+    fontSize: recipe.fontSize,
+    ...(import_tamagui.isWeb ? {
+      lineHeight
+    } : void 0),
+    paddingVertical: recipe.gap,
+    paddingHorizontal: recipe.paddingHorizontal,
     height
   };
 };

package/dist/cjs/themedPrimitives.native.js

@@ -27,38 +27,26 @@ __export(themedPrimitives_exports, {
   ThemedTextArea: () => ThemedTextArea
 });
 module.exports = __toCommonJS(themedPrimitives_exports);
-var import_get_font_sized = require("@tamagui/get-font-sized");
-var import_get_token = require("@tamagui/get-token");
+var import_theme = require("@multiplatform.one/theme");
 var import_tamagui = require("tamagui");
 var textAreaSizeWithoutRadius = function textAreaSizeWithoutRadius2(val, extras) {
   var _props_rows;
   var {
     props
   } = extras;
-  var size = val || "$true";
-  var fontStyle = (0, import_get_font_sized.getFontSized)(size, extras);
-  if (!fontStyle) return {};
-  var {
-    lineHeight: _lh,
-    ...safeFontStyle
-  } = !import_tamagui.isWeb && fontStyle ? fontStyle : {
-    lineHeight: void 0,
-    ...fontStyle
-  };
-  var lines = (_props_rows = props.rows) !== null && _props_rows !== void 0 ? _props_rows : props.numberOfLines;
-  var height = typeof lines === "number" ? lines * (0, import_tamagui.getVariableValue)(fontStyle.lineHeight) : "auto";
-  var paddingVertical = (0, import_get_token.getSpace)(size, {
-    shift: -2,
-    bounds: [2]
-  });
-  var paddingHorizontal = (0, import_get_token.getSpace)(size, {
-    shift: -1,
-    bounds: [2]
+  var recipe = (0, import_theme.sizeRecipeForToken)(String(val || "$true"), {
+    touch: (0, import_theme.isTouchSurface)()
   });
+  var lineHeight = Math.round(recipe.fontSize * 1.25);
+  var lines = (_props_rows = props.rows) !== null && _props_rows !== void 0 ? _props_rows : props.numberOfLines;
+  var height = typeof lines === "number" ? lines * lineHeight + recipe.gap * 2 : "auto";
   return {
-    ...safeFontStyle,
-    paddingVertical,
-    paddingHorizontal,
+    fontSize: recipe.fontSize,
+    ...(import_tamagui.isWeb ? {
+      lineHeight
+    } : void 0),
+    paddingVertical: recipe.gap,
+    paddingHorizontal: recipe.paddingHorizontal,
     height
   };
 };

package/dist/cjs/themedPrimitives.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","themedPrimitives_exports","__export","ThemedTextArea","module","exports","import_get_font_sized","require","import_get_token","import_tamagui","textAreaSizeWithoutRadius","textAreaSizeWithoutRadius2","val","extras","_props_rows","props","size","fontStyle","getFontSized","lineHeight","_lh","safeFontStyle","isWeb","lines","rows","numberOfLines","height","getVariableValue","paddingVertical","getSpace","shift","bounds","paddingHorizontal"],"sources":["../../src/themedPrimitives.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA6B,CAAAK,wBAAA;AAC7B,IAAAK,qBAAyB,GAAAC,OAAA;AAGzB,IAAAC,gBAAA,GAA6ED,OAAA;AAgB7E,IAAAE,cAAM,GAAAF,OAAA,UAA6D;AACjE,IAAAG,yBAAkB,YAAAC,2BAAAC,GAAA,EAAAC,MAAA;EAClB,IAAAC,WAAa;EACb;IAAMC;EAAA,IAAAF,MAAY;EAClB,IAAIG,IAAC,GAAAJ,GAAA,IAAW,OAAQ;EACxB,IAAAK,SAAQ,OAAYX,qBAAQ,CAAcY,YACvC,EAAAF,IAAA,EAAAH,MAAA;EACH,KAAAI,SAAc,SAAM;EACpB;IAAME,UACJ,EAAAC,GAAA;IAAO,GAAAC;EAAU,IAAW,CAAAZ,cAAQ,CAAAa,KAAA,IAAAL,SAAA,GAAAA,SAAiB;IACvDE,UAAM;IACN,GAAAF;EACA;EAAO,IACLM,KAAG,IAAAT,WAAA,GAAAC,KAAA,CAAAS,IAAA,cAAAV,WAAA,cAAAA,WAAA,GAAAC,KAAA,CAAAU,aAAA;EAAA,IACHC,MAAA,UAAAH,KAAA,gBAAAA,KAAA,OAAAd,cAAA,CAAAkB,gBAAA,EAAAV,SAAA,CAAAE,UAAA;EAAA,IACAS,eAAA,OAAApB,gBAAA,CAAAqB,QAAA,EAAAb,IAAA;IACAc,KAAA;IACFC,MAAA,GACF;EAGE;EACA,IAAAC,iBAAU,OAAAxB,gBAAA,CAAAqB,QAAA,EAAAb,IAAA;IACRc,KAAA,EAAM;IAAAC,MACJ,GACF;EAEH","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","themedPrimitives_exports","__export","ThemedTextArea","module","exports","import_theme","require","import_tamagui","textAreaSizeWithoutRadius","textAreaSizeWithoutRadius2","val","extras","_props_rows","props","recipe","sizeRecipeForToken","String","touch","isTouchSurface","lineHeight","Math","round","fontSize","lines","rows","numberOfLines","height","gap","isWeb","paddingVertical","paddingHorizontal","styled","TextArea","name"],"sources":["../../src/themedPrimitives.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAAT,YAAmD,CAAAK,wBAAA;AACnD,IAAAK,YAAA,GAAAC,OAA2D;AAoB3D,IAAAC,cAAM,GAAAD,OAAA,UAA6D;AACjE,IAAAE,yBAAkB,YAAAC,2BAAAC,GAAA,EAAAC,MAAA;EAClB,IAAAC,WAAM;EACN;IAAMC;EAAA,IAAAF,MAAa;EACnB,IAAAG,MAAM,IAAQ,GAAAT,YAAc,CAAAU,kBAAM,EAAAC,MAAA,CAAAN,GAAA;IAClCO,KAAM,MAAAZ,YAAgB,CAAAa,cAAU;EAChC;EAAO,IACLC,UAAU,GAAAC,IAAO,CAAAC,KAAA,CAAAP,MAAA,CAAAQ,QAAA;EAAA,IACjBC,KAAI,IAAAX,WAAA,GAAAC,KAAU,CAAAW,IAAA,MAAW,IAAI,IAAAZ,WAAA,cAAAA,WAAA,GAAAC,KAAA,CAAAY,aAAA;EAAA,IAC7BC,MAAA,UAAiBH,KAAA,KAAO,WAAAA,KAAA,GAAAJ,UAAA,GAAAL,MAAA,CAAAa,GAAA;EAAA,OACxB;IACAL,QAAA,EAAAR,MAAA,CAAAQ,QAAA;IACF,IAAAf,cAAA,CAAAqB,KAAA;MACFT;IAEO,IAAM;IACXU,eAAM,EAAAf,MAAA,CAAAa,GAAA;IACNG,iBAAU,EAAAhB,MAAA,CAAAgB,iBAAA;IACRJ;EAAM;AACO;AACb,IACFxB,cAAA,OAAAK,cAAA,CAAAwB,MAAA,EAAAxB,cAAA,CAAAyB,QAAA;EACDC,IAAA","ignoreList":[]}

package/dist/esm/AdaptivePopup/index.mjs

@@ -1,8 +1,8 @@
-import { useRef } from "react";
-import { useResolvedKnobs } from "@multiplatform.one/theme";
-import { Dialog, Sheet, Unspaced, useMedia, View, XStack, YStack } from "tamagui";
+import { useCallback, useRef } from "react";
+import { ensureFocusVisibleRing, useResolvedKnobs } from "@multiplatform.one/theme";
+import { Dialog, isWeb, Sheet, Unspaced, useMedia, View, XStack, YStack } from "tamagui";
 import { X } from "@tamagui/lucide-icons-2";
-import { Button } from "../Button/index.mjs";
+import { formCommonColors } from "../shared/colorRamps.mjs";
 import { useReturnFocusOnClose, useSheetModalFocus } from "../shared/focusManagement.mjs";
 import { useSheetEscapeDismiss } from "../shared/useSheetEscapeDismiss.mjs";
 import { zIndex } from "../shared/zIndex.mjs";
@@ -22,6 +22,85 @@ const sizeToHeight = {
   xl: "auto",
   fullscreen: "90vh"
 };
+const overlayFrameFocus = {
+  outlineWidth: 0,
+  focusStyle: {
+    outlineWidth: 0
+  },
+  focusVisibleStyle: {
+    outlineWidth: 0
+  }
+};
+function VisuallyHidden({
+  children
+}) {
+  return /* @__PURE__ */jsx(YStack, {
+    position: "absolute",
+    width: 1,
+    height: 1,
+    overflow: "hidden",
+    opacity: 0,
+    pointerEvents: "none",
+    children
+  });
+}
+function PopupCloseButton({
+  onPress
+}) {
+  const {
+    knobProps
+  } = useResolvedKnobs({
+    compact: true
+  });
+  const {
+    px,
+    hitSlop,
+    ...box
+  } = knobProps.nestedControl;
+  const glyph = Math.max(12, Math.round(px * 0.5));
+  const onKeyDown = e => {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault?.();
+      onPress();
+    }
+  };
+  return /* @__PURE__ */jsx(View, {
+    ...box,
+    position: "absolute",
+    top: 0,
+    right: 0,
+    zIndex: 1,
+    role: "button",
+    "aria-label": "Close",
+    "data-testid": "adaptive-popup-close",
+    "data-nested-px": px,
+    cursor: "pointer",
+    alignItems: "center",
+    justifyContent: "center",
+    borderRadius: knobProps.pointy ? 0 : 9999,
+    outlineWidth: 0,
+    focusStyle: {
+      outlineWidth: 0
+    },
+    focusVisibleStyle: ensureFocusVisibleRing(),
+    onPress,
+    ...(!isWeb ? {
+      hitSlop
+    } : {}),
+    ...(isWeb ? {
+      tabIndex: 0,
+      onKeyDown
+    } : {
+      accessible: true,
+      accessibilityRole: "button",
+      accessibilityLabel: "Close"
+    }),
+    children: /* @__PURE__ */jsx(X, {
+      size: glyph,
+      color: formCommonColors.muted
+    })
+  });
+}
 function AdaptivePopup({
   open,
   onOpenChange,
@@ -37,6 +116,11 @@ function AdaptivePopup({
   const {
     knobProps
   } = useResolvedKnobs();
+  const {
+    knobProps: nestedKnobs
+  } = useResolvedKnobs({
+    compact: true
+  });
   const media = useMedia();
   const viewportGtSm = useViewportGtSm();
   const isDesktop = typeof window !== "undefined" ? viewportGtSm : media.gtSm === true;
@@ -46,50 +130,80 @@ function AdaptivePopup({
   useSheetModalFocus(open && !isDesktop, sheetFrameRef);
   const maxWidth = sizeToWidth[size];
   const maxHeight = sizeToHeight[size];
-  const headerContent = (title || showCloseButton) && /* @__PURE__ */jsxs(XStack, {
-    justifyContent: "space-between",
-    alignItems: "center",
-    children: [title && /* @__PURE__ */jsx(YStack, {
-      flex: 1,
-      children: /* @__PURE__ */jsx(Dialog.Title, {
-        ...knobProps.heading,
-        fontSize: "$6",
-        children: title
-      })
-    }), showCloseButton && /* @__PURE__ */jsx(Dialog.Close, {
-      asChild: true,
-      children: /* @__PURE__ */jsx(Button, {
-        size: "$3",
-        circular: true,
-        chromeless: true,
-        children: /* @__PURE__ */jsx(X, {
-          size: 20
+  const closePx = nestedKnobs.nestedControl.px;
+  const openFromTrigger = useCallback(() => {
+    if (!disabled) onOpenChange(true);
+  }, [disabled, onOpenChange]);
+  const triggerActivation = isWeb ? {
+    onClickCapture: openFromTrigger
+  } : void 0;
+  const triggerWrap = {
+    cursor: disabled ? "not-allowed" : "pointer",
+    opacity: disabled ? 0.5 : 1,
+    "data-testid": "adaptive-popup-trigger",
+    ...(isWeb ? {
+      tabIndex: -1,
+      role: "presentation",
+      ...triggerActivation
+    } : {
+      onPress: openFromTrigger
+    })
+  };
+  const headerContent = (title || showCloseButton) && /* @__PURE__ */jsx(Unspaced, {
+    children: /* @__PURE__ */jsx(XStack, {
+      justifyContent: "space-between",
+      alignItems: "center",
+      paddingRight: showCloseButton ? closePx : void 0,
+      minHeight: showCloseButton ? closePx : void 0,
+      children: title ? /* @__PURE__ */jsx(YStack, {
+        flex: 1,
+        children: /* @__PURE__ */jsx(Dialog.Title, {
+          ...knobProps.heading,
+          children: title
         })
-      })
-    })]
-  });
-  const descriptionContent = description && /* @__PURE__ */jsx(Dialog.Description, {
-    ...knobProps.body,
-    color: "$color11",
-    fontSize: knobProps.sizeToken,
-    children: description
+      }) : null
+    })
   });
   const footerContent = footer && /* @__PURE__ */jsx(YStack, {
     paddingTop: "$2",
     children: footer
   });
+  const body = /* @__PURE__ */jsxs(YStack, {
+    flex: size === "fullscreen" ? 1 : void 0,
+    position: "relative",
+    ...knobProps.gap,
+    children: [!title ? /* @__PURE__ */jsx(VisuallyHidden, {
+      children: /* @__PURE__ */jsx(Dialog.Title, {
+        children: "Dialog"
+      })
+    }) : null, headerContent, description ? /* @__PURE__ */jsx(Dialog.Description, {
+      ...knobProps.body,
+      ...knobProps.label,
+      color: formCommonColors.muted,
+      children: description
+    }) : /* @__PURE__ */jsx(VisuallyHidden, {
+      children: /* @__PURE__ */jsx(Dialog.Description, {
+        children: " "
+      })
+    }), /* @__PURE__ */jsx(YStack, {
+      flex: size === "fullscreen" ? 1 : void 0,
+      children
+    }), footerContent, showCloseButton ? /* @__PURE__ */jsx(PopupCloseButton, {
+      onPress: () => onOpenChange(false)
+    }) : null]
+  });
   if (!isDesktop) {
     return /* @__PURE__ */jsxs(Fragment, {
       children: [trigger && /* @__PURE__ */jsx(View, {
-        onPress: () => !disabled && onOpenChange(true),
-        cursor: disabled ? "not-allowed" : "pointer",
-        opacity: disabled ? 0.5 : 1,
+        ...triggerWrap,
         children: trigger
       }), /* @__PURE__ */jsxs(Sheet, {
         modal: true,
         open,
         onOpenChange,
         dismissOnSnapToBottom: true,
+        dismissOnOverlayPress: true,
+        moveOnKeyboardChange: true,
         snapPointsMode: size === "fullscreen" ? "percent" : "fit",
         snapPoints: size === "fullscreen" ? [92] : void 0,
         zIndex: zIndex.sheet,
@@ -103,17 +217,29 @@ function AdaptivePopup({
           exitStyle: {
             opacity: 0
           }
-        }), /* @__PURE__ */jsx(Sheet.Handle, {}), /* @__PURE__ */jsxs(Sheet.Frame, {
+        }), /* @__PURE__ */jsx(Sheet.Handle, {
+          ...{
+            "aria-hidden": true
+          }
+        }), /* @__PURE__ */jsx(Sheet.Frame, {
           ...{
             ref: sheetFrameRef,
             tabIndex: -1
           },
+          unstyled: true,
+          position: "relative",
+          role: "dialog",
+          "aria-modal": true,
+          "aria-label": typeof title === "string" ? title : "Dialog",
+          "data-testid": "adaptive-popup-surface",
+          "data-adaptive-popup-mode": "sheet",
+          ...knobProps.elevatedSurface,
+          borderBottomLeftRadius: 0,
+          borderBottomRightRadius: 0,
+          ...overlayFrameFocus,
           ...knobProps.panelPadding,
-          ...knobProps.gap,
-          children: [headerContent, descriptionContent, /* @__PURE__ */jsx(YStack, {
-            flex: size === "fullscreen" ? 1 : void 0,
-            children
-          }), footerContent]
+          transition: knobProps.transition,
+          children: body
         })]
       })]
     });
@@ -126,8 +252,7 @@ function AdaptivePopup({
       asChild: true,
       disabled,
       children: /* @__PURE__ */jsx(View, {
-        cursor: disabled ? "not-allowed" : "pointer",
-        opacity: disabled ? 0.5 : 1,
+        ...triggerWrap,
         children: trigger
       })
     }), /* @__PURE__ */jsxs(Dialog.Portal, {
@@ -141,12 +266,17 @@ function AdaptivePopup({
         exitStyle: {
           opacity: 0
         }
-      }, "overlay"), /* @__PURE__ */jsxs(Dialog.Content, {
+      }, "overlay"), /* @__PURE__ */jsx(Dialog.Content, {
         unstyled: true,
         position: "relative",
         pointerEvents: "auto",
+        tabIndex: -1,
+        "data-testid": "adaptive-popup-surface",
+        "data-adaptive-popup-mode": "dialog",
         ...knobProps.elevatedSurface,
+        ...overlayFrameFocus,
         transition: knobProps.transition,
+        animateOnly: ["transform", "opacity"],
         enterStyle: {
           opacity: 0,
           scale: 0.96,
@@ -161,13 +291,16 @@ function AdaptivePopup({
         maxHeight,
         width: "90vw",
         ...knobProps.panelPadding,
-        ...knobProps.gap,
-        children: [headerContent && /* @__PURE__ */jsx(Unspaced, {
-          children: headerContent
-        }), descriptionContent, /* @__PURE__ */jsx(YStack, {
-          flex: size === "fullscreen" ? 1 : void 0,
-          children
-        }), footerContent]
+        onOpenAutoFocus: event => {
+          const root = event.currentTarget;
+          const field = root?.querySelector("input, textarea, select, [contenteditable='true']");
+          if (!field) return;
+          event.preventDefault();
+          field.focus({
+            preventScroll: true
+          });
+        },
+        children: body
       }, "content")]
     })]
   });