@abcagency/hc-ui-components 1.3.20 → 1.3.21

package/src/components/containers/maps/map-container.js

@@ -0,0 +1,204 @@
+/* eslint-disable no-undef */
+import React, { useEffect, useRef } from 'react';
+
+import MapMarker from "~/components/containers/maps/map-marker-container";
+import PlaceMarker from "~/components/modules/maps/place-marker";
+
+import { usePlaces } from "~/contexts/placesContext";
+import { useMap } from "~/contexts/mapContext";
+import { useMapList } from "~/contexts/mapListContext";
+
+import { markerIconSelected, markerIcon, pinIcon } from "~/util/mapIconUtil";
+
+import Map from "~/components/modules/maps/map";
+
+const MapContainer = ({
+	markerConfigs,
+	infoWindowClasses,
+	clusterGridSize = 60
+}) => {
+	const {
+		location,
+		zoom,
+		center,
+		commuteLocation,
+		selectLocationEntity,
+		setLocation,
+		mapInteracted,
+		setMapInteracted
+	} = useMap();
+
+	const {
+		mapItems, filteredListings, setSelectedFilters,
+		setQuery
+	} = useMapList();
+
+	const mapRef = useRef();
+	const markerRefs = useRef({});
+	const mapContainerRef = useRef(null);
+	const {
+		poiMarkers,
+		setCurrentCenter,
+		currentCenter,
+		setCurrentZoom,
+		currentZoom,
+		selectedPlaceMarker,
+		setSelectedPlaceMarker,
+		placesWindow,
+		setPlacesWindow } = usePlaces();
+
+	const onIdle = () => {
+		if (!currentCenter || !mapRef.current) return;
+		const newCenter = mapRef.current.getCenter().toJSON();
+		const newZoom = mapRef.current.zoom;
+
+		setCurrentCenter(newCenter);
+
+		if (newZoom !== currentZoom) {
+			setCurrentZoom(newZoom);
+		}
+	};
+
+	useEffect(() => {
+		if (mapContainerRef.current) {
+			const handleScroll = () => {
+				setMapInteracted(true);
+			};
+			var mapContainerRefCurrent = mapContainerRef.current;
+			mapContainerRef.current.addEventListener('wheel', handleScroll);
+			return () => mapContainerRefCurrent.removeEventListener('wheel', handleScroll);
+		}
+	}, [mapContainerRef.current]);
+
+	useEffect(() => {
+		if (mapRef.current) {
+			const mapInstance = mapRef.current;
+			const dragStartListener = mapInstance.addListener('dragstart', () => setMapInteracted(true));
+			const mouseDownListener = mapInstance.addListener('mousedown', () => setMapInteracted(true));
+			return () => {
+				google.maps.event.removeListener(dragStartListener);
+				google.maps.event.removeListener(mouseDownListener);
+			};
+		}
+	}, [mapRef.current, mapContainerRef.current]);
+
+	useEffect(() => {
+		if ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && mapRef.current) {
+			fitBounds(mapRef.current);
+		}
+	}, [mapItems, mapRef.current, location]);
+
+	useEffect(() => {
+		if ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && mapRef.current && mapInteracted) {
+			fitBounds(mapRef.current, true);
+		}
+		if (mapRef.current) {
+			let currZoom = mapRef.current.zoom;
+			let setZoomVal = currZoom < 13 ? currZoom : 12;
+			mapRef.current.setZoom(setZoomVal);
+		}
+	}, [filteredListings]);
+
+	useEffect(() => {
+		if (!mapRef.current || !location || mapInteracted) return;
+		mapRef.current.panTo(
+			new google.maps.LatLng(location.latitude, location.longitude)
+		);
+		if (mapRef.current) {
+			let setZoomVal = zoom < 13 ? zoom : 12;
+			mapRef.current.setZoom(setZoomVal);
+		}
+	}, [location, zoom, mapRef.current]);
+
+	const fitBounds = (map, overload = false) => {
+		if ((mapInteracted === false || overload) && mapItems != null) {
+			const bounds = new window.google.maps.LatLngBounds();
+			mapItems.forEach(item => {
+				bounds.extend(new google.maps.LatLng(item.latitude, item.longitude));
+			});
+			if (!map) return;
+			map.fitBounds(bounds);
+		}
+		if (mapRef.current.zoom > 17) {
+			mapRef.current.setZoom(16);
+		}
+	};
+
+	const markerClickHandler = mapLocation => {
+		setMapInteracted(true);
+		selectLocationEntity(mapLocation);
+	};
+
+	const onLoad = map => {
+		if (!location || location === null) {
+			mapRef.current = map;
+			fitBounds(map, true);
+			return;
+		}
+		mapRef.current = map;
+
+		if (mapInteracted === false) {
+			mapRef.current.panTo(
+				new google.maps.LatLng(location.latitude, location.longitude)
+			);
+
+			mapRef.current.setZoom(zoom);
+		}
+	};
+
+	const pinIconUrl = pinIcon({
+		fillColor: markerConfigs.fillColor,
+		strokeColor: markerConfigs.strokeColor
+	});
+
+	const mapMarkers = mapItems.map(item => (
+		<MapMarker
+			key={item.id}
+			item={item}
+			selectedLocation={location}
+			markerRefs={markerRefs}
+			infoWindowClasses={infoWindowClasses}
+			setSelectedLocation={setLocation}
+			markerClickHandler={markerClickHandler}
+			markerIcon={markerIcon(markerConfigs)}
+			markerIconSelected={markerIconSelected(markerConfigs)}
+			setMapInteracted={setMapInteracted}
+		/>
+	));
+
+	const placeMarkers = poiMarkers.markers.map((marker, index) => (
+		<PlaceMarker
+			key={`marker-${marker.title}-${index}`}
+			marker={marker}
+			index={index}
+			selectedPlaceMarker={selectedPlaceMarker}
+			placesWindow={placesWindow}
+			setPlacesWindow={setPlacesWindow}
+			setSelectedPlaceMarker={setSelectedPlaceMarker}
+		/>
+	));
+
+	return (
+		<Map
+			zoom={zoom}
+			center={center}
+			mapContainerRef={mapContainerRef}
+			onLoad={onLoad}
+			onIdle={onIdle}
+			clusterGridSize={clusterGridSize}
+			markerConfigs={markerConfigs}
+			mapMarkers={mapMarkers}
+			placeMarkers={placeMarkers}
+			mapInteracted={mapInteracted}
+			pinIconUrl={pinIconUrl}
+			setMapInteracted={setMapInteracted}
+			fitBounds={fitBounds}
+			mapRef={mapRef}
+			setQuery={setQuery}
+			filteredListingsLength={filteredListings.length}
+			setSelectedFilters={setSelectedFilters}
+		/>
+	);
+};
+
+export default MapContainer;

