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

[system] Fix the inconsistent types of the mergeBreakpointsInOrder function #38749

Merged
merged 4 commits into from
Sep 5, 2023
Merged

[system] Fix the inconsistent types of the mergeBreakpointsInOrder function #38749

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7763c70
fix the inconsistent types of the mergeBreakpointsInOrder function
imevanc Aug 31, 2023
70e6e31
address PR suggestions
imevanc Sep 4, 2023
2879e2f
Merge branch 'master' into fix-inconsistent-types-of-mergeBreakpoints…
ZeeshanTamboli Sep 5, 2023
c2f67cf
prettier
ZeeshanTamboli Sep 5, 2023
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
8 changes: 1 addition & 7 deletions packages/mui-system/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export type BordersProps = PropsFor<typeof borders>;

// breakpoints.js
type DefaultBreakPoints = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
export { handleBreakpoints } from './breakpoints';
export { handleBreakpoints, mergeBreakpointsInOrder } from './breakpoints';

/**
* @returns An enhanced stylefunction that considers breakpoints
Expand All @@ -41,12 +41,6 @@ export function breakpoints<Props, Breakpoints extends string = DefaultBreakPoin
styleFunction: StyleFunction<Props>,
): StyleFunction<Partial<Record<Breakpoints, Props>> & Props>;

// restructures the breakpoints in the in the correct order and merges all styles args
export function mergeBreakpointsInOrder(
breakpointsInput: { keys: string[]; up: (key: string) => string },
...styles: object[]
): object;

export function compose<T extends Array<StyleFunction<any>>>(...args: T): ComposedStyleFunction<T>;

export type DisplayProps = PropsFor<typeof display>;
Expand Down