perfectionist-plugins 2.4.6 → 2.4.7

package/auto-accept.js

@@ -33,8 +33,8 @@ let attempts = 0;
 let unsubscribes = [];
 let removeStyle = null;
 let domObserver = null;
-let domTimer = null;
-
+let domTimer = null;
+
 function enabled() {
   try {
     return api?.getOption?.(PLUGIN_ID, ACCEPT_KEY, true) === true;
@@ -99,8 +99,8 @@ async function acceptNow() {
   } finally {
     sending = false;
   }
-}
-
+}
+
 function onPhase(raw) {
   const phase = unwrap(raw);
   if (typeof phase !== "string") return;
@@ -148,8 +148,8 @@ function toggle() {
   syncButton();
   if (next) acceptNow();
   else resetReadyCheck();
-}
-
+}
+
 function buildButton() {
   const root = document.createElement("div");
   root.id = ROOT_ID;
@@ -165,8 +165,8 @@ function buildButton() {
     event.preventDefault();
     event.stopPropagation();
     toggle();
-  });
-
+  });
+
   root.append(option);
   return root;
 }

package/ban-blocker.js

@@ -1,4 +1,4 @@
-export const version = "3.6.0";
+export const version = "3.6.2";
 
 const PLUGIN_ID = "ban-blocker";
 const STYLE_ID = "perfectionist-ban-blocker-style";
@@ -70,6 +70,7 @@ const fetchedNames = new Set();
 const playerNames = new Map();
 const cellToPlayer = new Map();
 const buttons = new Map();
+const swapSeen = new Set();
 const failedUntil = new Map();
 const failCount = new Map();
 let rows = [];
@@ -159,10 +160,19 @@ function linkPlayer(p, rowName, cellId) {
   return root;
 }
 
