mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-04-24 08:23:38 +02:00
REFACTOR: prettier
This commit is contained in:
Joaquin Pereyra
parent
0ad4c8d71e
commit
b743c9b628
3 changed files with 226 additions and 237 deletions
|
|
@ -217,7 +217,6 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
|
||||
this._createContextMenues();
|
||||
this._createFilterMenus();
|
||||
|
||||
}
|
||||
|
||||
/** @inheritDoc */
|
||||
|
|
@ -474,11 +473,11 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
#filteredItems = {
|
||||
inventory: {
|
||||
search: new Set(),
|
||||
menu: new Set(),
|
||||
menu: new Set()
|
||||
},
|
||||
loadout: {
|
||||
search: new Set(),
|
||||
menu: new Set(),
|
||||
menu: new Set()
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -571,7 +570,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
content: '.items-section',
|
||||
callback: this._onMenuFilterInventory.bind(this),
|
||||
target: '.filter-button',
|
||||
filters: FilterMenu.invetoryFilters,
|
||||
filters: FilterMenu.invetoryFilters
|
||||
},
|
||||
{
|
||||
key: 'loadout',
|
||||
|
|
@ -579,20 +578,18 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
content: '.items-section',
|
||||
callback: this._onMenuFilterLoadout.bind(this),
|
||||
target: '.filter-button',
|
||||
filters: FilterMenu.cardsFilters,
|
||||
filters: FilterMenu.cardsFilters
|
||||
}
|
||||
];
|
||||
|
||||
menus.forEach(m => {
|
||||
const container = this.element.querySelector(m.container);
|
||||
this.#menu[m.key] = new FilterMenu(container, m.target, m.filters, m.callback, {
|
||||
contentSelector: m.content,
|
||||
contentSelector: m.content
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Callback when filters change
|
||||
* @param {PointerEvent} event
|
||||
|
|
@ -605,14 +602,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
for (const li of html.querySelectorAll('.inventory-item')) {
|
||||
const item = this.document.items.get(li.dataset.itemId);
|
||||
|
||||
const matchesMenu = filters.length === 0 ||
|
||||
filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
|
||||
const matchesMenu =
|
||||
filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
|
||||
if (matchesMenu) this.#filteredItems.inventory.menu.add(item.id);
|
||||
|
||||
const { search } = this.#filteredItems.inventory;
|
||||
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')) {
|
||||
const item = this.document.items.get(li.dataset.itemId);
|
||||
|
||||
const matchesMenu = filters.length === 0 ||
|
||||
filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
|
||||
const matchesMenu =
|
||||
filters.length === 0 || filters.some(f => foundry.applications.ux.SearchFilter.evaluateFilter(item, f));
|
||||
if (matchesMenu) this.#filteredItems.loadout.menu.add(item.id);
|
||||
|
||||
const { search } = this.#filteredItems.loadout;
|
||||
li.hidden = !(search.has(item.id) && matchesMenu);
|
||||
}
|
||||
|
||||
}
|
||||
/* -------------------------------------------- */
|
||||
|
||||
|
|
@ -915,7 +910,8 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
|
|||
const cls = getDocumentClass('ChatMessage');
|
||||
const systemData = {
|
||||
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({
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
export { default as FilterMenu} from "./filter-menu.mjs";
|
||||
export { default as FilterMenu } from './filter-menu.mjs';
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
constructor(container, selector, menuItems, callback, options = {}) {
|
||||
// Set default options
|
||||
const mergedOptions = {
|
||||
eventName: "click",
|
||||
eventName: 'click',
|
||||
fixed: true,
|
||||
...options
|
||||
};
|
||||
|
|
@ -27,7 +27,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
// Initialize filter states
|
||||
this.menuItems = menuItems.map(item => ({
|
||||
...item,
|
||||
enabled: false,
|
||||
enabled: false
|
||||
}));
|
||||
|
||||
this.callback = callback;
|
||||
|
|
@ -39,7 +39,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
cancelable: true,
|
||||
pointerType: 'mouse',
|
||||
isPrimary: true,
|
||||
button: 0,
|
||||
button: 0
|
||||
};
|
||||
|
||||
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 });
|
||||
|
||||
// Create menu structure
|
||||
const menu = document.createElement("menu");
|
||||
menu.className = "filter-menu";
|
||||
const menu = document.createElement('menu');
|
||||
menu.className = 'filter-menu';
|
||||
|
||||
// Group items by their group property
|
||||
const groups = this.#groupItems(this.menuItems);
|
||||
|
|
@ -67,7 +67,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
// Update menu and set position
|
||||
this.element.replaceChildren(menu);
|
||||
|
||||
menu.addEventListener("click", this.#handleClick.bind(this));
|
||||
menu.addEventListener('click', this.#handleClick.bind(this));
|
||||
|
||||
this._setPosition(this.element, target, options);
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
*/
|
||||
#groupItems(items) {
|
||||
return items.reduce((groups, item) => {
|
||||
const group = item.group ?? "_none";
|
||||
const group = item.group ?? '_none';
|
||||
groups[group] = groups[group] || [];
|
||||
groups[group].push(item);
|
||||
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.
|
||||
*/
|
||||
#createSection(groupName, items) {
|
||||
const section = document.createElement("fieldset");
|
||||
section.className = "filter-section";
|
||||
const section = document.createElement('fieldset');
|
||||
section.className = 'filter-section';
|
||||
|
||||
const header = document.createElement("legend");
|
||||
const header = document.createElement('legend');
|
||||
header.textContent = groupName;
|
||||
section.appendChild(header);
|
||||
|
||||
const buttons = document.createElement("div");
|
||||
buttons.className = "filter-buttons";
|
||||
const buttons = document.createElement('div');
|
||||
buttons.className = 'filter-buttons';
|
||||
|
||||
items.forEach(item => {
|
||||
const button = document.createElement("button");
|
||||
button.className = `filter-button ${item.enabled ? "active" : ""}`;
|
||||
const button = document.createElement('button');
|
||||
button.className = `filter-button ${item.enabled ? 'active' : ''}`;
|
||||
button.textContent = item.name;
|
||||
item.element = button;
|
||||
buttons.appendChild(button);
|
||||
|
|
@ -118,7 +118,6 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
return section;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get filter data from active filters
|
||||
* @returns {Array} Array of filter configurations
|
||||
|
|
@ -138,25 +137,24 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
|
||||
const button = event.target.closest(".filter-button");
|
||||
const button = event.target.closest('.filter-button');
|
||||
if (!button) return;
|
||||
|
||||
const clickedItem = this.menuItems.find(item => item.element === button);
|
||||
if (!clickedItem) return;
|
||||
|
||||
const isActive = button.classList.toggle("active");
|
||||
const isActive = button.classList.toggle('active');
|
||||
clickedItem.enabled = isActive;
|
||||
|
||||
const filters = this.getActiveFilterData();
|
||||
|
||||
if (filters.length > 0) {
|
||||
this.target.classList.add("fa-beat", "active");
|
||||
this.target.classList.add('fa-beat', 'active');
|
||||
} else {
|
||||
this.target.classList.remove("fa-beat", "active");
|
||||
this.target.classList.remove('fa-beat', 'active');
|
||||
}
|
||||
|
||||
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)
|
||||
.filter(([, { metadata }]) => metadata.isInventoryItem)
|
||||
.map(([type, { metadata }]) => ({
|
||||
group: game.i18n.localize("Type"),
|
||||
group: game.i18n.localize('Type'),
|
||||
name: game.i18n.localize(metadata.label),
|
||||
filter: {
|
||||
field: "type",
|
||||
field: 'type',
|
||||
operator: OPERATORS.EQUALS,
|
||||
value: type
|
||||
}
|
||||
}));
|
||||
|
||||
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),
|
||||
filter: {
|
||||
field: "system.burden",
|
||||
field: 'system.burden',
|
||||
operator: OPERATORS.EQUALS,
|
||||
value: value
|
||||
}
|
||||
}));
|
||||
|
||||
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),
|
||||
filter: {
|
||||
field: "system.damage.type",
|
||||
field: 'system.damage.type',
|
||||
operator: OPERATORS.EQUALS,
|
||||
value: id
|
||||
}
|
||||
}));
|
||||
|
||||
|
||||
return [
|
||||
...game.i18n.sortObjects(typesFilters, "name"),
|
||||
...game.i18n.sortObjects(burdenFilter, "name"),
|
||||
...game.i18n.sortObjects(damageTypeFilter, "name"),
|
||||
...game.i18n.sortObjects(typesFilters, 'name'),
|
||||
...game.i18n.sortObjects(burdenFilter, 'name'),
|
||||
...game.i18n.sortObjects(damageTypeFilter, 'name')
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -213,32 +210,28 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
|
|||
static get cardsFilters() {
|
||||
const { OPERATORS } = foundry.applications.ux.SearchFilter;
|
||||
|
||||
const typesFilters = Object.values(CONFIG.daggerheart.DOMAIN.cardTypes)
|
||||
.map(({ id, label }) => ({
|
||||
group: game.i18n.localize("Type"),
|
||||
const typesFilters = Object.values(CONFIG.daggerheart.DOMAIN.cardTypes).map(({ id, label }) => ({
|
||||
group: game.i18n.localize('Type'),
|
||||
name: game.i18n.localize(label),
|
||||
filter: {
|
||||
field: "system.type",
|
||||
field: 'system.type',
|
||||
operator: OPERATORS.EQUALS,
|
||||
value: id
|
||||
}
|
||||
}));
|
||||
|
||||
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),
|
||||
filter: {
|
||||
field: "system.domain",
|
||||
field: 'system.domain',
|
||||
operator: OPERATORS.EQUALS,
|
||||
value: id
|
||||
}
|
||||
}))
|
||||
}));
|
||||
|
||||
const sort = (arr) => game.i18n.sortObjects(arr, "name");
|
||||
const sort = arr => game.i18n.sortObjects(arr, 'name');
|
||||
|
||||
return [
|
||||
...sort(typesFilters),
|
||||
...sort(domainFilter),
|
||||
];
|
||||
return [...sort(typesFilters), ...sort(domainFilter)];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue