diff --git a/CHANGELOG.md b/CHANGELOG.md index 54b54c3..4461add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [3.2.0] - [2019-02-08](https://github.com/react-navigation/react-navigation/releases/tag/3.2.0) + +## Added + +- Add support for `backBehavior: history'` and `backBehavior: 'order'` to any navigator based on SwitchRouter (eg: tab navigators). (https://github.com/react-navigation/react-navigation-core/pull/31) + ## [3.1.5] - [2019-02-06](https://github.com/react-navigation/react-navigation/releases/tag/3.1.5) ## Fixed @@ -115,7 +121,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [2.x](https://github.com/react-navigation/react-navigation/blob/2.x/CHANGELOG.md) -[Unreleased]: https://github.com/react-navigation/react-navigation/compare/3.1.5...HEAD +[Unreleased]: https://github.com/react-navigation/react-navigation/compare/3.2.0...HEAD +[3.2.0]: https://github.com/react-navigation/react-navigation/compare/3.1.5...3.2.0 [3.1.5]: https://github.com/react-navigation/react-navigation/compare/3.1.4...3.1.5 [3.1.4]: https://github.com/react-navigation/react-navigation/compare/3.1.3...3.1.4 [3.1.3]: https://github.com/react-navigation/react-navigation/compare/3.1.2...3.1.3 diff --git a/examples/NavigationPlayground/js/SimpleTabs.js b/examples/NavigationPlayground/js/SimpleTabs.js index 8bdbb24..4f65b88 100644 --- a/examples/NavigationPlayground/js/SimpleTabs.js +++ b/examples/NavigationPlayground/js/SimpleTabs.js @@ -196,6 +196,7 @@ const SimpleTabs = createBottomTabNavigator( }, }, { + backBehavior: 'history', tabBarOptions: { activeTintColor: '#e91e63', }, diff --git a/examples/NavigationPlayground/yarn.lock b/examples/NavigationPlayground/yarn.lock index df9664a..4f3601a 100644 --- a/examples/NavigationPlayground/yarn.lock +++ b/examples/NavigationPlayground/yarn.lock @@ -656,10 +656,10 @@ pouchdb-collections "^1.0.1" tiny-queue "^0.2.1" -"@react-navigation/core@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.0.3.tgz#2c88f0553656fba04ff84a50711c35618bec1a72" - integrity sha512-cE0hfOrh+qbAs0tjvlek99gas6+ecW5rtORhTdfZQ1byDGYBKjYZnDTEMImbWqAaAobyXOLEzK7A/zNrpDfiYA== +"@react-navigation/core@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.1.0.tgz#2ab34a8d913564d4454dbdf5d68b6b4c70302099" + integrity sha512-VeS2npscdcz8n7rchIEEURfg4vS9IaaItOh8o5lHLByeNHKBASfWfu5KEoAFmX9XnrUSxvG98VjptQxyCLjtYA== dependencies: create-react-context "0.2.2" hoist-non-react-statics "^3.0.1" @@ -757,9 +757,9 @@ acorn@^5.5.3: integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== acorn@^6.0.1: - version "6.0.7" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.7.tgz#490180ce18337270232d9488a44be83d9afb7fd3" - integrity sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818" + integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw== ajv-errors@^1.0.0: version "1.0.1" @@ -1999,9 +1999,9 @@ core-js@^1.0.0: integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.7: - version "2.6.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.3.tgz#4b70938bdffdaf64931e66e2db158f0892289c49" - integrity sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ== + version "2.6.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" + integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -2730,9 +2730,9 @@ expo-task-manager@~1.0.0: expo-task-manager-interface "~1.0.0" expo@^32.0.0: - version "32.0.4" - resolved "https://registry.yarnpkg.com/expo/-/expo-32.0.4.tgz#f794bbd261907c0cd066cf67be20742adee4092a" - integrity sha512-KWTm5yQcrh5Z7oXbf8oLPKdgRL34Mm0spcN1yNQzyODQ/RlYuMLYeQcsEWhcuqIKygT94Fi0Td+d5hrOyQ8dMQ== + version "32.0.5" + resolved "https://registry.yarnpkg.com/expo/-/expo-32.0.5.tgz#ebfa6a12d6f11938264392ec7300ccc4368678fd" + integrity sha512-xo8wZ9/4F3P1xN9nKFSJM3Gb2m0p05aRncjgFF+jxM5XfvKkUrzW0a6FYOY/h/r2r1wyQI7OTBPTiTH/GxuwgA== dependencies: "@babel/runtime" "^7.1.2" "@expo/vector-icons" "github:expo/vector-icons#expo-font-fix" @@ -2796,7 +2796,7 @@ expo@^32.0.0: prop-types "^15.6.0" qs "^6.5.0" react-native-branch "2.2.5" - react-native-gesture-handler "1.0.14" + react-native-gesture-handler "~1.0.14" react-native-maps expo/react-native-maps#v0.22.1-exp.0 react-native-reanimated "1.0.0-alpha.11" react-native-screens "1.0.0-alpha.22" @@ -3240,9 +3240,9 @@ gud@^1.0.0: integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== handlebars@^4.0.3: - version "4.0.12" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" - integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a" + integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w== dependencies: async "^2.5.0" optimist "^0.6.1" @@ -5662,10 +5662,10 @@ react-devtools-core@3.3.4: shell-quote "^1.6.1" ws "^3.3.1" -react-is@^16.3.1, react-is@^16.5.2, react-is@^16.7.0, react-is@^16.8.0: - version "16.8.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.0.tgz#518db476214f3fb0716af9f82dfd420225ae970f" - integrity sha512-LOy+3La39aduxaPfuj+lCXC5RQ8ukjVPAAsFJ3yQ+DIOLf4eR9OMKeWKF0IzjRyE95xMj5QELwiXGgfQsIJguA== +react-is@^16.3.1, react-is@^16.5.2, react-is@^16.7.0, react-is@^16.8.1: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb" + integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA== react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -5677,15 +5677,6 @@ react-native-branch@2.2.5: resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-2.2.5.tgz#4074dd63b4973e6397d9ce50e97b57c77a518e9d" integrity sha1-QHTdY7SXPmOX2c5Q6XtXx3pRjp0= -react-native-gesture-handler@1.0.14: - version "1.0.14" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.14.tgz#0e79fcc7175c9bb2e550917a35488100eec8738b" - integrity sha512-mp+VD7ukS/gI6HhIJMp9GTIUzbNB+1MS9CvvtWEYoVp0eWFHuDA4W+t1cFNZv08kgDI9mBNbV9jj05hlzefSTw== - dependencies: - hoist-non-react-statics "^2.3.1" - invariant "^2.2.2" - prop-types "^15.5.10" - react-native-gesture-handler@~1.0.14: version "1.0.15" resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.15.tgz#7e0d0a457820a3c9325a3d492daaed14400508a6" @@ -5705,9 +5696,9 @@ react-native-iphone-x-helper@^1.0.2: resolved "https://codeload.github.com/expo/react-native-maps/tar.gz/e6f98ff7272e5d0a7fe974a41f28593af2d77bb2" react-native-paper@^2.1.3: - version "2.10.1" - resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-2.10.1.tgz#31316fd7b97d4537f6dde28e96fb35681798d1d2" - integrity sha512-I0zWlRnCHvISBwOcq4Xq5DE5zstLQIRM99ID9CzfjILGu2teY1PV/dgVzf1S0w+wpJx4GG7U8WJsIZ2s+LFV3w== + version "2.11.0" + resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-2.11.0.tgz#5737ea96859bd81f71c3c14abab81ad95e5f8d19" + integrity sha512-ItpTqeTG1nvwQpC4zRZ0lgU13NVc61vAtqMng7SwfgZODOaz77f1/aT2fL42xlAx6iIrUsJtIH5w9maC4qeAxw== dependencies: "@callstack/react-theme-provider" "^1.0.7" color "^2.0.1" @@ -5880,9 +5871,9 @@ react-navigation-tabs@1.0.2: react-native-tab-view "^1.0.0" react-navigation@../..: - version "3.1.5" + version "3.2.0" dependencies: - "@react-navigation/core" "3.0.3" + "@react-navigation/core" "3.1.0" "@react-navigation/native" "3.1.4" react-navigation-drawer "1.1.0" react-navigation-stack "1.0.9" @@ -5907,14 +5898,14 @@ react-test-renderer@16.3.1: react-is "^16.3.1" react-test-renderer@^16.3.1: - version "16.8.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.0.tgz#a7a635ac0622e79f349e4f42663a7f313d648518" - integrity sha512-BJzNYsI9rXMRJOpWh3vNRE+m8+PtObDQn+6yYe+gl3t3hWrlfN4XPOD46RUsBN+XT172JW/rRBe2nkeK5vkY1g== + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.1.tgz#72845ad9269be526126e97853311982f781767be" + integrity sha512-Bd21TN3+YVl6GZwav6O0T6m5UwGfOj+2+xZH5VH93ToD6M5uclN/c+R1DGX49ueG413KZPUx7Kw3sOYz2aJgfg== dependencies: object-assign "^4.1.1" prop-types "^15.6.2" - react-is "^16.8.0" - scheduler "^0.13.0" + react-is "^16.8.1" + scheduler "^0.13.1" react-timer-mixin@^0.13.2: version "0.13.4" @@ -6282,10 +6273,10 @@ schedule@^0.3.0: dependencies: object-assign "^4.1.1" -scheduler@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.0.tgz#e701f62e1b3e78d2bbb264046d4e7260f12184dd" - integrity sha512-w7aJnV30jc7OsiZQNPVmBc+HooZuvQZIZIShKutC3tnMFMkcwVN9CZRRSSNw03OnSCKmEkK8usmwcw6dqBaLzw== +scheduler@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" + integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" diff --git a/package.json b/package.json index 1494873..9465fa0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-navigation", - "version": "3.1.5", + "version": "3.2.0", "description": "Routing and navigation for your React Native apps", "main": "src/react-navigation.js", "repository": { @@ -34,7 +34,7 @@ "react-native": "*" }, "dependencies": { - "@react-navigation/core": "3.0.3", + "@react-navigation/core": "3.1.0", "@react-navigation/native": "3.1.4", "react-navigation-drawer": "1.1.0", "react-navigation-stack": "1.0.9", diff --git a/yarn.lock b/yarn.lock index 339d597..a4fa77a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,10 +46,10 @@ universal-user-agent "^2.0.0" url-template "^2.0.8" -"@react-navigation/core@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.0.3.tgz#2c88f0553656fba04ff84a50711c35618bec1a72" - integrity sha512-cE0hfOrh+qbAs0tjvlek99gas6+ecW5rtORhTdfZQ1byDGYBKjYZnDTEMImbWqAaAobyXOLEzK7A/zNrpDfiYA== +"@react-navigation/core@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.1.0.tgz#2ab34a8d913564d4454dbdf5d68b6b4c70302099" + integrity sha512-VeS2npscdcz8n7rchIEEURfg4vS9IaaItOh8o5lHLByeNHKBASfWfu5KEoAFmX9XnrUSxvG98VjptQxyCLjtYA== dependencies: create-react-context "0.2.2" hoist-non-react-statics "^3.0.1" @@ -143,9 +143,9 @@ acorn@^5.5.0, acorn@^5.5.3: integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== acorn@^6.0.1: - version "6.0.7" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.7.tgz#490180ce18337270232d9488a44be83d9afb7fd3" - integrity sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818" + integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw== add-stream@^1.0.0: version "1.0.0" @@ -2294,9 +2294,9 @@ core-js@^1.0.0: integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: - version "2.6.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.3.tgz#4b70938bdffdaf64931e66e2db158f0892289c49" - integrity sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ== + version "2.6.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" + integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3766,9 +3766,9 @@ gud@^1.0.0: integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== handlebars@^4.0.2, handlebars@^4.0.3: - version "4.0.12" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" - integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a" + integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w== dependencies: async "^2.5.0" optimist "^0.6.1" @@ -6705,10 +6705,10 @@ react-devtools-core@3.0.0: shell-quote "^1.6.1" ws "^2.0.3" -react-is@^16.5.2, react-is@^16.7.0, react-is@^16.8.0: - version "16.8.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.0.tgz#518db476214f3fb0716af9f82dfd420225ae970f" - integrity sha512-LOy+3La39aduxaPfuj+lCXC5RQ8ukjVPAAsFJ3yQ+DIOLf4eR9OMKeWKF0IzjRyE95xMj5QELwiXGgfQsIJguA== +react-is@^16.5.2, react-is@^16.7.0, react-is@^16.8.1: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb" + integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA== react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -6852,14 +6852,14 @@ react-test-renderer@16.2.0: prop-types "^15.6.0" react-test-renderer@^16.0.0: - version "16.8.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.0.tgz#a7a635ac0622e79f349e4f42663a7f313d648518" - integrity sha512-BJzNYsI9rXMRJOpWh3vNRE+m8+PtObDQn+6yYe+gl3t3hWrlfN4XPOD46RUsBN+XT172JW/rRBe2nkeK5vkY1g== + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.1.tgz#72845ad9269be526126e97853311982f781767be" + integrity sha512-Bd21TN3+YVl6GZwav6O0T6m5UwGfOj+2+xZH5VH93ToD6M5uclN/c+R1DGX49ueG413KZPUx7Kw3sOYz2aJgfg== dependencies: object-assign "^4.1.1" prop-types "^15.6.2" - react-is "^16.8.0" - scheduler "^0.13.0" + react-is "^16.8.1" + scheduler "^0.13.1" react-timer-mixin@^0.13.2: version "0.13.4" @@ -7406,10 +7406,10 @@ sax@~1.1.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240" integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA= -scheduler@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.0.tgz#e701f62e1b3e78d2bbb264046d4e7260f12184dd" - integrity sha512-w7aJnV30jc7OsiZQNPVmBc+HooZuvQZIZIShKutC3tnMFMkcwVN9CZRRSSNw03OnSCKmEkK8usmwcw6dqBaLzw== +scheduler@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" + integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1"