Skip to content

Commit 281e02f

Browse files
feat(Calendar): use outlined buttons view in case of xl size (#216)
1 parent e5abe14 commit 281e02f

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

src/components/CalendarView/Calendar.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ $block: '.#{variables.$ns}calendar';
3333

3434
&__header {
3535
display: flex;
36+
justify-content: space-between;
3637

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

4445
&__controls {
45-
margin-inline-start: auto;
46+
display: flex;
47+
flex-shrink: 1;
48+
justify-content: flex-end;
49+
gap: var(--g-spacing-2);
4650
}
4751

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

240244
font-weight: var(--g-text-subheader-font-weight);
241245
cursor: pointer;
246+
text-transform: capitalize;
242247

243248
border-radius: 4px;
244249
outline: none;
@@ -306,4 +311,8 @@ $block: '.#{variables.$ns}calendar';
306311
background-color: var(--g-color-base-generic);
307312
}
308313
}
314+
315+
&__mode-label {
316+
text-transform: capitalize;
317+
}
309318
}

src/components/CalendarView/CalendarView.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React from 'react';
44

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

99
import {block} from '../../utils/cn';
1010
import type {AccessibilityProps, DomProps, FocusEvents, StyleProps} from '../types';
@@ -44,6 +44,9 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
4444
props,
4545
state,
4646
);
47+
const isMobile = useMobile();
48+
49+
const buttonView = isMobile ? 'outlined' : 'flat';
4750

4851
React.useImperativeHandle(ref, () => ({
4952
focus() {
@@ -58,7 +61,7 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
5861
style={props.style}
5962
>
6063
<div className={b('header')}>
61-
<Button {...modeButtonProps} view="flat" size={props.size}>
64+
<Button {...modeButtonProps} view={buttonView} size={props.size}>
6265
{state.availableModes.indexOf(state.mode) + 1 ===
6366
state.availableModes.length ? (
6467
<span key="label" className={b('mode-label', b(`years-label`))}>
@@ -76,12 +79,12 @@ export const CalendarView = React.forwardRef<CalendarInstance, CalendarViewProps
7679
)}
7780
</Button>
7881
<div className={b('controls')}>
79-
<Button {...previousButtonProps} view="flat" size={props.size}>
82+
<Button {...previousButtonProps} view={buttonView} size={props.size}>
8083
<Button.Icon>
8184
<ChevronLeft className={b('control-icon')} />
8285
</Button.Icon>
8386
</Button>
84-
<Button {...nextButtonProps} view="flat" size={props.size}>
87+
<Button {...nextButtonProps} view={buttonView} size={props.size}>
8588
<Button.Icon>
8689
<ChevronRight className={b('control-icon')} />
8790
</Button.Icon>

0 commit comments

Comments
 (0)