[#845] Container TLC

src/scss/partials/_items.scss

@@ -921,6 +921,13 @@ document-tags button {
   .price {
     display: flex;
     align-items: center;
-    gap: 0.25rem
+    gap: 0.25rem;
   }
 }
+
+.window-content
+  :is(.tidy-table-cell, .inventory-currency)
+  :is(input[type='text'], input[type='number']) {
+  --input-background-color: transparent;
+  padding-inline: 0.125rem;
+}

src/sheets/container/ContainerContentsSections.svelte

@@ -23,6 +23,8 @@
   import type { Readable } from 'svelte/store';
   import InlineContainerView from './InlineContainerView.svelte';
   import InlineActivitiesList from 'src/components/item-list/InlineActivitiesList.svelte';
+  import ItemUses from 'src/components/item-list/ItemUses.svelte';
+  import ItemAddUses from 'src/components/item-list/ItemAddUses.svelte';
 
   export let contents: InventorySection[];
   export let container: Item5e;
@@ -81,7 +83,7 @@
     ? `/* Controls */ ${classicControlWidthRems * classicControls.length}rem`
     : '';
 
-  $: gridTemplateColumns = `/* Name */ 1fr /* Weight */ 3rem /* Quantity */ 3rem ${classicControlsWidth}`;
+  $: gridTemplateColumns = `/* Name */ 1fr /* Uses */ 3.125rem /* Weight */ 3rem /* Quantity */ 3rem ${classicControlsWidth}`;
 
   const localize = FoundryAdapter.localize;
 </script>
@@ -101,6 +103,9 @@
             <TidyTableHeaderCell primary={true}>
               {localize(section.label)} ({section.items.length})
             </TidyTableHeaderCell>
+            <TidyTableHeaderCell title={localize('DND5E.Charges')}>
+              <i class="fas fa-bolt" />
+            </TidyTableHeaderCell>
             <TidyTableHeaderCell>
               {localize('DND5E.Weight')}
             </TidyTableHeaderCell>
@@ -154,6 +159,7 @@
                     >{item.name}</span
                   >
                 </ItemName>
+
                 {#if !FoundryAdapter.concealDetails(item)}
                   {@const attunementContext =
                     FoundryAdapter.getAttunementContext(item)}
@@ -170,6 +176,13 @@
                   <InlineFavoriteIcon />
                 {/if}
               </TidyTableCell>
+              <TidyTableCell>
+                {#if item.hasLimitedUses}
+                  <ItemUses {item} />
+                {:else}
+                  <ItemAddUses {item} />
+                {/if}
+              </TidyTableCell>
               <TidyTableCell
                 title={localize('TIDY5E.Inventory.Weight.Text', {
                   weight: weight,

src/sheets/mixins/BaseSheetCustomSectionMixin.ts

@@ -1,5 +1,6 @@
 import { TidyFlags } from 'src/foundry/TidyFlags';
 import type { Item5e } from 'src/types/item.types';
+import type { Actor5e } from 'src/types/types';
 import { isNil } from 'src/utils/data';
 
 /**
@@ -16,15 +17,38 @@ type OwnedItemsFunction = (object: any) => Map<string, Item5e>;
  */
 export function BaseSheetCustomSectionMixin<
   T extends new (...args: any[]) => {
+    _onDropItemCreate(item: any, event: DragEvent): Promise<any> | void;
     _onSortItem(
       event: DragEvent,
-      itemData: Record<string, unknown>
+      itemData: Record<string, unknown>,
+      allowSectionTransfer?: boolean
     ): Promise<any> | void;
+    actor: Actor5e;
     object: any;
   }
 >(itemsFn: OwnedItemsFunction, Base: T) {
   return class extends Base {
-    async _onSortItem(event: DragEvent, itemData: Record<string, unknown>) {
+    async _onDropItem(event: DragEvent, data: any) {
+      if (!this.actor.isOwner) return false;
+      const item = await Item.implementation.fromDropData(data);
+
+      // Handle moving out of container & item sorting
+      if (this.actor.uuid === item.parent?.uuid) {
+        const removingFromContainer = item.system.container !== null;
+        if (removingFromContainer) {
+          await item.update({ 'system.container': null });
+        }
+        return this._onSortItem(event, item.toObject(), !removingFromContainer);
+      }
+
+      return this._onDropItemCreate(item, event);
+    }
+
+    async _onSortItem(
+      event: DragEvent,
+      itemData: Record<string, unknown>,
+      allowSectionTransfer: boolean = true
+    ) {
       const sourceSection = foundry.utils.getProperty(
         itemData,
         TidyFlags.section.prop
@@ -42,6 +66,10 @@ export function BaseSheetCustomSectionMixin<
 
       const initialSortResult = await super._onSortItem(event, itemData);
 
+      if (!allowSectionTransfer) {
+        return initialSortResult;
+      }
+
       const item = itemsFn(this.object).get(itemData._id as string);
 
       return isMovedToNewSection