GoogleMapsOverlay: requestRedraw when removing interleaved overlay (#…

…7902)
visgl · May 22, 2023 · 9c85a9e · 9c85a9e
1 parent 0d71f75
commit 9c85a9e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/modules/google-maps/src/google-maps-overlay.ts b/modules/google-maps/src/google-maps-overlay.ts
@@ -48,13 +48,17 @@ export default class GoogleMapsOverlay {
     if (map === this._map) {
       return;
     }
+
+    const {VECTOR, UNINITIALIZED} = google.maps.RenderingType;
     if (this._map) {
+      if (!map && this._map.getRenderingType() === VECTOR && this.props.interleaved) {
+        (this._overlay as google.maps.WebGLOverlayView).requestRedraw();
+      }
       this._overlay?.setMap(null);
       this._map = null;
     }
     if (map) {
       this._map = map;
-      const {UNINITIALIZED} = google.maps.RenderingType;
       const renderingType = map.getRenderingType();
       if (renderingType !== UNINITIALIZED) {
         this._createOverlay(map);

diff --git a/test/modules/google-maps/google-maps-overlay.spec.js b/test/modules/google-maps/google-maps-overlay.spec.js
@@ -121,6 +121,15 @@ for (const interleaved of [true, false]) {
     t.ok(overlay._overlay.onContextRestored, 'onContextRestored lifecycle function is registered');
     t.ok(overlay._overlay.onDraw, 'onDraw lifecycle function is registered');
     t.ok(overlay._overlay.onRemove, 'onRemove lifecycle function is registered');
+
+    t.notOk(overlay._overlay._draws, 'Map not yet drawn');
+    overlay.setMap(null);
+    if (interleaved) {
+      t.ok(overlay._overlay._draws, 'Redraw requested when map removed');
+    } else {
+      t.notOk(overlay._overlay._draws, 'Redraw not requested when map removed');
+    }
+
     overlay.finalize();
 
     t.end();

diff --git a/test/modules/google-maps/mock-maps-api.js b/test/modules/google-maps/mock-maps-api.js
@@ -204,6 +204,7 @@ export class WebGLOverlayView {
   constructor() {
     this.map = null;
     this._container = document.createElement('div');
+    this._draws = 0;
   }
 
   setMap(map) {
@@ -217,4 +218,8 @@ export class WebGLOverlayView {
       getDiv: () => this._container
     };
   }
+
+  requestRedraw() {
+    this._draws++;
+  }
 }