From 9dfa2e7f3cfa5009f6c54382e90681d99a9c3cb8 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Mon, 5 Feb 2018 22:15:32 -0800 Subject: [PATCH] Removed `[ShadowView collectUpdatedFrames:]` Summary: Another juicy leftover from old Text implementation. Reviewed By: fkgozali Differential Revision: D6887942 fbshipit-source-id: d0363d06d566554c03d0ae3293597daf9c387028 --- React/Views/RCTShadowView.h | 11 ----------- React/Views/RCTShadowView.m | 28 ---------------------------- 2 files changed, 39 deletions(-) diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h index 76d464fc1..1d8ed8a4c 100644 --- a/React/Views/RCTShadowView.h +++ b/React/Views/RCTShadowView.h @@ -184,17 +184,6 @@ typedef void (^RCTApplierBlock)(NSDictionary *viewRegistry */ @property (nonatomic, assign) CGSize intrinsicContentSize; -/** - * Can be called by a parent on a child in order to calculate all views whose frame needs - * updating in that branch. Adds these frames to `viewsWithNewFrame`. Useful if layout - * enters a view where flex doesn't apply (e.g. Text) and then you want to resume flex - * layout on a subview. - */ -- (void)collectUpdatedFrames:(NSMutableSet *)viewsWithNewFrame - withFrame:(CGRect)frame - hidden:(BOOL)hidden - absolutePosition:(CGPoint)absolutePosition; - /** * Apply the CSS layout. * This method also calls `applyLayoutToChildren:` internally. The functionality diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m index 714a5c7a6..a0b991c31 100644 --- a/React/Views/RCTShadowView.m +++ b/React/Views/RCTShadowView.m @@ -262,34 +262,6 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT], } } -- (void)collectUpdatedFrames:(NSMutableSet *)viewsWithNewFrame - withFrame:(CGRect)frame - hidden:(BOOL)hidden - absolutePosition:(CGPoint)absolutePosition -{ - // This is not the core layout method. It is only used by RCTTextShadowView to layout - // nested views. - - if (_hidden != hidden) { - // The hidden state has changed. Even if the frame hasn't changed, add - // this ShadowView to viewsWithNewFrame so the UIManager will process - // this ShadowView's UIView and update its hidden state. - _hidden = hidden; - [viewsWithNewFrame addObject:self]; - } - - if (!CGRectEqualToRect(frame, _frame)) { - YGNodeStyleSetPositionType(_yogaNode, YGPositionTypeAbsolute); - YGNodeStyleSetWidth(_yogaNode, frame.size.width); - YGNodeStyleSetHeight(_yogaNode, frame.size.height); - YGNodeStyleSetPosition(_yogaNode, YGEdgeLeft, frame.origin.x); - YGNodeStyleSetPosition(_yogaNode, YGEdgeTop, frame.origin.y); - } - - YGNodeCalculateLayout(_yogaNode, frame.size.width, frame.size.height, YGDirectionInherit); - [self applyLayoutNode:_yogaNode viewsWithNewFrame:viewsWithNewFrame absolutePosition:absolutePosition]; -} - - (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor { CGPoint offset = CGPointZero;