CB-5691 removes unneeded prop: disableCtrlEnterSubmit

dbeaver · Nov 8, 2024 · 23d56c8 · 23d56c8
1 parent 1227bcc
commit 23d56c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/webapp/packages/core-blocks/src/FormControls/Form.tsx b/webapp/packages/core-blocks/src/FormControls/Form.tsx
@@ -19,27 +19,14 @@ type FormDetailedProps = Omit<React.DetailedHTMLProps<React.FormHTMLAttributes<H
   context?: IFormContext;
   disabled?: boolean;
   disableEnterSubmit?: boolean;
-  disableCtrlEnterSubmit?: boolean;
   focusFirstChild?: boolean;
   contents?: boolean;
   onSubmit?: (event?: SubmitEvent) => Promise<void> | void;
   onChange?: FormChangeHandler;
 };
 
 export const Form = forwardRef<HTMLFormElement, FormDetailedProps>(function Form(
-  {
-    context,
-    disabled: disabledProp,
-    disableEnterSubmit,
-    disableCtrlEnterSubmit,
-    focusFirstChild,
-    children,
-    contents,
-    style,
-    onSubmit,
-    onChange,
-    ...rest
-  },
+  { context, disabled: disabledProp, disableEnterSubmit, focusFirstChild, children, contents, style, onSubmit, onChange, ...rest },
   ref,
 ) {
   const st = useS(styles);
@@ -50,7 +37,6 @@ export const Form = forwardRef<HTMLFormElement, FormDetailedProps>(function Form
 
   const formContext = useForm({
     disableEnterSubmit,
-    disableCtrlEnterSubmit,
     parent: context,
     async onSubmit(event) {
       try {

diff --git a/webapp/packages/core-blocks/src/FormControls/FormContext.ts b/webapp/packages/core-blocks/src/FormControls/FormContext.ts
@@ -25,7 +25,6 @@ export interface IFormContext {
   onChange: IExecutor<IChangeData>;
   parent: IFormContext | null;
   disableEnterSubmit: boolean;
-  disableCtrlEnterSubmit: boolean;
   setRef: (ref: HTMLFormElement | null) => void;
   change: FormChangeHandler;
   keyDown: KeyHandler;

diff --git a/webapp/packages/core-blocks/src/FormControls/useForm.ts b/webapp/packages/core-blocks/src/FormControls/useForm.ts
@@ -16,7 +16,6 @@ import { type FormChangeHandler, FormContext, type IChangeData, type IFormContex
 interface IOptions {
   parent?: IFormContext;
   disableEnterSubmit?: boolean;
-  disableCtrlEnterSubmit?: boolean;
   onSubmit?: (event?: SubmitEvent | undefined) => Promise<void> | void;
   onChange?: FormChangeHandler;
 }
@@ -32,7 +31,6 @@ export function useForm(options?: IOptions): IFormContext {
   }
 
   const disableEnterSubmit = options?.disableEnterSubmit ?? parentForm?.disableEnterSubmit ?? false;
-  const disableCtrlEnterSubmit = options?.disableCtrlEnterSubmit ?? parentForm?.disableCtrlEnterSubmit ?? false;
 
   useExecutor({
     executor: parentForm?.onChange,
@@ -84,7 +82,7 @@ export function useForm(options?: IOptions): IFormContext {
         const isCtrlEnterSubmit =
           event.key === 'Enter' &&
           (event.ctrlKey || event.metaKey) &&
-          this.disableCtrlEnterSubmit === false &&
+          this.disableEnterSubmit === false &&
           event.target instanceof HTMLTextAreaElement;
         const isEnterSubmit = event.key === 'Enter' && this.disableEnterSubmit === false && event.target instanceof HTMLInputElement;
 
@@ -130,7 +128,7 @@ export function useForm(options?: IOptions): IFormContext {
         }
       },
     }),
-    { parent: parentForm, disableEnterSubmit, disableCtrlEnterSubmit },
+    { parent: parentForm, disableEnterSubmit },
     ['setRef', 'change', 'keyDown', 'submit', 'validate'],
   );