diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c42d31e..e88c5c76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [7.4.5](https://github.com/valentine195/obsidian-initiative-tracker/compare/7.6.0...7.4.5) (2022-08-10) + + +### Bug Fixes + +* improved multi-creature hp and status ux ([30de922](https://github.com/valentine195/obsidian-initiative-tracker/commit/30de9220ea4b5dc6c3f6b7afba2784ab860792af)) + ### [7.4.4](https://github.com/valentine195/obsidian-initiative-tracker/compare/7.4.3...7.4.4) (2022-06-09) diff --git a/package-lock.json b/package-lock.json index b4e74255..db4a58e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "initiative-tracker", - "version": "7.4.4", + "version": "7.4.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "initiative-tracker", - "version": "7.4.4", + "version": "7.4.5", "license": "MIT", "devDependencies": { "@babel/core": "^7.14.6", @@ -22,7 +22,7 @@ "dotenv": "^10.0.0", "esbuild": "^0.14.2", "esbuild-svelte": "^0.6.0", - "obsidian": "^0.12.11", + "obsidian": "^0.15.9", "rollup": "^2.32.1", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-svelte": "^7.1.0", @@ -360,6 +360,25 @@ "node": ">=6.9.0" } }, + "node_modules/@codemirror/state": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.1.tgz", + "integrity": "sha512-2s+aXsxmAwnR3Rd+JDHPG/1lw0YsA9PEwl7Re88gHJHGfxyfEzKBmsN4rr53RyPIR4lzbbhJX0DCq0WlqlBIRw==", + "dev": true, + "peer": true + }, + "node_modules/@codemirror/view": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.0.tgz", + "integrity": "sha512-3emW1symh+GoteFMBPsltjmF790U/trouLILATh3JodbF/z98HvcQh2g3+H6dfNIHx16uNonsAF4mNzVr1TJNA==", + "dev": true, + "peer": true, + "dependencies": { + "@codemirror/state": "^6.0.0", + "style-mod": "^4.0.0", + "w3c-keyname": "^2.2.4" + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz", @@ -3419,9 +3438,9 @@ } }, "node_modules/moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true, "engines": { "node": "*" @@ -3518,13 +3537,17 @@ } }, "node_modules/obsidian": { - "version": "0.12.11", - "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-0.12.11.tgz", - "integrity": "sha512-Kv4m1n4nfd17FzpqHZfqFS2YZAyY+cxAUM7/5jqh1bmbPlmKoNd1XJZC7o9KvkXfTCxALiXfGRdrjHB+GUFAEA==", + "version": "0.15.9", + "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-0.15.9.tgz", + "integrity": "sha512-w3JL/IM3/U61rjFSFIFDSv+pcHn3mH1EIRN40kBkC/lGYqjFSPbr6daQe08QkskBz/GAYIeBoaKQIcgU9vV3LQ==", "dev": true, "dependencies": { "@types/codemirror": "0.0.108", - "moment": "2.29.1" + "moment": "2.29.4" + }, + "peerDependencies": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0" } }, "node_modules/once": { @@ -4593,6 +4616,13 @@ "node": ">=8" } }, + "node_modules/style-mod": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==", + "dev": true, + "peer": true + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -5066,6 +5096,13 @@ "spdx-expression-parse": "^3.0.0" } }, + "node_modules/w3c-keyname": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==", + "dev": true, + "peer": true + }, "node_modules/watchpack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", @@ -5623,6 +5660,25 @@ "to-fast-properties": "^2.0.0" } }, + "@codemirror/state": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.1.tgz", + "integrity": "sha512-2s+aXsxmAwnR3Rd+JDHPG/1lw0YsA9PEwl7Re88gHJHGfxyfEzKBmsN4rr53RyPIR4lzbbhJX0DCq0WlqlBIRw==", + "dev": true, + "peer": true + }, + "@codemirror/view": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.2.0.tgz", + "integrity": "sha512-3emW1symh+GoteFMBPsltjmF790U/trouLILATh3JodbF/z98HvcQh2g3+H6dfNIHx16uNonsAF4mNzVr1TJNA==", + "dev": true, + "peer": true, + "requires": { + "@codemirror/state": "^6.0.0", + "style-mod": "^4.0.0", + "w3c-keyname": "^2.2.4" + } + }, "@discoveryjs/json-ext": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz", @@ -7947,9 +8003,9 @@ "dev": true }, "moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "dev": true }, "ms": { @@ -8021,13 +8077,13 @@ "dev": true }, "obsidian": { - "version": "0.12.11", - "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-0.12.11.tgz", - "integrity": "sha512-Kv4m1n4nfd17FzpqHZfqFS2YZAyY+cxAUM7/5jqh1bmbPlmKoNd1XJZC7o9KvkXfTCxALiXfGRdrjHB+GUFAEA==", + "version": "0.15.9", + "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-0.15.9.tgz", + "integrity": "sha512-w3JL/IM3/U61rjFSFIFDSv+pcHn3mH1EIRN40kBkC/lGYqjFSPbr6daQe08QkskBz/GAYIeBoaKQIcgU9vV3LQ==", "dev": true, "requires": { "@types/codemirror": "0.0.108", - "moment": "2.29.1" + "moment": "2.29.4" } }, "once": { @@ -8811,6 +8867,13 @@ "min-indent": "^1.0.0" } }, + "style-mod": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==", + "dev": true, + "peer": true + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -9119,6 +9182,13 @@ "spdx-expression-parse": "^3.0.0" } }, + "w3c-keyname": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", + "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==", + "dev": true, + "peer": true + }, "watchpack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", diff --git a/package.json b/package.json index 4f8c51bd..0a0d19fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "initiative-tracker", - "version": "7.4.4", + "version": "7.6.0", "description": "TTRPG Initiative Tracker for Obsidian.md", "main": "main.js", "scripts": { @@ -34,7 +34,7 @@ "dotenv": "^10.0.0", "esbuild": "^0.14.2", "esbuild-svelte": "^0.6.0", - "obsidian": "^0.12.11", + "obsidian": "^0.15.9", "rollup": "^2.32.1", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-svelte": "^7.1.0", diff --git a/src/svelte/App.svelte b/src/svelte/App.svelte index 025530a2..d22ddd02 100644 --- a/src/svelte/App.svelte +++ b/src/svelte/App.svelte @@ -49,10 +49,16 @@ const removeIcon = (node: HTMLElement) => { setIcon(node, REMOVE); }; + const checkIcon = (node: HTMLElement) => { + setIcon(node, "check"); + }; + const cancelIcon = (node: HTMLElement) => { + setIcon(node, "cross-in-box"); + }; let damage: string = ""; let status: Condition = null; - let updatingCreatures: { [key: string]: any }[] = []; + export let updatingCreatures: { [key: string]: any }[] = []; const updateCreatures = (toAddString: string, tag: Condition) => { const roundHalf = !toAddString.includes("."); @@ -158,7 +164,7 @@ { + on:hp={(evt) => { let index = updatingCreatures.findIndex( (entry) => entry.creature == evt.detail.creature ); @@ -242,10 +248,32 @@ }} /> +
+ updateCreatures(damage, status)} + style="cursor:pointer" + aria-label="Apply" + /> + +
+
+ Multiple creatures can be selected at a time. +
- @@ -254,7 +282,7 @@ {#each updatingCreatures as { creature, saved, resist, customMod }, i} -
+ Name Saved Resist
- {creature.name + (creature.number ? (" " + creature.number) : "")} + {creature.name + + (creature.number + ? " " + creature.number + : "")} diff --git a/src/svelte/CreatureControls.svelte b/src/svelte/CreatureControls.svelte index 80945a50..f7dab174 100644 --- a/src/svelte/CreatureControls.svelte +++ b/src/svelte/CreatureControls.svelte @@ -1,7 +1,7 @@