logic cleanup

Author: davegarthsimpson

arduino-ide-extension/src/browser/dialogs/settings/settings-step-input.tsx

@@ -25,8 +25,9 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
       valueRoundedToScale === value ? value + step : valueRoundedToScale;
     const newValue = limitValueByCondition(
       calculatedValue,
+      maxValue,
       calculatedValue >= maxValue,
-      () => setStepUpDisabled(true)
+      disableStepUp
     );
 
     setSettingsStateValue(newValue);
@@ -38,22 +39,24 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
       valueRoundedToScale === value ? value - step : valueRoundedToScale;
     const newValue = limitValueByCondition(
       calculatedValue,
+      minValue,
       calculatedValue <= minValue,
-      () => setStepDownDisabled(true)
+      disableStepDown
     );
 
     setSettingsStateValue(newValue);
   };
 
   const limitValueByCondition = (
     calculatedValue: number,
+    limitedValue: number,
     condition: boolean,
     onConditionTrue: () => void,
     onConditionFalse = enableButtons
   ): number => {
     if (condition) {
       onConditionTrue();
-      return minValue;
+      return limitedValue;
     } else {
       onConditionFalse();
       return calculatedValue;
@@ -65,6 +68,14 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
     setStepDownDisabled(false);
   };
 
+  const disableStepUp = (): void => {
+    setStepUpDisabled(true);
+  };
+
+  const disableStepDown = (): void => {
+    setStepDownDisabled(true);
+  };
+
   const onUserInput = (event: React.ChangeEvent<HTMLInputElement>): void => {
     const { value: eventValue } = event.target;
 
@@ -77,12 +88,18 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
     if (!isNaN(number) && number !== value) {
       let newValue;
       if (number > value) {
-        newValue = limitValueByCondition(number, number >= maxValue, () =>
-          setStepUpDisabled(true)
+        newValue = limitValueByCondition(
+          number,
+          maxValue,
+          number >= maxValue,
+          disableStepUp
         );
       } else {
-        newValue = limitValueByCondition(number, number <= minValue, () =>
-          setStepDownDisabled(true)
+        newValue = limitValueByCondition(
+          number,
+          minValue,
+          number <= minValue,
+          disableStepDown
         );
       }