From 3e99fa431bd85ae894049ddfcc28e05f63dd429d Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Thu, 20 Jul 2023 18:09:46 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(floatComponent):=20replace?=
 =?UTF-8?q?=20input=20element=20with=20custom=20Input=20component=20for=20?=
 =?UTF-8?q?consistency=20and=20reusability=20=F0=9F=94=A7=20fix(inputCompo?=
 =?UTF-8?q?nent):=20replace=20input=20element=20with=20custom=20Input=20co?=
 =?UTF-8?q?mponent=20for=20consistency=20and=20reusability=20=F0=9F=94=A7?=
 =?UTF-8?q?=20fix(inputListComponent):=20replace=20input=20element=20with?=
 =?UTF-8?q?=20custom=20Input=20component=20for=20consistency=20and=20reusa?=
 =?UTF-8?q?bility=20=F0=9F=94=A7=20fix(intComponent):=20replace=20input=20?=
 =?UTF-8?q?element=20with=20custom=20Input=20component=20for=20consistency?=
 =?UTF-8?q?=20and=20reusability=20=F0=9F=94=A7=20fix(textAreaComponent):?=
 =?UTF-8?q?=20replace=20input=20element=20with=20custom=20Input=20componen?=
 =?UTF-8?q?t=20for=20consistency=20and=20reusability=20=F0=9F=94=A7=20fix(?=
 =?UTF-8?q?ui/input):=20update=20Input=20component=20styles=20to=20match?=
 =?UTF-8?q?=20the=20design=20requirements=20=F0=9F=94=A7=20fix(index.css):?=
 =?UTF-8?q?=20update=20styles=20for=20Input=20component=20to=20match=20the?=
 =?UTF-8?q?=20design=20requirements=20=F0=9F=94=A7=20fix(extraSidebarCompo?=
 =?UTF-8?q?nent):=20replace=20input=20element=20with=20custom=20Input=20co?=
 =?UTF-8?q?mponent=20for=20consistency=20and=20reusability?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/floatComponent/index.tsx     | 11 +++++------
 .../src/components/inputComponent/index.tsx     | 12 ++++++------
 .../src/components/inputListComponent/index.tsx | 17 +++++++----------
 .../src/components/intComponent/index.tsx       | 17 +++++++----------
 .../src/components/textAreaComponent/index.tsx  | 11 +++++------
 src/frontend/src/components/ui/input.tsx        |  2 +-
 src/frontend/src/index.css                      | 10 ++++------
 .../components/extraSidebarComponent/index.tsx  |  3 ++-
 8 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/src/frontend/src/components/floatComponent/index.tsx b/src/frontend/src/components/floatComponent/index.tsx
index 278b3d203..a3d29b798 100644
--- a/src/frontend/src/components/floatComponent/index.tsx
+++ b/src/frontend/src/components/floatComponent/index.tsx
@@ -1,5 +1,6 @@
 import { useEffect } from "react";
 import { FloatComponentType } from "../../types/components";
