ordering-ui-react-native 0.23.74-test4 → 0.23.75-test

package/package.json

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

package/themes/business/src/components/MapView/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
 import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native'
 import MapView, {
@@ -30,7 +30,7 @@ const MapViewComponent = (props: MapViewParams) => {
   const [, t] = useLanguage();
   const [{ user }] = useSession()
   const { width, height } = Dimensions.get('window');
-  const ASPECT_RATIO = width / height;
+
   const mapRef = useRef<MapView | any>(null);
   const following = useRef<boolean>(true);
   const [isFocused, setIsFocused] = useState(false)
@@ -44,6 +44,15 @@ const MapViewComponent = (props: MapViewParams) => {
 
   const location = { lat: userLocation?.latitude, lng: userLocation?.longitude }
   const haveOrders = Object.values(markerGroups)?.length > 0 && Object.values(customerMarkerGroups)?.length > 0
+
+  const ASPECT_RATIO = useMemo(() => {
+    if (typeof width !== 'number' || typeof height !== 'number' || height === 0) {
+      console.error('Invalid screen dimensions');
+      return .3 // Valor predeterminado o manejo de error
+    }
+    return width / height;
+  }, [width, height])
+
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -51,7 +60,7 @@ const MapViewComponent = (props: MapViewParams) => {
     });
   };
 
-  const fitCoordinates = (location?: any) => {
+  /* const fitCoordinates = (location?: any) => {
     if (mapRef.current && typeof location.latitude === 'number' && !Number.isNaN(location.latitude) && typeof location.longitude === 'number' && !Number.isNaN(location.longitude)) {
       const isSendCoordinates =
         location &&
@@ -73,7 +82,7 @@ const MapViewComponent = (props: MapViewParams) => {
         },
       );
     }
-  };
+  }; */
 
   const onPressZoomIn = () => {
     const lastRegion = mapRef?.current?.__lastRegion
@@ -93,9 +102,9 @@ const MapViewComponent = (props: MapViewParams) => {
     })
   }
 
-  useEffect(() => {
+  /* useEffect(() => {
     fitCoordinates(locationSelected || userLocation);
-  }, [userLocation, locationSelected]);
+  }, [userLocation, locationSelected]); */
 
 
   useEffect(() => {
@@ -257,8 +266,8 @@ const MapViewComponent = (props: MapViewParams) => {
               ref={mapRef}
               provider={PROVIDER_GOOGLE}
               initialRegion={{
-                latitude: initialPosition?.latitude || 0,
-                longitude: initialPosition?.longitude || 0,
+                latitude: initialPosition?.latitude ?? 0,
+                longitude: initialPosition?.longitude ?? 0,
                 latitudeDelta: haveOrders ? 0.01 : 0.1,
                 longitudeDelta: haveOrders ? 0.01 * ASPECT_RATIO : 0.1 * ASPECT_RATIO,
               }}
@@ -271,7 +280,7 @@ const MapViewComponent = (props: MapViewParams) => {
               onTouchStart={() => (following.current = false)}
             >
               <>
-                {/* {Object.values(markerGroups).length ? (Object.values(markerGroups).map((marker: any) => (
+                {Object.values(markerGroups).length ? (Object.values(markerGroups).map((marker: any) => (
                   <RenderMarker
                     key={marker[0]?.business_id}
                     marker={marker[0]}
@@ -285,7 +294,7 @@ const MapViewComponent = (props: MapViewParams) => {
                     orderIds={marker.map((order: any) => order.id).join(', ')}
                     customer
                   />
-                ))) : null} */}
+                ))) : null}
                 {typeof location.lat === 'number' && !Number.isNaN(location.lat) && typeof location.lng === 'number' && !Number.isNaN(location.lng) ? (
                   <Marker
                     coordinate={{

package/themes/original/src/components/Cart/index.tsx

@@ -73,6 +73,7 @@ const CartUI = (props: any) => {
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null, type: '' })
   const [openPlaceModal, setOpenPlaceModal] = useState(false)
   const [maxDate, setMaxDate] = useState<any>(null)
+  const [comment] = useState<any>(cart?.comment ?? '')
   const isCartPending = cart?.status === 2
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
   const business: any = (orderState?.carts && Object.values(orderState.carts).find((_cart: any) => _cart?.uuid === props.cartuuid)) ?? {}
@@ -523,7 +524,7 @@ const CartUI = (props: any) => {
                   <OText size={16} lineHeight={18}>{t('COMMENTS', 'Comments')}</OText>
                   <View style={{ flex: 1, width: '100%' }}>
                     <OInput
-                      value={cart?.comment}
+                      value={comment || cart?.comment}
                       placeholder={t('SPECIAL_COMMENTS', 'Special Comments')}
                       onChange={(value: string) => handleChangeComment(value)}
                       style={{
@@ -649,6 +650,7 @@ const CartUI = (props: any) => {
 export const Cart = (props: any) => {
   const cartProps = {
     ...props,
+    disablePreviousComment: true,
     UIComponent: CartUI
   }
 

package/themes/original/src/components/OrderSummary/index.tsx

@@ -59,6 +59,7 @@ const OrderSummaryUI = (props: any) => {
   const [{ parsePrice, parseNumber }] = useUtils();
   const commentRef = useRef()
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null, type: '' })
+  const [comment] = useState<any>(orderState?.carts?.[`businessId:${props.cart.business_id}`].comment ?? '')
   const hideCartDiscount = hideCouponByValidationCheckout
   const hideCartComments = hideCommentsByValidationCheckout
 
@@ -349,7 +350,7 @@ const OrderSummaryUI = (props: any) => {
                     <OText size={12}>{t('COMMENTS', 'Comments')}</OText>
                     <View style={{ flex: 1, width: '100%' }}>
                       <OInput
-                        value={cart?.comment}
+                        value={comment || cart?.comment}
                         placeholder={t('SPECIAL_COMMENTS', 'Special Comments')}
                         onChange={(value: string) => handleChangeComment(value)}
                         style={{
@@ -416,6 +417,7 @@ const OrderSummaryUI = (props: any) => {
 export const OrderSummary = (props: any) => {
   const orderSummaryProps = {
     ...props,
+    disablePreviousComment: true,
     UIComponent: OrderSummaryUI
   }