.

module/applications/sheets/actors/character.mjs

@@ -267,23 +267,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         context.isDeath = this.document.system.deathMoveViable;
         context.sidebarFavoritesEmpty = this.document.system.sidebarFavorites.length === 0;
         context.showfavorites = !context.sidebarFavoritesEmpty || this.document.system.usedUnarmed;
-
+        context.sidebarFavorites = this.document.system.sidebarFavorites.sort((a, b) => a.sort - b.sort);
-        // const initialFavorites = this.document.system.usedUnarmed
-        //     ? {
-        //           equipment: {
-        //               label: 'DAGGERHEART.GENERAL.equipment',
-        //               items: [{ type: 'attack', value: this.document.system.usedUnarmed }]
-        //           }
-        //       }
-        //     : {};
-        // context.sidebarFavorites = this.document.system.sidebarFavorites.reduce((acc, item) => {
-        //     const type = item.type === 'domainCard' ? item.type : 'equipment';
-        //     const label = type === 'domainCard' ? 'DAGGERHEART.GENERAL.loadout' : 'DAGGERHEART.GENERAL.equipment';
-        //     if (!acc[type]) acc[type] = { label, items: [] };
-        //     acc[type].items.push({ type: item.type, value: item });
-
-        //     return acc;
-        // }, initialFavorites);
     }
 
     /**
@@ -978,7 +962,12 @@ export default class CharacterSheet extends DHBaseActorSheet {
         if (inventoryItem) {
             event.dataTransfer.setDragImage(inventoryItem.querySelector('img'), 60, 0);
         }
-        super._onDragStart(event);
+
+        await super._onDragStart(event);
+        const baseDragData = foundry.applications.ux.TextEditor.getDragEventData(event);
+
+        const sidebarReorder = Boolean(event.target.closest('.items-sidebar-list'));
+        event.dataTransfer.setData('text/plain', JSON.stringify({ ...baseDragData, sidebarReorder }));
     }
 
     async _onDropItem(event, item) {
@@ -1027,16 +1016,57 @@ export default class CharacterSheet extends DHBaseActorSheet {
     }
 
     async _onSidebarDrop(event, item) {
-        if (!item.testUserPermission(game.user, 'OWNER')) return;
-
         if (!(item instanceof game.system.api.documents.DHItem)) return;
         if (!this.document.items.get(item.id)) return;
 
+        const data = foundry.applications.ux.TextEditor.getDragEventData(event);
+        if (data.sidebarReorder) {
+            return this.document.update({ 'system.sidebarFavorites': this.getDropSortedFavorites(event, item) });
+        }
+
+        if (!item.testUserPermission(game.user, 'OWNER')) return;
+
         const allowedItemTypes = ['domainCard', 'feature', 'weapon', 'armor', 'loot', 'consumable'];
         if (!allowedItemTypes.includes(item.type)) return;
 
-        if (this.document.system.sidebarFavorites.some(x => x.id === item.id)) return;
+        if (this.document.system.sidebarFavorites.some(x => x.item.id === item.id)) return;
 
-        this.document.update({ 'system.sidebarFavorites': [...this.document.system.sidebarFavorites, item] });
+        const nextSort = this.document.system.sidebarFavorites.length
+            ? this.document.system.sidebarFavorites.reduce((acc, curr) => Math.max(curr.sort, acc), 0) + 100000
+            : 0;
+        this.document.update({
+            'system.sidebarFavorites': [
+                ...this.document.system.sidebarFavorites.map(x => ({ ...x, item: x.item.uuid })),
+                { item, sort: nextSort }
+            ]
+        });
+    }
+
+    getDropSortedFavorites(event, item) {
+        const dropTarget = event.target.closest('[data-item-id]');
+        if (!dropTarget) return;
+
+        const siblings = [];
+        for (const element of dropTarget.parentElement.children) {
+            const siblingId = element.dataset.itemId;
+            if (siblingId && siblingId !== item.id && element.dataset.type !== 'attack')
+                siblings.push(this.document.system.sidebarFavorites.find(x => x.item.id === element.dataset.itemId));
+        }
+
+        const source = this.document.system.sidebarFavorites.find(x => x.item.id === item.id);
+        const target = this.document.system.sidebarFavorites.find(x => x.item.id === dropTarget.dataset.itemId);
+        const sortUpdates = foundry.utils.performIntegerSort(source, { target, siblings });
+        const updates = sortUpdates.map(u => ({
+            sort: u.update.sort,
+            item: u.target?.uuid ?? u.target.item.uuid
+        }));
+
+        const test = this.document.system.sidebarFavorites.reduce((acc, curr) => {
+            if (acc.some(x => x.item === curr.item.uuid)) return acc;
+            acc.push({ ...curr, item: curr.item.uuid });
+
+            return acc;
+        }, updates);
+        return test;
     }
 }

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

@@ -548,7 +548,9 @@ export default function DHApplicationMixin(Base) {
                 callback: async (target, _event) => {
                     const doc = await getDocFromElement(target);
                     this.document.update({
-                        'system.sidebarFavorites': this.document.system.sidebarFavorites.filter(x => x.id !== doc.id)
+                        'system.sidebarFavorites': this.document.system.sidebarFavorites
+                            .filter(x => x.item.id !== doc.id)
+                            .map(x => ({ ...x, item: x.item.uuid }))
                     });
                 }
             });
@@ -566,8 +568,15 @@ export default function DHApplicationMixin(Base) {
                 },
                 callback: async (target, _event) => {
                     const doc = await getDocFromElement(target);
+                    const nextSort = this.document.system.sidebarFavorites.length
+                        ? this.document.system.sidebarFavorites.reduce((acc, curr) => Math.max(curr.sort, acc), 0) +
+                          100000
+                        : 0;
                     this.document.update({
-                        'system.sidebarFavorites': [...this.document.system.sidebarFavorites, doc]
+                        'system.sidebarFavorites': [
+                            ...this.document.system.sidebarFavorites.map(x => ({ ...x, item: x.item.uuid })),
+                            { sort: nextSort, item: doc.uuid }
+                        ]
                     });
                 }
             });

module/data/actor/character.mjs

@@ -286,7 +286,12 @@ export default class DhCharacter extends BaseDataActor {
                     ignore: new fields.BooleanField()
                 })
             }),
-            sidebarFavorites: new ForeignDocumentUUIDArrayField({ type: 'Item' })
+            sidebarFavorites: new fields.ArrayField(
+                new fields.SchemaField({
+                    sort: new fields.NumberField({ required: true, nullable: false, integer: true }),
+                    item: new ForeignDocumentUUIDField({ type: 'Item' })
+                })
+            )
         };
     }
 

templates/sheets/actors/character/sidebar.hbs

@@ -109,10 +109,10 @@
                         type="attack"
                     }}
                 {{/if}}
-                {{#each this.document.system.sidebarFavorites as |item|}}
+                {{#each sidebarFavorites as |data|}}
                     {{> 'daggerheart.inventory-item-compact'
-                        item=item
+                        item=data.item
-                        type=item.type
+                        type=data.item.type
                     }}
                 {{/each}}
             </ul>
@@ -122,46 +122,28 @@
                 </div>
             {{/if}}
         </div>
-    </div>
         
-
+        <div class="experience-section">
-            {{!-- {{#each sidebarFavorites as |category|}}
+            <div class="title">
-                <div class="equipment-section">
+                <side-line-div class="invert"></side-line-div>
-                    <div class="title">
+                <h3>{{localize "DAGGERHEART.GENERAL.experience.single"}}</h3>
-                        <side-line-div class="invert"></side-line-div>
+                <side-line-div></side-line-div>
-                        <h3>{{localize category.label}}</h3>
+            </div>
-                        <side-line-div></side-line-div>
+            <div class="experience-list">
+                {{#each document.system.experiences as |experience id|}}
+                    <div class="experience-row" data-tooltip-text="{{experience.description}}">
+                        <span class="experience-value">
+                            +{{experience.value}}
+                        </span>
+                        <span class="experience-name">{{experience.name}}</span>
+                        <div class="controls">
+                            <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">
+                                <i class="fa-regular fa-message"></i>
+                            </a>
+                        </div>
                     </div>
-                    <ul class="items-sidebar-list">
+                {{/each}}
-                        {{#each category.items as |item|}}
+            </div>
-                            {{> 'daggerheart.inventory-item-compact'
-                                item=item.value
-                                type=item.type
-                            }}
-                        {{/each}}
-                    </ul>
-                </div>
-            {{/each}} --}}
-    <div class="experience-section">
-        <div class="title">
-            <side-line-div class="invert"></side-line-div>
-            <h3>{{localize "DAGGERHEART.GENERAL.experience.single"}}</h3>
-            <side-line-div></side-line-div>
-        </div>
-        <div class="experience-list">
-            {{#each document.system.experiences as |experience id|}}
-                <div class="experience-row" data-tooltip-text="{{experience.description}}">
-                    <span class="experience-value">
-                        +{{experience.value}}
-                    </span>
-                    <span class="experience-name">{{experience.name}}</span>
-                    <div class="controls">
-                        <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">
-                            <i class="fa-regular fa-message"></i>
-                        </a>
-                    </div>
-                </div>
-            {{/each}}
         </div>
     </div>
 </aside>