tamagui 1.130.5 → 1.130.7

package/dist/cjs/index.cjs

@@ -84,7 +84,7 @@ __export(index_exports, {
   withStaticProperties: () => import_core.withStaticProperties
 });
 module.exports = __toCommonJS(index_exports);
-var import_setup = require("./setup.cjs");
+var import_setup = require("./setup");
 __reExport(index_exports, require("@tamagui/accordion"), module.exports);
 __reExport(index_exports, require("@tamagui/adapt"), module.exports);
 __reExport(index_exports, require("@tamagui/alert-dialog"), module.exports);
@@ -128,14 +128,14 @@ __reExport(index_exports, require("@tamagui/use-debounce"), module.exports);
 __reExport(index_exports, require("@tamagui/use-force-update"), module.exports);
 __reExport(index_exports, require("@tamagui/use-window-dimensions"), module.exports);
 __reExport(index_exports, require("@tamagui/visually-hidden"), module.exports);
-__reExport(index_exports, require("./createTamagui.cjs"), module.exports);
-__reExport(index_exports, require("./viewTypes.cjs"), module.exports);
-__reExport(index_exports, require("./views/TamaguiProvider.cjs"), module.exports);
-__reExport(index_exports, require("./views/Anchor.cjs"), module.exports);
-__reExport(index_exports, require("./views/EnsureFlexed.cjs"), module.exports);
-__reExport(index_exports, require("./views/Fieldset.cjs"), module.exports);
-__reExport(index_exports, require("./views/Input.cjs"), module.exports);
-__reExport(index_exports, require("./views/Spinner.cjs"), module.exports);
-__reExport(index_exports, require("./views/TextArea.cjs"), module.exports);
-__reExport(index_exports, require("./views/Text.cjs"), module.exports);
+__reExport(index_exports, require("./createTamagui"), module.exports);
+__reExport(index_exports, require("./viewTypes"), module.exports);
+__reExport(index_exports, require("./views/TamaguiProvider"), module.exports);
+__reExport(index_exports, require("./views/Anchor"), module.exports);
+__reExport(index_exports, require("./views/EnsureFlexed"), module.exports);
+__reExport(index_exports, require("./views/Fieldset"), module.exports);
+__reExport(index_exports, require("./views/Input"), module.exports);
+__reExport(index_exports, require("./views/Spinner"), module.exports);
+__reExport(index_exports, require("./views/TextArea"), module.exports);
+__reExport(index_exports, require("./views/Text"), module.exports);
 var import_core = require("@tamagui/core");

package/dist/cjs/views/Input.cjs

@@ -42,7 +42,7 @@ var import_react = __toESM(require("react")),
   import_core = require("@tamagui/core"),
   import_focusable = require("@tamagui/focusable"),
   import_react_native = require("react-native-web"),
-  import_inputHelpers = require("../helpers/inputHelpers.cjs"),
+  import_inputHelpers = require("../helpers/inputHelpers"),
   import_jsx_runtime = require("react/jsx-runtime");
 const defaultStyles = {
     size: "$true",

package/dist/cjs/views/TextArea.cjs

@@ -38,8 +38,8 @@ module.exports = __toCommonJS(TextArea_exports);
 var import_react = __toESM(require("react")),
   import_constants = require("@tamagui/constants"),
   import_core = require("@tamagui/core"),
-  import_inputHelpers = require("../helpers/inputHelpers.cjs"),
-  import_Input = require("./Input.cjs"),
+  import_inputHelpers = require("../helpers/inputHelpers"),
+  import_Input = require("./Input"),
   import_jsx_runtime = require("react/jsx-runtime");
 const TextAreaFrame = (0, import_core.styled)(import_Input.InputFrame, {
     name: "TextArea",

package/dist/native.js

@@ -2205,6 +2205,58 @@ We have a CLI tool to help check this:
   }
 });
 
