fix: Make sure we don't store element snapshot in the cache (#1001)

mykola-mokhnach · web-flow · commit cfe052bb3adb · 2025-04-10T12:51:07.000+02:00
diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -269,6 +269,7 @@ + (NSArray *)routes
     NSString *focusedUUID = [elementCache storeElement:(useNativeCachingStrategy
                                                         ? focusedElement
                                                         : [focusedElement fb_stableInstanceWithUid:focusedElement.fb_uid])];
+    focusedElement.lastSnapshot = nil;
     if (focusedUUID && [focusedUUID isEqualToString:(id)request.parameters[@"uuid"]]) {
       isFocused = YES;
     }
diff --git a/WebDriverAgentLib/Routing/FBResponsePayload.m b/WebDriverAgentLib/Routing/FBResponsePayload.m
@@ -55,7 +55,9 @@
 id<FBResponsePayload> FBResponseWithCachedElement(XCUIElement *element, FBElementCache *elementCache, BOOL compact)
 {
   [elementCache storeElement:maybeStable(element)];
-  return FBResponseWithStatus([FBCommandStatus okWithValue:FBDictionaryResponseWithElement(element, compact)]);
+  NSDictionary *response = FBDictionaryResponseWithElement(element, compact);
+  element.lastSnapshot = nil;
+  return FBResponseWithStatus([FBCommandStatus okWithValue:response]);
 }
 
 id<FBResponsePayload> FBResponseWithCachedElements(NSArray<XCUIElement *> *elements, FBElementCache *elementCache, BOOL compact)
@@ -64,6 +66,7 @@
   for (XCUIElement *element in elements) {
     [elementCache storeElement:maybeStable(element)];
     [elementsResponse addObject:FBDictionaryResponseWithElement(element, compact)];
+    element.lastSnapshot = nil;
   }
   return FBResponseWithStatus([FBCommandStatus okWithValue:elementsResponse]);
 }

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ + (NSArray *)routes`
`269`	`269`	`NSString *focusedUUID = [elementCache storeElement:(useNativeCachingStrategy`
`270`	`270`	`? focusedElement`
`271`	`271`	`: [focusedElement fb_stableInstanceWithUid:focusedElement.fb_uid])];`
	`272`	`+ focusedElement.lastSnapshot = nil;`
`272`	`273`	`if (focusedUUID && [focusedUUID isEqualToString:(id)request.parameters[@"uuid"]]) {`
`273`	`274`	`isFocused = YES;`
`274`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@`
`55`	`55`	`id<FBResponsePayload> FBResponseWithCachedElement(XCUIElement element, FBElementCache elementCache, BOOL compact)`
`56`	`56`	`{`
`57`	`57`	`[elementCache storeElement:maybeStable(element)];`
`58`		`- return FBResponseWithStatus([FBCommandStatus okWithValue:FBDictionaryResponseWithElement(element, compact)]);`
	`58`	`+ NSDictionary *response = FBDictionaryResponseWithElement(element, compact);`
	`59`	`+ element.lastSnapshot = nil;`
	`60`	`+ return FBResponseWithStatus([FBCommandStatus okWithValue:response]);`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`id<FBResponsePayload> FBResponseWithCachedElements(NSArray<XCUIElement > elements, FBElementCache *elementCache, BOOL compact)`
`@@ -64,6 +66,7 @@`
`64`	`66`	`for (XCUIElement *element in elements) {`
`65`	`67`	`[elementCache storeElement:maybeStable(element)];`
`66`	`68`	`[elementsResponse addObject:FBDictionaryResponseWithElement(element, compact)];`
	`69`	`+ element.lastSnapshot = nil;`
`67`	`70`	`}`
`68`	`71`	`return FBResponseWithStatus([FBCommandStatus okWithValue:elementsResponse]);`
`69`	`72`	`}`