fix: Mousetrap import on mobile and inner text element in headers

berty · Mar 14, 2019 · 0cadf69 · 0cadf69
1 parent 58d2796
commit 0cadf69
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 1,085 deletions.
diff --git a/client/react-native/common/components/App.js b/client/react-native/common/components/App.js
@@ -17,7 +17,7 @@ import { AppNavigator } from './Navigator/AppNavigator'
 import { RelayContext } from '../relay'
 import { UpdateContext } from '../update'
 import * as KeyboardContext from '../helpers/KeyboardContext'
-import Mousetrap from 'mousetrap'
+import Mousetrap from '../helpers/Mousetrap'
 
 const { CoreModule } = NativeModules
 

diff --git a/client/react-native/common/components/Library/Header.js b/client/react-native/common/components/Library/Header.js
@@ -71,17 +71,19 @@ class Header extends PureComponent {
                 middle
               />
             )}
-            <Text
-              icon={titleIcon}
-              left
-              large
-              color={colorText}
-              justify={backBtn ? 'center' : 'start'}
-              middle
-              size={5}
-            >
-              {title}
-            </Text>
+            {typeof title !== 'string'
+              ? title
+              : <Text
+                icon={titleIcon}
+                left
+                large
+                color={colorText}
+                justify={backBtn ? 'center' : 'start'}
+                middle
+                size={5}
+              >
+                {title}
+              </Text>}
             {rightBtn ? <View>{rightBtn}</View> : null}
             {!rightBtn &&
             rightBtnIcon !== null && (

diff --git a/client/react-native/common/components/Library/ModalScreen.js b/client/react-native/common/components/Library/ModalScreen.js
@@ -21,7 +21,9 @@ class ModalScreen extends React.PureComponent {
   }
 
   componentWillUnmount () {
-    window.removeEventListener('keyup', this._keyboardListener)
+    if (Platform.OS === 'web') {
+      window.removeEventListener('keyup', this._keyboardListener)
+    }
   }
 
   keyboardListener (event) {

diff --git a/client/react-native/common/components/Screens/Contacts/ChatsSwitcherModal.js b/client/react-native/common/components/Screens/Contacts/ChatsSwitcherModal.js
@@ -10,7 +10,7 @@ import { Pagination } from '../../../relay'
 import { fragments } from '../../../graphql'
 import { borderTop, marginLeft, padding } from '../../../styles'
 import { conversation as utils } from '../../../utils'
-import Mousetrap from 'mousetrap'
+import Mousetrap from '../../../helpers/Mousetrap'
 import { withGoBack } from '../../Library/BackActionProvider'
 import { withNavigation, withNavigationFocus, StackActions, NavigationActions } from 'react-navigation'
 

diff --git a/client/react-native/common/helpers/Mousetrap.js b/client/react-native/common/helpers/Mousetrap.js
@@ -0,0 +1 @@
+export default {}
diff --git a/client/react-native/common/helpers/Mousetrap.web.js b/client/react-native/common/helpers/Mousetrap.web.js
@@ -0,0 +1,2 @@
+import Mousetrap from 'mousetrap'
+export default Mousetrap
diff --git a/client/react-native/yarn.lock b/client/react-native/yarn.lock