ordering-ui-react-native 0.23.94 → 0.23.96

package/package.json

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

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useMemo, useState, useCallback } from 'react'
 import { useLanguage, BusinessSearchList, useOrder, useUtils, useEvent, showToast, ToastType } from 'ordering-components/native'
 import { ScrollView, StyleSheet, Dimensions, FlatList } from 'react-native'
 import { useTheme } from 'styled-components/native'
@@ -16,7 +16,6 @@ import {
 import FastImage from 'react-native-fast-image'
 import { convertHoursToMinutes } from '../../utils'
 import { BusinessSearchParams } from '../../types'
-import { useIsFocused } from '@react-navigation/native';
 
 import { BusinessSearchHeader } from './BusinessSearchHeader'
 import { BusinessSearchFooter } from './BusinessSearchFooter'
@@ -49,8 +48,6 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
 
   const [openFilters, setOpenFilters] = useState(false)
 
-  const isFocused = useIsFocused();
-
   const styles = StyleSheet.create({
     productsContainer: {
       marginTop: 20
@@ -130,17 +127,16 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
     })
   }
 
-  const handleScroll = ({ nativeEvent }: any) => {
+  const handleScroll = useCallback(({ nativeEvent }: any) => {
     const y = nativeEvent.contentOffset.y;
     const height = nativeEvent.contentSize.height;
     const hasMore = !(
       paginationProps.totalPages === paginationProps.currentPage
     );
-
-    if (y + PIXELS_TO_SCROLL > height && !businessesSearchList.loading && hasMore && businessesSearchList?.businesses?.length > 0) {
+    if (height > 1000 && y + PIXELS_TO_SCROLL > height && !businessesSearchList.loading && hasMore && businessesSearchList?.businesses?.length > 0) {
       handleSearchbusinessAndProducts();
     }
-  };
+  }, [businessesSearchList.loading, businessesSearchList?.businesses?.length]);
 
   const onChangeTermValue = (query: any) => {
     handleChangeTermValue(query)
@@ -159,15 +155,14 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
     handleSearchbusinessAndProducts(true)
   }, [])
 
-
-  useEffect(() => {
-    handleChangeTermValue('')
-  }, [isFocused])
+  const businessFiltered = useMemo(() => {
+    return businessesSearchList.businesses?.filter((business: any) => business?.categories?.length > 0)
+  }, [businessesSearchList.businesses])
 
   return (
     <>
       <FlatList
-        data={businessesSearchList.businesses?.filter((business: any) => business?.categories?.length > 0)}
+        data={businessFiltered}
         ListFooterComponent={<BusinessSearchFooter
           businessesSearchList={businessesSearchList}
           handleCloseFilters={handleCloseFilters}