feat(mobile): integrate product search with filter tabs in search screen
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { View, FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions } from 'react-native';
|
import { View, FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions } from 'react-native';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { useNavigation } from 'expo-router';
|
import { useNavigation, useRouter } from 'expo-router';
|
||||||
import { SearchBar } from '../../components/SearchBar';
|
import { SearchBar } from '../../components/SearchBar';
|
||||||
import { MedicineCard } from '../../components/MedicineCard';
|
import { MedicineCard } from '../../components/MedicineCard';
|
||||||
import { LoadingSpinner } from '../../components/LoadingSpinner';
|
import { LoadingSpinner } from '../../components/LoadingSpinner';
|
||||||
@@ -9,6 +9,7 @@ import { useDebounce } from '../../hooks/useDebounce';
|
|||||||
import { useAuth } from '../../hooks/useAuth';
|
import { useAuth } from '../../hooks/useAuth';
|
||||||
import { useRecentSearches } from '../../hooks/useRecentSearches';
|
import { useRecentSearches } from '../../hooks/useRecentSearches';
|
||||||
import { searchMedicines } from '../../services/medicines';
|
import { searchMedicines } from '../../services/medicines';
|
||||||
|
import { searchProducts, Product } from '../../services/products';
|
||||||
import { useThemeContext } from '../../components/ThemeProvider';
|
import { useThemeContext } from '../../components/ThemeProvider';
|
||||||
import { spacing, borderRadius } from '../../constants/theme';
|
import { spacing, borderRadius } from '../../constants/theme';
|
||||||
import { Medicine } from '../../types';
|
import { Medicine } from '../../types';
|
||||||
@@ -31,11 +32,14 @@ export default function SearchScreen() {
|
|||||||
const { colors } = useThemeContext();
|
const { colors } = useThemeContext();
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
const [results, setResults] = useState<Medicine[]>([]);
|
const [results, setResults] = useState<Medicine[]>([]);
|
||||||
|
const [products, setProducts] = useState<Product[]>([]);
|
||||||
|
const [searchMode, setSearchMode] = useState<'all' | 'medicines' | 'products'>('all');
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
|
const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
|
||||||
const navigation = useNavigation();
|
const navigation = useNavigation();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const parent = navigation.getParent();
|
const parent = navigation.getParent();
|
||||||
@@ -43,6 +47,8 @@ export default function SearchScreen() {
|
|||||||
const unsubscribe = parent.addListener('tabPress', () => {
|
const unsubscribe = parent.addListener('tabPress', () => {
|
||||||
setQuery('');
|
setQuery('');
|
||||||
setResults([]);
|
setResults([]);
|
||||||
|
setProducts([]);
|
||||||
|
setSearchMode('all');
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
setError(null);
|
setError(null);
|
||||||
});
|
});
|
||||||
@@ -52,6 +58,7 @@ export default function SearchScreen() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (debouncedQuery.length < 2) {
|
if (debouncedQuery.length < 2) {
|
||||||
setResults([]);
|
setResults([]);
|
||||||
|
setProducts([]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +76,17 @@ export default function SearchScreen() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const fetchProducts = async () => {
|
||||||
|
try {
|
||||||
|
const productResults = await searchProducts(debouncedQuery);
|
||||||
|
setProducts(productResults);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Product search error:', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
fetchResults();
|
fetchResults();
|
||||||
|
fetchProducts();
|
||||||
}, [debouncedQuery]);
|
}, [debouncedQuery]);
|
||||||
|
|
||||||
const handleSearch = (searchQuery: string) => {
|
const handleSearch = (searchQuery: string) => {
|
||||||
@@ -77,7 +94,7 @@ export default function SearchScreen() {
|
|||||||
if (searchQuery.trim()) addSearch(searchQuery);
|
if (searchQuery.trim()) addSearch(searchQuery);
|
||||||
};
|
};
|
||||||
|
|
||||||
const showSuggestions = !query && !isLoading && results.length === 0;
|
const showSuggestions = !query && !isLoading && results.length === 0 && products.length === 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.container, { backgroundColor: colors.background }]}>
|
<View style={[styles.container, { backgroundColor: colors.background }]}>
|
||||||
@@ -87,6 +104,20 @@ export default function SearchScreen() {
|
|||||||
onChangeText={setQuery}
|
onChangeText={setQuery}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{query.length >= 2 && (
|
||||||
|
<View style={styles.filterContainer}>
|
||||||
|
<TouchableOpacity style={[styles.filterTab, searchMode === 'all' && styles.filterTabActive]} onPress={() => setSearchMode('all')}>
|
||||||
|
<Text style={[styles.filterText, searchMode === 'all' && styles.filterTextActive]}>Todos</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<TouchableOpacity style={[styles.filterTab, searchMode === 'medicines' && styles.filterTabActive]} onPress={() => setSearchMode('medicines')}>
|
||||||
|
<Text style={[styles.filterText, searchMode === 'medicines' && styles.filterTextActive]}>Medicamentos</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
<TouchableOpacity style={[styles.filterTab, searchMode === 'products' && styles.filterTabActive]} onPress={() => setSearchMode('products')}>
|
||||||
|
<Text style={[styles.filterText, searchMode === 'products' && styles.filterTextActive]}>Parafarmacia</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
{showSuggestions && (
|
{showSuggestions && (
|
||||||
<>
|
<>
|
||||||
<View style={[styles.suggestionsSection, isTablet && styles.suggestionsSectionTablet]}>
|
<View style={[styles.suggestionsSection, isTablet && styles.suggestionsSectionTablet]}>
|
||||||
@@ -130,7 +161,7 @@ export default function SearchScreen() {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{isLoading && <LoadingSpinner message="Buscando medicamentos..." />}
|
{isLoading && <LoadingSpinner message="Buscando..." />}
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<View style={[styles.errorContainer, isTablet && styles.errorContainerTablet, { backgroundColor: colors.dangerContainer }]}>
|
<View style={[styles.errorContainer, isTablet && styles.errorContainerTablet, { backgroundColor: colors.dangerContainer }]}>
|
||||||
@@ -138,16 +169,43 @@ export default function SearchScreen() {
|
|||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!isLoading && !error && results.length === 0 && query.length >= 2 && (
|
{!isLoading && !error && results.length === 0 && products.length === 0 && query.length >= 2 && (
|
||||||
<View style={styles.emptyContainer}>
|
<View style={styles.emptyContainer}>
|
||||||
<Text style={[styles.emptyText, { color: colors.textSecondary }]}>No se encontraron medicamentos</Text>
|
<Text style={[styles.emptyText, { color: colors.textSecondary }]}>No se encontraron resultados</Text>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<FlatList
|
<FlatList
|
||||||
data={results}
|
data={(searchMode === 'medicines' || searchMode === 'all') ? results : []}
|
||||||
keyExtractor={(item) => item.nregistro}
|
keyExtractor={(item) => item.nregistro}
|
||||||
renderItem={({ item }) => <MedicineCard medicine={item} />}
|
renderItem={({ item }) => <MedicineCard medicine={item} />}
|
||||||
|
ListHeaderComponent={
|
||||||
|
<>
|
||||||
|
{(searchMode === 'all' || searchMode === 'products') && products.length > 0 && (
|
||||||
|
<View style={styles.section}>
|
||||||
|
<Text style={[styles.sectionTitle, { color: colors.text }]}>Parafarmacia y Bebé</Text>
|
||||||
|
{products.map((product) => (
|
||||||
|
<TouchableOpacity
|
||||||
|
key={`${product.source}-${product.id}`}
|
||||||
|
style={[styles.productCard, { backgroundColor: colors.card, borderColor: colors.border }]}
|
||||||
|
onPress={() => router.push(`/product/${product.source}/${product.id}`)}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<View style={styles.productInfo}>
|
||||||
|
<View style={styles.badges}>
|
||||||
|
<View style={[styles.sourceBadge, { backgroundColor: product.source === 'cima' ? '#2563eb' : '#16a34a' }]}>
|
||||||
|
<Text style={styles.badgeText}>{product.source === 'cima' ? 'CIMA' : 'OFF'}</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
<Text style={[styles.productName, { color: colors.text }]} numberOfLines={1}>{product.name}</Text>
|
||||||
|
<Text style={[styles.productBrand, { color: colors.textSecondary }]} numberOfLines={1}>{product.brand}</Text>
|
||||||
|
</View>
|
||||||
|
</TouchableOpacity>
|
||||||
|
))}
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
}
|
||||||
contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
|
contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
|
||||||
showsVerticalScrollIndicator={false}
|
showsVerticalScrollIndicator={false}
|
||||||
/>
|
/>
|
||||||
@@ -159,6 +217,34 @@ const styles = StyleSheet.create({
|
|||||||
container: {
|
container: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
},
|
},
|
||||||
|
filterContainer: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'center',
|
||||||
|
gap: spacing.sm,
|
||||||
|
paddingVertical: spacing.sm,
|
||||||
|
paddingHorizontal: spacing.md,
|
||||||
|
},
|
||||||
|
filterTab: {
|
||||||
|
paddingHorizontal: spacing.md,
|
||||||
|
paddingVertical: spacing.sm,
|
||||||
|
borderRadius: borderRadius.full,
|
||||||
|
backgroundColor: 'rgba(0,0,0,0.05)',
|
||||||
|
},
|
||||||
|
filterTabActive: {
|
||||||
|
backgroundColor: '#7fbf8f',
|
||||||
|
},
|
||||||
|
filterText: {
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: '600',
|
||||||
|
color: '#41493e',
|
||||||
|
},
|
||||||
|
filterTextActive: {
|
||||||
|
color: '#ffffff',
|
||||||
|
},
|
||||||
|
section: {
|
||||||
|
paddingHorizontal: spacing.lg,
|
||||||
|
marginTop: spacing.md,
|
||||||
|
},
|
||||||
suggestionsSection: {
|
suggestionsSection: {
|
||||||
marginTop: spacing.sm,
|
marginTop: spacing.sm,
|
||||||
alignSelf: 'center',
|
alignSelf: 'center',
|
||||||
@@ -245,4 +331,38 @@ const styles = StyleSheet.create({
|
|||||||
emptyText: {
|
emptyText: {
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
},
|
},
|
||||||
|
productCard: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
borderRadius: borderRadius.lg,
|
||||||
|
borderWidth: 1,
|
||||||
|
padding: spacing.md,
|
||||||
|
marginBottom: spacing.sm,
|
||||||
|
},
|
||||||
|
productInfo: {
|
||||||
|
flex: 1,
|
||||||
|
gap: 4,
|
||||||
|
},
|
||||||
|
badges: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
gap: spacing.sm,
|
||||||
|
marginBottom: 2,
|
||||||
|
},
|
||||||
|
sourceBadge: {
|
||||||
|
paddingHorizontal: spacing.sm,
|
||||||
|
paddingVertical: 2,
|
||||||
|
borderRadius: borderRadius.sm,
|
||||||
|
},
|
||||||
|
badgeText: {
|
||||||
|
color: '#ffffff',
|
||||||
|
fontSize: 11,
|
||||||
|
fontWeight: '700',
|
||||||
|
},
|
||||||
|
productName: {
|
||||||
|
fontSize: 15,
|
||||||
|
fontWeight: '600',
|
||||||
|
},
|
||||||
|
productBrand: {
|
||||||
|
fontSize: 13,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user