Skip to content

fix: attach popups to map #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chia-Chi-Shen merged 2 commits into from
Apr 10, 2025
Merged

fix: attach popups to map #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a90d382
fix: add popups once map is ready
Apr 2, 2025
8c5ee69
fix: create popups test
Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/components/AzureMapPopup/useCreateAzureMapPopup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
import { ReactNode } from 'react'
import { renderHook } from '@testing-library/react'
import { Map } from 'azure-maps-control'
import React from 'react'
import { AzureMapsContext } from '../../contexts/AzureMapContext'
import { useCreatePopup } from './useCreateAzureMapPopup'
import { MapType } from '../../types'

const mapContextProps = {
mapRef: null,
isMapReady: false,
setMapReady: jest.fn(),
removeMapRef: jest.fn(),
setMapRef: jest.fn()
}
const mapRef = new Map('fake', {})
const mapRef = {
events: {
addOnce: jest.fn()
},
popups: {
add: jest.fn()
}
}

const wrapWithAzureMapContext = ({ children }: { children?: ReactNode | null }) => {
return (
<AzureMapsContext.Provider
value={{
...mapContextProps,
mapRef
mapRef: mapRef as unknown as MapType,
}}
>
{children}
Expand Down
7 changes: 6 additions & 1 deletion src/components/AzureMapPopup/useCreateAzureMapPopup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { useState, useEffect, useContext } from 'react'
import { renderToStaticMarkup } from 'react-dom/server'
import atlas from 'azure-maps-control'

import { IAzureMapPopup, IAzureMapsContextProps } from '../../types'
import { IAzureMapPopup, IAzureMapsContextProps, MapType } from '../../types'
import { AzureMapsContext } from '../../contexts/AzureMapContext'
import { useCheckRef } from '../../hooks/useCheckRef'
export const useCreatePopup = ({
options,
popupContent,
Expand All @@ -14,6 +15,10 @@ export const useCreatePopup = ({
)
const { mapRef } = useContext<IAzureMapsContextProps>(AzureMapsContext)

useCheckRef<MapType, MapType>(mapRef, mapRef, mref => {
mref.events.addOnce('ready', () => mref.popups.add(popupRef))
})

useEffect(() => {
popupRef.setOptions({
...options,
Expand Down