From b7b22a276de62d143c8adaecacf4b919458d7644 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Thu, 24 Feb 2022 05:08:31 -0500
Subject: [PATCH] improvements, but stuck. I think I need to rework again

---
 .../BitsCheermoteNameExactMatchForm.tsx       |  3 +-
 .../BitsCheermotePrefixSpendThresholdForm.tsx | 49 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermoteNameExactMatchForm.tsx b/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermoteNameExactMatchForm.tsx
index 713a6cc880..c30a360272 100644
--- a/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermoteNameExactMatchForm.tsx
+++ b/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermoteNameExactMatchForm.tsx
@@ -3,6 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faGem } from '@fortawesome/free-solid-svg-icons';
 import { CHEER_BIT_LEVELS, CHEER_PREFIXES } from '../../../../twitch/Cheers';
 
+// TODO: Don't duplicate
 const CHEER_REGEX = /^([A-Za-z]+)(\d+)?$/;
 
 interface BitsCheermoteNameExactMatchProps {
@@ -12,7 +13,7 @@ interface BitsCheermoteNameExactMatchProps {
 
 function BitsCheermoteNameExactMatchForm(props: BitsCheermoteNameExactMatchProps) {
   // The two dropdowns
-  const [cheerPrefix, setCheerPrefix] = useState<string|undefined>(props.cheerName);
+  const [cheerPrefix, setCheerPrefix] = useState<string>(props.cheerName);
   const [bitsValue, setBitsValue] = useState<number>(1);
   // The freeform text input
   const [manualCheerValue, setManualCheerValue] = useState<string>(props.cheerName);
diff --git a/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermotePrefixSpendThresholdForm.tsx b/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermotePrefixSpendThresholdForm.tsx
index 70125cf434..f55ecf5fc2 100644
--- a/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermotePrefixSpendThresholdForm.tsx
+++ b/packages/storyteller/src/pages/tts_configs/event_match_predicate_builder/subforms/BitsCheermotePrefixSpendThresholdForm.tsx
@@ -1,8 +1,11 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faGem } from '@fortawesome/free-solid-svg-icons';
 import { CHEER_BIT_LEVELS, CHEER_PREFIXES } from '../../../../twitch/Cheers';
 
+// TODO: Don't duplicate
+const CHEER_REGEX = /^([A-Za-z]+)(\d+)?$/;
+
 interface BitsCheermotePrefixSpendThresholdProps {
   cheerPrefix: string,
   updateCheerNameOrPrefix: (cheerNameOrPrefix: string) => void,
@@ -17,6 +20,45 @@ function BitsCheermotePrefixSpendThresholdForm(props: BitsCheermotePrefixSpendTh
   const [bitsValue, setBitsValue] = useState<number>(props.minimumBitsSpent);
   const [customBitsValue, setCustomBitsValue] = useState<number>(props.minimumBitsSpent);
 
+  // This handles initialization after mount.
+  // NB: useState is not always setting from props correctly (after several re-renders)
+  // The following answers suggests using useEffect:
+  //  https://stackoverflow.com/a/54866051 (less clear by also using useState(), but good comments)
+  //  https://stackoverflow.com/a/62982753
+  useEffect(() => {
+    let newBitsValue = 1;
+
+    // Cheer prefix could be just a prefix (eg. 'Corgo') OR the full name (eg. 'Corgo100')
+    // This depends on what the previous view was.
+    const matches = props.cheerPrefix.trim().match(CHEER_REGEX)
+
+    if (!!matches && matches.length > 1) {
+      // First match group
+      setCheerPrefix(matches[1]);
+      setCustomCheerPrefix(matches[1]);
+      if (matches.length == 3 && matches[2] !== undefined) {
+        // NB: Second match group can be 'undefined' if no number is present. (Zero-width matching?)
+        let maybeValid = parseInt(matches[2]);
+        if (!isNaN(maybeValid)) {
+          newBitsValue = maybeValid;
+        }
+      }
+    }
+
+    if (!!props.minimumBitsSpent && !isNaN(props.minimumBitsSpent) && props.minimumBitsSpent > 0) {
+      newBitsValue = props.minimumBitsSpent;
+    }
+
+    console.log('newBitsValue', newBitsValue);
+    
+    setBitsValue(newBitsValue);
+    setCustomBitsValue(newBitsValue);
+
+  }, [props.cheerPrefix, props.minimumBitsSpent]);
+
+  console.log('bv', bitsValue);
+
+
   const updateCheerPrefix = (ev: React.FormEvent<HTMLSelectElement>) : boolean => {
     const value = (ev.target as HTMLSelectElement).value;
     setCheerPrefix(value);
@@ -72,7 +114,10 @@ function BitsCheermotePrefixSpendThresholdForm(props: BitsCheermotePrefixSpendTh
         <div className="control">
           <label className="label">Pick the cheer prefix</label>
           <div className="select is-medium">
-            <select onChange={updateCheerPrefix}>
+            <select 
+              onChange={updateCheerPrefix}
+              value={cheerPrefix}
+              >
               <option
                 key={`option-*`}
                 value=""