From 1f50f78912caeeff1c65182d61b72e6ec95b9899 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 19 Oct 2022 20:57:27 +0100
Subject: feat: settings sliders (#120)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/components/PluginSettings/PluginModal.tsx      | 28 +++++++------
 .../components/SettingBooleanComponent.tsx         | 10 ++---
 .../components/SettingNumericComponent.tsx         | 10 ++---
 .../components/SettingSelectComponent.tsx          | 10 ++---
 .../components/SettingSliderComponent.tsx          | 49 ++++++++++++++++++++++
 .../components/SettingTextComponent.tsx            | 10 ++---
 src/components/PluginSettings/components/index.ts  |  1 +
 7 files changed, 82 insertions(+), 36 deletions(-)
 create mode 100644 src/components/PluginSettings/components/SettingSliderComponent.tsx

(limited to 'src/components')

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index a324300..3ef36b4 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -15,10 +15,9 @@ import {
     SettingInputComponent,
     SettingNumericComponent,
     SettingSelectComponent,
+    SettingSliderComponent,
 } from "./components";
 
-const { FormSection, FormText, FormTitle } = Forms;
-
 const UserSummaryItem = lazyWebpack(filters.byCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
 const AvatarStyles = lazyWebpack(filters.byProps(["moreUsers", "emptyUser", "avatarContainer", "clickableAvatar"]));
 const UserRecord: Constructor<Partial<User>> = proxyLazy(() => UserStore.getCurrentUser().constructor) as any;
@@ -80,7 +79,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
 
     function renderSettings() {
         if (!pluginSettings || !plugin.options) {
-            return <FormText>There are no settings for this plugin.</FormText>;
+            return <Forms.FormText>There are no settings for this plugin.</Forms.FormText>;
         }
 
         const options: JSX.Element[] = [];
@@ -110,6 +109,11 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                 }
                 case OptionType.BOOLEAN: {
                     options.push(<SettingBooleanComponent key={key} option={setting} {...props} />);
+                    break;
+                }
+                case OptionType.SLIDER: {
+                    options.push(<SettingSliderComponent key={key} option={setting} {...props} />);
+                    break;
                 }
             }
         }
@@ -142,9 +146,9 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                 <Text variant="heading-md/bold">{plugin.name}</Text>
             </ModalHeader>
             <ModalContent style={{ marginBottom: 8, marginTop: 8 }}>
-                <FormSection>
-                    <FormTitle tag="h3">About {plugin.name}</FormTitle>
-                    <FormText>{plugin.description}</FormText>
+                <Forms.FormSection>
+                    <Forms.FormTitle tag="h3">About {plugin.name}</Forms.FormTitle>
+                    <Forms.FormText>{plugin.description}</Forms.FormText>
                     <div style={{ marginTop: 8, marginBottom: 8, width: "fit-content" }}>
                         <UserSummaryItem
                             users={authors}
@@ -157,20 +161,20 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                             renderMoreUsers={renderMoreUsers}
                         />
                     </div>
-                </FormSection>
+                </Forms.FormSection>
                 {!!plugin.settingsAboutComponent && (
                     <div style={{ marginBottom: 8 }}>
-                        <FormSection>
+                        <Forms.FormSection>
                             <ErrorBoundary message="An error occurred while rendering this plugin's custom InfoComponent">
                                 <plugin.settingsAboutComponent />
                             </ErrorBoundary>
-                        </FormSection>
+                        </Forms.FormSection>
                     </div>
                 )}
-                <FormSection>
-                    <FormTitle tag="h3">Settings</FormTitle>
+                <Forms.FormSection>
+                    <Forms.FormTitle tag="h3">Settings</Forms.FormTitle>
                     {renderSettings()}
-                </FormSection>
+                </Forms.FormSection>
             </ModalContent>
             <ModalFooter>
                 <Flex>
