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

[pickers] Apply the layout.tabs class to Tabs slot (@LukasTy) #11782

Merged
merged 1 commit into from
Jan 22, 2024
Merged

[pickers] Apply the layout.tabs class to Tabs slot (@LukasTy) #11782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions packages/x-date-pickers/src/DateTimePicker/DateTimePickerTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import * as React from 'react';
import clsx from 'clsx';
import PropTypes from 'prop-types';
import Tab from '@mui/material/Tab';
import Tabs, { tabsClasses } from '@mui/material/Tabs';
import { styled, useThemeProps } from '@mui/material/styles';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import composeClasses from '@mui/utils/composeClasses';
import { TimeIcon, DateRangeIcon } from '../icons';
import { DateOrTimeViewWithMeridiem } from '../internals/models';
import { useLocaleText } from '../internals/hooks/useUtils';
Expand Down Expand Up @@ -101,6 +102,7 @@ const DateTimePickerTabs = function DateTimePickerTabs(inProps: DateTimePickerTa
timeIcon = <TimeIcon />,
view,
hidden = typeof window === 'undefined' || window.innerHeight < 667,
className,
} = props;

const localeText = useLocaleText();
Expand All @@ -120,7 +122,7 @@ const DateTimePickerTabs = function DateTimePickerTabs(inProps: DateTimePickerTa
variant="fullWidth"
value={viewToTab(view)}
onChange={handleChange}
className={classes.root}
className={clsx(className, classes.root)}
>
<Tab
value="date"
Expand All @@ -145,6 +147,7 @@ DateTimePickerTabs.propTypes = {
* Override or extend the styles applied to the component.
*/
classes: PropTypes.object,
className: PropTypes.string,
/**
* Date tab icon.
* @default DateRange
Expand Down
8 changes: 3 additions & 5 deletions packages/x-date-pickers/src/PickersLayout/pickersLayoutClasses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {
unstable_generateUtilityClass as generateUtilityClass,
unstable_generateUtilityClasses as generateUtilityClasses,
} from '@mui/utils';
import generateUtilityClass from '@mui/utils/generateUtilityClass';
import generateUtilityClasses from '@mui/utils/generateUtilityClasses';

export interface PickersLayoutClasses {
/** Styles applied to the root element. */
Expand All @@ -28,5 +26,5 @@ export function getPickersLayoutUtilityClass(slot: string) {

export const pickersLayoutClasses = generateUtilityClasses<PickersLayoutClassKey>(
'MuiPickersLayout',
['root', 'landscape', 'contentWrapper', 'toolbar', 'actionBar', 'shortcuts'],
['root', 'landscape', 'contentWrapper', 'toolbar', 'actionBar', 'tabs', 'shortcuts'],
);
4 changes: 3 additions & 1 deletion packages/x-date-pickers/src/PickersLayout/usePickerLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ const usePickerLayout = <TValue, TDate, TView extends DateOrTimeViewWithMeridiem

const Tabs = slots?.tabs;
const tabs =
view && Tabs ? <Tabs view={view} onViewChange={onViewChange} {...slotProps?.tabs} /> : null;
view && Tabs ? (
<Tabs view={view} onViewChange={onViewChange} className={classes.tabs} {...slotProps?.tabs} />
) : null;

// Shortcuts

Expand Down
1 change: 1 addition & 0 deletions packages/x-date-pickers/src/internals/models/props/tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface BaseTabsProps<TView extends DateOrTimeViewWithMeridiem> {
* @param {TView} view The view to open
*/
onViewChange: (view: TView) => void;
className?: string;
}

export interface ExportedBaseTabsProps {}
Loading