@abcagency/hc-ui-components 1.3.14 → 1.3.16

package/src/components/modules/filter/item.js

@@ -1,76 +1,87 @@
-import React, { useState, useEffect } from 'react';
-
-const FilterItem = ({
-	className,
-	item,
-	type = 'checkbox',
-	itemKey = null,
-	hasCount = true,
-	field,
-	selectedFilters,
-	setSelectedFilters,
-	...rest
-}) => {
-	const itemName = item.name ? item.name : item;
-	itemKey = itemKey === null ? itemName : itemKey;
-	var isActive =
-		selectedFilters != undefined && !!selectedFilters[field]?.[itemKey];
-
-	const changeHandler = () => {
-		setSelectedFilters(prevFilters => {
-			const updatedFilters = { ...prevFilters };
-			if (!isActive) {
-				if (!updatedFilters[field]) {
-					updatedFilters[field] = {};
-				}
-				updatedFilters[field][itemKey] = true;
-				return updatedFilters;
-			}
-			delete updatedFilters[field][itemKey];
-			if (Object.keys(updatedFilters[field]).length === 0) {
-				delete updatedFilters[field];
-			}
-			return updatedFilters;
-		});
-	};
-	const [activeItem, setActiveItem] = useState(isActive);
-
-	useEffect(() => {
-		if (selectedFilters && selectedFilters[field] && Object.keys(selectedFilters[field])?.length > 0) return;
-		else if (activeItem === true) {
-			setActiveItem(false);
-		}
-	}, [selectedFilters]);
-
-	return (
-		<label
-			className={`
-				hc-flex hc-items-start hc-gap-2 hc-px-2 hc-py-1.5 hc-rounded-sm hc-text-sm hc-cursor-pointer hc-transition hover:hc-bg-uiAccent/5
-				${className ?? ""}
-			`}
-			{...rest}
-		>
-			<input
-				id={itemKey}
-				name={field}
-				disabled={item.count == 0}
-				value={itemName}
-				type={type}
-				className={`hc-size-4 hc-mt-px hc-text-primary hc-border-uiAccent/30 hc-transition-colors hc-rounded-sm`}
-				checked={activeItem}
-				onChange={() => {
-					setActiveItem(!activeItem);
-					changeHandler();
-				}}
-			/>
-			<span className="font-medium">{itemName}</span>
-			{hasCount && (
-				<span className="hc-inline-block hc-mt-1 hc-ml-auto hc-text-xs hc-leading-none hc-text-primary">
-					({item.count})
-				</span>
-			)}
-		</label>
-	);
-};
-
-export default FilterItem;
+import React, { useState, useEffect } from 'react';
+
+import { useTrackEvent } from '~/contexts/trackEventContext';
+
+const FilterItem = ({
+	className,
+	item,
+	type = 'checkbox',
+	itemKey = null,
+	hasCount = true,
+	field,
+	selectedFilters,
+	setSelectedFilters,
+	...rest
+}) => {
+	const { trackEvent, eventTypes } = useTrackEvent();
+	const itemName = item.name ? item.name : item;
+	itemKey = itemKey === null ? itemName : itemKey;
+	var isActive =
+		selectedFilters != undefined && !!selectedFilters[field]?.[itemKey];
+
+	useEffect(() => {
+		if(!selectedFilters)
+			return;
+		 setActiveItem(!!selectedFilters[field]?.[itemKey]);
+	},[selectedFilters, field, itemKey]);
+	const changeHandler = () => {
+		if (!isActive) {
+			trackEvent(eventTypes.FILTER_APPLIED, { filterType:  field, filterChecked: itemKey });
+		}
+		setSelectedFilters(prevFilters => {
+			const updatedFilters = { ...prevFilters };
+			if (!isActive) {
+				if (!updatedFilters[field]) {
+					updatedFilters[field] = {};
+				}
+				updatedFilters[field][itemKey] = true;
+				return updatedFilters;
+			}
+			delete updatedFilters[field][itemKey];
+			if (Object.keys(updatedFilters[field]).length === 0) {
+				delete updatedFilters[field];
+			}
+			return updatedFilters;
+		});
+	};
+	const [activeItem, setActiveItem] = useState(isActive);
+
+	useEffect(() => {
+		if (selectedFilters && selectedFilters[field] && Object.keys(selectedFilters[field])?.length > 0) return;
+		else if (activeItem === true) {
+			setActiveItem(false);
+		}
+	}, [selectedFilters]);
+
+	return (
+		<label
+			className={`
+				hc-flex hc-items-start hc-gap-2 hc-px-2 hc-py-1.5 hc-rounded-sm hc-text-sm hc-cursor-pointer hc-transition hover:hc-bg-uiAccent/5
+				${className ?? ""}
+			`}
+			{...rest}
+		>
+			<input
+				id={itemKey}
+				name={field}
+				disabled={item.count == 0}
+				value={itemName}
+				type={type}
+				className={`hc-size-4 hc-mt-px hc-text-primary hc-border-uiAccent/30 hc-transition-colors hc-rounded-sm`}
+				checked={activeItem}
+				onChange={() => {
+					setActiveItem(!activeItem);
+					changeHandler();
+				}}
+			/>
+			<span className="font-medium">{itemName}</span>
+			{hasCount && (
+				<span className="hc-inline-block hc-mt-1 hc-ml-auto hc-text-xs hc-leading-none hc-text-primary">
+					({item.count})
+				</span>
+			)}
+		</label>
+	);
+};
+
+export default FilterItem;

