From 6e7200dfba3d957f328eb6397d34d41b31f14cfa Mon Sep 17 00:00:00 2001
From: Mohamed Marrouchi <marrouchi.mohamed@gmail.com>
Date: Tue, 17 Dec 2024 14:16:23 +0100
Subject: [PATCH] fix: btn display

---
 .../app-components/inputs/ToggleableInput.tsx |   2 +-
 .../visual-editor/form/ListMessageForm.tsx    |   4 +-
 .../form/inputs/message/ButtonInput.tsx       | 152 +++++++++---------
 .../form/inputs/message/ButtonsInput.tsx      |  41 ++---
 4 files changed, 93 insertions(+), 106 deletions(-)

diff --git a/frontend/src/app-components/inputs/ToggleableInput.tsx b/frontend/src/app-components/inputs/ToggleableInput.tsx
index 5a14777a..6094e3e7 100644
--- a/frontend/src/app-components/inputs/ToggleableInput.tsx
+++ b/frontend/src/app-components/inputs/ToggleableInput.tsx
@@ -41,7 +41,7 @@ export const ToggleableInput = forwardRef(
     }, [readOnlyValue, isDisabled, defaultValue]);
 
     return (
-      <Box display="flex">
+      <Box display="flex" flex={1}>
         <Switch
           onChange={() => {
             const newIsDisabled = !isDisabled;
diff --git a/frontend/src/components/visual-editor/form/ListMessageForm.tsx b/frontend/src/components/visual-editor/form/ListMessageForm.tsx
index eae1d787..ae39c995 100644
--- a/frontend/src/components/visual-editor/form/ListMessageForm.tsx
+++ b/frontend/src/components/visual-editor/form/ListMessageForm.tsx
@@ -166,7 +166,7 @@ const ListMessageForm = () => {
         </ContentItem>
       </Grid>
       <Grid item xs={1}>
-        <Divider orientation="vertical" sx={{ margin: "2rem" }} />
+        <Divider orientation="vertical" sx={{ marginX: "2rem" }} />
       </Grid>
       <Grid item xs={6}>
         <FormLabel component="h4" sx={{ marginBottom: "1rem" }}>
@@ -278,7 +278,7 @@ const ListMessageForm = () => {
           />
         </ContentItem>
       </Grid>
-      <ContentItem>
+      <ContentItem width="100%">
         <FormSectionTitle title={t("label.buttons")} Icon={ButtonsIcon} />
         <Controller
           name="options.content.buttons"
diff --git a/frontend/src/components/visual-editor/form/inputs/message/ButtonInput.tsx b/frontend/src/components/visual-editor/form/inputs/message/ButtonInput.tsx
index dae26a5b..0ec2b910 100644
--- a/frontend/src/components/visual-editor/form/inputs/message/ButtonInput.tsx
+++ b/frontend/src/components/visual-editor/form/inputs/message/ButtonInput.tsx
@@ -6,7 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { Grid } from "@mui/material";
+import { Box } from "@mui/material";
 import { FC } from "react";
 import { FieldPath, useFormContext } from "react-hook-form";
 
@@ -48,88 +48,86 @@ const ButtonInput: FC<ButtonInputProps> = ({
   } = useFormContext<IBlockAttributes>();
 
   return (
-    <>
-      <Grid item xs={5}>
+    <Box display="flex" flex={1} flexGrow={1} gap={2}>
+      <Input
+        fullWidth={false}
+        required
+        label={t("label.title")}
+        value={button.title}
+        sx={{ flex: 1 }}
+        inputProps={{
+          maxLength: 20,
+        }}
+        {...register(buildFieldPath(fieldPath, idx, "title"), {
+          required: t("message.title_is_required"),
+        })}
+        onChange={(e) => {
+          onChange({ ...button, title: e.target.value });
+        }}
+        error={!!errors.message?.["buttons"]?.[idx]?.title}
+        helperText={
+          errors.message?.["buttons"]?.[idx]?.title?.message ||
+          (button.title.length === 20
+            ? t("message.title_length_exceeded")
+            : null)
+        }
+      />
+      {button.type === ButtonType.postback ? (
+        <ToggleableInput
+          defaultValue={button.payload}
+          readOnlyValue={button.title}
+          {...register(buildFieldPath(fieldPath, idx, "payload"), {
+            validate: {
+              required: (value) => {
+                if (disablePayload || value) {
+                  return true;
+                }
+
+                return t("message.payload_is_required");
+              },
+            },
+          })}
+          onChange={(payload) =>
+            onChange({
+              ...button,
+              payload,
+            })
+          }
+          disabled={disablePayload}
+          error={!!errors.message?.["buttons"]?.[idx]?.payload}
+          helperText={errors.message?.["buttons"]?.[idx]?.payload?.message}
+        />
+      ) : (
         <Input
-          fullWidth
           required
-          placeholder={t("label.title")}
-          value={button.title}
-          inputProps={{
-            maxLength: 20,
-          }}
-          {...register(buildFieldPath(fieldPath, idx, "title"), {
-            required: t("message.title_is_required"),
+          type="url"
+          label={t("label.url")}
+          value={button.url}
+          sx={{ flex: 1 }}
+          {...register(buildFieldPath(fieldPath, idx, "url"), {
+            validate: {
+              required: (value) => {
+                if (
+                  button.type === ButtonType.web_url &&
+                  (disablePayload || value)
+                ) {
+                  return true;
+                }
+
+                return t("message.url_is_required");
+              },
+            },
+            ...rules.url,
           })}
           onChange={(e) => {
-            onChange({ ...button, title: e.target.value });
+            onChange({ ...button, url: e.target.value });
           }}
-          error={!!errors.message?.["buttons"]?.[idx]?.title}
-          helperText={
-            errors.message?.["buttons"]?.[idx]?.title?.message ||
-            (button.title.length === 20
-              ? t("message.title_length_exceeded")
-              : null)
-          }
+          disabled={disablePayload}
+          error={!!errors.message?.["buttons"]?.[idx]?.url}
+          helperText={errors.message?.["buttons"]?.[idx]?.url?.message}
         />
-      </Grid>
-      <Grid item xs={6}>
-        {button.type === ButtonType.postback ? (
-          <ToggleableInput
-            defaultValue={button.payload}
-            readOnlyValue={button.title}
-            {...register(buildFieldPath(fieldPath, idx, "payload"), {
-              validate: {
-                required: (value) => {
-                  if (disablePayload || value) {
-                    return true;
-                  }
-
-                  return t("message.payload_is_required");
-                },
-              },
-            })}
-            onChange={(payload) =>
-              onChange({
-                ...button,
-                payload,
-              })
-            }
-            disabled={disablePayload}
-            error={!!errors.message?.["buttons"]?.[idx]?.payload}
-            helperText={errors.message?.["buttons"]?.[idx]?.payload?.message}
-          />
-        ) : (
-          <Input
-            required
-            type="ur"
-            placeholder="URL"
-            value={button.url}
-            {...register(buildFieldPath(fieldPath, idx, "url"), {
-              validate: {
-                required: (value) => {
-                  if (
-                    button.type === ButtonType.web_url &&
-                    (disablePayload || value)
-                  ) {
-                    return true;
-                  }
-
-                  return t("message.url_is_required");
-                },
-              },
-              ...rules.url,
-            })}
-            onChange={(e) => {
-              onChange({ ...button, url: e.target.value });
-            }}
-            disabled={disablePayload}
-            error={!!errors.message?.["buttons"]?.[idx]?.url}
-            helperText={errors.message?.["buttons"]?.[idx]?.url?.message}
-          />
-        )}
-      </Grid>
-    </>
+      )}
+    </Box>
   );
 };
 
diff --git a/frontend/src/components/visual-editor/form/inputs/message/ButtonsInput.tsx b/frontend/src/components/visual-editor/form/inputs/message/ButtonsInput.tsx
index b1351aee..0df34acb 100644
--- a/frontend/src/components/visual-editor/form/inputs/message/ButtonsInput.tsx
+++ b/frontend/src/components/visual-editor/form/inputs/message/ButtonsInput.tsx
@@ -8,8 +8,8 @@
 
 import { KeyboardReturn, Link, RemoveCircleOutline } from "@mui/icons-material";
 import AddIcon from "@mui/icons-material/Add";
-import { Box, Grid, IconButton } from "@mui/material";
-import { FC, Fragment, useEffect, useMemo, useState } from "react";
+import { Box, IconButton } from "@mui/material";
+import { FC, useEffect, useMemo, useState } from "react";
 import { FieldPath } from "react-hook-form";
 
 import DropdownButton, {
@@ -96,19 +96,10 @@ const ButtonsInput: FC<ButtonsInput> = ({
   }, [buttons]);
 
   return (
-    <Box>
-      <Grid container spacing={2}>
-        <Grid item xs={5}>
-          {t("label.title")}
-        </Grid>
-        <Grid item xs={6}>
-          {t("label.payload")} / {t("label.url")}
-        </Grid>
-        <Grid item xs={1}>
-          &nbsp;
-        </Grid>
+    <Box display="flex" flexDirection="column">
+      <Box display="flex" flexDirection="column">
         {buttons.map(({ value, id }, idx) => (
-          <Fragment key={id}>
+          <Box display="flex" flex={1} mt={2} key={id}>
             <ButtonInput
               fieldPath={fieldPath}
               idx={idx}
@@ -116,20 +107,18 @@ const ButtonsInput: FC<ButtonsInput> = ({
               onChange={updateInput(idx)}
               disablePayload={disablePayload}
             />
-            <Grid item xs={1}>
-              <IconButton
-                color="error"
-                onClick={() => removeInput(idx)}
-                disabled={buttons.length <= minInput}
-              >
-                <RemoveCircleOutline />
-              </IconButton>
-            </Grid>
-          </Fragment>
+            <IconButton
+              color="error"
+              onClick={() => removeInput(idx)}
+              disabled={buttons.length <= minInput}
+            >
+              <RemoveCircleOutline />
+            </IconButton>
+          </Box>
         ))}
-      </Grid>
+      </Box>
       <DropdownButton
-        sx={{ m: 1, float: "right", padding: "16px" }}
+        sx={{ alignSelf: "end", marginTop: 2 }}
         label={t("button.add_button")}
         actions={actions}
         onClick={(action) => addInput(action.defaultValue)}