[v7] Fix popup className update in mapbox v1/maplibre (#1694)

visgl · Jan 27, 2022 · 24d7e21 · 24d7e21
1 parent 1952518
commit 24d7e21
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/src/components/popup.ts b/src/components/popup.ts
@@ -62,6 +62,11 @@ export type PopupProps = {
   children?: React.ReactNode;
 };
 
+// Adapted from https://github.com/mapbox/mapbox-gl-js/blob/v1.13.0/src/ui/popup.js
+function getClassList(className: string) {
+  return new Set(className ? className.trim().split(/\s+/) : []);
+}
+
 function Popup(props: PopupProps) {
   const map = useContext(MapContext);
   const container = useMemo(() => {
@@ -102,15 +107,24 @@ function Popup(props: PopupProps) {
       popup.options.anchor = props.anchor;
       popup.setMaxWidth(props.maxWidth);
     }
-    // Adapted from https://github.com/mapbox/mapbox-gl-js/blob/main/src/ui/popup.js
     // @ts-ignore
     if (popup.options.className !== props.className) {
       // @ts-ignore
-      popup.options.className = props.className;
-      // @ts-ignore
-      popup._classList = new Set(props.className ? props.className.trim().split(/\s+/) : []);
+      const prevClassList = getClassList(popup.options.className);
+      const nextClassList = getClassList(props.className);
+
+      for (const c of prevClassList) {
+        if (!nextClassList.has(c)) {
+          popup.removeClassName(c);
+        }
+      }
+      for (const c of nextClassList) {
+        if (!prevClassList.has(c)) {
+          popup.addClassName(c);
+        }
+      }
       // @ts-ignore
-      popup._updateClassList();
+      popup.options.className = props.className;
     }
   }
 

diff --git a/test/src/components/popup.spec.js b/test/src/components/popup.spec.js
@@ -57,6 +57,18 @@ test('Popup', t => {
   t.not(anchor, popup.options.anchor, 'anchor is updated');
   t.not(maxWidth, popup.options.maxWidth, 'maxWidth is updated');
 
+  act(() => {
+    map.update(
+      <Map ref={mapRef}>
+        <Popup longitude={-122} latitude={38} className="classA">
+          You are here
+        </Popup>
+      </Map>
+    );
+  });
+
+  t.is(popup.options.className, 'classA', 'className is updated');
+
   restoreMock();
 
   t.end();

diff --git a/test/src/utils/mapbox-gl-mock/popup.js b/test/src/utils/mapbox-gl-mock/popup.js
@@ -56,4 +56,11 @@ export default class Popup extends Evented {
     this.options.offset = value;
     return this;
   }
+
+  addClassName(className) {
+    this._classList.add(className);
+  }
+  removeClassName(className) {
+    this._classList.remove(className);
+  }
 }
diff --git a/tsconfig.es5.json b/tsconfig.es5.json
@@ -4,6 +4,7 @@
     "jsx": "react",
     "moduleResolution": "node",
     "module": "commonjs",
+    "downlevelIteration": true,
     "declaration": true,
     "sourceMap": true,
     "outDir": "./dist/es5"