Skip to content

Commit 6a9fdd1

Browse files
committed
feat: map, dependency updates & unit tests working
1 parent 79d23d1 commit 6a9fdd1

12 files changed

Lines changed: 37 additions & 38 deletions

File tree

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
},
9797
"dependencies": {},
9898
"resolutions": {
99-
"@types/react": "19.2.2",
100-
"@fortawesome/react-fontawesome": "3.1.0",
101-
"react-map-gl": "8.1.0"
99+
"@fortawesome/react-fontawesome": "3.1.0"
102100
}
103101
}

shared-helpers/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"prettier": "prettier --write \"**/*.ts\""
1818
},
1919
"dependencies": {
20-
"@bloom-housing/ui-components": "13.0.1",
21-
"@bloom-housing/ui-seeds": "bloom-housing/ui-seeds#fix-react-19-type-errors",
20+
"@bloom-housing/ui-components": "bloom-housing/ui-components#4328/remove-listing-map",
21+
"@bloom-housing/ui-seeds": "3.1.1",
2222
"@heroicons/react": "^2.1.1",
2323
"axios-cookiejar-support": "^5.0.5",
2424
"markdown-to-jsx": "^7.7.16",

shared-helpers/src/views/components/Map.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useState, useCallback, useEffect, useMemo } from "react"
22
import "mapbox-gl/dist/mapbox-gl.css"
3-
import MapGL from "react-map-gl/mapbox"
4-
import { Marker } from "react-map-gl/mapbox"
3+
import { Map as MapGL, Marker } from "@vis.gl/react-mapbox"
54

65
import styles from "./Map.module.scss"
76
import { MultiLineAddress } from "./MultiLineAddress"
@@ -71,16 +70,16 @@ const Map = (props: MapProps) => {
7170
const onMarkerDragEnd = useCallback((event: any) => {
7271
if (props.setLatLong) {
7372
props.setLatLong({
74-
latitude: event.lngLat[1],
75-
longitude: event.lngLat[0],
73+
latitude: event.lngLat.lat,
74+
longitude: event.lngLat.lng,
7675
})
7776
}
7877
if (props.setCustomMapPositionChosen) {
7978
props.setCustomMapPositionChosen(true)
8079
}
8180
setMarker({
82-
latitude: event.lngLat[1],
83-
longitude: event.lngLat[0],
81+
latitude: event.lngLat.lat,
82+
longitude: event.lngLat.lng,
8483
})
8584
}, [])
8685

sites/partners/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
},
3131
"dependencies": {
3232
"@bloom-housing/shared-helpers": "^7.7.1",
33-
"@bloom-housing/ui-components": "13.0.1",
34-
"@bloom-housing/ui-seeds": "bloom-housing/ui-seeds#fix-react-19-type-errors",
33+
"@bloom-housing/ui-components": "bloom-housing/ui-components#4328/remove-listing-map",
34+
"@bloom-housing/ui-seeds": "3.1.1",
3535
"@heroicons/react": "^2.2.0",
3636
"@mapbox/mapbox-sdk": "^0.13.0",
3737
"@tiptap/core": "^2.24.0",
@@ -56,6 +56,7 @@
5656
"react-dom": "19.2.0",
5757
"react-google-recaptcha-v3": "^1.10.1",
5858
"react-hook-form": "^6.15.5",
59+
"react-map-gl": "^8.1.0",
5960
"swr": "^2.1.2",
6061
"tailwindcss": "2.2.10"
6162
},

