Skip to content

feat(Calendar): use outlined buttons view in case of xl size #216

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

Merged
merged 6 commits into from
Oct 16, 2025
Merged

feat(Calendar): use outlined buttons view in case of xl size #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e642ee6
feat: adopt calendar to mobile version
MefistAldemisov Aug 8, 2025
2e10984
fix: change buttons view according to isMobile property
MefistAldemisov Sep 15, 2025
df9fcee
fix: restore padding variable
MefistAldemisov Sep 23, 2025
b62d77b
Merge branch 'main' into feat/redesign-mobile-calendar
MefistAldemisov Sep 23, 2025
2d6def2
fix: remove excessive paddings
MefistAldemisov Oct 16, 2025
3329019
Merge branch 'main' into feat/redesign-mobile-calendar
MefistAldemisov Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/components/CalendarView/Calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ $block: '.#{variables.$ns}calendar';

&__header {
display: flex;
justify-content: space-between;

padding: var(--_--calendar-padding) var(--_--calendar-padding) 0;
}
Expand All @@ -42,7 +43,10 @@ $block: '.#{variables.$ns}calendar';
}

&__controls {
margin-inline-start: auto;
display: flex;
flex-shrink: 1;
justify-content: flex-end;
gap: var(--g-spacing-2);
}

&__control-icon {
Expand Down Expand Up @@ -239,6 +243,7 @@ $block: '.#{variables.$ns}calendar';

font-weight: var(--g-text-subheader-font-weight);
cursor: pointer;
text-transform: capitalize;

border-radius: 4px;
outline: none;
Expand Down Expand Up @@ -306,4 +311,8 @@ $block: '.#{variables.$ns}calendar';
background-color: var(--g-color-base-generic);
}
}

&__mode-label {
text-transform: capitalize;
}
}
11 changes: 7 additions & 4 deletions src/components/CalendarView/CalendarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';

import type {DateTime} from '@gravity-ui/date-utils';
import {ChevronLeft, ChevronRight} from '@gravity-ui/icons';
import {ArrowToggle, Button, useLang} from '@gravity-ui/uikit';
import {ArrowToggle, Button, useLang, useMobile} from '@gravity-ui/uikit';

import {block} from '../../utils/cn';
import type {AccessibilityProps, DomProps, FocusEvents, StyleProps} from '../types';
Expand Down Expand Up @@ -44,6 +44,9 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
props,
state,
);
const isMobile = useMobile();

const buttonView = isMobile ? 'outlined' : 'flat';

React.useImperativeHandle(ref, () => ({
focus() {
Expand All @@ -58,7 +61,7 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
style={props.style}
>
<div className={b('header')}>
<Button {...modeButtonProps} view="flat" size={props.size}>
<Button {...modeButtonProps} view={buttonView} size={props.size}>
{state.availableModes.indexOf(state.mode) + 1 ===
state.availableModes.length ? (
<span key="label" className={b('mode-label', b(`years-label`))}>
Expand All @@ -76,12 +79,12 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
)}
</Button>
<div className={b('controls')}>
<Button {...previousButtonProps} view="flat" size={props.size}>
<Button {...previousButtonProps} view={buttonView} size={props.size}>
<Button.Icon>
<ChevronLeft className={b('control-icon')} />
</Button.Icon>
</Button>
<Button {...nextButtonProps} view="flat" size={props.size}>
<Button {...nextButtonProps} view={buttonView} size={props.size}>
<Button.Icon>
<ChevronRight className={b('control-icon')} />
</Button.Icon>
Expand Down
Loading