@multiplatform.one/forms 7.11.0 → 7.16.0

package/dist/cjs/fields/Geolocation/index.cjs

@@ -44,6 +44,7 @@ var import_InputParts = require("../../InputParts/index.cjs");
 var import_Skeleton = require("../../Skeleton/index.cjs");
 var import_GeolocationMap = require("./GeolocationMap.cjs");
 var import_nativeSearchFocus = require("./nativeSearchFocus.cjs");
+var import_geocoderContext = require("./geocoderContext.cjs");
 var import_geoValue = require("./geoValue.cjs");
 var import_capabilityPreflight = require("../../shared/capabilityPreflight.cjs");
 var import_colorRamps = require("../../shared/colorRamps.cjs");
@@ -529,7 +530,7 @@ function GeoMapSurface({
         disabled,
         readOnly,
         hasValue
-      }), !hasValue && !locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
+      }), !hasValue ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
         testID: "geolocation-empty",
         position: "absolute",
         top: 0,
@@ -539,91 +540,78 @@ function GeoMapSurface({
         zIndex: 2,
         alignItems: "center",
         justifyContent: "center",
-        gap: "$2",
-        pointerEvents: "box-none",
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
+        pointerEvents: "none",
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
           ...knobProps.body,
           color: import_colorRamps.formCommonColors.muted,
-          pointerEvents: "none",
           children: (0, import_t.t)("No location set")
-        }), !readOnly && !disabled ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$4",
-          onPress: onUseMyLocation,
-          disabled: locating,
-          testID: "geolocation-empty-locate",
-          "aria-label": (0, import_t.t)("Use my current location"),
-          children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
-            children: (0, import_t.t)("Use my current location")
-          })
-        }) : null]
-      }) : null, handleExpand && expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-        position: "absolute",
-        top: "$2",
-        insetInlineEnd: "$2",
-        zIndex: 2,
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$2",
-          circular: true,
-          disabled,
-          onPress: handleExpand,
-          backgroundColor: "$background",
-          "aria-label": (0, import_t.t)("Expand map"),
-          focusVisibleStyle: overlayFocusRing,
-          hitSlop: (0, import_theme.pressTargetHitSlop)(32),
-          children: expandIcon
         })
-      }), !readOnly && !locateErrorOpen && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-        position: "absolute",
-        bottom: "$2",
-        insetInlineEnd: "$2",
-        zIndex: 2,
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$2",
-          circular: true,
-          disabled: disabled || locating,
-          onPress: onUseMyLocation,
-          backgroundColor: "$background",
-          icon: locating ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Spinner, {
-            size: "small"
-          }) : locationIcon,
-          "aria-label": locating ? (0, import_t.t)("Locating") : (0, import_t.t)("Locate"),
-          focusVisibleStyle: overlayFocusRing,
-          hitSlop: (0, import_theme.pressTargetHitSlop)(32)
-        })
-      }), locateErrorOpen && /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
-        testID: "geolocation-locate-panel",
-        position: "absolute",
-        bottom: "$2",
-        left: "$2",
-        right: "$2",
-        zIndex: 3,
-        ...knobProps.borderRadius,
-        ...knobProps.inputSurface,
-        borderColor: import_colorRamps.formInputColors.border.base,
-        padding: "$3",
+      }) : null]
+    }), locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
+      testID: "geolocation-locate-panel",
+      role: "alert",
+      ...knobProps.borderRadius,
+      ...knobProps.inputSurface,
+      borderColor: import_colorRamps.formInputColors.border.base,
+      padding: "$3",
+      gap: "$2",
+      alignItems: "center",
+      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
+        ...knobProps.body,
+        color: import_colorRamps.formCommonColors.error,
+        textAlign: "center",
+        children: locateError
+      }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
         gap: "$2",
-        alignItems: "center",
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
-          ...knobProps.body,
-          color: import_colorRamps.formCommonColors.error,
-          textAlign: "center",
-          children: locateError
-        }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
-          gap: "$2",
-          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-            size: "$2",
-            onPress: onRetryLocate,
-            "aria-label": (0, import_t.t)("Retry location"),
-            children: (0, import_t.t)("Retry")
-          }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-            size: "$2",
-            onPress: onCloseLocate,
-            "aria-label": (0, import_t.t)("Close location"),
-            children: (0, import_t.t)("Close")
-          })]
+        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+          size: "$2",
+          onPress: onRetryLocate,
+          "aria-label": (0, import_t.t)("Retry location"),
+          children: (0, import_t.t)("Retry")
+        }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+          size: "$2",
+          onPress: onCloseLocate,
+          "aria-label": (0, import_t.t)("Close location"),
+          children: (0, import_t.t)("Close")
         })]
       })]
