status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-25 15:45:32 +00:00
Code Issues Projects Releases Wiki Activity

Add [RCTShadowView isCSSLeaf] for skipping css tree of children

Browse Source 
Summary: RCTShadowText currently overrides a couple methods from RCTShadowView to reset the count of the cssNode children to 0. This diff instead moves that logic into RCTShadowView behind a configurable flag making it easier to reason about.

Reviewed By: javache

Differential Revision: D3586434

fbshipit-source-id: 4389a8119dc49e3fc4357174c87c0c69287ae385
This commit is contained in:
Emil Sjolander 2016-07-20 02:49:13 -07:00 committed by Facebook Github Bot 7
parent 102577565a
commit 0587c85094
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Libraries/Text/RCTShadowText.m
View File

@ -81,6 +81,11 @@ static css_dim_t RCTMeasure(void *context, float width, css_measure_mode_t width
return [[superDescription substringToIndex:superDescription.length - 1] stringByAppendingFormat:@"; text: %@>", [self attributedString].string]; return [[superDescription substringToIndex:superDescription.length - 1] stringByAppendingFormat:@"; text: %@>", [self attributedString].string];
} }
- (BOOL)isCSSLeafNode
{
return YES;
}
- (void)contentSizeMultiplierDidChange:(NSNotification *)note - (void)contentSizeMultiplierDidChange:(NSNotification *)note
{ {
[self dirtyLayout]; [self dirtyLayout];
@ -443,18 +448,6 @@ static css_dim_t RCTMeasure(void *context, float width, css_measure_mode_t width
} }
} }
- (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
{
[super insertReactSubview:subview atIndex:atIndex];
self.cssNode->children_count = 0;
}
- (void)removeReactSubview:(RCTShadowView *)subview
{
[super removeReactSubview:subview];
self.cssNode->children_count = 0;
}
- (void)setBackgroundColor:(UIColor *)backgroundColor - (void)setBackgroundColor:(UIColor *)backgroundColor
{ {
super.backgroundColor = backgroundColor; super.backgroundColor = backgroundColor;

7
React/Views/RCTShadowView.h
View File

@ -189,6 +189,13 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
- (void)dirtyLayout NS_REQUIRES_SUPER; - (void)dirtyLayout NS_REQUIRES_SUPER;
- (BOOL)isLayoutDirty; - (BOOL)isLayoutDirty;
/**
* Return whether or not this node acts as a leaf node in the eyes of CSSLayout. For example
* RCTShadowText has children which it does not want CSSLayout to lay out so in the eyes of
* CSSLayout it is a leaf node.
*/
- (BOOL)isCSSLeafNode;
- (void)dirtyPropagation NS_REQUIRES_SUPER; - (void)dirtyPropagation NS_REQUIRES_SUPER;
- (BOOL)isPropagationDirty; - (BOOL)isPropagationDirty;

9
React/Views/RCTShadowView.m
View File

@ -320,6 +320,11 @@ static void RCTProcessMetaProps(const float metaProps[META_PROP_COUNT], float st
return _layoutLifecycle != RCTUpdateLifecycleComputed; return _layoutLifecycle != RCTUpdateLifecycleComputed;
} }
- (BOOL)isCSSLeafNode
{
return NO;
}
- (void)dirtyPropagation - (void)dirtyPropagation
{ {
if (_propagationLifecycle != RCTUpdateLifecycleDirtied) { if (_propagationLifecycle != RCTUpdateLifecycleDirtied) {
@ -354,7 +359,7 @@ static void RCTProcessMetaProps(const float metaProps[META_PROP_COUNT], float st
- (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
{ {
[_reactSubviews insertObject:subview atIndex:atIndex]; [_reactSubviews insertObject:subview atIndex:atIndex];
_cssNode->children_count = (int)_reactSubviews.count; _cssNode->children_count = [self isCSSLeafNode] ? 0 : (int)_reactSubviews.count;
subview->_superview = self; subview->_superview = self;
_didUpdateSubviews = YES; _didUpdateSubviews = YES;
[self dirtyText]; [self dirtyText];
@ -370,7 +375,7 @@ static void RCTProcessMetaProps(const float metaProps[META_PROP_COUNT], float st
_didUpdateSubviews = YES; _didUpdateSubviews = YES;
subview->_superview = nil; subview->_superview = nil;
[_reactSubviews removeObject:subview]; [_reactSubviews removeObject:subview];
_cssNode->children_count = (int)_reactSubviews.count; _cssNode->children_count = [self isCSSLeafNode] ? 0 : (int)_reactSubviews.count;
} }
- (NSArray<RCTShadowView *> *)reactSubviews - (NSArray<RCTShadowView *> *)reactSubviews