Merge remote-tracking branch 'origin/feature/z-index-cherrypick-2' in…

…to feature/z-index-cherrypick-2
facebook · Jun 9, 2016 · 9e8ea72 · 9e8ea72
2 parents bb69e1a + 15425fd
commit 9e8ea72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -100,6 +100,9 @@ var LayoutPropTypes = {
 
   // https://developer.mozilla.org/en-US/docs/Web/CSS/flex
   flex: ReactPropTypes.number,
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/z-index
+  zIndex: ReactPropTypes.number,
 };
 
 module.exports = LayoutPropTypes;
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
@@ -120,6 +120,7 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(__unused NSDictio
 RCT_REMAP_VIEW_PROPERTY(shadowOpacity, layer.shadowOpacity, float)
 RCT_REMAP_VIEW_PROPERTY(shadowRadius, layer.shadowRadius, CGFloat)
 RCT_REMAP_VIEW_PROPERTY(overflow, clipsToBounds, css_clip_t)
+RCT_REMAP_VIEW_PROPERTY(zIndex, layer.zPosition, CGFloat)
 RCT_CUSTOM_VIEW_PROPERTY(shouldRasterizeIOS, BOOL, RCTView)
 {
   view.layer.shouldRasterize = json ? [RCTConvert BOOL:json] : defaultView.layer.shouldRasterize;

diff --git a/React/Views/RCTWebView.m b/React/Views/RCTWebView.m
@@ -248,6 +248,7 @@ - (void)webView:(__unused UIWebView *)webView didFailLoadWithError:(NSError *)er
 
 - (void)webViewDidFinishLoad:(UIWebView *)webView
 {
+  self.superview.layer.zPosition = self.layer.zPosition;
   if (_injectedJavaScript != nil) {
     NSString *jsEvaluationValue = [webView stringByEvaluatingJavaScriptFromString:_injectedJavaScript];