From a6bf29ece15c223aa2ef26804c48118735fbabff Mon Sep 17 00:00:00 2001
From: ThaumRystra <thaum@dicecloud.com>
Date: Sat, 25 Jan 2025 21:17:59 +0200
Subject: [PATCH] Moved char subscription to page so it isn't re-fired on
 tabletops

---
 .../ui/creature/actions/input/CheckInput.vue  |  9 ++++++
 .../ui/creature/character/CharacterSheet.vue  | 18 +-----------
 .../client/ui/pages/CharacterSheetPage.vue    | 29 ++++++++++++++++---
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/app/imports/client/ui/creature/actions/input/CheckInput.vue b/app/imports/client/ui/creature/actions/input/CheckInput.vue
index 8ab0ac61..5377a3b9 100644
--- a/app/imports/client/ui/creature/actions/input/CheckInput.vue
+++ b/app/imports/client/ui/creature/actions/input/CheckInput.vue
@@ -44,6 +44,15 @@ export default {
     VerticalHex
   },
   props: {
+    /**
+      advantage: 0 | 1 | -1;
+      skillVariableName?: string;
+      abilityVariableName?: string;
+      dc: number | null;
+      contest?: true;
+      targetSkillVariableName?: string;
+      targetAbilityVariableName?: string;
+    */
     value: {
       type: Object,
       required: true,
diff --git a/app/imports/client/ui/creature/character/CharacterSheet.vue b/app/imports/client/ui/creature/character/CharacterSheet.vue
index bc126cf5..adfcbe8f 100644
--- a/app/imports/client/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheet.vue
@@ -1,18 +1,7 @@
 <template>
   <div class="character-sheet fill-height">
     <v-fade-transition mode="out-in">
-      <div
-        v-if="!$subReady.singleCharacter"
-        key="character-loading"
-        class="fill-height layout justify-center align-center"
-      >
-        <v-progress-circular
-          indeterminate
-          color="primary"
-          size="64"
-        />
-      </div>
-      <div v-else-if="!creature">
+      <div v-if="!creature">
         <v-layout
           column
           align-center
@@ -214,11 +203,6 @@ export default {
     this.logObserver?.stop();
   },
   meteor: {
-    $subscribe: {
-      'singleCharacter'() {
-        return [this.creatureId];
-      },
-    },
     creature() {
       return Creatures.findOne(this.creatureId, {
         fields: { variables: 0 }
diff --git a/app/imports/client/ui/pages/CharacterSheetPage.vue b/app/imports/client/ui/pages/CharacterSheetPage.vue
index 26865fde..25d3a2cd 100644
--- a/app/imports/client/ui/pages/CharacterSheetPage.vue
+++ b/app/imports/client/ui/pages/CharacterSheetPage.vue
@@ -1,8 +1,22 @@
 <template>
-  <character-sheet
-    show-menu-button
-    :creature-id="$route.params.id"
-  />
+  <v-fade-transition mode="out-in">
+    <div
+      v-if="!$subReady.singleCharacter"
+      key="character-loading"
+      class="fill-height layout justify-center align-center"
+    >
+      <v-progress-circular
+        indeterminate
+        color="primary"
+        size="64"
+      />
+    </div>
+    <character-sheet
+      v-else
+      show-menu-button
+      :creature-id="$route.params.id"
+    />
+  </v-fade-transition>
 </template>
 
 <script lang="js">
@@ -11,5 +25,12 @@ export default {
   components: {
     CharacterSheet,
   },
+  meteor: {
+    $subscribe: {
+      'singleCharacter'() {
+        return [this.$route.params.id];
+      },
+    },
+  }
 }
 </script>