@abcagency/hc-ui-components 1.6.6 → 1.6.7

package/src/util/filterUtil.js

@@ -4,10 +4,10 @@ import { isAlgoliaAvailable, filterListingsByAlgoliaSearch } from '~/util/algoli
 
 import Fuse from 'fuse.js';
 
-export const getFilterOptions = (listings, filteredListings, field, excludeZeroCount = null) => {
+export const getFilterOptions = (listings, filteredListings, field, excludeZeroCount = false, sortAlphabetically = false) => {
 	const options = new Set();
 	listings.forEach(listing => {
-		if (listing.fields[field]) {
+		if (listing.fields && listing.fields[field]) {
 			options.add(listing.fields[field]);
 		}
 	});
@@ -18,22 +18,32 @@ export const getFilterOptions = (listings, filteredListings, field, excludeZeroC
 	});
 
 	filteredListings.forEach(listing => {
+		if (!listing.fields) return;
 		const value = listing.fields[field];
-		if (value && optionCounts.hasOwnProperty(value)) {
+		if (value && Object.prototype.hasOwnProperty.call(optionCounts, value)) {
 			optionCounts[value] += 1;
 		}
 	});
 
-	return Array.from(options)
-		.sort()
+	let result = Array.from(options)
+		.filter(option => option != null && option !== '') // Filter out null/empty values
 		.map(option => ({
 			name: option,
 			count: optionCounts[option] || 0
 		}))
 		.filter(option => !(excludeZeroCount === true && option.count === 0));
+
+	// Sort alphabetically or by count
+	if (sortAlphabetically) {
+		result.sort((a, b) => a.name.localeCompare(b.name));
+	} else {
+		result.sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
+	}
+
+	return result;
 };
 
-export const getSpecialFeatureOptions = (listings, filteredListings, siteConfig, favorites) => {
+export const getSpecialFeatureOptions = (listings, filteredListings, siteConfig, favorites, filterConfig = {}) => {
 	const specialFeatures = siteConfig.specialFeatures;
 	const featureCounts = Object.keys(specialFeatures).sort().reduce((acc, key) => {
 		acc[specialFeatures[key]] = 0;
@@ -48,17 +58,28 @@ export const getSpecialFeatureOptions = (listings, filteredListings, siteConfig,
 		});
 	});
 
-	const specialFeatureOptions = Object.entries(featureCounts).map(([name, count]) => ({
+	let specialFeatureOptions = Object.entries(featureCounts).map(([name, count]) => ({
 		name,
 		count
 	}));
 
+	// Update favorite count
 	for (let option of specialFeatureOptions) {
 		if (option.name === 'Favorite') {
 			option.count = filteredListings.filter(x => favorites.includes(x.id)).length;
 		}
 	}
 
+	// Hide favorites if filterConfig.showFavorites is false
+	if (filterConfig.showFavorites === false) {
+		specialFeatureOptions = specialFeatureOptions.filter(option => option.name !== 'Favorite');
+	}
+
+	// Hide zero results if filterConfig.hideZeroResults is true
+	if (filterConfig.hideZeroResults === true) {
+		specialFeatureOptions = specialFeatureOptions.filter(option => option.count > 0);
+	}
+
 	return specialFeatureOptions;
 };
 
@@ -76,9 +97,19 @@ export const generateFilterOptions = (
 	filterOptions,
 	parentField,
 	favorites,
-	selectedFilters
+	selectedFilters,
+	filterConfig = {
+		hideZeroResults: false,
+		dynamicCounts: true,
+		showFavorites: true,
+		collapsedByDefault: false,
+		sortAlphabetically: false
+	}
 ) => {
 	if (allListings.length > 0) {
+		// Determine which listings to use for counts based on dynamicCounts setting
+		const countListings = filterConfig.dynamicCounts ? filteredListings : allListings;
+
 		const dynamicFilters = siteConfig.fieldFiltersShown.map(fieldName => {
 			if (fieldName === parentField && filterOptions?.filters) {
 				return filterOptions.filters.find(filter => filter.id === fieldName);
@@ -87,31 +118,31 @@ export const generateFilterOptions = (
 				return {
 					id: fieldName,
 					title: siteConfig.fieldNames[fieldName],
-					items: getFilterOptions(allListings, allListings, fieldName)
+					items: getFilterOptions(allListings, countListings, fieldName, filterConfig.hideZeroResults, filterConfig.sortAlphabetically)
 				};
 			}
 			if(fieldName == 'subCategory' && selectedFilters.category){
 				const categoryKeys = Object.keys(selectedFilters.category);
-				const filteredListings = allListings.filter(
+				const filteredByCategory = allListings.filter(
 					x => categoryKeys.includes(x.fields?.category)
 				);
 				return {
 					id: fieldName,
 					title: siteConfig.fieldNames[fieldName],
-					items: getFilterOptions(allListings, filteredListings, fieldName, false)
+					items: getFilterOptions(allListings, filteredByCategory, fieldName, filterConfig.hideZeroResults, filterConfig.sortAlphabetically)
 				};
 			}
 			if (fieldName == "specialFeatures") {
 				return {
 					id: fieldName,
 					title: siteConfig.fieldNames[fieldName],
-					items: getSpecialFeatureOptions(allListings, filteredListings, siteConfig, favorites).sort()
+					items: getSpecialFeatureOptions(allListings, countListings, siteConfig, favorites, filterConfig).sort()
 				};
 			}
 			return {
 				id: fieldName,
 				title: siteConfig.fieldNames[fieldName],
-				items: getFilterOptions(allListings, filteredListings, fieldName)
+				items: getFilterOptions(allListings, countListings, fieldName, filterConfig.hideZeroResults, filterConfig.sortAlphabetically)
 			};
 		});
 
@@ -186,9 +217,24 @@ export const generateFilterOptions = (
 			)
 		};
 
+		// Filter out null filters and ensure items arrays don't contain undefined values
+		const cleanFilters = dynamicFilters
+			.filter(f => f != null && f.items != null)
+			.map(f => ({
+				...f,
+				items: f.items.filter(item => item != null && item.name != null)
+			}));
+
+		const cleanLocations = locations
+			.filter(l => l != null && l.items != null)
+			.map(l => ({
+				...l,
+				items: l.items.filter(item => item != null && item.name != null)
+			}));
+
 		return {
-			filters: dynamicFilters,
-			locations: locations,
+			filters: cleanFilters,
+			locations: cleanLocations,
 			pointsOfInterest: pointsOfInterest
 		};
 	}
@@ -235,7 +281,7 @@ export const applyFilters = async (
 			});
 		} else if (Object.keys(filterItems).length > 0) {
 			results = results.filter(listing =>
-				filterItems.hasOwnProperty(listing.fields[formattedField])
+				Object.prototype.hasOwnProperty.call(filterItems, listing.fields[formattedField])
 			);
 		}
 	}
@@ -314,7 +360,7 @@ export const filterListingsByLocation = (
 	let results = allListings;
 	if (selectedLocation !== null) {
 		results = results.filter(item =>
-			selectedLocation.items.hasOwnProperty(item.id)
+			Object.prototype.hasOwnProperty.call(selectedLocation.items, item.id)
 		);
 	}
 	const mapItems = getDistinctItemsByProximity(results, listingEntities);

package/src/util/twMerge.js

@@ -0,0 +1,6 @@
+import { extendTailwindMerge } from 'tailwind-merge';
+
+// Create a custom tailwind-merge that understands the hc- prefix
+export const twMerge = extendTailwindMerge({
+	prefix: 'hc-'
+});