feat #218 - Address PR comments

package.json

@@ -11,7 +11,7 @@
 	},
 	"dependencies": {
 		"@ant-design/icons": "^4.2.2",
-		"@dassana-io/web-utils": "^0.7.6",
+		"@dassana-io/web-utils": "^0.7.9",
 		"@fortawesome/fontawesome-svg-core": "^1.2.32",
 		"@fortawesome/free-solid-svg-icons": "^5.15.1",
 		"@fortawesome/react-fontawesome": "^0.1.14",

src/components/Form/FormInput/index.tsx

@@ -1,4 +1,3 @@
-import { Input as AntDInput } from 'antd'
 import { BaseFieldProps } from '../types'
 import cn from 'classnames'
 import FieldError from '../FieldError'
@@ -7,7 +6,7 @@ import { getFormFieldDataTag } from '../utils'
 import { Controller, useFormContext } from 'react-hook-form'
 import FieldContext, { FieldContextProps } from '../FieldContext'
 import { Input, InputProps } from 'components/Input'
-import React, { FC, KeyboardEvent, useContext, useRef } from 'react'
+import React, { FC, KeyboardEvent, useContext } from 'react'
 
 export interface FormInputProps
 	extends BaseFieldProps,
@@ -27,7 +26,6 @@ const FormInput: FC<FormInputProps> = ({
 	rules = {},
 	...rest
 }: FormInputProps) => {
-	const inputRef = useRef<AntDInput>(null)
 	const { clearErrors, control, errors } = useFormContext()
 	const { loading } = useContext<FieldContextProps>(FieldContext)
 
@@ -66,7 +64,6 @@ const FormInput: FC<FormInputProps> = ({
 						error={errors[name]}
 						focused={focused}
 						fullWidth={fullWidth}
-						inputRef={inputRef}
 						loading={loading}
 						onChange={onChange}
 						onFocus={onInputFocus}

src/components/Form/FormSubmitButton/utils.ts

@@ -12,9 +12,13 @@ export const getUseShortcutProps = ({
 	callback,
 	useShortcutProps
 }: Params): UseShortcutConfig => {
-	const defaultConfig: UseShortcutConfig = {
+	const commonShortcutConfigProps = {
 		additionalConditionalFn,
-		callback,
+		callback
+	}
+
+	const defaultConfig: UseShortcutConfig = {
+		...commonShortcutConfigProps,
 		key: 'Enter',
 		keyEvent: 'keydown'
 	}
@@ -25,8 +29,7 @@ export const getUseShortcutProps = ({
 		const { key, keyEvent } = useShortcutProps
 
 		return {
-			additionalConditionalFn,
-			callback,
+			...commonShortcutConfigProps,
 			key,
 			keyEvent
 		}
@@ -36,8 +39,7 @@ export const getUseShortcutProps = ({
 		const { keys } = useShortcutProps
 
 		return {
-			additionalConditionalFn,
-			callback,
+			...commonShortcutConfigProps,
 			keys
 		}
 	}