From 2789ba016bfddace1407473769e933795333cfab Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Mon, 18 Dec 2017 11:41:24 -0800 Subject: [PATCH] zIndex prop was removed from RCTShadowView Summary: This was leftovers from old implementation of zIndex feature. Janic janicduplessis refactored this and moved all logic to UIView layer, so we don't need this prop anymore in shadow realm. More info: https://github.com/facebook/react-native/pull/14011 Reviewed By: mmmulani Differential Revision: D6574414 fbshipit-source-id: 2cae19350765689784d7884ed875878d39b4e3f1 --- React/Views/RCTShadowView.h | 5 ----- React/Views/RCTShadowView.m | 10 ---------- React/Views/RCTViewManager.m | 1 - 3 files changed, 16 deletions(-) diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h index 6b46c4f35..f3b334e63 100644 --- a/React/Views/RCTShadowView.h +++ b/React/Views/RCTShadowView.h @@ -170,11 +170,6 @@ typedef void (^RCTApplierBlock)(NSDictionary *viewRegistry @property (nonatomic, assign) float aspectRatio; -/** - * z-index, used to override sibling order in the view - */ -@property (nonatomic, assign) NSInteger zIndex; - /** * Interface direction (LTR or RTL) */ diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m index 56c363f96..b3d9d6910 100644 --- a/React/Views/RCTShadowView.m +++ b/React/Views/RCTShadowView.m @@ -792,16 +792,6 @@ RCT_STYLE_PROPERTY(AspectRatio, aspectRatio, AspectRatio, float) [self dirtyPropagation]; } -- (void)setZIndex:(NSInteger)zIndex -{ - _zIndex = zIndex; - if (_superview) { - // Changing zIndex means the subview order of the parent needs updating - _superview->_didUpdateSubviews = YES; - [_superview dirtyPropagation]; - } -} - - (void)didUpdateReactSubviews { // Does nothing by default diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 2aba8a754..99c40a7fd 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -336,7 +336,6 @@ RCT_EXPORT_SHADOW_PROPERTY(display, YGDisplay) RCT_EXPORT_SHADOW_PROPERTY(onLayout, RCTDirectEventBlock) -RCT_EXPORT_SHADOW_PROPERTY(zIndex, NSInteger) RCT_EXPORT_SHADOW_PROPERTY(direction, YGDirection) @end