cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-24 00:13:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

REFACTOR: prettier

Browse source
This commit is contained in:
Joaquin Pereyra 2025-07-02 21:51:04 -03:00
parent 0ad4c8d71e
commit b743c9b628
3 changed files with 226 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

26
module/applications/sheets/character.mjs
View file

@ -217,7 +217,6 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
this._createContextMenues(); this._createContextMenues();
this._createFilterMenus(); this._createFilterMenus();
} }
/** @inheritDoc */ /** @inheritDoc */
@ -474,11 +473,11 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
#filteredItems = { #filteredItems = {
inventory: { inventory: {
search: new Set(), search: new Set(),
menu: new Set(), menu: new Set()
}, },
loadout: { loadout: {
search: new Set(), search: new Set(),
menu: new Set(), menu: new Set()
} }
}; };
@ -571,7 +570,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
content: '.items-section', content: '.items-section',
callback: this._onMenuFilterInventory.bind(this), callback: this._onMenuFilterInventory.bind(this),
target: '.filter-button', target: '.filter-button',
filters: FilterMenu.invetoryFilters, filters: FilterMenu.invetoryFilters
}, },
{ {
key: 'loadout', key: 'loadout',
@ -579,20 +578,18 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
content: '.items-section', content: '.items-section',
callback: this._onMenuFilterLoadout.bind(this), callback: this._onMenuFilterLoadout.bind(this),
target: '.filter-button', target: '.filter-button',
filters: FilterMenu.cardsFilters, filters: FilterMenu.cardsFilters
} }
]; ];
menus.forEach(m => { menus.forEach(m => {
const container = this.element.querySelector(m.container); const container = this.element.querySelector(m.container);
this.#menu[m.key] = new FilterMenu(container, m.target, m.filters, m.callback, { this.#menu[m.key] = new FilterMenu(container, m.target, m.filters, m.callback, {
contentSelector: m.content, contentSelector: m.content
}); });
}); });
} }
/** /**
* Callback when filters change * Callback when filters change
* @param {PointerEvent} event * @param {PointerEvent} event
@ -605,14 +602,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
for (const li of html.querySelectorAll('.inventory-item')) { for (const li of html.querySelectorAll('.inventory-item')) {
const item = this.document.items.get(li.dataset.itemId); const item = this.document.items.get(li.dataset.itemId);
const matchesMenu = filters.length === 0 || const matchesMenu =
filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f)); filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
if (matchesMenu) this.#filteredItems.inventory.menu.add(item.id); if (matchesMenu) this.#filteredItems.inventory.menu.add(item.id);
const { search } = this.#filteredItems.inventory; const { search } = this.#filteredItems.inventory;
li.hidden = !(search.has(item.id) && matchesMenu); li.hidden = !(search.has(item.id) && matchesMenu);
} }
} }
/** /**
@ -627,14 +623,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
for (const li of html.querySelectorAll('.items-list .inventory-item, .card-list .card-item')) { for (const li of html.querySelectorAll('.items-list .inventory-item, .card-list .card-item')) {
const item = this.document.items.get(li.dataset.itemId); const item = this.document.items.get(li.dataset.itemId);
const matchesMenu = filters.length === 0 || const matchesMenu =
filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f)); filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
if (matchesMenu) this.#filteredItems.loadout.menu.add(item.id); if (matchesMenu) this.#filteredItems.loadout.menu.add(item.id);
const { search } = this.#filteredItems.loadout; const { search } = this.#filteredItems.loadout;
li.hidden = !(search.has(item.id) && matchesMenu); li.hidden = !(search.has(item.id) && matchesMenu);
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -915,7 +910,8 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const systemData = { const systemData = {
name: game.i18n.localize('DAGGERHEART.General.Experience.Single'), name: game.i18n.localize('DAGGERHEART.General.Experience.Single'),
description: `${experience.description} ${experience.total < 0 ? experience.total : `+${experience.total}` description: `${experience.description} ${
experience.total < 0 ? experience.total : `+${experience.total}`
}` }`
}; };
const msg = new cls({ const msg = new cls({

2
module/applications/ux/_module.mjs
View file

@ -1 +1 @@
export { default as FilterMenu} from "./filter-menu.mjs"; export { default as FilterMenu } from './filter-menu.mjs';

79
module/applications/ux/filter-menu.mjs
View file

@ -17,7 +17,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
constructor(container, selector, menuItems, callback, options = {}) { constructor(container, selector, menuItems, callback, options = {}) {
// Set default options // Set default options
const mergedOptions = { const mergedOptions = {
eventName: "click", eventName: 'click',
fixed: true, fixed: true,
...options ...options
}; };
@ -27,7 +27,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
// Initialize filter states // Initialize filter states
this.menuItems = menuItems.map(item => ({ this.menuItems = menuItems.map(item => ({
...item, ...item,
enabled: false, enabled: false
})); }));
this.callback = callback; this.callback = callback;
@ -39,7 +39,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
cancelable: true, cancelable: true,
pointerType: 'mouse', pointerType: 'mouse',
isPrimary: true, isPrimary: true,
button: 0, button: 0
}; };
this.callback(syntheticEvent, this.contentElement, this.getActiveFilterData()); this.callback(syntheticEvent, this.contentElement, this.getActiveFilterData());
@ -50,8 +50,8 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
await super.render(target, { ...options, animate: false }); await super.render(target, { ...options, animate: false });
// Create menu structure // Create menu structure
const menu = document.createElement("menu"); const menu = document.createElement('menu');
menu.className = "filter-menu"; menu.className = 'filter-menu';
// Group items by their group property // Group items by their group property
const groups = this.#groupItems(this.menuItems); const groups = this.#groupItems(this.menuItems);
@ -67,7 +67,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
// Update menu and set position // Update menu and set position
this.element.replaceChildren(menu); this.element.replaceChildren(menu);
menu.addEventListener("click", this.#handleClick.bind(this)); menu.addEventListener('click', this.#handleClick.bind(this));
this._setPosition(this.element, target, options); this._setPosition(this.element, target, options);
@ -82,7 +82,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
*/ */
#groupItems(items) { #groupItems(items) {
return items.reduce((groups, item) => { return items.reduce((groups, item) => {
const group = item.group ?? "_none"; const group = item.group ?? '_none';
groups[group] = groups[group] || []; groups[group] = groups[group] || [];
groups[group].push(item); groups[group].push(item);
return groups; return groups;
@ -96,19 +96,19 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
* @returns {HTMLDivElement} The section DOM element containing the label and buttons. * @returns {HTMLDivElement} The section DOM element containing the label and buttons.
*/ */
#createSection(groupName, items) { #createSection(groupName, items) {
const section = document.createElement("fieldset"); const section = document.createElement('fieldset');
section.className = "filter-section"; section.className = 'filter-section';
const header = document.createElement("legend"); const header = document.createElement('legend');
header.textContent = groupName; header.textContent = groupName;
section.appendChild(header); section.appendChild(header);
const buttons = document.createElement("div"); const buttons = document.createElement('div');
buttons.className = "filter-buttons"; buttons.className = 'filter-buttons';
items.forEach(item => { items.forEach(item => {
const button = document.createElement("button"); const button = document.createElement('button');
button.className = `filter-button ${item.enabled ? "active" : ""}`; button.className = `filter-button ${item.enabled ? 'active' : ''}`;
button.textContent = item.name; button.textContent = item.name;
item.element = button; item.element = button;
buttons.appendChild(button); buttons.appendChild(button);
@ -118,7 +118,6 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
return section; return section;
} }
/** /**
* Get filter data from active filters * Get filter data from active filters
* @returns {Array} Array of filter configurations * @returns {Array} Array of filter configurations
@ -138,25 +137,24 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const button = event.target.closest(".filter-button"); const button = event.target.closest('.filter-button');
if (!button) return; if (!button) return;
const clickedItem = this.menuItems.find(item => item.element === button); const clickedItem = this.menuItems.find(item => item.element === button);
if (!clickedItem) return; if (!clickedItem) return;
const isActive = button.classList.toggle("active"); const isActive = button.classList.toggle('active');
clickedItem.enabled = isActive; clickedItem.enabled = isActive;
const filters = this.getActiveFilterData(); const filters = this.getActiveFilterData();
if (filters.length > 0) { if (filters.length > 0) {
this.target.classList.add("fa-beat", "active"); this.target.classList.add('fa-beat', 'active');
} else { } else {
this.target.classList.remove("fa-beat", "active"); this.target.classList.remove('fa-beat', 'active');
} }
this.callback(event, this.contentElement, filters); this.callback(event, this.contentElement, filters);
} }
/** /**
@ -169,40 +167,39 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
const typesFilters = Object.entries(CONFIG.Item.dataModels) const typesFilters = Object.entries(CONFIG.Item.dataModels)
.filter(([, { metadata }]) => metadata.isInventoryItem) .filter(([, { metadata }]) => metadata.isInventoryItem)
.map(([type, { metadata }]) => ({ .map(([type, { metadata }]) => ({
group: game.i18n.localize("Type"), group: game.i18n.localize('Type'),
name: game.i18n.localize(metadata.label), name: game.i18n.localize(metadata.label),
filter: { filter: {
field: "type", field: 'type',
operator: OPERATORS.EQUALS, operator: OPERATORS.EQUALS,
value: type value: type
} }
})); }));
const burdenFilter = Object.values(CONFIG.daggerheart.GENERAL.burden).map(({ value, label }) => ({ const burdenFilter = Object.values(CONFIG.daggerheart.GENERAL.burden).map(({ value, label }) => ({
group: game.i18n.localize("DAGGERHEART.Sheets.Weapon.Burden"), group: game.i18n.localize('DAGGERHEART.Sheets.Weapon.Burden'),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {
field: "system.burden", field: 'system.burden',
operator: OPERATORS.EQUALS, operator: OPERATORS.EQUALS,
value: value value: value
} }
})); }));
const damageTypeFilter = Object.values(CONFIG.daggerheart.GENERAL.damageTypes).map(({ id, abbreviation }) => ({ const damageTypeFilter = Object.values(CONFIG.daggerheart.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
group: "Damage Type", //TODO localize group: 'Damage Type', //TODO localize
name: game.i18n.localize(abbreviation), name: game.i18n.localize(abbreviation),
filter: { filter: {
field: "system.damage.type", field: 'system.damage.type',
operator: OPERATORS.EQUALS, operator: OPERATORS.EQUALS,
value: id value: id
} }
})); }));
return [ return [
...game.i18n.sortObjects(typesFilters, "name"), ...game.i18n.sortObjects(typesFilters, 'name'),
...game.i18n.sortObjects(burdenFilter, "name"), ...game.i18n.sortObjects(burdenFilter, 'name'),
...game.i18n.sortObjects(damageTypeFilter, "name"), ...game.i18n.sortObjects(damageTypeFilter, 'name')
]; ];
} }
@ -213,32 +210,28 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
static get cardsFilters() { static get cardsFilters() {
const { OPERATORS } = foundry.applications.ux.SearchFilter; const { OPERATORS } = foundry.applications.ux.SearchFilter;
const typesFilters = Object.values(CONFIG.daggerheart.DOMAIN.cardTypes) const typesFilters = Object.values(CONFIG.daggerheart.DOMAIN.cardTypes).map(({ id, label }) => ({
.map(({ id, label }) => ({ group: game.i18n.localize('Type'),
group: game.i18n.localize("Type"),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {
field: "system.type", field: 'system.type',
operator: OPERATORS.EQUALS, operator: OPERATORS.EQUALS,
value: id value: id
} }
})); }));
const domainFilter = Object.values(CONFIG.daggerheart.DOMAIN.domains).map(({id, label}) => ({ const domainFilter = Object.values(CONFIG.daggerheart.DOMAIN.domains).map(({ id, label }) => ({
group: game.i18n.localize("DAGGERHEART.Sheets.DomainCard.Domain"), group: game.i18n.localize('DAGGERHEART.Sheets.DomainCard.Domain'),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {
field: "system.domain", field: 'system.domain',
operator: OPERATORS.EQUALS, operator: OPERATORS.EQUALS,
value: id value: id
} }
})) }));
const sort = (arr) => game.i18n.sortObjects(arr, "name"); const sort = arr => game.i18n.sortObjects(arr, 'name');
return [ return [...sort(typesFilters), ...sort(domainFilter)];
...sort(typesFilters),
...sort(domainFilter),
];
} }
} }