sites/partners/src/components/applications/PaperApplicationForm/MultiselectQuestionsMap.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useEffect, useState } from "react"
2-
import { FieldGroup, LatitudeLongitude, ListingMap, t } from "@bloom-housing/ui-components"
2+
import { FieldGroup, t } from "@bloom-housing/ui-components"
3+
import { Map, LatitudeLongitude } from "@bloom-housing/shared-helpers"
34
import { FieldValue, Grid } from "@bloom-housing/ui-seeds"
45
import { useFormContext, useWatch } from "react-hook-form"
56
import { GeocodeService as GeocodeServiceType } from "@mapbox/mapbox-sdk/services/geocoding"
@@ -132,7 +133,7 @@ const MultiselectQuestionsMap = ({ geocodingClient, dataKey }: MultiselectQuesti
132133
<Grid.Cell>
133134
<FieldValue label={t("listings.mapPreview")}>
134135
{displayMapPreview() ? (
135-
<ListingMap
136+
<Map
136137
address={{
137138
city: buildingAddress.city,
138139
state: buildingAddress.state,

sites/partners/src/components/listings/PaperListingForm/sections/BuildingDetails.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import {
55
Field,
66
Select,
77
FieldGroup,
8-
ListingMap,
9-
LatitudeLongitude,
108
GridCell,
119
} from "@bloom-housing/ui-components"
1210
import { FieldValue, Grid } from "@bloom-housing/ui-seeds"
13-
import { AuthContext, stateKeys } from "@bloom-housing/shared-helpers"
11+
import { AuthContext, stateKeys, Map, LatitudeLongitude } from "@bloom-housing/shared-helpers"
1412
import { FormListing } from "../../../../lib/listings/formTypes"
1513
import GeocodeService, {
1614
GeocodeService as GeocodeServiceType,
@@ -361,7 +359,7 @@ const BuildingDetails = ({
361359
<Grid.Cell className="seeds-grid-span-2">
362360
<FieldValue label={t("listings.mapPreview")} className={styles["custom-label"]}>
363361
{displayMapPreview() ? (
364-
<ListingMap
362+
<Map
365363
listingName={listing?.name}
366364
address={{
367365
city: buildingAddress.city,

sites/public/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
},
3131
"dependencies": {
3232
"@bloom-housing/shared-helpers": "^7.7.1",
33-
"@bloom-housing/ui-components": "13.0.1",
34-
"@bloom-housing/ui-seeds": "bloom-housing/ui-seeds#fix-react-19-type-errors",
33+
"@bloom-housing/ui-components": "bloom-housing/ui-components#4328/remove-listing-map",
34+
"@bloom-housing/ui-seeds": "3.1.1",
3535
"@heroicons/react": "^2.1.1",
3636
"@mapbox/mapbox-sdk": "^0.13.0",
3737
"@sentry/nextjs": "^7.61.0",
@@ -49,6 +49,7 @@
4949
"react-dom": "19.2.0",
5050
"react-google-recaptcha-v3": "^1.10.1",
5151
"react-hook-form": "^6.15.5",
52+
"react-map-gl": "^8.1.0",
5253
"tailwindcss": "2.2.10"
5354
},
5455
"devDependencies": {

sites/public/src/components/listing/listing_sections/Availability.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,12 @@ export const Availability = ({ listing, jurisdiction }: AvailabilityProps) => {
164164
</Heading>
165165
{!alwaysShowStatusBar && subtitle && <p className={styles["bold-subheader"]}>{subtitle}</p>}
166166
{statusMessage && (
167-
<p className={`${listingStyles["thin-heading-sm"]} seeds-m-bs-label`}>{statusMessage}</p>
167+
<p
168+
className={`${listingStyles["thin-heading-sm"]} seeds-m-bs-label`}
169+
suppressHydrationWarning
170+
>
171+
{statusMessage}
172+
</p>
168173
)}
169174
{content && <p className={"seeds-m-bs-label"}>{content}</p>}
170175
{subheading && subheading}

sites/public/src/components/listing/listing_sections/Features.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ export const Features = ({ children, features }: FeaturesProps) => {
2525
<HeadingGroup
2626
heading={feature.heading}
2727
subheading={feature.subheading}
28-
headingProps={{ size: "lg"}}
29-
headingPriority={3}
28+
headingProps={{ size: "lg", priority: 3 }}
3029
className={`${styles["heading-group"]} seeds-m-be-section`}
3130
key={index}
3231
/>

sites/public/src/components/listing/listing_sections/Neighborhood.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const Neighborhood = ({
7272
<HeadingGroup
7373
heading={t("t.region")}
7474
subheading={region}
75-
headingProps={{ priorty: 3, size: "lg" }}
75+
headingProps={{ priority: 3, size: "lg" }}
7676
className={`${styles["heading-group"]} seeds-m-bs-section`}
7777
/>
7878
)}

0 commit comments

Comments
 (0)