Fix header controls

Author: Qaw

.github/workflows/main.yml

@@ -108,7 +108,7 @@ jobs:
 
       # Pull YAML to LDB packs
       - name: Build Packs
-        run: npm run YAMLtoLDB
+        run: npm run YMLtoLDB
 
       # Create a "system.zip" archive containing all the module's required files.
       # If you have other directories or files that will need to be added to

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.0.0
+- Compatibility Foundry V13
+
 # 2.2.0
 - Fix issue [#51](https://github.com/voidcase/IntoTheOdd-FoundryVTT/issues/51)
 - Add an option to display or not the wealth section in a character sheet

css/intotheodd.css

@@ -158,6 +158,9 @@
   justify-content: space-between;
   align-items: center;
 }
+.intotheodd.actor.character nav {
+  margin: 10px 0 10px 0;
+}
 .intotheodd.actor.encounter {
   min-width: 675px;
 }

module/sheets/character-sheet.mjs

@@ -1,52 +1,20 @@
-const { ux } = foundry.applications
+const { sheets, ux } = foundry.applications
 const { HandlebarsApplicationMixin } = foundry.applications.api
 const { DragDrop } = foundry.applications.ux
 
-export default class IntoTheOddCharacterSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
+export default class IntoTheOddCharacterSheet extends HandlebarsApplicationMixin(sheets.ActorSheetV2) {
   /** @override */
   static DEFAULT_OPTIONS = {
     classes: ["intotheodd", "actor", "character"],
     position: {
-      width: 700,
-      height: 500,
+      width: 750,
+      height: 800,
     },
     form: {
       submitOnChange: true,
     },
     window: {
       resizable: true,
-      controls: [
-        {
-          action: "configurePrototypeToken",
-          icon: "fa-solid fa-user-circle",
-          label: "TOKEN.TitlePrototype",
-          ownership: "OWNER",
-        },
-        {
-          action: "showPortraitArtwork",
-          icon: "fa-solid fa-image",
-          label: "SIDEBAR.CharArt",
-          ownership: "OWNER",
-        },
-        {
-          action: "showTokenArtwork",
-          icon: "fa-solid fa-image",
-          label: "SIDEBAR.TokenArt",
-          ownership: "OWNER",
-        },
-        {
-          icon: "fa-solid fa-heart-pulse",
-          label: "INTOTHEODD.Labels.long.shortRest",
-          action: "shortRest",
-          ownership: "OWNER",
-        },
-        {
-          icon: "fas fa-bed",
-          label: "INTOTHEODD.Labels.long.fullRest",
-          action: "fullRest",
-          ownership: "OWNER",
-        },
-      ],
     },
     actions: {
       edit: IntoTheOddCharacterSheet.#onItemEdit,
@@ -61,77 +29,31 @@ export default class IntoTheOddCharacterSheet extends HandlebarsApplicationMixin
     },
   }
 
-  /** @override */
-  _getHeaderControls() {
-    const controls = super._getHeaderControls()
-
-    if (this.actor.system.deprived) {
-      controls.findSplice((c) => c.action === "shortRest")
-      controls.findSplice((c) => c.action === "fullRest")
-    } else {
-      if (!controls.find((c) => c.action === "shortRest")) {
-        controls.push({
-          icon: "fa-solid fa-heart-pulse",
-          label: "INTOTHEODD.Labels.long.shortRest",
-          action: "shortRest",
-        })
-      }
-      if (!controls.find((c) => c.action === "fullRest")) {
-        controls.push({
-          icon: "fas fa-bed",
-          label: "INTOTHEODD.Labels.long.fullRest",
-          action: "fullRest",
-        })
-      }
-    }
-
-    return controls
-  }
-
   /** @override */
   static PARTS = {
-    header: {
-      template: "systems/intotheodd/templates/character-header.hbs",
-    },
-    main: {
-      template: "systems/intotheodd/templates/character-main.hbs",
-    },
-    tabs: {
-      template: "templates/generic/tab-navigation.hbs",
-    },
-    biography: {
-      template: "systems/intotheodd/templates/character-biography.hbs",
-    },
-    inventory: {
-      template: "systems/intotheodd/templates/character-inventory.hbs",
-    },
+    header: { template: "systems/intotheodd/templates/character-header.hbs" },
+    main: { template: "systems/intotheodd/templates/character-main.hbs" },
+    tabs: { template: "templates/generic/tab-navigation.hbs" },
+    biography: { template: "systems/intotheodd/templates/character-biography.hbs" },
+    inventory: { template: "systems/intotheodd/templates/character-inventory.hbs" },
   }
 
   /** @override */
-  tabGroups = {
-    sheet: "inventory",
-  }
-
-  /**
-   * Prepare an array of form header tabs.
-   * @returns {Record<string, Partial<ApplicationTab>>}
-   */
-  #getTabs() {
-    const tabs = {
-      biography: { id: "biography", group: "sheet", icon: "fa-solid fa-book", label: "INTOTHEODD.Labels.long.biography" },
-      inventory: { id: "inventory", group: "sheet", icon: "fa-solid fa-shapes", label: "INTOTHEODD.Labels.long.inventory" },
-    }
-    for (const v of Object.values(tabs)) {
-      v.active = this.tabGroups[v.group] === v.id
-      v.cssClass = v.active ? "active" : ""
-    }
-    return tabs
+  static TABS = {
+    primary: {
+      tabs: [
+        { id: "biography", icon: "fa-solid fa-book" },
+        { id: "inventory", icon: "fa-solid fa-shapes" },
+      ],
+      initial: "inventory",
+      labelPrefix: "INTOTHEODD.Labels.long",
+    },
   }
 
   /** @override */
-  async _prepareContext() {
-    const context = {
-      tabs: this.#getTabs(),
+  async _prepareContext(options) {
+    const context = await super._prepareContext(options)
+    Object.assign(context, {
       fields: this.document.schema.fields,
       systemFields: this.document.system.schema.fields,
       actor: this.document,
@@ -146,21 +68,19 @@ export default class IntoTheOddCharacterSheet extends HandlebarsApplicationMixin
         },
       },
       displayWealth: game.settings.get("intotheodd", "displayWealth"),
-    }
-    //console.log('character context', context);
+    })
     return context
   }
 
   /** @override */