+// ../../core/web/dist/cjs/loadDuplicatedConfig.native.js
+var require_loadDuplicatedConfig_native = __commonJS({
+  "../../core/web/dist/cjs/loadDuplicatedConfig.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
+      for (var name in all) __defProp2(target, name, {
+        get: all[name],
+        enumerable: !0
+      });
+    }, __copyProps2 = function(to, from, except, desc) {
+      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+      if (from && typeof from == "object" || typeof from == "function") try {
+        for (var _loop = function() {
+          var key = _step.value;
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
+            get: function() {
+              return from[key];
+            },
+            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+          });
+        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError)
+            throw _iteratorError;
+        }
+      }
+      return to;
+    }, __toCommonJS2 = function(mod) {
+      return __copyProps2(__defProp2({}, "__esModule", {
+        value: !0
+      }), mod);
+    }, loadDuplicatedConfig_exports = {};
+    __export2(loadDuplicatedConfig_exports, {
+      loadDuplicatedConfig: function() {
+        return loadDuplicatedConfig;
+      }
+    });
+    module2.exports = __toCommonJS2(loadDuplicatedConfig_exports);
+    var hasLogged = !1;
+    function loadDuplicatedConfig() {
+      return process.env.NODE_ENV !== "production" && globalThis.__tamaguiConfig ? (hasLogged = !0, hasLogged || console.warn(`Warning: You have duplicate Tamagui dependencies which can cause major, confusing issues.
+    In dev/test, we're working around this by loading a previously loaded config.
+    In production, this will error.`), globalThis.__tamaguiConfig) : null;
+    }
+  }
+});
+
 // ../../core/web/dist/cjs/config.native.js
 var require_config_native = __commonJS({
   "../../core/web/dist/cjs/config.native.js"(exports2, module2) {
@@ -2299,7 +2351,7 @@ var require_config_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(config_exports);
-    var import_constants4 = require_index_native6(), import_constants22 = require_constants_native2(), conf, haventCalledErrorMessage = process.env.NODE_ENV === "development" ? `
+    var import_constants4 = require_index_native6(), import_constants22 = require_constants_native2(), import_loadDuplicatedConfig = require_loadDuplicatedConfig_native(), conf, haventCalledErrorMessage = process.env.NODE_ENV === "development" ? `
 Haven't called createTamagui yet. ${import_constants22.MISSING_THEME_MESSAGE}
 ` : "\u274C Error 001", getSetting2 = function(key) {
       if (process.env.NODE_ENV === "development" && !conf) throw new Error(haventCalledErrorMessage);
@@ -2314,6 +2366,8 @@ Haven't called createTamagui yet. ${import_constants22.MISSING_THEME_MESSAGE}
       if (process.env.NODE_ENV === "development" && !conf) throw new Error(haventCalledErrorMessage);
       conf.fonts[name] = font, conf.fontsParsed[`$${name}`] = fontParsed;
     }, getConfig3 = function() {
+      var dup = (0, import_loadDuplicatedConfig.loadDuplicatedConfig)();
+      if (dup) return dup;
       if (!conf) throw new Error(process.env.NODE_ENV !== "production" ? "Missing tamagui config, you either have a duplicate config, or haven't set it up. Be sure createTamagui is called before rendering. Also, make sure all of your tamagui dependencies are on the same version (`tamagui`, `@tamagui/package-name`, etc.) not just in your package.json, but in your lockfile." : "Err0");
       return conf;
     }, getConfigMaybe = function() {
@@ -10002,7 +10056,7 @@ var require_createTamagui_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(createTamagui_exports);
-    var import_constants4 = require_index_native6(), import_config = require_config_native(), import_createVariables = require_createVariables_native(), import_getThemeCSSRules = require_getThemeCSSRules_native(), import_insertStyleRule = require_insertStyleRule_native(), import_proxyThemeToParents = require_proxyThemeToParents_native(), import_registerCSSVariable = require_registerCSSVariable_native(), import_themes = require_themes_native(), import_useMedia = require_useMedia_native(), import_insertFont = require_insertFont_native(), import_Tamagui = require_Tamagui_native(), createdConfigs = /* @__PURE__ */ new WeakMap();
+    var import_constants4 = require_index_native6(), import_config = require_config_native(), import_createVariables = require_createVariables_native(), import_getThemeCSSRules = require_getThemeCSSRules_native(), import_insertStyleRule = require_insertStyleRule_native(), import_proxyThemeToParents = require_proxyThemeToParents_native(), import_registerCSSVariable = require_registerCSSVariable_native(), import_themes = require_themes_native(), import_useMedia = require_useMedia_native(), import_insertFont = require_insertFont_native(), import_loadDuplicatedConfig = require_loadDuplicatedConfig_native(), import_Tamagui = require_Tamagui_native();
     function shouldTokenCategoryHaveUnits(category) {
       var UNIT_CATEGORIES = /* @__PURE__ */ new Set([
         "size",
@@ -10012,9 +10066,8 @@ var require_createTamagui_native = __commonJS({
       return UNIT_CATEGORIES.has(category);
     }
     function createTamagui2(configIn) {
-      var _configIn_settings;
-      if (process.env.NODE_ENV === "test" && globalThis.__tamaguiConfig) return console.warn("Warning: You somehow have duplicate Tamagui dependencies, this can cause issues. Tamagui is working around this by loading a previously loaded config in test mode. "), globalThis.__tamaguiConfig;
-      if (createdConfigs.has(configIn)) return configIn;
+      var _configIn_settings, dup = (0, import_loadDuplicatedConfig.loadDuplicatedConfig)();
+      if (dup) return dup;
       var tokensParsed = {}, tokens = (0, import_createVariables.createVariables)(configIn.tokens || {});
       if (configIn.tokens) {
         var tokensMerged = {};
@@ -10165,7 +10218,7 @@ ${JSON.stringify(variable, null, 2)}`);
         specificTokens,
         defaultFontToken
       };
-      if ((0, import_config.setConfig)(config), (0, import_useMedia.configureMedia)(config), createdConfigs.set(config, !0), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), import_config.configListeners.size && (import_config.configListeners.forEach(function(cb) {
+      if ((0, import_config.setConfig)(config), (0, import_useMedia.configureMedia)(config), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), import_config.configListeners.size && (import_config.configListeners.forEach(function(cb) {
         return cb(config);
       }), import_config.configListeners.clear()), process.env.NODE_ENV === "development") {
         var _process_env_DEBUG;
@@ -18225,6 +18278,7 @@ var require_useSheetProviderProps_native = __commonJS({
       if (!animationDriver) throw new Error(process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts");
       var scrollBridge = (0, import_use_constant.useConstant)(function() {
         var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
+          hasScrollableContent: !1,
           enabled: !1,
           y: 0,
           paneY: 0,
@@ -18639,7 +18693,7 @@ var require_SheetImplementationCustom_native = __commonJS({
         screenSize,
         frameSize
       ]), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
-        isAbleToPosition && animateTo(position);
+        isAbleToPosition && (animateTo(position), position === -1 && (scrollBridge.scrollLock = !1, scrollBridge.scrollStartY = -1));
       }, [
         isAbleToPosition,
         position
@@ -18671,9 +18725,13 @@ var require_SheetImplementationCustom_native = __commonJS({
           var { dy } = param;
           function getShouldSet() {
             if (e.target === providerProps.handleRef.current) return !0;
-            if (scrollBridge.scrollLock) return !1;
-            var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
+            if (scrollBridge.hasScrollableContent === !0) {
+              if (scrollBridge.scrollLock) return !1;
+              var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
+              if (isScrolled) return previouslyScrolling = !0, !1;
+              if (isNearTop && hasScrollView.current && isDraggingUp) return !1;
+            }
+            return Math.abs(dy) > 5;
           }
           var granted = getShouldSet();
           return granted && scrollBridge.setParentDragging(!0), granted;
@@ -19094,9 +19152,13 @@ var require_SheetScrollView_native = __commonJS({
         var [hasScrollableContent, setHasScrollableContent] = (0, import_react3.useState)(!0), parentHeight = (0, import_react3.useRef)(0), contentHeight = (0, import_react3.useRef)(0), setIsScrollable = function() {
           parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
         };
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
+        return (0, import_react3.useEffect)(function() {
+          scrollBridge.hasScrollableContent = hasScrollableContent;
+        }, [
+          hasScrollableContent
+        ]), /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
           onLayout: function(e) {
-            parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+            parentHeight.current = Math.ceil(e.nativeEvent.layout.height), setIsScrollable();
           },
           ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
           flex: 1,
@@ -19151,7 +19213,7 @@ var require_SheetScrollView_native = __commonJS({
               pointerEvents: "none",
               zIndex: -1,
               onLayout: function(e) {
-                contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+                contentHeight.current = Math.floor(e.nativeEvent.layout.height), setIsScrollable();
               }
             }),
             children