package/src/components/containers/maps/map-list-container.js

@@ -0,0 +1,48 @@
+import React from 'react';
+
+import List from '~/components/containers/list/item-list-container';
+import Map from '~/components/containers/maps/map-container';
+import Filter from '~/components/modules/filter';
+import MapList from '~/components/modules/maps/map-list';
+
+const MapListContainer = ({
+	loading = false,
+	mapDetails,
+	markerConfigs,
+	itemExpandedContent,
+	fieldsShown,
+	specialFeatures,
+	fieldNames,
+	showMap,
+	placeMappings
+}) => {
+
+	const listProps = {
+		fieldsShown,
+		fieldNames,
+		itemExpandedContent,
+		loading,
+		showMap,
+		specialFeatures
+	};
+
+	const mapProps = {
+		mapDetails,
+		markerConfigs,
+		placeMappings,
+		clusterGridSize: 60,
+		showMap
+	};
+
+	return (
+		<MapList
+			showMap={showMap}
+			loading={loading}
+			list={<List {...listProps} />}
+			map={<Map {...mapProps} />}
+			filter={<Filter showMap={showMap} className="md:hc-hidden" />}
+		/>
+	);
+};
+
+export default MapListContainer;

package/src/components/containers/maps/map-marker-container.js

@@ -0,0 +1,78 @@
+import React, { useEffect, useRef } from 'react';
+import MapMarker from '~/components/modules/maps/map-marker';
+import { InfoWindow } from '@react-google-maps/api';
+import InfoWindowCard from '~/components/modules/maps/info-window-card';
+import InfoWindowContent from "~/components/containers/maps/info-window-content-container";
+
+import { useMap } from "~/contexts/mapContext";
+import { useMapList } from "~/contexts/mapListContext";
+import { useTrackEvent } from '~/contexts/trackEventContext';
+
+const MapMarkerContainer = ({
+	item,
+	markerRefs,
+	infoWindowClasses,
+	markerClickHandler,
+	clusterer,
+	markerIconSelected,
+	markerIcon,
+	selectedLocation,
+	setMapInteracted
+}) => {
+	const { setLocation, commuteLocation } = useMap();
+	const isSelected = item.id === selectedLocation?.id;
+	const markerRef = useRef(null);
+	const { trackEvent, eventTypes } = useTrackEvent();
+	const { handleFilterListingsByLocation } = useMapList();
+
+	useEffect(() => {
+		markerRefs.current[item.id] = markerRef.current;
+	}, []);
+
+	const onMarkerClick = () => {
+		trackEvent(eventTypes.MAP_MARKER_CLICKED, {
+			entityDisplayName: item.entityDisplayName,
+			lat: item.latitude,
+			lng: item.longitude,
+			travelTime: item.travelTime
+		});
+		setMapInteracted(true);
+		markerClickHandler(item);
+	};
+
+	return (
+		<MapMarker
+			position={{ lat: item.latitude, lng: item.longitude }}
+			title={item.name}
+			icon={isSelected ? markerIconSelected : markerIcon}
+			zIndex={isSelected ? 9999 : 1}
+			onLoad={marker => (markerRef.current = marker)}
+			onClick={onMarkerClick}
+			clusterer={clusterer}
+		>
+			{isSelected && (
+				<InfoWindow
+					position={{ lat: item.latitude, lng: item.longitude }}
+					anchor={markerRefs.current[item.id]}
+					onCloseClick={() => {
+						setMapInteracted(true);
+						setLocation(null);
+					}}
+					options={{ maxWidth: 400 }}
+				>
+					<InfoWindowCard
+						className={infoWindowClasses}
+						id={item.id}
+						content={<InfoWindowContent
+							item={item}
+							commuteLocation={commuteLocation}
+							filterListingsByLocation={() => handleFilterListingsByLocation(selectedLocation)}
+						/>}
+					/>
+				</InfoWindow>
+			)}
+		</MapMarker>
+	);
+};
+
+export default MapMarkerContainer;

