From 746d4d7a44773436beeb69681f3b3a4e0ba82398 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Mon, 8 Feb 2021 02:07:25 +0100
Subject: [PATCH] Update types

---
 package-lock.json                      | 2 +-
 src/module/actor/sheets/actor-sheet.ts | 8 ++++----
 src/module/item/item-sheet.ts          | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2894318..8b3eee5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3119,7 +3119,7 @@
             }
         },
         "foundry-vtt-types": {
-            "version": "github:League-of-Foundry-Developers/foundry-vtt-types#32d849fd2afa4e88319c0105c989cec62bb888c2",
+            "version": "github:League-of-Foundry-Developers/foundry-vtt-types#f1c321dcfe460595123765ababe5b8772d5df966",
             "from": "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9",
             "dev": true,
             "requires": {
diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts
index 177fff4..66c381b 100644
--- a/src/module/actor/sheets/actor-sheet.ts
+++ b/src/module/actor/sheets/actor-sheet.ts
@@ -6,7 +6,7 @@ import { DS4Actor } from "../actor";
 /**
  * The base Sheet class for all DS4 Actors
  */
-export class DS4ActorSheet extends ActorSheet<DS4Actor> {
+export class DS4ActorSheet extends ActorSheet<ActorSheet.Data<DS4Actor>> {
     // TODO(types): Improve mergeObject in upstream so that it isn't necessary to provide all parameters (see https://github.com/League-of-Foundry-Developers/foundry-vtt-types/issues/272)
     /** @override */
     static get defaultOptions(): BaseEntitySheet.Options {
@@ -48,9 +48,9 @@ export class DS4ActorSheet extends ActorSheet<DS4Actor> {
      * object itemsByType.
      * @returns The data fed to the template of the actor sheet
      */
-    getData(): ActorSheet.Data<DS4Actor> | Promise<ActorSheet.Data<DS4Actor>> {
+    async getData(): Promise<ActorSheet.Data<DS4Actor>> {
         const data = {
-            ...super.getData(),
+            ...(await super.getData()),
             // Add the localization config to the data:
             config: DS4,
             // Add the items explicitly sorted by type to the data:
@@ -73,7 +73,7 @@ export class DS4ActorSheet extends ActorSheet<DS4Actor> {
         html.find(".item-edit").on("click", (ev) => {
             const li = $(ev.currentTarget).parents(".item");
             const item = this.actor.getOwnedItem(li.data("itemId"));
-            item.sheet.render(true);
+            item.sheet?.render(true);
         });
 
         // Delete Inventory Item
diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts
index f32b602..2c7153a 100644
--- a/src/module/item/item-sheet.ts
+++ b/src/module/item/item-sheet.ts
@@ -5,7 +5,7 @@ import { isDS4ItemDataTypePhysical } from "./item-data";
 /**
  * The Sheet class for DS4 Items
  */
-export class DS4ItemSheet extends ItemSheet<DS4Item> {
+export class DS4ItemSheet extends ItemSheet<ItemSheet.Data<DS4Item>> {
     /** @override */
     static get defaultOptions(): BaseEntitySheet.Options {
         const superDefaultOptions = super.defaultOptions;
@@ -41,9 +41,9 @@ export class DS4ItemSheet extends ItemSheet<DS4Item> {
     }
 
     /** @override */
-    getData(): ItemSheet.Data<DS4Item> | Promise<ItemSheet.Data<DS4Item>> {
+    async getData(): Promise<ItemSheet.Data<DS4Item>> {
         const data = {
-            ...super.getData(),
+            ...(await super.getData()),
             config: DS4,
             isOwned: this.item.isOwned,
             actor: this.item.actor,