From dcb830463059edccc2b60b29a98392df68a5e26f Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Mon, 22 Oct 2018 19:48:49 -0700 Subject: [PATCH] Bump dependency versions --- .../NavigationPlayground/js/CustomTabs.js | 2 +- .../js/CustomTransitioner.js | 2 +- .../NavigationPlayground/js/SimpleTabs.js | 84 +++++++++--- .../NavigationPlayground/js/StacksInTabs.js | 101 +++++++++++---- .../NavigationPlayground/package.json | 6 +- .../examples/NavigationPlayground/yarn.lock | 76 ++++------- packages/react-navigation/package.json | 6 +- packages/react-navigation/yarn.lock | 122 +++++++----------- 8 files changed, 229 insertions(+), 170 deletions(-) diff --git a/packages/react-navigation/examples/NavigationPlayground/js/CustomTabs.js b/packages/react-navigation/examples/NavigationPlayground/js/CustomTabs.js index efdf2283..8d9b81f8 100644 --- a/packages/react-navigation/examples/NavigationPlayground/js/CustomTabs.js +++ b/packages/react-navigation/examples/NavigationPlayground/js/CustomTabs.js @@ -13,7 +13,7 @@ import { } from 'react-native'; import { BorderlessButton } from 'react-native-gesture-handler'; import { createNavigator, SafeAreaView, TabRouter } from 'react-navigation'; -import { createAppContainer } from '@react-navigation/native'; +import { createAppContainer } from 'react-navigation'; import SampleText from './SampleText'; import { Button } from './commonComponents/ButtonWithMargin'; diff --git a/packages/react-navigation/examples/NavigationPlayground/js/CustomTransitioner.js b/packages/react-navigation/examples/NavigationPlayground/js/CustomTransitioner.js index 80a6769f..ed42d4e7 100644 --- a/packages/react-navigation/examples/NavigationPlayground/js/CustomTransitioner.js +++ b/packages/react-navigation/examples/NavigationPlayground/js/CustomTransitioner.js @@ -9,12 +9,12 @@ import { View, } from 'react-native'; import { + createAppContainer, Transitioner, SafeAreaView, StackRouter, createNavigator, } from 'react-navigation'; -import { createAppContainer } from '@react-navigation/native'; import SampleText from './SampleText'; import { Button } from './commonComponents/ButtonWithMargin'; diff --git a/packages/react-navigation/examples/NavigationPlayground/js/SimpleTabs.js b/packages/react-navigation/examples/NavigationPlayground/js/SimpleTabs.js index bb29d82e..648daa61 100644 --- a/packages/react-navigation/examples/NavigationPlayground/js/SimpleTabs.js +++ b/packages/react-navigation/examples/NavigationPlayground/js/SimpleTabs.js @@ -8,26 +8,80 @@ import type { } from 'react-navigation'; import React from 'react'; -import { Platform, ScrollView, StatusBar, View } from 'react-native'; -import { SafeAreaView, createBottomTabNavigator } from 'react-navigation'; +import { Platform, Text, ScrollView, StatusBar, View } from 'react-native'; +import { + SafeAreaView, + createBottomTabNavigator, + withNavigation, +} from 'react-navigation'; import Ionicons from 'react-native-vector-icons/Ionicons'; import SampleText from './SampleText'; import { Button } from './commonComponents/ButtonWithMargin'; +class NavigationAwareScrollView extends React.Component { + componentDidMount() { + this.props.navigation.addListener('willFocus', () => { + this._isFocused = true; + }); + + this.props.navigation.addListener('willBlur', () => { + this._isFocused = false; + }); + + this.props.navigation.addListener('refocus', () => { + if (this._isFocused) { + this._component.scrollTo({ x: 0, y: 0 }); + } + }); + } + + setNativeProps(props) { + this._component.setNativeProps(props); + } + + _setComponentRef(c) { + this._component = c; + } + + getNode() { + return this._component; + } + + render() { + return ( + { + this._component = view; + }} + /> + ); + } +} + +const TEXT = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla a hendrerit dui, id consectetur nulla. Curabitur mattis sapien nunc, quis dignissim eros venenatis sit amet. Praesent rutrum dapibus diam quis eleifend. Donec vulputate quis purus sed vulputate. Fusce ipsum felis, cursus at congue vel, consectetur tincidunt purus. Pellentesque et fringilla lorem. In at augue malesuada, sollicitudin ex ut, convallis elit. Curabitur metus nibh, consequat vel libero sit amet, iaculis congue nisl. Maecenas eleifend sodales sapien, fringilla sagittis nisi ornare volutpat. Integer tellus enim, volutpat vitae nisl et, dignissim pharetra leo. Sed sit amet efficitur sapien, at tristique sapien. Aenean dignissim semper sagittis. Nullam sit amet volutpat mi. +Curabitur auctor orci et justo molestie iaculis. Integer elementum tortor ac ipsum egestas pharetra. Etiam ultrices elementum pharetra. Maecenas lobortis ultrices risus dignissim luctus. Nunc malesuada cursus posuere. Vestibulum tristique lectus pretium pellentesque pellentesque. Nunc ac nisi lacus. Duis ultrices dui ac viverra ullamcorper. Morbi placerat laoreet lacus sit amet ullamcorper. +Nulla convallis pulvinar hendrerit. Nulla mattis sem et aliquam ultrices. Nam egestas magna leo, nec luctus turpis sollicitudin ac. Sed id leo luctus, lobortis tortor ut, rhoncus ex. Aliquam gravida enim ac dapibus ultricies. Vestibulum at interdum est, et vehicula nibh. Phasellus dignissim iaculis rhoncus. Vestibulum tempus leo lectus, quis euismod metus ullamcorper quis. Interdum et malesuada fames ac ante ipsum primis in faucibus. Ut id ipsum at enim eleifend porttitor id quis metus. Proin bibendum ornare iaculis. Duis elementum lacus vel cursus efficitur. Nunc eu tortor sed risus lacinia scelerisque. +Praesent lobortis elit sit amet mauris pulvinar, viverra condimentum massa pellentesque. Curabitur massa ex, dignissim eget neque at, fringilla consectetur justo. Cras sollicitudin vel ligula sed cursus. Aliquam porta sem hendrerit diam porta ultricies. Sed eu mi erat. Curabitur id justo vel tortor hendrerit vestibulum id eget est. Morbi eros magna, placerat id diam ut, varius sollicitudin mi. Curabitur pretium finibus accumsan.`; const MyNavScreen = ({ navigation, banner }) => ( - - {banner} -