resolve conflict

Author: farhanlatheef

CHANGELOG.md

@@ -24,6 +24,15 @@ Each change is prefixed with one of these keywords::
 - _Fixed_: Denotes bug fixes.
 - _Security_: Pertains to actions taken in response to vulnerabilities.
 
+## 6.5.11 - 2024-04-11
+
+Fixed: `antd` Datepicker not validating minDate and maxDate on input date
+changes.
+
+## 6.5.10 - 2024-04-11
+
+Fixed: Remove unnecessary onBlur trigger on amPm change in TimePickerInput
+
 ## 6.5.7 - 2024-03-29
 
 Fixed: Clearing all rows by directly changing `selectedRowKeys` not working when
@@ -51,9 +60,7 @@ Added: Styles for _ActionBlock_ wrapper
 ## 6.5.0 - 2024-03-22
 Added: `bulkSelectAllRowsProps` for tables to allow selecting all rows for multipage tables
 ## 6.4.0 - 2024-03-21
-
 Added: minDateTime and maxDateTime prop.
-
 ## 6.3.10 - 2024-03-20
 
 While changing the page for multi-paged table, the selected rows will not be
@@ -237,9 +244,7 @@ This PR will migrate the package from `react-linkify` to `linkify-react`
 Added: `Add` button in *Select*
 ## 5.2.28 - 2023-11-08
 Added: *Stepper* component.
-
 ## 5.2.27 - 2023-11-08
-
 Changed: Updated instances of `@reach/autoid` with React `useId`
 
 ## 5.2.26 - 2023-11-08
@@ -1019,10 +1024,8 @@ Changes documentations to sentence case from title casing.
   its submit/cancel buttons will also be automatically enabled or disabled.
 ## 3.5.10 - 2022-07-05
 - Fixed: issue with closeOnEsc prop when the Pane is controlled.
-
 ## 3.5.9 - 2022-07-05
-
-- Fixed: Checkbox in _Table_ component cut off in lower screen resolutions.
+- Fixed: Checkbox in *Table* component cut off in lower screen resolutions.
 
 ## 3.5.8 - 2022-07-01
 

formik.d.ts

@@ -1,52 +1,27 @@
-import React from "react";
-import { FormikProps } from "formik";
-import {
-  Input as PlainInput,
-  Radio as PlainRadio,
-  Switch as PlainSwitch,
-  Textarea as PlainTextarea,
-  Checkbox as PlainCheckbox,
-  Select as PlainSelect,
-  MultiEmailInput as PlainMultiEmailInput,
-  TreeSelect as PlainTreeSelect,
-  Slider as PlainSlider,
-  Button as PlainButton,
-  ButtonProps,
-  AlertProps,
-} from "./index";
+export * from "./types/formik/ActionBlock";
+export * from "./types/formik/BlockNavigation";
+export * from "./types/formik/Button";
+export * from "./types/formik/Checkbox";
+export * from "./types/formik/Form";
+export * from "./types/formik/Input";
+export * from "./types/formik/MultiEmailInput";
+export * from "./types/formik/Radio";
+export * from "./types/formik/Select";
+export * from "./types/formik/Slider";
+export * from "./types/formik/Switch";
+export * from "./types/formik/Textarea";
+export * from "./types/formik/TreeSelect";
 
-export interface ActionBlockProps {
-  className?: string;
-  submitButtonProps?: ButtonProps;
-  cancelButtonProps?: ButtonProps;
-  isSubmitting?: boolean;
-}
-export interface BlockNavigationProps {
-  isDirty?: boolean;
-}
-
-export interface Form {
-  className?: string;
-  children: React.ReactNode | ((props: FormikProps<any>) => React.ReactNode);
-  formikProps: { [key: string]: any };
-  formProps?: { [key: string]: any };
-  scrollToErrorField?: boolean;
-}
-
-export const ActionBlock: React.FC<ActionBlockProps>;
-export const BlockNavigation: React.FC<
-  BlockNavigationProps & Partial<AlertProps>
->;
-
-export const Input: typeof PlainInput;
-export const Radio: typeof PlainRadio;
-export const Switch: typeof PlainSwitch;
-export const Textarea: typeof PlainTextarea;
-export const Checkbox: typeof PlainCheckbox;
-export const Select: typeof PlainSelect;
-export const MultiEmailInput: typeof PlainMultiEmailInput;
-export const Button: typeof PlainButton;
-export const TreeSelect: typeof PlainTreeSelect;
-export const Slider: typeof PlainSlider;
-
-export const Form: React.FC<Form>;
+export { default as ActionBlock } from "./types/formik/ActionBlock";
+export { default as BlockNavigation } from "./types/formik/BlockNavigation";
+export { default as Button } from "./types/formik/Button";
+export { default as Checkbox } from "./types/formik/Checkbox";
+export { default as Form } from "./types/formik/Form";
+export { default as Input } from "./types/formik/Input";
+export { default as MultiEmailInput } from "./types/formik/MultiEmailInput";
+export { default as Radio } from "./types/formik/Radio";
+export { default as Select } from "./types/formik/Select";
+export { default as Slider } from "./types/formik/Slider";
+export { default as Switch } from "./types/formik/Switch";
+export { default as Textarea } from "./types/formik/Textarea";
+export { default as TreeSelect } from "./types/formik/TreeSelect";