add/remove style elements on global toggle (#990)

content/style-injector.js

@@ -19,52 +19,47 @@ self.createStyleInjector = self.INJECTED === 1 ? self.createStyleInjector : ({
   let isTransitionPatched;
   // will store the original method refs because the page can override them
   let creationDoc, createElement, createElementNS;
-  return {
-    apply,
-    clear,
-    clearOrphans,
-    remove,
-    replace,
-    toggle,
-    list,
-  };
 
-  function apply(styleMap) {
+  return {
+
+    list,
+
+    apply(styleMap) {
       const styles = _styleMapToArray(styleMap);
-    return !styles.length ?
+      return (
+        !styles.length ?
           Promise.resolve([]) :
           docRootObserver.evade(() => {
-        if (!isTransitionPatched) _applyTransitionPatch(styles);
+            if (!isTransitionPatched && isEnabled) {
-        const els = styles.map(_apply);
+              _applyTransitionPatch(styles);
-        _emitUpdate();
-        return els;
-      });
             }
+            return styles.map(_addUpdate);
+          })
+      ).then(_emitUpdate);
+    },
 
-  function clear() {
+    clear() {
-    for (const style of list) {
+      _addRemoveElements(false);
-      style.el.remove();
-    }
       list.length = 0;
       table.clear();
       _emitUpdate();
-  }
+    },
 
-  function clearOrphans() {
+    clearOrphans() {
       for (const el of document.querySelectorAll(`style[id^="${PREFIX}"].stylus`)) {
         const id = el.id.slice(PREFIX.length);
         if (/^\d+$/.test(id) || id === PATCH_ID) {
           el.remove();
         }
       }
-  }
+    },
 
-  function remove(id) {
+    remove(id) {
       _remove(id);
       _emitUpdate();
-  }
+    },
 
-  function replace(styleMap) {
+    replace(styleMap) {
       const styles = _styleMapToArray(styleMap);
       const added = new Set(styles.map(s => s.id));
       const removed = [];
@@ -73,36 +68,42 @@ self.createStyleInjector = self.INJECTED === 1 ? self.createStyleInjector : ({
           removed.push(style.id);
         }
       }
-    styles.forEach(_apply);
+      styles.forEach(_addUpdate);
       removed.forEach(_remove);
       _emitUpdate();
-  }
+    },
 
-  function toggle(_enabled) {
+    toggle(enable) {
-    if (isEnabled === _enabled) return;
+      if (isEnabled === enable) return;
-    isEnabled = _enabled;
+      isEnabled = enable;
-    for (const style of list) {
+      if (!enable) _toggleObservers(false);
-      style.el.disabled = !isEnabled;
+      _addRemoveElements(enable);
-    }
+      if (enable) _toggleObservers(true);
-  }
+    },
+  };
 
   function _add(style) {
     const el = style.el = _createStyle(style.id, style.code);
+    const i = list.findIndex(item => compare(item, style) > 0);
     table.set(style.id, style);
-    const nextIndex = list.findIndex(i => compare(i, style) > 0);
+    list.splice(i < 0 ? list.length : i, 0, style);
-    if (nextIndex < 0) {
+    if (isEnabled) {
-      document.documentElement.appendChild(el);
+      document.documentElement.insertBefore(el, i < 0 ? null : list[i].el);
-      list.push(style);
-    } else {
-      document.documentElement.insertBefore(el, list[nextIndex].el);
-      list.splice(nextIndex, 0, style);
     }
-    // moving an element resets its 'disabled' state
-    el.disabled = !isEnabled;
     return el;
   }
 
-  function _apply(style) {
+  function _addRemoveElements(add) {
+    for (const {el} of list) {
+      if (add) {
+        document.documentElement.appendChild(el);
+      } else {
+        el.remove();
+      }
+    }
+  }
+
+  function _addUpdate(style) {
     return table.has(style.id) ? _update(style) : _add(style);
   }
 
@@ -151,15 +152,16 @@ self.createStyleInjector = self.INJECTED === 1 ? self.createStyleInjector : ({
     return el;
   }
 
-  function _emitUpdate() {
+  function _toggleObservers(shouldStart) {
-    if (!IS_OWN_PAGE && list.length) {
+    const onOff = shouldStart && isEnabled ? 'start' : 'stop';
-      docRewriteObserver.start();
+    docRewriteObserver[onOff]();
-      docRootObserver.start();
+    docRootObserver[onOff]();
-    } else {
-      docRewriteObserver.stop();
-      docRootObserver.stop();
   }
+
+  function _emitUpdate(value) {
+    _toggleObservers(!IS_OWN_PAGE && list.length);
     onUpdate();
+    return value;
   }
 
   /*
@@ -193,11 +195,7 @@ self.createStyleInjector = self.INJECTED === 1 ? self.createStyleInjector : ({
   function _sort() {
     docRootObserver.evade(() => {
       list.sort(compare);
-      for (const style of list) {
+      _addRemoveElements(true);
-        // moving an element resets its 'disabled' state
-        document.documentElement.appendChild(style.el);
-        style.el.disabled = !isEnabled;
-      }
     });
   }
 
@@ -241,13 +239,13 @@ self.createStyleInjector = self.INJECTED === 1 ? self.createStyleInjector : ({
     if (isChromePre65) {
       const oldEl = style.el;
       style.el = _createStyle(id, code);
+      if (isEnabled) {
         oldEl.parentNode.insertBefore(style.el, oldEl.nextSibling);
         oldEl.remove();
+      }
     } else {
       style.el.textContent = code;
     }
-    // https://github.com/openstyles/stylus/issues/693
-    style.el.disabled = !isEnabled;
   }
 
   function RewriteObserver(onChange) {