ordering-ui-react-native 0.23.77-test → 0.23.77-test1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.23.77-test",
+  "version": "0.23.77-test1",
   "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, useMemo } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native'
 import MapView, {
@@ -30,8 +30,8 @@ const MapViewComponent = (props: MapViewParams) => {
   const [, t] = useLanguage();
   const [{ user }] = useSession()
   const { width, height } = Dimensions.get('window');
-
-  const mapRef = useRef<any>(null);
+  const ASPECT_RATIO = width / height;
+  const mapRef = useRef<MapView | any>(null);
   const following = useRef<boolean>(true);
   const [isFocused, setIsFocused] = useState(false)
   const [locationSelected, setLocationSelected] = useState<any>(null)
@@ -44,15 +44,6 @@ 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 0.3 // Valor predeterminado o manejo de error
-    }
-    return width / height;
-  }, [width, height])
-
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -107,7 +98,7 @@ const MapViewComponent = (props: MapViewParams) => {
   }, [userLocation, locationSelected]);
 
 
-  /* useEffect(() => {
+  useEffect(() => {
     if (isFocused) {
       getBusinessLocations()
     }
@@ -121,14 +112,6 @@ const MapViewComponent = (props: MapViewParams) => {
     };
   }, [isFocused]);
 
-  useEffect(() => {
-    return () => {
-      if (mapRef) {
-        mapRef.current = null
-      }
-    }
-  }, [])
-
   useFocusEffect(
     useCallback(() => {
       setIsFocused(true)
@@ -138,7 +121,7 @@ const MapViewComponent = (props: MapViewParams) => {
         setLocationSelected(null)
       }
     }, [])
-  ) */
+  )
 
   const styles = StyleSheet.create({
     image: {
@@ -273,8 +256,8 @@ const MapViewComponent = (props: MapViewParams) => {
             ref={mapRef}
             provider={PROVIDER_GOOGLE}
             initialRegion={{
-              latitude: initialPosition?.latitude ?? 1,
-              longitude: initialPosition?.longitude ?? 1,
+              latitude: initialPosition?.latitude || 0,
+              longitude: initialPosition?.longitude || 0,
               latitudeDelta: haveOrders ? 0.01 : 0.1,
               longitudeDelta: haveOrders ? 0.01 * ASPECT_RATIO : 0.1 * ASPECT_RATIO,
             }}
@@ -287,44 +270,42 @@ const MapViewComponent = (props: MapViewParams) => {
             onTouchStart={() => (following.current = false)}
           >
             <>
-              {Object.values(markerGroups).length ? (Object.values(markerGroups).map((marker: any) => (
+              {Object.values(markerGroups).map((marker: any) => (
                 <RenderMarker
                   key={marker[0]?.business_id}
                   marker={marker[0]}
                   orderIds={marker.map((order: any) => order.id).join(', ')}
                 />
-              ))) : null}
-              {Object.values(customerMarkerGroups).length ? (Object.values(customerMarkerGroups).map((marker: any) => (
+              ))}
+              {Object.values(customerMarkerGroups).map((marker: any) => (
                 <RenderMarker
                   key={marker[0]?.customer_id}
                   marker={marker[0]}
                   orderIds={marker.map((order: any) => order.id).join(', ')}
                   customer
                 />
-              ))) : null}
-              {typeof location.lat === 'number' && !Number.isNaN(location.lat) && typeof location.lng === 'number' && !Number.isNaN(location.lng) ? (
-                <Marker
-                  coordinate={{
-                    latitude: typeof location.lat === 'number' && !Number.isNaN(location.lat) ? location.lat : 0,
-                    longitude: typeof location.lng === 'number' && !Number.isNaN(location.lng) ? location.lng : 0,
-                  }}
-                  title={t('YOUR_LOCATION', 'Your Location')}
-                >
-                  <Icon
-                    name="map-marker"
-                    size={50}
-                    color={theme.colors.primary}
+              ))}
+              <Marker
+                coordinate={{
+                  latitude: typeof location.lat === 'number' && !Number.isNaN(location.lat) ? location.lat : 0,
+                  longitude: typeof location.lng === 'number' && !Number.isNaN(location.lng) ? location.lng : 0,
+                }}
+                title={t('YOUR_LOCATION', 'Your Location')}
+              >
+                <Icon
+                  name="map-marker"
+                  size={50}
+                  color={theme.colors.primary}
+                />
+                <View style={styles.view}>
+                  <OIcon
+                    style={styles.image}
+                    src={{ uri: user.photo }}
+                    width={25}
+                    height={25}
                   />
-                  <View style={styles.view}>
-                    <OIcon
-                      style={styles.image}
-                      src={{ uri: user.photo }}
-                      width={25}
-                      height={25}
-                    />
-                  </View>
-                </Marker>
-              ) : null}
+                </View>
+              </Marker>
             </>
           </MapView>
           <OFab