Convert CompendiumBrowser to ApplicationV2 (#16884)

foundryvtt · Dec 3, 2024 · 914e009 · 914e009
1 parent 66f4572
commit 914e009
Show file tree

Hide file tree

Showing 57 changed files with 2,524 additions and 2,326 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -94,6 +94,7 @@
         "nouislider": "^15.8.1",
         "remeda": "^2.17.3",
         "sortablejs": "^1.15.3",
+        "svelecte": "^5.0.0-next.16",
         "svelte": "^5.2.2",
         "uuid": "^11.0.3"
     }

diff --git a/src/global.ts b/src/global.ts
@@ -14,7 +14,7 @@ import type {
     CompendiumBrowser,
     CompendiumBrowserSettings,
     CompendiumBrowserSources,
-} from "@module/apps/compendium-browser/index.ts";
+} from "@module/apps/compendium-browser/browser.ts";
 import type { EffectsPanel } from "@module/apps/effects-panel.ts";
 import type { HotbarPF2e } from "@module/apps/hotbar.ts";
 import type { LicenseViewer } from "@module/apps/license-viewer/app.ts";

diff --git a/src/module/actor/character/sheet.ts b/src/module/actor/character/sheet.ts
@@ -1247,13 +1247,13 @@ class CharacterSheetPF2e<TActor extends CharacterPF2e> extends CreatureSheetPF2e
 
         const featTab = game.pf2e.compendiumBrowser.tabs.feat;
         const filter = await featTab.getFilterData();
-        filter.multiselects.traits.conjunction = featFilters?.conjunction ?? "or";
+        filter.traits.conjunction = featFilters?.conjunction ?? "or";
 
         // Assign levels
         if (typeof maxLevel === "number") {
-            const level = filter.sliders.level;
-            level.values.max = Math.min(maxLevel, level.values.upperLimit);
-            level.isExpanded = level.values.max !== level.values.upperLimit;
+            const level = filter.level;
+            level.to = Math.min(maxLevel, level.max);
+            level.isExpanded = level.to !== level.max;
         }
 
         // Assign categories
@@ -1265,7 +1265,7 @@ class CharacterSheetPF2e<TActor extends CharacterPF2e> extends CreatureSheetPF2e
         }
 
         // Assign traits
-        const traits = filter.multiselects.traits;
+        const traits = filter.traits;
         const filterTraits = [
             (featFilters?.traits ?? []).map((trait) => ({ trait, not: false })),
             (featFilters?.omitTraits ?? []).map((trait) => ({ trait, not: true })),
@@ -1277,7 +1277,7 @@ class CharacterSheetPF2e<TActor extends CharacterPF2e> extends CreatureSheetPF2e
             }
         }
 
-        return featTab.open(filter);
+        return featTab.open({ filter });
     }
 
     /** Handle changing of lore and spellcasting entry proficiency-rank via dropdown */

diff --git a/src/module/actor/party/kingdom/sheet.ts b/src/module/actor/party/kingdom/sheet.ts
@@ -445,16 +445,16 @@ class KingdomSheetPF2e extends ActorSheetPF2e<PartyPF2e> {
                 const filter = await compendiumTab.getFilterData();
 
                 // Configure level filters
-                const levels = filter.sliders.level;
-                levels.values.max = Math.min(maxLevel, levels.values.upperLimit);
-                levels.isExpanded = levels.values.max !== levels.values.upperLimit;
+                const levels = filter.level;
+                levels.to = Math.min(maxLevel, levels.max);
+                levels.isExpanded = levels.to !== levels.max;
 
                 // Set category
                 filter.checkboxes.category.options["kingdom-feat"].selected = true;
                 filter.checkboxes.category.selected.push("kingdom-feat");
                 filter.checkboxes.category.isExpanded = true;
 
-                compendiumTab.open(filter);
+                compendiumTab.open({ filter });
             });
         }
 

diff --git a/src/module/actor/sheet/base.ts b/src/module/actor/sheet/base.ts
@@ -832,9 +832,10 @@ abstract class ActorSheetPF2e<TActor extends ActorPF2e> extends ActorSheet<TActo
             .split(",")
             .map((s) => s.trim())
             .filter((s) => !!s);
+        const levelString = element.dataset.level;
         const tab = game.pf2e.compendiumBrowser.tabs.equipment;
         const filter = await tab.getFilterData();
-        const { checkboxes } = filter;
+        const checkboxes = filter.checkboxes;
 
         for (const itemType of checkboxesFilterCodes) {
             const checkbox = checkboxes.itemTypes;
@@ -845,7 +846,17 @@ abstract class ActorSheetPF2e<TActor extends ActorPF2e> extends ActorSheet<TActo
             }
         }
 
-        tab.open(filter);
+        if (levelString) {
+            const level = filter.level;
+            const newValue = Math.clamp(Number(levelString), level.min, level.max);
+            if (!Number.isNaN(newValue)) {
+                level.from = newValue;
+                level.to = newValue;
+            }
+            level.isExpanded = true;
+        }
+
+        tab.open({ filter });
     }
 
     protected override _canDragStart(selector: string): boolean {