Better separation of concerns

lang/en.json

@@ -2055,7 +2055,6 @@
                 "partyMembers": "Party Members",
                 "projects": "Projects",
                 "types": "Types",
-                "itemFeatures": "Item Features",
                 "questions": "Questions",
                 "configuration": "Configuration",
                 "base": "Base"

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

@@ -79,9 +79,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
 
         switch (partId) {
             case 'description':
-                context.enrichedDescription = await this.document.system.getEnrichedDescription({
+                context.enrichedDescription = await this.document.system.getEnrichedDescription();
-                    headerStyle: 'large'
-                });
                 break;
             case 'effects':
                 await this._prepareEffectsContext(context, options);

module/data/item/armor.mjs

@@ -55,19 +55,18 @@ export default class DHArmor extends AttachableItem {
     }
 
     /**@inheritdoc */
-    async getDescriptionData(options = {}) {
+    async getDescriptionData() {
-        const baseDescription = await super.getDescriptionData();
+        const baseDescription = this.description;
         const allFeatures = CONFIG.DH.ITEM.allArmorFeatures();
         const features = this.armorFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return baseDescription;
+        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
 
-        const prepend = await foundry.applications.handlebars.renderTemplate(
+        const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/armor/description.hbs',
-            { features, headerStyle: options.headerStyle }
+            { features }
         );
 
-        const mainDescription = baseDescription ? `\n<hr>\n${baseDescription}` : '';
+        return { prefix, value: baseDescription, suffix: null };
-        return `${prepend}${mainDescription}`;
     }
 
     /**@inheritdoc */

module/data/item/base.mjs

@@ -130,7 +130,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
      * @returns {string}
      */
     async getDescriptionData(_options) {
-        return this.description;
+        return { prefix: null, value: this.description, suffix: null };
     }
 
     /**
@@ -138,11 +138,21 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
      * @param {object} [options] - Options that modify the styling of the rendered template. { headerStyle: undefined|'none'|'large' }
      * @returns {string}
      */
-    async getEnrichedDescription(options) {
+    async getEnrichedDescription() {
         if (!this.metadata.hasDescription) return '';
 
-        const description = await this.getDescriptionData(options);
+        const appendWithSeparator = (text, add) => {
-        return await foundry.applications.ux.TextEditor.implementation.enrichHTML(description, {
+            if (!add) return text;
+            if (text) return `${text}\n<hr>\n${add}`;
+            else return add;
+        };
+
+        const { prefix, value, suffix } = await this.getDescriptionData();
+        let fullDescription = prefix ?? '';
+        fullDescription = appendWithSeparator(fullDescription, value);
+        fullDescription = appendWithSeparator(fullDescription, suffix);
+
+        return await foundry.applications.ux.TextEditor.implementation.enrichHTML(fullDescription, {
             relativeTo: this,
             rollData: this.getRollData(),
             secrets: this.isOwner

module/data/item/weapon.mjs

@@ -111,19 +111,18 @@ export default class DHWeapon extends AttachableItem {
     }
 
     /**@inheritdoc */
-    async getDescriptionData(options = {}) {
+    async getDescriptionData() {
-        const baseDescription = await super.getDescriptionData();
+        const baseDescription = this.description;
         const allFeatures = CONFIG.DH.ITEM.allWeaponFeatures();
         const features = this.weaponFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return baseDescription;
+        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
 
-        const prepend = await foundry.applications.handlebars.renderTemplate(
+        const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/weapon/description.hbs',
-            { features, headerStyle: options.headerStyle }
+            { features }
         );
 
-        const mainDescription = baseDescription ? `\n<hr>\n${baseDescription}` : '';
+        return { prefix, value: baseDescription, suffix: null };
-        return `${prepend}${mainDescription}`;
     }
 
     prepareDerivedData() {

module/documents/tooltipManager.mjs

@@ -221,15 +221,14 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
                     const itemIsAction = itemValue instanceof game.system.api.models.actions.actionsTypes.base;
                     const value = itemIsAction || !itemValue?.item ? itemValue : itemValue.item;
                     const enrichedValue =
-                        (await value.system?.getEnrichedDescription?.({ headerStyle: 'none' })) ??
+                        (await value.system?.getEnrichedDescription?.()) ??
                         (await TextEditor.enrichHTML(value.system?.description ?? value.description));
                     if (itemIsAction) value.enrichedDescription = enrichedValue;
                     else foundry.utils.setProperty(item, `${basePath}.${index}.enrichedDescription`, enrichedValue);
                 }
             } else {
                 const enrichedValue =
-                    (await item.system?.getEnrichedDescription?.({ headerStyle: 'none' })) ??
+                    (await item.system?.getEnrichedDescription?.()) ?? (await TextEditor.enrichHTML(pathValue));
-                    (await TextEditor.enrichHTML(pathValue));
                 foundry.utils.setProperty(
                     item,
                     `${data.path ? `${data.path}.` : ''}enriched${data.name.capitalize()}`,

styles/less/sheets/items/item-sheet-shared.less

@@ -10,16 +10,4 @@
         font-family: @font-body;
         color: light-dark(@chat-blue-bg, @beige-50);
     }
-
-    .feature-descriptions {
-        .features-header {
-            font-size: 14px;
-            font-weight: bold;
-            text-decoration: underline;
-
-            &.large {
-                font-size: 18px;
-            }
-        }
-    }
 }

templates/sheets/items/armor/description.hbs

@@ -1,7 +1,4 @@
-<div class="feature-descriptions">
+<div>
-    {{#unless (eq headerStyle 'none')}}
-        <div class="features-header {{#if (eq headerStyle 'large')}}large{{/if}}">{{localize "DAGGERHEART.SETTINGS.Homebrew.itemFeatures"}}</div>
-    {{/unless}}
     {{#each features as | feature |}}
         <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
     {{/each}}

templates/sheets/items/weapon/description.hbs

@@ -1,7 +1,4 @@
-<div class="feature-descriptions">
+<div>
-    {{#unless (eq headerStyle 'none')}}
-        <div class="features-header {{#if (eq headerStyle 'large')}}large{{/if}}">{{localize "DAGGERHEART.SETTINGS.Homebrew.itemFeatures"}}</div>
-    {{/unless}}
     {{#each features as | feature |}}
         <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
     {{/each}}