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

fix: Form 与 Grid 样式冲突问题 #44472

Merged
merged 3 commits into from
Aug 28, 2023
Merged

fix: Form 与 Grid 样式冲突问题 #44472

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc0ab4e
fix: style
crazyair Aug 28, 2023
a381c74
fix: style
crazyair Aug 28, 2023
9625bf0
chore: ref
crazyair Aug 28, 2023
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
28 changes: 17 additions & 11 deletions components/grid/style/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { CSSObject } from '@ant-design/cssinjs';

import type { FullToken, GenerateStyle } from '../../theme/internal';
import { genComponentStyleHook, mergeToken } from '../../theme/internal';

Expand Down Expand Up @@ -86,13 +87,18 @@ const genGridColStyle: GenerateStyle<GridColToken> = (token): CSSObject => {
};
};

const genLoopGridColumnsStyle = (token: GridColToken, sizeCls: string): CSSObject => {
const genLoopGridColumnsStyle = (
token: GridColToken,
sizeCls: string,
rootPrefixCls: string,
): CSSObject => {
const { componentCls, gridColumns } = token;

const gridColumnsStyle: CSSObject = {};
const _prefixCls = `${componentCls}${componentCls}`;
yoyo837 marked this conversation as resolved.
Show resolved Hide resolved
for (let i = gridColumns; i >= 0; i--) {
if (i === 0) {
gridColumnsStyle[`${componentCls}${sizeCls}-${i}`] = {
gridColumnsStyle[`${_prefixCls}${sizeCls}-${i}`] = {
display: 'none',
};
gridColumnsStyle[`${componentCls}-push-${i}`] = {
Expand Down Expand Up @@ -133,27 +139,27 @@ const genLoopGridColumnsStyle = (token: GridColToken, sizeCls: string): CSSObjec
};
}
}

return gridColumnsStyle;
return { [`.${rootPrefixCls}-row`]: gridColumnsStyle };
};

const genGridStyle = (token: GridColToken, sizeCls: string): CSSObject =>
genLoopGridColumnsStyle(token, sizeCls);
const genGridStyle = (token: GridColToken, sizeCls: string, rootPrefixCls: string): CSSObject =>
genLoopGridColumnsStyle(token, sizeCls, rootPrefixCls);

const genGridMediaStyle = (
token: GridColToken,
screenSize: number,
sizeCls: string,
rootPrefixCls: string,
): CSSObject => ({
[`@media (min-width: ${screenSize}px)`]: {
...genGridStyle(token, sizeCls),
...genGridStyle(token, sizeCls, rootPrefixCls),
},
});

// ============================== Export ==============================
export const useRowStyle = genComponentStyleHook('Grid', (token) => [genGridRowStyle(token)]);

export const useColStyle = genComponentStyleHook('Grid', (token) => {
export const useColStyle = genComponentStyleHook('Grid', (token, { rootPrefixCls }) => {
const gridToken: GridColToken = mergeToken<GridColToken>(token, {
gridColumns: 24, // Row is divided into 24 parts in Grid
});
Expand All @@ -168,11 +174,11 @@ export const useColStyle = genComponentStyleHook('Grid', (token) => {

return [
genGridColStyle(gridToken),
genGridStyle(gridToken, ''),
genGridStyle(gridToken, '-xs'),
genGridStyle(gridToken, '', rootPrefixCls),
genGridStyle(gridToken, '-xs', rootPrefixCls),
Object.keys(gridMediaSizesMap)
.map((key: keyof typeof gridMediaSizesMap) =>
genGridMediaStyle(gridToken, gridMediaSizesMap[key], key),
genGridMediaStyle(gridToken, gridMediaSizesMap[key], key, rootPrefixCls),
)
.reduce((pre, cur) => ({ ...pre, ...cur }), {}),
];
Expand Down