diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs index 42e1615d..2dcfff6e 100644 --- a/module/applications/sheets/api/application-mixin.mjs +++ b/module/applications/sheets/api/application-mixin.mjs @@ -97,15 +97,13 @@ export default function DHApplicationMixin(Base) { // Validate required fields if (!selector || !options || !callback) { - console.warn('Invalid TagifyConfig - missing required properties', config); - return; + throw new Error('Invalid TagifyConfig - missing required properties', config); } // Find target element const element = this.element.querySelector(selector); if (!element) { - console.warn(`Element not found with selector: ${selector}`); - return; + throw new Error(`Element not found with selector: ${selector}`); } // Resolve dynamic options if function provided const resolvedOptions = typeof options === 'function' ? options.call(this) : options; @@ -113,7 +111,7 @@ export default function DHApplicationMixin(Base) { // Initialize Tagify tagifyElement(element, resolvedOptions, callback.bind(this), tagifyOptions); } catch (error) { - console.error('Error initializing Tagify:', error, config); + console.error('Error initializing Tagify:', error); } }); } @@ -141,7 +139,7 @@ export default function DHApplicationMixin(Base) { * @param {DragEvent} event * @protected */ - _onDrop(event) {} + _onDrop(event) { } /* -------------------------------------------- */ /* Prepare Context */ diff --git a/module/applications/sheets/item.mjs b/module/applications/sheets/item.mjs deleted file mode 100644 index 1b8c416b..00000000 --- a/module/applications/sheets/item.mjs +++ /dev/null @@ -1,132 +0,0 @@ -import DhpApplicationMixin from './daggerheart-sheet.mjs'; -import DHActionConfig from '../config/Action.mjs'; -import { actionsTypes } from '../../data/_module.mjs'; - -export default function DHItemMixin(Base) { - return class DHItemSheetV2 extends DhpApplicationMixin(Base) { - constructor(options = {}) { - super(options); - } - - static DEFAULT_OPTIONS = { - tag: 'form', - classes: ['daggerheart', 'sheet', 'item', 'dh-style'], - position: { width: 600 }, - form: { - handler: this.updateForm, - submitOnChange: true, - closeOnSubmit: false - }, - actions: { - addAction: this.addAction, - editAction: this.editAction, - removeAction: this.removeAction - } - }; - - static TABS = { - description: { - active: true, - cssClass: '', - group: 'primary', - id: 'description', - icon: null, - label: 'DAGGERHEART.Sheets.Feature.Tabs.Description' - }, - actions: { - active: false, - cssClass: '', - group: 'primary', - id: 'actions', - icon: null, - label: 'DAGGERHEART.Sheets.Feature.Tabs.Actions' - }, - settings: { - active: false, - cssClass: '', - group: 'primary', - id: 'settings', - icon: null, - label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings' - } - }; - - async _prepareContext(_options) { - const context = await super._prepareContext(_options); - context.document = this.document; - context.config = CONFIG.daggerheart; - context.tabs = super._getTabs(this.constructor.TABS); - - return context; - } - - static async updateForm(event, _, formData) { - await this.document.update(formData.object); - this.render(); - } - - static async selectActionType() { - const content = await foundry.applications.handlebars.renderTemplate( - 'systems/daggerheart/templates/views/actionType.hbs', - { types: SYSTEM.ACTIONS.actionTypes } - ), - title = 'Select Action Type', - type = 'form', - data = {}; - return Dialog.prompt({ - title, - label: title, - content, - type, - callback: html => { - const form = html[0].querySelector('form'), - fd = new foundry.applications.ux.FormDataExtended(form); - foundry.utils.mergeObject(data, fd.object, { inplace: true }); - // if (!data.name?.trim()) data.name = game.i18n.localize(SYSTEM.ACTIONS.actionTypes[data.type].name); - return data; - }, - rejectClose: false - }); - } - - static async addAction() { - const actionType = await DHItemSheetV2.selectActionType(), - actionIndexes = this.document.system.actions.map(x => x._id.split('-')[2]).sort((a, b) => a - b); - try { - const cls = actionsTypes[actionType?.type] ?? actionsTypes.attack, - action = new cls( - { - // id: `${this.document.id}-Action-${actionIndexes.length > 0 ? actionIndexes[0] + 1 : 1}` - _id: foundry.utils.randomID(), - type: actionType.type, - name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name), - ...cls.getSourceConfig(this.document) - }, - { - parent: this.document - } - ); - await this.document.update({ 'system.actions': [...this.document.system.actions, action] }); - await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render( - true - ); - } catch (error) { - console.log(error); - } - } - - static async editAction(_, button) { - const action = this.document.system.actions[button.dataset.index]; - await new DHActionConfig(action).render(true); - } - - static async removeAction(event, button) { - event.stopPropagation(); - await this.document.update({ - 'system.actions': this.document.system.actions.filter( - (_, index) => index !== Number.parseInt(button.dataset.index) - ) - }); - } - }; -} diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs index 06244972..efe556fa 100644 --- a/module/applications/sheets/items/class.mjs +++ b/module/applications/sheets/items/class.mjs @@ -20,7 +20,7 @@ export default class ClassSheet extends DHBaseItemSheet { tagifyConfigs: [ { selector: '.domain-input', - choices: () => CONFIG.daggerheart.DOMAIN.domains, + options: () => CONFIG.daggerheart.DOMAIN.domains, callback: ClassSheet.#onDomainSelect } ], @@ -138,17 +138,32 @@ export default class ClassSheet extends DHBaseItemSheet { /* Application Clicks Actions */ /* -------------------------------------------- */ + /** + * Removes an item from an class collection by UUID. + * @param {PointerEvent} event - The originating click event + * @param {HTMLElement} element - The capturing HTML element which defines the [data-action="removeItemFromCollection"] + */ static async #removeItemFromCollection(_event, element) { const { uuid, target } = element.dataset; const prop = foundry.utils.getProperty(this.document.system, target); await this.document.update({ [target]: prop.filter(i => i.uuid !== uuid) }); } + /** + * Removes an suggested item from the class. + * @param {PointerEvent} _event - The originating click event + * @param {HTMLElement} element - The capturing HTML element which defines the [data-action="removeSuggestedItem"] + */ static async #removeSuggestedItem(_event, element) { const { target } = element.dataset; await this.document.update({ [`system.characterGuide.${target}`]: null }); } + /** + * Open the sheet of a item by UUID. + * @param {PointerEvent} _event - + * @param {HTMLElement} button + */ static async #viewDoc(_event, button) { const doc = await fromUuid(button.dataset.uuid); doc.sheet.render({ force: true }); diff --git a/module/applications/sheets/items/feature.mjs b/module/applications/sheets/items/feature.mjs index 077186f1..655e4542 100644 --- a/module/applications/sheets/items/feature.mjs +++ b/module/applications/sheets/items/feature.mjs @@ -48,6 +48,8 @@ export default class FeatureSheet extends DHBaseItemSheet { } }; + /* -------------------------------------------- */ + /**@inheritdoc*/ _attachPartListeners(partId, htmlElement, options) { super._attachPartListeners(partId, htmlElement, options); @@ -65,6 +67,8 @@ export default class FeatureSheet extends DHBaseItemSheet { this.render({ parts: ['effects'] }); } + /* -------------------------------------------- */ + /**@inheritdoc */ async _prepareContext(_options) { const context = await super._prepareContext(_options); @@ -77,6 +81,10 @@ export default class FeatureSheet extends DHBaseItemSheet { return context; } + /* -------------------------------------------- */ + /* Application Clicks Actions */ + /* -------------------------------------------- */ + /** * Adds a new effect to the item, based on the selected effect type. * @param {PointerEvent} _event - The originating click event diff --git a/module/applications/sheets/items/subclass.mjs b/module/applications/sheets/items/subclass.mjs index c12593ec..841c3eb2 100644 --- a/module/applications/sheets/items/subclass.mjs +++ b/module/applications/sheets/items/subclass.mjs @@ -39,6 +39,8 @@ export default class SubclassSheet extends DHBaseItemSheet { } }; + //TODO redo everything below this message + static addFeature(_, target) { if (target.dataset.type === 'action') this.addAction(target.dataset.level); else this.addEffect(target.dataset.level);