feat: empty color cache if the theme changes

atom-minimap · Jan 11, 2021 · 5b12790 · 5b12790
1 parent a605d57
commit 5b12790
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -371,6 +371,11 @@ function initSubscriptions () {
       emitter.emit('did-create-minimap', minimap)
       minimapElement.attach()
     }),
+    // empty color cache if the theme changes
+    atom.themes.onDidChangeActiveThemes(() => {
+      DOMStylesReaderInstance.invalidateDOMStylesCache()
+      editorsMinimaps.forEach((minimap) => { atom.views.getView(minimap).requestForcedUpdate() })
+    }),
     treeSitterWarning()
   )
 }

diff --git a/lib/minimap-element.js b/lib/minimap-element.js
@@ -377,18 +377,6 @@ class MinimapElement {
     }
 
     this.subscriptions.add(
-
-      /*
-        We use `atom.styles.onDidAddStyleElement` instead of
-        `atom.themes.onDidChangeActiveThemes`.
-        Why? Currently, The style element will be removed first, and then re-added
-        and the `change` event has not be triggered in the process.
-      */
-      atom.styles.onDidAddStyleElement(() => {
-        this.DOMStylesReader.invalidateDOMStylesCache()
-        this.requestForcedUpdate()
-      }),
-
       this.subscribeToMediaQuery()
     )
   }

diff --git a/spec/minimap-element-spec.js b/spec/minimap-element-spec.js
@@ -1198,9 +1198,7 @@ describe('MinimapElement', () => {
           spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
           spyOn(minimapElement.DOMStylesReader, 'invalidateDOMStylesCache').andCallThrough()
 
-          const styleNode = document.createElement('style')
-          styleNode.textContent = 'body{ color: #233 }'
-          atom.styles.emitter.emit('did-add-style-element', styleNode)
+          atom.themes.emitter.emit('did-change-active-themes')
         })
 
         waitsFor('minimap frame requested', () => {