diff --git a/src/components/PluginSettings/components/SettingBooleanComponent.tsx b/src/components/PluginSettings/components/SettingBooleanComponent.tsx
index 62dd4d5..939ca70 100644
--- a/src/components/PluginSettings/components/SettingBooleanComponent.tsx
+++ b/src/components/PluginSettings/components/SettingBooleanComponent.tsx
@@ -2,8 +2,6 @@ import { ISettingElementProps } from ".";
 import { PluginOptionBoolean } from "../../../utils/types";
 import { Forms, React, Select } from "../../../webpack/common";
 
-const { FormSection, FormTitle, FormText } = Forms;
-
 export function SettingBooleanComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionBoolean>) {
     const def = pluginSettings[id] ?? option.default;
 
@@ -31,8 +29,8 @@ export function SettingBooleanComponent({ option, pluginSettings, id, onChange,
     }
 
     return (
-        <FormSection>
-            <FormTitle>{option.description}</FormTitle>
+        <Forms.FormSection>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
             <Select
                 isDisabled={option.disabled?.() ?? false}
                 options={options}
@@ -44,8 +42,8 @@ export function SettingBooleanComponent({ option, pluginSettings, id, onChange,
                 serialize={v => String(v)}
                 {...option.componentProps}
             />
-            {error && <FormText style={{ color: "var(--text-danger)" }}>{error}</FormText>}
-        </FormSection>
+            {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
+        </Forms.FormSection>
     );
 }
 
diff --git a/src/components/PluginSettings/components/SettingNumericComponent.tsx b/src/components/PluginSettings/components/SettingNumericComponent.tsx
index fe3fea1..a54d281 100644
--- a/src/components/PluginSettings/components/SettingNumericComponent.tsx
+++ b/src/components/PluginSettings/components/SettingNumericComponent.tsx
@@ -2,8 +2,6 @@ import { ISettingElementProps } from ".";
 import { OptionType, PluginOptionNumber } from "../../../utils/types";
 import { Forms, React, TextInput } from "../../../webpack/common";
 
-const { FormSection, FormTitle, FormText } = Forms;
-
 const MAX_SAFE_NUMBER = BigInt(Number.MAX_SAFE_INTEGER);
 
 export function SettingNumericComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionNumber>) {
@@ -33,8 +31,8 @@ export function SettingNumericComponent({ option, pluginSettings, id, onChange,
     }
 
     return (
-        <FormSection>
-            <FormTitle>{option.description}</FormTitle>
+        <Forms.FormSection>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
             <TextInput
                 type="number"
                 pattern="-?[0-9]+"
@@ -44,7 +42,7 @@ export function SettingNumericComponent({ option, pluginSettings, id, onChange,
                 disabled={option.disabled?.() ?? false}
                 {...option.componentProps}
             />
-            {error && <FormText style={{ color: "var(--text-danger)" }}>{error}</FormText>}
-        </FormSection>
+            {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
+        </Forms.FormSection>
     );
 }
diff --git a/src/components/PluginSettings/components/SettingSelectComponent.tsx b/src/components/PluginSettings/components/SettingSelectComponent.tsx
index 703ffbb..20ff7a5 100644
--- a/src/components/PluginSettings/components/SettingSelectComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSelectComponent.tsx
@@ -2,8 +2,6 @@ import { ISettingElementProps } from ".";
 import { PluginOptionSelect } from "../../../utils/types";
 import { Forms, React, Select } from "../../../webpack/common";
 
-const { FormSection, FormTitle, FormText } = Forms;
-
 export function SettingSelectComponent({ option, pluginSettings, onChange, onError, id }: ISettingElementProps<PluginOptionSelect>) {
     const def = pluginSettings[id] ?? option.options?.find(o => o.default)?.value;
 
@@ -25,8 +23,8 @@ export function SettingSelectComponent({ option, pluginSettings, onChange, onErr
     }
 
     return (
-        <FormSection>
-            <FormTitle>{option.description}</FormTitle>
+        <Forms.FormSection>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
             <Select
                 isDisabled={option.disabled?.() ?? false}
                 options={option.options}
@@ -38,7 +36,7 @@ export function SettingSelectComponent({ option, pluginSettings, onChange, onErr
                 serialize={v => String(v)}
                 {...option.componentProps}
             />
-            {error && <FormText style={{ color: "var(--text-danger)" }}>{error}</FormText>}
-        </FormSection>
+            {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
+        </Forms.FormSection>
     );
 }
diff --git a/src/components/PluginSettings/components/SettingSliderComponent.tsx b/src/components/PluginSettings/components/SettingSliderComponent.tsx
new file mode 100644
index 0000000..64466c1
--- /dev/null
+++ b/src/components/PluginSettings/components/SettingSliderComponent.tsx
@@ -0,0 +1,49 @@
+import { ISettingElementProps } from ".";
+import { PluginOptionSlider } from "../../../utils/types";
+import { Forms, React, Slider } from "../../../webpack/common";
+
+export function makeRange(start: number, end: number, step = 1) {
+    const ranges: number[] = [];
+    for (let value = start; value <= end; value += step) {
+        ranges.push(Math.round(value * 100) / 100);
+    }
+    return ranges;
+}
+
+export function SettingSliderComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionSlider>) {
+    const def = pluginSettings[id] ?? option.default;
+
+    const [error, setError] = React.useState<string | null>(null);
+
+    React.useEffect(() => {
+        onError(error !== null);
+    }, [error]);
+
+    function handleChange(newValue: number): void {
+        let isValid = (option.isValid && option.isValid(newValue)) ?? true;
+        if (typeof isValid === "string") setError(isValid);
+        else if (!isValid) setError("Invalid input provided.");
+        else {
+            setError(null);
+            onChange(newValue);
+        }
+    }
+
+    return (
+        <Forms.FormSection>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
+            <Slider
+                disabled={option.disabled?.() ?? false}
+                markers={option.markers}
+                minValue={option.markers[0]}
+                maxValue={option.markers[option.markers.length - 1]}
+                initialValue={def}
+                onValueChange={handleChange}
+                onValueRender={(v: number) => String(v.toFixed(2))}
+                stickToMarkers={option.stickToMarkers ?? true}
+                {...option.componentProps}
+            />
+        </Forms.FormSection>
+    );
+}
+
diff --git a/src/components/PluginSettings/components/SettingTextComponent.tsx b/src/components/PluginSettings/components/SettingTextComponent.tsx
index 0bfe3fb..898f66b 100644
--- a/src/components/PluginSettings/components/SettingTextComponent.tsx
+++ b/src/components/PluginSettings/components/SettingTextComponent.tsx
@@ -2,8 +2,6 @@ import { ISettingElementProps } from ".";
 import { PluginOptionString } from "../../../utils/types";
 import { Forms, React, TextInput } from "../../../webpack/common";
 
-const { FormSection, FormTitle, FormText } = Forms;
-
 export function SettingInputComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionString>) {
     const [state, setState] = React.useState(pluginSettings[id] ?? option.default ?? null);
     const [error, setError] = React.useState<string | null>(null);
@@ -23,8 +21,8 @@ export function SettingInputComponent({ option, pluginSettings, id, onChange, on
     }
 
     return (
-        <FormSection>
-            <FormTitle>{option.description}</FormTitle>
+        <Forms.FormSection>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
             <TextInput
                 type="text"
                 value={state}
@@ -33,7 +31,7 @@ export function SettingInputComponent({ option, pluginSettings, id, onChange, on
                 disabled={option.disabled?.() ?? false}
                 {...option.componentProps}
             />
-            {error && <FormText style={{ color: "var(--text-danger)" }}>{error}</FormText>}
-        </FormSection>
+            {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
+        </Forms.FormSection>
     );
 }
diff --git a/src/components/PluginSettings/components/index.ts b/src/components/PluginSettings/components/index.ts
index d1fe7d6..a1748b0 100644
--- a/src/components/PluginSettings/components/index.ts
+++ b/src/components/PluginSettings/components/index.ts
@@ -15,3 +15,4 @@ export * from "./SettingBooleanComponent";
 export * from "./SettingNumericComponent";
 export * from "./SettingSelectComponent";
 export * from "./SettingTextComponent";
+export * from "./SettingSliderComponent";
-- 
cgit