Merge branch 'hotfix/2.20.5' into develop

HarmlessKey · Dec 15, 2023 · a3111ec · a3111ec
2 parents a1925e8 + 5640034
commit a3111ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.20.4",
+	"version": "2.20.5",
 	"name": "harmless_key",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Harmless Key",

diff --git a/src/components/Drawer.vue b/src/components/Drawer.vue
@@ -9,7 +9,7 @@
 			<div class="drawer__content" :class="drawer.classes">
 				<component
 					v-if="component"
-					v-bind="drawer.data"
+					v-bind="!Array.isArray(drawer.data) ? drawer.data : null"
 					:is="component"
 					:data="drawer.data"
 					:type="drawer.type"

diff --git a/src/components/drawers/encounter/EditEntity.vue b/src/components/drawers/encounter/EditEntity.vue
@@ -401,7 +401,7 @@ export default {
 	computed: {
 		...mapGetters(["entities", "targeted", "userSettings"]),
 		edit_targets() {
-			if (this.data !== undefined && this.data.length > 0) {
+			if (this.data?.length > 0) {
 				return this.data;
 			}
 			return this.targeted;