fix: invalidate styles cache on styles update

atom-minimap · Feb 18, 2021 · 12b1b07 · 12b1b07
1 parent c0778a6
commit 12b1b07
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 10 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -407,16 +407,21 @@ function initSubscriptions() {
       minimapElement.attach(textEditor.getElement())
     }),
     // empty color cache if the theme changes
-    atom.themes.onDidChangeActiveThemes(() => {
-      domStylesReader.invalidateDOMStylesCache()
-      editorsMinimaps.forEach((minimap) => {
-        atom.views.getView(minimap).requestForcedUpdate()
-      })
-    }),
+    atom.themes.onDidChangeActiveThemes(updateStyles),
+    atom.styles.onDidUpdateStyleElement(updateStyles),
+    atom.styles.onDidAddStyleElement(updateStyles),
+    atom.styles.onDidRemoveStyleElement(updateStyles),
     treeSitterWarning()
   )
 }
 
+function updateStyles() {
+  domStylesReader.invalidateDOMStylesCache()
+  editorsMinimaps.forEach((minimap) => {
+    atom.views.getView(minimap).requestForcedUpdate()
+  })
+}
+
 // The public exports included in the service:
 const MinimapServiceV1 = {
   minimapViewProvider,

diff --git a/spec/minimap-element-spec.js b/spec/minimap-element-spec.js
@@ -1380,26 +1380,75 @@ describe("MinimapElement", () => {
     //     ######   #######  ##    ## ##       ####  ######
 
     describe("when the atom styles are changed", () => {
+      let styleElement;
       beforeEach(() => {
+        styleElement = document.createElement("style");
+        atom.styles.addStyleElement(styleElement);
+
         waitsFor("a new animation frame request", () => {
           return nextAnimationFrame !== noAnimationFrame
         })
+
         runs(() => {
           nextAnimationFrame()
           spyOn(minimapElement, "requestForcedUpdate").andCallThrough()
           spyOn(minimapElement.DOMStylesReader, "invalidateDOMStylesCache").andCallThrough()
+        })
+      })
+
+      it("forces a refresh with theme change", () => {
+
+        atom.themes.emitter.emit("did-change-active-themes")
+
+        waitsFor("minimap frame requested", () => {
+          return minimapElement.frameRequested
+        })
 
-          atom.themes.emitter.emit("did-change-active-themes")
+        runs(() => {
+          expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+          expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
         })
+      })
+
+      it("forces a refresh with style update", () => {
+        atom.styles.emitter.emit("did-update-style-element", styleElement)
 
         waitsFor("minimap frame requested", () => {
           return minimapElement.frameRequested
         })
+
+        runs(() => {
+          expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+          expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
+        })
       })
 
-      it("forces a refresh with cache invalidation", () => {
-        expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
-        expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
+      it("forces a refresh with style add", () => {
+
+        atom.styles.emitter.emit("did-add-style-element", styleElement)
+
+        waitsFor("minimap frame requested", () => {
+          return minimapElement.frameRequested
+        })
+
+        runs(() => {
+          expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+          expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
+        })
+      })
+
+      it("forces a refresh with style remove", () => {
+
+        atom.styles.emitter.emit("did-remove-style-element", styleElement)
+
+        waitsFor("minimap frame requested", () => {
+          return minimapElement.frameRequested
+        })
+
+        runs(() => {
+          expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
+          expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
+        })
       })
     })