From e79ccd34e98bda971f81e88252ad16434a26a8ea Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Thu, 26 Feb 2026 11:42:42 +0100
Subject: [PATCH] [Fix] 1671 - Compendium Context Menues (#1677)

* Fixed

* .
---
 .../sheets/api/application-mixin.mjs          | 18 ++++++-------
 .../partials/inventory-fieldset-items-V2.hbs  |  1 +
 .../global/partials/inventory-item-V2.hbs     |  8 ++++--
 templates/sheets/global/tabs/tab-effects.hbs  | 25 ++++++++++---------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 49f7dcf0..449880fb 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -431,18 +431,18 @@ export default function DHApplicationMixin(Base) {
                 {
                     name: 'disableEffect',
                     icon: 'fa-solid fa-lightbulb',
-                    condition: target => {
-                        const doc = getDocFromElementSync(target);
-                        return doc && !doc.disabled && doc.type !== 'beastform';
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return !target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: true })
                 },
                 {
                     name: 'enableEffect',
                     icon: 'fa-regular fa-lightbulb',
-                    condition: target => {
-                        const doc = getDocFromElementSync(target);
-                        return doc && doc.disabled && doc.type !== 'beastform';
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: false })
                 }
@@ -536,9 +536,9 @@ export default function DHApplicationMixin(Base) {
                 options.push({
                     name: 'CONTROLS.CommonDelete',
                     icon: 'fa-solid fa-trash',
-                    condition: target => {
-                        const doc = getDocFromElementSync(target);
-                        return doc && doc.type !== 'beastform';
+                    condition: element => {
+                        const target = element.closest('[data-item-uuid]');
+                        return target.dataset.itemType !== 'beastform';
                     },
                     callback: async (target, event) => {
                         const doc = await getDocFromElement(target);
diff --git a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
index d2534a5a..0a3275d0 100644
--- a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
+++ b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
@@ -56,6 +56,7 @@ Parameters:
     {{> 'daggerheart.inventory-item'
     item=item
     type=../type
+    disabledEffect=../disabledEffect
     actorType=../actorType
     hideControls=../hideControls
     hideContextMenu=../hideContextMenu
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 76e13a5c..fec215a0 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -17,8 +17,12 @@ Parameters:
 - showActions {boolean} : If true show feature's actions.
 --}}
 
-<li class="inventory-item" data-item-id="{{item.id}}" {{#if (or (eq type 'action' ) (eq type 'attack' ))}}
-  data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}">
+<li class="inventory-item" data-item-id="{{item.id}}" 
+    {{#if (or (eq type 'action' ) (eq type 'attack' ))}}data-action-id="{{item.id}}" {{/if}} 
+    {{#if disabledEffect}}data-disabled="true"{{/if}}
+    data-type="{{type}}" data-item-type="{{item.type}}"
+    data-item-uuid="{{item.uuid}}" data-no-compendium-edit="{{noCompendiumEdit}}"
+>
   <div class="inventory-item-header {{#if hideContextMenu}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
     {{!-- Image --}}
     <div class="img-portait" data-action='{{ifThen (or (hasProperty item "use") (eq type "attack")) "useItem" (ifThen
diff --git a/templates/sheets/global/tabs/tab-effects.hbs b/templates/sheets/global/tabs/tab-effects.hbs
index c89c6ff4..1f0967b8 100644
--- a/templates/sheets/global/tabs/tab-effects.hbs
+++ b/templates/sheets/global/tabs/tab-effects.hbs
@@ -2,20 +2,21 @@
     data-group='{{tabs.effects.group}}'>
 
     {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.activeEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.actives
-    canCreate=true
-    hideResources=true
+        title='DAGGERHEART.GENERAL.activeEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.actives
+        canCreate=true
+        hideResources=true
     }}
 
     {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.inactiveEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.inactives
-    canCreate=true
-    hideResources=true
+        title='DAGGERHEART.GENERAL.inactiveEffects'
+        type='effect'
+        disabledEffect=true
+        isGlassy=true
+        collection=effects.inactives
+        canCreate=true
+        hideResources=true
     }}
 </section>
\ No newline at end of file