package/src/components/modules/filter/location.js

@@ -1,71 +1,71 @@
-import React from 'react';
-
-import Accordion from '~/components/modules/accordions/default';
-import FilterCommute from '~/components/modules/filter/commute';
-import FilterPointsOfInterest from '~/components/modules/filter/points-of-interest';
-import FilterCard from '~/components/modules/cards/filter';
-import AccordionFilterItem from '~/components/modules/accordions/filterItem';
-
-import Loading from '~/util/loading';
-
-import { useMapList } from '~/contexts/mapListContext';
-
-const FilterLocation = ({
-	className,
-	defaultValue,
-	setDefaultValue,
-	showMap = false,
-	setLocation,
-	setSelectedListItem
-}) => {
-	const { setSelectedFilters, selectedFilters, filterOptions } = useMapList();
-	// const activeItemsCount = selectedFilters != null && selectedFilters["cityState"]
-	// 	? Object.keys(selectedFilters["cityState"]).length
-	// 	: 0;
-
-	// const handleClearFilters = () => {
-	// 	setSelectedFilters(prevFilters => {
-	// 		const updatedFilters = { ...prevFilters };
-	// 		delete updatedFilters["cityState"];
-	// 		return updatedFilters;
-	// 	});
-	// };
-
-	var locations = filterOptions?.locations;
-	var pointsOfInterest = filterOptions?.pointsOfInterest;
-	return (
-		<FilterCard className={className ?? ""}>
-			<FilterCard.Title icon="fluent:hc-location-16-filled">
-				<span>
-					<span className="hc-hidden lg:hc-inline">Job</span> location
-				</span>
-			</FilterCard.Title>
-			{!locations && (
-				<Loading />
-			)}
-			{locations && <Accordion defaultValue={defaultValue} className="hc-space-y-4">
-				{locations?.map(filter => (
-					<AccordionFilterItem
-						key={filter.id}
-						filter={filter}
-						setDefaultValue={setDefaultValue}
-						selectedFilters={selectedFilters}
-						setSelectedFilters={prevFilters => { setSelectedFilters(prevFilters); setLocation(null); setSelectedListItem(null); }}
-					/>
-				))}
-				{showMap && <FilterCommute className="hc-mt-6" />}
-				{showMap && (
-					<FilterPointsOfInterest
-						className="hc-mt-4"
-						pointsOfInterest={pointsOfInterest}
-						setDefaultValue={setDefaultValue}
-						defaultValue={defaultValue}
-					/>
-				)}
-			</Accordion>
-			}
-		</FilterCard>
-	);
-};
-
-export default FilterLocation;
+import React, { useEffect } from 'react';
+
+import Accordion from '~/components/modules/accordions/default';
+import FilterCommute from '~/components/modules/filter/commute';
+import FilterPointsOfInterest from '~/components/modules/filter/points-of-interest';
+import FilterCard from '~/components/modules/cards/filter';
+import AccordionFilterItem from '~/components/modules/accordions/filterItem';
+
+import Loading from '~/util/loading';
+
+import { useMapList } from '~/contexts/mapListContext';
+
+const FilterLocation = ({
+	className,
+	defaultValue,
+	setDefaultValue,
+	showMap = false,
+	setLocation,
+	setSelectedListItem
+}) => {
+	const { setSelectedFilters, selectedFilters, filterOptions } = useMapList();
+	// const activeItemsCount = selectedFilters != null && selectedFilters["cityState"]
+	// 	? Object.keys(selectedFilters["cityState"]).length
+	// 	: 0;
+
+	// const handleClearFilters = () => {
+	// 	setSelectedFilters(prevFilters => {
+	// 		const updatedFilters = { ...prevFilters };
+	// 		delete updatedFilters["cityState"];
+	// 		return updatedFilters;
+	// 	});
+	// };
+
+	var locations = filterOptions?.locations;
+	var pointsOfInterest = filterOptions?.pointsOfInterest;
+	return (
+		<FilterCard className={className ?? ""}>
+			<FilterCard.Title icon="fluent:location-16-filled">
+				<span>
+					<span className="hc-hidden lg:hc-inline">Job</span> location
+				</span>
+			</FilterCard.Title>
+			{!locations && (
+				<Loading />
+			)}
+			{locations && <Accordion defaultValue={defaultValue} className="hc-space-y-4">
+				{locations?.map(filter => (
+					<AccordionFilterItem
+						key={filter.id}
+						filter={filter}
+						setDefaultValue={setDefaultValue}
+						selectedFilters={selectedFilters}
+						setSelectedFilters={prevFilters => { setSelectedFilters(prevFilters); setLocation(null); setSelectedListItem(null); }}
+					/>
+				))}
+				{showMap && <FilterCommute className="hc-mt-6" />}
+				{showMap && (
+					<FilterPointsOfInterest
+						className="hc-mt-4"
+						pointsOfInterest={pointsOfInterest}
+						setDefaultValue={setDefaultValue}
+						defaultValue={defaultValue}
+					/>
+				)}
+			</Accordion>
+			}
+		</FilterCard>
+	);
+};
+
+export default FilterLocation;

