Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure layout happens after setFrame:forView:

Browse Source 
Reviewed By: majak

Differential Revision: D3682745

fbshipit-source-id: 108ff292aa79765d8e5bb7fc364717eba662c0ea
This commit is contained in:
Pieter De Baets
2016-09-07 11:31:08 +01:00
committed by Konstantin Raev
parent e72181447e
commit 3a3ecc40d5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/Modules/RCTUIManager.m
+9 -3
View File
@@ -232,7 +232,7 @@ RCT_EXPORT_MODULE()
dispatch_async(RCTGetUIManagerQueue(), ^{
[[NSNotificationCenter defaultCenter] postNotificationName:RCTUIManagerWillUpdateViewsDueToContentSizeMultiplierChangeNotification
object:self];
[self batchDidComplete];
[self setNeedsLayout];
});
}
@@ -424,8 +424,10 @@ dispatch_queue_t RCTGetUIManagerQueue(void)
RCTShadowView *shadowView = self->_shadowViewRegistry[reactTag];
RCTAssert(shadowView != nil, @"Could not locate shadow view with tag #%@", reactTag);
BOOL needsLayout = NO;
if (!CGRectEqualToRect(frame, shadowView.frame)) {
shadowView.frame = frame;
needsLayout = YES;
}
// Trigger re-layout when size flexibility changes, as the root view might grow or
@@ -434,9 +436,13 @@ dispatch_queue_t RCTGetUIManagerQueue(void)
RCTRootShadowView *rootShadowView = (RCTRootShadowView *)shadowView;
if (rootShadowView.sizeFlexibility != sizeFlexibility) {
rootShadowView.sizeFlexibility = sizeFlexibility;
[self batchDidComplete];
needsLayout = YES;
}
}
if (needsLayout) {
[self setNeedsLayout];
}
});
}
@@ -451,7 +457,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void)
shadowView.intrinsicContentSize = size;
[self batchDidComplete];
[self setNeedsLayout];
});
}