mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-13 13:29:18 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

refactor: import css-in-js utils from theme (#35215)

Browse Source
This commit is contained in:
afc163 2022-04-24 18:05:08 +08:00 committed by GitHub
parent 4ebe262426
commit 3d23b809b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/_util/theme/index.tsx
View File

@ -3,9 +3,9 @@ import { CSSInterpolation, Theme, useCacheToken, useStyleRegister } from '@ant-d
import genComponentStyleHook from './util/genComponentStyleHook'; import genComponentStyleHook from './util/genComponentStyleHook';
import defaultSeedToken, { derivative as defaultDerivative } from './themes/default'; import defaultSeedToken, { derivative as defaultDerivative } from './themes/default';
import version from '../../version'; import version from '../../version';
import { resetComponent, resetIcon, clearFix, roundedArrow } from './util'; import { resetComponent, resetIcon, clearFix, roundedArrow, operationUnit } from './util';
import formatToken from './util/alias'; import formatToken from './util/alias';
import statisticToken, { merge as mergeToken } from './util/statistic'; import statisticToken, { merge as mergeToken, statistic } from './util/statistic';
import { GlobalToken, PresetColors } from './interface'; import { GlobalToken, PresetColors } from './interface';
import type { import type {
SeedToken, SeedToken,
@ -17,16 +17,20 @@ import type {
import type { FullToken } from './util/genComponentStyleHook'; import type { FullToken } from './util/genComponentStyleHook';
export { export {
PresetColors, // css utils
resetComponent, resetComponent,
resetIcon, resetIcon,
clearFix, clearFix,
roundedArrow, roundedArrow,
useStyleRegister, operationUnit,
// colors
PresetColors,
// Statistic // Statistic
statistic,
statisticToken, statisticToken,
mergeToken, mergeToken,
// GenComponentStyleHook // hooks
useStyleRegister,
genComponentStyleHook, genComponentStyleHook,
}; };

1
components/_util/theme/util/index.tsx
View File

@ -2,6 +2,7 @@
import { CSSObject } from '@ant-design/cssinjs'; import { CSSObject } from '@ant-design/cssinjs';
import type { DerivativeToken } from '..'; import type { DerivativeToken } from '..';
export { operationUnit } from './operationUnit';
export { roundedArrow } from './roundedArrow'; export { roundedArrow } from './roundedArrow';
export const resetComponent = (token: DerivativeToken): CSSObject => ({ export const resetComponent = (token: DerivativeToken): CSSObject => ({

5
components/typography/style/index.tsx
View File

@ -1,7 +1,6 @@
// deps-lint-skip-all // deps-lint-skip-all
import { FullToken, genComponentStyleHook } from '../../_util/theme'; import type { FullToken, GenerateStyle } from '../../_util/theme';
import type { GenerateStyle } from '../../_util/theme'; import { genComponentStyleHook, operationUnit } from '../../_util/theme';
import { operationUnit } from '../../_util/theme/util/operationUnit';
import { import {
getTitleStyles, getTitleStyles,
getResetStyles, getResetStyles,

3
components/typography/style/mixins.tsx
View File

@ -10,7 +10,7 @@
import { gold } from '@ant-design/colors'; import { gold } from '@ant-design/colors';
import type { CSSObject } from '@ant-design/cssinjs'; import type { CSSObject } from '@ant-design/cssinjs';
import type { GenerateStyle } from '../../_util/theme'; import type { GenerateStyle } from '../../_util/theme';
import { operationUnit } from '../../_util/theme/util/operationUnit'; import { operationUnit } from '../../_util/theme';
import { initInputToken } from '../../input/style'; import { initInputToken } from '../../input/style';
import type { TypographyToken } from '.'; import type { TypographyToken } from '.';
@ -107,6 +107,7 @@ export const getResetStyles = (): CSSObject => ({
mark: { mark: {
padding: 0, padding: 0,
// FIXME hardcode in v4
backgroundColor: gold[2], backgroundColor: gold[2],
}, },

2
site/theme/template/Layout/DynamicTheme/Token.tsx
View File

@ -1,7 +1,7 @@
/* eslint-disable react/no-array-index-key */ /* eslint-disable react/no-array-index-key */
import * as React from 'react'; import * as React from 'react';
import { Table, Space, TableProps, ConfigProvider, Select, Row, Col, Alert } from 'antd'; import { Table, Space, TableProps, ConfigProvider, Select, Row, Col, Alert } from 'antd';
import { statistic } from '../../../../../components/_util/theme/util/statistic'; import { statistic } from '../../../../../components/_util/theme';
const columns: TableProps<{ name: string; value: any }>['columns'] = [ const columns: TableProps<{ name: string; value: any }>['columns'] = [
{ {