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.

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

[Grid v2][system] handle direction object prop for responsive design #34574

Merged
merged 1 commit into from Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/mui-system/src/Unstable_Grid/createGrid.tsx
Expand Up @@ -21,6 +21,7 @@ import {
generateGridOffsetStyles,
generateSizeClassNames,
generateSpacingClassNames,
generateDirectionClasses,
} from './gridGenerator';
import { CreateMUIStyled } from '../createStyled';
import { GridTypeMap, GridOwnerState } from './GridProps';
Expand Down Expand Up @@ -62,13 +63,12 @@ export default function createGrid(

const useUtilityClasses = (ownerState: GridOwnerState, theme: typeof defaultTheme) => {
const { container, direction, spacing, wrap, gridSize } = ownerState;

const slots = {
root: [
'root',
container && 'container',
direction !== 'row' && `direction-xs-${String(direction)}`,
wrap !== 'wrap' && `wrap-xs-${String(wrap)}`,
...generateDirectionClasses(direction),
...generateSizeClassNames(gridSize),
...(container ? generateSpacingClassNames(spacing, theme.breakpoints.keys[0]) : []),
],
Expand Down
16 changes: 16 additions & 0 deletions packages/mui-system/src/Unstable_Grid/gridGenerator.test.js
Expand Up @@ -12,6 +12,7 @@ import {
generateGridOffsetStyles,
generateSizeClassNames,
generateSpacingClassNames,
generateDirectionClasses,
} from './gridGenerator';

const spacing = createSpacing();
Expand Down Expand Up @@ -569,4 +570,19 @@ describe('grid generator', () => {
).to.deep.equal(['spacing-mobile-3', 'spacing-tablet-4']);
});
});

describe('generateDirectionClasses', () => {
it('should generate correct direction class names', () => {
expect(generateDirectionClasses()).to.deep.equal([]);
expect(generateDirectionClasses('row')).to.deep.equal(['direction-xs-row']);
expect(generateDirectionClasses('column')).to.deep.equal(['direction-xs-column']);
expect(
generateDirectionClasses({
xs: 'row',
sm: 'column',
md: 'row',
}),
).to.deep.equal(['direction-xs-row', 'direction-sm-column', 'direction-md-row']);
});
});
});
16 changes: 15 additions & 1 deletion packages/mui-system/src/Unstable_Grid/gridGenerator.ts
@@ -1,6 +1,7 @@
import { Breakpoints, Breakpoint } from '../createTheme/createBreakpoints';
import { Spacing } from '../createTheme/createSpacing';
import { GridOwnerState } from './GridProps';
import { ResponsiveStyleValue } from '../styleFunctionSx';
import { GridDirection, GridOwnerState } from './GridProps';

interface Props {
theme: { breakpoints: Breakpoints; spacing?: Spacing };
Expand Down Expand Up @@ -255,3 +256,16 @@ export const generateSpacingClassNames = (
}
return [];
};

export const generateDirectionClasses = (
direction: ResponsiveStyleValue<GridDirection> | undefined,
): string[] => {
if (direction === undefined) {
return [];
}
if (typeof direction === 'object') {
return Object.entries(direction).map(([key, value]) => `direction-${key}-${value}`);
}

return [`direction-xs-${String(direction)}`];
};