From 81cdf282eac9953dd80ed205c026d3572bb2baa1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 11 Feb 2021 13:12:35 +0200
Subject: [PATCH] Stopped inactive properties from showing computed inline
 fields, since they are not recomputed while inactive

---
 .../ui/components/computation/EmbedInlineComputations.vue       | 2 ++
 app/imports/ui/creature/slots/SlotFillDialog.vue                | 1 +
 app/imports/ui/properties/components/actions/ActionCard.vue     | 1 +
 app/imports/ui/properties/components/features/FeatureCard.vue   | 1 +
 app/imports/ui/properties/components/persona/NoteCard.vue       | 1 +
 app/imports/ui/properties/viewers/ActionViewer.vue              | 2 ++
 app/imports/ui/properties/viewers/AttributeViewer.vue           | 1 +
 app/imports/ui/properties/viewers/BuffViewer.vue                | 1 +
 app/imports/ui/properties/viewers/ContainerViewer.vue           | 1 +
 app/imports/ui/properties/viewers/FeatureViewer.vue             | 2 ++
 app/imports/ui/properties/viewers/ItemViewer.vue                | 1 +
 app/imports/ui/properties/viewers/NoteViewer.vue                | 1 +
 app/imports/ui/properties/viewers/SkillViewer.vue               | 1 +
 app/imports/ui/properties/viewers/SpellListViewer.vue           | 1 +
 app/imports/ui/properties/viewers/SpellViewer.vue               | 1 +
 .../ui/properties/viewers/shared/PropertyDescription.vue        | 2 ++
 16 files changed, 20 insertions(+)

diff --git a/app/imports/ui/components/computation/EmbedInlineComputations.vue b/app/imports/ui/components/computation/EmbedInlineComputations.vue
index 033f39bf..3c4ca6f4 100644
--- a/app/imports/ui/components/computation/EmbedInlineComputations.vue
+++ b/app/imports/ui/components/computation/EmbedInlineComputations.vue
@@ -22,10 +22,12 @@ export default {
         return [];
       },
     },
+    inactive: Boolean,
   },
   computed: {
     computedValue(){
       if (!this.string) return '';
+      if (this.inactive) return this.string;
       let index = 0;
       return this.string.replace(/\{([^{}]*)\}/g, () => {
         let comp = this.calculations && this.calculations[index++];
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 5d61153b..b99e24c9 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -58,6 +58,7 @@
                   <property-description
                     :string="model.description"
                     :calculations="model.descriptionCalculations"
+                    :inactive="model.inactive"
                   />
                 </div>
               </v-card-title>
diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/ui/properties/components/actions/ActionCard.vue
index 22cecf90..140293a4 100644
--- a/app/imports/ui/properties/components/actions/ActionCard.vue
+++ b/app/imports/ui/properties/components/actions/ActionCard.vue
@@ -74,6 +74,7 @@
         <property-description
           :string="model.summary"
           :calculations="model.summaryCalculations"
+          :inactive="model.inactive"
         />
         <v-divider
           v-if="children.length"
diff --git a/app/imports/ui/properties/components/features/FeatureCard.vue b/app/imports/ui/properties/components/features/FeatureCard.vue
index bc4fccdf..909c484e 100644
--- a/app/imports/ui/properties/components/features/FeatureCard.vue
+++ b/app/imports/ui/properties/components/features/FeatureCard.vue
@@ -14,6 +14,7 @@
       <computed
         :string="model.summary"
         :calculations="model.summaryCalculations"
+        :inactive="model.inactive"
       />
     </v-card-text>
   </toolbar-card>
diff --git a/app/imports/ui/properties/components/persona/NoteCard.vue b/app/imports/ui/properties/components/persona/NoteCard.vue
index 9af43ed2..642485e4 100644
--- a/app/imports/ui/properties/components/persona/NoteCard.vue
+++ b/app/imports/ui/properties/components/persona/NoteCard.vue
@@ -14,6 +14,7 @@
       <property-description
         :string="model.description"
         :calculations="model.descriptionCalculations"
+        :inactive="model.inactive"
       />
     </v-card-text>
   </v-card>
diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/ui/properties/viewers/ActionViewer.vue
index 005610e9..0b73c3ab 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/ui/properties/viewers/ActionViewer.vue
@@ -105,6 +105,7 @@
       <property-description
         :string="model.summary"
         :calculations="model.summaryCalculations"
+        :inactive="model.inactive"
       />
       <v-divider
         v-if="model.description"
@@ -114,6 +115,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/ui/properties/viewers/AttributeViewer.vue
index 21dfdfcc..f0e2a021 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/ui/properties/viewers/AttributeViewer.vue
@@ -41,6 +41,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
 
     <effect-viewer
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/ui/properties/viewers/BuffViewer.vue
index 69aa999c..08b4d6fd 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/ui/properties/viewers/BuffViewer.vue
@@ -8,6 +8,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/ContainerViewer.vue b/app/imports/ui/properties/viewers/ContainerViewer.vue
index cb18ccd8..55a2b68c 100644
--- a/app/imports/ui/properties/viewers/ContainerViewer.vue
+++ b/app/imports/ui/properties/viewers/ContainerViewer.vue
@@ -46,6 +46,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/ui/properties/viewers/FeatureViewer.vue
index 64534f58..709a20a2 100644
--- a/app/imports/ui/properties/viewers/FeatureViewer.vue
+++ b/app/imports/ui/properties/viewers/FeatureViewer.vue
@@ -4,11 +4,13 @@
     <property-description
       :string="model.summary"
       :calculations="model.summaryCalculations"
+      :inactive="model.inactive"
     />
     <v-divider class="mt-3 mb-3" />
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/ui/properties/viewers/ItemViewer.vue
index cf08e964..bde66f12 100644
--- a/app/imports/ui/properties/viewers/ItemViewer.vue
+++ b/app/imports/ui/properties/viewers/ItemViewer.vue
@@ -111,6 +111,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/NoteViewer.vue b/app/imports/ui/properties/viewers/NoteViewer.vue
index 2a134a75..cec30f99 100644
--- a/app/imports/ui/properties/viewers/NoteViewer.vue
+++ b/app/imports/ui/properties/viewers/NoteViewer.vue
@@ -4,6 +4,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 9db2026d..bac8052c 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -37,6 +37,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
 
     <effect-viewer
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue
index 402eec44..18faeca2 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellListViewer.vue
@@ -9,6 +9,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/ui/properties/viewers/SpellViewer.vue
index 55d445ec..b74b0bad 100644
--- a/app/imports/ui/properties/viewers/SpellViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellViewer.vue
@@ -20,6 +20,7 @@
     <property-description
       :string="model.description"
       :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
     />
   </div>
 </template>
diff --git a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
index 0aed6cd8..5c3fd568 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
@@ -4,6 +4,7 @@
     class="property-description"
     :string="string"
     :calculations="calculations"
+    :inactive="inactive"
   />
 </template>
 
@@ -25,6 +26,7 @@ export default {
         return [];
       },
     },
+    inactive: Boolean,
 	},
 }
 </script>