From d66ae739018b3b4df26784b7c7ef50eae37ba46b Mon Sep 17 00:00:00 2001
From: nsalyzyn <nsalyzyn@gmail.com>
Date: Thu, 18 Dec 2025 17:30:28 -0700
Subject: [PATCH] Fixing other uses of dragDrop to handle the layout change

---
 module/applications/sheets/actors/adversary.mjs      | 5 ++++-
 module/applications/sheets/actors/environment.mjs    | 5 ++++-
 module/applications/sheets/actors/party.mjs          | 5 ++++-
 module/applications/sheets/api/application-mixin.mjs | 5 ++++-
 module/applications/sheets/api/base-actor.mjs        | 3 ++-
 module/applications/sheets/api/base-item.mjs         | 3 ++-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 6b6354ef..5e6a17f2 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -26,7 +26,10 @@ export default class AdversarySheet extends DHBaseActorSheet {
                 }
             ]
         },
-        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
+        dragDrop: [
+            { dragSelector: '[data-item-id][draggable="true"]', dropSelector: null },
+            { dragSelector: '[data-item-id] [draggable="true"]', dropSelector: null }
+        ]
     };
 
     static PARTS = {
diff --git a/module/applications/sheets/actors/environment.mjs b/module/applications/sheets/actors/environment.mjs
index 9a09cd94..312b62ff 100644
--- a/module/applications/sheets/actors/environment.mjs
+++ b/module/applications/sheets/actors/environment.mjs
@@ -25,7 +25,10 @@ export default class DhpEnvironment extends DHBaseActorSheet {
             toggleResourceDice: DhpEnvironment.#toggleResourceDice,
             handleResourceDice: DhpEnvironment.#handleResourceDice
         },
-        dragDrop: [{ dragSelector: '.inventory-item', dropSelector: null }]
+        dragDrop: [
+            { dragSelector: '.inventory-item', dropSelector: null },
+            { dragSelector: '.inventory-item [draggable="true"]', dropSelector: null }
+        ]
     };
 
     /**@override */
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 5c448b49..96408775 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -40,7 +40,10 @@ export default class Party extends DHBaseActorSheet {
             selectRefreshable: DaggerheartMenu.selectRefreshable,
             refreshActors: DaggerheartMenu.refreshActors
         },
-        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
+        dragDrop: [
+            { dragSelector: '[data-item-id][draggable="true"]', dropSelector: null },
+            { dragSelector: '[data-item-id] [draggable="true"]', dropSelector: null }
+        ]
     };
 
     /**@override */
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 2b68d4a5..2ae6e9cf 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -124,7 +124,10 @@ export default function DHApplicationMixin(Base) {
                     }
                 }
             ],
-            dragDrop: [{ dragSelector: '.inventory-item[data-type="effect"]', dropSelector: null }],
+            dragDrop: [
+                { dragSelector: '.inventory-item[data-type="effect"]', dropSelector: null },
+                { dragSelector: '.inventory-item[data-type="effect"] [draggable="true"]', dropSelector: null }
+            ],
             tagifyConfigs: []
         };
 
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index 5d054949..68cceed6 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -36,6 +36,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         ],
         dragDrop: [
             { dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null },
+            { dragSelector: '.inventory-item[data-type="attack"] [draggable="true"]', dropSelector: null },
             { dragSelector: ".currency[data-currency] .drag-handle", dropSelector: null }
         ]
     };
@@ -374,4 +375,4 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
 
         super._onDragStart(event);
     }
-}
\ No newline at end of file
+}
diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs
index 42ed9426..c59e964d 100644
--- a/module/applications/sheets/api/base-item.mjs
+++ b/module/applications/sheets/api/base-item.mjs
@@ -35,7 +35,8 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
         dragDrop: [
             { dragSelector: null, dropSelector: '.drop-section' },
             { dragSelector: '.feature-item', dropSelector: null },
-            { dragSelector: '.inventory-item', dropSelector: null }
+            { dragSelector: '.inventory-item', dropSelector: null },
+            { dragSelector: '.inventory-item [draggable="true"]', dropSelector: null }
         ],
         contextMenus: [
             {