From c6badc8f64519d6d70b6b99211ce377b841d1f05 Mon Sep 17 00:00:00 2001 From: "e.muhamethanov" Date: Thu, 10 Oct 2024 17:12:19 +0300 Subject: [PATCH 1/5] feat(Calendar): add doneButtonShow, doneButtonDisabled props flags --- .../vkui/src/components/Calendar/Calendar.tsx | 14 +++++++-- .../vkui/src/components/Calendar/Readme.md | 9 ++++++ .../CalendarTime/CalendarTime.module.css | 4 +++ .../CalendarTime/CalendarTime.test.tsx | 31 +++++++++++++++++++ .../components/CalendarTime/CalendarTime.tsx | 25 +++++++++------ 5 files changed, 72 insertions(+), 11 deletions(-) diff --git a/packages/vkui/src/components/Calendar/Calendar.tsx b/packages/vkui/src/components/Calendar/Calendar.tsx index cca8cfab3e..f6c1858f28 100644 --- a/packages/vkui/src/components/Calendar/Calendar.tsx +++ b/packages/vkui/src/components/Calendar/Calendar.tsx @@ -16,7 +16,14 @@ import styles from './Calendar.module.css'; export interface CalendarProps extends Omit, 'onChange'>, - Pick, + Pick< + CalendarTimeProps, + | 'changeHoursLabel' + | 'changeMinutesLabel' + | 'doneButtonText' + | 'doneButtonDisabled' + | 'doneButtonShow' + >, Pick< CalendarHeaderProps, | 'prevMonthLabel' @@ -44,7 +51,6 @@ export interface CalendarProps disableFuture?: boolean; enableTime?: boolean; disablePickers?: boolean; - doneButtonText?: string; changeDayLabel?: string; weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6; showNeighboringMonth?: boolean; @@ -90,6 +96,8 @@ export const Calendar = ({ onClose, enableTime = false, doneButtonText, + doneButtonDisabled, + doneButtonShow, weekStartsOn = 1, disablePickers, changeHoursLabel = 'Изменить час', @@ -233,6 +241,8 @@ export const Calendar = ({ onChange={onChange} onClose={onClose} doneButtonText={doneButtonText} + doneButtonDisabled={doneButtonDisabled} + doneButtonShow={doneButtonShow} changeHoursLabel={changeHoursLabel} changeMinutesLabel={changeMinutesLabel} isDayDisabled={minDateTime || maxDateTime ? isDayDisabled : undefined} diff --git a/packages/vkui/src/components/Calendar/Readme.md b/packages/vkui/src/components/Calendar/Readme.md index 423f0e6715..5974a06271 100644 --- a/packages/vkui/src/components/Calendar/Readme.md +++ b/packages/vkui/src/components/Calendar/Readme.md @@ -9,6 +9,7 @@ import { lightFormat } from 'date-fns'; const Example = () => { const [value, setValue] = useState(() => new Date()); const [enableTime, setEnableTime] = useState(false); + const [doneButtonShow, setDoneButtonShow] = useState(true); const [disablePast, setDisablePast] = useState(false); const [disableFuture, setDisableFuture] = useState(false); const [disablePickers, setDisablePickers] = useState(false); @@ -25,6 +26,13 @@ const Example = () => { Включено + {enableTime && ( + + setDoneButtonShow(e.target.checked)}> + Включено + + + )} setDisablePast(e.target.checked)}> Включено @@ -107,6 +115,7 @@ const Example = () => { disablePast={disablePast} disableFuture={disableFuture} disablePickers={disablePickers} + doneButtonShow={doneButtonShow} showNeighboringMonth={showNeighboringMonth} size={size} listenDayChangesForUpdate={listenDayChangesForUpdate} diff --git a/packages/vkui/src/components/CalendarTime/CalendarTime.module.css b/packages/vkui/src/components/CalendarTime/CalendarTime.module.css index 9f2ea879d9..3004341f0b 100644 --- a/packages/vkui/src/components/CalendarTime/CalendarTime.module.css +++ b/packages/vkui/src/components/CalendarTime/CalendarTime.module.css @@ -3,6 +3,10 @@ align-items: center; } +.host__withoutDone { + justify-content: center; +} + .picker { inline-size: 77px; } diff --git a/packages/vkui/src/components/CalendarTime/CalendarTime.test.tsx b/packages/vkui/src/components/CalendarTime/CalendarTime.test.tsx index 15ce1e0be1..e840f63493 100644 --- a/packages/vkui/src/components/CalendarTime/CalendarTime.test.tsx +++ b/packages/vkui/src/components/CalendarTime/CalendarTime.test.tsx @@ -52,4 +52,35 @@ describe('CalendarTime', () => { expect(onChange).toHaveBeenCalledTimes(0); }); + + it('should hide done button with doneButtonShow=false', () => { + const onChange = jest.fn(); + const buttonText = 'Текст'; + render( + , + ); + expect(screen.queryByText(buttonText)).toBeFalsy(); + }); + + it('should disable done button with doneButtonDisabled=false', () => { + const onChange = jest.fn(); + const buttonText = 'Текст'; + render( + , + ); + const text = screen.queryByText(buttonText); + expect(text).toBeTruthy(); + const button = text!.closest('button'); + expect(button!.disabled).toBeTruthy(); + }); }); diff --git a/packages/vkui/src/components/CalendarTime/CalendarTime.tsx b/packages/vkui/src/components/CalendarTime/CalendarTime.tsx index adf19ee50d..225884def1 100644 --- a/packages/vkui/src/components/CalendarTime/CalendarTime.tsx +++ b/packages/vkui/src/components/CalendarTime/CalendarTime.tsx @@ -1,6 +1,7 @@ 'use client'; import * as React from 'react'; +import { classNames } from '@vkontakte/vkjs'; import { setHours, setMinutes } from 'date-fns'; import { AdaptivityProvider } from '../AdaptivityProvider/AdaptivityProvider'; import { Button } from '../Button/Button'; @@ -10,6 +11,8 @@ import styles from './CalendarTime.module.css'; export interface CalendarTimeProps { value: Date; doneButtonText?: string; + doneButtonShow?: boolean; + doneButtonDisabled?: boolean; changeHoursLabel?: string; changeMinutesLabel?: string; onChange?: (value: Date) => void; @@ -35,12 +38,14 @@ for (let i = 0; i < 60; i += 1) { export const CalendarTime = ({ value, - doneButtonText = 'Готово', onChange, onClose, changeHoursLabel, changeMinutesLabel, isDayDisabled, + doneButtonText = 'Готово', + doneButtonDisabled = false, + doneButtonShow = true, }: CalendarTimeProps): React.ReactNode => { const localHours = isDayDisabled ? hours.map((hour) => { @@ -66,7 +71,7 @@ export const CalendarTime = ({ ); return ( -
+
-
- - - -
+ {doneButtonShow && ( +
+ + + +
+ )}
); }; From d0b1211d2a6d6fb7ab6b8053848809d68c70e62d Mon Sep 17 00:00:00 2001 From: "e.muhamethanov" Date: Thu, 10 Oct 2024 17:21:08 +0300 Subject: [PATCH 2/5] test(Calendar): add screenshots --- .../components/Calendar/Calendar.e2e-playground.tsx | 12 ++++++++++++ .../calendar-android-chromium-dark-1-snap.png | 4 ++-- .../calendar-android-chromium-light-1-snap.png | 4 ++-- .../calendar-ios-webkit-dark-1-snap.png | 4 ++-- .../calendar-ios-webkit-light-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-dark-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-light-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-dark-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-light-1-snap.png | 4 ++-- .../calendar-vkcom-webkit-dark-1-snap.png | 4 ++-- .../calendar-vkcom-webkit-light-1-snap.png | 4 ++-- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/packages/vkui/src/components/Calendar/Calendar.e2e-playground.tsx b/packages/vkui/src/components/Calendar/Calendar.e2e-playground.tsx index 19f5be1a13..be08e6493f 100644 --- a/packages/vkui/src/components/Calendar/Calendar.e2e-playground.tsx +++ b/packages/vkui/src/components/Calendar/Calendar.e2e-playground.tsx @@ -31,6 +31,18 @@ export const CalendarPlayground = (props: ComponentPlaygroundProps) => { enableTime: [true, false], doneButtonText: [undefined, 'Done'], }, + { + value: [new Date('1970-05-05')], + enableTime: [true], + doneButtonText: ['Done'], + doneButtonShow: [true, false], + }, + { + value: [new Date('1970-05-05')], + enableTime: [true], + doneButtonShow: [true], + doneButtonDisabled: [true], + }, { value: [new Date('1970-05-05')], nextMonthIcon: [ diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png index 0b6b5f0710..54083ed5c7 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1155eb43cfdfea423913ddf7c865e5ded0964c9c0079ae4312a8dcad2ba1b04b -size 277842 +oid sha256:ae6101ceeff99ec9c860ac006dc704ed32607124c0570455ffaf59106803f52f +size 334812 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png index 9cafff3768..f08f80e924 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64d1d4dd24a3c0631f4a38e018c39266087b5193ee04021d53ab8deb3aa7f775 -size 276594 +oid sha256:2917437f2569cf833669c63a2fa7c37f0421992a2a5e6e15c209b8d589dae9a3 +size 333457 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png index a95ef3dbd1..905ca582cb 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0cf43b925816b9321629b267bbe90d4a6138432909a79037f78f7c05aa6123c -size 287239 +oid sha256:f7e171ae917ab2fb16aebab374e92b3973ceea89a85a82dcdefdf2edb5293ad3 +size 347950 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png index 14ee3c9a8c..6133ab615d 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dac3cca25b0ebc8b4a6de016893879398b170cea3608682989626acda2a2e95 -size 286862 +oid sha256:4770daa46f1c5d5b671d5bc305a23206f062519e42783f01a2ad54cc6dd5e449 +size 345254 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png index 2d2b439c4c..8d1099925b 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f426a0595fe9be923f91857ff30d6c9edb8a64715b15b37081e0efa6757d26c3 -size 282916 +oid sha256:42e7cd83a6e874c2ba0e6d119d6db598be83329c86428ba17196962e2ea1342e +size 340567 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png index 84cadf0f4a..e9cad78370 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df7fb9881e220d3230e93f5c115faf10d587d1a6ce37f9c1c371f5915be63147 -size 287223 +oid sha256:0a8c140cba16f518462a2802042c53e222363cbc1c645da04eafceeb7bdc7ee4 +size 345689 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png index 2b79cb1ef2..b1ffab7125 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f44612d85ca46dc0a53d1d1e7b6fb78b9e4598014abfa0913e68fc30536c049b -size 459550 +oid sha256:cb944f7a8700c6531f7580ff8b5eeef998cb452b9d25befbde5761801266d720 +size 565230 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png index 0b835c70ed..83f23485c6 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a165d1344c0686ba14afb72c8585901555ff8df747726c13f5f8ecd9b5aa7b5c -size 461909 +oid sha256:c396327664babc017a814cc7760addbed946eb0a726db4952e42a67019fa3f11 +size 557669 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png index f8a4bcf3ba..4a0ca527d1 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f3ea260825b575ac1c47f66d84a768273d4df6a860e646ab53e383f0d6cde67 -size 293375 +oid sha256:2ae69bc391238f7128ab25c3ab4f59ea82e6520da3a8009d33659449b8689b4a +size 352849 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png index 8c2abfa63e..5cb789fcf0 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c9687f73d29913eec8b0a46d0e6232bdbd8a559f01d35a2d10fbf7b95b7ff44 -size 298504 +oid sha256:b06fcdcfecc15ab7c3fd03c2383cfc701220559a53fb9cd076604adf328acb82 +size 358772 From c9c7901fd92294efd4a019318ee0bdfa8aef86b9 Mon Sep 17 00:00:00 2001 From: "e.muhamethanov" Date: Thu, 17 Oct 2024 10:39:13 +0300 Subject: [PATCH 3/5] test(Calendar): update screenshots --- .../calendar-android-chromium-dark-1-snap.png | 4 ++-- .../calendar-android-chromium-light-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-ios-webkit-dark-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-ios-webkit-light-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-dark-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-light-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-dark-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-light-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png | 4 ++-- .../calendar-vkcom-webkit-light-1-snap.png | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png index 704ce9b593..665fa341d9 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f06ec74481cd32106c3fb4b491d57bf3de03779b321621e53bea6acfab5eb873 -size 277952 +oid sha256:7a0ccba30e13bbf60055358ec6c07c919f5105ae3a70c581bafc4a433fac801b +size 334796 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png index 9804c9979c..4b472ecf28 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:555bdd4d0b4db09cc696b52de6f74bdf8961163fb1d479169cc854a903fee482 -size 276830 +oid sha256:7a0cbe1aee68414a94e412897c8b6bc87fcf541c9892560369608d02dfe8fd64 +size 333453 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png index b505a93dcd..79dc544ed7 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20ac360db98796a85758f30f70ade565ed3517f10b1a9bb2f99c04154eab64bf -size 288998 +oid sha256:27b571ea927588c60582d9ccb3664258abdd1d76e1b28c762c380bce13f6b8e6 +size 347942 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png index efff732205..814764d6fe 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a6f3c9335a0cbd01d74e5d8ae91ba58ea039157a0f8ada4c17804a5c749c615 -size 286851 +oid sha256:d19a807a64dc93b5a6449edd3f7d4369ecd2420a2df0494ab5064fff2094527b +size 345245 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png index ae850a975d..be16dcc31d 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:034c6122bed6985cae91748dbdf375833fbf66151bad96eccf6250f7c86cbf0b -size 282847 +oid sha256:9a468650d56489317b6319cf5beb28ab00b50cd1982234e52625b994b93b9989 +size 340567 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png index 03f8bf195e..9989efc8e6 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:071dc745a23353675717ad2bd1e1d52dcb1f5306ede9962a92ae46536093c2d5 -size 287356 +oid sha256:a8bcddc349e6ba3fa93cfd2b329e135f037446e171c44488bae5bc3073d08981 +size 345664 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png index 6a43b312ef..0b25ed82d3 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:527f64064d75a02f19d25590d8b25e5e698201683393311e28beb04c0d65c9df -size 467658 +oid sha256:64fece7fda8cdb26eb6079a144ab0e6bd4611f2e76ca74b347fe8c8f6e3c9603 +size 565187 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png index 2e831d594e..bd380b7891 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74cebadd843079a33ae0ce8138887701269f7dedb7d35acbba716833593e7c52 -size 461846 +oid sha256:fd7b260597abd8122d7bca2d0f279d246bd8a0a12f3d139860279e7a34812338 +size 557610 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png index 5e519a59e1..7bab5c49ab 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c82b3940c831f7889dbe86b1980d967ef798878ab68bc694f34f940975adce98 -size 293360 +oid sha256:f6d29a9f1a9f2b4d140d93a788aa19ced226366189635406f1dd23402763cee8 +size 352827 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png index d4dbe6f816..53a71cc4da 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc8a07ff6f9a72de1c72f134726ba34e760e87e1ece5048aa20192075c7ecc99 -size 298489 +oid sha256:69d90988417e9fb3f253c41c6c227022dfb9e07caba08d5e152d39e676397b04 +size 358756 From 49d7f6d25a8b650b8bb3af1a6385ac15b898a8ba Mon Sep 17 00:00:00 2001 From: "e.muhamethanov" Date: Tue, 29 Oct 2024 15:56:03 +0300 Subject: [PATCH 4/5] test(Calendar): update screenshots --- .../calendar-android-chromium-dark-1-snap.png | 4 ++-- .../calendar-android-chromium-light-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-ios-webkit-dark-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-ios-webkit-light-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-dark-1-snap.png | 4 ++-- .../calendar-vkcom-chromium-light-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-dark-1-snap.png | 4 ++-- .../calendar-vkcom-firefox-light-1-snap.png | 4 ++-- .../__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png | 4 ++-- .../calendar-vkcom-webkit-light-1-snap.png | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png index 69a37b0f97..cc6719cfe7 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:229888482e06d53a3775b717ba81f3cf1f6d2c04df9f0e14e011c390b4b640ca -size 277954 +oid sha256:01741b02fb9782cc9d7c993d4c5fe51145ebec9d98cbf9c4781e94ddefad7c2a +size 334805 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png index 08c1d5ca4e..fcd24cc38a 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-android-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ec410338ad4c2f192c672fec781975ea957a93043ada846dbf88ef918120ab3 -size 276832 +oid sha256:52a1904f187cbd2220b81402bec5c5496b3d0c9d60716c961cf711d433e36619 +size 333457 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png index 399675032b..0b67e971ae 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0632bc18aa2f604cd0bf936b72781ab2c933f9afdf59c0de947eca7008cbb883 -size 289036 +oid sha256:50d8603a79a7a01314ecb0aaa598bcd510fb7759d1fcfb0b2969eae01bbbe48e +size 347982 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png index 5539694e2a..00e5e16d42 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-ios-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06ae7446bfa379b01af1379eb5ebde2b5a5d3a508dfc12511a6e1801a22e282b -size 286925 +oid sha256:93ce9c1d688de0565a90f96679f06047a4ae0948310553dacc90ae3d62955ecd +size 345334 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png index aaa2b998b6..becc93e194 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0783b793cae29a30e87fd4d0698a60c987886542dbb61253f7ec94f9bb85cf7c -size 282782 +oid sha256:65b8d73ace246872feb09e589915fc195ed0f8fb8acad40f45bfa9e86a4c5e53 +size 340475 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png index 7394a76acd..87e1ac2f7d 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-chromium-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded1d02f13da45e85a783beb00d95b7feb7a11fa2e1b4a541d90c97a522540ea -size 287378 +oid sha256:6b5f0ce3b68a4e0f8cf5e4559fc492386a587823bb285da8e5469ec20268d5b5 +size 345721 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png index 9267de1c5c..27f92cff0a 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b18d52c0ed919daf17b5bcf788d9c70b5987876590997b0edcf8b0e0c603d63b -size 467531 +oid sha256:6d5d14c68f319f676ad481c4bb1396121de506d1ce8a9b10a861a5604540f7bc +size 564905 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png index e152de59aa..2bc60a8474 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-firefox-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17a7aa9817be19e7f0752deaef411bb019d23089518bb953d5b0bc5192fd213e -size 461650 +oid sha256:34d31d7f143eb57de538e8b054a7ed190145889e5074914220c325ac9df3f941 +size 557212 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png index 8a819d369e..85b45dc0b1 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-dark-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ac03164ac54fc9089388d898badba320259612358972ad40fd6dd7d2024ec29 -size 293338 +oid sha256:84f1c2b1d61acca8b91466e8a50f4087668f9c49fc9ca3d0aa0e6664e4c329ee +size 352738 diff --git a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png index 5e1d7e5f39..8d6f2743d2 100644 --- a/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png +++ b/packages/vkui/src/components/Calendar/__image_snapshots__/calendar-vkcom-webkit-light-1-snap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc51188bf46efdac54291c54e304d64c93f3eb1fa30b56053d7e551e76a8f004 -size 298522 +oid sha256:d9cebac55ddbca4994ffa359dfb6fada779cfe570670f10b28fbd33e098a6a43 +size 358763 From 2110f86c4a2d605bb80f14b27e5a5e1652bbb375 Mon Sep 17 00:00:00 2001 From: "e.muhamethanov" Date: Tue, 5 Nov 2024 14:12:42 +0300 Subject: [PATCH 5/5] fix(CalendarTime): fix formatting --- packages/vkui/src/components/CalendarTime/CalendarTime.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vkui/src/components/CalendarTime/CalendarTime.tsx b/packages/vkui/src/components/CalendarTime/CalendarTime.tsx index b50f78bfa1..50c74af0a9 100644 --- a/packages/vkui/src/components/CalendarTime/CalendarTime.tsx +++ b/packages/vkui/src/components/CalendarTime/CalendarTime.tsx @@ -96,7 +96,12 @@ export const CalendarTime = ({ {doneButtonShow && (
-