feat(gql): conversations message pagination

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Oct 29, 2018 · ffcb02c · ffcb02c
1 parent 5cac515
commit ffcb02c
Show file tree

Hide file tree

Showing 49 changed files with 1,062 additions and 588 deletions.
diff --git a/.stickler.yml b/.stickler.yml
@@ -3,8 +3,9 @@ linters:
     fixer: false
   shellcheck:
     shell: bash
-  eslint:
-    config: './client/react-native/.eslintrc'
+  # eslint:
+  #  config: './client/react-native/.eslintrc'
+  #  install_plugins: true
   swiftlint: {  }
 files:
   ignore:

diff --git a/client/react-native/common/components/Library/Header.js b/client/react-native/common/components/Library/Header.js
@@ -74,7 +74,6 @@ export default class Header extends PureComponent {
               left
               large
               color={colorText}
-              ellipsis
               justify={backBtn ? 'center' : 'start'}
               middle
               size={5}

diff --git a/client/react-native/common/components/Library/ListItem.js b/client/react-native/common/components/Library/ListItem.js
@@ -33,10 +33,10 @@ export default class ListItem extends PureComponent {
             justify='center'
             style={[marginLeft]}
           >
-            <Text color={colors.black} left middle ellipsis>
+            <Text color={colors.black} left middle>
               {title}
             </Text>
-            <Text color={colors.subtleGrey} tiny middle left ellipsis>
+            <Text color={colors.subtleGrey} tiny middle left>
               {subtitle}
             </Text>
           </Flex.Rows>

diff --git a/client/react-native/common/components/Library/Menu.js b/client/react-native/common/components/Library/Menu.js
@@ -23,11 +23,11 @@ export default class Menu extends Component {
           justify='between'
           style={[paddingLeft, { height: 42 }]}
         >
-          <Text medium color={colors.black} ellipsis>
+          <Text medium color={colors.black}>
             {title}
           </Text>
           {description && (
-            <Text tiny color={colors.subtleGrey} ellipsis>
+            <Text tiny color={colors.subtleGrey}>
               {description}
             </Text>
           )}
@@ -113,7 +113,6 @@ export default class Menu extends Component {
                   color={color || colors.textBlack}
                   align='center'
                   bold={boldLeft ? true : null}
-                  ellipsis
                 >
                   {title}
                 </Text>

diff --git a/client/react-native/common/components/Library/Text.js b/client/react-native/common/components/Library/Text.js
@@ -216,10 +216,23 @@ const getMargin = (
   }
 }
 
-const getHeight = props =>
-  StyleSheet.create({
-    height: { height: props.height, lineHeight: props.height },
+const getHeight = props => {
+  let { multiline, height, lineHeight } = props
+
+  if (!height && !lineHeight) {
+    return null
+  } else if (!lineHeight && typeof multiline === 'number') {
+    lineHeight = height / multiline
+  } else if (!lineHeight && !multiline) {
+    lineHeight = height
+  }
+  return StyleSheet.create({
+    height: {
+      height,
+      lineHeight,
+    },
   }).height
+}
 
 export class BackgroundText extends PureComponent {
   static styles = {}
@@ -330,7 +343,8 @@ export class ForegroundText extends PureComponent {
   }
 
   render () {
-    const { icon, input, children, ellipsis, onSubmit } = this.props
+    const { icon, input, children, multiline, onSubmit } = this.props
+    const numberOfLines = typeof multiline === 'number' ? multiline : undefined
 
     const styles = ForegroundText.getStyles(this.props)
     return (
@@ -347,13 +361,15 @@ export class ForegroundText extends PureComponent {
             placeholder={children || input.placeholder}
             placeholderTextColor={colors.subtleGrey}
             onSubmitEditing={onSubmit}
+            multiline={!!multiline}
+            numberOfLines={numberOfLines}
           />
         ) : (
           <TextNative
-            className={ellipsis ? 'textEllipsis' : 'textBreak'}
+            className={multiline ? 'textBreak' : 'textEllipsis'}
             style={styles.text}
-            ellipsizeMode={ellipsis && 'tail'}
-            numberOfLines={ellipsis && 1}
+            ellipsizeMode={!multiline && 'tail'}
+            numberOfLines={numberOfLines}
           >
             {children}
           </TextNative>