@abcagency/hc-ui-components 1.3.26 → 1.3.28

package/src/components/modules/list/list-item/list-item.js

@@ -1,130 +1,130 @@
-import React, { forwardRef, useState } from 'react';
-import Grid from '~/components/modules/grid';
-import Icon from '~/components/modules/icon';
-import FieldMapper from '~/components/modules/list/field-mapper';
-
-const ListItem = forwardRef(
-	(
-		{
-			isActive,
-			bodyClassName,
-			className,
-			item,
-			fieldsShown,
-			specialFeatures,
-			onItemSelected,
-			showMap,
-			setMobileTab,
-			handleSettingFavorites,
-			favorites,
-			includeFavorite = true,
-			siteConfig,
-			trackEvent,
-			eventTypes,
-			...props
-		},
-		ref
-	) => {
-		const mapPinColor = !showMap ? null : siteConfig.colors.primary.replace("#", "");
-
-		const handleClick = () => {
-			if (onItemSelected) {
-				onItemSelected(item);
-			}
-		};
-		let isFavorite = favorites.includes(item.id);
-
-		const handleFavouriteClick = (event, item) => {
-			if(!includeFavorite)return;
-			event.stopPropagation();
-			let updatedFavorites;
-			if (isFavorite) {
-				updatedFavorites = favorites.filter(fav => fav !== item.id);
-			} else {
-				updatedFavorites = [...favorites, item.id];
-			}
-			isFavorite = !isFavorite;
-			handleSettingFavorites(updatedFavorites);
-		};
-		return (
-			<button
-				ref={ref}
-				onClick={() => { handleClick(); }}
-				className={`
-          hc-group hc-relative hc-flex md:hc-flex-col hc-w-full md:hc-pl-4 hc-text-left hc-bg-clip-border hc-border hc-border-transparent hc-break-words hc-overflow-hidden hc-cursor-pointer hc-transition-colors hover:hc-bg-uiAccent/5 focus:hover:hc-bg-uiAccent/5
-          ${isActive ? "hc-bg-uiAccent/5 hc-border-secondary hc-border" : "hc-text-uiText hc-bg-white"}
-          ${className ?? ""}
-        `}
-				{...props}
-			>
-				<Grid
-					columns="hc-grid-flow-col hc-auto-cols-fr"
-					gap="hc-gap-2"
-					isAnimated={false}
-					className={`
-            hc-block md:hc-grid hc-p-2 hc-ps-4 hc-w-full hc-grow hc-leading-tight hc-text-sm md:hc-text-xs lg:hc-text-sm
-            ${bodyClassName ?? ""}
-          `}
-				>
-					<Grid.Item className="hc-hidden md:hc-block md:hc-absolute md:hc-left-1.5 hc-top-1.5">
-						<span className="hc-sr-only">Expand row</span>
-						<Icon
-							icon="fluent-emoji-high-contrast:plus"
-							size="hc-size-2.5"
-							className={`
-                hc-opacity-0 hc-text-uiText/60 hc-transition group-hover:hc-opacity-100 group-active:hc-opacity-100
-                ${isActive ? "hc-opacity-100 hc-rotate-45" : ""}
-              `}
-						/>
-					</Grid.Item>
-					<FieldMapper
-						item={item}
-						fieldsShown={fieldsShown}
-						specialFeatures={specialFeatures}
-						isFavorite={isFavorite}
-						includeFavorite={includeFavorite}
-						handleFavouriteClick={handleFavouriteClick}
-					/>
-					{includeFavorite &&
-					<Grid.Item
-						key={"favorites"}
-						className="hc-hidden md:hc-block hc-col-span-1"
-					>
-						<Icon
-							icon={isFavorite ? "mdi:heart" : "mdi:heart-outline"}
-							size="hc-size-3.5"
-							iconClasses={isFavorite ? "hc-text-primary" : ""}
-							title={!isFavorite ? 'Add job to favorites' : 'Remove job from favorites'}
-							className="hc-pr-2 hc-transition-opacity hc-duration-300 hc-cursor-pointer hc-opacity-100"
-							onClick={e => {handleFavouriteClick(e, item);}}
-						/>
-					</Grid.Item>
-					}
-				</Grid>
-				{showMap && (
-					<div onClick={() => { setMobileTab("mapTab"); handleClick(); }} className="md:hc-hidden hc-w-2/5 sm:hc-w-1/3 hc-p-1.5 hc-my-1 hc-bg-uiAccent/5 hc-border hc-border-uiAccent/10 hc-rounded-sm">
-						<img
-							src={`https://maps.googleapis.com/maps/api/staticmap?scale=2&center=${item.mapDetails?.latitude},${item.mapDetails?.longitude}&zoom=10&size=240x180&maptype=roadmap&markers=color:0x${mapPinColor}%7Clabel:•%7C${item.mapDetails?.latitude},${item.mapDetails?.longitude}&key=${process.env.GOOGLE_MAPS_API_KEY}`}
-							alt={`Map of location for ${item.fields.position}`}
-							className="hc-w-full hc-h-full hc-object-cover"
-						/>
-					</div>
-				)}
-			</button>
-		);
-	}
-);
-
-ListItem.displayName = "ListItem";
-
-export default React.memo(ListItem, (prevProps, nextProps) => {
-	return (
-		prevProps.isActive === nextProps.isActive &&
-		prevProps.favorites === nextProps.favorites &&
-    prevProps.item.id === nextProps.item.id &&
-	prevProps.item.fields.travelTime === nextProps.item.fields.travelTime &&
-    prevProps.fieldsShown === nextProps.fieldsShown &&
-    prevProps.bodyClassName === nextProps.bodyClassName &&
-    prevProps.className === nextProps.className
-	);
-});
+import React, { forwardRef, useState } from 'react';
+import Grid from '~/components/modules/grid';
+import Icon from '~/components/modules/icon';
+import FieldMapper from '~/components/modules/list/field-mapper';
+
+const ListItem = forwardRef(
+	(
+		{
+			isActive,
+			bodyClassName,
+			className,
+			item,
+			fieldsShown,
+			specialFeatures,
+			onItemSelected,
+			showMap,
+			setMobileTab,
+			handleSettingFavorites,
+			favorites,
+			includeFavorite = true,
+			siteConfig,
+			trackEvent,
+			eventTypes,
+			...props
+		},
+		ref
+	) => {
+		const mapPinColor = !showMap ? null : siteConfig.colors.primary.replace("#", "");
+
+		const handleClick = () => {
+			if (onItemSelected) {
+				onItemSelected(item);
+			}
+		};
+		let isFavorite = favorites.includes(item.id);
+
+		const handleFavouriteClick = (event, item) => {
+			if(!includeFavorite)return;
+			event.stopPropagation();
+			let updatedFavorites;
+			if (isFavorite) {
+				updatedFavorites = favorites.filter(fav => fav !== item.id);
+			} else {
+				updatedFavorites = [...favorites, item.id];
+			}
+			isFavorite = !isFavorite;
+			handleSettingFavorites(updatedFavorites);
+		};
+		return (
+			<button
+				ref={ref}
+				onClick={() => { handleClick(); }}
+				className={`
+          hc-group hc-relative hc-flex md:hc-flex-col hc-w-full md:hc-pl-4 hc-text-left hc-bg-clip-border hc-border hc-border-transparent hc-break-words hc-overflow-hidden hc-cursor-pointer hc-transition-colors hover:hc-bg-uiAccent/5 focus:hover:hc-bg-uiAccent/5
+          ${isActive ? "hc-bg-uiAccent/5 hc-border-secondary hc-border" : "hc-text-uiText hc-bg-white"}
+          ${className ?? ""}
+        `}
+				{...props}
+			>
+				<Grid
+					columns="hc-grid-flow-col hc-auto-cols-fr"
+					gap="hc-gap-2"
+					isAnimated={false}
+					className={`
+            hc-block md:hc-grid hc-p-2 hc-ps-4 hc-w-full hc-grow hc-leading-tight hc-text-sm md:hc-text-xs lg:hc-text-sm
+            ${bodyClassName ?? ""}
+          `}
+				>
+					<Grid.Item className="hc-hidden md:hc-block md:hc-absolute md:hc-left-1.5 hc-top-1.5">
+						<span className="hc-sr-only">Expand row</span>
+						<Icon
+							icon="fluent-emoji-high-contrast:plus"
+							size="hc-size-2.5"
+							className={`
+                hc-opacity-0 hc-text-uiText/60 hc-transition group-hover:hc-opacity-100 group-active:hc-opacity-100
+                ${isActive ? "hc-opacity-100 hc-rotate-45" : ""}
+              `}
+						/>
+					</Grid.Item>
+					<FieldMapper
+						item={item}
+						fieldsShown={fieldsShown}
+						specialFeatures={specialFeatures}
+						isFavorite={isFavorite}
+						includeFavorite={includeFavorite}
+						handleFavouriteClick={handleFavouriteClick}
+					/>
+					{includeFavorite &&
+					<Grid.Item
+						key={"favorites"}
+						className="hc-hidden md:hc-block hc-col-span-1"
+					>
+						<Icon
+							icon={isFavorite ? "mdi:heart" : "mdi:heart-outline"}
+							size="hc-size-3.5"
+							iconClasses={isFavorite ? "hc-text-primary" : ""}
+							title={!isFavorite ? 'Add job to favorites' : 'Remove job from favorites'}
+							className="hc-pr-2 hc-transition-opacity hc-duration-300 hc-cursor-pointer hc-opacity-100"
+							onClick={e => {handleFavouriteClick(e, item);}}
+						/>
+					</Grid.Item>
+					}
+				</Grid>
+				{showMap && (
+					<div onClick={() => { setMobileTab("mapTab"); handleClick(); }} className="md:hc-hidden hc-w-2/5 sm:hc-w-1/3 hc-p-1.5 hc-my-1 hc-bg-uiAccent/5 hc-border hc-border-uiAccent/10 hc-rounded-sm">
+						<img
+							src={`https://maps.googleapis.com/maps/api/staticmap?scale=2&center=${item.mapDetails?.latitude},${item.mapDetails?.longitude}&zoom=10&size=240x180&maptype=roadmap&markers=color:0x${mapPinColor}%7Clabel:•%7C${item.mapDetails?.latitude},${item.mapDetails?.longitude}&key=${process.env.GOOGLE_MAPS_API_KEY}`}
+							alt={`Map of location for ${item.fields.position}`}
+							className="hc-w-full hc-h-full hc-object-cover"
+						/>
+					</div>
+				)}
+			</button>
+		);
+	}
+);
+
+ListItem.displayName = "ListItem";
+
+export default React.memo(ListItem, (prevProps, nextProps) => {
+	return (
+		prevProps.isActive === nextProps.isActive &&
+		prevProps.favorites === nextProps.favorites &&
+    prevProps.item.id === nextProps.item.id &&
+	prevProps.item.fields.travelTime === nextProps.item.fields.travelTime &&
+    prevProps.fieldsShown === nextProps.fieldsShown &&
+    prevProps.bodyClassName === nextProps.bodyClassName &&
+    prevProps.className === nextProps.className
+	);
+});

