Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@farhanlatheef @josephmathew900
farhanlatheef authored and josephmathew900 committed Apr 11, 2024
1 parent eee888b commit 732a17f
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 69 deletions.
138 changes: 69 additions & 69 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
** Represent a version as second level heading and write the version number inside a square bracket, eg: ## [3.3.2]
--->

# Changelog

All notable changes to this project will be documented in this file.
Expand All @@ -17,12 +16,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

Each change is prefixed with one of these keywords::

- _Added_: Describes new features.
- _Changed_: Highlights modifications to existing functionality.
- _Deprecated_: Marks features that will be removed in the future.
- _Removed_: Indicates features that have been taken out.
- _Fixed_: Denotes bug fixes.
- _Security_: Pertains to actions taken in response to vulnerabilities.
- *Added*: Describes new features.
- *Changed*: Highlights modifications to existing functionality.
- *Deprecated*: Marks features that will be removed in the future.
- *Removed*: Indicates features that have been taken out.
- *Fixed*: Denotes bug fixes.
- *Security*: Pertains to actions taken in response to vulnerabilities.

## 6.5.10 - 2024-04-11

Expand All @@ -43,7 +42,7 @@ Fixed: DatePicker unable to switch to different month or year.

## 6.5.3 - 2024-03-27

Added: Styles for _ActionBlock_ wrapper
Added: Styles for *ActionBlock* wrapper

## 6.5.2 - 2024-03-27

Expand All @@ -64,7 +63,7 @@ deselected.

## 6.3.9 - 2024-03-20

- Added: Support for overriding the dropdown props in the _ColorPicker_
- Added: Support for overriding the dropdown props in the *ColorPicker*
component so that it can be further customised.

## 6.3.8 - 2024-03-13
Expand All @@ -79,7 +78,7 @@ deselected.

- Added: support for resize, suffix, prefix and sizing for textarea.

@ajmaln \_a Please review.
@ajmaln _a Please review.

## 6.3.5 - 2024-03-06

Expand All @@ -103,6 +102,7 @@ After

