@tamagui/select 1.30.29 → 1.31.1

package/dist/jsx/SelectScrollButton.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SelectScrollButton.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/jsx/SelectScrollButton.mjs

@@ -1,6 +1,5 @@
 import { autoUpdate, offset, useFloating } from "@floating-ui/react";
 import { useComposedRefs } from "@tamagui/compose-refs";
-import { useIsomorphicLayoutEffect } from "@tamagui/core";
 import { YStack } from "@tamagui/stacks";
 import * as React from "react";
 import { flushSync } from "react-dom";
@@ -29,51 +28,33 @@ const SelectScrollButtonImpl = React.memo(
   React.forwardRef(
     (props, forwardedRef) => {
       const { __scopeSelect, dir, componentName, ...scrollIndicatorProps } = props;
-      const {
-        floatingRef,
-        forceUpdate,
-        open,
-        fallback,
-        setScrollTop,
-        setInnerOffset,
-        ...context
-      } = useSelectContext(componentName, __scopeSelect);
-      const [element, setElement] = React.useState(null);
+      const { forceUpdate, open, fallback, setScrollTop, setInnerOffset, ...context } = useSelectContext(componentName, __scopeSelect);
+      const floatingRef = context.floatingContext?.refs.floating;
       const statusRef = React.useRef("idle");
       const isVisible = context[dir === "down" ? "canScrollDown" : "canScrollUp"];
       const frameRef = React.useRef();
-      const { x, y, reference, floating, strategy, update, refs } = useFloating({
+      const { x, y, refs, strategy } = useFloating({
         open: open && isVisible,
         strategy: "fixed",
+        elements: {
+          reference: floatingRef?.current
+        },
         placement: dir === "up" ? "top" : "bottom",
         middleware: [offset(({ rects }) => -rects.floating.height)],
         whileElementsMounted: (...args) => autoUpdate(...args, { animationFrame: true })
       });
-      const composedRef = useComposedRefs(forwardedRef, floating);
-      if (floatingRef) {
-        if (open) {
-          if (element !== floatingRef.current) {
-            setElement(floatingRef.current);
-            reference(floatingRef.current);
-            requestAnimationFrame(update);
-          }
-        } else {
-          cancelAnimationFrame(frameRef.current);
-        }
-      }
-      useIsomorphicLayoutEffect(() => {
-        return () => {
-          cancelAnimationFrame(frameRef.current);
-        };
-      }, []);
-      if (!(isVisible && floatingRef)) {
+      const composedRef = useComposedRefs(forwardedRef, refs.setFloating);
+      if (!isVisible) {
         return null;
       }
       const onScroll = (amount) => {
+        const floating = floatingRef;
+        if (!floating)
+          return;
         if (fallback) {
-          if (refs.floating.current) {
-            refs.floating.current.scrollTop -= amount;
-            flushSync(() => setScrollTop(refs.floating.current?.scrollTop ?? 0));
+          if (floating.current) {
+            floating.current.scrollTop -= amount;
+            flushSync(() => setScrollTop(floating.current?.scrollTop ?? 0));
           }
         } else {
           flushSync(() => setInnerOffset((value) => value - amount));
@@ -93,6 +74,7 @@ const SelectScrollButtonImpl = React.memo(
           statusRef.current = "active";
           let prevNow = Date.now();
           function frame() {
+            const element = floatingRef?.current;
             if (element) {
               const currentNow = Date.now();
               const msElapsed = currentNow - prevNow;

package/dist/jsx/SelectScrollButton.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SelectScrollButton.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/jsx/SelectViewport.js

@@ -1,5 +1,5 @@
 import { FloatingFocusManager } from "@floating-ui/react";
-import { isWeb } from "@tamagui/core";
+import { composeRefs, isWeb } from "@tamagui/core";
 import { styled } from "@tamagui/core";
 import { PortalItem } from "@tamagui/portal";
 import { ThemeableStack } from "@tamagui/stacks";
@@ -32,6 +32,10 @@ const SelectViewport = React.forwardRef(
     const { __scopeSelect, children, disableScroll, ...viewportProps } = props;
     const context = useSelectContext(VIEWPORT_NAME, __scopeSelect);
     const breakpointActive = useSelectBreakpointActive(context.sheetBreakpoint);
+    const composedRefs = composeRefs(
+      forwardedRef,
+      context.floatingContext?.refs.setFloating
+    );
     if (context.shouldRenderWebNative) {
       return <>{children}</>;
     }
@@ -58,7 +62,7 @@ const SelectViewport = React.forwardRef(
         size={context.size}
         role="presentation"
         {...viewportProps}
-        ref={forwardedRef}
+        ref={composedRefs}
         {...floatingProps}
         {...restStyle}
         overflow={disableScroll ? void 0 : overflow ?? "scroll"}

package/dist/jsx/SelectViewport.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SelectViewport.tsx"],
-  "mappings": "AAAA,SAAS,4BAA4B;AACrC,SAAyB,aAAa;AACtC,SAAS,cAAc;AACvB,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB,wBAAwB;AAEvD,SAAS,iCAAiC;AAMnC,MAAM,sBAAsB,OAAO,gBAAgB;AAAA,EACxD,MAAM;AAAA,EACN,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,UAAU;AAAA,EACV,YAAY;AAAA,EACZ,cAAc;AAAA,EAEd,UAAU;AAAA,IACR,MAAM;AAAA,MACJ,WAAW,CAAC,KAAK,EAAE,OAAO,MAAM;AAC9B,eAAO;AAAA,UACL,cAAc,OAAO,OAAO,GAAG,KAAK;AAAA,QACtC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,MAAM;AAAA,EACR;AACF,CAAC;AAEM,MAAM,iBAAiB,MAAM;AAAA,EAClC,CAAC,OAAyC,iBAAiB;AACzD,UAAM,EAAE,eAAe,UAAU,eAAe,GAAG,cAAc,IAAI;AACrE,UAAM,UAAU,iBAAiB,eAAe,aAAa;AAC7D,UAAM,mBAAmB,0BAA0B,QAAQ,eAAe;AAE1E,QAAI,QAAQ,uBAAuB;AACjC,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,QAAI,oBAAoB,CAAC,OAAO;AAC9B,aACE,CAAC,WAAW,UAAU,GAAG,QAAQ,yBAC/B,CAAC,qBAAqB,SAAS,UAAU,SAAS,EAAjD,qBACH,EAFC;AAAA,IAIL;AAEA,QAAI,CAAC,QAAQ,iBAAiB;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,QAAQ,MAAM;AACjB,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,UAAM;AAAA,MACJ,OAAO,EAAE,gBAAgB,eAAe,UAAU,GAAG,UAAU;AAAA,MAC/D,GAAG;AAAA,IACL,IAAI,QAAQ,aAAc,iBAAiB;AAE3C,WACE;AAAA,OACG,CAAC,iBACA,CAAC;AAAA,QACC,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA,MACF;AAAA,MAEF,CAAC,qBAAqB,SAAS,QAAQ,iBACrC,CAAC;AAAA,QACC,MAAM,QAAQ;AAAA,QAEd,KAAK;AAAA,YACD;AAAA,QACJ,KAAK;AAAA,YACD;AAAA,YACA;AAAA,QACJ,UAAU,gBAAgB,SAAY,YAAY;AAAA,QAEjD,SACH,EAXC,oBAYH,EAbC;AAAA,IAcH;AAAA,EAEJ;AACF;AAEA,eAAe,cAAc;AAE7B,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": "AAAA,SAAS,4BAA4B;AACrC,SAAyB,aAAa,aAAa;AACnD,SAAS,cAAc;AACvB,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB,wBAAwB;AAEvD,SAAS,iCAAiC;AAMnC,MAAM,sBAAsB,OAAO,gBAAgB;AAAA,EACxD,MAAM;AAAA,EACN,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,UAAU;AAAA,EACV,YAAY;AAAA,EACZ,cAAc;AAAA,EAEd,UAAU;AAAA,IACR,MAAM;AAAA,MACJ,WAAW,CAAC,KAAK,EAAE,OAAO,MAAM;AAC9B,eAAO;AAAA,UACL,cAAc,OAAO,OAAO,GAAG,KAAK;AAAA,QACtC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,MAAM;AAAA,EACR;AACF,CAAC;AAEM,MAAM,iBAAiB,MAAM;AAAA,EAClC,CAAC,OAAyC,iBAAiB;AACzD,UAAM,EAAE,eAAe,UAAU,eAAe,GAAG,cAAc,IAAI;AACrE,UAAM,UAAU,iBAAiB,eAAe,aAAa;AAC7D,UAAM,mBAAmB,0BAA0B,QAAQ,eAAe;AAE1E,UAAM,eAAe;AAAA,MACnB;AAAA,MACA,QAAQ,iBAAiB,KAAK;AAAA,IAChC;AACA,QAAI,QAAQ,uBAAuB;AACjC,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,QAAI,oBAAoB,CAAC,OAAO;AAC9B,aACE,CAAC,WAAW,UAAU,GAAG,QAAQ,yBAC/B,CAAC,qBAAqB,SAAS,UAAU,SAAS,EAAjD,qBACH,EAFC;AAAA,IAIL;AAEA,QAAI,CAAC,QAAQ,iBAAiB;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,QAAQ,MAAM;AACjB,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,UAAM;AAAA,MACJ,OAAO,EAAE,gBAAgB,eAAe,UAAU,GAAG,UAAU;AAAA,MAC/D,GAAG;AAAA,IACL,IAAI,QAAQ,aAAc,iBAAiB;AAE3C,WACE;AAAA,OACG,CAAC,iBACA,CAAC;AAAA,QACC,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA,MACF;AAAA,MAEF,CAAC,qBAAqB,SAAS,QAAQ,iBACrC,CAAC;AAAA,QACC,MAAM,QAAQ;AAAA,QAEd,KAAK;AAAA,YACD;AAAA,QACJ,KAAK;AAAA,YACD;AAAA,YACA;AAAA,QACJ,UAAU,gBAAgB,SAAY,YAAY;AAAA,QAEjD,SACH,EAXC,oBAYH,EAbC;AAAA,IAcH;AAAA,EAEJ;AACF;AAEA,eAAe,cAAc;AAE7B,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }

package/dist/jsx/SelectViewport.mjs

@@ -1,5 +1,5 @@
 import { FloatingFocusManager } from "@floating-ui/react";
-import { isWeb } from "@tamagui/core";
+import { composeRefs, isWeb } from "@tamagui/core";
 import { styled } from "@tamagui/core";
 import { PortalItem } from "@tamagui/portal";
 import { ThemeableStack } from "@tamagui/stacks";
@@ -32,6 +32,10 @@ const SelectViewport = React.forwardRef(
     const { __scopeSelect, children, disableScroll, ...viewportProps } = props;
     const context = useSelectContext(VIEWPORT_NAME, __scopeSelect);
     const breakpointActive = useSelectBreakpointActive(context.sheetBreakpoint);
+    const composedRefs = composeRefs(
+      forwardedRef,
+      context.floatingContext?.refs.setFloating
+    );
     if (context.shouldRenderWebNative) {
       return <>{children}</>;
     }
@@ -58,7 +62,7 @@ const SelectViewport = React.forwardRef(
         size={context.size}
         role="presentation"
         {...viewportProps}
-        ref={forwardedRef}
+        ref={composedRefs}
         {...floatingProps}
         {...restStyle}
         overflow={disableScroll ? void 0 : overflow ?? "scroll"}

package/dist/jsx/SelectViewport.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SelectViewport.tsx"],
-  "mappings": "AAAA,SAAS,4BAA4B;AACrC,SAAyB,aAAa;AACtC,SAAS,cAAc;AACvB,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB,wBAAwB;AAEvD,SAAS,iCAAiC;AAMnC,MAAM,sBAAsB,OAAO,gBAAgB;AAAA,EACxD,MAAM;AAAA,EACN,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,UAAU;AAAA,EACV,YAAY;AAAA,EACZ,cAAc;AAAA,EAEd,UAAU;AAAA,IACR,MAAM;AAAA,MACJ,WAAW,CAAC,KAAK,EAAE,OAAO,MAAM;AAC9B,eAAO;AAAA,UACL,cAAc,OAAO,OAAO,GAAG,KAAK;AAAA,QACtC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,MAAM;AAAA,EACR;AACF,CAAC;AAEM,MAAM,iBAAiB,MAAM;AAAA,EAClC,CAAC,OAAyC,iBAAiB;AACzD,UAAM,EAAE,eAAe,UAAU,eAAe,GAAG,cAAc,IAAI;AACrE,UAAM,UAAU,iBAAiB,eAAe,aAAa;AAC7D,UAAM,mBAAmB,0BAA0B,QAAQ,eAAe;AAE1E,QAAI,QAAQ,uBAAuB;AACjC,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,QAAI,oBAAoB,CAAC,OAAO;AAC9B,aACE,CAAC,WAAW,UAAU,GAAG,QAAQ,yBAC/B,CAAC,qBAAqB,SAAS,UAAU,SAAS,EAAjD,qBACH,EAFC;AAAA,IAIL;AAEA,QAAI,CAAC,QAAQ,iBAAiB;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,QAAQ,MAAM;AACjB,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,UAAM;AAAA,MACJ,OAAO,EAAE,gBAAgB,eAAe,UAAU,GAAG,UAAU;AAAA,MAC/D,GAAG;AAAA,IACL,IAAI,QAAQ,aAAc,iBAAiB;AAE3C,WACE;AAAA,OACG,CAAC,iBACA,CAAC;AAAA,QACC,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA,MACF;AAAA,MAEF,CAAC,qBAAqB,SAAS,QAAQ,iBACrC,CAAC;AAAA,QACC,MAAM,QAAQ;AAAA,QAEd,KAAK;AAAA,YACD;AAAA,QACJ,KAAK;AAAA,YACD;AAAA,YACA;AAAA,QACJ,UAAU,gBAAgB,SAAY,YAAY;AAAA,QAEjD,SACH,EAXC,oBAYH,EAbC;AAAA,IAcH;AAAA,EAEJ;AACF;AAEA,eAAe,cAAc;AAE7B,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": "AAAA,SAAS,4BAA4B;AACrC,SAAyB,aAAa,aAAa;AACnD,SAAS,cAAc;AACvB,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB,wBAAwB;AAEvD,SAAS,iCAAiC;AAMnC,MAAM,sBAAsB,OAAO,gBAAgB;AAAA,EACxD,MAAM;AAAA,EACN,iBAAiB;AAAA,EACjB,SAAS;AAAA,EACT,UAAU;AAAA,EACV,YAAY;AAAA,EACZ,cAAc;AAAA,EAEd,UAAU;AAAA,IACR,MAAM;AAAA,MACJ,WAAW,CAAC,KAAK,EAAE,OAAO,MAAM;AAC9B,eAAO;AAAA,UACL,cAAc,OAAO,OAAO,GAAG,KAAK;AAAA,QACtC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,MAAM;AAAA,EACR;AACF,CAAC;AAEM,MAAM,iBAAiB,MAAM;AAAA,EAClC,CAAC,OAAyC,iBAAiB;AACzD,UAAM,EAAE,eAAe,UAAU,eAAe,GAAG,cAAc,IAAI;AACrE,UAAM,UAAU,iBAAiB,eAAe,aAAa;AAC7D,UAAM,mBAAmB,0BAA0B,QAAQ,eAAe;AAE1E,UAAM,eAAe;AAAA,MACnB;AAAA,MACA,QAAQ,iBAAiB,KAAK;AAAA,IAChC;AACA,QAAI,QAAQ,uBAAuB;AACjC,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,QAAI,oBAAoB,CAAC,OAAO;AAC9B,aACE,CAAC,WAAW,UAAU,GAAG,QAAQ,yBAC/B,CAAC,qBAAqB,SAAS,UAAU,SAAS,EAAjD,qBACH,EAFC;AAAA,IAIL;AAEA,QAAI,CAAC,QAAQ,iBAAiB;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,QAAQ,MAAM;AACjB,aAAO,GAAG,SAAS;AAAA,IACrB;AAEA,UAAM;AAAA,MACJ,OAAO,EAAE,gBAAgB,eAAe,UAAU,GAAG,UAAU;AAAA,MAC/D,GAAG;AAAA,IACL,IAAI,QAAQ,aAAc,iBAAiB;AAE3C,WACE;AAAA,OACG,CAAC,iBACA,CAAC;AAAA,QACC,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA,MACF;AAAA,MAEF,CAAC,qBAAqB,SAAS,QAAQ,iBACrC,CAAC;AAAA,QACC,MAAM,QAAQ;AAAA,QAEd,KAAK;AAAA,YACD;AAAA,QACJ,KAAK;AAAA,YACD;AAAA,YACA;AAAA,QACJ,UAAU,gBAAgB,SAAY,YAAY;AAAA,QAEjD,SACH,EAXC,oBAYH,EAbC;AAAA,IAcH;AAAA,EAEJ;AACF;AAEA,eAAe,cAAc;AAE7B,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/select",
-  "version": "1.30.29",
+  "version": "1.31.1",
   "sideEffects": [
     "*.css"
   ],
@@ -31,25 +31,25 @@
     }
   },
   "dependencies": {
-    "@floating-ui/react": "~0.19.1",
-    "@floating-ui/react-dom": "~1.2.2",
-    "@floating-ui/react-native": "~0.9.0",
+    "@floating-ui/react": "^0.24.2",
+    "@floating-ui/react-dom": "^2.0.0",
+    "@floating-ui/react-native": "^0.10.0",
     "@radix-ui/react-use-previous": "^1.0.0",
-    "@tamagui/adapt": "1.30.29",
-    "@tamagui/compose-refs": "1.30.29",
-    "@tamagui/core": "1.30.29",
-    "@tamagui/create-context": "1.30.29",
-    "@tamagui/dismissable": "1.30.29",
-    "@tamagui/focus-scope": "1.30.29",
-    "@tamagui/get-token": "1.30.29",
-    "@tamagui/list-item": "1.30.29",
-    "@tamagui/portal": "1.30.29",
-    "@tamagui/separator": "1.30.29",
-    "@tamagui/sheet": "1.30.29",
-    "@tamagui/stacks": "1.30.29",
-    "@tamagui/text": "1.30.29",
-    "@tamagui/use-controllable-state": "1.30.29",
-    "@tamagui/use-event": "1.30.29"
+    "@tamagui/adapt": "1.31.1",
+    "@tamagui/compose-refs": "1.31.1",
+    "@tamagui/core": "1.31.1",
+    "@tamagui/create-context": "1.31.1",
+    "@tamagui/dismissable": "1.31.1",
+    "@tamagui/focus-scope": "1.31.1",
+    "@tamagui/get-token": "1.31.1",
+    "@tamagui/list-item": "1.31.1",
+    "@tamagui/portal": "1.31.1",
+    "@tamagui/separator": "1.31.1",
+    "@tamagui/sheet": "1.31.1",
+    "@tamagui/stacks": "1.31.1",
+    "@tamagui/text": "1.31.1",
+    "@tamagui/use-controllable-state": "1.31.1",
+    "@tamagui/use-event": "1.31.1"
   },
   "peerDependencies": {
     "react": "*",
@@ -57,7 +57,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.30.29",
+    "@tamagui/build": "1.31.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-native": "^0.71.7"

package/src/Select.tsx

@@ -45,11 +45,16 @@ export const SelectTrigger = React.forwardRef<TamaguiElement, SelectTriggerProps
     const { __scopeSelect, disabled = false, ...triggerProps } = props
 
     const context = useSelectContext(TRIGGER_NAME, __scopeSelect)
-    // const composedRefs = useComposedRefs(forwardedRef, context.onTriggerChange)
+    const composedRefs = useComposedRefs(
+      forwardedRef,
+      context.floatingContext?.refs.setReference as any
+    )
     // const getItems = useCollection(__scopeSelect)
     // const labelId = useLabelContext(context.trigger)
     // const labelledBy = ariaLabelledby || labelId
 
+    // console.log('wtf', context.interactions.getReferenceProps())
+
     if (context.shouldRenderWebNative) {
       return null
     }
@@ -76,9 +81,15 @@ export const SelectTrigger = React.forwardRef<TamaguiElement, SelectTriggerProps
         disabled={disabled}
         data-disabled={disabled ? '' : undefined}
         {...triggerProps}
-        ref={forwardedRef}
+        ref={composedRefs}
         {...(process.env.TAMAGUI_TARGET === 'web' && context.interactions
-          ? context.interactions.getReferenceProps()
+          ? {
+              ...context.interactions.getReferenceProps(),
+              onMouseDown() {
+                context.floatingContext?.update()
+                context.setOpen(!context.open)
+              },
+            }
           : {
               onPress() {
                 context.setOpen(!context.open)
@@ -462,7 +473,7 @@ const NativeSelectFrame = styled(ThemeableStack, {
           paddingRight: paddingHorizontal + 20,
           paddingLeft: paddingHorizontal,
           paddingVertical: getSpace(val, {
-            shift: -4,
+            shift: -3,
           }),
         }
       },

package/src/SelectImpl.tsx

@@ -111,10 +111,9 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
     padding: WINDOW_PADDING,
   })
 
-  const { x, y, reference, floating, strategy, context, refs } = useFloating({
+  const { x, y, strategy, context, refs, update } = useFloating({
     open,
     onOpenChange: setOpen,
-    whileElementsMounted: autoUpdate,
     placement: 'bottom-start',
     middleware: fallback
       ? [
@@ -141,6 +140,14 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
         ],
   })
 
+  React.useLayoutEffect(() => {
+    window.addEventListener('resize', update)
+    if (open) {
+      update()
+    }
+    return () => window.removeEventListener('resize', update)
+  }, [update, open])
+
   const floatingRef = refs.floating
 
   const showUpArrow = open && scrollTop > SCROLL_ARROW_THRESHOLD
@@ -160,6 +167,7 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
       enabled: !fallback,
       onChange: setInnerOffset,
       overflowRef,
+      scrollRef: refs.floating,
     }),
     useListNavigation(context, {
       listRef: listItemsRef,
@@ -180,7 +188,7 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
       ...interactions,
       getReferenceProps() {
         return interactions.getReferenceProps({
-          ref: reference,
+          ref: refs.reference as any,
           className: 'SelectTrigger',
           onKeyDown(event) {
             if (
@@ -195,7 +203,7 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
       },
       getFloatingProps(props) {
         return interactions.getFloatingProps({
-          ref: floating,
+          ref: refs.floating,
           className: 'Select',
           ...props,
           style: {
@@ -232,7 +240,7 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
         })
       },
     }
-  }, [floating, y, x, interactions])
+  }, [refs.reference.current, refs.floating.current, y, x, interactions])
 
   // effects
 
@@ -319,7 +327,6 @@ export const SelectInlineImpl = (props: SelectImplProps) => {
       {...(selectContext as Required<typeof selectContext>)}
       setScrollTop={setScrollTop}
       setInnerOffset={setInnerOffset}
-      floatingRef={floatingRef}
       setValueAtIndex={(index, value) => {
         listContentRef.current[index] = value
       }}

package/src/SelectScrollButton.tsx

@@ -62,59 +62,38 @@ const SelectScrollButtonImpl = React.memo(
   React.forwardRef<SelectScrollButtonImplElement, SelectScrollButtonImplProps>(
     (props: ScopedProps<SelectScrollButtonImplProps>, forwardedRef) => {
       const { __scopeSelect, dir, componentName, ...scrollIndicatorProps } = props
-      const {
-        floatingRef,
-        forceUpdate,
-        open,
-        fallback,
-        setScrollTop,
-        setInnerOffset,
-        ...context
-      } = useSelectContext(componentName, __scopeSelect)
-
-      const [element, setElement] = React.useState<HTMLElement | null>(null)
+      const { forceUpdate, open, fallback, setScrollTop, setInnerOffset, ...context } =
+        useSelectContext(componentName, __scopeSelect)
+      const floatingRef = context.floatingContext?.refs.floating
+
       const statusRef = React.useRef<'idle' | 'active'>('idle')
       const isVisible = context[dir === 'down' ? 'canScrollDown' : 'canScrollUp']
       const frameRef = React.useRef<any>()
 
-      const { x, y, reference, floating, strategy, update, refs } = useFloating({
+      const { x, y, refs, strategy } = useFloating({
         open: open && isVisible,
         strategy: 'fixed',
+        elements: {
+          reference: floatingRef?.current,
+        },
         placement: dir === 'up' ? 'top' : 'bottom',
         middleware: [offset(({ rects }) => -rects.floating.height)],
         whileElementsMounted: (...args) => autoUpdate(...args, { animationFrame: true }),
       })
 
-      const composedRef = useComposedRefs(forwardedRef, floating)
-
-      if (floatingRef) {
-        if (open) {
-          if (element !== floatingRef.current) {
-            setElement(floatingRef.current)
-            reference(floatingRef.current)
-            requestAnimationFrame(update)
-          }
-        } else {
-          cancelAnimationFrame(frameRef.current)
-        }
-      }
-
-      useIsomorphicLayoutEffect(() => {
-        return () => {
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          cancelAnimationFrame(frameRef.current)
-        }
-      }, [])
+      const composedRef = useComposedRefs(forwardedRef, refs.setFloating)
 
-      if (!(isVisible && floatingRef)) {
+      if (!isVisible) {
         return null
       }
 
       const onScroll = (amount: number) => {
+        const floating = floatingRef
+        if (!floating) return
         if (fallback) {
-          if (refs.floating.current) {
-            refs.floating.current.scrollTop -= amount
-            flushSync(() => setScrollTop!(refs.floating.current?.scrollTop ?? 0))
+          if (floating.current) {
+            floating.current.scrollTop -= amount
+            flushSync(() => setScrollTop!(floating.current?.scrollTop ?? 0))
           }
         } else {
           flushSync(() => setInnerOffset!((value) => value - amount))
@@ -138,6 +117,7 @@ const SelectScrollButtonImpl = React.memo(
             let prevNow = Date.now()
 
             function frame() {
+              const element = floatingRef?.current
               if (element) {
                 const currentNow = Date.now()
                 const msElapsed = currentNow - prevNow

package/src/SelectViewport.tsx

@@ -1,5 +1,5 @@
 import { FloatingFocusManager } from '@floating-ui/react'
-import { TamaguiElement, isWeb } from '@tamagui/core'
+import { TamaguiElement, composeRefs, isWeb } from '@tamagui/core'
 import { styled } from '@tamagui/core'
 import { PortalItem } from '@tamagui/portal'
 import { ThemeableStack } from '@tamagui/stacks'
@@ -43,6 +43,10 @@ export const SelectViewport = React.forwardRef<TamaguiElement, SelectViewportPro
     const context = useSelectContext(VIEWPORT_NAME, __scopeSelect)
     const breakpointActive = useSelectBreakpointActive(context.sheetBreakpoint)
 
+    const composedRefs = composeRefs(
+      forwardedRef,
+      context.floatingContext?.refs.setFloating
+    )
     if (context.shouldRenderWebNative) {
       return <>{children}</>
     }
@@ -83,7 +87,7 @@ export const SelectViewport = React.forwardRef<TamaguiElement, SelectViewportPro
             // @ts-ignore
             role="presentation"
             {...viewportProps}
-            ref={forwardedRef}
+            ref={composedRefs}
             {...floatingProps}
             {...restStyle}
             overflow={disableScroll ? undefined : overflow ?? 'scroll'}

package/src/types.tsx

@@ -69,7 +69,6 @@ export interface SelectContextValue {
   dataRef?: MutableRefObject<ContextData>
   controlledScrolling?: boolean
   listRef?: MutableRefObject<Array<HTMLElement | null>>
-  floatingRef?: MutableRefObject<HTMLElement | null>
   canScrollUp?: boolean
   canScrollDown?: boolean
   floatingContext?: FloatingContext<ReferenceType>