@abcagency/hc-ui-components 1.3.4 → 1.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -51,12 +51,12 @@ var Map = function Map(_ref) {
|
|
|
51
51
|
}
|
|
52
52
|
};
|
|
53
53
|
useEffect(function () {
|
|
54
|
-
|
|
54
|
+
var current = mapContainerRef.current;
|
|
55
|
+
if (current) {
|
|
55
56
|
var handleScroll = function handleScroll() {
|
|
56
57
|
setMapInteracted(true);
|
|
57
58
|
};
|
|
58
|
-
|
|
59
|
-
mapContainerRef.current.addEventListener('wheel', handleScroll);
|
|
59
|
+
current.addEventListener('wheel', handleScroll);
|
|
60
60
|
return function () {
|
|
61
61
|
return mapContainerRefCurrent.removeEventListener('wheel', handleScroll);
|
|
62
62
|
};
|
|
@@ -64,12 +64,12 @@ var Map = function Map(_ref) {
|
|
|
64
64
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
65
65
|
}, [mapContainerRef.current]);
|
|
66
66
|
useEffect(function () {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
var dragStartListener =
|
|
67
|
+
var current = mapContainerRef.current;
|
|
68
|
+
if (current) {
|
|
69
|
+
var dragStartListener = current.addListener('dragstart', function () {
|
|
70
70
|
return setMapInteracted(true);
|
|
71
71
|
});
|
|
72
|
-
var mouseDownListener =
|
|
72
|
+
var mouseDownListener = current.addListener('mousedown', function () {
|
|
73
73
|
return setMapInteracted(true);
|
|
74
74
|
});
|
|
75
75
|
return function () {
|
|
@@ -78,35 +78,39 @@ var Map = function Map(_ref) {
|
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
81
|
-
}, [
|
|
81
|
+
}, [mapContainerRef.current]);
|
|
82
82
|
useEffect(function () {
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
var current = mapRef.current;
|
|
84
|
+
if ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && current) {
|
|
85
|
+
fitBounds(current);
|
|
85
86
|
}
|
|
86
87
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
87
88
|
}, [mapItems, mapRef.current, location]);
|
|
88
89
|
useEffect(function () {
|
|
89
|
-
|
|
90
|
-
|
|
90
|
+
var current = mapRef.current;
|
|
91
|
+
if (mapItems && mapItems.length > 0 || poiMarkers.length > 0 && current && mapInteracted) {
|
|
92
|
+
fitBounds(current, true);
|
|
91
93
|
}
|
|
92
|
-
if (
|
|
93
|
-
var currZoom =
|
|
94
|
+
if (current) {
|
|
95
|
+
var currZoom = current.zoom;
|
|
94
96
|
var setZoomVal = currZoom < 13 ? currZoom : 12;
|
|
95
|
-
|
|
97
|
+
current.setZoom(setZoomVal);
|
|
96
98
|
}
|
|
97
99
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
98
100
|
}, [filteredListings]);
|
|
99
101
|
useEffect(function () {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
102
|
+
var current = mapRef.current;
|
|
103
|
+
if (!current || !location || mapInteracted) return;
|
|
104
|
+
current.panTo(new google.maps.LatLng(location.latitude, location.longitude));
|
|
105
|
+
if (current) {
|
|
103
106
|
var setZoomVal = zoom < 13 ? zoom : 12;
|
|
104
|
-
|
|
107
|
+
current.setZoom(setZoomVal);
|
|
105
108
|
}
|
|
106
109
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
107
110
|
}, [location, zoom, mapRef.current]);
|
|
108
111
|
var fitBounds = function fitBounds(map) {
|
|
109
112
|
var overload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
113
|
+
var current = mapRef.current;
|
|
110
114
|
if ((mapInteracted === false || overload) && mapItems != null) {
|
|
111
115
|
var bounds = new window.google.maps.LatLngBounds();
|
|
112
116
|
mapItems.forEach(function (item) {
|
|
@@ -115,8 +119,8 @@ var Map = function Map(_ref) {
|
|
|
115
119
|
if (!map) return;
|
|
116
120
|
map.fitBounds(bounds);
|
|
117
121
|
}
|
|
118
|
-
if (
|
|
119
|
-
|
|
122
|
+
if (current.zoom > 17) {
|
|
123
|
+
current.setZoom(16);
|
|
120
124
|
}
|
|
121
125
|
};
|
|
122
126
|
var markerClickHandler = function markerClickHandler(mapLocation) {
|
|
@@ -124,15 +128,16 @@ var Map = function Map(_ref) {
|
|
|
124
128
|
selectLocationEntity(mapLocation);
|
|
125
129
|
};
|
|
126
130
|
var onLoad = function onLoad(map) {
|
|
131
|
+
var current = mapRef.current;
|
|
127
132
|
if (!location || location === null) {
|
|
128
|
-
|
|
133
|
+
current = map;
|
|
129
134
|
fitBounds(map, true);
|
|
130
135
|
return;
|
|
131
136
|
}
|
|
132
|
-
|
|
137
|
+
current = map;
|
|
133
138
|
if (mapInteracted === false) {
|
|
134
|
-
|
|
135
|
-
|
|
139
|
+
current.panTo(new google.maps.LatLng(location.latitude, location.longitude));
|
|
140
|
+
current.setZoom(zoom);
|
|
136
141
|
}
|
|
137
142
|
};
|
|
138
143
|
var pinIconUrl = pinIcon({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","sources":["../../../../src/components/modules/maps/map.js"],"sourcesContent":["/* eslint-disable no-undef */\nimport React, { useEffect, useRef } from 'react';\nimport { GoogleMap, MarkerClustererF } from \"@react-google-maps/api\";\n\nimport MapMarker from \"~/components/modules/maps/map-marker\";\nimport PlaceMarker from \"~/components/modules/maps/place-marker\";\nimport ShowAllButton from \"~/components/modules/buttons/show-all-button\";\n\nimport { usePlaces } from \"~/contexts/placesContext\";\nimport { useMap } from \"~/contexts/mapContext\";\nimport { useMapList } from \"~/contexts/mapListContext\";\n\nimport { markerIconSelected, markerIcon, pinIcon } from \"~/util/mapIconUtil\";\nimport { clusterOptions } from \"~/util/mapUtil\";\n\nconst Map = ({\n\tmarkerConfigs,\n\tinfoWindowClasses,\n\tclusterGridSize = 60\n}) => {\n\tconst {\n\t\tlocation,\n\t\tzoom,\n\t\tcenter,\n\t\tselectLocationEntity,\n\t\tsetLocation,\n\t\tmapInteracted,\n\t\tsetMapInteracted\n\t} = useMap();\n\n\tconst {\n\t\tmapItems, filteredListings, setSelectedFilters,\n\t\tsetQuery\n\t} = useMapList();\n\n\tconst mapRef = useRef();\n\tconst markerRefs = useRef({});\n\tconst mapContainerRef = useRef(null);\n\tconst {\n\t\tpoiMarkers,\n\t\tsetCurrentCenter,\n\t\tcurrentCenter,\n\t\tsetCurrentZoom,\n\t\tcurrentZoom,\n\t\tselectedPlaceMarker,\n\t\tsetSelectedPlaceMarker,\n\t\tplacesWindow,\n\t\tsetPlacesWindow } = usePlaces();\n\n\tconst onIdle = () => {\n\t\tif (!currentCenter || !mapRef.current) return;\n\t\tconst newCenter = mapRef.current.getCenter().toJSON();\n\t\tconst newZoom = mapRef.current.zoom;\n\n\t\tsetCurrentCenter(newCenter);\n\n\t\tif (newZoom != currentZoom) {\n\t\t\tsetCurrentZoom(newZoom);\n\t\t}\n\t};\n\n\tuseEffect(() => {\n\t\tif (mapContainerRef.current) {\n\t\t\tconst handleScroll = () => {\n\t\t\t\tsetMapInteracted(true);\n\t\t\t};\n\t\t\tvar mapContainerRefCurrent = mapContainerRef.current;\n\t\t\tmapContainerRef.current.addEventListener('wheel', handleScroll);\n\t\t\treturn () => mapContainerRefCurrent.removeEventListener('wheel', handleScroll);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapContainerRef.current]);\n\n\tuseEffect(() => {\n\t\tif (mapRef.current) {\n\t\t\tconst mapInstance = mapRef.current;\n\t\t\tconst dragStartListener = mapInstance.addListener('dragstart', () => setMapInteracted(true));\n\t\t\tconst mouseDownListener = mapInstance.addListener('mousedown', () => setMapInteracted(true));\n\t\t\treturn () => {\n\t\t\t\tgoogle.maps.event.removeListener(dragStartListener);\n\t\t\t\tgoogle.maps.event.removeListener(mouseDownListener);\n\t\t\t};\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapRef.current, mapContainerRef.current]);\n\n\tuseEffect(() => {\n\t\tif ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && mapRef.current) {\n\t\t\tfitBounds(mapRef.current);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapItems, mapRef.current, location]);\n\n\tuseEffect(() => {\n\t\tif (mapItems && mapItems.length > 0 || poiMarkers.length > 0 && mapRef.current && mapInteracted) {\n\t\t\tfitBounds(mapRef.current, true);\n\t\t}\n\t\tif (mapRef.current) {\n\t\t\tlet currZoom = mapRef.current.zoom;\n\t\t\tlet setZoomVal = currZoom < 13 ? currZoom : 12;\n\t\t\tmapRef.current.setZoom(setZoomVal);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [filteredListings]);\n\n\tuseEffect(() => {\n\t\tif (!mapRef.current || !location || mapInteracted) return;\n\t\tmapRef.current.panTo(\n\t\t\tnew google.maps.LatLng(location.latitude, location.longitude)\n\t\t);\n\t\tif (mapRef.current) {\n\t\t\tlet setZoomVal = zoom < 13 ? zoom : 12;\n\t\t\tmapRef.current.setZoom(setZoomVal);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [location, zoom, mapRef.current]);\n\n\tconst fitBounds = (map, overload = false) => {\n\t\tif ((mapInteracted === false || overload) && mapItems != null) {\n\t\t\tconst bounds = new window.google.maps.LatLngBounds();\n\t\t\tmapItems.forEach(item => {\n\t\t\t\tbounds.extend(new google.maps.LatLng(item.latitude, item.longitude));\n\t\t\t});\n\t\t\tif (!map) return;\n\t\t\tmap.fitBounds(bounds);\n\t\t}\n\t\tif (mapRef.current.zoom > 17) {\n\t\t\tmapRef.current.setZoom(16);\n\t\t}\n\t};\n\n\tconst markerClickHandler = mapLocation => {\n\t\tsetMapInteracted(true);\n\t\tselectLocationEntity(mapLocation);\n\t};\n\n\tconst onLoad = map => {\n\t\tif (!location || location === null) {\n\t\t\tmapRef.current = map;\n\t\t\tfitBounds(map, true);\n\t\t\treturn;\n\t\t}\n\t\tmapRef.current = map;\n\n\t\tif (mapInteracted === false) {\n\t\t\tmapRef.current.panTo(\n\t\t\t\tnew google.maps.LatLng(location.latitude, location.longitude)\n\t\t\t);\n\n\t\t\tmapRef.current.setZoom(zoom);\n\t\t}\n\t};\n\n\tconst pinIconUrl = pinIcon({\n\t\tfillColor: markerConfigs.fillColor,\n\t\tstrokeColor: markerConfigs.strokeColor\n\t});\n\n\treturn (\n\t\t<>{zoom && center && <div ref={mapContainerRef} className=\"hc-h-full hc-relative\">\n\t\t\t<GoogleMap\n\t\t\t\tzoom={zoom}\n\t\t\t\tonLoad={onLoad}\n\t\t\t\tonIdle={onIdle}\n\t\t\t\tcenter={center}\n\t\t\t\tmapContainerStyle={{\n\t\t\t\t\twidth: \"100%\",\n\t\t\t\t\theight: \"100%\"\n\t\t\t\t}}\n\t\t\t\toptions={{\n\t\t\t\t\tstyles: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tfeatureType: \"poi\",\n\t\t\t\t\t\t\telementType: \"labels\",\n\t\t\t\t\t\t\tstylers: [{ visibility: \"off\" }]\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}}\n\t\t\t>\n\t\t\t\t<MarkerClustererF options={clusterOptions(clusterGridSize, markerConfigs.fillColor)}>\n\t\t\t\t\t{clusterer => (\n\t\t\t\t\t\t<>\n\t\t\t\t\t\t\t{mapItems.map(item => (\n\t\t\t\t\t\t\t\t<MapMarker\n\t\t\t\t\t\t\t\t\tkey={item.id}\n\t\t\t\t\t\t\t\t\titem={item}\n\t\t\t\t\t\t\t\t\tselectedLocation={location}\n\t\t\t\t\t\t\t\t\tmarkerRefs={markerRefs}\n\t\t\t\t\t\t\t\t\tinfoWindowClasses={infoWindowClasses}\n\t\t\t\t\t\t\t\t\tsetSelectedLocation={setLocation}\n\t\t\t\t\t\t\t\t\tmarkerClickHandler={markerClickHandler}\n\t\t\t\t\t\t\t\t\tclusterer={clusterer}\n\t\t\t\t\t\t\t\t\tmarkerIcon={markerIcon(markerConfigs)}\n\t\t\t\t\t\t\t\t\tmarkerIconSelected={markerIconSelected(markerConfigs)}\n\t\t\t\t\t\t\t\t\tsetMapInteracted={setMapInteracted}\n\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t))}\n\t\t\t\t\t\t\t{poiMarkers && poiMarkers.markers.map((marker, index) => {\n\t\t\t\t\t\t\t\treturn (\n\t\t\t\t\t\t\t\t\t<PlaceMarker\n\t\t\t\t\t\t\t\t\t\tkey={`marker-${marker.title}-${index}`}\n\t\t\t\t\t\t\t\t\t\tmarker={marker}\n\t\t\t\t\t\t\t\t\t\tindex={index}\n\t\t\t\t\t\t\t\t\t\tselectedPlaceMarker={selectedPlaceMarker}\n\t\t\t\t\t\t\t\t\t\tplacesWindow={placesWindow}\n\t\t\t\t\t\t\t\t\t\tsetPlacesWindow={setPlacesWindow}\n\t\t\t\t\t\t\t\t\t\tsetSelectedPlaceMarker={setSelectedPlaceMarker}\n\t\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t})}\n\t\t\t\t\t\t</>\n\t\t\t\t\t)}\n\t\t\t\t</MarkerClustererF>\n\t\t\t</GoogleMap>\n\t\t\t{mapInteracted && markerConfigs && (\n\t\t\t\t<ShowAllButton\n\t\t\t\t\tmapInteracted={mapInteracted}\n\t\t\t\t\tmarkerConfigs={markerConfigs}\n\t\t\t\t\tsetMapInteracted={setMapInteracted}\n\t\t\t\t\tfitBounds={fitBounds}\n\t\t\t\t\tmapRef={mapRef}\n\t\t\t\t\tpinIconUrl={pinIconUrl}\n\t\t\t\t\tsetQuery={setQuery}\n\t\t\t\t\tlistingCount={filteredListings.length}\n\t\t\t\t\tsetSelectedFilters={setSelectedFilters}\n\t\t\t\t/>\n\t\t\t)}\n\t\t</div>\n\t\t}\n\t\t</>\n\t);\n};\n\nexport default Map;\n"],"names":["Map","_ref","markerConfigs","infoWindowClasses","_ref$clusterGridSize","clusterGridSize","_useMap","useMap","location","zoom","center","selectLocationEntity","setLocation","mapInteracted","setMapInteracted","_useMapList","useMapList","mapItems","filteredListings","setSelectedFilters","setQuery","mapRef","useRef","markerRefs","mapContainerRef","_usePlaces","usePlaces","poiMarkers","setCurrentCenter","currentCenter","setCurrentZoom","currentZoom","selectedPlaceMarker","setSelectedPlaceMarker","placesWindow","setPlacesWindow","onIdle","current","newCenter","getCenter","toJSON","newZoom","useEffect","handleScroll","mapContainerRefCurrent","addEventListener","removeEventListener","mapInstance","dragStartListener","addListener","mouseDownListener","google","maps","event","removeListener","length","fitBounds","currZoom","setZoomVal","setZoom","panTo","LatLng","latitude","longitude","map","overload","arguments","undefined","bounds","window","LatLngBounds","forEach","item","extend","markerClickHandler","mapLocation","onLoad","pinIconUrl","pinIcon","fillColor","strokeColor","React","createElement","Fragment","ref","className","GoogleMap","mapContainerStyle","width","height","options","styles","featureType","elementType","stylers","visibility","MarkerClustererF","clusterOptions","clusterer","MapMarker","key","id","selectedLocation","setSelectedLocation","markerIcon","markerIconSelected","markers","marker","index","PlaceMarker","concat","title","ShowAllButton","listingCount"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"map.js","sources":["../../../../src/components/modules/maps/map.js"],"sourcesContent":["/* eslint-disable no-undef */\nimport React, { useEffect, useRef } from 'react';\nimport { GoogleMap, MarkerClustererF } from \"@react-google-maps/api\";\n\nimport MapMarker from \"~/components/modules/maps/map-marker\";\nimport PlaceMarker from \"~/components/modules/maps/place-marker\";\nimport ShowAllButton from \"~/components/modules/buttons/show-all-button\";\n\nimport { usePlaces } from \"~/contexts/placesContext\";\nimport { useMap } from \"~/contexts/mapContext\";\nimport { useMapList } from \"~/contexts/mapListContext\";\n\nimport { markerIconSelected, markerIcon, pinIcon } from \"~/util/mapIconUtil\";\nimport { clusterOptions } from \"~/util/mapUtil\";\n\nconst Map = ({\n\tmarkerConfigs,\n\tinfoWindowClasses,\n\tclusterGridSize = 60\n}) => {\n\tconst {\n\t\tlocation,\n\t\tzoom,\n\t\tcenter,\n\t\tselectLocationEntity,\n\t\tsetLocation,\n\t\tmapInteracted,\n\t\tsetMapInteracted\n\t} = useMap();\n\n\tconst {\n\t\tmapItems, filteredListings, setSelectedFilters,\n\t\tsetQuery\n\t} = useMapList();\n\n\tconst mapRef = useRef();\n\tconst markerRefs = useRef({});\n\tconst mapContainerRef = useRef(null);\n\tconst {\n\t\tpoiMarkers,\n\t\tsetCurrentCenter,\n\t\tcurrentCenter,\n\t\tsetCurrentZoom,\n\t\tcurrentZoom,\n\t\tselectedPlaceMarker,\n\t\tsetSelectedPlaceMarker,\n\t\tplacesWindow,\n\t\tsetPlacesWindow } = usePlaces();\n\n\tconst onIdle = () => {\n\t\tif (!currentCenter || !mapRef.current) return;\n\t\tconst newCenter = mapRef.current.getCenter().toJSON();\n\t\tconst newZoom = mapRef.current.zoom;\n\n\t\tsetCurrentCenter(newCenter);\n\n\t\tif (newZoom != currentZoom) {\n\t\t\tsetCurrentZoom(newZoom);\n\t\t}\n\t};\n\n\tuseEffect(() => {\n\t\tconst { current } = mapContainerRef;\n\t\tif (current) {\n\t\t\tconst handleScroll = () => {\n\t\t\t\tsetMapInteracted(true);\n\t\t\t};\n\t\t\tcurrent.addEventListener('wheel', handleScroll);\n\t\t\treturn () => mapContainerRefCurrent.removeEventListener('wheel', handleScroll);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapContainerRef.current]);\n\n\tuseEffect(() => {\n\t\tconst { current } = mapContainerRef;\n\t\tif (current) {\n\t\t\tconst dragStartListener = current.addListener('dragstart', () => setMapInteracted(true));\n\t\t\tconst mouseDownListener = current.addListener('mousedown', () => setMapInteracted(true));\n\t\t\treturn () => {\n\t\t\t\tgoogle.maps.event.removeListener(dragStartListener);\n\t\t\t\tgoogle.maps.event.removeListener(mouseDownListener);\n\t\t\t};\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapContainerRef.current]);\n\n\tuseEffect(() => {\n\t\tconst { current } = mapRef;\n\t\tif ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && current) {\n\t\t\tfitBounds(current);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [mapItems, mapRef.current, location]);\n\n\tuseEffect(() => {\n\t\tconst { current } = mapRef;\n\t\tif (mapItems && mapItems.length > 0 || poiMarkers.length > 0 && current && mapInteracted) {\n\t\t\tfitBounds(current, true);\n\t\t}\n\t\tif (current) {\n\t\t\tlet currZoom = current.zoom;\n\t\t\tlet setZoomVal = currZoom < 13 ? currZoom : 12;\n\t\t\tcurrent.setZoom(setZoomVal);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [filteredListings]);\n\n\tuseEffect(() => {\n\t\tconst { current } = mapRef;\n\t\tif (!current || !location || mapInteracted) return;\n\t\tcurrent.panTo(\n\t\t\tnew google.maps.LatLng(location.latitude, location.longitude)\n\t\t);\n\t\tif (current) {\n\t\t\tlet setZoomVal = zoom < 13 ? zoom : 12;\n\t\t\tcurrent.setZoom(setZoomVal);\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [location, zoom, mapRef.current]);\n\n\tconst fitBounds = (map, overload = false) => {\n\t\tconst { current } = mapRef;\n\t\tif ((mapInteracted === false || overload) && mapItems != null) {\n\t\t\tconst bounds = new window.google.maps.LatLngBounds();\n\t\t\tmapItems.forEach(item => {\n\t\t\t\tbounds.extend(new google.maps.LatLng(item.latitude, item.longitude));\n\t\t\t});\n\t\t\tif (!map) return;\n\t\t\tmap.fitBounds(bounds);\n\t\t}\n\t\tif (current.zoom > 17) {\n\t\t\tcurrent.setZoom(16);\n\t\t}\n\t};\n\n\tconst markerClickHandler = mapLocation => {\n\t\tsetMapInteracted(true);\n\t\tselectLocationEntity(mapLocation);\n\t};\n\n\tconst onLoad = map => {\n\t\tlet { current } = mapRef;\n\t\tif (!location || location === null) {\n\t\t\tcurrent = map;\n\t\t\tfitBounds(map, true);\n\t\t\treturn;\n\t\t}\n\t\tcurrent = map;\n\n\t\tif (mapInteracted === false) {\n\t\t\tcurrent.panTo(\n\t\t\t\tnew google.maps.LatLng(location.latitude, location.longitude)\n\t\t\t);\n\n\t\t\tcurrent.setZoom(zoom);\n\t\t}\n\t};\n\n\tconst pinIconUrl = pinIcon({\n\t\tfillColor: markerConfigs.fillColor,\n\t\tstrokeColor: markerConfigs.strokeColor\n\t});\n\n\treturn (\n\t\t<>\n\t\t\t{zoom && center && <div ref={mapContainerRef} className=\"hc-h-full hc-relative\">\n\t\t\t\t<GoogleMap\n\t\t\t\t\tzoom={zoom}\n\t\t\t\t\tonLoad={onLoad}\n\t\t\t\t\tonIdle={onIdle}\n\t\t\t\t\tcenter={center}\n\t\t\t\t\tmapContainerStyle={{\n\t\t\t\t\t\twidth: \"100%\",\n\t\t\t\t\t\theight: \"100%\"\n\t\t\t\t\t}}\n\t\t\t\t\toptions={{\n\t\t\t\t\t\tstyles: [\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tfeatureType: \"poi\",\n\t\t\t\t\t\t\t\telementType: \"labels\",\n\t\t\t\t\t\t\t\tstylers: [{ visibility: \"off\" }]\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t]\n\t\t\t\t\t}}\n\t\t\t\t>\n\t\t\t\t\t<MarkerClustererF options={clusterOptions(clusterGridSize, markerConfigs.fillColor)}>\n\t\t\t\t\t\t{clusterer => (\n\t\t\t\t\t\t\t<>\n\t\t\t\t\t\t\t\t{mapItems.map(item => (\n\t\t\t\t\t\t\t\t\t<MapMarker\n\t\t\t\t\t\t\t\t\t\tkey={item.id}\n\t\t\t\t\t\t\t\t\t\titem={item}\n\t\t\t\t\t\t\t\t\t\tselectedLocation={location}\n\t\t\t\t\t\t\t\t\t\tmarkerRefs={markerRefs}\n\t\t\t\t\t\t\t\t\t\tinfoWindowClasses={infoWindowClasses}\n\t\t\t\t\t\t\t\t\t\tsetSelectedLocation={setLocation}\n\t\t\t\t\t\t\t\t\t\tmarkerClickHandler={markerClickHandler}\n\t\t\t\t\t\t\t\t\t\tclusterer={clusterer}\n\t\t\t\t\t\t\t\t\t\tmarkerIcon={markerIcon(markerConfigs)}\n\t\t\t\t\t\t\t\t\t\tmarkerIconSelected={markerIconSelected(markerConfigs)}\n\t\t\t\t\t\t\t\t\t\tsetMapInteracted={setMapInteracted}\n\t\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t\t))}\n\t\t\t\t\t\t\t\t{poiMarkers && poiMarkers.markers.map((marker, index) => {\n\t\t\t\t\t\t\t\t\treturn (\n\t\t\t\t\t\t\t\t\t\t<PlaceMarker\n\t\t\t\t\t\t\t\t\t\t\tkey={`marker-${marker.title}-${index}`}\n\t\t\t\t\t\t\t\t\t\t\tmarker={marker}\n\t\t\t\t\t\t\t\t\t\t\tindex={index}\n\t\t\t\t\t\t\t\t\t\t\tselectedPlaceMarker={selectedPlaceMarker}\n\t\t\t\t\t\t\t\t\t\t\tplacesWindow={placesWindow}\n\t\t\t\t\t\t\t\t\t\t\tsetPlacesWindow={setPlacesWindow}\n\t\t\t\t\t\t\t\t\t\t\tsetSelectedPlaceMarker={setSelectedPlaceMarker}\n\t\t\t\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t\t})}\n\t\t\t\t\t\t\t</>\n\t\t\t\t\t\t)}\n\t\t\t\t\t</MarkerClustererF>\n\t\t\t\t</GoogleMap>\n\t\t\t\t{mapInteracted && markerConfigs && (\n\t\t\t\t\t<ShowAllButton\n\t\t\t\t\t\tmapInteracted={mapInteracted}\n\t\t\t\t\t\tmarkerConfigs={markerConfigs}\n\t\t\t\t\t\tsetMapInteracted={setMapInteracted}\n\t\t\t\t\t\tfitBounds={fitBounds}\n\t\t\t\t\t\tmapRef={mapRef}\n\t\t\t\t\t\tpinIconUrl={pinIconUrl}\n\t\t\t\t\t\tsetQuery={setQuery}\n\t\t\t\t\t\tlistingCount={filteredListings.length}\n\t\t\t\t\t\tsetSelectedFilters={setSelectedFilters}\n\t\t\t\t\t/>\n\t\t\t\t)}\n\t\t\t</div>\n\t\t\t}\n\t\t</>\n\t);\n};\n\nexport default Map;\n"],"names":["Map","_ref","markerConfigs","infoWindowClasses","_ref$clusterGridSize","clusterGridSize","_useMap","useMap","location","zoom","center","selectLocationEntity","setLocation","mapInteracted","setMapInteracted","_useMapList","useMapList","mapItems","filteredListings","setSelectedFilters","setQuery","mapRef","useRef","markerRefs","mapContainerRef","_usePlaces","usePlaces","poiMarkers","setCurrentCenter","currentCenter","setCurrentZoom","currentZoom","selectedPlaceMarker","setSelectedPlaceMarker","placesWindow","setPlacesWindow","onIdle","current","newCenter","getCenter","toJSON","newZoom","useEffect","handleScroll","addEventListener","mapContainerRefCurrent","removeEventListener","dragStartListener","addListener","mouseDownListener","google","maps","event","removeListener","length","fitBounds","currZoom","setZoomVal","setZoom","panTo","LatLng","latitude","longitude","map","overload","arguments","undefined","bounds","window","LatLngBounds","forEach","item","extend","markerClickHandler","mapLocation","onLoad","pinIconUrl","pinIcon","fillColor","strokeColor","React","createElement","Fragment","ref","className","GoogleMap","mapContainerStyle","width","height","options","styles","featureType","elementType","stylers","visibility","MarkerClustererF","clusterOptions","clusterer","MapMarker","key","id","selectedLocation","setSelectedLocation","markerIcon","markerIconSelected","markers","marker","index","PlaceMarker","concat","title","ShowAllButton","listingCount"],"mappings":"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"}
|
package/dist/hooks/useList.js
CHANGED
|
@@ -47,19 +47,19 @@ var useListLogic = function useListLogic() {
|
|
|
47
47
|
rootMargin: "100px 0px",
|
|
48
48
|
threshold: 0.5
|
|
49
49
|
});
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
var current = loader.current;
|
|
51
|
+
if (current) {
|
|
52
|
+
observer.current.observe(current);
|
|
52
53
|
}
|
|
53
54
|
return function () {
|
|
54
|
-
if (observer.current &&
|
|
55
|
-
observer.current.unobserve(
|
|
55
|
+
if (observer.current && current) {
|
|
56
|
+
observer.current.unobserve(current);
|
|
56
57
|
}
|
|
57
58
|
};
|
|
59
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
58
60
|
}, [filteredListings.length, itemLimit]);
|
|
59
61
|
useEffect(function () {
|
|
60
62
|
localStorage.setItem('scrollPosition', scrollPosition.toString());
|
|
61
|
-
}, [scrollPosition]);
|
|
62
|
-
useEffect(function () {
|
|
63
63
|
var savedScrollPosition = scrollPosition;
|
|
64
64
|
if (parseInt(savedScrollPosition) > 3000) {
|
|
65
65
|
setItemLimit(savedScrollPosition / 10);
|
|
@@ -69,15 +69,15 @@ var useListLogic = function useListLogic() {
|
|
|
69
69
|
scrollContainerRef.current.scrollTop = parseInt(savedScrollPosition, 10);
|
|
70
70
|
}, 300);
|
|
71
71
|
}
|
|
72
|
-
}, []);
|
|
72
|
+
}, [scrollPosition]);
|
|
73
73
|
useEffect(function () {
|
|
74
|
-
var
|
|
75
|
-
if (
|
|
76
|
-
|
|
74
|
+
var current = scrollContainerRef.current;
|
|
75
|
+
if (current) {
|
|
76
|
+
current.addEventListener('scroll', handleScroll);
|
|
77
77
|
}
|
|
78
78
|
return function () {
|
|
79
|
-
if (
|
|
80
|
-
|
|
79
|
+
if (current) {
|
|
80
|
+
current.removeEventListener('scroll', handleScroll);
|
|
81
81
|
}
|
|
82
82
|
};
|
|
83
83
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useList.js","sources":["../../src/hooks/useList.js"],"sourcesContent":["import { useEffect, useState, useRef } from 'react';\n\nimport { getStorageObject } from '~/util/localStorageUtil';\nimport { dynamicSort } from '~/util/sortUtil';\n\nimport { useMapList } from '~/contexts/mapListContext';\n\nconst getDefaultItemId = () => {\n\tlet item = getStorageObject(\"selectedListItem\");\n\tif (item?.expanded == true) {\n\t\treturn item.id;\n\t} else {\n\t\treturn null;\n\t}\n};\n\nconst useListLogic = () => {\n\tconst [itemLimit, setItemLimit] = useState(100);\n\tconst [expandedId] = useState(getDefaultItemId());\n\tconst [sortSetting, setSortSetting] = useState(getStorageObject('sortSetting', null));\n\tconst [scrollPosition, setScrollPosition] = useState(getStorageObject('scrollPosition', 0));\n\tconst loader = useRef(null);\n\tconst scrollContainerRef = useRef(null);\n\tconst itemRefs = useRef({});\n\tconst observer = useRef(null);\n\tconst { filteredListings, setFilteredListings } = useMapList();\n\n\tuseEffect(() => {\n\t\tif (!sortSetting) return;\n\t\tlocalStorage.setItem('sortSetting', JSON.stringify(sortSetting));\n\t\tlet listingFiltered = dynamicSort(filteredListings, sortSetting.field, sortSetting.type);\n\t\tsetFilteredListings(listingFiltered);\n\t}, [sortSetting, filteredListings, setFilteredListings]);\n\n\tuseEffect(() => {\n\t\tobserver.current = new IntersectionObserver(handleObserver, {\n\t\t\troot: scrollContainerRef.current,\n\t\t\trootMargin: \"100px 0px\",\n\t\t\tthreshold: 0.5\n\t\t});\n\t\tif (
|
|
1
|
+
{"version":3,"file":"useList.js","sources":["../../src/hooks/useList.js"],"sourcesContent":["import { useEffect, useState, useRef } from 'react';\n\nimport { getStorageObject } from '~/util/localStorageUtil';\nimport { dynamicSort } from '~/util/sortUtil';\n\nimport { useMapList } from '~/contexts/mapListContext';\n\nconst getDefaultItemId = () => {\n\tlet item = getStorageObject(\"selectedListItem\");\n\tif (item?.expanded == true) {\n\t\treturn item.id;\n\t} else {\n\t\treturn null;\n\t}\n};\n\nconst useListLogic = () => {\n\tconst [itemLimit, setItemLimit] = useState(100);\n\tconst [expandedId] = useState(getDefaultItemId());\n\tconst [sortSetting, setSortSetting] = useState(getStorageObject('sortSetting', null));\n\tconst [scrollPosition, setScrollPosition] = useState(getStorageObject('scrollPosition', 0));\n\tconst loader = useRef(null);\n\tconst scrollContainerRef = useRef(null);\n\tconst itemRefs = useRef({});\n\tconst observer = useRef(null);\n\tconst { filteredListings, setFilteredListings } = useMapList();\n\n\tuseEffect(() => {\n\t\tif (!sortSetting) return;\n\t\tlocalStorage.setItem('sortSetting', JSON.stringify(sortSetting));\n\t\tlet listingFiltered = dynamicSort(filteredListings, sortSetting.field, sortSetting.type);\n\t\tsetFilteredListings(listingFiltered);\n\t}, [sortSetting, filteredListings, setFilteredListings]);\n\n\tuseEffect(() => {\n\t\tobserver.current = new IntersectionObserver(handleObserver, {\n\t\t\troot: scrollContainerRef.current,\n\t\t\trootMargin: \"100px 0px\",\n\t\t\tthreshold: 0.5\n\t\t});\n\t\tconst { current } = loader;\n\t\tif (current) {\n\t\t\tobserver.current.observe(current);\n\t\t}\n\t\treturn () => {\n\t\t\tif (observer.current && current) {\n\t\t\t\tobserver.current.unobserve(current);\n\t\t\t}\n\t\t};\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [filteredListings.length, itemLimit]);\n\n\tuseEffect(() => {\n\t\tlocalStorage.setItem('scrollPosition', scrollPosition.toString());\n\t\tconst savedScrollPosition = scrollPosition;\n\t\tif (parseInt(savedScrollPosition) > 3000) {\n\t\t\tsetItemLimit(savedScrollPosition / 10);\n\t\t}\n\t\tif (savedScrollPosition && scrollContainerRef.current) {\n\t\t\tsetTimeout(() => {\n\t\t\t\tscrollContainerRef.current.scrollTop = parseInt(savedScrollPosition, 10);\n\t\t\t}, 300);\n\t\t}\n\t}, [scrollPosition]);\n\n\tuseEffect(() => {\n\t\tconst { current } = scrollContainerRef;\n\t\tif (current) {\n\t\t\tcurrent.addEventListener('scroll', handleScroll);\n\t\t}\n\t\treturn () => {\n\t\t\tif (current) {\n\t\t\t\tcurrent.removeEventListener('scroll', handleScroll);\n\t\t\t}\n\t\t};\n\t}, []);\n\n\tconst handleObserver = entities => {\n\t\tconst target = entities[0];\n\t\tif (!target.isIntersecting) return;\n\t\tif (filteredListings.length > itemLimit) {\n\t\t\tsetItemLimit(prevLimit => prevLimit + 100);\n\t\t} else if (observer.current) {\n\t\t\tobserver.current.disconnect();\n\t\t}\n\t};\n\n\tconst handleScroll = () => {\n\t\tif (scrollContainerRef.current) {\n\t\t\tsetScrollPosition(scrollContainerRef.current.scrollTop);\n\t\t}\n\t};\n\n\treturn { itemLimit, expandedId, sortSetting, scrollPosition, loader, scrollContainerRef, itemRefs, setSortSetting, setScrollPosition, dynamicSort, filteredListings };\n};\n\nexport default useListLogic;\n"],"names":["getDefaultItemId","item","getStorageObject","expanded","id","useListLogic","_useState","useState","_useState2","_slicedToArray","itemLimit","setItemLimit","_useState3","_useState4","expandedId","_useState5","_useState6","sortSetting","setSortSetting","_useState7","_useState8","scrollPosition","setScrollPosition","loader","useRef","scrollContainerRef","itemRefs","observer","_useMapList","useMapList","filteredListings","setFilteredListings","useEffect","localStorage","setItem","JSON","stringify","listingFiltered","dynamicSort","field","type","current","IntersectionObserver","handleObserver","root","rootMargin","threshold","observe","unobserve","length","toString","savedScrollPosition","parseInt","setTimeout","scrollTop","addEventListener","handleScroll","removeEventListener","entities","target","isIntersecting","prevLimit","disconnect"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -60,62 +60,66 @@ const Map = ({
|
|
|
60
60
|
};
|
|
61
61
|
|
|
62
62
|
useEffect(() => {
|
|
63
|
-
|
|
63
|
+
const { current } = mapContainerRef;
|
|
64
|
+
if (current) {
|
|
64
65
|
const handleScroll = () => {
|
|
65
66
|
setMapInteracted(true);
|
|
66
67
|
};
|
|
67
|
-
|
|
68
|
-
mapContainerRef.current.addEventListener('wheel', handleScroll);
|
|
68
|
+
current.addEventListener('wheel', handleScroll);
|
|
69
69
|
return () => mapContainerRefCurrent.removeEventListener('wheel', handleScroll);
|
|
70
70
|
}
|
|
71
71
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
72
72
|
}, [mapContainerRef.current]);
|
|
73
73
|
|
|
74
74
|
useEffect(() => {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const dragStartListener =
|
|
78
|
-
const mouseDownListener =
|
|
75
|
+
const { current } = mapContainerRef;
|
|
76
|
+
if (current) {
|
|
77
|
+
const dragStartListener = current.addListener('dragstart', () => setMapInteracted(true));
|
|
78
|
+
const mouseDownListener = current.addListener('mousedown', () => setMapInteracted(true));
|
|
79
79
|
return () => {
|
|
80
80
|
google.maps.event.removeListener(dragStartListener);
|
|
81
81
|
google.maps.event.removeListener(mouseDownListener);
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
84
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
85
|
-
}, [
|
|
85
|
+
}, [mapContainerRef.current]);
|
|
86
86
|
|
|
87
87
|
useEffect(() => {
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
const { current } = mapRef;
|
|
89
|
+
if ((mapItems && mapItems.length > 0 || poiMarkers.length > 0) && current) {
|
|
90
|
+
fitBounds(current);
|
|
90
91
|
}
|
|
91
92
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
92
93
|
}, [mapItems, mapRef.current, location]);
|
|
93
94
|
|
|
94
95
|
useEffect(() => {
|
|
95
|
-
|
|
96
|
-
|
|
96
|
+
const { current } = mapRef;
|
|
97
|
+
if (mapItems && mapItems.length > 0 || poiMarkers.length > 0 && current && mapInteracted) {
|
|
98
|
+
fitBounds(current, true);
|
|
97
99
|
}
|
|
98
|
-
if (
|
|
99
|
-
let currZoom =
|
|
100
|
+
if (current) {
|
|
101
|
+
let currZoom = current.zoom;
|
|
100
102
|
let setZoomVal = currZoom < 13 ? currZoom : 12;
|
|
101
|
-
|
|
103
|
+
current.setZoom(setZoomVal);
|
|
102
104
|
}
|
|
103
105
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
104
106
|
}, [filteredListings]);
|
|
105
107
|
|
|
106
108
|
useEffect(() => {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
+
const { current } = mapRef;
|
|
110
|
+
if (!current || !location || mapInteracted) return;
|
|
111
|
+
current.panTo(
|
|
109
112
|
new google.maps.LatLng(location.latitude, location.longitude)
|
|
110
113
|
);
|
|
111
|
-
if (
|
|
114
|
+
if (current) {
|
|
112
115
|
let setZoomVal = zoom < 13 ? zoom : 12;
|
|
113
|
-
|
|
116
|
+
current.setZoom(setZoomVal);
|
|
114
117
|
}
|
|
115
118
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
116
119
|
}, [location, zoom, mapRef.current]);
|
|
117
120
|
|
|
118
121
|
const fitBounds = (map, overload = false) => {
|
|
122
|
+
const { current } = mapRef;
|
|
119
123
|
if ((mapInteracted === false || overload) && mapItems != null) {
|
|
120
124
|
const bounds = new window.google.maps.LatLngBounds();
|
|
121
125
|
mapItems.forEach(item => {
|
|
@@ -124,8 +128,8 @@ const Map = ({
|
|
|
124
128
|
if (!map) return;
|
|
125
129
|
map.fitBounds(bounds);
|
|
126
130
|
}
|
|
127
|
-
if (
|
|
128
|
-
|
|
131
|
+
if (current.zoom > 17) {
|
|
132
|
+
current.setZoom(16);
|
|
129
133
|
}
|
|
130
134
|
};
|
|
131
135
|
|
|
@@ -135,19 +139,20 @@ const Map = ({
|
|
|
135
139
|
};
|
|
136
140
|
|
|
137
141
|
const onLoad = map => {
|
|
142
|
+
let { current } = mapRef;
|
|
138
143
|
if (!location || location === null) {
|
|
139
|
-
|
|
144
|
+
current = map;
|
|
140
145
|
fitBounds(map, true);
|
|
141
146
|
return;
|
|
142
147
|
}
|
|
143
|
-
|
|
148
|
+
current = map;
|
|
144
149
|
|
|
145
150
|
if (mapInteracted === false) {
|
|
146
|
-
|
|
151
|
+
current.panTo(
|
|
147
152
|
new google.maps.LatLng(location.latitude, location.longitude)
|
|
148
153
|
);
|
|
149
154
|
|
|
150
|
-
|
|
155
|
+
current.setZoom(zoom);
|
|
151
156
|
}
|
|
152
157
|
};
|
|
153
158
|
|
|
@@ -157,76 +162,77 @@ const Map = ({
|
|
|
157
162
|
});
|
|
158
163
|
|
|
159
164
|
return (
|
|
160
|
-
<>
|
|
161
|
-
<
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
{
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
))}
|
|
198
|
-
{poiMarkers && poiMarkers.markers.map((marker, index) => {
|
|
199
|
-
return (
|
|
200
|
-
<PlaceMarker
|
|
201
|
-
key={`marker-${marker.title}-${index}`}
|
|
202
|
-
marker={marker}
|
|
203
|
-
index={index}
|
|
204
|
-
selectedPlaceMarker={selectedPlaceMarker}
|
|
205
|
-
placesWindow={placesWindow}
|
|
206
|
-
setPlacesWindow={setPlacesWindow}
|
|
207
|
-
setSelectedPlaceMarker={setSelectedPlaceMarker}
|
|
165
|
+
<>
|
|
166
|
+
{zoom && center && <div ref={mapContainerRef} className="hc-h-full hc-relative">
|
|
167
|
+
<GoogleMap
|
|
168
|
+
zoom={zoom}
|
|
169
|
+
onLoad={onLoad}
|
|
170
|
+
onIdle={onIdle}
|
|
171
|
+
center={center}
|
|
172
|
+
mapContainerStyle={{
|
|
173
|
+
width: "100%",
|
|
174
|
+
height: "100%"
|
|
175
|
+
}}
|
|
176
|
+
options={{
|
|
177
|
+
styles: [
|
|
178
|
+
{
|
|
179
|
+
featureType: "poi",
|
|
180
|
+
elementType: "labels",
|
|
181
|
+
stylers: [{ visibility: "off" }]
|
|
182
|
+
}
|
|
183
|
+
]
|
|
184
|
+
}}
|
|
185
|
+
>
|
|
186
|
+
<MarkerClustererF options={clusterOptions(clusterGridSize, markerConfigs.fillColor)}>
|
|
187
|
+
{clusterer => (
|
|
188
|
+
<>
|
|
189
|
+
{mapItems.map(item => (
|
|
190
|
+
<MapMarker
|
|
191
|
+
key={item.id}
|
|
192
|
+
item={item}
|
|
193
|
+
selectedLocation={location}
|
|
194
|
+
markerRefs={markerRefs}
|
|
195
|
+
infoWindowClasses={infoWindowClasses}
|
|
196
|
+
setSelectedLocation={setLocation}
|
|
197
|
+
markerClickHandler={markerClickHandler}
|
|
198
|
+
clusterer={clusterer}
|
|
199
|
+
markerIcon={markerIcon(markerConfigs)}
|
|
200
|
+
markerIconSelected={markerIconSelected(markerConfigs)}
|
|
201
|
+
setMapInteracted={setMapInteracted}
|
|
208
202
|
/>
|
|
209
|
-
)
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
203
|
+
))}
|
|
204
|
+
{poiMarkers && poiMarkers.markers.map((marker, index) => {
|
|
205
|
+
return (
|
|
206
|
+
<PlaceMarker
|
|
207
|
+
key={`marker-${marker.title}-${index}`}
|
|
208
|
+
marker={marker}
|
|
209
|
+
index={index}
|
|
210
|
+
selectedPlaceMarker={selectedPlaceMarker}
|
|
211
|
+
placesWindow={placesWindow}
|
|
212
|
+
setPlacesWindow={setPlacesWindow}
|
|
213
|
+
setSelectedPlaceMarker={setSelectedPlaceMarker}
|
|
214
|
+
/>
|
|
215
|
+
);
|
|
216
|
+
})}
|
|
217
|
+
</>
|
|
218
|
+
)}
|
|
219
|
+
</MarkerClustererF>
|
|
220
|
+
</GoogleMap>
|
|
221
|
+
{mapInteracted && markerConfigs && (
|
|
222
|
+
<ShowAllButton
|
|
223
|
+
mapInteracted={mapInteracted}
|
|
224
|
+
markerConfigs={markerConfigs}
|
|
225
|
+
setMapInteracted={setMapInteracted}
|
|
226
|
+
fitBounds={fitBounds}
|
|
227
|
+
mapRef={mapRef}
|
|
228
|
+
pinIconUrl={pinIconUrl}
|
|
229
|
+
setQuery={setQuery}
|
|
230
|
+
listingCount={filteredListings.length}
|
|
231
|
+
setSelectedFilters={setSelectedFilters}
|
|
232
|
+
/>
|
|
233
|
+
)}
|
|
234
|
+
</div>
|
|
235
|
+
}
|
|
230
236
|
</>
|
|
231
237
|
);
|
|
232
238
|
};
|
package/src/hooks/useList.js
CHANGED
|
@@ -38,21 +38,20 @@ const useListLogic = () => {
|
|
|
38
38
|
rootMargin: "100px 0px",
|
|
39
39
|
threshold: 0.5
|
|
40
40
|
});
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const { current } = loader;
|
|
42
|
+
if (current) {
|
|
43
|
+
observer.current.observe(current);
|
|
43
44
|
}
|
|
44
45
|
return () => {
|
|
45
|
-
if (observer.current &&
|
|
46
|
-
observer.current.unobserve(
|
|
46
|
+
if (observer.current && current) {
|
|
47
|
+
observer.current.unobserve(current);
|
|
47
48
|
}
|
|
48
49
|
};
|
|
50
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
49
51
|
}, [filteredListings.length, itemLimit]);
|
|
50
52
|
|
|
51
53
|
useEffect(() => {
|
|
52
54
|
localStorage.setItem('scrollPosition', scrollPosition.toString());
|
|
53
|
-
}, [scrollPosition]);
|
|
54
|
-
|
|
55
|
-
useEffect(() => {
|
|
56
55
|
const savedScrollPosition = scrollPosition;
|
|
57
56
|
if (parseInt(savedScrollPosition) > 3000) {
|
|
58
57
|
setItemLimit(savedScrollPosition / 10);
|
|
@@ -62,16 +61,16 @@ const useListLogic = () => {
|
|
|
62
61
|
scrollContainerRef.current.scrollTop = parseInt(savedScrollPosition, 10);
|
|
63
62
|
}, 300);
|
|
64
63
|
}
|
|
65
|
-
}, []);
|
|
64
|
+
}, [scrollPosition]);
|
|
66
65
|
|
|
67
66
|
useEffect(() => {
|
|
68
|
-
const
|
|
69
|
-
if (
|
|
70
|
-
|
|
67
|
+
const { current } = scrollContainerRef;
|
|
68
|
+
if (current) {
|
|
69
|
+
current.addEventListener('scroll', handleScroll);
|
|
71
70
|
}
|
|
72
71
|
return () => {
|
|
73
|
-
if (
|
|
74
|
-
|
|
72
|
+
if (current) {
|
|
73
|
+
current.removeEventListener('scroll', handleScroll);
|
|
75
74
|
}
|
|
76
75
|
};
|
|
77
76
|
}, []);
|