![2a-after](https://github.com/bigbinary/neeto-ui/assets/16187886/a4b009a5-b372-4677-aa1d-cc80217ad5b2)


---

Before
Expand Down Expand Up @@ -277,7 +277,7 @@ Added: Support for lazy loading for the `Select` component

## 5.2.17 - 2023-10-24

Added: New _TreeSelect_ component.
Added: New *TreeSelect* component.

## 5.2.15 - 2023-10-23

Expand Down Expand Up @@ -357,11 +357,11 @@ Fixed: scroll to error is not triggered on submitting form with enter key.

## 5.1.8 - 2023-08-24

Added `type = "button"` attribute to _Tab.Item_ component
Added `type = "button"` attribute to *Tab.Item* component

## 5.1.7 - 2023-08-21

Added: `rejectCharsRegex` prop to _Input_ component.
Added: `rejectCharsRegex` prop to *Input* component.

## 5.1.6 - 2023-08-17

Expand All @@ -370,11 +370,11 @@ Added: `rejectCharsRegex` prop to _Input_ component.

## 5.1.5 - 2023-08-08

- Added: `initialFocusRef` prop to _Alert_
- Added: `initialFocusRef` prop to *Alert*

## 5.1.4 - 2023-08-04

- Fixed: Handled dot paths in _ScrollToErrorField_.
- Fixed: Handled dot paths in *ScrollToErrorField*.

## 5.1.3 - 2023-08-02

Expand All @@ -386,7 +386,7 @@ Added: `rejectCharsRegex` prop to _Input_ component.

## 5.1.1 - 2023-08-02

- Fixed: issue with onClose in _Dropdown_ not getting called on trigger click.
- Fixed: issue with onClose in *Dropdown* not getting called on trigger click.

## 5.1.0 - 2023-08-02

Expand Down Expand Up @@ -414,15 +414,15 @@ Fixed warnings in jest tests.

## 5.0.12 - 2023-06-29

- Changed: Default value of`scrollToErrorField` prop of formik _Form_ to false.
- Changed: Default value of`scrollToErrorField` prop of formik *Form* to false.

## 5.0.11 - 2023-06-27

- Added: `hasScrollToErrorField` prop to formik _Form_ component.
- Added: `hasScrollToErrorField` prop to formik *Form* component.

## 5.0.10 - 2023-06-20

- Removed: condition to disable _FormikButton_ when the form is invalid.
- Removed: condition to disable *FormikButton* when the form is invalid.

## 5.0.9 - 2023-06-17

Expand All @@ -443,30 +443,30 @@ Fixed warnings in jest tests.

## 5.0.6 - 2023-06-06

- Fixes janky animation in _Pane_ when form fields have the `autoFocus` prop.
- Fixes janky animation in *Pane* when form fields have the `autoFocus` prop.

## 5.0.5 - 2023-06-05

Added: `optionRemapping` prop to map the label and value properties of `options`
prop in _Select_ component.
prop in *Select* component.

## 5.0.4 - 2023-05-29

- Fixed: Overrided `onChange` function to output empty array if value is null in
_DatePicker_
*DatePicker*

## 5.0.3 - 2023-05-29

- Fixed: the issue of filter invalid emails link for valid emails in
_MultiEmailInput_ component
*MultiEmailInput* component

## 5.0.2 - 2023-05-23

- Added: `required` prop to _MultiEmailInput_.
- Added: `required` prop to *MultiEmailInput*.

## 5.0.1 - 2023-05-07

- Added: resize and reorder columns functionality to _Table_ component.
- Added: resize and reorder columns functionality to *Table* component.

## 5.0.0 - 2023-04-28

Expand All @@ -484,7 +484,7 @@ Removed following components from `neetoui`:

## 4.4.27 - 2023-04-24

- Added: `unlmitedChars` prop to _Input_ and _Textarea_ and reverted the
- Added: `unlmitedChars` prop to *Input* and *Textarea* and reverted the
behaviour of maxlength prop to the native one.

## 4.4.26 - 2023-04-14
Expand All @@ -506,7 +506,7 @@ Removed following components from `neetoui`:

## 4.4.22 - 2023-04-04

Added: Support for children array in _Tooltip_ component.
Added: Support for children array in *Tooltip* component.

## 4.4.21 - 2023-03-28

Expand All @@ -523,11 +523,11 @@ Added: `children` prop for button and tag components
## 4.4.18 - 2023-03-24

- Changed: -the default row size to 30 and hidden the page size changer in the
_Table_ component.
*Table* component.

## 4.4.17 - 2023-03-22

- Fixed: weird behavior or create new option in _MultiEmailInput_.
- Fixed: weird behavior or create new option in *MultiEmailInput*.

## 4.4.16 - 2023-03-20

Expand All @@ -549,15 +549,15 @@ Added terser plugin to rollup config to minimise bundle size.

## 4.4.12 - 2023-03-15

This PR adds the following changes to the _Switch_ component.
This PR adds the following changes to the *Switch* component.

- Added `forwardRef` to the _Switch_ component so that it supports adding
_Tooltip_ to it, as per this
- Added `forwardRef` to the *Switch* component so that it supports adding
*Tooltip* to it, as per this
[guide](https://github.com/atomiks/tippyjs-react#component-children).

## 4.4.11 - 2023-03-14

- Added: `liveChat` prop to _HelpSection_ component.
- Added: `liveChat` prop to *HelpSection* component.
- Added: data-cy to `helpLink` prop.
- Changed: label into an optional value in LinkType.

Expand Down Expand Up @@ -1023,7 +1023,7 @@ Changes documentations to sentence case from title casing.
- 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

Expand All @@ -1032,28 +1032,28 @@ Changes documentations to sentence case from title casing.

## 3.5.7 - 2022-06-24

- Added: `startsFrom` to `counter` prop of _EmailInput_ component.
- Added: `startsFrom` to `counter` prop of *EmailInput* component.

## 3.5.6 - 2022-06-13

- Fixed: Calendar icon overflowing under the clear icon in Date Range picker

## 3.5.5 - 2022-06-09

- Fixed: issue with `onClose` function reference when closing the _Modal_ using
- Fixed: issue with `onClose` function reference when closing the *Modal* using
`Esc`.

## 3.5.4 - 2022-06-08

Fixed: `TypeError` issue in _Toastr_ component.
Fixed: `TypeError` issue in *Toastr* component.

## 3.5.3 - 2022-06-07

- Fixed: issue with `closeOnEsc` prop when the _Dropdown_ is controlled.
- Fixed: issue with `closeOnEsc` prop when the *Dropdown* is controlled.

## 3.5.2 - 2022-06-07

- Fixed : placeholder content extending into multiple lines in _Select_
- Fixed : placeholder content extending into multiple lines in *Select*
component.

## 3.5.1 - 2022-06-07
Expand All @@ -1074,91 +1074,91 @@ Fixed: `TypeError` issue in _Toastr_ component.

## 3.4.3

- Added: `prefix` and `suffix` to _EmailInput_.
- Added: `prefix` and `suffix` to *EmailInput*.

## 3.4.2

- Fixed: issue with search not working with `isCreatable` _Select_.
- Fixed: issue with search not working with `isCreatable` *Select*.

## 3.4.1

- Fixed: issue with `autoFocus` not working on _Input_ when inside _Dropdown_.
- Fixed: issue with `autoFocus` not working on *Input* when inside *Dropdown*.

## 3.4.0

- Removed: all instances of TailwindCSS.
- Added: `label` prop in _Tags_ molecule.
- Changed: Added `neetoCal` into _AppSwitcher_ app list .
- Removed: `count` limiting (to 99) logic from _MenuBar.Block_.
- Added: `label` prop in *Tags* molecule.
- Changed: Added `neetoCal` into *AppSwitcher* app list .
- Removed: `count` limiting (to 99) logic from *MenuBar.Block*.

## 3.3.13

- Added: Tags in the molecule section.

## 3.3.12

- Fixed: loading state in _ActionBlock_ component.
- Fixed: loading state in *ActionBlock* component.

## 3.3.11

- Added: New input format for the _EmailInput_ component.
- Added: New input format for the *EmailInput* component.

## 3.3.10

- Fixed: Removed unnecessary scrollbar in _Table_ component.
- Added: `maxHeight` prop to the _EmailInput_ component.
- Fixed: Removed unnecessary scrollbar in *Table* component.
- Added: `maxHeight` prop to the *EmailInput* component.

## 3.3.9

- Fixed: _ActionDropdown_ issues with common props for button and dropdown
- Fixed: *ActionDropdown* issues with common props for button and dropdown

## 3.3.7

- Changed: Updated React version to 17.0.2.

## 3.3.6

- Fixed: Reset Formik data on continue action in _BlockNavigation_ component.
- Fixed: Reset Formik data on continue action in *BlockNavigation* component.

## 3.3.5

- Added: active state to `NavLink` in _Sidebar_ component.
- Added: active state to `NavLink` in *Sidebar* component.

## 3.3.4

- Added: `hideOnTargetExit` prop to _Tooltip_ component
- Added: `hideOnTargetExit` prop to *Tooltip* component

## 3.3.3

- Added: data-cy for in _Alert_ component elements
- Added: data-cy for in *Alert* component elements

## 3.3.2

- Fixed: Added override for `onClick` prop in _Dropdown_ component
- Fixed: Added override for `onClick` prop in *Dropdown* component

## 3.3.1

- Fixed: Typography of Header in _Alert_ component.
- Fixed: Max width issue in _Dropdown_ component.
- Fixed: Typography of Header in *Alert* component.
- Fixed: Max width issue in *Dropdown* component.

## 3.3.0

- Changed: **BREAKING** `isLoading` prop of _Table_ to `loading`.
- Changed: Implemented _Dropdown_ component with Tippy.js and removed
- Changed: **BREAKING** `isLoading` prop of *Table* to `loading`.
- Changed: Implemented *Dropdown* component with Tippy.js and removed
`react-popper`
- Deprecated: **BREAKING** `loading` prop of _Pane_, _Modal_ and _Alert_
- Deprecated: **BREAKING** `loading` prop of *Pane*, *Modal* and *Alert*
components.
- Removed: **BREAKING** `placement` prop from _Tooltip_ (Use position instead).
- Removed: **BREAKING** `placement` prop from *Tooltip* (Use position instead).

#### UI

- Changed: colors of `$neeto-ui-warning` and `$neeto-ui-error` in _Color
Palette_
- Changed: the text color in _Table_ to `$neeto-ui-black`
- Changed: UI of _Tag_ of component
- Changed: look and feel of _Danger Button_
- Changed: Contrast of _Avatar_, _Accordian_, _Toastr_ and _Callout_
- Changed: Made _Modal_ Header text and Close icon aligned in a line
- Added: new variant for _Danger Button_ -`danger-text`
- Changed: colors of `$neeto-ui-warning` and `$neeto-ui-error` in *Color
Palette*
- Changed: the text color in *Table* to `$neeto-ui-black`
- Changed: UI of *Tag* of component
- Changed: look and feel of *Danger Button*
- Changed: Contrast of *Avatar*, *Accordian*, *Toastr* and *Callout*
- Changed: Made *Modal* Header text and Close icon aligned in a line
- Added: new variant for *Danger Button* -`danger-text`
- Added: new accent colors
- ![accent-colors](https://user-images.githubusercontent.com/48869249/160755429-d2830f42-3086-4cbe-b9f5-4f0bca4f1a32.png)
2 changes: 2 additions & 0 deletions types/DatePicker.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export type DatePickerProps = {
disabled?: boolean;
labelProps?: LabelProps;
allowClear?: boolean;
minDate?: Dayjs;
maxDate?: Dayjs;
[key: string]: any;
};

Expand Down

0 comments on commit 732a17f

Please sign in to comment.