Compare commits

..

6 Commits

Author SHA1 Message Date
satyajit.happy
4e07461526 chore: publish
- @react-navigation/bottom-tabs@5.0.0-alpha.3
 - @react-navigation/core@5.0.0-alpha.2
 - @react-navigation/drawer@5.0.0-alpha.3
 - @react-navigation/material-bottom-tabs@5.0.0-alpha.3
 - @react-navigation/material-top-tabs@5.0.0-alpha.3
 - @react-navigation/native@5.0.0-alpha.2
 - @react-navigation/routers@5.0.0-alpha.3
 - @react-navigation/stack@5.0.0-alpha.4
2019-08-22 10:10:06 +05:30
satyajit.happy
f18231541b fix: fix path to typescript definitions 2019-08-22 10:09:16 +05:30
satyajit.happy
e70f5273ac chore: publish
- @react-navigation/bottom-tabs@5.0.0-alpha.2
 - @react-navigation/drawer@5.0.0-alpha.2
 - @react-navigation/material-bottom-tabs@5.0.0-alpha.2
 - @react-navigation/material-top-tabs@5.0.0-alpha.2
 - @react-navigation/routers@5.0.0-alpha.2
 - @react-navigation/stack@5.0.0-alpha.3
2019-08-22 07:40:13 +05:30
satyajit.happy
61dce7ae1b fix: properly handle pop action from stack 2019-08-22 07:39:06 +05:30
satyajit.happy
90f014b78a chore: publish
- @react-navigation/stack@5.0.0-alpha.2
2019-08-22 05:08:18 +05:30
satyajit.happy
8645e361f1 fix: check if left button is truthy to add a left offset 2019-08-22 05:07:48 +05:30
19 changed files with 212 additions and 47 deletions

View File