package/src/components/modules/filter/points-of-interest.js

@@ -1,44 +1,44 @@
-import React from 'react';
-
-import Accordion from '~/components/modules/accordions/default';
-import RadioItem from '~/components/modules/filter/radio-item';
-
-const FilterPointsOfInterest = ({
-	title = "Points of interest",
-	pointsOfInterest,
-	setDefaultValue,
-	className,
-	defaultValue
-}) => {
-	return (
-		<div
-			className={`
-				hc-relative
-				${className ?? ""}
-			`}
-		>
-			<Accordion defaultValue={defaultValue} className="hc-space-y-4">
-				<Accordion.Item id="points-of-interest">
-					<Accordion.Trigger.HasHeader
-						onClick={() => setDefaultValue("points-of-interest")}
-						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"
-					>
-						{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] ohc-verflow-auto">
-						{pointsOfInterest.items.map((item, index) => {
-							return <RadioItem
-								key={item.key + index}
-								item={item}
-								field={item.id} />;
-						})}
-					</Accordion.Content>
-				</Accordion.Item>
-			</Accordion>
-		</div>
-	);
-};
-
-export default FilterPointsOfInterest;
+import React from 'react';
+
+import Accordion from '~/components/modules/accordions/default';
+import RadioItem from '~/components/modules/filter/radio-item';
+
+const FilterPointsOfInterest = ({
+	title = "Points of interest",
+	pointsOfInterest,
+	setDefaultValue,
+	className,
+	defaultValue
+}) => {
+	return (
+		<div
+			className={`
+				hc-relative
+				${className ?? ""}
+			`}
+		>
+			<Accordion defaultValue={defaultValue} className="hc-space-y-4">
+				<Accordion.Item id="points-of-interest">
+					<Accordion.Trigger.HasHeader
+						onClick={() => setDefaultValue("points-of-interest")}
+						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"
+					>
+						{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] ohc-verflow-auto">
+						{pointsOfInterest.items.map((item, index) => {
+							return <RadioItem
+								key={item.key + index}
+								item={item}
+								field={item.id} />;
+						})}
+					</Accordion.Content>
+				</Accordion.Item>
+			</Accordion>
+		</div>
+	);
+};
+
+export default FilterPointsOfInterest;

