Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(new-hope): edit calendar range logic and fix name #1084

Merged
merged 1 commit into from
Mar 6, 2024
Merged

feat(new-hope): edit calendar range logic and fix name #1084

merged 1 commit into from
Mar 6, 2024

Conversation

iljs
Copy link
Contributor

@iljs iljs commented Mar 3, 2024 •
edited by Yakutoc
Loading

Calendar

  • добавлено возможность выбора одного дня для range

What/why changed

Возможность выбор 1 дня в типе range, убрал проверку на hoverDate со startDate. И изменил название функции, которая была написана неправильно

📦 Published PR as canary version: Canary Versions

✨ Test out this PR locally via:

npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
# or 
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]

@iljs iljs self-assigned this Mar 3, 2024
@Salute-Eva
Copy link
Contributor

Theme Builder app deployed!

http://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-1084/

@Salute-Eva
Copy link
Contributor

Documentation preview deployed!

website: http://plasma.sberdevices.ru/pr/pr-1084/
b2c storybook: http://plasma.sberdevices.ru/pr/pr-1084/b2c-storybook/
web storybook: http://plasma.sberdevices.ru/pr/pr-1084/web-storybook/
new-hope storybook: http://plasma.sberdevices.ru/pr/pr-1084/new-hope-storybook/
asdk storybook: http://plasma.sberdevices.ru/pr/pr-1084/asdk-storybook/
caldera storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-storybook/
caldera-online storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-online-storybook/
sdds-serv storybook: http://plasma.sberdevices.ru/pr/pr-1084/sdds-serv-storybook/

@iljs iljs marked this pull request as ready for review March 4, 2024 05:19
@Yeti-or Yeti-or requested review from shuga2704 and TitanKuzmich and removed request for Yeti-or, neretin-trike and kayman233 March 4, 2024 08:06
TitanKuzmich
TitanKuzmich reviewed Mar 4, 2024
View reviewed changes
packages/plasma-new-hope/src/components/Calendar/hooks/useDays.ts
@@ -8,7 +8,7 @@ import {
getOffsetDayInWeek,
getPrevDate,
IsCurrentDay,
isDayInRage,
isDayInRange,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

shuga2704
shuga2704 requested changes Mar 4, 2024
View reviewed changes
packages/plasma-new-hope/src/components/Calendar/utils/index.ts Outdated
@@ -116,7 +116,7 @@ export const isDayInRage = (
}

const day = new Date(year, monthIndex, currentDay);
return startValue && startValue <= day && day <= endValue;
return startValue && startValue < day && day <= endValue;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return startValue && startValue < day && day <= endValue;
return startValue < day && day <= endValue;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

оно может быть undefined, поэтому лучше оставить проверку. TS ругается

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чуть выше в условии добавь плз проверку у startValue, также как это сделано с endValue.

@iljs iljs requested a review from shuga2704 March 4, 2024 13:17
shuga2704
shuga2704 requested changes Mar 6, 2024
View reviewed changes
packages/plasma-new-hope/src/components/Calendar/utils/index.ts Outdated
@@ -116,7 +116,7 @@ export const isDayInRage = (
}

const day = new Date(year, monthIndex, currentDay);
return startValue && startValue <= day && day <= endValue;
return startValue && startValue < day && day <= endValue;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чуть выше в условии добавь плз проверку у startValue, также как это сделано с endValue.

@iljs iljs force-pushed the feat-calendar-range-logic branch from a8c748c to 7bc0c67 Compare March 6, 2024 07:53
@iljs iljs requested a review from shuga2704 March 6, 2024 07:55
@Salute-Eva
Copy link
Contributor

Theme Builder app deployed!

http://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-1084/

@Salute-Eva
Copy link
Contributor

Documentation preview deployed!

website: http://plasma.sberdevices.ru/pr/pr-1084/
b2c storybook: http://plasma.sberdevices.ru/pr/pr-1084/b2c-storybook/
web storybook: http://plasma.sberdevices.ru/pr/pr-1084/web-storybook/
new-hope storybook: http://plasma.sberdevices.ru/pr/pr-1084/new-hope-storybook/
asdk storybook: http://plasma.sberdevices.ru/pr/pr-1084/asdk-storybook/
caldera storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-storybook/
caldera-online storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-online-storybook/
sdds-serv storybook: http://plasma.sberdevices.ru/pr/pr-1084/sdds-serv-storybook/

@iljs
feat(new-hope): edit calendar range logic and fix name
789e771 
feat(new-hope): calender utils startDay check
@iljs iljs force-pushed the feat-calendar-range-logic branch from 7bc0c67 to 789e771 Compare March 6, 2024 08:20
@Salute-Eva
Copy link
Contributor

Theme Builder app deployed!

http://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-1084/

@Salute-Eva
Copy link
Contributor

Documentation preview deployed!

website: http://plasma.sberdevices.ru/pr/pr-1084/
b2c storybook: http://plasma.sberdevices.ru/pr/pr-1084/b2c-storybook/
web storybook: http://plasma.sberdevices.ru/pr/pr-1084/web-storybook/
new-hope storybook: http://plasma.sberdevices.ru/pr/pr-1084/new-hope-storybook/
asdk storybook: http://plasma.sberdevices.ru/pr/pr-1084/asdk-storybook/
caldera storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-storybook/
caldera-online storybook: http://plasma.sberdevices.ru/pr/pr-1084/caldera-online-storybook/
sdds-serv storybook: http://plasma.sberdevices.ru/pr/pr-1084/sdds-serv-storybook/

@iljs iljs added this pull request to the merge queue Mar 6, 2024
Merged via the queue into dev with commit 02a0296 Mar 6, 2024
23 checks passed
@iljs iljs deleted the feat-calendar-range-logic branch March 6, 2024 10:14
@Salute-Eva Salute-Eva mentioned this pull request Mar 13, 2024
Merged
This was referenced Jul 24, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shuga2704 shuga2704 shuga2704 approved these changes

@TitanKuzmich TitanKuzmich TitanKuzmich approved these changes

@Yakutoc Yakutoc Yakutoc approved these changes

Assignees

@iljs iljs

Labels
plasma-components
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@iljs @Salute-Eva @Yakutoc @TitanKuzmich @shuga2704