Merge branch 'development' into feature/313-preset-measured-templates

module/applications/dialogs/d20RollDialog.mjs

@@ -16,7 +16,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             this.action =
                 config.data.attack?._id == config.source.action
                     ? config.data.attack
-                    : this.item.system.actions.get(config.source.action);
+                    : this.item.system.actionsList?.find(a => a.id === config.source.action);
         }
     }
 

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

@@ -99,6 +99,7 @@ export default function DHApplicationMixin(Base) {
                 deleteDoc: DHSheetV2.#deleteDoc,
                 toChat: DHSheetV2.#toChat,
                 useItem: DHSheetV2.#useItem,
+                viewItem: DHSheetV2.#viewItem,
                 toggleEffect: DHSheetV2.#toggleEffect,
                 toggleExtended: DHSheetV2.#toggleExtended,
                 addNewItem: DHSheetV2.#addNewItem,
@@ -203,11 +204,19 @@ export default function DHApplicationMixin(Base) {
             this.relatedDocs.filter(doc => doc).map(doc => delete doc.apps[this.id]);
         }
 
+        /** @inheritdoc */
+        async _renderHTML(context, options) {
+            const rendered = await super._renderHTML(context, options);
+            for (const result of Object.values(rendered)) {
+                await this.#prepareInventoryDescription(result);
+            }
+            return rendered;
+        }
+
         /**@inheritdoc */
         async _onRender(context, options) {
             await super._onRender(context, options);
             this._createTagifyElements(this.options.tagifyConfigs);
-            await this.#prepareInventoryDescription(context);
         }
 
         /* -------------------------------------------- */
@@ -215,8 +224,8 @@ export default function DHApplicationMixin(Base) {
         /* -------------------------------------------- */
 
         /**@inheritdoc */
-        _syncPartState(partId, newElement, priorElement, state) {
-            super._syncPartState(partId, newElement, priorElement, state);
+        _preSyncPartState(partId, newElement, priorElement, state) {
+            super._preSyncPartState(partId, newElement, priorElement, state);
             for (const el of priorElement.querySelectorAll('.extensible.extended')) {
                 const { actionId, itemUuid } = el.parentElement.dataset;
                 const selector = `${actionId ? `[data-action-id="${actionId}"]` : `[data-item-uuid="${itemUuid}"]`} .extensible`;
@@ -496,11 +505,12 @@ export default function DHApplicationMixin(Base) {
 
         /**
          * Prepares and enriches an inventory item or action description for display.
+         * @param {HTMLElement} element the element to enrich the inventory items of
          * @returns {Promise<void>}
          */
-        async #prepareInventoryDescription(context) {
+        async #prepareInventoryDescription(element) {
             // Get all inventory item elements with a data-item-uuid attribute
-            const inventoryItems = this.element.querySelectorAll('.inventory-item[data-item-uuid]');
+            const inventoryItems = element.querySelectorAll('.inventory-item[data-item-uuid]');
             for (const el of inventoryItems) {
                 // Get the doc uuid from the element
                 const { itemUuid } = el?.dataset || {};
@@ -701,7 +711,7 @@ export default function DHApplicationMixin(Base) {
          * @type {ApplicationClickAction}
          */
         static async #toChat(_event, target) {
-            let doc = await getDocFromElement(target);
+            const doc = await getDocFromElement(target);
             return doc.toChat(doc.uuid);
         }
 
@@ -710,10 +720,19 @@ export default function DHApplicationMixin(Base) {
          * @type {ApplicationClickAction}
          */
         static async #useItem(event, target) {
-            let doc = await getDocFromElement(target);
+            const doc = await getDocFromElement(target);
             await doc.use(event);
         }
 
+        /**
+         * View an item by opening its sheet
+         * @type {ApplicationClickAction}
+         */
+        static async #viewItem(_, target) {
+            const doc = await getDocFromElement(target);
+            await doc.sheet.render({ force: true });
+        }
+
         /**
          * Toggle a ActiveEffect
          * @type {ApplicationClickAction}

module/applications/sheets/api/base-item.mjs

@@ -66,7 +66,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
 
     /**@inheritdoc */
     async _prepareContext(options) {
-        const context = super._prepareContext(options);
+        const context = await super._prepareContext(options);
         context.showAttribution = !game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
             .hideAttribution;
 

module/applications/sidebar/sidebar.mjs

@@ -1,10 +1,49 @@
-export default class DhSidebar extends Sidebar {
+export default class DhSidebar extends foundry.applications.sidebar.Sidebar {
     /** @override */
     static TABS = {
-        ...super.TABS,
+        chat: {
+            documentName: 'ChatMessage'
+        },
+        combat: {
+            documentName: 'Combat'
+        },
+        scenes: {
+            documentName: 'Scene',
+            gmOnly: true
+        },
+        actors: {
+            documentName: 'Actor'
+        },
+        items: {
+            documentName: 'Item'
+        },
+        journal: {
+            documentName: 'JournalEntry',
+            tooltip: 'SIDEBAR.TabJournal'
+        },
+        tables: {
+            documentName: 'RollTable'
+        },
+        cards: {
+            documentName: 'Cards'
+        },
+        macros: {
+            documentName: 'Macro'
+        },
+        playlists: {
+            documentName: 'Playlist'
+        },
+        compendium: {
+            tooltip: 'SIDEBAR.TabCompendium',
+            icon: 'fa-solid fa-book-atlas'
+        },
         daggerheartMenu: {
             tooltip: 'DAGGERHEART.UI.Sidebar.daggerheartMenu.title',
             img: 'systems/daggerheart/assets/logos/FoundryBorneLogoWhite.svg'
+        },
+        settings: {
+            tooltip: 'SIDEBAR.TabSettings',
+            icon: 'fa-solid fa-gears'
         }
     };
 

module/applications/ui/itemBrowser.mjs

@@ -16,6 +16,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         this.selectedMenu = { path: [], data: null };
         this.config = CONFIG.DH.ITEMBROWSER.compendiumConfig;
         this.presets = {};
+        this.compendiumBrowserTypeKey = 'compendiumBrowserDefault';
     }
 
     /** @inheritDoc */
@@ -84,10 +85,25 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
     /** @inheritDoc */
     async _preRender(context, options) {
         this.presets = options.presets ?? {};
-
-        const width = this.presets?.render?.noFolder === true || this.presets?.render?.lite === true ? 600 : 850;
-        if (this.rendered) this.setPosition({ width });
-        else options.position.width = width;
+        const noFolder = this.presets?.render?.noFolder;
+        if (noFolder === true) {
+            this.compendiumBrowserTypeKey = 'compendiumBrowserNoFolder';
+        }
+        const lite = this.presets?.render?.lite;
+        if (lite === true) {
+            this.compendiumBrowserTypeKey = 'compendiumBrowserLite';
+        }
+        const userPresetPosition = game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.compendiumBrowserTypeKey}`].position) ;
+ 
+        options.position = userPresetPosition ?? ItemBrowser.DEFAULT_OPTIONS.position;
+        
+        if (!userPresetPosition) {
+            const width = noFolder === true || lite === true ? 600 : 850;
+            if (this.rendered)
+                this.setPosition({ width });
+            else
+                options.position.width = width;
+        }
 
         await super._preRender(context, options);
     }
@@ -113,6 +129,10 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         });
     }
 
+    _onPosition(position) {
+        game.user.setFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.compendiumBrowserTypeKey}`].position, position);
+    }
+
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);