ordering-ui-react-native 0.17.76 → 0.17.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.17.76",
+  "version": "0.17.78",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx

@@ -1,6 +1,6 @@
-import React, { useState } from 'react'
+import React, { useState, useCallback } from 'react'
 
-import { Platform, StyleSheet, View } from 'react-native';
+import { Platform, StyleSheet, View, TouchableOpacity } from 'react-native';
 
 import { OButton, OText, OLink, OModal } from '../shared'
 import {
@@ -44,6 +44,9 @@ export const OrderContentComponent = (props: OrderContent) => {
   const [{ configs }] = useConfig();
   const [openReviewModal, setOpenReviewModal] = useState(false)
 
+  const [isReadMore, setIsReadMore] = useState(false)
+  const [lengthMore, setLengthMore] = useState(false)
+
   const pastOrderStatuses = [1, 2, 5, 6, 10, 11, 12, 16, 17]
 
   const walletName: any = {
@@ -95,6 +98,10 @@ export const OrderContentComponent = (props: OrderContent) => {
     return /^\d+$/.test(str);
   }
 
+  const onTextLayout = useCallback((e: any) => {
+    setLengthMore(e.nativeEvent.lines.length >= 3); //to check the text is more than 2 lines or not
+  },[]);
+
   return (
     <OrderContent isOrderGroup={isOrderGroup} lastOrder={lastOrder}>
       {isOrderGroup && (
@@ -298,18 +305,26 @@ export const OrderContentComponent = (props: OrderContent) => {
         )}
 
         {!!order?.customer?.address && (
-          <View style={styles.linkWithIcons}>
-            <OLink
-              PressStyle={styles.linkWithIcons}
-              url={Platform.select({
-                ios: `maps:0,0?q=${order?.customer?.address}`,
-                android: `geo:0,0?q=${order?.customer?.address}`,
-              })}
-              numberOfLines={2}
-              shorcut={order?.customer?.address}
-              TextStyle={styles.textLink}
-            />
-          </View>
+          <>
+            <View style={styles.linkWithIcons}>
+              <OLink
+                PressStyle={{ ...styles.linkWithIcons, marginBottom: 0 }}
+                url={Platform.select({
+                  ios: `maps:0,0?q=${order?.customer?.address}`,
+                  android: `geo:0,0?q=${order?.customer?.address}`,
+                })}
+                onTextLayout={onTextLayout}
+                numberOfLines={isReadMore ? 20 : 2}
+                shorcut={order?.customer?.address}
+                TextStyle={styles.textLink}
+              />
+            </View>
+            {lengthMore && (
+              <TouchableOpacity onPress={() => setIsReadMore(!isReadMore)}>
+                <OText size={12} color={theme.colors.statusOrderBlue}>{isReadMore ? t('SHOW_LESS', 'Show less') : t('READ_MORE', 'Read more')}</OText>
+              </TouchableOpacity>
+            )}
+          </>
         )}
 
         {!!order?.customer?.internal_number && (

package/themes/business/src/components/shared/OLink.tsx

@@ -13,10 +13,11 @@ interface Props {
   type?: string;
   hasButton?: boolean;
   numberOfLines?: number;
+  onTextLayout?: (e : any) => void;
 }
 
 const OLink = (props: Props): React.ReactElement => {
-  const { url, shorcut, color, PressStyle, TextStyle, type, hasButton, numberOfLines } = props;
+  const { url, shorcut, color, PressStyle, TextStyle, type, hasButton, numberOfLines, onTextLayout } = props;
   const [, t] = useLanguage();
 
   const handleAlert = () =>
@@ -78,7 +79,9 @@ const OLink = (props: Props): React.ReactElement => {
           style={TextStyle}
           numberOfLines={numberOfLines ?? 1}
           ellipsizeMode="tail"
-          color={color}>
+          color={color}
+          onTextLayout={onTextLayout}
+        >
           {shorcut}
         </OText>
       )}
@@ -86,4 +89,8 @@ const OLink = (props: Props): React.ReactElement => {
   );
 };
 
+OLink.defaultProps = {
+  onTextLayout: (e: any) => {}
+};
+
 export default OLink;

package/themes/business/src/components/shared/OText.tsx

@@ -42,15 +42,20 @@ interface Props {
   adjustsFontSizeToFit?: boolean;
   textDecorationLine?: string;
   lineHeight?: number;
+  onTextLayout?: (e : any) => void;
 }
 
 const OText = (props: Props): React.ReactElement => {
   return (
-    <SText {...props} style={[props.style, { lineHeight: props.lineHeight }]}>
+    <SText {...props} style={[props.style, { lineHeight: props.lineHeight }]} onTextLayout={props.onTextLayout}>
       {props.children}
       {props.space && ' '}
     </SText>
   );
 };
 
+OText.defaultProps = {
+  onTextLayout: (e: any) => {}
+};
+
 export default OText;

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -557,7 +557,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			<PageBanner position='app_business_listing' />
 
 			<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
-			<ListWrapper ph={isChewLayout && 20}>
+			<ListWrapper style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
 				{!businessId && (
 					<BusinessTypeFilter
 						images={props.images}

package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx

@@ -67,7 +67,6 @@ export const HeaderWrapper = styled.ImageBackground`
 
 export const ListWrapper = styled.View`
 	background-color: ${(props: any) => props.theme.colors.backgroundLight};
-	padding-horizontal: ${(props: any) => props.ph ?? 40}px;
 `;
 
 export const FeaturedWrapper = styled.View`

package/themes/original/src/components/Notifications/styles.tsx

@@ -1,9 +1,5 @@
 import styled from 'styled-components/native'
 
-export const ContainerButtons = styled.View`
-    margin-vertical: 50px
-`
-
 export const Container = styled.ScrollView`
     position: relative;
     flex: 1;
@@ -13,7 +9,7 @@ export const Container = styled.ScrollView`
 export const NotificationsGroupSwitchWrapper = styled.View`
   flex-grow: 1;
   justify-content: space-between;
-	paddingHorizontal: 20px;
+	padding: 0 20px;
 `
 
 export const SwitchWrapper = styled.View`