From ff85b92ba05dd0a9fa4c513224da6d1026cecb18 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Fri, 6 Jun 2025 12:27:45 +0100 Subject: [PATCH] refactor: prioritize props speading --- .../inputs/AutoCompleteEntitySelect.tsx | 12 ---------- .../inputs/AutoCompleteSelect.tsx | 6 ----- .../app-components/inputs/PasswordInput.tsx | 3 +-- .../visual-editor/form/ButtonsMessageForm.tsx | 16 ++++--------- .../visual-editor/form/ListMessageForm.tsx | 23 +++++++------------ 5 files changed, 13 insertions(+), 47 deletions(-) diff --git a/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx b/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx index 840a3d31..f0098fe8 100644 --- a/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx +++ b/frontend/src/app-components/inputs/AutoCompleteEntitySelect.tsx @@ -52,15 +52,9 @@ const AutoCompleteEntitySelect = < Multiple extends boolean | undefined = true, >( { - label, - value, entity, format, searchFields, - multiple, - onChange, - error, - helperText, preprocess, idKey = "id", labelKey, @@ -106,17 +100,11 @@ const AutoCompleteEntitySelect = < return ( - value={value} - onChange={onChange} - label={label} - multiple={multiple} ref={ref} idKey={idKey} labelKey={labelKey} options={options || []} onSearch={onSearch} - error={error} - helperText={helperText} loading={isFetching} {...rest} /> diff --git a/frontend/src/app-components/inputs/AutoCompleteSelect.tsx b/frontend/src/app-components/inputs/AutoCompleteSelect.tsx index 439cc6d5..43bd384c 100644 --- a/frontend/src/app-components/inputs/AutoCompleteSelect.tsx +++ b/frontend/src/app-components/inputs/AutoCompleteSelect.tsx @@ -52,15 +52,12 @@ const AutoCompleteSelect = < FreeSolo extends boolean | undefined = false, >( { - label, value, options = [], idKey = "id", labelKey, multiple, onSearch, - error, - helperText, isOptionEqualToValue = (option, value) => option?.[idKey] === value?.[idKey], getOptionLabel = (option) => option?.[String(labelKey)] || option?.[idKey], @@ -157,10 +154,7 @@ const AutoCompleteSelect = < renderInput={(props) => ( handleSearch(e.target.value)} - error={error} - helperText={helperText} InputProps={{ ...props.InputProps, endAdornment: ( diff --git a/frontend/src/app-components/inputs/PasswordInput.tsx b/frontend/src/app-components/inputs/PasswordInput.tsx index 35206a5e..0b0c23c4 100644 --- a/frontend/src/app-components/inputs/PasswordInput.tsx +++ b/frontend/src/app-components/inputs/PasswordInput.tsx @@ -14,7 +14,7 @@ import { forwardRef, useState } from "react"; import { Input } from "./Input"; export const PasswordInput = forwardRef( - ({ onChange, InputProps, ...rest }, ref) => { + ({ InputProps, ...rest }, ref) => { const [showPassword, setShowPassword] = useState(false); const handleTogglePasswordVisibility = () => { setShowPassword(!showPassword); @@ -25,7 +25,6 @@ export const PasswordInput = forwardRef( ref={ref} type={showPassword ? "text" : "password"} {...rest} - onChange={onChange} InputProps={{ ...InputProps, endAdornment: ( diff --git a/frontend/src/components/visual-editor/form/ButtonsMessageForm.tsx b/frontend/src/components/visual-editor/form/ButtonsMessageForm.tsx index 0a362bec..daf8365d 100644 --- a/frontend/src/components/visual-editor/form/ButtonsMessageForm.tsx +++ b/frontend/src/components/visual-editor/form/ButtonsMessageForm.tsx @@ -1,5 +1,5 @@ /* - * Copyright © 2024 Hexastack. All rights reserved. + * Copyright © 2025 Hexastack. All rights reserved. * * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. @@ -63,17 +63,9 @@ const ButtonsMessageForm = () => { name="message.buttons" control={control} defaultValue={block?.message.buttons || []} - render={({ field }) => { - const { value, onChange } = field; - - return ( - - ); - }} + render={({ field }) => ( + + )} /> diff --git a/frontend/src/components/visual-editor/form/ListMessageForm.tsx b/frontend/src/components/visual-editor/form/ListMessageForm.tsx index e1328cec..f638a91f 100644 --- a/frontend/src/components/visual-editor/form/ListMessageForm.tsx +++ b/frontend/src/components/visual-editor/form/ListMessageForm.tsx @@ -295,21 +295,14 @@ const ListMessageForm = () => { name="options.content.buttons" control={control} defaultValue={content?.buttons || []} - render={({ field }) => { - const { value, onChange } = field; - - return ( - { - onChange(buttons); - }} - disablePayload={true} - maxInput={displayMode === "list" ? 1 : 2} - /> - ); - }} + render={({ field }) => ( + + )} />