-  async _preparePartContext(partId, context) {
-    const doc = this.document
+  async _preparePartContext(partId, context, options) {
+    context = await super._preparePartContext(partId, context, options)
+
     switch (partId) {
       case "biography":
-        context.tab = context.tabs.biography
         context.enrichedBiography = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.biography, { async: true })
         break
       case "inventory":
-        context.tab = context.tabs.inventory
         context.items = []
         const itemsRaw = this.actor.itemTypes.equipment
         for (const item of itemsRaw) {
@@ -189,6 +109,33 @@ export default class IntoTheOddCharacterSheet extends HandlebarsApplicationMixin
     }).bind(this.element)
   }
 
+  /** @override */
+  _getHeaderControls() {
+    const controls = super._getHeaderControls()
+
+    if (this.actor.system.deprived) {
+      controls.findSplice((c) => c.action === "shortRest")
+      controls.findSplice((c) => c.action === "fullRest")
+    } else {
+      if (!controls.find((c) => c.action === "shortRest")) {
+        controls.push({
+          icon: "fa-solid fa-heart-pulse",
+          label: "INTOTHEODD.Labels.long.shortRest",
+          action: "shortRest",
+        })
+      }
+      if (!controls.find((c) => c.action === "fullRest")) {
+        controls.push({
+          icon: "fas fa-bed",
+          label: "INTOTHEODD.Labels.long.fullRest",
+          action: "fullRest",
+        })
+      }
+    }
+
+    return controls
+  }
+
   //#region Drag-and-Drop Workflow
 
   /**

module/sheets/encounter-sheet.mjs

@@ -1,8 +1,8 @@
-const { ux } = foundry.applications
+const { sheets, ux } = foundry.applications
 const { HandlebarsApplicationMixin } = foundry.applications.api
 const { DragDrop } = foundry.applications.ux
 
-export default class IntoTheOddEncounterSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
+export default class IntoTheOddEncounterSheet extends HandlebarsApplicationMixin(sheets.ActorSheetV2) {
   /** @override */
   static DEFAULT_OPTIONS = {
     classes: ["intotheodd", "actor", "encounter"],
@@ -15,26 +15,6 @@ export default class IntoTheOddEncounterSheet extends HandlebarsApplicationMixin
     },
     window: {
       resizable: true,
-      controls: [
-        {
-          action: "configurePrototypeToken",
-          icon: "fa-solid fa-user-circle",
-          label: "TOKEN.TitlePrototype",
-          ownership: "OWNER",
-        },
-        {
-          action: "showPortraitArtwork",
-          icon: "fa-solid fa-image",
-          label: "SIDEBAR.CharArt",
-          ownership: "OWNER",
-        },
-        {
-          action: "showTokenArtwork",
-          icon: "fa-solid fa-image",
-          label: "SIDEBAR.TokenArt",
-          ownership: "OWNER",
-        },
-      ],
     },
     actions: {
       edit: IntoTheOddEncounterSheet.#onItemEdit,
@@ -45,41 +25,6 @@ export default class IntoTheOddEncounterSheet extends HandlebarsApplicationMixin
     },
   }
 
