SpellList class

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dnd-battle-tracker",
-  "version": "5.106.1",
+  "version": "5.107.0",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.9.2",

src/components/app/DungeonMasterApp.js

@@ -64,13 +64,13 @@ import {
   dismissErrors,
   updateErrors,
 } from '../../state/ErrorManager';
-import { getSpells } from '../../client/dnd5eapi';
+import { getSpellList } from '../../domain/spellcasting';
 import SrdContext from './SrdContext';
 
 function DungeonMasterApp({
   state, setState, shareBattle, onlineError,
 }) {
-  const [srdSpells, setSrdSpells] = useState([]);
+  const [spellList, setSpellList] = useState([]);
   const creaturesRef = useRef(null);
 
   const updateBattle = (update, doShare = true) => (...args) => {
@@ -112,7 +112,7 @@ function DungeonMasterApp({
   } = state;
 
   useEffect(() => {
-    getSpells().then(setSrdSpells);
+    getSpellList().then(setSpellList);
   }, []);
 
   useEffect(() => {
@@ -158,7 +158,7 @@ function DungeonMasterApp({
     loadBattle,
   }), [state]);
 
-  const srd = useMemo(() => ({ srdSpells }));
+  const srd = useMemo(() => ({ spellList }));
 
   const onScrollActiveInitiative = () => {
     creaturesRef.current.scrollToCreature(activeCreatureId);

src/components/creature/toolbar/tools/spellcasting/SpellList.js

@@ -85,17 +85,6 @@ function Spells({
   );
 }
 
-function getFilteredSpells(name, spellData) {
-  if (name.length < 2) return [];
-  return spellData
-    .filter((spell) => spell.name && spell.name.toLowerCase().includes(name.toLowerCase()))
-    .map((spell) => ({
-      ...spell,
-      text: spell.name,
-      id: spell.index,
-    }));
-}
-
 export default function SpellList({
   spells,
   spellProperty,
@@ -110,7 +99,7 @@ export default function SpellList({
 }) {
   const [name, setName] = useState('');
   const srd = useContext(SrdContext);
-  const { srdSpells } = srd;
+  const { spellList } = srd;
   const spellRightControls = {
     rightTitle: 'Add spell',
     RightSubmitIcon: <CrossIcon />,
@@ -121,7 +110,7 @@ export default function SpellList({
         <ComboboxList
           value={name}
           setValue={setName}
-          list={getFilteredSpells(name, srdSpells)}
+          list={spellList.search(name)}
           id={`${creatureId}-${id}-spells`}
           dropdownId={`${creatureId}-${id}-spells-dropdown`}
           dropdownLabel="Select spell"

src/domain/spellcasting.js

@@ -1,3 +1,26 @@
+import { getSpells } from '../client/dnd5eapi';
+
+class SpellList {
+  constructor(spells) {
+    this.spells = spells;
+  }
+
+  search(name) {
+    if (name.length < 2) return [];
+    return this.spells
+      .filter((spell) => spell.name && spell.name.toLowerCase().includes(name.toLowerCase()))
+      .map((spell) => ({
+        text: spell.name,
+        id: spell.index,
+      }));
+  }
+}
+
+export async function getSpellList() {
+  const spells = await getSpells();
+  return new SpellList(spells);
+}
+
 export const maxSpellSlots = {
   '1st': 4,
   '2nd': 3,