@tamagui/use-element-layout 1.134.5 → 1.135.1

package/dist/esm/index.native.js

@@ -1,17 +1,34 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import { isClient, useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { isEqualShallow } from "@tamagui/is-equal-shallow";
+import { createContext, useContext, useId } from "react";
 var LayoutHandlers = /* @__PURE__ */new WeakMap(),
+  LayoutDisableKey = /* @__PURE__ */new WeakMap(),
   Nodes = /* @__PURE__ */new Set(),
   IntersectionState = /* @__PURE__ */new WeakMap(),
+  DisableLayoutContextValues = {},
+  DisableLayoutContextKey = /* @__PURE__ */createContext(""),
+  ENABLE = isClient && typeof IntersectionObserver < "u",
+  LayoutMeasurementController = function (param) {
+    var {
+        disable,
+        children
+      } = param,
+      id = useId();
+    return useIsomorphicLayoutEffect(function () {
+      DisableLayoutContextValues[id] = disable;
+    }, [disable, id]), /* @__PURE__ */_jsx(DisableLayoutContextKey.Provider, {
+      value: id,
+      children
+    });
+  },
   globalIntersectionObserver = null,
   strategy = "async";
 function setOnLayoutStrategy(state) {
   strategy = state;
 }
 var NodeRectCache = /* @__PURE__ */new WeakMap(),
-  ParentRectCache = /* @__PURE__ */new WeakMap(),
   LastChangeTime = /* @__PURE__ */new WeakMap(),
-  rAF = typeof window < "u" ? window.requestAnimationFrame : void 0,
   avoidUpdates = !0,
   queuedUpdates = /* @__PURE__ */new Map();
 function enable() {
@@ -20,7 +37,7 @@ function enable() {
   }), queuedUpdates.clear()));
 }
 function startGlobalObservers() {
-  !isClient || globalIntersectionObserver || (globalIntersectionObserver = new IntersectionObserver(function (entries) {
+  !ENABLE || globalIntersectionObserver || (globalIntersectionObserver = new IntersectionObserver(function (entries) {
     entries.forEach(function (entry) {
       var node = entry.target;
       IntersectionState.get(node) !== entry.isIntersecting && IntersectionState.set(node, entry.isIntersecting);
@@ -29,30 +46,29 @@ function startGlobalObservers() {
     threshold: 0
   }));
 }
-if (isClient) if (rAF) {
-  var supportsCheckVisibility = "checkVisibility" in document.body,
-    BoundingRects = /* @__PURE__ */new WeakMap();
+if (ENABLE) {
+  var BoundingRects = /* @__PURE__ */new WeakMap();
   async function updateLayoutIfChanged(node) {
-    if (IntersectionState.get(node) !== !1 && !(process.env.TAMAGUI_ONLAYOUT_VISIBILITY_CHECK === "1" && supportsCheckVisibility && !node.checkVisibility())) {
-      var onLayout = LayoutHandlers.get(node);
-      if (typeof onLayout == "function") {
-        var parentNode = node.parentElement;
-        if (parentNode) {
-          var nodeRect, parentRect;
-          if (strategy === "async") {
-            var [nr, pr] = await Promise.all([BoundingRects.get(node) || getBoundingClientRectAsync(node), BoundingRects.get(parentNode) || getBoundingClientRectAsync(parentNode)]);
-            if (nr === !1 || pr === !1) return;
-            nodeRect = nr, parentRect = pr;
-          } else nodeRect = node.getBoundingClientRect(), parentRect = parentNode.getBoundingClientRect();
+    var onLayout = LayoutHandlers.get(node);
+    if (typeof onLayout == "function") {
+      var parentNode = node.parentElement;
+      if (parentNode) {
+        var nodeRect, parentRect;
+        if (strategy === "async") {
+          var [nr, pr] = await Promise.all([BoundingRects.get(node), BoundingRects.get(parentNode)]);
+          if (!nr || !pr) return;
+          nodeRect = nr, parentRect = pr;
+        } else nodeRect = node.getBoundingClientRect(), parentRect = parentNode.getBoundingClientRect();
+        if (!(!nodeRect || !parentRect)) {
           var cachedRect = NodeRectCache.get(node),
             cachedParentRect = NodeRectCache.get(parentNode);
-          if (!cachedRect ||
+          if (!cachedRect || !cachedParentRect ||
           // has changed one rect
           // @ts-expect-error DOMRectReadOnly can go into object
-          !isEqualShallow(cachedRect, nodeRect) && (
+          !isEqualShallow(cachedRect, nodeRect) ||
           // @ts-expect-error DOMRectReadOnly can go into object
-          !cachedParentRect || !isEqualShallow(cachedParentRect, parentRect))) {
-            NodeRectCache.set(node, nodeRect), ParentRectCache.set(parentNode, parentRect);
+          !isEqualShallow(cachedParentRect, parentRect)) {
+            NodeRectCache.set(node, nodeRect), NodeRectCache.set(parentNode, parentRect);
             var event = getElementLayoutEvent(nodeRect, parentRect);
             avoidUpdates ? queuedUpdates.set(node, function () {
               return onLayout(event);
@@ -62,64 +78,66 @@ if (isClient) if (rAF) {
       }
     }
   }
-  rAF(layoutOnAnimationFrame);
-  var frameCount = 0,
-    userSkipVal = process.env.TAMAGUI_LAYOUT_FRAME_SKIP,
-    RUN_EVERY_X_FRAMES = userSkipVal ? +userSkipVal : 10;
+  var userSkipVal = process.env.TAMAGUI_LAYOUT_FRAME_SKIP,
+    RUN_EVERY_X_FRAMES = userSkipVal ? +userSkipVal : 14;
   async function layoutOnAnimationFrame() {
     if (strategy !== "off") {
-      if (!Nodes.size || frameCount++ % RUN_EVERY_X_FRAMES !== 0) {
-        rAF(layoutOnAnimationFrame);
-        return;
-      }
-      frameCount === Number.MAX_SAFE_INTEGER && (frameCount = 0), await new Promise(function (res) {
-        var io = new IntersectionObserver(function (entries) {
-            io.disconnect();
-            var _iteratorNormalCompletion2 = !0,
-              _didIteratorError2 = !1,
-              _iteratorError2 = void 0;
-            try {
-              for (var _iterator2 = entries[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
-                var entry = _step2.value;
-                BoundingRects.set(entry.target, entry.boundingClientRect);
-              }
-            } catch (err) {
-              _didIteratorError2 = !0, _iteratorError2 = err;
-            } finally {
+      var visibleNodes = [],
+        didRun = await new Promise(function (res) {
+          var io = new IntersectionObserver(function (entries) {
+              io.disconnect();
+              var _iteratorNormalCompletion2 = !0,
+                _didIteratorError2 = !1,
+                _iteratorError2 = void 0;
               try {
-                !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
+                for (var _iterator2 = entries[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
+                  var entry = _step2.value;
+                  BoundingRects.set(entry.target, entry.boundingClientRect);
+                }
+              } catch (err) {
+                _didIteratorError2 = !0, _iteratorError2 = err;
               } finally {
-                if (_didIteratorError2) throw _iteratorError2;
+                try {
+                  !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
+                } finally {
+                  if (_didIteratorError2) throw _iteratorError2;
+                }
               }
-            }
-            res();
-          }, {
-            threshold: 0
-          }),
-          _iteratorNormalCompletion = !0,
-          _didIteratorError = !1,
-          _iteratorError = void 0;
-        try {
-          for (var _iterator = Nodes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-            var node = _step.value;
-            node.parentElement instanceof HTMLElement && (io.observe(node), io.observe(node.parentElement));
-          }
-        } catch (err) {
-          _didIteratorError = !0, _iteratorError = err;
-        } finally {
+              res(!0);
+            }, {
+              threshold: 0
+            }),
+            didObserve = !1,
+            _iteratorNormalCompletion = !0,
+            _didIteratorError = !1,
+            _iteratorError = void 0;
           try {
-            !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+            for (var _iterator = Nodes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+              var node = _step.value;
+              if (node.parentElement instanceof HTMLElement) {
+                var disableKey = LayoutDisableKey.get(node);
+                disableKey && DisableLayoutContextValues[disableKey] === !0 || IntersectionState.get(node) !== !1 && (didObserve = !0, io.observe(node), io.observe(node.parentElement), visibleNodes.push(node));
+              }
+            }
+          } catch (err) {
+            _didIteratorError = !0, _iteratorError = err;
           } finally {
-            if (_didIteratorError) throw _iteratorError;
+            try {
+              !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+            } finally {
+              if (_didIteratorError) throw _iteratorError;
+            }
           }
-        }
-      }), Nodes.forEach(function (node) {
+          didObserve || res(!1);
+        });
+      didRun && visibleNodes.forEach(function (node) {
         updateLayoutIfChanged(node);
       });
     }
-    rAF(layoutOnAnimationFrame);
+    setTimeout(layoutOnAnimationFrame, 16.6667 * RUN_EVERY_X_FRAMES);
   }
-} else process.env.NODE_ENV === "development" && console.warn("No requestAnimationFrame - please polyfill for onLayout to work correctly");
+  layoutOnAnimationFrame();
+}
 var getElementLayoutEvent = function (nodeRect, parentRect) {
     return {
       nativeEvent: {
@@ -149,8 +167,9 @@ var getElementLayoutEvent = function (nodeRect, parentRect) {
   };
 function useElementLayout(ref, onLayout) {
   var _ref_current,
+    disableKey = useContext(DisableLayoutContextKey),
     node = ensureWebElement((_ref_current = ref.current) === null || _ref_current === void 0 ? void 0 : _ref_current.host);
-  node && onLayout && LayoutHandlers.set(node, onLayout), useIsomorphicLayoutEffect(function () {
+  node && onLayout && (LayoutHandlers.set(node, onLayout), LayoutDisableKey.set(node, disableKey)), useIsomorphicLayoutEffect(function () {
     var _ref_current2;
     if (onLayout) {
       var node2 = (_ref_current2 = ref.current) === null || _ref_current2 === void 0 ? void 0 : _ref_current2.host;
@@ -213,5 +232,5 @@ function createMeasureLayout(node) {
     return measureLayout(node, relativeTo, callback);
   };
 }
-export { createMeasure, createMeasureInWindow, createMeasureLayout, enable, getBoundingClientRectAsync, getElementLayoutEvent, measure, measureInWindow, measureLayout, measureNode, setOnLayoutStrategy, useElementLayout };
+export { LayoutMeasurementController, createMeasure, createMeasureInWindow, createMeasureLayout, enable, getBoundingClientRectAsync, getElementLayoutEvent, measure, measureInWindow, measureLayout, measureNode, setOnLayoutStrategy, useElementLayout };
 //# sourceMappingURL=index.native.js.map

package/dist/esm/index.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isClient","useIsomorphicLayoutEffect","isEqualShallow","LayoutHandlers","WeakMap","Nodes","Set","IntersectionState","globalIntersectionObserver","strategy","setOnLayoutStrategy","state","NodeRectCache","ParentRectCache","LastChangeTime","rAF","window","requestAnimationFrame","avoidUpdates","queuedUpdates","Map","enable","forEach","cb","clear","startGlobalObservers","IntersectionObserver","entries","entry","node","target","get","isIntersecting","set","threshold","supportsCheckVisibility","document","body","BoundingRects","updateLayoutIfChanged","process","env","TAMAGUI_ONLAYOUT_VISIBILITY_CHECK","checkVisibility","onLayout","parentNode","parentElement","nodeRect","parentRect","nr","pr","Promise","all","getBoundingClientRectAsync","getBoundingClientRect","cachedRect","cachedParentRect","event","getElementLayoutEvent","layoutOnAnimationFrame","frameCount","userSkipVal","TAMAGUI_LAYOUT_FRAME_SKIP","RUN_EVERY_X_FRAMES","size","Number","MAX_SAFE_INTEGER","res","io","disconnect","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","Symbol","iterator","_step2","next","done","value","boundingClientRect","err","return","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","_step","HTMLElement","observe","NODE_ENV","console","warn","nativeEvent","layout","getRelativeDimensions","timeStamp","Date","now","a","b","height","left","top","width","x","y","pageX","pageY","useElementLayout","ref","_ref_current","ensureWebElement","current","host","_ref_current2","node2","add","delete","unobserve","nodeType"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","isClient","useIsomorphicLayoutEffect","isEqualShallow","createContext","useContext","useId","LayoutHandlers","WeakMap","LayoutDisableKey","Nodes","Set","IntersectionState","DisableLayoutContextValues","DisableLayoutContextKey","ENABLE","IntersectionObserver","LayoutMeasurementController","param","disable","children","id","Provider","value","globalIntersectionObserver","strategy","setOnLayoutStrategy","state","NodeRectCache","LastChangeTime","avoidUpdates","queuedUpdates","Map","enable","forEach","cb","clear","startGlobalObservers","entries","entry","node","target","get","isIntersecting","set","threshold","BoundingRects","updateLayoutIfChanged","onLayout","parentNode","parentElement","nodeRect","parentRect","nr","pr","Promise","all","getBoundingClientRect","cachedRect","cachedParentRect","event","getElementLayoutEvent","userSkipVal","process","env","TAMAGUI_LAYOUT_FRAME_SKIP","RUN_EVERY_X_FRAMES","layoutOnAnimationFrame","visibleNodes","didRun","res","io","disconnect","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","Symbol","iterator","_step2","next","done","boundingClientRect","err","return","didObserve","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","_step","HTMLElement","disableKey","observe","push","setTimeout","nativeEvent","layout","getRelativeDimensions","timeStamp","Date","now","a","b","height","left","top","width","x","y","pageX","pageY","useElementLayout","ref","_ref_current","ensureWebElement","current","host","_ref_current2","node2","add","delete","unobserve","getBoundingClientRectAsync","nodeType"],"sources":["../../src/index.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-element-layout",
-  "version": "1.134.5",
+  "version": "1.135.1",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -31,11 +31,11 @@
     }
   },
   "dependencies": {
-    "@tamagui/constants": "1.134.5",
-    "@tamagui/is-equal-shallow": "1.134.5"
+    "@tamagui/constants": "1.135.1",
+    "@tamagui/is-equal-shallow": "1.135.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.134.5",
+    "@tamagui/build": "1.135.1",
     "react": "*"
   },
   "publishConfig": {

package/src/{index.ts → index.tsx}

@@ -1,11 +1,41 @@
 import { isClient, useIsomorphicLayoutEffect } from '@tamagui/constants'
 import { isEqualShallow } from '@tamagui/is-equal-shallow'
-import { useCallback, type RefObject } from 'react'
+import { createContext, useContext, useId, type ReactNode, type RefObject } from 'react'
 
 const LayoutHandlers = new WeakMap<HTMLElement, Function>()
+const LayoutDisableKey = new WeakMap<HTMLElement, string>()
 const Nodes = new Set<HTMLElement>()
 const IntersectionState = new WeakMap<HTMLElement, boolean>()
 
+// separating to avoid all re-rendering
+const DisableLayoutContextValues: Record<string, boolean> = {}
+const DisableLayoutContextKey = createContext<string>('')
+
+const ENABLE = isClient && typeof IntersectionObserver !== 'undefined'
+
+// internal testing - advanced helper to turn off layout measurement for extra performance
+// TODO document!
+// TODO could add frame skip control here
+export const LayoutMeasurementController = ({
+  disable,
+  children,
+}: {
+  disable: boolean
+  children: ReactNode
+}): ReactNode => {
+  const id = useId()
+
+  useIsomorphicLayoutEffect(() => {
+    DisableLayoutContextValues[id] = disable
+  }, [disable, id])
+
+  return (
+    <DisableLayoutContextKey.Provider value={id}>
+      {children}
+    </DisableLayoutContextKey.Provider>
+  )
+}
+
 // Single persistent IntersectionObserver for all nodes
 let globalIntersectionObserver: IntersectionObserver | null = null
 
@@ -39,11 +69,8 @@ export type LayoutEvent = {
 }
 
 const NodeRectCache = new WeakMap<HTMLElement, DOMRect>()
-const ParentRectCache = new WeakMap<HTMLElement, DOMRect>()
 const LastChangeTime = new WeakMap<HTMLElement, number>()
 
-const rAF = typeof window !== 'undefined' ? window.requestAnimationFrame : undefined
-
 // prevent thrashing during first hydration (somewhat, streaming gets trickier)
 let avoidUpdates = true
 const queuedUpdates = new Map<HTMLElement, Function>()
@@ -59,7 +86,7 @@ export function enable(): void {
 }
 
 function startGlobalObservers() {
-  if (!isClient || globalIntersectionObserver) return
+  if (!ENABLE || globalIntersectionObserver) return
 
   globalIntersectionObserver = new IntersectionObserver(
     (entries) => {
@@ -76,134 +103,120 @@ function startGlobalObservers() {
   )
 }
 
-if (isClient) {
-  if (rAF) {
-    const supportsCheckVisibility = 'checkVisibility' in document.body
+if (ENABLE) {
+  const BoundingRects = new WeakMap<any, DOMRectReadOnly | undefined>()
 
-    const BoundingRects = new WeakMap<any, DOMRectReadOnly | undefined>()
+  async function updateLayoutIfChanged(node: HTMLElement) {
+    const onLayout = LayoutHandlers.get(node)
+    if (typeof onLayout !== 'function') return
 
-    async function updateLayoutIfChanged(node: HTMLElement) {
-      if (IntersectionState.get(node) === false) {
-        // avoid due to not intersecting
-        return
-      }
-      // triggers style recalculation in safari which is slower than not
-      if (process.env.TAMAGUI_ONLAYOUT_VISIBILITY_CHECK === '1') {
-        if (supportsCheckVisibility && !(node as any).checkVisibility()) {
-          // avoid due to not visible
-          return
-        }
-      }
+    const parentNode = node.parentElement
+    if (!parentNode) return
 
-      const onLayout = LayoutHandlers.get(node)
-      if (typeof onLayout !== 'function') return
+    let nodeRect: DOMRectReadOnly
+    let parentRect: DOMRectReadOnly
 
-      const parentNode = node.parentElement
-      if (!parentNode) return
+    if (strategy === 'async') {
+      const [nr, pr] = await Promise.all([
+        BoundingRects.get(node),
+        BoundingRects.get(parentNode),
+      ])
 
-      let nodeRect: DOMRectReadOnly
-      let parentRect: DOMRectReadOnly
+      if (!nr || !pr) {
+        return
+      }
 
-      if (strategy === 'async') {
-        const [nr, pr] = await Promise.all([
-          BoundingRects.get(node) || getBoundingClientRectAsync(node),
-          BoundingRects.get(parentNode) || getBoundingClientRectAsync(parentNode),
-        ])
+      nodeRect = nr
+      parentRect = pr
+    } else {
+      nodeRect = node.getBoundingClientRect()
+      parentRect = parentNode.getBoundingClientRect()
+    }
 
-        if (nr === false || pr === false) {
-          return
-        }
+    if (!nodeRect || !parentRect) {
+      return
+    }
 
-        nodeRect = nr
-        parentRect = pr
+    const cachedRect = NodeRectCache.get(node)
+    const cachedParentRect = NodeRectCache.get(parentNode)
+
+    if (
+      !cachedRect ||
+      !cachedParentRect ||
+      // has changed one rect
+      // @ts-expect-error DOMRectReadOnly can go into object
+      !isEqualShallow(cachedRect, nodeRect) ||
+      // @ts-expect-error DOMRectReadOnly can go into object
+      !isEqualShallow(cachedParentRect, parentRect)
+    ) {
+      NodeRectCache.set(node, nodeRect)
+      NodeRectCache.set(parentNode, parentRect)
+
+      const event = getElementLayoutEvent(nodeRect, parentRect)
+
+      if (avoidUpdates) {
+        queuedUpdates.set(node, () => onLayout(event))
       } else {
-        nodeRect = node.getBoundingClientRect()
-        parentRect = parentNode.getBoundingClientRect()
-      }
-
-      const cachedRect = NodeRectCache.get(node)
-      const cachedParentRect = NodeRectCache.get(parentNode)
-
-      if (
-        !cachedRect ||
-        // has changed one rect
-        // @ts-expect-error DOMRectReadOnly can go into object
-        (!isEqualShallow(cachedRect, nodeRect) &&
-          // @ts-expect-error DOMRectReadOnly can go into object
-          (!cachedParentRect || !isEqualShallow(cachedParentRect, parentRect)))
-      ) {
-        NodeRectCache.set(node, nodeRect)
-        ParentRectCache.set(parentNode, parentRect)
-
-        const event = getElementLayoutEvent(nodeRect, parentRect)
-
-        if (avoidUpdates) {
-          queuedUpdates.set(node, () => onLayout(event))
-        } else {
-          onLayout(event)
-        }
+        onLayout(event)
       }
     }
+  }
 
-    // note that getBoundingClientRect() does not thrash layout if its after an animation frame
-    // ok new note: *if* it needed recalc then yea, but browsers often skip that, so it does
-    // which is why we use async strategy in general
-    rAF!(layoutOnAnimationFrame)
+  // note that getBoundingClientRect() does not thrash layout if its after an animation frame
+  // ok new note: *if* it needed recalc then yea, but browsers often skip that, so it does
+  // which is why we use async strategy in general
 
-    // only run once in a few frames, this could be adjustable
-    let frameCount = 0
+  const userSkipVal = process.env.TAMAGUI_LAYOUT_FRAME_SKIP
+  const RUN_EVERY_X_FRAMES = userSkipVal ? +userSkipVal : 14
 
-    const userSkipVal = process.env.TAMAGUI_LAYOUT_FRAME_SKIP
-    const RUN_EVERY_X_FRAMES = userSkipVal ? +userSkipVal : 10
+  async function layoutOnAnimationFrame() {
+    if (strategy !== 'off') {
+      const visibleNodes: HTMLElement[] = []
 
-    async function layoutOnAnimationFrame() {
-      if (strategy !== 'off') {
-        if (!Nodes.size || frameCount++ % RUN_EVERY_X_FRAMES !== 0) {
-          // skip a few frames to avoid work
-          rAF!(layoutOnAnimationFrame)
-          return
-        }
+      // do a 1 rather than N IntersectionObservers for performance
+      const didRun = await new Promise<boolean>((res) => {
+        const io = new IntersectionObserver(
+          (entries) => {
+            io.disconnect()
+            for (const entry of entries) {
+              BoundingRects.set(entry.target, entry.boundingClientRect)
+            }
+            res(true)
+          },
+          {
+            threshold: 0,
+          }
+        )
 
-        if (frameCount === Number.MAX_SAFE_INTEGER) {
-          frameCount = 0
+        let didObserve = false
+
+        for (const node of Nodes) {
+          if (!(node.parentElement instanceof HTMLElement)) continue
+          const disableKey = LayoutDisableKey.get(node)
+          if (disableKey && DisableLayoutContextValues[disableKey] === true) continue
+          if (IntersectionState.get(node) === false) continue
+          didObserve = true
+          io.observe(node)
+          io.observe(node.parentElement)
+          visibleNodes.push(node)
         }
 
-        // do a 1 rather than N IntersectionObservers for performance
-        await new Promise<void>((res) => {
-          const io = new IntersectionObserver(
-            (entries) => {
-              io.disconnect()
-              for (const entry of entries) {
-                BoundingRects.set(entry.target, entry.boundingClientRect)
-              }
-              res()
-            },
-            {
-              threshold: 0,
-            }
-          )
-          for (const node of Nodes) {
-            if (node.parentElement instanceof HTMLElement) {
-              io.observe(node)
-              io.observe(node.parentElement)
-            }
-          }
-        })
+        if (!didObserve) {
+          res(false)
+        }
+      })
 
-        Nodes.forEach((node) => {
+      if (didRun) {
+        visibleNodes.forEach((node) => {
           updateLayoutIfChanged(node)
         })
       }
-
-      rAF!(layoutOnAnimationFrame)
-    }
-  } else {
-    if (process.env.NODE_ENV === 'development') {
-      console.warn(
-        `No requestAnimationFrame - please polyfill for onLayout to work correctly`
-      )
     }
+
+    setTimeout(layoutOnAnimationFrame, 16.6667 * RUN_EVERY_X_FRAMES)
   }
+
+  layoutOnAnimationFrame()
 }
 
 export const getElementLayoutEvent = (
@@ -230,10 +243,13 @@ export function useElementLayout(
   ref: RefObject<TamaguiComponentStatePartial>,
   onLayout?: ((e: LayoutEvent) => void) | null
 ): void {
+  const disableKey = useContext(DisableLayoutContextKey)
+
   // ensure always up to date so we can avoid re-running effect
   const node = ensureWebElement(ref.current?.host)
   if (node && onLayout) {
     LayoutHandlers.set(node, onLayout)
+    LayoutDisableKey.set(node, disableKey)
   }
 
   useIsomorphicLayoutEffect(() => {

package/types/index.d.ts

@@ -1,4 +1,11 @@
-import { type RefObject } from "react";
+import { type ReactNode, type RefObject } from "react";
+// internal testing - advanced helper to turn off layout measurement for extra performance
+// TODO document!
+// TODO could add frame skip control here
+export declare const LayoutMeasurementController: ({ disable, children }: {
+	disable: boolean;
+	children: ReactNode;
+}) => ReactNode;
 type TamaguiComponentStatePartial = {
 	host?: any;
 };