Skip to content

Commit 62aa84a

Browse files
Peter Arganyfacebook-github-bot
Peter Argany
authored andcommitted
Deprecate calculateChildFrames from RCTScrollView
Summary: This function is unused. (Followup to D21941946) Changelog: [iOS] Deprecate calculateChildFrames from RCTScrollView Reviewed By: sammy-SC Differential Revision: D22071415 fbshipit-source-id: 0c996ab02df1431ee9cfa082bc99681a2ec7118c
1 parent 3ff671c commit 62aa84a

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

React/Views/ScrollView/RCTScrollView.m

-30
Original file line numberDiff line numberDiff line change
@@ -600,36 +600,6 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
600600
RCT_FORWARD_SCROLL_EVENT(scrollViewDidScroll : scrollView);
601601
}
602602

603-
- (NSArray<NSDictionary *> *)calculateChildFramesData
604-
{
605-
NSMutableArray<NSDictionary *> *updatedChildFrames = [NSMutableArray new];
606-
[[_contentView reactSubviews] enumerateObjectsUsingBlock:^(UIView *subview, NSUInteger idx, __unused BOOL *stop) {
607-
// Check if new or changed
608-
CGRect newFrame = subview.frame;
609-
BOOL frameChanged = NO;
610-
if (self->_cachedChildFrames.count <= idx) {
611-
frameChanged = YES;
612-
[self->_cachedChildFrames addObject:[NSValue valueWithCGRect:newFrame]];
613-
} else if (!CGRectEqualToRect(newFrame, [self->_cachedChildFrames[idx] CGRectValue])) {
614-
frameChanged = YES;
615-
self->_cachedChildFrames[idx] = [NSValue valueWithCGRect:newFrame];
616-
}
617-
618-
// Create JS frame object
619-
if (frameChanged) {
620-
[updatedChildFrames addObject:@{
621-
@"index" : @(idx),
622-
@"x" : @(newFrame.origin.x),
623-
@"y" : @(newFrame.origin.y),
624-
@"width" : @(newFrame.size.width),
625-
@"height" : @(newFrame.size.height),
626-
}];
627-
}
628-
}];
629-
630-
return updatedChildFrames;
631-
}
632-
633603
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
634604
{
635605
_allowNextScrollNoMatterWhat = YES; // Ensure next scroll event is recorded, regardless of throttle

React/Views/ScrollView/RCTScrollViewManager.m

-22
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
#import "RCTShadowView.h"
1313
#import "RCTUIManager.h"
1414

15-
@interface RCTScrollView (Private)
16-
17-
- (NSArray<NSDictionary *> *)calculateChildFramesData;
18-
19-
@end
20-
2115
@implementation RCTConvert (UIScrollView)
2216

2317
RCT_ENUM_CONVERTER(
@@ -140,22 +134,6 @@ - (UIView *)view
140134
}];
141135
}
142136

143-
RCT_EXPORT_METHOD(calculateChildFrames : (nonnull NSNumber *)reactTag callback : (RCTResponseSenderBlock)callback)
144-
{
145-
[self.bridge.uiManager
146-
addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTScrollView *> *viewRegistry) {
147-
RCTScrollView *view = viewRegistry[reactTag];
148-
if (!view || ![view isKindOfClass:[RCTScrollView class]]) {
149-
return;
150-
}
151-
152-
NSArray<NSDictionary *> *childFrames = [view calculateChildFramesData];
153-
if (childFrames) {
154-
callback(@[ childFrames ]);
155-
}
156-
}];
157-
}
158-
159137
RCT_EXPORT_METHOD(scrollTo
160138
: (nonnull NSNumber *)reactTag offsetX
161139
: (CGFloat)x offsetY

0 commit comments

Comments
 (0)