From a5489f8b7c2de4bbca42c248ec4a9419840fb3b2 Mon Sep 17 00:00:00 2001
From: olzzon <github@olzzon.dk>
Date: Wed, 10 Nov 2021 12:03:04 +0100
Subject: [PATCH] feat: valuesAsLabels - show min and max in GUI

---
 client/components/ChanStrip.tsx     | 11 +++++++---
 client/components/ChanStripFull.tsx | 34 +++++++++++++++--------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
index b41ac7ff..d73352bf 100644
--- a/client/components/ChanStrip.tsx
+++ b/client/components/ChanStrip.tsx
@@ -243,7 +243,9 @@ class ChanStrip extends React.PureComponent<
                 {window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
                     .label ?? ''}
                 <div className="parameter-mini-text">
-                    {maxLabel + valueLabel}
+                    {!valueAsLabels
+                        ? maxLabel + valueLabel
+                        : valueAsLabels[valueAsLabels.length - 1] + valueLabel}
                 </div>
                 <ReactSlider
                     className="chan-strip-fader"
@@ -267,7 +269,8 @@ class ChanStrip extends React.PureComponent<
                                   )
                                 : valueAsLabels[
                                       Math.round(
-                                          parseFloat(state.valueNow) * (maxLabel - minLabel)
+                                          parseFloat(state.valueNow) *
+                                              (maxLabel - minLabel)
                                       )
                                   ]}
                             {valueLabel}
@@ -278,7 +281,9 @@ class ChanStrip extends React.PureComponent<
                     }}
                 />
                 <div className="parameter-mini-text">
-                    {minLabel + valueLabel}
+                    {!valueAsLabels
+                        ? minLabel + valueLabel
+                        : valueAsLabels[0] + valueLabel}
                 </div>
             </div>
         )
diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
index a4cd90ed..2dd3857a 100644
--- a/client/components/ChanStripFull.tsx
+++ b/client/components/ChanStripFull.tsx
@@ -589,42 +589,42 @@ class ChanStripFull extends React.PureComponent<
         let valueLabel =
             window.mixerProtocol.channelTypes[0].fromMixer[fxParam]?.[0]
                 .valueLabel ?? ''
-
+        let valueAsLabels =
+            window.mixerProtocol.channelTypes[0].fromMixer[fxParam]?.[0]
+                .valueAsLabels
         return (
             <div className="parameter-text">
-                {
-                    window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
-                        .label
-                }
+                {window.mixerProtocol.channelTypes[0].fromMixer[fxParam][0]
+                    .label ?? ''}
                 <div className="parameter-mini-text">
-                    {maxLabel + valueLabel}
+                    {!valueAsLabels
+                        ? maxLabel + valueLabel
+                        : valueAsLabels[valueAsLabels.length - 1] + valueLabel}
                 </div>
                 <ReactSlider
-                    className="chan-strip-full-fader"
-                    thumbClassName="chan-strip-full-thumb"
+                    className="chan-strip-fader"
+                    thumbClassName="chan-strip-thumb"
                     orientation="vertical"
+                    invert
                     min={0}
                     max={1}
                     step={0.001}
-                    invert="false"
                     value={
                         this.props.fader[this.props.faderIndex][fxParam]?.[0] ??
                         0
                     }
                     renderThumb={(props: any, state: any) => (
                         <div {...props}>
-                            {!window.mixerProtocol.channelTypes[0].fromMixer[
-                                fxParam
-                            ]?.[0].valueAsLabels
+                            {!valueAsLabels
                                 ? Math.round(
                                       (maxLabel - minLabel) *
                                           parseFloat(state.valueNow) +
                                           minLabel
                                   )
-                                : window.mixerProtocol.channelTypes[0]
-                                      .fromMixer[fxParam]?.[0].valueAsLabels[
+                                : valueAsLabels[
                                       Math.round(
-                                          parseFloat(state.valueNow) * 10
+                                          parseFloat(state.valueNow) *
+                                              (maxLabel - minLabel)
                                       )
                                   ]}
                             {valueLabel}
@@ -635,7 +635,9 @@ class ChanStripFull extends React.PureComponent<
                     }}
                 />
                 <div className="parameter-mini-text">
-                    {minLabel + valueLabel}
+                    {!valueAsLabels
+                        ? minLabel + valueLabel
+                        : valueAsLabels[0] + valueLabel}
                 </div>
             </div>
         )