package/src/components/modules/maps/map.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import { GoogleMap, MarkerClustererF } from "@react-google-maps/api";
+import { GoogleMap } from "@react-google-maps/api";
 import ShowAllButton from "~/components/modules/buttons/show-all-button";
-import { clusterOptions } from "~/util/mapUtil";
 
 const Map = ({
 	zoom,
@@ -9,10 +8,6 @@ const Map = ({
 	mapContainerRef,
 	onLoad,
 	onIdle,
-	clusterGridSize,
-	markerConfigs,
-	mapMarkers,
-	placeMarkers,
 	mapInteracted,
 	pinIconUrl,
 	setMapInteracted,
@@ -20,7 +15,8 @@ const Map = ({
 	mapRef,
 	setQuery,
 	filteredListingsLength,
-	setSelectedFilters
+	setSelectedFilters,
+	children
 }) => {
 	return (
 		<>
@@ -45,19 +41,11 @@ const Map = ({
 							]
 						}}
 					>
-						<MarkerClustererF options={clusterOptions(clusterGridSize, markerConfigs.fillColor)}>
-							{clusterer => (
-								<>
-									{mapMarkers}
-									{placeMarkers}
-								</>
-							)}
-						</MarkerClustererF>
+						{children}
 					</GoogleMap>
-					{mapInteracted && markerConfigs && (
+					{mapInteracted && (
 						<ShowAllButton
 							mapInteracted={mapInteracted}
-							markerConfigs={markerConfigs}
 							setMapInteracted={setMapInteracted}
 							fitBounds={fitBounds}
 							mapRef={mapRef}

package/src/contexts/themeContext.js

@@ -0,0 +1,40 @@
+import React, { useEffect } from 'react';
+import { createContext, useContext } from 'react';
+
+const ThemeContext = createContext();
+
+export const ThemeProvider = ({
+	children,
+	uiText,
+	uiAccent,
+	primary,
+	primaryDark,
+	secondary,
+	secondaryDark
+}) => {
+	useEffect(() => {
+		document.documentElement.style.setProperty('--ui-text', uiText);
+		document.documentElement.style.setProperty('--ui-accent', uiAccent);
+		document.documentElement.style.setProperty('--primary', primary);
+		document.documentElement.style.setProperty('--primary-dark', primaryDark);
+		document.documentElement.style.setProperty('--secondary', secondary);
+		document.documentElement.style.setProperty('--secondary-dark', secondaryDark);
+	}, [uiText, uiAccent, primary, primaryDark, secondary, secondaryDark]);
+
+	return (
+		<ThemeContext.Provider
+			value={{
+				uiText,
+				uiAccent,
+				primary,
+				primaryDark,
+				secondary,
+				secondaryDark
+			}}
+		>
+			{children}
+		</ThemeContext.Provider>
+	);
+};
+
+export const useTheme = () => useContext(ThemeContext);

package/src/styles/index.css

@@ -1,24 +1,33 @@
-@config "../../tailwind.config.js";
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-	html {
-		@apply hc-text-400 hc-text-uiText [scroll-behavior:smooth];
-	}
-}
-
-@layer components {
-	.track * {
-		@apply hc-pointer-events-none;
-	}
-
-	.stretched-link::after {
-		@apply hc-content-[''] hc-absolute hc-inset-0 hc-z-[1] hc-pointer-events-auto hc-bg-transparent;
-	}
-}
-
-.fit-content{
-	height:fit-content;
-}
+@config "../../tailwind.config.js";
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+	html {
+		@apply hc-text-400 hc-text-uiText [scroll-behavior:smooth];
+	}
+}
+
+@layer components {
+	.track * {
+		@apply hc-pointer-events-none;
+	}
+
+	.stretched-link::after {
+		@apply hc-content-[''] hc-absolute hc-inset-0 hc-z-[1] hc-pointer-events-auto hc-bg-transparent;
+	}
+}
+
+.fit-content{
+	height:fit-content;
+}
+:root {
+    --ui-text: #000000;
+    --ui-accent: #008494;
+    --primary: #008494;
+    --primary-dark: #001f5f;
+    --secondary: #008494;
+    --secondary-dark: #005f73;
+}
+

package/src/util/urlFilterUtil.js

@@ -1,26 +1,27 @@
 export const updateURLWithFilters = (filters, location, query) => {
 	const searchParams = new URLSearchParams(location.search);
 
-	for (const key of searchParams.keys()) {
-	  if (key.includes('.') || key === 'query') {
-			searchParams.delete(key);
-	  }
+	const filteredSearchParams = new URLSearchParams();
+	for (const [key, value] of searchParams.entries()) {
+		if (!key.includes('.') && key !== 'query') {
+			filteredSearchParams.set(key, value);
+		}
 	}
 
 	if (query) {
-	  searchParams.set('query', query);
+		filteredSearchParams.set('query', query);
 	}
 
 	for (const category in filters) {
-	  for (const filter in filters[category]) {
+		for (const filter in filters[category]) {
 			const key = `${category}.${filter}`;
 			if (filters[category][filter]) {
-		  searchParams.set(key, 'true');
+				filteredSearchParams.set(key, 'true');
 			}
-	  }
+		}
 	}
 
-	const newUrl = `${location.pathname}?${searchParams.toString()}`;
+	const newUrl = `${location.pathname}?${filteredSearchParams.toString()}`;
 	window.history.replaceState({}, '', newUrl);
 };