summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-10-05 17:26:33 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-10-08 13:00:17 +0200
commit1b1a37fe8df9d88959d9fb5cd45d436dc2bc0643 (patch)
treeea893f2796dfb04a726a233cc2b94a37f640ab49 /gui
parentf9891e59134557d3cb52f06b6febef143f4da286 (diff)
downloadmullvadvpn-1b1a37fe8df9d88959d9fb5cd45d436dc2bc0643.tar.xz
mullvadvpn-1b1a37fe8df9d88959d9fb5cd45d436dc2bc0643.zip
Drop static methods and inline constant checks into getDerivedStateFromProps
Diffstat (limited to 'gui')
-rw-r--r--gui/packages/desktop/src/renderer/components/NavigationBar.js17
1 files changed, 5 insertions, 12 deletions
diff --git a/gui/packages/desktop/src/renderer/components/NavigationBar.js b/gui/packages/desktop/src/renderer/components/NavigationBar.js
index a0fef6dc81..8cde736498 100644
--- a/gui/packages/desktop/src/renderer/components/NavigationBar.js
+++ b/gui/packages/desktop/src/renderer/components/NavigationBar.js
@@ -261,8 +261,11 @@ class PrivateNavigationBar extends Component<NavigationBarProps, NavigationBarSt
_titleViewRef = React.createRef();
static getDerivedStateFromProps(props, state) {
- const showsBarSeparator = PrivateNavigationBar._shouldShowBarSeparator(props.scrollTop);
- const showsBarTitle = PrivateNavigationBar._shouldShowNavigationTitle(props.scrollTop);
+ // that's where SettingsHeader.HeaderTitle intersects the navigation bar
+ const showsBarSeparator = props.scrollTop > 11;
+
+ // that's when SettingsHeader.HeaderTitle goes behind the navigation bar
+ const showsBarTitle = props.scrollTop > 30;
return {
...state,
@@ -307,16 +310,6 @@ class PrivateNavigationBar extends Component<NavigationBarProps, NavigationBarSt
);
}
- static _shouldShowBarSeparator(scrollTop: number): boolean {
- // that's where SettingsHeader.HeaderTitle intersects the navigation bar
- return scrollTop > 11;
- }
-
- static _shouldShowNavigationTitle(scrollTop: number): boolean {
- // that's when SettingsHeader.HeaderTitle goes behind the navigation bar
- return scrollTop > 30;
- }
-
_onLayout = async (containerLayout) => {
const titleView = this._titleViewRef.current;
if (titleView) {