From 588c040656deafd9dbd9dae148e4395772b9bd94 Mon Sep 17 00:00:00 2001
From: RobPruzan <rapruzan@buffalo.edu>
Date: Thu, 21 Nov 2024 02:09:37 -0500
Subject: [PATCH] cached measurment -> latest measurment

---
 src/core/native/index.tsx |  4 ++--
 src/core/native/scan.tsx  | 26 +++++++++++++-------------
 src/core/web/outline.ts   | 26 +++++++++++++-------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/core/native/index.tsx b/src/core/native/index.tsx
index 10b2305b..c302df37 100644
--- a/src/core/native/index.tsx
+++ b/src/core/native/index.tsx
@@ -123,7 +123,7 @@ const updateOutlines = async (fiber: Fiber, render: Render) => {
     const existingOutline = ReactScanInternals.activeOutlines.find(
       ({ outline }) => {
         return (
-          getKey(assertNative(outline.cachedMeasurement).value) ===
+          getKey(assertNative(outline.latestMeasurement).value) ===
           getKey(measurement)
         );
       },
@@ -141,7 +141,7 @@ const updateOutlines = async (fiber: Fiber, render: Render) => {
       ReactScanInternals.activeOutlines = getCopiedActiveOutlines();
     } else {
       const newOutline: PendingOutline = {
-        cachedMeasurement: {
+        latestMeasurement: {
           kind: 'native',
           value: measurement,
         },
diff --git a/src/core/native/scan.tsx b/src/core/native/scan.tsx
index 988d23ba..52a4cb61 100644
--- a/src/core/native/scan.tsx
+++ b/src/core/native/scan.tsx
@@ -190,7 +190,7 @@ const ReactNativeScan = ({ id: _ }: { id: string }) => {
         {outlines
           // we can maybe take this out of render if Dimensions.get is cheap
           .filter(({ outline }) => {
-            const measurement = assertNative(outline.cachedMeasurement).value;
+            const measurement = assertNative(outline.latestMeasurement).value;
             const vis = isVisible(measurement.x, measurement.y);
             return vis;
           })
@@ -202,33 +202,33 @@ const ReactNativeScan = ({ id: _ }: { id: string }) => {
             return (
               <Group key={render.id}>
                 <Rect
-                  x={assertNative(render.outline.cachedMeasurement).value.pageX}
-                  y={assertNative(render.outline.cachedMeasurement).value.pageY}
+                  x={assertNative(render.outline.latestMeasurement).value.pageX}
+                  y={assertNative(render.outline.latestMeasurement).value.pageY}
                   width={
-                    assertNative(render.outline.cachedMeasurement).value.width
+                    assertNative(render.outline.latestMeasurement).value.width
                   }
                   height={
-                    assertNative(render.outline.cachedMeasurement).value.height
+                    assertNative(render.outline.latestMeasurement).value.height
                   }
                   color="rgba(88, 82, 185, 0.1)"
                 />
                 <Rect
-                  x={assertNative(render.outline.cachedMeasurement).value.pageX}
-                  y={assertNative(render.outline.cachedMeasurement).value.pageY}
+                  x={assertNative(render.outline.latestMeasurement).value.pageX}
+                  y={assertNative(render.outline.latestMeasurement).value.pageY}
                   width={
-                    assertNative(render.outline.cachedMeasurement).value.width
+                    assertNative(render.outline.latestMeasurement).value.width
                   }
                   height={
-                    assertNative(render.outline.cachedMeasurement).value.height
+                    assertNative(render.outline.latestMeasurement).value.height
                   }
                   color="rgba(147, 141, 255, 0.6)"
                   style="stroke"
                   strokeWidth={1}
                 />
                 <Rect
-                  x={assertNative(render.outline.cachedMeasurement).value.pageX}
+                  x={assertNative(render.outline.latestMeasurement).value.pageX}
                   y={
-                    assertNative(render.outline.cachedMeasurement).value.pageY -
+                    assertNative(render.outline.latestMeasurement).value.pageY -
                     labelHeight -
                     2
                   }
@@ -238,11 +238,11 @@ const ReactNativeScan = ({ id: _ }: { id: string }) => {
                 />
                 <Text
                   x={
-                    assertNative(render.outline.cachedMeasurement).value.pageX +
+                    assertNative(render.outline.latestMeasurement).value.pageX +
                     labelPadding
                   }
                   y={
-                    assertNative(render.outline.cachedMeasurement).value.pageY -
+                    assertNative(render.outline.latestMeasurement).value.pageY -
                     5
                   }
                   text={render.text || 'unknown'}
diff --git a/src/core/web/outline.ts b/src/core/web/outline.ts
index fa6b8283..044dd6e4 100644
--- a/src/core/web/outline.ts
+++ b/src/core/web/outline.ts
@@ -17,7 +17,7 @@ export const assertDom = (measurement: Measurement) => {
 
 export interface PendingOutline {
   fiber: Fiber; // todo, weak ref not always available
-  cachedMeasurement: Measurement;
+  latestMeasurement: Measurement;
   renders: Render[];
 }
 
@@ -129,7 +129,7 @@ export const getOutline = (
   return {
     fiber: fiber,
     renders: [render],
-    cachedMeasurement: {
+    latestMeasurement: {
       kind: 'dom',
       value: rect,
     },
@@ -140,7 +140,7 @@ export const mergeOutlines = (outlines: PendingOutline[]) => {
   const mergedOutlines = new Map<string, PendingOutline>();
   for (let i = 0, len = outlines.length; i < len; i++) {
     const outline = outlines[i];
-    const key = getOutlineKey(assertDom(outline.cachedMeasurement).value);
+    const key = getOutlineKey(assertDom(outline.latestMeasurement).value);
     const existingOutline = mergedOutlines.get(key);
 
     if (!existingOutline) {
@@ -173,7 +173,7 @@ export const recalcOutlines = throttle(() => {
       scheduledOutlines.splice(i, 1);
       continue;
     }
-    outline.cachedMeasurement.value = rect;
+    outline.latestMeasurement.value = rect;
   }
 
   for (let i = activeOutlines.length - 1; i >= 0; i--) {
@@ -187,7 +187,7 @@ export const recalcOutlines = throttle(() => {
       activeOutlines.splice(i, 1);
       continue;
     }
-    outline.cachedMeasurement.value = rect;
+    outline.latestMeasurement.value = rect;
   }
 }, DEFAULT_THROTTLE_TIME);
 
@@ -238,7 +238,7 @@ export const flushOutlines = (
 
       await Promise.all(
         mergedOutlines.map(async (outline) => {
-          const key = getOutlineKey(assertDom(outline.cachedMeasurement).value);
+          const key = getOutlineKey(assertDom(outline.latestMeasurement).value);
           if (previousOutlines.has(key)) {
             return;
           }
@@ -270,11 +270,11 @@ export const paintOutline = (
       log(outline.renders);
     }
 
-    const key = getOutlineKey(assertDom(outline.cachedMeasurement).value); // todo: fix for dom
+    const key = getOutlineKey(assertDom(outline.latestMeasurement).value); // todo: fix for dom
     const existingActiveOutline = ReactScanInternals.activeOutlines.find(
       (activeOutline) =>
         getOutlineKey(
-          assertDom(activeOutline.outline.cachedMeasurement).value,
+          assertDom(activeOutline.outline.latestMeasurement).value,
         ) === key,
     );
 
@@ -293,8 +293,8 @@ export const paintOutline = (
 
     if (existingActiveOutline) {
       existingActiveOutline.outline.renders.push(...outline.renders);
-      existingActiveOutline.outline.cachedMeasurement =
-        outline.cachedMeasurement;
+      existingActiveOutline.outline.latestMeasurement =
+        outline.latestMeasurement;
       existingActiveOutline.frame = 0;
       existingActiveOutline.totalFrames = totalFrames;
       existingActiveOutline.alpha = alpha;
@@ -350,10 +350,10 @@ export const fadeOutOutline = (ctx: CanvasRenderingContext2D) => {
       }
       const newRect = getRect(domNode);
       if (newRect) {
-        outline.cachedMeasurement.value = newRect;
+        outline.latestMeasurement.value = newRect;
       }
     });
-    const { value: rect } = assertDom(outline.cachedMeasurement);
+    const { value: rect } = assertDom(outline.latestMeasurement);
     const unstable = isOutlineUnstable(outline);
 
     const alphaScalar = unstable ? 0.8 : 0.2;
@@ -393,7 +393,7 @@ export const fadeOutOutline = (ctx: CanvasRenderingContext2D) => {
 
   for (let i = 0, len = pendingLabeledOutlines.length; i < len; i++) {
     const { alpha, outline, text } = pendingLabeledOutlines[i];
-    const { value: rect } = assertDom(outline.cachedMeasurement); // todo: fix for dom
+    const { value: rect } = assertDom(outline.latestMeasurement); // todo: fix for dom
     ctx.save();
 
     if (text) {