+function pickStarted(s) {
+  const actions = s?.actions?.flat?.() ?? [];
+  return actions.some((a) => a.type === "pick" && (a.isInProgress || a.completed));
+}
+
 function banPending(s) {
-  const bans = (s?.actions?.flat?.() ?? []).filter((a) => a.type === "ban");
+  const actions = s?.actions?.flat?.() ?? [];
+  const bans = actions.filter((a) => a.type === "ban");
   if (!bans.length) return true;
-  return bans.some((a) => !a.completed);
+  if (bans.some((a) => !a.completed)) return true;
+  const phase = s?.timer?.phase;
+  if (phase && phase !== "BAN_PICK") return false;
+  return !pickStarted(s);
 }
 
 function pump() {
@@ -254,6 +264,7 @@ function onSessionGone() {
   lastSession = null;
   goneAway = true;
   uiVisible = false;
+  swapSeen.clear();
   removeButtons();
   if (!goneTimer) {
     goneTimer = setTimeout(() => {
@@ -449,16 +460,31 @@ function isSelfRow(r) {
   return lastSession?.localPlayerCellId != null && (r.cell ?? r.slotId) === lastSession.localPlayerCellId;
 }
 
+function rowKey(r) {
+  return String(r.slotId ?? r.cell ?? r.index);
+}
+
 function nativeSwapIn(circle) {
-  return !!circle.querySelector(".swap-button-component:not([data-bb])");
+  if (!circle) return false;
+  return [...circle.querySelectorAll(".swap-button-component")].some((el) => el.dataset.bb !== "1");
 }
 
 function ensureButtons() {
   const list = getRows();
   for (const r of list) {
+    if (!r.circle || !r.circle.isConnected) r.circle = r.el.querySelector(".champion-icon-container");
     if (!r.circle || !r.circle.isConnected) continue;
+    const key = rowKey(r);
     let btn = buttons.get(r.index);
-    if (isSelfRow(r) || !nativeSwapIn(r.circle)) {
+    if (isSelfRow(r)) {
+      if (btn) {
+        btn.remove();
+        buttons.delete(r.index);
+      }
+      continue;
+    }
+    if (nativeSwapIn(r.circle)) swapSeen.add(key);
+    if (!swapSeen.has(key)) {
       if (btn) {
         btn.remove();
         buttons.delete(r.index);
@@ -531,6 +557,7 @@ function update() {
     renderButtons();
   } else if (uiVisible) {
     uiVisible = false;
+    swapSeen.clear();
     removeButtons();
   }
 }
@@ -605,6 +632,7 @@ function onDisable() {
   observer = null;
 
   uiVisible = false;
+  swapSeen.clear();
   goneAway = true;
   target = undefined;
   sent = 0;

package/hide-unowned-skins.js

@@ -78,16 +78,11 @@ function installArrayFilter() {
       return owned;
     });
     if (!changed) return result;
-    filterStats.array = (filterStats.array || 0) + 1;
-    filterStats.source = "array";
-    filterStats.lastIn = result.length;
-    filterStats.lastOut = kept.length;
     return kept;
   };
   wrapped.__perfSkinFilter = FILTER_VERSION;
   proto.filter = wrapped;
 }
-const filterStats = (globalThis.__perfSkinFilterStats ??= { carousel: 0, source: "", lastIn: 0, lastOut: 0 });
 let rawFetch = (typeof window !== "undefined" && window.fetch && window.fetch.__perfOriginalFetch) || null;
 let clientSkinOrder = [];
 
@@ -127,8 +122,6 @@ function filterSkinList(list) {
     })
     .filter(isOwnedSkin);
   if (filtered.length !== list.length) changed = true;
-  filterStats.lastIn = list.length;
-  filterStats.lastOut = filtered.length;
   return changed ? filtered : null;
 }
 
@@ -153,8 +146,6 @@ function rewriteWebSocketFrame(text) {
   if (!payload || typeof payload !== "object" || typeof payload.uri !== "string") return null;
   if (payload.uri.split("?")[0] !== CAROUSEL_URI) return null;
   const kept = filterSkinList(payload.data);
-  filterStats.carousel++;
-  filterStats.source = "ws";
   recordClientOrder(kept ?? payload.data);
   if (!kept) return null;
   return JSON.stringify([frame[0], frame[1], Object.assign({}, payload, { data: kept })]);
@@ -235,7 +226,6 @@ function installFetchFilter() {
   const original = window.fetch;
   if (typeof original !== "function" || original.__perfSkinFilter === FILTER_VERSION) return;
   if (!rawFetch) rawFetch = original.__perfOriginalFetch || original;
-  globalThis.__perfNativeFetch = rawFetch;
 
   const wrapped = function (input, init) {
     const url =
@@ -261,8 +251,6 @@ function installFetchFilter() {
         .catch(() => null)
         .then((json) => {
           const kept = filterSkinList(json);
-          filterStats.carousel++;
-          filterStats.source = "fetch";
           recordClientOrder(kept ?? json);
           if (!kept) return response;
           return new Response(JSON.stringify(kept), {
@@ -307,8 +295,6 @@ function installXhrFilter() {
           try {
             const json = JSON.parse(raw);
             const kept = filterSkinList(json);
-            filterStats.carousel++;
-            filterStats.source = "xhr";
             recordClientOrder(kept ?? json);
             if (kept) cache.filtered = JSON.stringify(kept);
           } catch {
@@ -442,10 +428,6 @@ function applyAll() {
   });
 }
 
-function applyAllGuarded() {
-  applyAll();
-}
-
 let applyQueued = false;
 
 function scheduleApply() {
@@ -558,7 +540,7 @@ function resetState() {
   failure = null;
   sessionMisses = 0;
   championMisses = 0;
-  applyAllGuarded();
+  applyAll();
 }
 
 function loadChampion(championId) {
@@ -579,7 +561,7 @@ function loadChampion(championId) {
       topLevelOrder = topLevel;
       ownedTopLevelIds = ownedTopLevel;
       carouselOrder = carouselIds.length > 0 ? carouselIds : inventoryOrder;
-      applyAllGuarded();
+      applyAll();
     },
     (error) => {
       if (token !== requestToken) return;
@@ -618,7 +600,7 @@ function updateForSession(session, selection) {
     }
   }
 
-  applyAllGuarded();
+  applyAll();
 }
 
 function scheduleRefresh() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perfectionist-plugins",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "Small plugins that fix the annoying parts of League of Legends champ select. Built for Pengu Loader.",
   "type": "module",
   "main": "perfectionist-utils.js",

package/perfectionist-utils.js

@@ -5,7 +5,7 @@ const PANEL_ID = "perfectionist-plugins-panel";
 const STYLE_ID = "perfectionist-plugins-style";
 const TAB_TITLE = "Perfectionism";
 
-export const version = "2.4.0";
+export const version = "2.4.6";
 
 const PKG = "perfectionist-plugins";
 const CDN = "https://cdn.jsdelivr.net/npm";
@@ -30,7 +30,7 @@ const BUNDLED_MODULES = [
     id: "ban-blocker",
     file: "ban-blocker.js",
     name: "Ban Blocker",
-    version: "3.6.0",
+    version: "3.6.2",
     description: "Adds a BLOCK button to your teammates in champ select. While a teammate is blocked, the champion they are about to ban is prepicked for you, so their ban can never land on it.",
   },
   {
@@ -44,7 +44,7 @@ const BUNDLED_MODULES = [
     id: "hide-unowned-skins",
     file: "hide-unowned-skins.js",
     name: "Hide Unowned Skins",
-    version: "2.5.1",
+    version: "2.4.3",
     description: "In champ select, the skin carousel only shows the skins you own for the champion you picked.",
   },
   {
@@ -849,10 +849,23 @@ function refreshPanel() {
   requestAnimationFrame(() => applyScrollTop(next, top));
 }
 
+function settingsNavScope() {
+  const title =
+    document.querySelector(".lol-settings-nav-title:not([data-perfectionist])") ??
+    document.querySelector(".lol-settings-nav-title");
+  return title?.closest("lol-uikit-scrollable") ?? title?.parentElement ?? null;
+}
+
+function navItems() {
+  const scope = settingsNavScope();
+  if (!scope) return [];
+  return [...scope.querySelectorAll('lol-uikit-navigation-item, [class*="settings-nav"]')];
+}
+
 function setNavActive(activeNav) {
-  for (const nav of document.querySelectorAll(".lol-settings-nav")) {
+  for (const nav of navItems()) {
     if (nav === activeNav) {
-      nav.setAttribute("active", "true");
+      if (nav.getAttribute("active") !== "true") nav.setAttribute("active", "true");
     } else if (nav.hasAttribute("active")) {
       nav.removeAttribute("active");
     }
@@ -861,6 +874,26 @@ function setNavActive(activeNav) {
 
 let panelRequested = false;
 let syncTimer = null;
+let navObserver = null;
+let nativeActiveBeforeOpen = null;
+
+function suppressNativeNavActive() {
+  const own = document.getElementById(NAV_ID);
+  if (!own) return;
+  if (!panelRequested) {
+    if (own.hasAttribute("active")) own.removeAttribute("active");
+    return;
+  }
+  for (const nav of navItems()) {
+    if (nav !== own && nav.hasAttribute("active")) nav.removeAttribute("active");
+  }
+}
+
+function watchNavActive() {
+  if (navObserver || !document.body) return;
+  navObserver = new MutationObserver(suppressNativeNavActive);
+  navObserver.observe(document.body, { subtree: true, attributes: true, attributeFilter: ["active"] });
+}
 
 function startSync() {
   if (syncTimer === null) syncTimer = setInterval(keepPanelInSync, 300);
@@ -885,7 +918,11 @@ function openPanel() {
   if (existing) existing.remove();
   content.append(buildPanel());
 
-  setNavActive(document.getElementById(NAV_ID));
+  const ownNav = document.getElementById(NAV_ID);
+  if (!nativeActiveBeforeOpen) {
+    nativeActiveBeforeOpen = navItems().find((nav) => nav !== ownNav && nav.hasAttribute("active")) ?? null;
+  }
+  setNavActive(ownNav);
   const currentTitle = document.querySelector(".lol-settings-title-current");
   if (currentTitle) currentTitle.textContent = TAB_TITLE.toUpperCase();
 }
@@ -897,7 +934,9 @@ function closePanel() {
   panel.remove();
   const options = document.querySelector(".lol-settings-content .lol-settings-options");
   if (options) options.style.display = "";
-  setNavActive(null);
+  document.getElementById(NAV_ID)?.removeAttribute("active");
+  if (nativeActiveBeforeOpen?.isConnected) nativeActiveBeforeOpen.setAttribute("active", "true");
+  nativeActiveBeforeOpen = null;
 }
 
 function keepPanelInSync() {
@@ -905,6 +944,7 @@ function keepPanelInSync() {
   if (!content) {
     panelRequested = false;
     stopSync();
+    document.getElementById(NAV_ID)?.removeAttribute("active");
     return;
   }
   if (!panelRequested) {
@@ -923,12 +963,7 @@ function keepPanelInSync() {
   if (options && options.style.display !== "none") options.style.display = "none";
 
   const nav = document.getElementById(NAV_ID);
-  if (nav) {
-    for (const other of document.querySelectorAll(".lol-settings-nav")) {
-      if (other !== nav && other.hasAttribute("active")) other.removeAttribute("active");
-    }
-    if (nav.getAttribute("active") !== "true") nav.setAttribute("active", "true");
-  }
+  if (nav) setNavActive(nav);
 
   const title = document.querySelector(".lol-settings-title-current");
   if (title && title.textContent !== TAB_TITLE.toUpperCase()) title.textContent = TAB_TITLE.toUpperCase();
@@ -967,6 +1002,7 @@ function isDoneButton(target) {
 
 function installSettingsTab() {
   addStyle(STYLE_ID, STYLE_CSS);
+  watchNavActive();
 
   document.addEventListener(
     "click",