fix: use DOMStylesReader as a class in MinimapElement

atom-minimap · Jan 1, 2021 · a1c99e5 · a1c99e5
1 parent 2641ae6
commit a1c99e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/lib/minimap-element.js b/lib/minimap-element.js
@@ -59,7 +59,7 @@ const SPEC_MODE = atom.inSpecMode()
  */
 class MinimapElement {
   static initClass () {
-    include(this, DOMStylesReader, CanvasDrawer, EventsDelegation, AncestorsMethods)
+    include(this, CanvasDrawer, EventsDelegation, AncestorsMethods)
     return element(this, 'atom-text-editor-minimap')
   }
 
@@ -181,6 +181,11 @@ class MinimapElement {
      */
     this.quickSettingsElement = undefined
 
+    /**
+     * This MinimapElement's DOMStylesReader
+     */
+    this.DOMStylesReader = new DOMStylesReader()
+
     // States
 
     /**
@@ -389,7 +394,7 @@ class MinimapElement {
         and the `change` event has not be triggered in the process.
       */
       atom.styles.onDidAddStyleElement(() => {
-        this.invalidateDOMStylesCache()
+        this.DOMStylesReader.invalidateDOMStylesCache()
         this.requestForcedUpdate()
       }),
 

diff --git a/spec/minimap-element-spec.js b/spec/minimap-element-spec.js
@@ -213,7 +213,7 @@ describe('MinimapElement', () => {
       describe('when a hue-rotate filter is applied to a rgb color', () => {
         let [additionnalStyleNode] = []
         beforeEach(() => {
-          minimapElement.invalidateDOMStylesCache()
+          minimapElement.DOMStylesReader.invalidateDOMStylesCache()
 
           additionnalStyleNode = document.createElement('style')
           additionnalStyleNode.textContent = `
@@ -241,7 +241,7 @@ describe('MinimapElement', () => {
         let [additionnalStyleNode] = []
 
         beforeEach(() => {
-          minimapElement.invalidateDOMStylesCache()
+          minimapElement.DOMStylesReader.invalidateDOMStylesCache()
 
           additionnalStyleNode = document.createElement('style')
           additionnalStyleNode.textContent = `
@@ -1195,7 +1195,7 @@ describe('MinimapElement', () => {
         runs(() => {
           nextAnimationFrame()
           spyOn(minimapElement, 'requestForcedUpdate').andCallThrough()
-          spyOn(minimapElement, 'invalidateDOMStylesCache').andCallThrough()
+          spyOn(minimapElement.DOMStylesReader, 'invalidateDOMStylesCache').andCallThrough()
 
           const styleNode = document.createElement('style')
           styleNode.textContent = 'body{ color: #233 }'
@@ -1209,7 +1209,7 @@ describe('MinimapElement', () => {
 
       it('forces a refresh with cache invalidation', () => {
         expect(minimapElement.requestForcedUpdate).toHaveBeenCalled()
-        expect(minimapElement.invalidateDOMStylesCache).toHaveBeenCalled()
+        expect(minimapElement.DOMStylesReader.invalidateDOMStylesCache).toHaveBeenCalled()
       })
     })