kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-29 21:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix header transition when mode is set to screen (#3927)

Browse Source
This commit is contained in:
Janic Duplessis
2018-04-09 14:22:51 -04:00
parent 0191edf83a
commit cc4d75f1a8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/react-navigation/src/views/Header/HeaderStyleInterpolator.js vendored
View File

@@ -47,7 +47,10 @@ function isGoingBack(scenes) {
} }
function forLayout(props) { function forLayout(props) {
const { layout, position, scene, scenes } = props; const { layout, position, scene, scenes, mode } = props;
if (mode !== 'float') {
return {};
}
const isBack = isGoingBack(scenes); const isBack = isGoingBack(scenes);
const interpolate = getSceneIndicesForInterpolationInputRange(props); const interpolate = getSceneIndicesForInterpolationInputRange(props);
@@ -163,11 +166,11 @@ function forLeftButton(props) {
}; };
} }
/* /*
* NOTE: this offset calculation is an approximation that gives us * NOTE: this offset calculation is an approximation that gives us
* decent results in many cases, but it is ultimately a poor substitute * decent results in many cases, but it is ultimately a poor substitute
* for text measurement. See the comment on title for more information. * for text measurement. See the comment on title for more information.
* *
* - 70 is the width of the left button area. * - 70 is the width of the left button area.
* - 25 is the width of the left button icon (to account for label offset) * - 25 is the width of the left button icon (to account for label offset)
*/ */
@@ -234,14 +237,14 @@ function forLeftLabel(props) {
}; };
} }
/* /*
* NOTE: this offset calculation is a an approximation that gives us * NOTE: this offset calculation is a an approximation that gives us
* decent results in many cases, but it is ultimately a poor substitute * decent results in many cases, but it is ultimately a poor substitute
* for text measurement. We want the back button label to transition * for text measurement. We want the back button label to transition
* smoothly into the title text and to do this we need to understand * smoothly into the title text and to do this we need to understand
* where the title is positioned within the title container (since it is * where the title is positioned within the title container (since it is
* centered). * centered).
* *
* - 70 is the width of the left button area. * - 70 is the width of the left button area.
* - 25 is the width of the left button icon (to account for label offset) * - 25 is the width of the left button icon (to account for label offset)
*/ */