@@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/bottom-tabs@5.0.0-alpha.2...@react-navigation/bottom-tabs@5.0.0-alpha.3) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/bottom-tabs@5.0.0-alpha.1...@react-navigation/bottom-tabs@5.0.0-alpha.2) (2019-08-22)
**Note:** Version bump only for package @react-navigation/bottom-tabs
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -10,7 +10,7 @@
"android",
"tab"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.3",
"license": "MIT",
"repository": {
"type": "git",
@@ -20,7 +20,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/bottom-tabssrc/index.d.ts",
"files": [
"src",
"lib"
@@ -33,7 +33,7 @@
"clean": "del lib"
},
"dependencies": {
"@react-navigation/routers": "^5.0.0-alpha.1",
"@react-navigation/routers": "^5.0.0-alpha.3",
"react-native-safe-area-view": "^0.14.6"
},
"devDependencies": {

View File

@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/core@5.0.0-alpha.1...@react-navigation/core@5.0.0-alpha.2) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -6,7 +6,7 @@
"react-native",
"react-navigation"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
@@ -16,7 +16,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/index.d.ts",
"files": [
"src",
"lib"

View File

@@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/drawer@5.0.0-alpha.2...@react-navigation/drawer@5.0.0-alpha.3) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/drawer@5.0.0-alpha.1...@react-navigation/drawer@5.0.0-alpha.2) (2019-08-22)
**Note:** Version bump only for package @react-navigation/drawer
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -11,7 +11,7 @@
"material",
"drawer"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.3",
"license": "MIT",
"repository": {
"type": "git",
@@ -21,7 +21,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/drawer/src/index.d.ts",
"files": [
"src",
"lib"
@@ -34,7 +34,7 @@
"clean": "del lib"
},
"dependencies": {
"@react-navigation/routers": "^5.0.0-alpha.1",
"@react-navigation/routers": "^5.0.0-alpha.3",
"react-native-safe-area-view": "^0.14.6"
},
"devDependencies": {

View File

@@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/material-bottom-tabs@5.0.0-alpha.2...@react-navigation/material-bottom-tabs@5.0.0-alpha.3) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/material-bottom-tabs@5.0.0-alpha.1...@react-navigation/material-bottom-tabs@5.0.0-alpha.2) (2019-08-22)
**Note:** Version bump only for package @react-navigation/material-bottom-tabs
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -11,7 +11,7 @@
"material",
"tab"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.3",
"license": "MIT",
"repository": {
"type": "git",
@@ -21,7 +21,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/material-bottom-tabs/src/index.d.ts",
"files": [
"src",
"lib"
@@ -34,7 +34,7 @@
"clean": "del lib"
},
"dependencies": {
"@react-navigation/routers": "^5.0.0-alpha.1"
"@react-navigation/routers": "^5.0.0-alpha.3"
},
"devDependencies": {
"@react-native-community/bob": "^0.7.0",

View File

@@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/material-top-tabs@5.0.0-alpha.2...@react-navigation/material-top-tabs@5.0.0-alpha.3) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/material-top-tabs@5.0.0-alpha.1...@react-navigation/material-top-tabs@5.0.0-alpha.2) (2019-08-22)
**Note:** Version bump only for package @react-navigation/material-top-tabs
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -11,7 +11,7 @@
"material",
"tab"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.3",
"license": "MIT",
"repository": {
"type": "git",
@@ -21,7 +21,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/material-top-tabs/src/index.d.ts",
"files": [
"src",
"lib"
@@ -34,7 +34,7 @@
"clean": "del lib"
},
"dependencies": {
"@react-navigation/routers": "^5.0.0-alpha.1"
"@react-navigation/routers": "^5.0.0-alpha.3"
},
"devDependencies": {
"@react-native-community/bob": "^0.7.0",

View File

@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/native@5.0.0-alpha.1...@react-navigation/native@5.0.0-alpha.2) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -7,7 +7,7 @@
"ios",
"android"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
@@ -17,7 +17,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/native/src/index.d.ts",
"files": [
"src",
"lib"

View File

@@ -3,6 +3,28 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/routers@5.0.0-alpha.2...@react-navigation/routers@5.0.0-alpha.3) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/routers@5.0.0-alpha.1...@react-navigation/routers@5.0.0-alpha.2) (2019-08-22)
### Bug Fixes
* properly handle pop action from stack ([61dce7a](https://github.com/react-navigation/navigation-ex/commit/61dce7a))
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -6,7 +6,7 @@
"react-native",
"react-navigation"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.3",
"license": "MIT",
"repository": {
"type": "git",
@@ -16,7 +16,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/routers/src/index.d.ts",
"files": [
"src",
"lib"

View File

@@ -161,21 +161,27 @@ export default function StackRouter(options: StackRouterOptions) {
return null;
case 'POP':
if (state.index > 0) {
const index = state.routes.length - 1;
case 'POP': {
const index =
action.target === state.key && action.source
? state.routes.findIndex(r => r.key === action.source)
: state.index;
if (index > 0) {
const routes = state.routes.slice(
0,
Math.max(index - action.payload.count + 1, 1)
);
return {
...state,
index: Math.max(0, state.index - action.payload.count),
routes: state.routes.slice(
0,
Math.max(index - action.payload.count + 1, 1)
),
index: routes.length - 1,
routes,
};
}
return null;
}
case 'POP_TO_TOP':
return router.getStateForAction(state, {
@@ -248,6 +254,8 @@ export default function StackRouter(options: StackRouterOptions) {
return router.getStateForAction(state, {
type: 'POP',
payload: { count: 1 },
target: action.target,
source: action.source,
});
}

View File

@@ -3,6 +3,36 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
# [5.0.0-alpha.4](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/stack@5.0.0-alpha.3...@react-navigation/stack@5.0.0-alpha.4) (2019-08-22)
### Bug Fixes
* fix path to typescript definitions ([f182315](https://github.com/react-navigation/navigation-ex/commit/f182315))
# [5.0.0-alpha.3](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/stack@5.0.0-alpha.2...@react-navigation/stack@5.0.0-alpha.3) (2019-08-22)
**Note:** Version bump only for package @react-navigation/stack
# [5.0.0-alpha.2](https://github.com/react-navigation/navigation-ex/compare/@react-navigation/stack@5.0.0-alpha.1...@react-navigation/stack@5.0.0-alpha.2) (2019-08-21)
### Bug Fixes
* check if left button is truthy to add a left offset ([8645e36](https://github.com/react-navigation/navigation-ex/commit/8645e36))
# 5.0.0-alpha.1 (2019-08-21)

View File

@@ -10,7 +10,7 @@
"android",
"stack"
],
"version": "5.0.0-alpha.1",
"version": "5.0.0-alpha.4",
"license": "MIT",
"repository": {
"type": "git",
@@ -20,7 +20,7 @@
"main": "lib/commonjs/index.js",
"react-native": "src/index.tsx",
"module": "lib/module/index.js",
"types": "lib/typescript/src/index.d.ts",
"types": "lib/typescript/stack/src/index.d.ts",
"files": [
"src",
"lib"
@@ -33,7 +33,7 @@
"clean": "del lib"
},
"dependencies": {
"@react-navigation/routers": "^5.0.0-alpha.1",
"@react-navigation/routers": "^5.0.0-alpha.3",
"react-native-safe-area-view": "^0.14.6"
},
"devDependencies": {

View File

@@ -274,6 +274,24 @@ export default class HeaderSegment extends React.Component<Props, State> {
}
}
const leftButton = left
? left({
backImage,
pressColorAndroid,
allowFontScaling: backAllowFontScaling,
onPress: onGoBack,
labelVisible: headerBackTitleVisible,
label: leftLabel !== undefined ? leftLabel : previousTitle,
truncatedLabel,
labelStyle: [leftLabelStyle, customLeftLabelStyle],
onLabelLayout: this.handleLeftLabelLayout,
screenLayout: layout,
titleLayout,
tintColor: headerTintColor,
canGoBack: Boolean(onGoBack),
})
: null;
return (
<React.Fragment>
<Animated.View
@@ -295,26 +313,12 @@ export default class HeaderSegment extends React.Component<Props, State> {
style={{ height: headerStatusBarHeight }}
/>
<View pointerEvents="box-none" style={styles.content}>
{left ? (
{leftButton ? (
<Animated.View
pointerEvents="box-none"
style={[styles.left, leftButtonStyle, leftContainerStyle]}
>
{left({
backImage,
pressColorAndroid,
allowFontScaling: backAllowFontScaling,
onPress: onGoBack,
labelVisible: headerBackTitleVisible,
label: leftLabel !== undefined ? leftLabel : previousTitle,
truncatedLabel,
labelStyle: [leftLabelStyle, customLeftLabelStyle],
onLabelLayout: this.handleLeftLabelLayout,
screenLayout: layout,
titleLayout,
tintColor: headerTintColor,
canGoBack: Boolean(onGoBack),
})}
{leftButton}
</Animated.View>
) : null}
<Animated.View
@@ -322,7 +326,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
style={[
Platform.select({
ios: null,
default: { left: left ? 72 : 16 },
default: { left: leftButton ? 72 : 16 },
}),
styles.title,
titleStyle,

View File

@@ -2,7 +2,10 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@react-navigation/*": ["./packages/*/src", "./packages/*/lib/typescript"],
"@react-navigation/*": [
"./packages/*/src",
"./packages/*/lib/typescript"
],
"use-subscription": ["./typings/use-subscription.d"]
},
"allowUnreachableCode": false,