2.0 Overhaul start

src/components/PageComponents/ModuleConfig/CannedMessage.tsx

@@ -1,9 +1,11 @@
 import type React from "react";
 import { useEffect, useState } from "react";
 
-import { FormField, SelectField, Switch, TextInputField } from "evergreen-ui";
 import { Controller, useForm, useWatch } from "react-hook-form";
 
+import { Input } from "@app/components/form/Input.js";
+import { Select } from "@app/components/form/Select.js";
+import { Toggle } from "@app/components/form/Toggle.js";
 import { CannedMessageValidation } from "@app/validation/moduleConfig/cannedMessage.js";
 import { Form } from "@components/form/Form";
 import { useDevice } from "@core/providers/useDevice.js";
@@ -52,57 +54,60 @@ export const CannedMessage = (): JSX.Element => {
     );
   });
   return (
-    <Form loading={loading} dirty={isDirty} onSubmit={onSubmit}>
-      <FormField
-        label="Module Enabled"
-        description="This is a description."
-        isInvalid={!!errors.enabled?.message}
-        validationMessage={errors.enabled?.message}
-      >
-        <Controller
-          name="enabled"
-          control={control}
-          render={({ field: { value, ...field } }) => (
-            <Switch height={24} marginLeft="auto" checked={value} {...field} />
-          )}
-        />
-      </FormField>
-      <FormField
-        label="Rotary Encoder #1 Enabled"
-        description="This is a description."
-        isInvalid={!!errors.rotary1Enabled?.message}
-        validationMessage={errors.rotary1Enabled?.message}
-      >
-        <Controller
-          name="rotary1Enabled"
-          control={control}
-          render={({ field: { value, ...field } }) => (
-            <Switch height={24} marginLeft="auto" checked={value} {...field} />
-          )}
-        />
-      </FormField>
-      <TextInputField
+    <Form
+      title="Canned Message Config"
+      breadcrumbs={["Module Config", "Canned Message"]}
+      reset={() => reset(moduleConfig.cannedMessage)}
+      loading={loading}
+      dirty={isDirty}
+      onSubmit={onSubmit}
+    >
+      <Controller
+        name="enabled"
+        control={control}
+        render={({ field: { value, ...rest } }) => (
+          <Toggle
+            label="Module Enabled"
+            description="Description"
+            checked={value}
+            {...rest}
+          />
+        )}
+      />
+      <Controller
+        name="rotary1Enabled"
+        control={control}
+        render={({ field: { value, ...rest } }) => (
+          <Toggle
+            label="Rotary Encoder #1 Enabled"
+            description="Description"
+            checked={value}
+            {...rest}
+          />
+        )}
+      />
+      <Input
         label="Encoder Pin A"
         description="Max transmit power in dBm"
         type="number"
         disabled={moduleEnabled}
         {...register("inputbrokerPinA", { valueAsNumber: true })}
       />
-      <TextInputField
+      <Input
         label="Encoder Pin B"
         description="Max transmit power in dBm"
         type="number"
         disabled={moduleEnabled}
         {...register("inputbrokerPinB", { valueAsNumber: true })}
       />
-      <TextInputField
+      <Input
         label="Endoer Pin Press"
         description="Max transmit power in dBm"
         type="number"
         disabled={moduleEnabled}
         {...register("inputbrokerPinPress", { valueAsNumber: true })}
       />
-      <SelectField
+      <Select
         label="Clockwise event"
         description="This is a description."
         disabled={moduleEnabled}
@@ -111,8 +116,8 @@ export const CannedMessage = (): JSX.Element => {
         {renderOptions(
           Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
         )}
-      </SelectField>
-      <SelectField
+      </Select>
+      <Select
         label="Counter Clockwise event"
         description="This is a description."
         disabled={moduleEnabled}
@@ -121,8 +126,8 @@ export const CannedMessage = (): JSX.Element => {
         {renderOptions(
           Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
         )}
-      </SelectField>
-      <SelectField
+      </Select>
+      <Select
         label="Press event"
         description="This is a description."
         disabled={moduleEnabled}
@@ -131,41 +136,37 @@ export const CannedMessage = (): JSX.Element => {
         {renderOptions(
           Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
         )}
-      </SelectField>
-      <FormField
-        label="Up Down enabled"
-        description="This is a description."
-        isInvalid={!!errors.updown1Enabled?.message}
-        validationMessage={errors.updown1Enabled?.message}
-      >
-        <Controller
-          name="updown1Enabled"
-          control={control}
-          render={({ field: { value, ...field } }) => (
-            <Switch height={24} marginLeft="auto" checked={value} {...field} />
-          )}
-        />
-      </FormField>
-      <TextInputField
+      </Select>
+      <Controller
+        name="updown1Enabled"
+        control={control}
+        render={({ field: { value, ...rest } }) => (
+          <Toggle
+            label="Up Down enabled"
+            description="Description"
+            checked={value}
+            {...rest}
+          />
+        )}
+      />
+      <Input
         label="Allow Input Source"
         description="Max transmit power in dBm"
         disabled={moduleEnabled}
         {...register("allowInputSource")}
       />
-      <FormField
-        label="Send Bell"
-        description="This is a description."
-        isInvalid={!!errors.sendBell?.message}
-        validationMessage={errors.sendBell?.message}
-      >
-        <Controller
-          name="sendBell"
-          control={control}
-          render={({ field: { value, ...field } }) => (
-            <Switch height={24} marginLeft="auto" checked={value} {...field} />
-          )}
-        />
-      </FormField>
+      <Controller
+        name="sendBell"
+        control={control}
+        render={({ field: { value, ...rest } }) => (
+          <Toggle
+            label="Send Bell"
+            description="Description"
+            checked={value}
+            {...rest}
+          />
+        )}
+      />
     </Form>
   );
 };