🐛 Add guard against duplicated minimap

Fixes #504
atom-minimap · Jul 5, 2016 · d782ed6 · d782ed6
1 parent 7d1fdbd
commit d782ed6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/minimap-element.js b/lib/minimap-element.js
@@ -379,7 +379,13 @@ export default class MinimapElement {
    */
   attach (parent) {
     if (this.attached) { return }
-    (parent || this.getTextEditorElementRoot()).appendChild(this)
+
+    const container = parent || this.getTextEditorElementRoot()
+    let minimaps = container.querySelectorAll('atom-text-editor-minimap')
+    if (minimaps.length) {
+      Array.prototype.forEach.call(minimaps, (el) => { el.destroy() })
+    }
+    container.appendChild(this)
   }
 
   /**

diff --git a/spec/minimap-main-spec.js b/spec/minimap-main-spec.js
@@ -63,6 +63,19 @@ describe('Minimap package', () => {
       it('removes the minimap from their editor parent', () => {
         expect(editorElement.shadowRoot.querySelector('atom-text-editor-minimap')).not.toExist()
       })
+
+      fdescribe('and reactivated with a remaining minimap in the DOM', () => {
+        beforeEach(() => {
+          const m = new Minimap({textEditor: editor})
+          const v = atom.views.getView(m)
+          editorElement.shadowRoot.appendChild(v)
+          waitsForPromise(() => atom.packages.activatePackage('minimap'))
+        })
+
+        it('removes the remaining minimap', () => {
+          expect(editorElement.shadowRoot.querySelectorAll('atom-text-editor-minimap').length).toEqual(1)
+        })
+      })
     })
   })