diff --git a/.vscode/components.html-data.json b/.vscode/components.html-data.json index 9177004..e1c3ebd 100644 --- a/.vscode/components.html-data.json +++ b/.vscode/components.html-data.json @@ -2,36 +2,24 @@ "version": 1.1, "tags": [ { - "name": "taf-icon", + "name": "dd-incrementer", + "description": "A number input that allows more flexible increase/decrease buttons", + "attributes": [ + { "name": "value", "description": "The initial value to put in the input" }, + { "name": "name", "description": "The form name to use when this input is used to submit data" }, + { "name": "min", "description": "The minimum value that this input can contain" }, + { "name": "max", "description": "The maximum value that this input can contain" }, + { "name": "smallStep", "description": "The value that the input is changed by when clicking a delta button or using the up/down arrow key" }, + { "name": "largeStep", "description": "The value that the input is changed by when clicking a delta button with control held or using the page up/ page down arrow key" } + ] + }, + { + "name": "dd-icon", "description": "Loads an icon asynchronously, caching the result for future uses", "attributes": [ - { "name": "name", "description": "The name of the icon, this is relative to the assets folder of the system" }, + { "name": "name", "description": "The name of the icon, this is relative to the assets folder of the dotdungeon system" }, { "name": "path", "description": "The full path of the icon, this will only be used if `name` isn't provided or fails to fetch." } ] - }, - { - "name": "taf-svg", - "description": "Loads an SVG file asynchronously, caching the result for future uses", - "attributes": [ - { "name": "name", "description": "The name of the icon, this is relative to the assets folder of the system" }, - { "name": "path", "description": "The full path of the icon, this will only be used if `name` isn't provided or fails to fetch." } - ] - }, - { - "name": "taf-toggle", - "description": "A conveniency component for a toggle switch", - "attributes": [ - { - "name": "type", - "description": "The type of toggle that this should be", - "values": [ - { - "name": "round", - "description": "The slider is a full circle" - } - ] - } - ] } ], "globalAttributes": [], diff --git a/assets/icons/chevron.svg b/assets/icons/chevron.svg deleted file mode 100644 index 40bf6e2..0000000 --- a/assets/icons/chevron.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg deleted file mode 100644 index 0a72686..0000000 --- a/assets/icons/plus.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/eslint.config.mjs b/eslint.config.mjs index 88feed0..7c89266 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -22,8 +22,6 @@ export default [ Hooks: `readonly`, ui: `readonly`, foundry: `readonly`, - Actor: `readonly`, - Item: `readonly`, ChatMessage: `readonly`, ActiveEffect: `readonly`, fromUuid: `readonly`, @@ -31,7 +29,7 @@ export default [ // v14 Additions: _loc: `readonly`, - _del: `readonly`, + _del: `reaonly`, _replace: `readonly`, }, }, @@ -74,16 +72,7 @@ export default [ "@stylistic/space-infix-ops": `warn`, "@stylistic/eol-last": `warn`, "@stylistic/operator-linebreak": [`warn`, `before`], - "@stylistic/indent": [ - `warn`, - `tab`, - { - SwitchCase: 1, - ignoredNodes: [ - `.superClass CallExpression`, - ], - }, - ], + "@stylistic/indent": [`warn`, `tab`], "@stylistic/brace-style": [`off`], "@stylistic/quotes": [`warn`, `backtick`, { "avoidEscape": true }], "@stylistic/comma-dangle": [`warn`, { arrays: `always-multiline`, objects: `always-multiline`, imports: `always-multiline`, exports: `always-multiline`, functions: `always-multiline` }], diff --git a/langs/en-ca.json b/langs/en-ca.json index 2600103..6dee3ec 100644 --- a/langs/en-ca.json +++ b/langs/en-ca.json @@ -2,18 +2,10 @@ "TYPES": { "Actor": { "player": "Player" - }, - "Item": { - "generic": "Generic Item" } }, "taf": { "settings": { - "actorDefaultAttributes": { - "name": "Remove Default Attributes", - "hint": "This removes the default attributes that are applied when a new actor is created, making it so that no attributes get created alongside the actor.", - "label": "Remove Attributes" - }, "canPlayersManageAttributes": { "name": "Players Can Manage Attributes", "hint": "This allows players who have edit access to a document to be able to edit what attributes those characters have via the attribute editor" @@ -39,16 +31,16 @@ "true": "Resizable" } }, - "weightUnit": { - "name": "Weight Unit", - "hint": "This unit is used to display the units for the weights of items and carrying capacity of actors. This does NOTHING beyond adding the unit into the displays, it will not automatically convert between any units." + "actorDefaultAttributes": { + "name": "Remove Default Attributes", + "hint": "This removes the default attributes that are applied when a new actor is created, making it so that no attributes get created alongside the actor.", + "label": "Remove Attributes" } }, "sheet-names": { "PlayerSheet": "Player Sheet", "SingleModePlayerSheet": "Player Sheet (Always Editing)", - "AttributeOnlyPlayerSheet": "Player Sheet (Attributes Only)", - "GenericItemSheet": "System Item Sheet" + "AttributeOnlyPlayerSheet": "Player Sheet (Attributes Only)" }, "misc": { "Key": "Key", @@ -59,15 +51,8 @@ "confirm-and-close": "Confirm and Close", "save-and-close": "Save and Close", "delete": "Delete", - "edit": "Edit", "resizable": "Resizable", - "not-resizable": "Not Resizable", - "item": { - "weight": "Weight", - "quantity": "Quantity", - "equipped": "Equipped", - "group": "Group" - } + "not-resizable": "Not Resizable" }, "Apps": { "Ask": { @@ -84,21 +69,8 @@ }, "PlayerSheet": { "manage-attributes": "Manage Attributes", - "create-item": "Create Embedded Item", "current-value": "Current value", - "max-value": "Maximum value", - "carry-capacity-used": "({percent}% Used)", - "carrying-capacity": { - "placeholder": "Unlimited", - "title": "Carrying Capacity:", - "label": "Maximum carrying weight" - }, - "total-weight": "Total weight", - "toggle-item-description": "Show/Hide Item Description", - "tab-names": { - "content": "Content", - "items": "Items" - } + "max-value": "Maximum value" }, "QueryStatus": { "title": "Information Request Status", diff --git a/module/api.mjs b/module/api.mjs index d0b8c62..33eab44 100644 --- a/module/api.mjs +++ b/module/api.mjs @@ -13,18 +13,24 @@ import { toID } from "./utils/toID.mjs"; const { deepFreeze } = foundry.utils; -export const api = deepFreeze({ - DialogManager, - QueryManager, - Apps: { - Ask, - AttributeManager, - PlayerSheet, - QueryStatus, +Object.defineProperty( + globalThis, + `taf`, + { + value: deepFreeze({ + DialogManager, + QueryManager, + Apps: { + Ask, + AttributeManager, + PlayerSheet, + QueryStatus, + }, + utils: { + attributeSorter, + localizer, + toID, + }, + }), }, - utils: { - attributeSorter, - localizer, - toID, - }, -}); +); diff --git a/module/apps/AttributeManager.mjs b/module/apps/AttributeManager.mjs index 1f4d7f6..7ca3bf4 100644 --- a/module/apps/AttributeManager.mjs +++ b/module/apps/AttributeManager.mjs @@ -1,6 +1,6 @@ import { __ID__, filePath } from "../consts.mjs"; -import { ask } from "../utils/DialogManager.mjs"; import { attributeSorter } from "../utils/attributeSort.mjs"; +import { ask } from "../utils/DialogManager.mjs"; import { localizer } from "../utils/localizer.mjs"; import { toID } from "../utils/toID.mjs"; @@ -29,7 +29,7 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) label: `Save As Defaults`, visible: () => game.user.isGM, action: `saveAsDefault`, - }, + } ], }, form: { @@ -137,8 +137,7 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) const attrs = []; for (const [id, data] of Object.entries(this.#attributes)) { if (data == null) { continue }; - // Remove with issue: Foundry/taf#54 - if (game.release.generation >= 14 && data == _del) {continue} + if (game.release.generation >= 14 && data == _del) continue; attrs.push({ id, name: data.name, @@ -151,7 +150,7 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) }; // #endregion Data Prep - // #region Actions +// #region Actions /** * @param {Event} event */ @@ -187,7 +186,6 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) static async #remove($e, element) { const attribute = element.closest(`[data-attribute]`)?.dataset.attribute; if (!attribute) { return }; - // Remove with issue: Foundry/taf#54 if (game.release.generation < 14) { delete this.#attributes[attribute]; this.#attributes[`-=${attribute}`] = null; @@ -229,7 +227,7 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) }, ], }, - { type: `divider` }, + { type: `divider` } ); continue; }; @@ -256,7 +254,6 @@ export class AttributeManager extends HandlebarsApplicationMixin(ApplicationV2) switch (response.state) { case `errored`: ui.notifications.error(response.error); - // eslint-disable-next-line no-fallthrough case `fronted`: return; }; diff --git a/module/apps/AttributeOnlyPlayerSheet.mjs b/module/apps/AttributeOnlyPlayerSheet.mjs index 0ecac54..f07747a 100644 --- a/module/apps/AttributeOnlyPlayerSheet.mjs +++ b/module/apps/AttributeOnlyPlayerSheet.mjs @@ -2,8 +2,6 @@ import { PlayerSheet } from "./PlayerSheet.mjs"; const { deepClone } = foundry.utils; -const removedParts = new Set([`content`]); - export class AttributeOnlyPlayerSheet extends PlayerSheet { // #region Options static DEFAULT_OPTIONS = { @@ -17,45 +15,14 @@ export class AttributeOnlyPlayerSheet extends PlayerSheet { delete parts.content; return parts; }; - - static get TABS() { - const tabs = deepClone(super.TABS); - tabs.primary.tabs = tabs.primary.tabs - .filter(tab => tab.id !== `content`); - tabs.primary.initial = tabs.primary.tabs.at(0).id; - return tabs; - }; // #endregion Options - // #region Instance Data - /** - * This method is used in order to ensure that when we hide specific - * tabs due to programmatic logic (e.g. having no items), that the tab - * doesn't stay selected in the app if the logic for it being visible - * no longer holds true. - */ - _assertSelectedTabs() { - // Intentional No-Op Function - }; - - get hasContentTab() { - return false; - }; - // #endregion Instance Data - // #region Lifecycle _configureRenderOptions(options) { super._configureRenderOptions(options); - // don't attempt to rerender the parts that get removed - options.parts = options.parts?.filter(partID => !removedParts.has(partID)); + // don't attempt to rerender the content + options.parts = options.parts?.filter(partID => partID !== `content`); }; // #endregion Lifecycle - - // #region Data Prep - async _prepareItems(ctx) { - await super._prepareItems(ctx); - ctx.tabActive &&= this.hasItemsTab; - }; - // #endregion Data Prep }; diff --git a/module/apps/GenericItemSheet.mjs b/module/apps/GenericItemSheet.mjs deleted file mode 100644 index 560fc12..0000000 --- a/module/apps/GenericItemSheet.mjs +++ /dev/null @@ -1,90 +0,0 @@ -import { __ID__, filePath } from "../consts.mjs"; -import { TAFDocumentSheetMixin } from "./mixins/TAFDocumentSheetMixin.mjs"; - -const { HandlebarsApplicationMixin } = foundry.applications.api; -const { ItemSheetV2 } = foundry.applications.sheets; -const { setProperty } = foundry.utils; - -export class GenericItemSheet extends - TAFDocumentSheetMixin( - HandlebarsApplicationMixin( - ItemSheetV2, -)) { - // #region Options - static DEFAULT_OPTIONS = { - classes: [ - __ID__, - `GenericItemSheet`, - ], - position: { - width: 400, - height: 450, - }, - window: { - resizable: true, - }, - form: { - submitOnChange: true, - closeOnSubmit: false, - }, - actions: {}, - }; - - static PARTS = { - header: { template: filePath(`templates/GenericItemSheet/header.hbs`) }, - content: { template: filePath(`templates/GenericItemSheet/content.hbs`) }, - }; - - /** - * This tells the Application's TAFDocumentSheetMixin how to rerender this app - * when specific properties get changed on the actor, so that it doesn't need - * to full-app rendering if we can do a partial rerender instead. - */ - static PROPERTY_TO_PARTIAL = { - "name": [`header`], - "img": [`header`], - "system": [`content`], - }; - // #endregion Options - - // #region Instance Data - // #endregion Instance Data - - // #region Lifecycle - async _prepareContext() { - return { - meta: { - idp: this.id, - editable: this.isEditable, - limited: this.isLimited, - }, - item: this.item, - system: this.item.system, - }; - }; - - async _preparePartContext(partID, ctx) { - switch (partID) { - case `content`: { - await this._prepareContentContext(ctx); - break; - }; - }; - - return ctx; - }; - - async _prepareContentContext(ctx) { - const TextEditor = foundry.applications.ux.TextEditor.implementation; - - setProperty( - ctx, - `enriched.system.description`, - await TextEditor.enrichHTML(this.item.system.description), - ); - }; - // #endregion Lifecycle - - // #region Actions - // #endregion Actions -}; diff --git a/module/apps/PlayerSheet.mjs b/module/apps/PlayerSheet.mjs index 3e1be0f..a1b8069 100644 --- a/module/apps/PlayerSheet.mjs +++ b/module/apps/PlayerSheet.mjs @@ -1,22 +1,22 @@ import { __ID__, filePath } from "../consts.mjs"; -import { deleteItemFromElement, editItemFromElement } from "./utils.mjs"; import { AttributeManager } from "./AttributeManager.mjs"; import { attributeSorter } from "../utils/attributeSort.mjs"; -import { config } from "../config.mjs"; -import { Logger } from "../utils/Logger.mjs"; import { TAFDocumentSheetConfig } from "./TAFDocumentSheetConfig.mjs"; -import { TAFDocumentSheetMixin } from "./mixins/TAFDocumentSheetMixin.mjs"; const { HandlebarsApplicationMixin } = foundry.applications.api; const { ActorSheetV2 } = foundry.applications.sheets; -const { getProperty } = foundry.utils; -const { ContextMenu, TextEditor } = foundry.applications.ux; +const { getProperty, hasProperty } = foundry.utils; -export class PlayerSheet extends - TAFDocumentSheetMixin( - HandlebarsApplicationMixin( - ActorSheetV2, -)) { +const propertyToParts = { + "name": [`header`], + "img": [`header`], + "system.attr": [`attributes`], + "system.attr.value": [`attributes`, `content`], + "system.attr.max": [`attributes`, `content`], + "system.content": [`content`], +}; + +export class PlayerSheet extends HandlebarsApplicationMixin(ActorSheetV2) { // #region Options static DEFAULT_OPTIONS = { @@ -36,101 +36,18 @@ export class PlayerSheet extends closeOnSubmit: false, }, actions: { - createEmbeddedItem: this.#createEmbeddedItem, manageAttributes: this.#manageAttributes, configureSheet: this.#configureSheet, - toggleExpand: this.#toggleExpand, }, }; static PARTS = { header: { template: filePath(`templates/PlayerSheet/header.hbs`) }, attributes: { template: filePath(`templates/PlayerSheet/attributes.hbs`) }, - tabs: { template: filePath(`templates/generic/tabs.hbs`) }, content: { template: filePath(`templates/PlayerSheet/content.hbs`) }, - items: { - template: filePath(`templates/PlayerSheet/item-lists.hbs`), - scrollable: [``], - templates: [ - filePath(`templates/PlayerSheet/item.hbs`), - ], - }, - }; - - /** - * This tells the Application's TAFDocumentSheetMixin how to rerender this app - * when specific properties get changed on the actor, so that it doesn't need - * to full-app rendering if we can do a partial rerender instead. - */ - static PROPERTY_TO_PARTIAL = { - "name": [`header`], - "img": [`header`], - "system.attr": [`attributes`], - "system.attr.value": [`attributes`, `content`], - "system.attr.max": [`attributes`, `content`], - "system.content": [`content`], - "system.carryCapacity": [`items`], - }; - - static TABS = { - primary: { - initial: `content`, - labelPrefix: `taf.Apps.PlayerSheet.tab-names`, - tabs: [ - { id: `content` }, - { id: `items` }, - ], - }, }; // #endregion Options - // #region Instance Data - /** - * This Set is used to keep track of which items have had their full - * details expanded so that it can be persisted across rerenders as - * they occur. - */ - #expandedItems = new Set(); - - /** - * This method is used in order to ensure that when we hide specific - * tabs due to programmatic logic (e.g. having no items), that the tab - * doesn't stay selected in the app if the logic for it being visible - * no longer holds true. - */ - _assertSelectedTabs() { - const initial = this.constructor.TABS.primary.initial; - if (this.tabGroups.primary === `items` && !this.hasItemsTab) { - Logger.debug(`Asserting app "${this.id}" from tab "items" to "${initial}"`); - this.tabGroups.primary = initial; - }; - }; - - /** - * A helper method that allows a shortcut to determine if a tab is visible - * solely based on it's ID. This usually redirects to the relevant getter in - * the class, but if the tab ID doesn't exist it always returns false. - * - * @param {string} tabID The ID of the relevant tab - * @returns Whether or not the tab is visible - */ - hasTab(tabID) { - switch (tabID) { - case `content`: return this.hasContentTab; - case `items`: return this.hasItemsTab; - }; - return false; - }; - - get hasContentTab() { - return true; - }; - - get hasItemsTab() { - return this.actor.items.size > 0; - }; - // #endregion Instance Data - // #region Lifecycle _initializeApplicationOptions(options) { const sizing = getProperty(options.document, `flags.${__ID__}.PlayerSheet.size`) ?? {}; @@ -172,64 +89,34 @@ export class PlayerSheet extends _getHeaderControls() { const controls = super._getHeaderControls(); - controls.push( - { - icon: `fa-solid fa-at`, - label: `taf.Apps.PlayerSheet.manage-attributes`, - action: `manageAttributes`, - visible: () => { - const isGM = game.user.isGM; - const allowPlayerEdits = game.settings.get(__ID__, `canPlayersManageAttributes`); - const editable = this.isEditable; - return isGM || (allowPlayerEdits && editable); - }, + controls.push({ + icon: `fa-solid fa-at`, + label: `taf.Apps.PlayerSheet.manage-attributes`, + action: `manageAttributes`, + visible: () => { + const isGM = game.user.isGM; + const allowPlayerEdits = game.settings.get(__ID__, `canPlayersManageAttributes`); + const editable = this.isEditable; + return isGM || (allowPlayerEdits && editable); }, - { - icon: `fa-solid fa-suitcase`, - label: `taf.Apps.PlayerSheet.create-item`, - action: `createEmbeddedItem`, - visible: () => { - return this.isEditable; - }, - }, - ); + }); return controls; }; - async _preRender(ctx, options) { - this._assertSelectedTabs(); - return super._preRender(ctx, options); - }; + _configureRenderOptions(options) { + // Only rerender the parts of the app that got changed + if (options.renderContext === `updateActor`) { + const parts = new Set(); + for (const property in propertyToParts) { + if (hasProperty(options.renderData, property)) { + propertyToParts[property].forEach(partID => parts.add(partID)); + }; + }; + options.parts = options.parts?.filter(part => !parts.has(part)) ?? Array.from(parts); + }; - async _onRender(ctx, options) { - await super._onRender(ctx, options); - - new ContextMenu.implementation( - this.element, - `li.item`, - [ - { - label: _loc(`taf.misc.edit`), - condition: (el) => { - const itemUuid = el.dataset.itemUuid; - const itemExists = itemUuid != null && itemUuid !== ``; - return this.isEditable && itemExists; - }, - onClick: editItemFromElement, - }, - { - label: _loc(`taf.misc.delete`), - condition: (el) => { - const itemUuid = el.dataset.itemUuid; - const itemExists = itemUuid != null && itemUuid !== ``; - return this.isEditable && itemExists; - }, - onClick: deleteItemFromElement, - }, - ], - { jQuery: false, fixed: true }, - ); + super._configureRenderOptions(options); }; async close() { @@ -240,36 +127,22 @@ export class PlayerSheet extends // #endregion Lifecycle // #region Data Prep - async _prepareContext() { - return { - meta: { - idp: this.id, - editable: this.isEditable, - }, + async _preparePartContext(partID) { + let ctx = { actor: this.actor, system: this.actor.system, editable: this.isEditable, }; - }; - async _preparePartContext(partID, ctx) { switch (partID) { case `attributes`: { await this._prepareAttributes(ctx); break; }; - case `tabs`: { - await this._prepareTabList(ctx); - break; - }; case `content`: { await this._prepareContent(ctx); break; }; - case `items`: { - await this._prepareItems(ctx); - break; - }; }; return ctx; @@ -289,91 +162,22 @@ export class PlayerSheet extends ctx.attrs = attrs.toSorted(attributeSorter); }; - async _prepareTabList(ctx) { - ctx.tabs = await this._prepareTabs(`primary`); - - let amountVisible = 0; - for (const tabID in ctx.tabs) { - const visible = this.hasTab(tabID); - ctx.tabs[tabID].visible = visible; - if (visible) { amountVisible++ }; - }; - - ctx.hideTabs = amountVisible <= 1; - }; - async _prepareContent(ctx) { // Whether or not the prose-mirror is toggled or always-edit ctx.toggled = true; - ctx.tabActive = this.tabGroups.primary === `content`; + const TextEditor = foundry.applications.ux.TextEditor.implementation; ctx.enriched = { system: { - content: await TextEditor.implementation.enrichHTML(this.actor.system.content), + content: await TextEditor.enrichHTML(this.actor.system.content), }, }; }; - - async _prepareItems(ctx) { - ctx.tabActive = this.tabGroups.primary === `items`; - - let totalWeight = 0; - - ctx.itemGroups = []; - for (const [groupName, items] of Object.entries(this.actor.itemTypes)) { - const preparedItems = []; - - let summedWeight = 0; - for (const item of items) { - summedWeight += item.system.quantifiedWeight; - preparedItems.push(await this._prepareItem(item)); - }; - totalWeight += summedWeight; - - ctx.itemGroups.push({ - name: groupName.titleCase(), - items: preparedItems, - weight: config.weightFormatter(totalWeight), - }); - }; - - ctx.totalWeight = config.weightFormatter(totalWeight); - ctx.hasCarryingCapacity = this.actor.system.carryCapacity != null; - ctx.carryCapacityPercent = Math.round(totalWeight / this.actor.system.carryCapacity * 100); - }; - - async _prepareItem(item) { - const ctx = { - uuid: item.uuid, - img: item.img, - name: item.name, - equipped: item.system.equipped, - quantity: item.system.quantity, - weight: config.weightFormatter(item.system.quantifiedWeight), - isExpanded: this.#expandedItems.has(item.uuid), - canExpand: item.system.description.length > 0, - }; - - ctx.description = ``; - if (item.system.description.length > 0) { - ctx.description = await TextEditor.implementation.enrichHTML(item.system.description); - }; - - return ctx; - }; // #endregion Data Prep // #region Actions #attributeManager = null; - - /** - * This action opens an instance of the AttributeManager application - * so that the user can edit and update all of the attributes for the - * actor. This persists the application instance for the duration of - * the ActorSheet's lifespan. - * - * @this {PlayerSheet} - */ + /** @this {PlayerSheet} */ static async #manageAttributes() { this.#attributeManager ??= new AttributeManager({ document: this.actor }); if (this.#attributeManager.rendered) { @@ -386,13 +190,6 @@ export class PlayerSheet extends }; }; - /** - * This action overrides the default Foundry action in order to tell - * it to open my custom DocumentSheetConfig application instead of - * opening the non-customized sheet config app. - * - * @this {PlayerSheet} - */ static async #configureSheet(event) { event.stopPropagation(); if ( event.detail > 1 ) { return } @@ -408,52 +205,5 @@ export class PlayerSheet extends window: { windowId: this.window.windowId }, }); }; - - /** - * This action is used by the item lists in order to expand/collapse - * the descriptions while maintaining that state across renders. - * - * @this {PlayerSheet} - */ - static async #toggleExpand(event, target) { - const element = target.closest(`[data-item-uuid]`); - const { itemUuid } = element?.dataset ?? {}; - if (!itemUuid) { return }; - - const expanded = this.#expandedItems.has(itemUuid); - const newExpanded = !expanded; - - this.#expandedItems[newExpanded ? `add` : `delete`]?.(itemUuid); - target.dataset.expanded = newExpanded; - const collapses = element.querySelectorAll(`[data-expanded]`); - collapses.forEach(el => { - el.dataset.expanded = newExpanded; - }); - }; - - /** - * Used by the sheet in order to create embedded items without needing to have - * equivalent World Items or Compendiums initially. - * - * @this {PlayerSheet} - */ - static async #createEmbeddedItem(event, target) { - let { itemGroup } = target.dataset ?? {}; - if (itemGroup === `Items`) { itemGroup = undefined }; - - const data = { - name: Item.defaultName({ - type: `generic`, - parent: this.actor, - }), - type: `generic`, - system: { - group: itemGroup, - }, - }; - - const item = await Item.create(data, { parent: this.actor }); - item?.sheet?.render({ force: true }); - }; // #endregion Actions }; diff --git a/module/apps/elements/StyledShadowElement.mjs b/module/apps/elements/StyledShadowElement.mjs index 24288d9..4929868 100644 --- a/module/apps/elements/StyledShadowElement.mjs +++ b/module/apps/elements/StyledShadowElement.mjs @@ -26,13 +26,10 @@ export function StyledShadowElement(Base) { /** @type {ShadowRoot} */ _shadow; - constructor({focusable = false} = {}) { + constructor() { super(); - this._shadow = this.attachShadow({ - mode: `open`, - delegatesFocus: focusable, - }); + this._shadow = this.attachShadow({ mode: `open` }); this._style = document.createElement(`style`); this._shadow.appendChild(this._style); }; diff --git a/module/apps/elements/Toggle.mjs b/module/apps/elements/Toggle.mjs deleted file mode 100644 index e12b70f..0000000 --- a/module/apps/elements/Toggle.mjs +++ /dev/null @@ -1,117 +0,0 @@ -import { StyledShadowElement } from "./StyledShadowElement.mjs"; - -const { debounce } = foundry.utils; - -export class TafToggle extends StyledShadowElement(HTMLElement) { - static elementName = `taf-toggle`; - static formAssociated = true; - - static _stylePath = `toggle.css`; - - _mounted; - _internals; - - constructor() { - super({ focusable: true }); - - this._internals = this.attachInternals(); - this._internals.role = `checkbox`; - }; - - get type() { - return `checkbox`; - }; - - get name() { - return this.getAttribute(`name`); - }; - set name(newName) { - this.setAttribute(`name`, newName); - }; - - get value() { - return this._input.value; - }; - set value(newValue) { - this._input.value = newValue; - }; - - get checked() { - return this._input.checked ?? false; - }; - set checked(newValue) { - if (typeof newValue !== `boolean`) { return }; - this._input.checked = newValue; - this.#emitEvents(); - }; - - get disabled() { - return this.matches(`:disabled`); - }; - set disabled(value) { - this.toggleAttribute(`disabled`, value); - }; - - get editable() { - return true; - }; - - connectedCallback() { - super.connectedCallback(); - if (this._mounted) { return }; - - this._internals.checked = this.hasAttribute(`checked`); - - /* - This converts all of the double-dash prefixed properties on the - element to CSS variables so that they don't all need to be - provided by doing style="" - */ - for (const attrVar of this.attributes) { - if (attrVar.name?.startsWith(`var:`)) { - const prop = attrVar.name.replace(`var:`, ``); - this.style.setProperty(`--` + prop, attrVar.value); - }; - }; - - const container = document.createElement(`div`); - container.classList = `toggle`; - container.dataset.type = `round`; - - const input = this._input = document.createElement(`input`); - input.type = `checkbox`; - input.toggleAttribute(`switch`, true); - input.checked = this.hasAttribute(`checked`); - input.addEventListener(`change`, () => { - this.#emitEvents(); - }); - - this.addEventListener(`click`, () => { - input.click(); - }); - - container.appendChild(input); - - const slider = document.createElement(`div`); - slider.classList = `slider`; - container.appendChild(slider); - - this._shadow.appendChild(container); - - this._mounted = true; - }; - - disconnectedCallback() { - super.disconnectedCallback(); - if (!this._mounted) { return }; - this._mounted = false; - }; - - #emitEvents = debounce( - () => { - this.dispatchEvent(new Event(`input`, {bubbles: true, cancelable: false})); - this.dispatchEvent(new Event(`change`, {bubbles: true, cancelable: false})); - }, - 150, - ); -}; diff --git a/module/apps/elements/_index.mjs b/module/apps/elements/_index.mjs index 281c006..dce2b24 100644 --- a/module/apps/elements/_index.mjs +++ b/module/apps/elements/_index.mjs @@ -1,15 +1,14 @@ import { Logger } from "../../utils/Logger.mjs"; import { TafIcon } from "./Icon.mjs"; import { TafSVGLoader } from "./svgLoader.mjs"; -import { TafToggle } from "./Toggle.mjs"; const components = [ TafSVGLoader, TafIcon, - TafToggle, ]; export function registerCustomComponents() { + (CONFIG.CACHE ??= {}).componentListeners ??= []; for (const component of components) { if (!window.customElements.get(component.elementName)) { Logger.debug(`Registering component "${component.elementName}"`); @@ -17,6 +16,9 @@ export function registerCustomComponents() { component.elementName, component, ); + if (component.formAssociated) { + CONFIG.CACHE.componentListeners.push(component.elementName); + } }; } }; diff --git a/module/apps/mixins/TAFDocumentSheetMixin.mjs b/module/apps/mixins/TAFDocumentSheetMixin.mjs deleted file mode 100644 index fef966b..0000000 --- a/module/apps/mixins/TAFDocumentSheetMixin.mjs +++ /dev/null @@ -1,53 +0,0 @@ -import { updateForeignDocumentFromEvent } from "../utils.mjs"; - -const { hasProperty } = foundry.utils; - -export function TAFDocumentSheetMixin(HandlebarsApplication) { - class TAFDocumentSheet extends HandlebarsApplication { - /** @type {Record | null} */ - static PROPERTY_TO_PARTIAL = null; - - // #region Lifecycle - /** - * This override is used by the mixin in order to allow for partial - * re-rendering of applications based on what properties changed. - * It requires that a static PROPERTY_TO_PARTIAL to be defined as - * an object of path keys to arrays of part IDs in order to work. - * This will not interfere with renders that are not started as - * part of the actor update lifecycle. - */ - _configureRenderOptions(options) { - - if (options.renderContext === `updateActor`) { - const propertyToParts = this.constructor.PROPERTY_TO_PARTIAL; - if (propertyToParts) { - const parts = new Set(); - for (const property in propertyToParts) { - if (hasProperty(options.renderData, property)) { - propertyToParts[property].forEach(partID => parts.add(partID)); - }; - }; - options.parts = options.parts?.filter(part => !parts.has(part)) ?? Array.from(parts); - } - }; - - super._configureRenderOptions(options); - }; - - async _onRender(...args) { - await super._onRender(...args); - this._attachEmbeddedChangeListeners(); - }; - - _attachEmbeddedChangeListeners() { - /** @type {HTMLElement[]} */ - const elements = this.element.querySelectorAll(`[data-foreign-name]`); - for (const el of elements) { - el.addEventListener(`change`, updateForeignDocumentFromEvent); - }; - }; - // #endregion Lifecycle - }; - - return TAFDocumentSheet; -}; diff --git a/module/apps/utils.mjs b/module/apps/utils.mjs deleted file mode 100644 index de8edcc..0000000 --- a/module/apps/utils.mjs +++ /dev/null @@ -1,58 +0,0 @@ -/* -This file contains utility methods used by Applications in order to be -DRYer -*/ - -/** - * @param {Event} _event The click event - * @param {HTMLElement} target The element to operate on - */ -export async function editItemFromElement(_event, target) { - const itemEl = target.closest(`[data-item-uuid]`); - if (!itemEl) { return }; - const uuid = itemEl.dataset.itemUuid; - if (!uuid) { return }; - const item = await fromUuid(uuid); - item.sheet.render({ force: true, orBringToFront: true }); -}; - -/** - * @param {Event} _event The click event - * @param {HTMLElement} target The element to operate on - */ -export async function deleteItemFromElement(_event, target) { - const itemEl = target.closest(`[data-item-uuid]`); - if (!itemEl) { return }; - const uuid = itemEl.dataset.itemUuid; - if (!uuid) { return }; - const item = await fromUuid(uuid); - item.deleteDialog(); -}; - -/** - * Updates a document using the UUID, this is most useful for editing - * documents from a sheet of another document (e.g. an Item embedded - * in an Actor). This requires the dataset of the element to have a - * "data-foreign-name" which is the data path of the property being - * edited. As well as the input, or a parent of it, to have the - * "data-foreign-uuid" attribute, representing the UUID of the document - * to edit. - */ -export async function updateForeignDocumentFromEvent(event) { - const target = event.currentTarget; - const name = target.dataset.foreignName; - let uuid = target.dataset.foreignUuid; - uuid ??= target.closest(`[data-foreign-uuid]`)?.dataset.foreignUuid; - - if (!name || !uuid) { - throw `Cannot edit foreign document with the name and UUID`; - }; - - let value = target.value; - switch (target.type) { - case `checkbox`: value = target.checked; break; - }; - - let doc = await fromUuid(uuid); - await doc?.update({ [name]: value }); -}; diff --git a/module/config.mjs b/module/config.mjs deleted file mode 100644 index 7022150..0000000 --- a/module/config.mjs +++ /dev/null @@ -1,7 +0,0 @@ -import { formatWeight } from "./utils/formatWeight.mjs"; - -const { deepSeal } = foundry.utils; - -export const config = deepSeal({ - weightFormatter: formatWeight, -}); diff --git a/module/data/Item/generic.mjs b/module/data/Item/generic.mjs deleted file mode 100644 index 54d2090..0000000 --- a/module/data/Item/generic.mjs +++ /dev/null @@ -1,41 +0,0 @@ -import { toPrecision } from "../../utils/roundToPrecision.mjs"; - -export class GenericItemData extends foundry.abstract.TypeDataModel { - static defineSchema() { - const fields = foundry.data.fields; - return { - group: new fields.StringField({ - blank: false, - trim: true, - initial: null, - nullable: true, - }), - weight: new fields.NumberField({ - min: 0, - initial: 0, - nullable: false, - }), - quantity: new fields.NumberField({ - integer: true, - initial: 1, - }), - equipped: new fields.BooleanField({ - initial: true, - }), - description: new fields.HTMLField({ - blank: true, - trim: true, - initial: ``, - }), - }; - }; - - /** - * Calculates the total weight of the item based on the quantity of it, this - * rounds the number to the nearest 2 decimal places. - */ - get quantifiedWeight() { - const value = this.weight * this.quantity; - return toPrecision(Math.max(value, 0), 2); - }; -}; diff --git a/module/data/Actor/player.mjs b/module/data/Player.mjs similarity index 89% rename from module/data/Actor/player.mjs rename to module/data/Player.mjs index d0e8dbc..b2ad529 100644 --- a/module/data/Actor/player.mjs +++ b/module/data/Player.mjs @@ -7,11 +7,6 @@ export class PlayerData extends foundry.abstract.TypeDataModel { trim: true, initial: ``, }), - carryCapacity: new fields.NumberField({ - min: 0, - nullable: true, - initial: null, - }), attr: new fields.TypedObjectField( new fields.SchemaField({ name: new fields.StringField({ blank: false, trim: true }), diff --git a/module/documents/Actor.mjs b/module/documents/Actor.mjs index acbe5e0..91c2bfa 100644 --- a/module/documents/Actor.mjs +++ b/module/documents/Actor.mjs @@ -6,36 +6,19 @@ const { hasProperty } = foundry.utils; export class TAFActor extends Actor { // #region Lifecycle - /** - * This makes sure that the actor gets created with the global attributes if - * they exist, while still allowing programmatic creation through the API with - * specific attributes. - */ async _preCreate(data, options, user) { // Assign the defaults from the world setting if they exist const defaults = game.settings.get(__ID__, `actorDefaultAttributes`) ?? {}; if (!hasProperty(data, `system.attr`)) { - // Remove with issue: Foundry/taf#55 const value = game.release.generation > 13 ? _replace(defaults) : defaults; this.updateSource({ "system.==attr": value }); }; return super._preCreate(data, options, user); }; - - /** - * This resets the cache of the item groupings whenever a descedant document - * gets changed (created, updated, deleted) so that we keep the cache as close - * to accurate as can be possible. - */ - _onEmbeddedDocumentChange(...args) { - super._onEmbeddedDocumentChange(...args); - this.#sortedTypes = null; - }; // #endregion Lifecycle - // #region Token Attributes async modifyTokenAttribute(attribute, value, isDelta = false, isBar = true) { const attr = foundry.utils.getProperty(this.system, attribute); const current = isBar ? attr.value : attr; @@ -57,18 +40,9 @@ export class TAFActor extends Actor { return allowed !== false ? this.update(updates) : this; }; - // #endregion Token Attributes - // #region Roll Data getRollData() { - /* - All properties assigned during this phase of the roll data prep can potentially - be overridden by users creating attributes of the same key, if users shouldn't - be able to override, assign the property before the return of this function. - */ - const data = { - carryCapacity: this.system.carryCapacity ?? null, - }; + const data = {}; if (`attr` in this.system) { for (const attrID in this.system.attr) { @@ -86,24 +60,4 @@ export class TAFActor extends Actor { return data; }; - // #endregion Roll Data - - // #region Getters - #sortedTypes = null; - get itemTypes() { - if (this.#sortedTypes) { return this.#sortedTypes }; - const types = {}; - for (const item of this.items) { - if (item.type !== `generic`) { - types[item.type] ??= []; - types[item.type].push(item); - } else { - const group = item.system.group?.toLowerCase() ?? `items`; - types[group] ??= []; - types[group].push(item); - }; - }; - return this.#sortedTypes = types; - }; - // #endregion Getters }; diff --git a/module/documents/Item.mjs b/module/documents/Item.mjs new file mode 100644 index 0000000..683187e --- /dev/null +++ b/module/documents/Item.mjs @@ -0,0 +1,7 @@ +const { Item } = foundry.documents; + +export class TAFItem extends Item { + async _preCreate() { + return false; + }; +}; diff --git a/module/hooks/init.mjs b/module/hooks/init.mjs index a6f623e..6ff92f0 100644 --- a/module/hooks/init.mjs +++ b/module/hooks/init.mjs @@ -1,16 +1,15 @@ // Apps import { AttributeOnlyPlayerSheet } from "../apps/AttributeOnlyPlayerSheet.mjs"; -import { GenericItemSheet } from "../apps/GenericItemSheet.mjs"; import { PlayerSheet } from "../apps/PlayerSheet.mjs"; import { SingleModePlayerSheet } from "../apps/SingleModePlayerSheet.mjs"; // Data Models -import { GenericItemData } from "../data/Item/generic.mjs"; -import { PlayerData } from "../data/Actor/player.mjs"; +import { PlayerData } from "../data/Player.mjs"; // Documents import { TAFActor } from "../documents/Actor.mjs"; import { TAFCombatant } from "../documents/Combatant.mjs"; +import { TAFItem } from "../documents/Item.mjs"; import { TAFTokenDocument } from "../documents/Token.mjs"; // Settings @@ -26,18 +25,16 @@ import { registerSockets } from "../sockets/_index.mjs"; Hooks.on(`init`, () => { Logger.debug(`Initializing`); - // #region Documents CONFIG.Token.documentClass = TAFTokenDocument; CONFIG.Actor.documentClass = TAFActor; CONFIG.Combatant.documentClass = TAFCombatant; - // #endregion Documents - // #region Data Models CONFIG.Actor.dataModels.player = PlayerData; - CONFIG.Item.dataModels.generic = GenericItemData; - // #endregion Data Models - // #region Sheets + // We disable items in the system for now + CONFIG.Item.documentClass = TAFItem; + delete CONFIG.ui.sidebar.TABS.items; + foundry.documents.collections.Actors.registerSheet( __ID__, PlayerSheet, @@ -57,16 +54,6 @@ Hooks.on(`init`, () => { { label: `taf.sheet-names.AttributeOnlyPlayerSheet` }, ); - foundry.documents.collections.Items.registerSheet( - __ID__, - GenericItemSheet, - { - makeDefault: true, - label: `taf.sheet-names.GenericItemSheet`, - }, - ); - // #endregion Sheets - registerWorldSettings(); registerSockets(); diff --git a/module/hooks/ready.mjs b/module/hooks/ready.mjs deleted file mode 100644 index 94c7249..0000000 --- a/module/hooks/ready.mjs +++ /dev/null @@ -1,6 +0,0 @@ -Hooks.on(`ready`, () => { - // Remove with issue: Foundry/taf#52 - if (game.release.generation < 14 && globalThis._loc == null) { - globalThis._loc = game.i18n.format.bind(game.i18n); - }; -}); diff --git a/module/hooks/renderSettingsConfig.mjs b/module/hooks/renderSettingsConfig.mjs index a75c55c..62eb341 100644 --- a/module/hooks/renderSettingsConfig.mjs +++ b/module/hooks/renderSettingsConfig.mjs @@ -1,6 +1,6 @@ import { __ID__ } from "../consts.mjs"; -Hooks.on(`renderSettingsConfig`, (app, html) => { +Hooks.on(`renderSettingsConfig`, (app, html, context, options) => { /* This section is used to insert a button into the settings config that unsets a world setting when it exists but doesn't allow any other form of editing it. diff --git a/module/main.mjs b/module/main.mjs index c0ba4df..df1c170 100644 --- a/module/main.mjs +++ b/module/main.mjs @@ -1,20 +1,4 @@ +import "./api.mjs"; import "./hooks/init.mjs"; -import "./hooks/ready.mjs"; import "./hooks/userConnected.mjs"; import "./hooks/renderSettingsConfig.mjs"; - -import { api } from "./api.mjs"; -import { config } from "./config.mjs"; - -Object.defineProperty( - globalThis, - `taf`, - { - value: Object.seal({ - api, - config, - }), - writable: false, - enumerable: true, - }, -); diff --git a/module/settings/world.mjs b/module/settings/world.mjs index bb0cd06..330f433 100644 --- a/module/settings/world.mjs +++ b/module/settings/world.mjs @@ -13,15 +13,6 @@ export function registerWorldSettings() { scope: `world`, }); - game.settings.register(__ID__, `weightUnit`, { - name: `taf.settings.weightUnit.name`, - hint: `taf.settings.weightUnit.hint`, - config: true, - type: String, - default: ``, - scope: `world`, - }); - game.settings.register(__ID__, `canPlayersManageAttributes`, { name: `taf.settings.canPlayersManageAttributes.name`, hint: `taf.settings.canPlayersManageAttributes.hint`, diff --git a/module/utils/formatWeight.mjs b/module/utils/formatWeight.mjs deleted file mode 100644 index 57f945d..0000000 --- a/module/utils/formatWeight.mjs +++ /dev/null @@ -1,12 +0,0 @@ -import { __ID__ } from "../consts.mjs"; -import { toPrecision } from "./roundToPrecision.mjs"; - -/** - * Formats a numerical value as a weight. - * - * @param {number} weight The numerical weight to format - */ -export function formatWeight(weight) { - const unit = game.settings.get(__ID__, `weightUnit`); - return toPrecision(weight, 2) + unit; -}; diff --git a/module/utils/localizer.mjs b/module/utils/localizer.mjs index 4961bae..7988039 100644 --- a/module/utils/localizer.mjs +++ b/module/utils/localizer.mjs @@ -1,4 +1,4 @@ -const config = Object.seal({ +const config = Object.preventExtensions({ subKeyPattern: /@(?[a-zA-Z.]+)/gm, maxDepth: 10, }); diff --git a/module/utils/roundToPrecision.mjs b/module/utils/roundToPrecision.mjs deleted file mode 100644 index 5365690..0000000 --- a/module/utils/roundToPrecision.mjs +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Takes a possibly-decimal value and rounds after a certain precision, keeping - * only the specified amount of decimals. - * - * @param {number} value The value that is to be rounded. - * @param {number} precision The number of decimal places to round to. Must be a - * positive integer. - * @returns The rounded number - */ -export function toPrecision(value, precision = 1) { - if (!Number.isInteger(precision)) { - throw `Precision must be an integer`; - }; - if (precision < 0) { - throw `Precision must be greater than or equal to 0`; - }; - - const m = 10 ** precision; - return Math.round(value * m) / m; -}; diff --git a/styles/Apps/GenericItemSheet.css b/styles/Apps/GenericItemSheet.css deleted file mode 100644 index 7691348..0000000 --- a/styles/Apps/GenericItemSheet.css +++ /dev/null @@ -1,78 +0,0 @@ -.taf.GenericItemSheet { - > .window-content { - padding: 0; - color: var(--item-sheet-colour); - background: var(--item-sheet-background); - } - - .sheet-header { - display: grid; - grid-template-columns: auto 1fr min-content 75px; - gap: 4px; - align-items: center; - padding: 0.5rem; - border-bottom: 1px solid var(--item-sheet-divider-colour); - - img { - border-radius: 4px; - } - } - - .content { - display: flex; - flex-direction: column; - flex-grow: 1; - gap: inherit; - padding: 0.5rem; - } - - .property { - display: grid; - grid-template-columns: 1fr 100px; - align-items: center; - justify-items: left; - gap: 8px; - - taf-toggle { - justify-self: end; - } - } - - .description { - flex-grow: 1; - overflow: hidden; - border-radius: 8px; - --table-row-color-odd: var(--table-header-bg-color); - - &:not(:has(> prose-mirror)) { - padding: 0.5rem; - } - } - - prose-mirror { - height: 100%; - background: var(--item-sheet-description-content-background); - --divider-colour: currentColor; - - menu { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - background: var(--item-sheet-description-menu-background); - - button { - color: var(--item-sheet-description-menu-colour); - } - } - } - - input { - color: var(--item-sheet-input-colour); - background: var(--item-sheet-input-background); - } - - taf-toggle { - --toggle-background: var(--item-sheet-input-background); - --slider-checked-colour: var(--item-sheet-toggle-slider-enabled-colour); - --slider-unchecked-colour: var(--item-sheet-toggle-slider-disabled-colour) - } -} diff --git a/styles/Apps/PlayerSheet.css b/styles/Apps/PlayerSheet.css index 627932e..525f01b 100644 --- a/styles/Apps/PlayerSheet.css +++ b/styles/Apps/PlayerSheet.css @@ -37,141 +37,6 @@ } } - .items-tab.active { - display: flex; - flex-direction: column; - gap: 8px; - } - - .inventory-summary { - display: flex; - flex-direction: row; - gap: 4px; - align-items: center; - background: var(--inventory-summary-background); - color: var(--inventory-summary-colour); - padding: 6px; - border-radius: 4px; - - input { - width: 75px; - text-align: center; - background: var(--inventory-input-background); - color: var(--inventory-input-colour); - text-align: center; - - &:disabled { - color: var(--inventory-input-disabled-colour); - cursor: not-allowed; - } - } - } - - .item-list-header { - display: flex; - flex-direction: row; - align-items: center; - gap: 8px; - border-radius: 6px 6px 0 0; - padding: 6px 6px 4px; - margin-bottom: 2px; - background: var(--item-list-header-background); - color: var(--item-list-header-colour); - - button { - padding: 2px; - border: none; - aspect-ratio: 1; - height: unset; - min-height: unset; - background: var(--item-list-header-input-background); - color: var(--item-list-header-input-colour); - } - } - - .item-list { - display: flex; - flex-direction: column; - gap: 2px; - list-style: none; - margin: 0; - padding: 0; - } - - .item { - background: var(--item-card-background); - color: var(--item-card-colour); - overflow: hidden; - margin-bottom: 0; - - .summary { - display: grid; - grid-template-columns: min-content auto 1fr 50px auto; - align-items: center; - gap: 8px; - background: var(--item-card-header-background); - color: var(--item-card-header-colour); - padding: 4px; - - img { - --size: 35px; - width: var(--size); - height: var(--size); - border-radius: 6px; - } - - .title { - display: flex; - flex-direction: column; - gap: 4px; - } - - .name { - font-size: 1.1rem; - } - .subtitle { - font-size: 0.7rem; - opacity: 90%; - } - - input, button { - background: var(--item-card-header-input-background); - color: var(--item-card-header-input-colour); - text-align: center; - - &:disabled { - color: var(--item-card-header-disabled-input-colour); - } - } - } - - .expand-button { - border: none; - aspect-ratio: 1; - - &:focus-visible { - filter: brightness(150%); - outline: none; - } - - &[data-expanded="true"] { - rotate: 180deg; - } - } - - .full-details { - padding: 4px; - - &[data-expanded="false"] { - display: none; - } - } - - &:last-child { - border-radius: 0 0 6px 6px; - } - } - .content { flex-grow: 1; overflow: hidden; diff --git a/styles/Apps/common.css b/styles/Apps/common.css index d673ac7..bbf1212 100644 --- a/styles/Apps/common.css +++ b/styles/Apps/common.css @@ -6,26 +6,4 @@ gap: 0.5rem; overflow: auto; } - - > .window-content nav.system-tabs { - display: flex; - flex-direction: row; - justify-content: left; - align-items: center; - gap: 8px; - - button { - border: none; - text-shadow: none; - box-shadow: none; - - &.active { - outline: 1px solid var(--tab-button-active-border); - } - - &:hover { - background: var(--tab-button-hover-bg); - } - } - } } diff --git a/styles/components/toggle.css b/styles/components/toggle.css deleted file mode 100644 index ff21137..0000000 --- a/styles/components/toggle.css +++ /dev/null @@ -1,55 +0,0 @@ -:host { - display: block; -} - -input { - width: 0; - height: 0; - margin: 0; - padding: 0; -} - -.slider { - width: var(--size, 16px); - height: var(--size, 16px); - background: var( - --slider-colour, - var(--toggle-slider-unchecked-colour) - ); - transition: all 150ms ease-in-out; - border-radius: 9999px; -} - -.toggle { - display: flex; - padding: var(--padding, 4px); - height: calc(var(--size, 16px) + (var(--padding, 4px) * 2)); - width: calc((var(--size, 16px) * 2) + (var(--padding, 4px) * 2)); - border-radius: 9999px; - background: var( - --toggle-background, - var(--toggle-background-colour) - ); - box-sizing: border-box; - cursor: pointer; - - /* Non-checked, clicking */ - &:is(&:active, &.active) .slider { - width: calc(var(--size, 16px) * 1.5); - } - - /* checked, non-clicking */ - & > :checked + .slider { - transform: translateX(var(--size, 16px)); - background: var( - --slider-checked-colour, - var(--toggle-slider-checked-colour) - ); - } - - /* checked, clicking */ - &:is(&:active, &.active) > :checked + .slider { - width: calc(var(--size, 16px) * 1.5); - transform: translateX(calc(var(--size, 16px) * 0.5)); - } -} diff --git a/styles/elements/button.css b/styles/elements/button.css deleted file mode 100644 index ddda02d..0000000 --- a/styles/elements/button.css +++ /dev/null @@ -1,5 +0,0 @@ -.taf > .window-content button { - &:disabled { - cursor: not-allowed; - } -} diff --git a/styles/elements/div.css b/styles/elements/div.css index b3d1566..69ebd5e 100644 --- a/styles/elements/div.css +++ b/styles/elements/div.css @@ -1,9 +1,9 @@ .taf > .window-content div { &.chip { display: inline flex; - color: var(--chip-colour); + color: var(--chip-color); background: var(--chip-background); - border: 1px solid var(--chip-border-colour); + border: 1px solid var(--chip-border-color); border-radius: 4px; .key { @@ -13,7 +13,7 @@ .value { padding: 2px 4px; border-radius: 0 4px 4px 0; - color: var(--chip-value-colour); + color: var(--chip-value-color); background: var(--chip-value-background); } } diff --git a/styles/elements/headers.css b/styles/elements/headers.css index 37ebdd1..2f59e8c 100644 --- a/styles/elements/headers.css +++ b/styles/elements/headers.css @@ -1,14 +1,5 @@ .taf > .window-content { h1, h2, h3, h4, h5, h6 { - font-family: var(--font-body); - color: currentColor; margin: 0; } - - h1 { font-size: 1.25rem; } - h2 { font-size: 1.20rem; } - h3 { font-size: 1.15rem; } - h4 { font-size: 1.1rem; } - h5 { font-size: 1.1rem; } - h6 { font-size: 1.1rem; } } diff --git a/styles/elements/hr.css b/styles/elements/hr.css index f5b37f8..1cffab7 100644 --- a/styles/elements/hr.css +++ b/styles/elements/hr.css @@ -1,8 +1,7 @@ .taf > .window-content hr { - color: inherit; display: block; height: 1px; - background: var(--divider-colour, rebeccapurple); + background: rebeccapurple; border-radius: 0; margin: 0; padding: 0; diff --git a/styles/elements/input.css b/styles/elements/input.css index 93396b2..4c6c747 100644 --- a/styles/elements/input.css +++ b/styles/elements/input.css @@ -1,10 +1,4 @@ .taf > .window-content input { - border: none; - - &::placeholder { - color: color-mix(in srgb, currentColor 40%, transparent 60%); - } - &.large { --input-height: 2.5rem; font-size: 1.75rem; diff --git a/styles/main.css b/styles/main.css index 49e4763..a4c4a2c 100644 --- a/styles/main.css +++ b/styles/main.css @@ -1,19 +1,16 @@ @layer resets, themes, elements, components, partials, apps, exceptions; /* Resets */ -@import url("./resets/button.css") layer(resets); @import url("./resets/hr.css") layer(resets); @import url("./resets/inputs.css") layer(resets); -@import url("./resets/tabs.css") layer(resets); +@import url("./resets/button.css") layer(resets); /* Themes */ -@import url("./palettes/forgejo.css") layer(themes); @import url("./themes/dark.css") layer(themes); @import url("./themes/light.css") layer(themes); /* Elements */ @import url("./elements/utils.css") layer(elements); -@import url("./elements/button.css") layer(elements); @import url("./elements/div.css") layer(elements); @import url("./elements/headers.css") layer(elements); @import url("./elements/hr.css") layer(elements); @@ -27,7 +24,6 @@ @import url("./Apps/common.css") layer(apps); @import url("./Apps/Ask.css") layer(apps); @import url("./Apps/AttributeManager.css") layer(apps); -@import url("./Apps/GenericItemSheet.css") layer(apps); @import url("./Apps/PlayerSheet.css") layer(apps); @import url("./Apps/QueryStatus.css") layer(apps); @import url("./Apps/TAFDocumentSheetConfig.css") layer(apps); diff --git a/styles/palettes/forgejo.css b/styles/palettes/forgejo.css deleted file mode 100644 index c491479..0000000 --- a/styles/palettes/forgejo.css +++ /dev/null @@ -1,49 +0,0 @@ -/* -Most of this file comes from a combination of Forgejo's themes - -- https://codeberg.org/forgejo/forgejo/src/commit/b68caa311fe5e3b7118130c2894c5b396b319681/web_src/css/themes/theme-forgejo-dark.css -- https://codeberg.org/forgejo/forgejo/src/commit/b68caa311fe5e3b7118130c2894c5b396b319681/web_src/css/themes/theme-forgejo-light.css - -Licensed under the GNU GPL v3 -*/ - -:root { - /* Steel */ - --steel-900: #10161d; - --steel-850: #131a21; - --steel-800: #171e26; - --steel-750: #1d262f; - --steel-700: #242d38; - --steel-650: #2b3642; - --steel-600: #374351; - --steel-550: #445161; - --steel-500: #515f70; - --steel-450: #5f6e80; - --steel-400: #6d7d8f; - --steel-350: #7c8c9f; - --steel-300: #8c9caf; - --steel-250: #9dadc0; - --steel-200: #aebed0; - --steel-150: #c0cfe0; - --steel-100: #d2e0f0; - - /* Zinc */ - --zinc-50: #fafafa; - --zinc-100: #f4f4f5; - --zinc-150: #ececee; - --zinc-200: #e4e4e7; - --zinc-250: #dcdce0; - --zinc-300: #d4d4d8; - --zinc-350: #babac1; - --zinc-400: #a1a1aa; - --zinc-450: #898992; - --zinc-500: #71717a; - --zinc-550: #61616a; - --zinc-600: #52525b; - --zinc-650: #484850; - --zinc-700: #3f3f46; - --zinc-750: #333338; - --zinc-800: #27272a; - --zinc-850: #1f1f23; - --zinc-900: #18181b; -} \ No newline at end of file diff --git a/styles/resets/button.css b/styles/resets/button.css index 98ba86d..d04ae6e 100644 --- a/styles/resets/button.css +++ b/styles/resets/button.css @@ -1,8 +1,3 @@ .taf > .window-content button { height: initial; - - &:focus { - outline: none; - box-shadow: none; - } } diff --git a/styles/resets/tabs.css b/styles/resets/tabs.css deleted file mode 100644 index aefac97..0000000 --- a/styles/resets/tabs.css +++ /dev/null @@ -1,10 +0,0 @@ -.taf > .window-content { - nav.tabs.system-tabs { - all: initial; - } - - nav.sheet-tabs.top-tabs { - margin-inline: 0; - margin-top: calc(var(--spacer-8) * -1); - } -} diff --git a/styles/themes/dark.css b/styles/themes/dark.css index fa87c25..53552e0 100644 --- a/styles/themes/dark.css +++ b/styles/themes/dark.css @@ -4,50 +4,10 @@ --spinner-outer-colour: white; --spinner-inner-colour: #FF3D00; - --toggle-background-colour: #171e26; - --toggle-slider-unchecked-colour: maroon; - --toggle-slider-checked-colour: green; - - --tab-button-active-border: rebeccapurple; - --tab-button-hover-bg: var(--color-cool-3); - - /* Actor Sheet Variables */ - /* Use --steel-850 as the main sheet background */ - --inventory-summary-background: var(--steel-800); - --inventory-summary-colour: var(--steel-100); - --inventory-input-background: var(--steel-650); - --inventory-input-colour: var(--steel-100); - --inventory-input-disabled-colour: var(--steel-350); - - --item-list-header-background: var(--steel-800); - --item-list-header-colour: var(--steel-100); - --item-list-header-input-background: var(--steel-650); - --item-list-header-input-colour: var(--steel-100); - - --item-card-background: #1d262f; - --item-card-colour: var(--steel-100); - --item-card-header-background: var(--steel-700); - --item-card-header-colour: var(--steel-100); - --item-card-header-input-background: var(--steel-650); - --item-card-header-input-colour: var(--steel-100); - --item-card-header-disabled-input-colour: var(--steel-350); - - /* Item Sheet Variables */ - --item-sheet-colour: var(--steel-100); - --item-sheet-background: var(--steel-800); - --item-sheet-divider-colour: var(--steel-700); - --item-sheet-input-colour: var(--steel-100); - --item-sheet-input-background: var(--steel-650); - --item-sheet-toggle-slider-enabled-colour: green; - --item-sheet-toggle-slider-disabled-colour: maroon; - --item-sheet-description-menu-colour: var(--steel-100); - --item-sheet-description-menu-background: var(--steel-700); - --item-sheet-description-content-background: var(--steel-650); - /* Chip Variables */ - --chip-colour: #fff7ed; + --chip-color: #fff7ed; --chip-background: #2b3642; - --chip-value-colour: #fff7ed; + --chip-value-color: #fff7ed; --chip-value-background: #10161d; - --chip-border-colour: var(--chip-value-background); + --chip-border-color: var(--chip-value-background); } diff --git a/styles/themes/light.css b/styles/themes/light.css index dd45d6b..47cf1e9 100644 --- a/styles/themes/light.css +++ b/styles/themes/light.css @@ -4,13 +4,10 @@ --spinner-outer-colour: black; --spinner-inner-colour: #FF3D00; - --tab-button-active: rebeccapurple; - --tab-button-hover-bg: var(--color-light-3); - /* Chip Variables */ - --chip-colour: #18181b; + --chip-color: #18181b; --chip-background: #fafafa; - --chip-value-colour: #18181b; + --chip-value-color: #18181b; --chip-value-background: #d4d4d8aa; - --chip-border-colour: var(--chip-value-background); + --chip-border-color: var(--chip-value-background); } diff --git a/system.json b/system.json index 6a9bdef..9c15e3e 100644 --- a/system.json +++ b/system.json @@ -39,14 +39,7 @@ "filePathFields": {} } }, - "Item": { - "generic": { - "htmlFields": [ - "description" - ], - "filePathFields": {} - } - } + "Item": {} }, "socket": true, "flags": { diff --git a/templates/GenericItemSheet/content.hbs b/templates/GenericItemSheet/content.hbs deleted file mode 100644 index d409ef5..0000000 --- a/templates/GenericItemSheet/content.hbs +++ /dev/null @@ -1,50 +0,0 @@ -
-
- - -
-
- - -
-
- - -
-
- {{#if meta.editable}} - - {{{ enriched.system.description }}} - - {{else}} - {{{ enriched.system.description }}} - {{/if}} -
-
diff --git a/templates/GenericItemSheet/header.hbs b/templates/GenericItemSheet/header.hbs deleted file mode 100644 index fd39d31..0000000 --- a/templates/GenericItemSheet/header.hbs +++ /dev/null @@ -1,28 +0,0 @@ -
- - - - -
diff --git a/templates/PlayerSheet/content.hbs b/templates/PlayerSheet/content.hbs index e5219f9..a22f5a1 100644 --- a/templates/PlayerSheet/content.hbs +++ b/templates/PlayerSheet/content.hbs @@ -1,8 +1,4 @@ -
+
{{#if editable}} -
-

- {{localize "taf.Apps.PlayerSheet.carrying-capacity.title"}} -

- {{#if hasCarryingCapacity}} -
- {{localize - "taf.Apps.PlayerSheet.carry-capacity-used" - percent=carryCapacityPercent - }} -
- {{/if}} - - - -
- {{#each itemGroups as | group |}} -
-
- {{#if @root.meta.editable}} - - {{/if}} -

- {{ group.name }} -

- - {{ group.weight }} - -
-
    - {{#each group.items as |item|}} - {{> (systemFilePath "templates/PlayerSheet/item.hbs") item }} - {{/each}} -
-
- {{/each}} -
diff --git a/templates/PlayerSheet/item.hbs b/templates/PlayerSheet/item.hbs deleted file mode 100644 index 962f62b..0000000 --- a/templates/PlayerSheet/item.hbs +++ /dev/null @@ -1,50 +0,0 @@ -
  • -
    - - -
    - {{ name }} - {{ weight }} -
    - - -
    - {{#if canExpand}} -
    - {{{ description }}} -
    - {{/if}} -
    • diff --git a/templates/generic/tabs.hbs b/templates/generic/tabs.hbs deleted file mode 100644 index 3096c6f..0000000 --- a/templates/generic/tabs.hbs +++ /dev/null @@ -1,19 +0,0 @@ -{{#if hideTabs}} - -{{else}} - -{{/if}}