-    }), coordLine, expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_AdaptivePopup.AdaptivePopup, {
+    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
+      testID: "geolocation-map-footer",
+      alignItems: "center",
+      flexWrap: "wrap",
+      gap: "$2",
+      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+        flexGrow: 1,
+        flexShrink: 1,
+        flexBasis: 0,
+        minWidth: 160,
+        children: coordLine
+      }), !readOnly && !locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+        size: "$2",
+        disabled: disabled || locating,
+        onPress: onUseMyLocation,
+        icon: locating ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Spinner, {
+          size: "small"
+        }) : locationIcon,
+        testID: hasValue ? "geolocation-locate" : "geolocation-empty-locate",
+        "aria-label": hasValue ? (0, import_t.t)("Locate") : (0, import_t.t)("Use my current location"),
+        "aria-busy": locating || void 0,
+        hitSlop: (0, import_theme.pressTargetHitSlop)(32),
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
+          children: hasValue ? (0, import_t.t)("Locate") : (0, import_t.t)("Use my current location")
+        })
+      }) : null, handleExpand && expandIcon ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+        size: "$2",
+        disabled,
+        onPress: handleExpand,
+        icon: expandIcon,
+        "aria-label": (0, import_t.t)("Expand map"),
+        hitSlop: (0, import_theme.pressTargetHitSlop)(32),
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
+          children: (0, import_t.t)("Expand")
+        })
+      }) : null]
+    }), expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_AdaptivePopup.AdaptivePopup, {
       open: expanded,
       onOpenChange: setExpanded,
       title: (0, import_t.t)("Select Location"),
@@ -704,6 +692,7 @@ function Geolocation({
   reverseGeocode: reverseGeocodeProp,
   geocoder
 }) {
+  const hydrationTouch = (0, import_theme.useTouchSurface)();
   const {
     resolvedForm,
     knobProps,
@@ -722,13 +711,14 @@ function Geolocation({
   const inTableCell = (0, import_tableCellContext.useIsInTableCell)();
   const viewportGtSm = (0, import_FloatingPanel.useViewportGtSm)();
   const shouldUseSheet = !import_tamagui.isWeb || !viewportGtSm;
+  const contextGeocoder = (0, import_geocoderContext.useGeocoder)();
   const {
     geocode,
     reverseGeocode
   } = (0, import_geocoder.resolveGeocoder)({
     geocode: geocodeProp,
     reverseGeocode: reverseGeocodeProp,
-    geocoder
+    geocoder: geocoder === void 0 ? contextGeocoder ?? void 0 : geocoder ?? void 0
   });
   const searchEnabled = Boolean(geocode) && !disabled && !readOnly;
   const listId = (0, import_react2.useId)();
@@ -1005,7 +995,7 @@ function Geolocation({
       }
     };
   }, [startLocate, requestPosition, cancelLocate, applyAddress, closeSearch]);
-  const mapHeight = (0, import_utils.getFieldHeight)(size ?? knobProps.sizeToken, compact ? 4 : 5);
+  const mapHeight = (0, import_utils.getFieldHeight)(size ?? knobProps.sizeToken, compact ? 4 : 5, hydrationTouch);
   const displayError = error || preflightError;
   const renderSearch = (handlers, opts = {}) => {
     const showClear = Boolean(query) && !disabled && !readOnly;
@@ -1081,7 +1071,7 @@ function Geolocation({
               onBlur: () => nativeSearchFocus.blur(!!opts.sheetHeader, resultsOpen)
             } : {}),
             onFocus: () => {
-              if (searchEnabled && !opts.editingCell && !closingSearchRef.current && (import_tamagui.isWeb || nativeSearchFocus.canOpen(!!opts.sheetHeader))) setResultsOpen(true);
+              if (!import_tamagui.isWeb && searchEnabled && !opts.editingCell && !closingSearchRef.current && nativeSearchFocus.canOpen(!!opts.sheetHeader)) setResultsOpen(true);
             }
           })
         }), showClear ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Section, {

package/dist/cjs/fields/Geolocation/index.native.js

@@ -47,6 +47,7 @@ var import_InputParts = require("../../InputParts/index.native.js");
 var import_Skeleton = require("../../Skeleton/index.native.js");
 var import_GeolocationMap = require("./GeolocationMap.native.js");
 var import_nativeSearchFocus = require("./nativeSearchFocus.native.js");
+var import_geocoderContext = require("./geocoderContext.native.js");
 var import_geoValue = require("./geoValue.native.js");
 var import_capabilityPreflight = require("../../shared/capabilityPreflight.native.js");
 var import_colorRamps = require("../../shared/colorRamps.native.js");
@@ -559,7 +560,7 @@ function GeoMapSurface(param) {
         disabled,
         readOnly,
         hasValue
-      }), !hasValue && !locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
+      }), !hasValue ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
         testID: "geolocation-empty",
         position: "absolute",
         top: 0,
@@ -569,91 +570,78 @@ function GeoMapSurface(param) {
         zIndex: 2,
         alignItems: "center",
         justifyContent: "center",
-        gap: "$2",
-        pointerEvents: "box-none",
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
+        pointerEvents: "none",
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
           ...knobProps.body,
           color: import_colorRamps.formCommonColors.muted,
-          pointerEvents: "none",
           children: (0, import_t.t)("No location set")
-        }), !readOnly && !disabled ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$4",
-          onPress: onUseMyLocation,
-          disabled: locating,
-          testID: "geolocation-empty-locate",
-          "aria-label": (0, import_t.t)("Use my current location"),
-          children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
-            children: (0, import_t.t)("Use my current location")
-          })
-        }) : null]
-      }) : null, handleExpand && expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-        position: "absolute",
-        top: "$2",
-        insetInlineEnd: "$2",
-        zIndex: 2,
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$2",
-          circular: true,
-          disabled,
-          onPress: handleExpand,
-          backgroundColor: "$background",
-          "aria-label": (0, import_t.t)("Expand map"),
-          focusVisibleStyle: overlayFocusRing,
-          hitSlop: (0, import_theme.pressTargetHitSlop)(32),
-          children: expandIcon
         })
-      }), !readOnly && !locateErrorOpen && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.View, {
-        position: "absolute",
-        bottom: "$2",
-        insetInlineEnd: "$2",
-        zIndex: 2,
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-          size: "$2",
-          circular: true,
-          disabled: disabled || locating,
-          onPress: onUseMyLocation,
-          backgroundColor: "$background",
-          icon: locating ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Spinner, {
-            size: "small"
-          }) : locationIcon,
-          "aria-label": locating ? (0, import_t.t)("Locating") : (0, import_t.t)("Locate"),
-          focusVisibleStyle: overlayFocusRing,
-          hitSlop: (0, import_theme.pressTargetHitSlop)(32)
-        })
-      }), locateErrorOpen && /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
-        testID: "geolocation-locate-panel",
-        position: "absolute",
-        bottom: "$2",
-        left: "$2",
-        right: "$2",
-        zIndex: 3,
-        ...knobProps.borderRadius,
-        ...knobProps.inputSurface,
-        borderColor: import_colorRamps.formInputColors.border.base,
-        padding: "$3",
+      }) : null]
+    }), locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
+      testID: "geolocation-locate-panel",
+      role: "alert",
+      ...knobProps.borderRadius,
+      ...knobProps.inputSurface,
+      borderColor: import_colorRamps.formInputColors.border.base,
+      padding: "$3",
+      gap: "$2",
+      alignItems: "center",
+      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
+        ...knobProps.body,
+        color: import_colorRamps.formCommonColors.error,
+        textAlign: "center",
+        children: locateError
+      }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
         gap: "$2",
-        alignItems: "center",
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
-          ...knobProps.body,
-          color: import_colorRamps.formCommonColors.error,
-          textAlign: "center",
-          children: locateError
-        }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
-          gap: "$2",
-          children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-            size: "$2",
-            onPress: onRetryLocate,
-            "aria-label": (0, import_t.t)("Retry location"),
-            children: (0, import_t.t)("Retry")
-          }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
-            size: "$2",
-            onPress: onCloseLocate,
-            "aria-label": (0, import_t.t)("Close location"),
-            children: (0, import_t.t)("Close")
-          })]
+        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+          size: "$2",
+          onPress: onRetryLocate,
+          "aria-label": (0, import_t.t)("Retry location"),
+          children: (0, import_t.t)("Retry")
+        }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+          size: "$2",
+          onPress: onCloseLocate,
+          "aria-label": (0, import_t.t)("Close location"),
+          children: (0, import_t.t)("Close")
         })]
       })]