+import { Input } from "../ui/input";
 
 export default function FloatComponent({
   value,
@@ -19,8 +20,8 @@ export default function FloatComponent({
   }, [disabled, onChange]);
 
   return (
-    <div className={"w-full " + (disabled ? "float-component-pointer" : "")}>
-      <input
+    <div className="w-full">
+      <Input
         type="number"
         step={step}
         min={min}
@@ -34,11 +35,9 @@ export default function FloatComponent({
         }}
         max={max}
         value={value ?? ""}
+        disabled={disabled}
         className={
-          "nopan nodrag noundo nocopy " +
-          (editNode
-            ? "input-edit-node"
-            : "input-primary" + (disabled ? " input-disable " : ""))
+          (editNode ? "input-edit-node" : "")
         }
         placeholder={
           editNode ? "Number 0 to 1" : "Type a number from zero to one"
diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index 682d5716c..78b06c411 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
 import { InputComponentType } from "../../types/components";
 import { classNames } from "../../utils/utils";
+import { Input } from "../ui/input";
 
 export default function InputComponent({
   value,
@@ -19,16 +20,15 @@ export default function InputComponent({
   }, [disabled, onChange]);
 
   return (
-    <div className={disabled ? "input-component-div" : "relative"}>
-      <input
+    <div className="relative w-full">
+      <Input
         value={value}
+        disabled={disabled}
         className={classNames(
-          disabled ? " input-disable " : "",
           password && !pwdVisible && value !== "" ? " text-clip password " : "",
-          editNode ? " input-edit-node " : " input-primary ",
+          editNode ? " input-edit-node " : "",
           password && editNode ? "pr-8" : "",
-          password && !editNode ? "pr-10" : "",
-          "nopan nodrag noundo nocopy"
+          password && !editNode ? "pr-10" : ""
         )}
         placeholder={password && editNode ? "Key" : "Type something..."}
         onChange={(e) => {
diff --git a/src/frontend/src/components/inputListComponent/index.tsx b/src/frontend/src/components/inputListComponent/index.tsx
index a54b4151f..8fde7cf4c 100644
--- a/src/frontend/src/components/inputListComponent/index.tsx
+++ b/src/frontend/src/components/inputListComponent/index.tsx
@@ -3,6 +3,7 @@ import { InputListComponentType } from "../../types/components";
 
 import _ from "lodash";
 import IconComponent from "../genericIconComponent";
+import { Input } from "../ui/input";
 
 export default function InputListComponent({
   value,
@@ -27,23 +28,19 @@ export default function InputListComponent({
   }, [disabled, onChange]);
 
   return (
-    <div
-      className={
-        (disabled ? "pointer-events-none cursor-not-allowed" : "") +
-        "flex flex-col gap-3"
-      }
+    <div className="flex flex-col gap-3"
     >
       {inputList.map((i, idx) => {
         return (
           <div key={idx} className="flex w-full gap-3">
-            <input
+            <Input
+            disabled={disabled}
               type="text"
               value={i}
               className={
-                "nopan nodrag noundo nocopy " +
-                (editNode
-                  ? "input-edit-node "
-                  : "input-primary " + (disabled ? "input-disable" : ""))
+                editNode
+                  ? "input-edit-node"
+                  : ""
               }
               placeholder="Type something..."
               onChange={(e) => {
diff --git a/src/frontend/src/components/intComponent/index.tsx b/src/frontend/src/components/intComponent/index.tsx
index 24d28e4f5..8a4da22b6 100644
--- a/src/frontend/src/components/intComponent/index.tsx
+++ b/src/frontend/src/components/intComponent/index.tsx
@@ -1,5 +1,6 @@
 import { useEffect } from "react";
 import { FloatComponentType } from "../../types/components";
+import { Input } from "../ui/input";
 
 export default function IntComponent({
   value,
@@ -17,13 +18,9 @@ export default function IntComponent({
   }, [disabled, onChange]);
 
   return (
-    <div
-      className={
-        "w-full " +
-        (disabled ? "pointer-events-none w-full cursor-not-allowed" : "")
-      }
+    <div className="w-full"
     >
-      <input
+      <Input
         onKeyDown={(event) => {
           if (
             event.key !== "Backspace" &&
@@ -52,11 +49,11 @@ export default function IntComponent({
         }}
         value={value ?? ""}
         className={
-          "nopan nodrag noundo nocopy " +
-          (editNode
-            ? " input-edit-node "
-            : " input-primary " + (disabled ? " input-disable" : ""))
+          editNode
+            ? "input-edit-node"
+            : ""
         }
+        disabled={disabled}
         placeholder={editNode ? "Integer number" : "Type an integer number"}
         onChange={(e) => {
           onChange(e.target.value);
diff --git a/src/frontend/src/components/textAreaComponent/index.tsx b/src/frontend/src/components/textAreaComponent/index.tsx
index 2bead9a2d..e3cbb672f 100644
--- a/src/frontend/src/components/textAreaComponent/index.tsx
+++ b/src/frontend/src/components/textAreaComponent/index.tsx
@@ -3,6 +3,7 @@ import { TypeModal } from "../../constants/enums";
 import GenericModal from "../../modals/genericModal";
 import { TextAreaComponentType } from "../../types/components";
 import IconComponent from "../genericIconComponent";
+import { Input } from "../ui/input";
 
 export default function TextAreaComponent({
   value,
@@ -18,15 +19,14 @@ export default function TextAreaComponent({
   }, [disabled]);
 
   return (
-    <div className={disabled ? "pointer-events-none w-full " : " w-full"}>
       <div className="flex w-full items-center">
-        <input
+        <Input
           value={value}
+          disabled={disabled}
           className={
             (editNode
-              ? " input-edit-node "
-              : " input-primary " + (disabled ? " input-disable" : "")) +
-            " nopan nodrag noundo nocopy w-full"
+              ? "input-edit-node"
+              : "")
           }
           placeholder={"Type something..."}
           onChange={(e) => {
@@ -55,6 +55,5 @@ export default function TextAreaComponent({
           </GenericModal>
         </div>
       </div>
-    </div>
   );
 }
diff --git a/src/frontend/src/components/ui/input.tsx b/src/frontend/src/components/ui/input.tsx
index 0942a3930..33b7f8813 100644
--- a/src/frontend/src/components/ui/input.tsx
+++ b/src/frontend/src/components/ui/input.tsx
@@ -10,7 +10,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          "nopan nodrag noundo nocopy flex h-10 w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          "input-primary nopan nodrag noundo nocopy",
           className
         )}
         ref={ref}
diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css
index 0bb5b46e9..ca1a4a207 100644
--- a/src/frontend/src/index.css
+++ b/src/frontend/src/index.css
@@ -239,11 +239,9 @@ The cursor: default; property value restores the browser's default cursor style
   .button-div-style {
     @apply gap-2 flex
   }
-  .input-primary:focus{
-    @apply focus:placeholder-transparent focus:ring-ring focus:border-ring
-  }
-  .input-primary {
-    @apply bg-background block text-left border-border form-input px-3 placeholder:text-muted-foreground rounded-md shadow-sm sm:text-sm truncate w-full;
+ 
+  .input-primary{
+    @apply placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50 focus:placeholder-transparent focus:ring-ring focus:border-ring bg-background block text-left border-border form-input px-3 placeholder:text-muted-foreground rounded-md shadow-sm sm:text-sm truncate w-full
   }
 
   .input-edit-node{
@@ -550,7 +548,7 @@ The cursor: default; property value restores the browser's default cursor style
     @apply z-10 mt-1 max-h-60 overflow-auto rounded-md bg-background py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm
   }
   .dropdown-component-true-options {
-    @apply dropdown-component-options lg:w-[31.5%]
+    @apply dropdown-component-options lg:w-[32%]
   }
   .dropdown-component-false-options {
     @apply dropdown-component-options w-full
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index 45aa67526..6d08cabd1 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -15,6 +15,7 @@ import {
 } from "../../../../utils/styleUtils";
 import { classNames } from "../../../../utils/utils";
 import DisclosureComponent from "../DisclosureComponent";
+import { Input } from "../../../../components/ui/input";
 
 export default function ExtraSidebar() {
   const { data } = useContext(typesContext);
@@ -109,7 +110,7 @@ export default function ExtraSidebar() {
       </div>
       <Separator />
       <div className="side-bar-search-div-placement">
-        <input
+        <Input
           type="text"
           name="search"
           id="search"