From 5ffeb9764c72def0f771c714b3f2143dc000f1ee Mon Sep 17 00:00:00 2001 From: Konstantin Raev Date: Thu, 3 Mar 2016 04:20:34 -0800 Subject: [PATCH] Back out of D3000972 Reviewed By: dmmiller Differential Revision: D3003211 fb-gh-sync-id: e64f1f17dcbf19a32066de91d6e839d59cd5d27c shipit-source-id: e64f1f17dcbf19a32066de91d6e839d59cd5d27c --- .../NavigationAnimatedExample.js | 19 +- .../NavigationBasicExample.js | 3 +- .../NavigationCompositionExample.js | 15 +- .../NavigationExampleRow.js | 3 +- Examples/UIExplorer/UIExplorerList.android.js | 2 - .../NavigationHeader.js | 296 ++++++------------ .../NavigationHeaderBackButton.js | 59 ---- .../NavigationHeaderTitle.js | 74 ----- .../assets/back-icon@1.5x.android.png | Bin 134 -> 0 bytes .../assets/back-icon@1.5x.ios.png | Bin 273 -> 0 bytes .../assets/back-icon@1x.android.png | Bin 100 -> 0 bytes .../assets/back-icon@1x.ios.png | Bin 177 -> 0 bytes .../assets/back-icon@2x.android.png | Bin 134 -> 0 bytes .../assets/back-icon@2x.ios.png | Bin 303 -> 0 bytes .../assets/back-icon@3x.android.png | Bin 167 -> 0 bytes .../assets/back-icon@3x.ios.png | Bin 439 -> 0 bytes .../assets/back-icon@4x.android.png | Bin 207 -> 0 bytes .../assets/back-icon@4x.ios.png | Bin 586 -> 0 bytes .../NavigationExperimental/back_chevron.png | Bin 0 -> 575 bytes .../NavigationAnimatedView.js | 19 +- .../NavigationExperimental.js | 4 - .../NavigationStateUtils.js | 6 - 22 files changed, 122 insertions(+), 378 deletions(-) delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js delete mode 100644 Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.ios.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.ios.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.android.png delete mode 100644 Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png create mode 100644 Libraries/CustomComponents/NavigationExperimental/back_chevron.png diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js index 8ef14c56ac8..e74d80e2630 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js @@ -27,7 +27,6 @@ var { RootContainer: NavigationRootContainer, Reducer: NavigationReducer, Header: NavigationHeader, - HeaderTitle: NavigationHeaderTitle, } = NavigationExperimental; const NavigationBasicReducer = NavigationReducer.StackReducer({ @@ -61,6 +60,12 @@ class NavigationAnimatedExample extends React.Component { /> ); } + handleBackAction() { + return ( + this.navRootContainer && + this.navRootContainer.handleNavigation(NavigationRootContainer.getBackAction()) + ); + } _renderNavigated(navigationState, onNavigate) { if (!navigationState) { return null; @@ -69,13 +74,11 @@ class NavigationAnimatedExample extends React.Component { ( + renderOverlay={(props) => ( {pageState.key}} + navigationState={props.navigationParentState} + position={props.position} + getTitle={state => state.key} /> )} setTiming={(pos, navState) => { @@ -118,7 +121,7 @@ const styles = StyleSheet.create({ flex: 1, }, scrollView: { - marginTop: NavigationHeader.APPBAR_HEIGHT + NavigationHeader.STATUSBAR_HEIGHT, + marginTop: 64 }, }); diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js index 8508c047368..447ab2051fb 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js @@ -23,7 +23,6 @@ const NavigationExampleRow = require('./NavigationExampleRow'); const { RootContainer: NavigationRootContainer, Reducer: NavigationReducer, - Header: NavigationHeader, } = NavigationExperimental; const StackReducer = NavigationReducer.StackReducer; @@ -94,7 +93,7 @@ const styles = StyleSheet.create({ topView: { backgroundColor: '#E9E9EF', flex: 1, - paddingTop: NavigationHeader.STATUSBAR_HEIGHT, + paddingTop: 30, }, }); diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js index 6a79a5cdc04..bc1d184db5d 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js @@ -28,7 +28,6 @@ const { Container: NavigationContainer, RootContainer: NavigationRootContainer, Header: NavigationHeader, - HeaderTitle: NavigationHeaderTitle, Reducer: NavigationReducer, View: NavigationView, } = NavigationExperimental; @@ -155,15 +154,13 @@ class ExampleTabScreen extends React.Component { /> ); } - - _renderHeader(scenes, index, position, layout) { + _renderHeader(props) { return ( {stateTypeTitleMap(pageState)}} + navigationState={props.navigationParentState} + position={props.position} + layout={props.layout} + getTitle={state => stateTypeTitleMap(state)} /> ); } @@ -273,7 +270,7 @@ const styles = StyleSheet.create({ flex: 1, }, scrollView: { - marginTop: NavigationHeader.APPBAR_HEIGHT + NavigationHeader.STATUSBAR_HEIGHT, + marginTop: 64 }, tabContent: { flex: 1, diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js b/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js index 9fceec7bc3b..4e431e30a72 100644 --- a/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js +++ b/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js @@ -16,6 +16,7 @@ var React = require('react-native'); var { Text, + PixelRatio, StyleSheet, View, TouchableHighlight, @@ -49,7 +50,7 @@ const styles = StyleSheet.create({ row: { padding: 15, backgroundColor: 'white', - borderBottomWidth: StyleSheet.hairlineWidth, + borderBottomWidth: 1 / PixelRatio.get(), borderBottomColor: '#CDCDCD', }, rowText: { diff --git a/Examples/UIExplorer/UIExplorerList.android.js b/Examples/UIExplorer/UIExplorerList.android.js index a912ae9abf8..68be333e510 100644 --- a/Examples/UIExplorer/UIExplorerList.android.js +++ b/Examples/UIExplorer/UIExplorerList.android.js @@ -15,8 +15,6 @@ */ 'use strict'; -const React = require('react'); - export type UIExplorerExample = { key: string; module: React.Component; diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js index fac681c1a39..82a807e2f27 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js @@ -27,227 +27,123 @@ */ 'use strict'; -const React = require('react-native'); +const Animated = require('Animated'); +const Image = require('Image'); const NavigationContainer = require('NavigationContainer'); -const NavigationHeaderTitle = require('NavigationHeaderTitle'); -const NavigationHeaderBackButton = require('NavigationHeaderBackButton'); - -const { - Animated, - Platform, - StyleSheet, - View, -} = React; - -const APPBAR_HEIGHT = Platform.OS === 'ios' ? 44 : 56; -const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : 0; +const NavigationRootContainer = require('NavigationRootContainer'); +const React = require('react-native'); +const StyleSheet = require('StyleSheet'); +const Text = require('Text'); +const TouchableOpacity = require('TouchableOpacity'); +const View = require('View'); import type { - NavigationScene, + NavigationState, + NavigationParentState } from 'NavigationStateUtils'; -type Renderer = (scene: NavigationScene) => ReactElement; - -type DefaultProps = { - renderTitleComponent: Renderer; - renderLeftComponent: Renderer; -}; - type Props = { + navigationState: NavigationParentState, + onNavigate: Function, position: Animated.Value, - scenes: Array; - index: number; - renderTitleComponent: Renderer; - renderLeftComponent: Renderer; - renderRightComponent: Renderer; - style: any, + getTitle: (navState: NavigationState) => string, }; -class NavigationHeader extends React.Component { - _renderLeftComponent(scene) { - const { - renderLeftComponent, - position, - } = this.props; - - if (renderLeftComponent) { - const { - index, - state, - } = scene; - - return ( - - {renderLeftComponent(state, index)} - - ); - } - - return null; +class NavigationHeader extends React.Component { + _handleBackPress: Function; + props: Props; + componentWillMount() { + this._handleBackPress = this._handleBackPress.bind(this); } - - _renderRightComponent(scene) { - const { - renderRightComponent, - position, - } = this.props; - - if (renderRightComponent) { - const { - index, - state, - } = scene; - - return ( - - {renderRightComponent(state, index)} - - ); - } - - return null; - } - - _renderTitleComponent(scene) { - const { - renderTitleComponent, - position, - } = this.props; - - if (renderTitleComponent) { - const { - index, - state, - } = scene; - - return ( - - {renderTitleComponent(state, index)} - - ); - } - - return null; - } - render() { - const { scenes } = this.props; - + var state = this.props.navigationState; return ( - - {scenes.map(this._renderLeftComponent, this)} - {scenes.map(this._renderTitleComponent, this)} - {scenes.map(this._renderRightComponent, this)} - + + {state.children.map(this._renderTitle, this)} + {this._renderBackButton()} + ); } + _renderBackButton() { + if (this.props.navigationState.index === 0) { + return null; + } + return ( + + + + ); + } + _renderTitle(childState, index) { + return ( + + {this.props.getTitle(childState)} + + ); + } + _handleBackPress() { + this.props.onNavigate(NavigationRootContainer.getBackAction()); + } } -const renderTitleComponent = pageState => {pageState.title}; -const renderLeftComponent = (pageState, index) => index !== 0 ? : null; - -NavigationHeader.defaultProps = { - renderTitleComponent, - renderLeftComponent, -}; - -NavigationHeader.propTypes = { - position: React.PropTypes.object.isRequired, - scenes: React.PropTypes.arrayOf(React.PropTypes.shape({ - index: React.PropTypes.number, - state: React.PropTypes.any, - })).isRequired, - index: React.PropTypes.number.isRequired, - renderTitleComponent: React.PropTypes.func, - renderLeftComponent: React.PropTypes.func, - renderRightComponent: React.PropTypes.func, - style: View.propTypes.style, -}; - -NavigationHeader.APPBAR_HEIGHT = APPBAR_HEIGHT; -NavigationHeader.STATUSBAR_HEIGHT = STATUSBAR_HEIGHT; +NavigationHeader = NavigationContainer.create(NavigationHeader); const styles = StyleSheet.create({ - appbar: { - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'flex-start', - backgroundColor: Platform.OS === 'ios' ? 'rgba(255, 255, 255, .9)' : 'rgba(255, 255, 255, 1)', - borderBottomWidth: Platform.OS === 'ios' ? StyleSheet.hairlineWidth : 0, - borderBottomColor: 'rgba(0, 0, 0, .15)', - height: APPBAR_HEIGHT + STATUSBAR_HEIGHT, - marginBottom: 16, // This is needed for elevation shadow - elevation: 2, - }, - title: { + textAlign: 'center', + marginTop: 10, + fontSize: 18, + fontWeight: '500', + color: '#0A0A0A', position: 'absolute', - top: 0, - bottom: 0, - left: APPBAR_HEIGHT, - right: APPBAR_HEIGHT, - marginTop: STATUSBAR_HEIGHT, - }, - - left: { - position: 'absolute', - top: 0, - bottom: 0, + top: 20, left: 0, - marginTop: STATUSBAR_HEIGHT, - }, - - right: { - position: 'absolute', - top: 0, - bottom: 0, right: 0, - marginTop: STATUSBAR_HEIGHT, - } + }, + header: { + backgroundColor: '#EFEFF2', + paddingTop: 20, + top: 0, + height: 64, + right: 0, + left: 0, + borderBottomWidth: 0.5, + borderBottomColor: '#828287', + position: 'absolute', + }, + backButton: { + width: 29, + height: 37, + position: 'absolute', + bottom: 4, + left: 2, + padding: 8, + }, + backButtonImage: { + width: 13, + height: 21, + }, }); -module.exports = NavigationContainer.create(NavigationHeader); +module.exports = NavigationHeader; diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js deleted file mode 100644 index 4cd4a867676..00000000000 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderBackButton.js +++ /dev/null @@ -1,59 +0,0 @@ -/** - * The examples provided by Facebook are for non-commercial testing and - * evaluation purposes only. - * - * Facebook reserves all rights not expressly granted. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL - * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @providesModule NavigationHeaderBackButton - * @flow -*/ -'use strict'; - -const React = require('react-native'); -const NavigationContainer = require('NavigationContainer'); -const NavigationRootContainer = require('NavigationRootContainer'); - -const { - Image, - Platform, - StyleSheet, - TouchableOpacity, -} = React; - -type Props = { - onNavigate: Function -} - -const NavigationHeaderBackButton = (props: Props) => ( - props.onNavigate(NavigationRootContainer.getBackAction())}> - - -); - -NavigationHeaderBackButton.propTypes = { - onNavigate: React.PropTypes.func.isRequired -}; - -const styles = StyleSheet.create({ - buttonContainer: { - flex: 1, - flexDirection: 'row', - alignItems: 'center', - justifyContent: 'center', - }, - button: { - height: 24, - width: 24, - margin: Platform.OS === 'ios' ? 10 : 16, - resizeMode: 'contain' - } -}); - -module.exports = NavigationContainer.create(NavigationHeaderBackButton); diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js deleted file mode 100644 index 94fd4c00a8d..00000000000 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeaderTitle.js +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (c) 2015, Facebook, Inc. All rights reserved. - * - * Facebook, Inc. ("Facebook") owns all right, title and interest, including - * all intellectual property and other proprietary rights, in and to the React - * Native CustomComponents software (the "Software"). Subject to your - * compliance with these terms, you are hereby granted a non-exclusive, - * worldwide, royalty-free copyright license to (1) use and copy the Software; - * and (2) reproduce and distribute the Software as part of your own software - * ("Your Software"). Facebook reserves all rights not expressly granted to - * you in this license agreement. - * - * THE SOFTWARE AND DOCUMENTATION, IF ANY, ARE PROVIDED "AS IS" AND ANY EXPRESS - * OR IMPLIED WARRANTIES (INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE) ARE DISCLAIMED. - * IN NO EVENT SHALL FACEBOOK OR ITS AFFILIATES, OFFICERS, DIRECTORS OR - * EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * @providesModule NavigationHeaderTitle - * @flow - */ -'use strict'; - -const React = require('react-native'); - -const { - Platform, - StyleSheet, - View, - Text, -} = React; - -type Props = { - children: ReactElement; - style: any; - textStyle: any; -} - -const NavigationHeaderTitle = ({ children, style, textStyle }: Props) => ( - - {children} - -); - -const styles = StyleSheet.create({ - title: { - flex: 1, - flexDirection: 'row', - alignItems: 'center', - marginHorizontal: 16 - }, - - titleText: { - flex: 1, - fontSize: 18, - fontWeight: '500', - color: 'rgba(0, 0, 0, .9)', - textAlign: Platform.OS === 'ios' ? 'center' : 'left' - } -}); - -NavigationHeaderTitle.propTypes = { - children: React.PropTypes.string.isRequired, - style: View.propTypes.style, - textStyle: Text.propTypes.style -}; - -module.exports = NavigationHeaderTitle; diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1.5x.android.png deleted file mode 100644 index ad03a63bf3caba175695f5acca85a690dda2d02c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;ucwP+NCjiE#Ight69&c5o}c_J zydef`Jl72k0*^~vo0xKDg<-rzRAUa4zR#@V;MZ|!{Y$D84XcR{V40-cB_Dagsz~k`~nOy`dl9H)~;mL!H;T8hs zNi}dC49}j(tifY8L@=y}$MYvLOYoR3Ri*|QUObVRL%;IZ+E2;p%OolKM}Q}YX% z5d@5b2p;{XGEbME3cXRX(WfQTrj{Rj>BT5;Is}fZem}y0(E9WX8xoJjpZw%2ilSTs XSG)izRaHxJ00000NkvXXu0mjfJD6{! diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@1x.android.png deleted file mode 100644 index 083db295f474b9903408258c71818c2c49151d35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1ZBG}+kP60RiDL^GIXr{@&3`D~ x%$9kI*}bEvWF}#ISRN$7dnY> ziSW7Jaj-kLU-99@V~M-N-maFitX%fhe|fNkw(*M-9%Wj>s_(oO9P$Yh3Qm<1{PRlg zbWG=S^NM9BywVo3Bx+m!Wb1iw-zCgQwaI?JGS@8i411;jlWxyn`S7BVIP2S`hxE$k ap5yjcE&i-(aLy6v1_n=8KbLh*2~7ZuaX;z+ diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.android.png deleted file mode 100644 index 6de0a1cbb365dfd5d9274890d243ca2321f32235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tUr!gukP61P(+)Bo5D;KluXOkB z|6f;`Uoa>nrTyP5;4+Jm;dJDxe#>oP@r$y*#>rHDd13s5eN)8##R;WH*ZD4M;?i1i i;i&z7`QNqd4J-@3aX4v+{p181%;4$j=d#Wzp$P!F!7nZV diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@2x.ios.png deleted file mode 100644 index a8b6e9a63e5954e88cdc2c4b376350f0d00df554..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)zvF^`PeepS z7TEyfHda_2WB3*rkKxFyc44eTG>n~aJj;r2>JTd|kD=%L;CPW0Khze2x5NP$uRn!1 zZX$RIM`67E6h7fb4B^LMy!Z5c5<~cLI6iph{7eiBb^?x1o}Mouc#e}WK7R=Rf`n5D zT@f-1`=QsLi$(>{Sn|yGr(!w<&vC{R{-IdN!80bF#d=?Cp?+$BrqI_Hv9?hiWM98Z z=rX74^cNpA#&vk;NvTKu7rs^Wv8AuYuMrUukrdBxph|6xwif^Z002ovPDHLkV1oFx BfD!-z diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.android.png deleted file mode 100644 index 15a983a67d97c9a6c39d91550a528c37c53a9e3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw@;qG}Ln;{G-aN{9*nr0&aBl6p z15q2fw>DO<$f$_t-m`#N(R0!@qfL6}is!BA-aP5mqcux*S)AYDzOuXc@WF!zU-mWw z!RNIrdq3B7GJgpV3USMNx+#Bt3lxOZSlm}!I$z&?|8f=2ODy@*gQAaCs?P@6%;4$j K=d#Wzp$P!X&_+4{ diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@3x.ios.png deleted file mode 100644 index 07ea37b4e1e252d9a406eb33af2efe80e8612330..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V65|WaSW+oe0!^TU0k35>w~N5 zD{^m}Eq3eux1v|-U!Z02tG3=(cE0h8%+~eBW#4@=>-m*gUsZpzUi)^h`M$FY6s#)} z>gj)YrzKG2oQcK!Lmm>@g`Kw*Yv&jz*03tG&-%R^M+5-PWXN3Y$OD&$vu zev#}XWBWLRs%-}IWc4L%Yb+=CTrSK#FZ%emrh>0wa_#xpH~Sa4M%~`S*R?C_#imuy z`{rr>ON!s~fyjD~^@_e`eg-Wf97@ f#;HgU3SP2ZTiYg8>Ayn?7$FRvu6{1-oD!M(TP*-+rv1Kz7M z%I*XNJ!(VLzdH4Ge@o8ai4)e^3vK%P+bZq#{MQci z?P`C0d3kxcKa^1~`zt>B;jiLd|K_aKfAEz>edFmDy)D6SUw`+o@R*?B*u=sqq~bB* zgRIJrKN^lr3+tD}bFTI}~XjubmVU5CWQ(LZ;AgeuH{an^LB{Ts5E|^v% diff --git a/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png b/Libraries/CustomComponents/NavigationExperimental/assets/back-icon@4x.ios.png deleted file mode 100644 index 7899053f61b38b1b3f3e4400d208265e5b9752cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=s9naSW+od~=hzM>bIA=)>UK z+j4L7ymFJ?da+G<>i2V3@@^C?c1sOmFAV_7Y+pW^_tiJQPwUT5pEG0s#o3iVv^!8i zim|-RbcHmwI>VWV{uIQ_?D`V&{_Irnr^8qw?c?ji zpS`+_?VDyC&F4A)n(^V;_-!g_+!pt^`qrQ4ZA;qL`26mHAHN=?o!YD{BhPa5x_WxD z;qHSU10T%%f9#XL_{<}AA8Mo|{);O0wMcYY2+TXroNui!SZHv>&F_p#R>Gg>9Toy^ zDvvxY_Hp(6H+gQB>XMXp;G=KCpW`QY9qzE`YkGeB0Q)=UBX3xgg$#xJ-ZP#5v-{+& zLmd@qOMh%BkT#4y0952F_}?nYtWoe|PtcM5pZ3lDt-v7A*2wU}y6!>)b4)^ODEHl` zeoV7_{8cmNF!U?zX*vB_vP<4@DTm18DT^;oxH!or_+A7T+vXm%B#Y}6zh3BMLURef?`bco}f*(;i)5@ieJ4_O_#+T)lo`NXE!g?<_LHI9Ta0n-E!9AHie V()u#B%0&&t^K|udS?83{1OT-835oy! diff --git a/Libraries/CustomComponents/NavigationExperimental/back_chevron.png b/Libraries/CustomComponents/NavigationExperimental/back_chevron.png new file mode 100644 index 0000000000000000000000000000000000000000..af21cf9d5718b71d1d2be0c445fa7f6012813609 GIT binary patch literal 575 zcmV-F0>J%=P)hav*r1ebY%FXnCP|Vc5mCsyuf;WtY3_3t&$*|b z^{4al|3BxEqN8Suj4K*sntB#BTb1}C10^o@25Hm(7a2P>XQGj9GQR$YjGaU)21)Et z;@hN12YR4Brk5ecfQ;`MWK<0nlxDKiK_05f!qVy5rNoa6@<=Tfl_I+x#2Jn|s+b*B#>3g4 zY2ua|%#6zHpo3l4ATy${VF$ZfzO(%+<52brPh5^$=o5RK&F7ND)Toa-zsngHB&I}V zmfuc|^9l=NAiLBX=i;!$_O8#A&b#Pr9M+~kiy5cmu<=jH$um0{*|W_uK4(VXBFnf* z#-}dWwYahG3`n06A17pUGwy#lJ}NdU@!=12TSLrJ&%)RsS%4d+Oj-Z{ N002ovPDHLkV1mZY2_^sl literal 0 HcmV?d00001 diff --git a/Libraries/NavigationExperimental/NavigationAnimatedView.js b/Libraries/NavigationExperimental/NavigationAnimatedView.js index 91830721031..4d1f5b68f16 100644 --- a/Libraries/NavigationExperimental/NavigationAnimatedView.js +++ b/Libraries/NavigationExperimental/NavigationAnimatedView.js @@ -21,9 +21,14 @@ var View = require('View'); import type { NavigationState, NavigationParentState, - NavigationScene, } from 'NavigationStateUtils'; +type NavigationScene = { + index: number, + state: NavigationState, + isStale: boolean, +}; + /** * Helper function to compare route keys (e.g. "9", "11"). */ @@ -65,13 +70,6 @@ type Layout = { height: Animated.Value; }; -type OverlayRenderer = ( - scenes: Array, - index: number, - position: Animated.Value, - layout: Layout -) => ReactElement; - type Position = Animated.Value; /** @@ -253,11 +251,6 @@ class NavigationAnimatedView extends React.Component { } } -NavigationAnimatedView.propTypes = { - navigationState: React.PropTypes.instanceOf(NavigationStateUtils), - style: View.propTypes.style, -}; - function setDefaultTiming(position, navigationState) { Animated.spring( position, diff --git a/Libraries/NavigationExperimental/NavigationExperimental.js b/Libraries/NavigationExperimental/NavigationExperimental.js index 0f4e9fa63c4..ca6bb627d55 100644 --- a/Libraries/NavigationExperimental/NavigationExperimental.js +++ b/Libraries/NavigationExperimental/NavigationExperimental.js @@ -16,8 +16,6 @@ const NavigationCard = require('NavigationCard'); const NavigationCardStack = require('NavigationCardStack'); const NavigationContainer = require('NavigationContainer'); const NavigationHeader = require('NavigationHeader'); -const NavigationHeaderTitle = require('NavigationHeaderTitle'); -const NavigationHeaderBackButton = require('NavigationHeaderBackButton'); const NavigationLegacyNavigator = require('NavigationLegacyNavigator'); const NavigationReducer = require('NavigationReducer'); const NavigationRootContainer = require('NavigationRootContainer'); @@ -41,8 +39,6 @@ const NavigationExperimental = { Card: NavigationCard, CardStack: NavigationCardStack, Header: NavigationHeader, - HeaderTitle: NavigationHeaderTitle, - HeaderBackButton: NavigationHeaderBackButton, LegacyNavigator: NavigationLegacyNavigator, }; diff --git a/Libraries/NavigationExperimental/NavigationStateUtils.js b/Libraries/NavigationExperimental/NavigationStateUtils.js index 28d5c85bd3a..d457ebea8ad 100644 --- a/Libraries/NavigationExperimental/NavigationStateUtils.js +++ b/Libraries/NavigationExperimental/NavigationStateUtils.js @@ -23,12 +23,6 @@ export type NavigationParentState = { children: Array; }; -export type NavigationScene = { - index: number; - state: NavigationState; - isStale: boolean; -}; - export type NavigationAction = { type: string; };