Revert Resettable changes

Rian8337 · Mar 14, 2024 · 19887f2 · 19887f2
1 parent 352cbc0
commit 19887f2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 37 deletions.
diff --git a/src/components/editors/MultipleColorEditor.tsx b/src/components/editors/MultipleColorEditor.tsx
@@ -53,16 +53,14 @@ export default function MultipleColorEditor(props: Props) {
                         value="↑"
                         disabled={index === 0}
                         onClick={() => {
-                            resettable.setValue((value) => {
-                                const newValue = value.slice();
+                            const newValue = arr.slice();
 
-                                [newValue[index - 1], newValue[index]] = [
-                                    newValue[index],
-                                    newValue[index - 1],
-                                ];
+                            [newValue[index - 1], newValue[index]] = [
+                                newValue[index],
+                                newValue[index - 1],
+                            ];
 
-                                return newValue;
-                            });
+                            resettable.setValue(newValue);
                         }}
                     />
 
@@ -72,16 +70,14 @@ export default function MultipleColorEditor(props: Props) {
                         value="↓"
                         disabled={index === arr.length - 1}
                         onClick={() => {
-                            resettable.setValue((value) => {
-                                const newValue = value.slice();
+                            const newValue = arr.slice();
 
-                                [newValue[index], newValue[index + 1]] = [
-                                    newValue[index + 1],
-                                    newValue[index],
-                                ];
+                            [newValue[index], newValue[index + 1]] = [
+                                newValue[index + 1],
+                                newValue[index],
+                            ];
 
-                                return newValue;
-                            });
+                            resettable.setValue(newValue);
                         }}
                     />
 
@@ -91,13 +87,10 @@ export default function MultipleColorEditor(props: Props) {
                         value="Remove"
                         disabled={arr.length === 1}
                         onClick={() => {
-                            resettable.setValue((value) => {
-                                const newValue = value.slice();
+                            const newValue = arr.slice();
+                            newValue.splice(index, 1);
 
-                                newValue.splice(index, 1);
-
-                                return newValue;
-                            });
+                            resettable.setValue(newValue);
                         }}
                     />
                 </div>
@@ -145,7 +138,7 @@ export default function MultipleColorEditor(props: Props) {
                     type="button"
                     value="Add"
                     onClick={() => {
-                        resettable.setValue((value) => value.concat(hexCode));
+                        resettable.setValue(resettable.value.concat(hexCode));
                     }}
                 />
             </div>

diff --git a/src/hooks/ComboColor/ComboColorsContext.tsx b/src/hooks/ComboColor/ComboColorsContext.tsx
@@ -28,7 +28,7 @@ export function ComboColorsContextProvider(props: PropsWithChildren) {
                     setValue(defaultValue);
                 },
                 setValue: (value = defaultValue) => {
-                    setValue(value);
+                    setValue(value.slice());
                 },
                 saveToJSON(json) {
                     if (!forceOverride.value) {

diff --git a/src/structures/resettable/NumberJSONResettable.ts b/src/structures/resettable/NumberJSONResettable.ts
@@ -4,5 +4,4 @@ import { NumberResettable } from "./NumberResettable";
 /**
  * A storage structure that allows the stored number to be reset and saved to a skin.json.
  */
-export type NumberJSONResettable = NumberResettable &
-    Omit<JSONResettable<number>, "setValue">;
+export type NumberJSONResettable = NumberResettable & JSONResettable<number>;
diff --git a/src/structures/resettable/NumberResettable.ts b/src/structures/resettable/NumberResettable.ts
@@ -3,14 +3,7 @@ import { Resettable } from "./Resettable";
 /**
  * A number `Resettable` that has additional properties to deal with numbers.
  */
-export interface NumberResettable extends Omit<Resettable<number>, "setValue"> {
-    /**
-     * Sets the value of this `NumberResettable`.
-     *
-     * @param value The new value. Defaults to the default value.
-     */
-    setValue(value?: number): void;
-
+export interface NumberResettable extends Resettable<number> {
     /**
      * The minimum number allowed.
      */

diff --git a/src/structures/resettable/Resettable.ts b/src/structures/resettable/Resettable.ts
@@ -1,5 +1,3 @@
-import { SetStateAction } from "react";
-
 /**
  * A storage structure that allows the stored value to be reset.
  */
@@ -29,5 +27,5 @@ export interface Resettable<T = unknown> {
      *
      * @param value The new value. Defaults to the default value.
      */
-    setValue(value?: SetStateAction<T>): void;
+    setValue(value?: T): void;
 }