fix task map property list on task markers (#2236)

* fix task map property list on task markers
maproulette · Jan 17, 2024 · dc935a3 · dc935a3
1 parent e70d74b
commit dc935a3
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/components/EnhancedMap/TaskFeatureLayer/TaskFeatureLayer.js b/src/components/EnhancedMap/TaskFeatureLayer/TaskFeatureLayer.js
@@ -13,6 +13,7 @@ import PropertyList from '../PropertyList/PropertyList'
 import resolveConfig from 'tailwindcss/resolveConfig'
 import tailwindConfig from '../../../tailwind.config.js'
 import layerMessages from '../LayerToggle/Messages'
+import { IntlProvider } from 'react-intl'
 
 const colors = resolveConfig(tailwindConfig).theme.colors
 const HIGHLIGHT_SIMPLESTYLE = {
@@ -33,7 +34,13 @@ const TaskFeatureLayer = props => {
   const propertyList = (featureProperties, onBack) => {
     const contentElement = document.createElement('div')
     ReactDOM.render(
-      <PropertyList featureProperties={featureProperties} onBack={onBack} />,
+      <IntlProvider key={props.intl.locale} 
+                    locale={props.intl.locale} 
+                    messages={props.intl.messages}
+                    textComponent="span" 
+      >
+        <PropertyList featureProperties={featureProperties} onBack={onBack} />
+      </IntlProvider>,
       contentElement
     )
     return contentElement
@@ -73,8 +80,10 @@ const TaskFeatureLayer = props => {
                 Object.assign(styleableFeature.markerSimplestyles(layer), HIGHLIGHT_SIMPLESTYLE)
               )
               popup.on('remove', function() {
-                // Restore original styling when popup closes
-                styleableFeature.popLeafletLayerSimpleStyles(layer)
+                if (layer && layer._leaflet_events) {
+                  // Restore original styling when popup closes
+                  styleableFeature.popLeafletLayerSimpleStyles(layer)
+                }
               })
               popup.openOn(map)
             })