package/src/components/modules/filter/radio-item.js

@@ -1,53 +1,57 @@
-import React from 'react';
-
-import Icon from '~/components/modules/icon';
-
-import { useMap } from "~/contexts/mapContext";
-
-const RadioItem = ({
-	className,
-	item,
-	field,
-	...rest
-}) => {
-	const { selectedPlaces, setSelectedPlaces } = useMap();
-	const chosenPlace = item.key.toLowerCase();
-	let isActive = selectedPlaces.includes(chosenPlace);
-
-	const changeHandler = () => {
-		setSelectedPlaces([isActive ? '' : chosenPlace]);
-	};
-
-	return (
-		<label key={item.key}
-			className={`
-			hc-flex hc-items-start hc-gap-2 hc-px-2 hc-py-1.5 hc-rounded-sm hc-text-sm hc-cursor-pointer hc-transition hover:hc-bg-uiAccent/5
-				${item.count === 0 ? 'hc-text-uiDisabled hc-cursor-not-allowed' : 'hover:hc-bg-uiAccent/5'}
-				${className ?? ""}
-			`}
-			{...rest}
-		>
-			<input
-				key={item.key}
-				id={item.Key}
-				name={field}
-				value={item.key}
-				type={"radio"}
-				className={`hc-size-4 hc-mt-px hc-text-primary hc-border-uiAccent/30 hc-transition-colors hc-rounded-full`}
-				checked={isActive}
-				onClick={() => {
-					changeHandler();
-				}}
-				onChange={() => { }}
-			/>
-			<span className="hc-font-medium">{item.key}</span>
-			{isActive &&
-				<div className="hc-w-full hc-unselect-div">
-					<Icon className="hc-float-right" icon="mdi:times"></Icon>
-				</div>
-			}
-		</label>
-	);
-};
-
-export default RadioItem;
+import React from 'react';
+
+import Icon from '~/components/modules/icon';
+
+import { useMap } from "~/contexts/mapContext";
+import { useTrackEvent } from '~/contexts/trackEventContext';
+
+const RadioItem = ({
+	className,
+	item,
+	field,
+	...rest
+}) => {
+	const { trackEvent, eventTypes } = useTrackEvent();
+	const { selectedPlaces, setSelectedPlaces } = useMap();
+	const chosenPlace = item.key.toLowerCase();
+	let isActive = selectedPlaces.includes(chosenPlace);
+
+	const changeHandler = () => {
+		if(!isActive)
+			trackEvent(eventTypes.POI_APPLIED, { chosenPlace });
+		setSelectedPlaces([isActive ? '' : chosenPlace]);
+	};
+
+	return (
+		<label key={item.key}
+			className={`
+			hc-flex hc-items-start hc-gap-2 hc-px-2 hc-py-1.5 hc-rounded-sm hc-text-sm hc-cursor-pointer hc-transition hover:hc-bg-uiAccent/5
+				${item.count === 0 ? 'hc-text-uiDisabled hc-cursor-not-allowed' : 'hover:hc-bg-uiAccent/5'}
+				${className ?? ""}
+			`}
+			{...rest}
+		>
+			<input
+				key={item.key}
+				id={item.Key}
+				name={field}
+				value={item.key}
+				type={"radio"}
+				className={`hc-size-4 hc-mt-px hc-text-primary hc-border-uiAccent/30 hc-transition-colors hc-rounded-full`}
+				checked={isActive}
+				onClick={() => {
+					changeHandler();
+				}}
+				onChange={() => { }}
+			/>
+			<span className="hc-font-medium">{item.key}</span>
+			{isActive &&
+				<div className="hc-w-full hc-unselect-div">
+					<Icon className="hc-float-right" icon="mdi:times"></Icon>
+				</div>
+			}
+		</label>
+	);
+};
+
+export default RadioItem;