Remade apps handling

module/applications/sheets/api/application-mixin.mjs

@@ -108,6 +108,13 @@ export default function DHApplicationMixin(Base) {
             tagifyConfigs: []
         };
 
+        /**
+         * Related documents that should cause a rerender of this application when updated.
+         */
+        get relatedDocs() {
+            return [];
+        }
+
         /* -------------------------------------------- */
 
         /**@inheritdoc */
@@ -118,9 +125,17 @@ export default function DHApplicationMixin(Base) {
         /**@inheritdoc */
         async _onFirstRender(context, options) {
             await super._onFirstRender(context, options);
+            this.relatedDocs.map(doc => (doc.apps[this.id] = this));
+
             if (!!this.options.contextMenus.length) this._createContextMenus();
         }
 
+        /** @inheritDoc */
+        _onClose(options) {
+            super._onClose(options);
+            this.relatedDocs.map(doc => delete doc.apps[this.id]);
+        }
+
         /**@inheritdoc */
         async _onRender(context, options) {
             await super._onRender(context, options);
@@ -511,19 +526,7 @@ export default function DHApplicationMixin(Base) {
          */
         static async #editDoc(_event, target) {
             const doc = getDocFromElement(target);
-            if (doc) {
+            if (doc) return doc.sheet.render({ force: true });
-                const appId = this.element.id;
-                doc.apps[appId] = this;
-                const app = await doc.sheet.render({ force: true });
-                app.addEventListener(
-                    'close',
-                    () => {
-                        delete doc.apps[appId];
-                    },
-                    { once: true }
-                );
-                return;
-            }
 
             // TODO: REDO this
             const { actionId } = target.closest('[data-action-id]').dataset;

module/applications/sheets/items/ancestry.mjs

@@ -13,6 +13,11 @@ export default class AncestrySheet extends DHHeritageSheet {
         features: { template: 'systems/daggerheart/templates/sheets/items/ancestry/features.hbs' }
     };
 
+    /**@inheritdoc */
+    get relatedDocs() {
+        return this.document.system.features.map(x => x.item);
+    }
+
     /* -------------------------------------------- */
     /*  Application Drag/Drop                       */
     /* -------------------------------------------- */

module/applications/sheets/items/beastform.mjs

@@ -31,6 +31,11 @@ export default class BeastformSheet extends DHBaseItemSheet {
         }
     };
 
+    /**@inheritdoc */
+    get relatedDocs() {
+        return this.document.system.features;
+    }
+
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);
 

module/applications/sheets/items/class.mjs

@@ -58,6 +58,11 @@ export default class ClassSheet extends DHBaseItemSheet {
         }
     };
 
+    /**@inheritdoc */
+    get relatedDocs() {
+        return this.document.system.features.map(x => x.item);
+    }
+
     /**@inheritdoc */
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);

module/applications/sheets/items/community.mjs

@@ -15,4 +15,9 @@ export default class CommunitySheet extends DHHeritageSheet {
             scrollable: ['.feature']
         }
     };
+
+    /**@inheritdoc */
+    get relatedDocs() {
+        return this.document.system.features;
+    }
 }

module/applications/sheets/items/subclass.mjs

@@ -35,4 +35,9 @@ export default class SubclassSheet extends DHBaseItemSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
+
+    /**@inheritdoc */
+    get relatedDocs() {
+        return this.document.system.features.map(x => x.item);
+    }
 }

module/data/item/base.mjs

@@ -148,4 +148,35 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
                 items.map(x => x.id)
             );
     }
+
+    async _preUpdate(changed, options, userId) {
+        const allowed = await super._preUpdate(changed, options, userId);
+        if (allowed === false) return false;
+
+        if (changed.system?.features) {
+            const prevFeatures = new Set(this.features);
+            const newFeatures = new Set(changed.system.features);
+            options.changedFeatures = {
+                toLink: Array.from(newFeatures.difference(prevFeatures).map(feature => feature.item ?? feature)),
+                toUnlink: Array.from(
+                    prevFeatures.difference(newFeatures).map(feature => feature.item?.uuid ?? feature.uuid)
+                )
+            };
+        }
+    }
+
+    _onUpdate(changed, options, userId) {
+        super._onUpdate(changed, options, userId);
+
+        if (options.changedFeatures) {
+            options.changedFeatures.toLink.forEach(featureUuid => {
+                const doc = foundry.utils.fromUuidSync(featureUuid);
+                doc.apps[this.parent.sheet.id] = this.parent.sheet;
+            });
+            options.changedFeatures.toUnlink.forEach(featureUuid => {
+                const doc = foundry.utils.fromUuidSync(featureUuid);
+                delete doc.apps[this.parent.sheet.id];
+            });
+        }
+    }
 }