-  /** @override */
-  _getHeaderControls() {
-    const controls = this.options.window.controls
-
-    if (!controls.find((c) => c.action === "showPortraitArtwork")) {
-      controls.push({
-        action: "showPortraitArtwork",
-        icon: "fa-solid fa-image",
-        label: "SIDEBAR.CharArt",
-        ownership: "OWNER",
-      })
-    }
-    if (!controls.find((c) => c.action === "showTokenArtwork")) {
-      controls.push({
-        action: "showTokenArtwork",
-        icon: "fa-solid fa-image",
-        label: "SIDEBAR.TokenArt",
-        ownership: "OWNER",
-      })
-    }
-
-    // Portrait image
-    const img = this.actor.img
-    if (img === CONST.DEFAULT_TOKEN) controls.findSplice((c) => c.action === "showPortraitArtwork")
-
-    // Token image
-    const pt = this.actor.prototypeToken
-    const tex = pt.texture.src
-    if (pt.randomImg || [null, undefined, CONST.DEFAULT_TOKEN].includes(tex)) {
-      controls.findSplice((c) => c.action === "showTokenArtwork")
-    }
-
-    return controls
-  }
-
   /** @override */
   static PARTS = {
     main: {
@@ -88,23 +33,28 @@ export default class IntoTheOddEncounterSheet extends HandlebarsApplicationMixin
   }
 
   /** @override */
-  async _prepareContext() {
-    const context = {
+  async _prepareContext(options) {
+    const context = await super._prepareContext(options)
+    Object.assign(context, {
       fields: this.document.schema.fields,
       systemFields: this.document.system.schema.fields,
       actor: this.document,
       system: this.document.system,
       source: this.document.toObject(),
       enrichedDescription: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description, { async: true }),
-    }
+    })
 
-    context.attacks = []
+    const attacks = []
     const attacksRaw = this.actor.itemTypes.attack
     for (const item of attacksRaw) {
       item.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(item.system.description, { async: true })
-      context.attacks.push(item)
+      attacks.push(item)
     }
 
+    Object.assign(context, {
+      attacks,
+    })
+
     //console.log('encounter context', context);
     return context
   }

styles/character.less

@@ -119,4 +119,8 @@
       }
     }
   }
+
+  nav {
+    margin: 10px 0 10px 0;
+  }
 }

templates/attack-main.hbs

@@ -8,8 +8,8 @@
     <div class="details">
       <fieldset>
         <legend>{{localize "INTOTHEODD.Labels.details"}}</legend>
-        {{formField systemFields.damageFormula value=system.damageFormula }}
-        {{formField systemFields.blast value=system.blast }}
+        {{formGroup systemFields.damageFormula value=system.damageFormula }}
+        {{formGroup systemFields.blast value=system.blast }}
       </fieldset>
     </div>
   </section>

templates/character-biography.hbs

@@ -1,4 +1,4 @@
-<section class="tab standard-form character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+<section class="tab standard-form character-biography {{#if tabs.biography.active}} active{{/if}}" data-group="primary" data-tab="biography">
   {{formInput
     systemFields.biography
     enriched=enrichedBiography

templates/character-header.hbs

@@ -4,9 +4,9 @@
     <div class="character-name">{{formInput fields.name value=source.name }}</div>
     <fieldset>
       <legend>{{localize "INTOTHEODD.Labels.details"}}</legend>
-      {{formField systemFields.level value=system.level localize=true }}
-      {{formField systemFields.deprived value=system.deprived dataset=data.deprived }}
-      {{formField systemFields.critical value=system.critical dataset=data.critical }}
+      {{formGroup systemFields.level value=system.level localize=true }}
+      {{formGroup systemFields.deprived value=system.deprived dataset=data.deprived }}
+      {{formGroup systemFields.critical value=system.critical dataset=data.critical }}
     </fieldset>
   </div>
 </div>

templates/character-inventory.hbs

@@ -1,4 +1,4 @@
-<section class="tab standard-form character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+<section class="tab standard-form character-inventory {{#if tabs.inventory.active}} active{{/if}}" data-group="primary" data-tab="inventory">
   <div class="character-items-list">
     {{#each actor.items as |item id|}}
       {{!log "item" id item}}