-    }), coordLine, expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_AdaptivePopup.AdaptivePopup, {
+    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
+      testID: "geolocation-map-footer",
+      alignItems: "center",
+      flexWrap: "wrap",
+      gap: "$2",
+      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
+        flexGrow: 1,
+        flexShrink: 1,
+        flexBasis: 0,
+        minWidth: 160,
+        children: coordLine
+      }), !readOnly && !locateErrorOpen ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+        size: "$2",
+        disabled: disabled || locating,
+        onPress: onUseMyLocation,
+        icon: locating ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Spinner, {
+          size: "small"
+        }) : locationIcon,
+        testID: hasValue ? "geolocation-locate" : "geolocation-empty-locate",
+        "aria-label": hasValue ? (0, import_t.t)("Locate") : (0, import_t.t)("Use my current location"),
+        "aria-busy": locating || void 0,
+        hitSlop: (0, import_theme.pressTargetHitSlop)(32),
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
+          children: hasValue ? (0, import_t.t)("Locate") : (0, import_t.t)("Use my current location")
+        })
+      }) : null, handleExpand && expandIcon ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button, {
+        size: "$2",
+        disabled,
+        onPress: handleExpand,
+        icon: expandIcon,
+        "aria-label": (0, import_t.t)("Expand map"),
+        hitSlop: (0, import_theme.pressTargetHitSlop)(32),
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Button.Button.Text, {
+          children: (0, import_t.t)("Expand")
+        })
+      }) : null]
+    }), expandIcon && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_AdaptivePopup.AdaptivePopup, {
       open: expanded,
       onOpenChange: setExpanded,
       title: (0, import_t.t)("Select Location"),
@@ -736,6 +724,7 @@ function Geolocation(param) {
     reverseGeocode: reverseGeocodeProp,
     geocoder
   } = param;
+  var hydrationTouch = (0, import_theme.useTouchSurface)();
   var {
     resolvedForm,
     knobProps,
@@ -754,13 +743,14 @@ function Geolocation(param) {
   var inTableCell = (0, import_tableCellContext.useIsInTableCell)();
   var viewportGtSm = (0, import_FloatingPanel.useViewportGtSm)();
   var shouldUseSheet = !import_tamagui.isWeb || !viewportGtSm;
+  var contextGeocoder = (0, import_geocoderContext.useGeocoder)();
   var {
     geocode,
     reverseGeocode
   } = (0, import_geocoder.resolveGeocoder)({
     geocode: geocodeProp,
     reverseGeocode: reverseGeocodeProp,
-    geocoder
+    geocoder: geocoder === void 0 ? contextGeocoder !== null && contextGeocoder !== void 0 ? contextGeocoder : void 0 : geocoder !== null && geocoder !== void 0 ? geocoder : void 0
   });
   var searchEnabled = Boolean(geocode) && !disabled && !readOnly;
   var listId = (0, import_react2.useId)();
@@ -1043,7 +1033,7 @@ function Geolocation(param) {
       }
     };
   }, [startLocate, requestPosition, cancelLocate, applyAddress, closeSearch]);
-  var mapHeight = (0, import_utils.getFieldHeight)(size !== null && size !== void 0 ? size : knobProps.sizeToken, compact ? 4 : 5);
+  var mapHeight = (0, import_utils.getFieldHeight)(size !== null && size !== void 0 ? size : knobProps.sizeToken, compact ? 4 : 5, hydrationTouch);
   var displayError = error || preflightError;
   var renderSearch = function renderSearch2(handlers) {
     var opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
@@ -1131,7 +1121,7 @@ function Geolocation(param) {
               }
             } : {}),
             onFocus: function onFocus() {
-              if (searchEnabled && !opts.editingCell && !closingSearchRef.current && (import_tamagui.isWeb || nativeSearchFocus.canOpen(!!opts.sheetHeader))) setResultsOpen(true);
+              if (!import_tamagui.isWeb && searchEnabled && !opts.editingCell && !closingSearchRef.current && nativeSearchFocus.canOpen(!!opts.sheetHeader)) setResultsOpen(true);
             }
           })
         }), showClear ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_InputParts.Input.Section, {