Browse Source

refactor: remove Fragment wrappers and simplify jest config

pull/11519/head
afc163 9 months ago
parent
commit
c255e70b80
  1. 3
      jest.config.ts
  2. 30
      src/pages/account/settings/components/binding.tsx
  3. 22
      src/pages/account/settings/components/notification.tsx
  4. 32
      src/pages/profile/advanced/index.tsx

3
jest.config.ts

@ -1,7 +1,6 @@
import type { Config } from '@jest/types';
import { configUmiAlias, createConfig } from '@umijs/max/test'; import { configUmiAlias, createConfig } from '@umijs/max/test';
export default async (): Promise<Config.InitialOptions> => { export default async (): Promise<any> => {
const config = await configUmiAlias({ const config = await configUmiAlias({
...createConfig({ ...createConfig({
target: 'browser', target: 'browser',

30
src/pages/account/settings/components/binding.tsx

@ -4,7 +4,7 @@ import {
TaobaoOutlined, TaobaoOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import { List } from 'antd'; import { List } from 'antd';
import React, { Fragment } from 'react'; import React from 'react';
const BindingView: React.FC = () => { const BindingView: React.FC = () => {
const getData = () => [ const getData = () => [
@ -29,21 +29,19 @@ const BindingView: React.FC = () => {
]; ];
return ( return (
<Fragment> <List
<List itemLayout="horizontal"
itemLayout="horizontal" dataSource={getData()}
dataSource={getData()} renderItem={(item) => (
renderItem={(item) => ( <List.Item actions={item.actions}>
<List.Item actions={item.actions}> <List.Item.Meta
<List.Item.Meta avatar={item.avatar}
avatar={item.avatar} title={item.title}
title={item.title} description={item.description}
description={item.description} />
/> </List.Item>
</List.Item> )}
)} />
/>
</Fragment>
); );
}; };

22
src/pages/account/settings/components/notification.tsx

@ -1,5 +1,5 @@
import { List, Switch } from 'antd'; import { List, Switch } from 'antd';
import React, { Fragment } from 'react'; import React from 'react';
type Unpacked<T> = T extends (infer U)[] ? U : T; type Unpacked<T> = T extends (infer U)[] ? U : T;
@ -29,17 +29,15 @@ const NotificationView: React.FC = () => {
const data = getData(); const data = getData();
return ( return (
<Fragment> <List<Unpacked<typeof data>>
<List<Unpacked<typeof data>> itemLayout="horizontal"
itemLayout="horizontal" dataSource={data}
dataSource={data} renderItem={(item) => (
renderItem={(item) => ( <List.Item actions={item.actions}>
<List.Item actions={item.actions}> <List.Item.Meta title={item.title} description={item.description} />
<List.Item.Meta title={item.title} description={item.description} /> </List.Item>
</List.Item> )}
)} />
/>
</Fragment>
); );
}; };

32
src/pages/profile/advanced/index.tsx

@ -27,7 +27,7 @@ import {
} from 'antd'; } from 'antd';
import classNames from 'classnames'; import classNames from 'classnames';
import type { FC } from 'react'; import type { FC } from 'react';
import React, { Fragment, useState } from 'react'; import React, { useState } from 'react';
import type { AdvancedProfileData } from './data.d'; import type { AdvancedProfileData } from './data.d';
import { queryAdvancedProfile } from './service'; import { queryAdvancedProfile } from './service';
import useStyles from './style.style'; import useStyles from './style.style';
@ -187,28 +187,24 @@ const Advanced: FC = () => {
); );
const desc1 = ( const desc1 = (
<div className={classNames(styles.stepDescription)}> <div className={classNames(styles.stepDescription)}>
<Fragment>
<DingdingOutlined
<DingdingOutlined style={{
style={{ marginLeft: 8,
marginLeft: 8, }}
}} />
/>
</Fragment>
<div>2016-12-12 12:32</div> <div>2016-12-12 12:32</div>
</div> </div>
); );
const desc2 = ( const desc2 = (
<div className={styles.stepDescription}> <div className={styles.stepDescription}>
<Fragment>
<DingdingOutlined
<DingdingOutlined style={{
style={{ color: '#00A0E9',
color: '#00A0E9', marginLeft: 8,
marginLeft: 8, }}
}} />
/>
</Fragment>
<div> <div>
<a href=""></a> <a href=""></a>
</div> </div>

Loading…
Cancel
Save