@tamagui/web 1.98.0 → 1.98.1

package/dist/cjs/views/Slot.js

@@ -19,7 +19,7 @@ __export(Slot_exports, {
 });
 module.exports = __toCommonJS(Slot_exports);
 var import_compose_refs = require("@tamagui/compose-refs"), import_constants = require("@tamagui/constants"), import_helpers = require("@tamagui/helpers"), import_react = require("react"), import_jsx_runtime = require("react/jsx-runtime");
-const Slot = (0, import_react.forwardRef)(function(props, forwardedRef) {
+const is19 = import_react.version.startsWith("19."), Slot = (0, import_react.forwardRef)(function(props, forwardedRef) {
   const { children, ...slotProps } = props;
   if ((0, import_react.isValidElement)(children)) {
     const mergedProps = mergeSlotProps(children, slotProps);
@@ -27,7 +27,10 @@ const Slot = (0, import_react.forwardRef)(function(props, forwardedRef) {
       children,
       children.type.avoidForwardRef ? mergedProps : {
         ...mergedProps,
-        ref: (0, import_compose_refs.composeRefs)(forwardedRef, children.ref)
+        ref: (0, import_compose_refs.composeRefs)(
+          forwardedRef,
+          is19 ? children.props.ref : children.ref
+        )
       }
     );
   }

package/dist/cjs/views/Slot.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Slot.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAA4B,kCAC5B,mBAAsB,+BACtB,iBAAqC,6BAErC,eAAmE,kBAoC1D;AA1BF,MAAM,WAAO,yBAA2B,SAAc,OAAO,cAAc;AAChF,QAAM,EAAE,UAAU,GAAG,UAAU,IAAI;AAEnC,UAAI,6BAAe,QAAQ,GAAG;AAC5B,UAAM,cAAc,eAAe,UAAU,SAAS;AACtD,eAAO;AAAA,MACL;AAAA,MACA,SAAS,KAAK,kBACV,cACA;AAAA,QACE,GAAG;AAAA,QACH,SAAK,iCAAY,cAAe,SAAiB,GAAG;AAAA,MACtD;AAAA,IACN;AAAA,EACF;AAEA,SAAO,sBAAS,MAAM,QAAQ,IAAI,IAAI,sBAAS,KAAK,IAAI,IAAI;AAC9D,CAAC;AAED,KAAK,cAAiB;AAMf,MAAM,YAAY,CAAC,EAAE,SAAS,MAC5B,2EAAG,UAAS;AAGrB,UAAU,cAAiB;AAI3B,MAAM,WAAW,yBACb;AAAA,EACE,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,WAAW;AACb,IACA,CAAC;AAEL,SAAS,eAAe,OAAY,WAAgC;AAClE,QAAM,aAAa,MAAM,OAGnB,gBAAgB,EAAE,GAAG,WAAW,GAChC,cAAc,OAAO,MAAM,QAAS;AAE1C,MAAI;AACF,eAAW,OAAO;AAChB,MAAI,OAAO,cACT,UAAU,SAAS,GAAG,CAAC,IAAI,UAAU,GAAG,GACxC,OAAO,UAAU,GAAG;AAK1B,WAAS,YAAY,YAAY;AAC/B,UAAM,gBAAgB,UAAU,QAAQ,GAClC,iBAAiB,WAAW,QAAQ;AAE1C,IAAI,eAAe,YAAY,aAC7B,WAAW,SAAS,QAAQ,GAC5B,OAAO,cAAc,QAAQ,IAGb,YAAY,KAAK,QAAQ,IAGzC,cAAc,QAAQ,QAAI,qCAAqB,gBAAgB,aAAa,IAGrE,aAAa,UACpB,cAAc,QAAQ,IAAI,EAAE,GAAG,eAAe,GAAG,eAAe,IACvD,aAAa,gBACtB,cAAc,QAAQ,IAAI,CAAC,eAAe,cAAc,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAAA,EAEtF;AAEA,SAAO,EAAE,GAAG,WAAW,GAAG,cAAc;AAC1C;AAEA,MAAM,cAAc;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAA4B,kCAC5B,mBAAsB,+BACtB,iBAAqC,6BAErC,eAA4E,kBAyCnE;AA/BT,MAAM,OAAO,qBAAQ,WAAW,KAAK,GAExB,WAAO,yBAA2B,SAAc,OAAO,cAAc;AAChF,QAAM,EAAE,UAAU,GAAG,UAAU,IAAI;AAEnC,UAAI,6BAAe,QAAQ,GAAG;AAC5B,UAAM,cAAc,eAAe,UAAU,SAAS;AACtD,eAAO;AAAA,MACL;AAAA,MACA,SAAS,KAAK,kBACV,cACA;AAAA,QACE,GAAG;AAAA,QACH,SAAK;AAAA,UACH;AAAA,UACA,OAAQ,SAAiB,MAAM,MAAO,SAAiB;AAAA,QACzD;AAAA,MACF;AAAA,IACN;AAAA,EACF;AAEA,SAAO,sBAAS,MAAM,QAAQ,IAAI,IAAI,sBAAS,KAAK,IAAI,IAAI;AAC9D,CAAC;AAED,KAAK,cAAiB;AAMf,MAAM,YAAY,CAAC,EAAE,SAAS,MAC5B,2EAAG,UAAS;AAGrB,UAAU,cAAiB;AAI3B,MAAM,WAAW,yBACb;AAAA,EACE,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,WAAW;AACb,IACA,CAAC;AAEL,SAAS,eAAe,OAAY,WAAgC;AAClE,QAAM,aAAa,MAAM,OAGnB,gBAAgB,EAAE,GAAG,WAAW,GAChC,cAAc,OAAO,MAAM,QAAS;AAE1C,MAAI;AACF,eAAW,OAAO;AAChB,MAAI,OAAO,cACT,UAAU,SAAS,GAAG,CAAC,IAAI,UAAU,GAAG,GACxC,OAAO,UAAU,GAAG;AAK1B,WAAS,YAAY,YAAY;AAC/B,UAAM,gBAAgB,UAAU,QAAQ,GAClC,iBAAiB,WAAW,QAAQ;AAE1C,IAAI,eAAe,YAAY,aAC7B,WAAW,SAAS,QAAQ,GAC5B,OAAO,cAAc,QAAQ,IAGb,YAAY,KAAK,QAAQ,IAGzC,cAAc,QAAQ,QAAI,qCAAqB,gBAAgB,aAAa,IAGrE,aAAa,UACpB,cAAc,QAAQ,IAAI,EAAE,GAAG,eAAe,GAAG,eAAe,IACvD,aAAa,gBACtB,cAAc,QAAQ,IAAI,CAAC,eAAe,cAAc,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAAA,EAEtF;AAEA,SAAO,EAAE,GAAG,WAAW,GAAG,cAAc;AAC1C;AAEA,MAAM,cAAc;",
   "names": []
 }

package/dist/cjs/views/Slot.native.js

@@ -73,14 +73,14 @@ function _object_without_properties_loose(source, excluded) {
     key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
   return target;
 }
-var Slot = /* @__PURE__ */ (0, import_react.forwardRef)(function(props, forwardedRef) {
+var is19 = import_react.version.startsWith("19."), Slot = /* @__PURE__ */ (0, import_react.forwardRef)(function(props, forwardedRef) {
   var children = props.children, slotProps = _object_without_properties(props, [
     "children"
   ]);
   if (/* @__PURE__ */ (0, import_react.isValidElement)(children)) {
     var mergedProps = mergeSlotProps(children, slotProps);
     return /* @__PURE__ */ (0, import_react.cloneElement)(children, children.type.avoidForwardRef ? mergedProps : _object_spread_props(_object_spread({}, mergedProps), {
-      ref: (0, import_compose_refs.composeRefs)(forwardedRef, children.ref)
+      ref: (0, import_compose_refs.composeRefs)(forwardedRef, is19 ? children.props.ref : children.ref)
     }));
   }
   return import_react.Children.count(children) > 1 ? import_react.Children.only(null) : null;

package/dist/cjs/views/Slot.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/packages/web/src/views/Slot.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;uDAEA,sBAA4B,kCAC5B,mBAAsB,+BACtB,iBAAqC,6BAErC,eAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU5D,IAAMA,OAAOC,6CAA2B,SAAcC,OAAOC,cAAY;AAC9E,MAAQC,WAA2BF,MAA3BE,UAAaC,YAAAA,2BAAcH,OAAAA;IAA3BE;;AAER,MAAIE,iDAAeF,QAAAA,GAAW;AAC5B,QAAMG,cAAcC,eAAeJ,UAAUC,SAAAA;AAC7C,WAAOI,+CACLL,UACAA,SAASM,KAAK,kBACVH,cACA,qBAAA,eAAA,CAAA,GACKA,WAAAA,GAAAA;MACHI,SAAKC,iCAAYT,cAAeC,SAAiBO,GAAG;;EAG9D;AAEA,SAAOE,sBAASC,MAAMV,QAAAA,IAAY,IAAIS,sBAASE,KAAK,IAAA,IAAQ;AAC9D,CAAA;AAEAf,KAAK,cAAiB;AAMf,IAAMgB,YAAY,SAAA,OAAA;MAAGZ,WAAAA,MAAAA;AAC1B,SAAO,uCAAAa,KAAA,mBAAAC,UAAA;;;AACT;AAEAF,UAAU,cAAiB;AAI3B,IAAMG,WAAWC,yBACb;EACEC,SAAS;EACTC,YAAY;EACZC,WAAW;AACb,IACA,CAAC;AAEL,SAASf,eAAegB,OAAYnB,WAA8B;AAChE,MAAMoB,aAAaD,MAAMtB,OAGnBwB,gBAAgB,eAAA,CAAA,GAAKD,UAAAA,GACrBE,cAAc,OAAOH,MAAMd,QAAS;AAE1C,MAAIiB;AACF,aAAWC,OAAOT;AAChB,MAAIS,OAAOvB,cACTA,UAAUc,SAASS,GAAAA,CAAI,IAAIvB,UAAUuB,GAAAA,GACrC,OAAOvB,UAAUuB,GAAAA;AAKvB,WAASC,YAAYJ,YAAY;AAC/B,QAAMK,gBAAgBzB,UAAUwB,QAAAA,GAC1BE,iBAAiBN,WAAWI,QAAAA;AAElC,IAAIF,eAAeE,YAAYV,aAC7BU,WAAWV,SAASU,QAAAA,GACpB,OAAOH,cAAcG,QAAAA;AAGvB,QAAMG,YAAYC,YAAYC,KAAKL,QAAAA;AAEnC,IAAIG,YACFN,cAAcG,QAAAA,QAAYM,qCAAqBJ,gBAAgBD,aAAAA,IAGxDD,aAAa,UACpBH,cAAcG,QAAAA,IAAY,eAAA,CAAA,GAAKC,eAAkBC,cAAAA,IACxCF,aAAa,gBACtBH,cAAcG,QAAAA,IAAY;MAACC;MAAeC;MAAgBK,OAAOC,OAAAA,EAASC,KAAK,GAAA;EAEnF;AAEA,SAAO,eAAA,CAAA,GAAKjC,WAAcqB,aAAAA;AAC5B;AAEA,IAAMO,cAAc;",
-  "names": ["Slot", "forwardRef", "props", "forwardedRef", "children", "slotProps", "isValidElement", "mergedProps", "mergeSlotProps", "cloneElement", "type", "ref", "composeRefs", "Children", "count", "only", "Slottable", "_jsx", "_Fragment", "pressMap", "isWeb", "onPress", "onPressOut", "onPressIn", "child", "childProps", "overrideProps", "isHTMLChild", "key", "propName", "slotPropValue", "childPropValue", "isHandler", "handleRegex", "test", "composeEventHandlers", "filter", "Boolean", "join"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;uDAEA,sBAA4B,kCAC5B,mBAAsB,+BACtB,iBAAqC,6BAErC,eAA4E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU5E,IAAMA,OAAOC,qBAAQC,WAAW,KAAA,GAEnBC,OAAOC,6CAA2B,SAAcC,OAAOC,cAAY;AAC9E,MAAQC,WAA2BF,MAA3BE,UAAaC,YAAAA,2BAAcH,OAAAA;IAA3BE;;AAER,MAAIE,iDAAeF,QAAAA,GAAW;AAC5B,QAAMG,cAAcC,eAAeJ,UAAUC,SAAAA;AAC7C,WAAOI,+CACLL,UACAA,SAASM,KAAK,kBACVH,cACA,qBAAA,eAAA,CAAA,GACKA,WAAAA,GAAAA;MACHI,SAAKC,iCACHT,cACAN,OAAQO,SAAiBF,MAAMS,MAAOP,SAAiBO,GAAG;;EAItE;AAEA,SAAOE,sBAASC,MAAMV,QAAAA,IAAY,IAAIS,sBAASE,KAAK,IAAA,IAAQ;AAC9D,CAAA;AAEAf,KAAK,cAAiB;AAMf,IAAMgB,YAAY,SAAA,OAAA;MAAGZ,WAAAA,MAAAA;AAC1B,SAAO,uCAAAa,KAAA,mBAAAC,UAAA;;;AACT;AAEAF,UAAU,cAAiB;AAI3B,IAAMG,WAAWC,yBACb;EACEC,SAAS;EACTC,YAAY;EACZC,WAAW;AACb,IACA,CAAC;AAEL,SAASf,eAAegB,OAAYnB,WAA8B;AAChE,MAAMoB,aAAaD,MAAMtB,OAGnBwB,gBAAgB,eAAA,CAAA,GAAKD,UAAAA,GACrBE,cAAc,OAAOH,MAAMd,QAAS;AAE1C,MAAIiB;AACF,aAAWC,OAAOT;AAChB,MAAIS,OAAOvB,cACTA,UAAUc,SAASS,GAAAA,CAAI,IAAIvB,UAAUuB,GAAAA,GACrC,OAAOvB,UAAUuB,GAAAA;AAKvB,WAASC,YAAYJ,YAAY;AAC/B,QAAMK,gBAAgBzB,UAAUwB,QAAAA,GAC1BE,iBAAiBN,WAAWI,QAAAA;AAElC,IAAIF,eAAeE,YAAYV,aAC7BU,WAAWV,SAASU,QAAAA,GACpB,OAAOH,cAAcG,QAAAA;AAGvB,QAAMG,YAAYC,YAAYC,KAAKL,QAAAA;AAEnC,IAAIG,YACFN,cAAcG,QAAAA,QAAYM,qCAAqBJ,gBAAgBD,aAAAA,IAGxDD,aAAa,UACpBH,cAAcG,QAAAA,IAAY,eAAA,CAAA,GAAKC,eAAkBC,cAAAA,IACxCF,aAAa,gBACtBH,cAAcG,QAAAA,IAAY;MAACC;MAAeC;MAAgBK,OAAOC,OAAAA,EAASC,KAAK,GAAA;EAEnF;AAEA,SAAO,eAAA,CAAA,GAAKjC,WAAcqB,aAAAA;AAC5B;AAEA,IAAMO,cAAc;",
+  "names": ["is19", "version", "startsWith", "Slot", "forwardRef", "props", "forwardedRef", "children", "slotProps", "isValidElement", "mergedProps", "mergeSlotProps", "cloneElement", "type", "ref", "composeRefs", "Children", "count", "only", "Slottable", "_jsx", "_Fragment", "pressMap", "isWeb", "onPress", "onPressOut", "onPressIn", "child", "childProps", "overrideProps", "isHTMLChild", "key", "propName", "slotPropValue", "childPropValue", "isHandler", "handleRegex", "test", "composeEventHandlers", "filter", "Boolean", "join"]
 }

package/dist/esm/views/Slot.js

@@ -1,9 +1,9 @@
 import { composeRefs } from "@tamagui/compose-refs";
 import { isWeb } from "@tamagui/constants";
 import { composeEventHandlers } from "@tamagui/helpers";
-import { Children, cloneElement, forwardRef, isValidElement } from "react";
+import { Children, cloneElement, forwardRef, isValidElement, version } from "react";
 import { Fragment, jsx } from "react/jsx-runtime";
-const Slot = forwardRef(function(props, forwardedRef) {
+const is19 = version.startsWith("19."), Slot = forwardRef(function(props, forwardedRef) {
   const { children, ...slotProps } = props;
   if (isValidElement(children)) {
     const mergedProps = mergeSlotProps(children, slotProps);
@@ -11,7 +11,10 @@ const Slot = forwardRef(function(props, forwardedRef) {
       children,
       children.type.avoidForwardRef ? mergedProps : {
         ...mergedProps,
-        ref: composeRefs(forwardedRef, children.ref)
+        ref: composeRefs(
+          forwardedRef,
+          is19 ? children.props.ref : children.ref
+        )
       }
     );
   }

package/dist/esm/views/Slot.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Slot.tsx"],
-  "mappings": "AAEA,SAAS,mBAAmB;AAC5B,SAAS,aAAa;AACtB,SAAS,4BAA4B;AAErC,SAAS,UAAU,cAAc,YAAY,sBAAsB;AAoC1D;AA1BF,MAAM,OAAO,WAA2B,SAAc,OAAO,cAAc;AAChF,QAAM,EAAE,UAAU,GAAG,UAAU,IAAI;AAEnC,MAAI,eAAe,QAAQ,GAAG;AAC5B,UAAM,cAAc,eAAe,UAAU,SAAS;AACtD,WAAO;AAAA,MACL;AAAA,MACA,SAAS,KAAK,kBACV,cACA;AAAA,QACE,GAAG;AAAA,QACH,KAAK,YAAY,cAAe,SAAiB,GAAG;AAAA,MACtD;AAAA,IACN;AAAA,EACF;AAEA,SAAO,SAAS,MAAM,QAAQ,IAAI,IAAI,SAAS,KAAK,IAAI,IAAI;AAC9D,CAAC;AAED,KAAK,cAAiB;AAMf,MAAM,YAAY,CAAC,EAAE,SAAS,MAC5B,gCAAG,UAAS;AAGrB,UAAU,cAAiB;AAI3B,MAAM,WAAW,QACb;AAAA,EACE,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,WAAW;AACb,IACA,CAAC;AAEL,SAAS,eAAe,OAAY,WAAgC;AAClE,QAAM,aAAa,MAAM,OAGnB,gBAAgB,EAAE,GAAG,WAAW,GAChC,cAAc,OAAO,MAAM,QAAS;AAE1C,MAAI;AACF,eAAW,OAAO;AAChB,MAAI,OAAO,cACT,UAAU,SAAS,GAAG,CAAC,IAAI,UAAU,GAAG,GACxC,OAAO,UAAU,GAAG;AAK1B,WAAS,YAAY,YAAY;AAC/B,UAAM,gBAAgB,UAAU,QAAQ,GAClC,iBAAiB,WAAW,QAAQ;AAE1C,IAAI,eAAe,YAAY,aAC7B,WAAW,SAAS,QAAQ,GAC5B,OAAO,cAAc,QAAQ,IAGb,YAAY,KAAK,QAAQ,IAGzC,cAAc,QAAQ,IAAI,qBAAqB,gBAAgB,aAAa,IAGrE,aAAa,UACpB,cAAc,QAAQ,IAAI,EAAE,GAAG,eAAe,GAAG,eAAe,IACvD,aAAa,gBACtB,cAAc,QAAQ,IAAI,CAAC,eAAe,cAAc,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAAA,EAEtF;AAEA,SAAO,EAAE,GAAG,WAAW,GAAG,cAAc;AAC1C;AAEA,MAAM,cAAc;",
+  "mappings": "AAEA,SAAS,mBAAmB;AAC5B,SAAS,aAAa;AACtB,SAAS,4BAA4B;AAErC,SAAS,UAAU,cAAc,YAAY,gBAAgB,eAAe;AAyCnE;AA/BT,MAAM,OAAO,QAAQ,WAAW,KAAK,GAExB,OAAO,WAA2B,SAAc,OAAO,cAAc;AAChF,QAAM,EAAE,UAAU,GAAG,UAAU,IAAI;AAEnC,MAAI,eAAe,QAAQ,GAAG;AAC5B,UAAM,cAAc,eAAe,UAAU,SAAS;AACtD,WAAO;AAAA,MACL;AAAA,MACA,SAAS,KAAK,kBACV,cACA;AAAA,QACE,GAAG;AAAA,QACH,KAAK;AAAA,UACH;AAAA,UACA,OAAQ,SAAiB,MAAM,MAAO,SAAiB;AAAA,QACzD;AAAA,MACF;AAAA,IACN;AAAA,EACF;AAEA,SAAO,SAAS,MAAM,QAAQ,IAAI,IAAI,SAAS,KAAK,IAAI,IAAI;AAC9D,CAAC;AAED,KAAK,cAAiB;AAMf,MAAM,YAAY,CAAC,EAAE,SAAS,MAC5B,gCAAG,UAAS;AAGrB,UAAU,cAAiB;AAI3B,MAAM,WAAW,QACb;AAAA,EACE,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,WAAW;AACb,IACA,CAAC;AAEL,SAAS,eAAe,OAAY,WAAgC;AAClE,QAAM,aAAa,MAAM,OAGnB,gBAAgB,EAAE,GAAG,WAAW,GAChC,cAAc,OAAO,MAAM,QAAS;AAE1C,MAAI;AACF,eAAW,OAAO;AAChB,MAAI,OAAO,cACT,UAAU,SAAS,GAAG,CAAC,IAAI,UAAU,GAAG,GACxC,OAAO,UAAU,GAAG;AAK1B,WAAS,YAAY,YAAY;AAC/B,UAAM,gBAAgB,UAAU,QAAQ,GAClC,iBAAiB,WAAW,QAAQ;AAE1C,IAAI,eAAe,YAAY,aAC7B,WAAW,SAAS,QAAQ,GAC5B,OAAO,cAAc,QAAQ,IAGb,YAAY,KAAK,QAAQ,IAGzC,cAAc,QAAQ,IAAI,qBAAqB,gBAAgB,aAAa,IAGrE,aAAa,UACpB,cAAc,QAAQ,IAAI,EAAE,GAAG,eAAe,GAAG,eAAe,IACvD,aAAa,gBACtB,cAAc,QAAQ,IAAI,CAAC,eAAe,cAAc,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAAA,EAEtF;AAEA,SAAO,EAAE,GAAG,WAAW,GAAG,cAAc;AAC1C;AAEA,MAAM,cAAc;",
   "names": []
 }

package/dist/esm/views/Slot.mjs

@@ -1,22 +1,23 @@
 import { composeRefs } from "@tamagui/compose-refs";
 import { isWeb } from "@tamagui/constants";
 import { composeEventHandlers } from "@tamagui/helpers";
-import { Children, cloneElement, forwardRef, isValidElement } from "react";
+import { Children, cloneElement, forwardRef, isValidElement, version } from "react";
 import { Fragment, jsx } from "react/jsx-runtime";
-const Slot = forwardRef(function (props, forwardedRef) {
-  const {
-    children,
-    ...slotProps
-  } = props;
-  if (isValidElement(children)) {
-    const mergedProps = mergeSlotProps(children, slotProps);
-    return cloneElement(children, children.type.avoidForwardRef ? mergedProps : {
-      ...mergedProps,
-      ref: composeRefs(forwardedRef, children.ref)
-    });
-  }
-  return Children.count(children) > 1 ? Children.only(null) : null;
-});
+const is19 = version.startsWith("19."),
+  Slot = forwardRef(function (props, forwardedRef) {
+    const {
+      children,
+      ...slotProps
+    } = props;
+    if (isValidElement(children)) {
+      const mergedProps = mergeSlotProps(children, slotProps);
+      return cloneElement(children, children.type.avoidForwardRef ? mergedProps : {
+        ...mergedProps,
+        ref: composeRefs(forwardedRef, is19 ? children.props.ref : children.ref)
+      });
+    }
+    return Children.count(children) > 1 ? Children.only(null) : null;
+  });
 Slot.displayName = "Slot";
 const Slottable = ({
   children

package/dist/esm/views/Slot.native.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { composeRefs } from "@tamagui/compose-refs";
 import { isWeb } from "@tamagui/constants";
 import { composeEventHandlers } from "@tamagui/helpers";
-import { Children, cloneElement, forwardRef, isValidElement } from "react";
+import { Children, cloneElement, forwardRef, isValidElement, version } from "react";
 function _define_property(obj, key, value) {
   return key in obj ? Object.defineProperty(obj, key, {
     value,
@@ -56,14 +56,14 @@ function _object_without_properties_loose(source, excluded) {
     key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
   return target;
 }
-var Slot = /* @__PURE__ */ forwardRef(function(props, forwardedRef) {
+var is19 = version.startsWith("19."), Slot = /* @__PURE__ */ forwardRef(function(props, forwardedRef) {
   var children = props.children, slotProps = _object_without_properties(props, [
     "children"
   ]);
   if (/* @__PURE__ */ isValidElement(children)) {
     var mergedProps = mergeSlotProps(children, slotProps);
     return /* @__PURE__ */ cloneElement(children, children.type.avoidForwardRef ? mergedProps : _object_spread_props(_object_spread({}, mergedProps), {
-      ref: composeRefs(forwardedRef, children.ref)
+      ref: composeRefs(forwardedRef, is19 ? children.props.ref : children.ref)
     }));
   }
   return Children.count(children) > 1 ? Children.only(null) : null;

package/dist/esm/views/Slot.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/packages/web/src/views/Slot.tsx"],
-  "mappings": ";AAEA,SAASA,mBAAmB;AAC5B,SAASC,aAAa;AACtB,SAASC,4BAA4B;AAErC,SAASC,UAAUC,cAAcC,YAAYC,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU5D,IAAMC,OAAOF,2BAA2B,SAAcG,OAAOC,cAAY;AAC9E,MAAQC,WAA2BF,MAA3BE,UAAaC,YAAAA,2BAAcH,OAAAA;IAA3BE;;AAER,MAAIJ,+BAAeI,QAAAA,GAAW;AAC5B,QAAME,cAAcC,eAAeH,UAAUC,SAAAA;AAC7C,WAAOP,6BACLM,UACAA,SAASI,KAAK,kBACVF,cACA,qBAAA,eAAA,CAAA,GACKA,WAAAA,GAAAA;MACHG,KAAKf,YAAYS,cAAeC,SAAiBK,GAAG;;EAG9D;AAEA,SAAOZ,SAASa,MAAMN,QAAAA,IAAY,IAAIP,SAASc,KAAK,IAAA,IAAQ;AAC9D,CAAA;AAEAV,KAAK,cAAiB;AAMf,IAAMW,YAAY,SAAA,OAAA;MAAGR,WAAAA,MAAAA;AAC1B,SAAO,qBAAA,WAAA;;;AACT;AAEAQ,UAAU,cAAiB;AAI3B,IAAMC,WAAWlB,QACb;EACEmB,SAAS;EACTC,YAAY;EACZC,WAAW;AACb,IACA,CAAC;AAEL,SAAST,eAAeU,OAAYZ,WAA8B;AAChE,MAAMa,aAAaD,MAAMf,OAGnBiB,gBAAgB,eAAA,CAAA,GAAKD,UAAAA,GACrBE,cAAc,OAAOH,MAAMT,QAAS;AAE1C,MAAIY;AACF,aAAWC,OAAOR;AAChB,MAAIQ,OAAOhB,cACTA,UAAUQ,SAASQ,GAAAA,CAAI,IAAIhB,UAAUgB,GAAAA,GACrC,OAAOhB,UAAUgB,GAAAA;AAKvB,WAASC,YAAYJ,YAAY;AAC/B,QAAMK,gBAAgBlB,UAAUiB,QAAAA,GAC1BE,iBAAiBN,WAAWI,QAAAA;AAElC,IAAIF,eAAeE,YAAYT,aAC7BS,WAAWT,SAASS,QAAAA,GACpB,OAAOH,cAAcG,QAAAA;AAGvB,QAAMG,YAAYC,YAAYC,KAAKL,QAAAA;AAEnC,IAAIG,YACFN,cAAcG,QAAAA,IAAY1B,qBAAqB4B,gBAAgBD,aAAAA,IAGxDD,aAAa,UACpBH,cAAcG,QAAAA,IAAY,eAAA,CAAA,GAAKC,eAAkBC,cAAAA,IACxCF,aAAa,gBACtBH,cAAcG,QAAAA,IAAY;MAACC;MAAeC;MAAgBI,OAAOC,OAAAA,EAASC,KAAK,GAAA;EAEnF;AAEA,SAAO,eAAA,CAAA,GAAKzB,WAAcc,aAAAA;AAC5B;AAEA,IAAMO,cAAc;",
-  "names": ["composeRefs", "isWeb", "composeEventHandlers", "Children", "cloneElement", "forwardRef", "isValidElement", "Slot", "props", "forwardedRef", "children", "slotProps", "mergedProps", "mergeSlotProps", "type", "ref", "count", "only", "Slottable", "pressMap", "onPress", "onPressOut", "onPressIn", "child", "childProps", "overrideProps", "isHTMLChild", "key", "propName", "slotPropValue", "childPropValue", "isHandler", "handleRegex", "test", "filter", "Boolean", "join"]
+  "mappings": ";AAEA,SAASA,mBAAmB;AAC5B,SAASC,aAAa;AACtB,SAASC,4BAA4B;AAErC,SAASC,UAAUC,cAAcC,YAAYC,gBAAgBC,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU5E,IAAMC,OAAOD,QAAQE,WAAW,KAAA,GAEnBC,OAAOL,2BAA2B,SAAcM,OAAOC,cAAY;AAC9E,MAAQC,WAA2BF,MAA3BE,UAAaC,YAAAA,2BAAcH,OAAAA;IAA3BE;;AAER,MAAIP,+BAAeO,QAAAA,GAAW;AAC5B,QAAME,cAAcC,eAAeH,UAAUC,SAAAA;AAC7C,WAAOV,6BACLS,UACAA,SAASI,KAAK,kBACVF,cACA,qBAAA,eAAA,CAAA,GACKA,WAAAA,GAAAA;MACHG,KAAKlB,YACHY,cACAJ,OAAQK,SAAiBF,MAAMO,MAAOL,SAAiBK,GAAG;;EAItE;AAEA,SAAOf,SAASgB,MAAMN,QAAAA,IAAY,IAAIV,SAASiB,KAAK,IAAA,IAAQ;AAC9D,CAAA;AAEAV,KAAK,cAAiB;AAMf,IAAMW,YAAY,SAAA,OAAA;MAAGR,WAAAA,MAAAA;AAC1B,SAAO,qBAAA,WAAA;;;AACT;AAEAQ,UAAU,cAAiB;AAI3B,IAAMC,WAAWrB,QACb;EACEsB,SAAS;EACTC,YAAY;EACZC,WAAW;AACb,IACA,CAAC;AAEL,SAAST,eAAeU,OAAYZ,WAA8B;AAChE,MAAMa,aAAaD,MAAMf,OAGnBiB,gBAAgB,eAAA,CAAA,GAAKD,UAAAA,GACrBE,cAAc,OAAOH,MAAMT,QAAS;AAE1C,MAAIY;AACF,aAAWC,OAAOR;AAChB,MAAIQ,OAAOhB,cACTA,UAAUQ,SAASQ,GAAAA,CAAI,IAAIhB,UAAUgB,GAAAA,GACrC,OAAOhB,UAAUgB,GAAAA;AAKvB,WAASC,YAAYJ,YAAY;AAC/B,QAAMK,gBAAgBlB,UAAUiB,QAAAA,GAC1BE,iBAAiBN,WAAWI,QAAAA;AAElC,IAAIF,eAAeE,YAAYT,aAC7BS,WAAWT,SAASS,QAAAA,GACpB,OAAOH,cAAcG,QAAAA;AAGvB,QAAMG,YAAYC,YAAYC,KAAKL,QAAAA;AAEnC,IAAIG,YACFN,cAAcG,QAAAA,IAAY7B,qBAAqB+B,gBAAgBD,aAAAA,IAGxDD,aAAa,UACpBH,cAAcG,QAAAA,IAAY,eAAA,CAAA,GAAKC,eAAkBC,cAAAA,IACxCF,aAAa,gBACtBH,cAAcG,QAAAA,IAAY;MAACC;MAAeC;MAAgBI,OAAOC,OAAAA,EAASC,KAAK,GAAA;EAEnF;AAEA,SAAO,eAAA,CAAA,GAAKzB,WAAcc,aAAAA;AAC5B;AAEA,IAAMO,cAAc;",
+  "names": ["composeRefs", "isWeb", "composeEventHandlers", "Children", "cloneElement", "forwardRef", "isValidElement", "version", "is19", "startsWith", "Slot", "props", "forwardedRef", "children", "slotProps", "mergedProps", "mergeSlotProps", "type", "ref", "count", "only", "Slottable", "pressMap", "onPress", "onPressOut", "onPressIn", "child", "childProps", "overrideProps", "isHTMLChild", "key", "propName", "slotPropValue", "childPropValue", "isHandler", "handleRegex", "test", "filter", "Boolean", "join"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.98.0",
+  "version": "1.98.1",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,21 +27,18 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.98.0",
-    "@tamagui/constants": "1.98.0",
-    "@tamagui/helpers": "1.98.0",
-    "@tamagui/normalize-css-color": "1.98.0",
-    "@tamagui/timer": "1.98.0",
-    "@tamagui/types": "1.98.0",
-    "@tamagui/use-did-finish-ssr": "1.98.0",
-    "@tamagui/use-event": "1.98.0",
-    "@tamagui/use-force-update": "1.98.0"
-  },
-  "peerDependencies": {
-    "react": "*"
+    "@tamagui/compose-refs": "1.98.1",
+    "@tamagui/constants": "1.98.1",
+    "@tamagui/helpers": "1.98.1",
+    "@tamagui/normalize-css-color": "1.98.1",
+    "@tamagui/timer": "1.98.1",
+    "@tamagui/types": "1.98.1",
+    "@tamagui/use-did-finish-ssr": "1.98.1",
+    "@tamagui/use-event": "1.98.1",
+    "@tamagui/use-force-update": "1.98.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.98.0",
+    "@tamagui/build": "1.98.1",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/views/Slot.tsx

@@ -4,7 +4,7 @@ import { composeRefs } from '@tamagui/compose-refs'
 import { isWeb } from '@tamagui/constants'
 import { composeEventHandlers } from '@tamagui/helpers'
 import type { ReactNode } from 'react'
-import { Children, cloneElement, forwardRef, isValidElement } from 'react'
+import { Children, cloneElement, forwardRef, isValidElement, version } from 'react'
 
 /* -------------------------------------------------------------------------------------------------
  * Slot
@@ -14,6 +14,8 @@ interface SlotProps {
   children: ReactNode
 }
 
+const is19 = version.startsWith('19.')
+
 export const Slot = forwardRef<any, SlotProps>(function Slot(props, forwardedRef) {
   const { children, ...slotProps } = props
 
@@ -25,7 +27,10 @@ export const Slot = forwardRef<any, SlotProps>(function Slot(props, forwardedRef
         ? mergedProps
         : {
             ...mergedProps,
-            ref: composeRefs(forwardedRef, (children as any).ref),
+            ref: composeRefs(
+              forwardedRef,
+              is19 ? (children as any).props.ref : (children as any).ref
+            ),
           }
     )
   }

package/types/views/Slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Slot.d.ts","sourceRoot":"","sources":["../../src/views/Slot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAOtC,UAAU,SAAS;IACjB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,IAAI,2FAiBf,CAAA;AAQF,eAAO,MAAM,SAAS;mBAAkB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;;CAE9D,CAAA"}
+{"version":3,"file":"Slot.d.ts","sourceRoot":"","sources":["../../src/views/Slot.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAOtC,UAAU,SAAS;IACjB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAID,eAAO,MAAM,IAAI,2FAoBf,CAAA;AAQF,eAAO,MAAM,SAAS;mBAAkB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;;CAE9D,CAAA"}