package/src/components/modules/accordions/MapAccordionItem.js

@@ -9,9 +9,6 @@ const MapAccordionItem = ({
 	isActive,
 	children
 }) => {
-	if(isActive){
-		console.log("accordion rerender ");
-	}
 	return (
 		<Accordion.Item key={item.id} id={item.id}>
 			<Accordion.Trigger.Blank>

package/src/components/modules/accordions/filterItem.js

@@ -1,55 +1,27 @@
-import React, { memo } from 'react';
-
-import Accordion from '~/components/modules/accordions/default';
-import FilterItem from '~/components/modules/filter/item';
-import ItemsPill from '~/components/modules/buttons/items-pill';
-
-const AccordionFilterItem = memo(({ filter, setDefaultValue, setSelectedFilters, selectedFilters }) => {
-	const fieldKey = filter.id;
-	const activeItemsCount = selectedFilters != null && selectedFilters[fieldKey]
-		? Object.keys(selectedFilters[fieldKey]).length
-		: 0;
-
-	const handleClearFilters = event => {
-		event.stopPropagation();
-
-		setSelectedFilters(prevFilters => {
-			const updatedFilters = { ...prevFilters };
-			delete updatedFilters[fieldKey];
-			return updatedFilters;
-		});
-	};
-	return (
-		<Accordion.Item key={filter.id} id={filter.id}>
-			<Accordion.Trigger.HasHeader
-				onClick={() => setDefaultValue(filter.id)}
-				className="hc-stretched-link hc-text-left"
-				iconClassName="hc-order-last"
-				headerClassName="hc-relative hc-py-2 hc-rounded hc-border hc-border-uiAccent/20 hc-bg-white hc-text-sm hc-transition data-[state=open]:hc-border-b-transparent data-[state=open]:hc-rounded-b-none"
-				header={
-					activeItemsCount > 0 && (
-						<ItemsPill
-							activeItemsCount={activeItemsCount}
-							onClick={handleClearFilters}
-						/>
-					)
-				}
-			>
-				{filter.title}
-			</Accordion.Trigger.HasHeader>
-			<Accordion.Content bodyClassName="hc-px-2 hc-py-1 hc-bg-white hc-rounded-b hc-border hc-border-uiAccent/20 hc-border-t-0 hc-max-h-[20vh] md:hc-max-h-[25vh] hc-overflow-auto">
-				{filter.items.sort().map(item => (
-					<FilterItem
-						key={item.name}
-						item={item}
-						field={filter.id}
-						selectedFilters={selectedFilters}
-						setSelectedFilters={setSelectedFilters}
-					/>
-				))}
-			</Accordion.Content>
-		</Accordion.Item>
-	);
-});
-AccordionFilterItem.displayName = 'AccordionItem';
-export default AccordionFilterItem;
+import React from 'react';
+import Accordion from '~/components/modules/accordions/default';
+
+const AccordionFilterItem = ({
+	id,
+	setDefaultValue,
+	header,
+	body
+}) => {
+	return (
+		<Accordion.Item key={id} id={id}>
+			<Accordion.Trigger.HasHeader
+				onClick={() => setDefaultValue(id)}
+				className="hc-stretched-link hc-text-left"
+				iconClassName="hc-order-last"
+				headerClassName="hc-relative hc-py-2 hc-rounded hc-border hc-border-uiAccent/20 hc-bg-white hc-text-sm hc-transition data-[state=open]:hc-border-b-transparent data-[state=open]:hc-rounded-b-none"
+			>
+				{header}
+			</Accordion.Trigger.HasHeader>
+			<Accordion.Content bodyClassName="hc-px-2 hc-py-1 hc-bg-white hc-rounded-b hc-border hc-border-uiAccent/20 hc-border-t-0 hc-max-h-[20vh] md:hc-max-h-[25vh] hc-overflow-auto">
+				{body}
+			</Accordion.Content>
+		</Accordion.Item>
+	);
+};
+
+export default AccordionFilterItem;

package/src/components/modules/accordions/filters.js

@@ -1,47 +1,32 @@
-import React from 'react';
-import Accordion from '~/components/modules/accordions/default';
-import AccordionFilterItem from '~/components/modules/accordions/filterItem';
-import FilterCard from '~/components/modules/cards/filter';
-
-import { useMapList } from '~/contexts/mapListContext';
-
-import Loading from '~/util/loading';
-
-const AccordionFilters = ({
-	className,
-	defaultValue,
-	setDefaultValue,
-	setLocation,
-	setSelectedListItem
-}) => {
-	const { filterOptions, selectedFilters, setSelectedFilters } = useMapList();
-
-	return (
-		<FilterCard className={className ?? ""}>
-			<FilterCard.Title icon="fa-solid:sliders-h">
-				<span>
-					Filter <span className="md:hc-hidden lg:hc-inline">your search</span>
-				</span>
-			</FilterCard.Title>
-
-			<Accordion defaultValue={defaultValue} className="hc-space-y-4" >
-				{!filterOptions?.filters && (
-					<Accordion.Item>
-						<Loading />
-					</Accordion.Item>
-				)}
-				{filterOptions?.filters && filterOptions?.filters.map(filter => (
-					<AccordionFilterItem
-						key={filter.id}
-						filter={filter}
-						setDefaultValue={setDefaultValue}
-						selectedFilters={selectedFilters}
-						setSelectedFilters={prevFilters => { setSelectedFilters(prevFilters); setLocation(null); setSelectedListItem(null); }}
-					/>
-				))}
-			</Accordion>
-		</FilterCard>
-	);
-};
-
-export default AccordionFilters;
+import React from 'react';
+import Accordion from '~/components/modules/accordions/default';
+import FilterCard from '~/components/modules/cards/filter';
+import Loading from '~/util/loading';
+
+const AccordionFilters = ({
+	className,
+	defaultValue,
+	children,
+	filterOptions
+}) => {
+	return (
+		<FilterCard className={className ?? ""}>
+			<FilterCard.Title icon="fa-solid:sliders-h">
+				<span>
+          Filter <span className="md:hc-hidden lg:hc-inline">your search</span>
+				</span>
+			</FilterCard.Title>
+
+			<Accordion defaultValue={defaultValue} className="hc-space-y-4" >
+				{!filterOptions?.filters && (
+					<Accordion.Item>
+						<Loading />
+					</Accordion.Item>
+				)}
+				{filterOptions?.filters && children}
+			</Accordion>
+		</FilterCard>
+	);
+};
+
+export default AccordionFilters;