From f64e459cd29fb4c99a91069ad348f0189cbb5017 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sun, 7 Feb 2021 12:16:48 +0100
Subject: [PATCH] Update types

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

diff --git a/package-lock.json b/package-lock.json
index ad8c8a4..dcac666 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#e17295657bcdf61775f3eaf86900be594e5cec57",
+            "version": "github:League-of-Foundry-Developers/foundry-vtt-types#32d849fd2afa4e88319c0105c989cec62bb888c2",
             "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 0697707..e030854 100644
--- a/src/module/actor/sheets/actor-sheet.ts
+++ b/src/module/actor/sheets/actor-sheet.ts
@@ -2,12 +2,12 @@ import { DS4 } from "../../config";
 import { DS4Item } from "../../item/item";
 import { DS4ItemData } from "../../item/item-data";
 import { DS4Actor } from "../actor";
+import { DS4ActorData } from "../actor-data";
 
 /**
  * The base Sheet class for all DS4 Actors
  */
-// TODO(types): Remove first generic parameter once https://github.com/League-of-Foundry-Developers/foundry-vtt-types/pull/273 is merged
-export class DS4ActorSheet extends ActorSheet<unknown, DS4Actor> {
+export class DS4ActorSheet extends ActorSheet<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 {
@@ -49,7 +49,7 @@ export class DS4ActorSheet extends ActorSheet<unknown, DS4Actor> {
      * object itemsByType.
      * @returns The data fed to the template of the actor sheet
      */
-    getData(): ActorSheet.Data<DS4Actor> {
+    getData(): ActorSheet.Data<DS4Actor> | Promise<ActorSheet.Data<DS4Actor>> {
         const data = {
             ...super.getData(),
             // Add the localization config to the data:
@@ -216,7 +216,10 @@ export class DS4ActorSheet extends ActorSheet<unknown, DS4Actor> {
     }
 
     /** @override */
-    async _onDropItem(event: DragEvent, data: Parameters<typeof DS4Item.fromDropData>[0]): Promise<unknown> {
+    protected async _onDropItem(
+        event: DragEvent,
+        data: { type: "Item" } & (DeepPartial<ActorSheet.OwnedItemData<DS4Actor>> | { pack: string } | { id: string }),
+    ): Promise<boolean | undefined | ActorSheet.OwnedItemData<DS4Actor>> {
         const item = ((await Item.fromDropData(data)) as unknown) as DS4Item;
         if (item && !this.actor.canOwnItemType(item.data.type)) {
             ui.notifications.warn(
@@ -229,6 +232,6 @@ export class DS4ActorSheet extends ActorSheet<unknown, DS4Actor> {
             );
             return false;
         }
-        return super["_onDropItem"](event, data); // TODO(types): Add _onDropItem to upstream (fixed by https://github.com/League-of-Foundry-Developers/foundry-vtt-types/pull/273)
+        return super._onDropItem(event, data);
     }
 }
diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts
index 1d2b227..5afc372 100644
--- a/src/module/item/item-sheet.ts
+++ b/src/module/item/item-sheet.ts
@@ -5,8 +5,7 @@ import { isDS4ItemDataTypePhysical } from "./item-data";
 /**
  * The Sheet class for DS4 Items
  */
-// TODO(types): Remove first generic parameter once https://github.com/League-of-Foundry-Developers/foundry-vtt-types/pull/273 is merged
-export class DS4ItemSheet extends ItemSheet<unknown, DS4Item> {
+export class DS4ItemSheet extends ItemSheet<DS4Item> {
     /** @override */
     static get defaultOptions(): BaseEntitySheet.Options {
         const superDefaultOptions = super.defaultOptions;
@@ -42,7 +41,7 @@ export class DS4ItemSheet extends ItemSheet<unknown, DS4Item> {
     }
 
     /** @override */
-    getData(): ItemSheet.Data<DS4Item> {
+    getData(): ItemSheet.Data<DS4Item> | Promise<ItemSheet.Data<DS4Item>> {
         const data = {
             ...super.getData(),
             config: DS4,