Skip to content

Commit

Permalink
feat(icons): upgrade @gio-design-icons to v23 (#1994)
Browse files Browse the repository at this point in the history
* feat(icons): upgrade @gio-design-icons to v23

* feat(panel): remove panel component

* docs(list-pro): change list-pro document dir
  • Loading branch information
gavin-hao committed Apr 27, 2022
1 parent 496856f commit 98103fd
Show file tree
Hide file tree
Showing 74 changed files with 409 additions and 1,025 deletions.
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit $1
npx --no-install commitlint --edit "$1"
4 changes: 4 additions & 0 deletions .husky/prepare-commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

exec < /dev/tty && ./node_modules/.bin/cz --hook || true
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"watch": "gio-rewire lib compile --watch"
},
"peerDependencies": {
"@gio-design/icons": ">=23.0.0",
"@gio-design/icons": ">=23.2.0",
"@gio-design/tokens": ">=22.0.0-alpha.0",
"@gio-design/utils": ">=23.0.0",
"react": ">=16.8.0",
Expand Down Expand Up @@ -86,7 +86,7 @@
"@commitlint/config-conventional": "^16.0.0",
"@formatjs/cli": "^4.2.31",
"@formatjs/ts-transformer": "^3.4.8",
"@gio-design/icons": "^22.0.0",
"@gio-design/icons": "^23.2.0",
"@gio-design/tokens": "22.0.0-alpha.0",
"@gio-design/utils": "^23.0.0",
"@semantic-release/changelog": "^6.0.1",
Expand Down Expand Up @@ -178,4 +178,4 @@
"path": "./node_modules/cz-conventional-changelog"
}
}
}
}
18 changes: 9 additions & 9 deletions src/alert/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import classnames from 'classnames';
import { usePrefixCls } from '@gio-design/utils';
import _ from 'lodash';
import {
CheckCircleFilled,
WarningCircleFilled,
InfoCircleFilled,
CloseCircleFilled,
SuccessFilled,
WarningFilled,
InfoFilled,
ErrorFilled,
CloseOutlined,
} from '@gio-design/icons';
import Button from '../button';
Expand All @@ -24,15 +24,15 @@ export const Alert = React.forwardRef<HTMLDivElement, AlertProps>(
if (icon) return icon;
switch (type) {
case 'success':
return <CheckCircleFilled />;
return <SuccessFilled />;
case 'warning':
return <WarningCircleFilled />;
return <WarningFilled />;
case 'error':
return <CloseCircleFilled />;
return <ErrorFilled />;
case 'info':
return <InfoCircleFilled />;
return <InfoFilled />;
default:
return <InfoCircleFilled />;
return <InfoFilled />;
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/alert/demos/Alert.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
import React from 'react';
import { Meta } from '@storybook/react/types-6-0';
import { CheckCircleOutlined, CheckOutlined } from '@gio-design/icons';
import { SuccessOutlined, CheckOutlined } from '@gio-design/icons';
import Docs from './AlertPage';
import Alert from '../index';
import '../style';
Expand Down Expand Up @@ -69,7 +69,7 @@ export const Icons = () => (
description="This is a success alert"
type="success"
showIcon
icon={<CheckCircleOutlined />}
icon={<SuccessOutlined />}
/>
</>
);
Expand Down
8 changes: 4 additions & 4 deletions src/avatar/demos/Avatar.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Meta, Story } from '@storybook/react/types-6-0';
import { AppOutlined, EditOutlined, SettingOutlined, UserOutlined } from '@gio-design/icons';
import { CardOutlined, EditOutlined, GearOutlined, UserOutlined } from '@gio-design/icons';
import Docs from './AvatarPage';
import Avatar, { AvatarProps } from '../index';
import '../style';
Expand Down Expand Up @@ -91,16 +91,16 @@ export const Sizes = () => (

export const IconAvatars = () => (
<>
<Avatar icon={<SettingOutlined />} />
<Avatar icon={<AppOutlined />} backgroundColor="pink" />
<Avatar icon={<GearOutlined />} />
<Avatar icon={<CardOutlined />} backgroundColor="pink" />
<Avatar icon={<EditOutlined />} backgroundColor="palegoldenrod" />
</>
);

export const Modes = () => (
<>
<Avatar icon={<UserOutlined />} size="large" mode="square" />
<Avatar icon={<AppOutlined />} size="large" mode="square" />
<Avatar icon={<CardOutlined />} size="large" mode="square" />
<Avatar icon={<EditOutlined />} size="large" mode="square" />
</>
);
Expand Down
4 changes: 2 additions & 2 deletions src/breadcrumbs/demos/Breadcrumbs.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Story, Meta } from '@storybook/react/types-6-0';
import { HomeOutlined, RightOutlined } from '@gio-design/icons';
import { HomeOutlined, ArrowRightOutlined } from '@gio-design/icons';
import Breadcrumbs, { BreadcrumbsProps } from '..';
import Link from '../../link';
import '../style';
Expand Down Expand Up @@ -39,7 +39,7 @@ export const Separator = () => (
<span>Current</span>
</Breadcrumbs>
<br />
<Breadcrumbs separator={<RightOutlined size="14px" />}>
<Breadcrumbs separator={<ArrowRightOutlined size="14px" />}>
<Link href="/?path=/story/upgraded-breadcrumbs--default">Home</Link>
<Link href="/?path=/story/upgraded-breadcrumbs--default">Second</Link>
<span>Current</span>
Expand Down
2 changes: 1 addition & 1 deletion src/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const Button = WithRef<HTMLButtonElement, ButtonProps>((props, ref) => {
} = props;

const prefixCls = usePrefixCls('button');
const classes = classNames([className, prefixCls], {
const classes = classNames([prefixCls, className], {
[`${prefixCls}_${type}`]: type,
[`${prefixCls}_${size}`]: size,
[`${prefixCls}_loading`]: loading,
Expand Down
1 change: 0 additions & 1 deletion src/button/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
user-select: none;
.text-body1();
.border(2, transparent);

&_primary {
color: @gray-0;
background-color: @blue-2;
Expand Down
22 changes: 11 additions & 11 deletions src/card/demo/Card.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useMemo, useState } from 'react';
import { CloseOutlined, MoreOutlined, PlusCircleFilled, UserOutlined } from '@gio-design/icons';
import { CloseOutlined, MoreVerticalOutlined, PlusCircleFilled, UserOutlined } from '@gio-design/icons';
import { Story, Meta } from '@storybook/react/types-6-0';
import Docs from './CardPage';
import { CardProps } from '../interfaces';
Expand Down Expand Up @@ -41,7 +41,7 @@ Default.args = {
description="卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -65,7 +65,7 @@ export const BoxShadow = () => (
description="卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand Down Expand Up @@ -93,7 +93,7 @@ export const WithoutContent = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -111,7 +111,7 @@ export const Disabled = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text" onClick={() => alert('action click')}>
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -128,7 +128,7 @@ export const GridCard = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -154,7 +154,7 @@ export const GridCard = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -181,7 +181,7 @@ export const GridCard = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -203,7 +203,7 @@ export const FullWidthContent = () => (
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand All @@ -229,7 +229,7 @@ export const Clickable = () => {
description="卡片副标题"
action={
<Button.IconButton size="small" type="text">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
}
/>
Expand Down Expand Up @@ -325,7 +325,7 @@ export const ComplexCard = () => {
}
>
<Button.IconButton size="small" type="secondary">
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
</Dropdown>
</>
Expand Down
6 changes: 3 additions & 3 deletions src/collapse/demos/Collapse.Panel.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from 'react';
import { Story, Meta } from '@storybook/react/types-6-0';
import { action } from '@storybook/addon-actions';
import { MoreOutlined, EditOutlined, RightOutlined } from '@gio-design/icons';
import { MoreVerticalOutlined, EditOutlined, ArrowRightOutlined } from '@gio-design/icons';
import Docs from './CollapsePanel';
import Collapse, { CollapsePanel } from '../index';
import Button from '../../button';
Expand Down Expand Up @@ -32,7 +32,7 @@ const Template: Story = () => (
</Collapse.Panel>
<Collapse.Panel header="折叠面板标题" key="2">
<p>{text}</p>
<Collapse expandIcon={() => <RightOutlined size="14px" />} bordered={false} onChange={callback}>
<Collapse expandIcon={() => <ArrowRightOutlined size="14px" />} bordered={false} onChange={callback}>
<Collapse.Panel header="折叠面板标题" key="1">
<p>{text}</p>
<p>{text}</p>
Expand Down Expand Up @@ -82,7 +82,7 @@ export const Extra = () => {
}}
type="text"
>
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
</>
);
Expand Down
8 changes: 4 additions & 4 deletions src/collapse/demos/Collapse.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from 'react';
import { Story, Meta } from '@storybook/react/types-6-0';
import { action } from '@storybook/addon-actions';
import { MoreOutlined, EditOutlined, RightOutlined } from '@gio-design/icons';
import { MoreVerticalOutlined, EditOutlined, ArrowRightOutlined } from '@gio-design/icons';
import Docs from './CollapsePage';
import Collapse from '../index';
import Button from '../../button';
Expand Down Expand Up @@ -40,7 +40,7 @@ const Template: Story = () => (
</Collapse.Panel>
<Collapse.Panel header="折叠面板标题" key="2">
<div>{text}</div>
<Collapse expandIcon={() => <RightOutlined size="14px" />} bordered={false} onChange={callback}>
<Collapse expandIcon={() => <ArrowRightOutlined size="14px" />} bordered={false} onChange={callback}>
<Collapse.Panel header="折叠面板标题" key="1">
<div>{text}</div>
<div>{text}</div>
Expand Down Expand Up @@ -98,12 +98,12 @@ export const Extra = () => {
}}
type="text"
>
<MoreOutlined />
<MoreVerticalOutlined />
</Button.IconButton>
</>
);
return (
<Collapse expandIcon={() => <RightOutlined size="14px" />}>
<Collapse expandIcon={() => <ArrowRightOutlined size="14px" />}>
<Collapse.Panel header="折叠面板标题" key="1" extra={genExtra()}>
<div>{text}</div>
<div>{text}</div>
Expand Down
16 changes: 13 additions & 3 deletions src/collapse/demos/CollapsePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,30 @@ export default function ListPage() {
<Canvas>
<Story id="upgraded-collapse--default" />
</Canvas>

<Subheading>{formatMessage({ defaultMessage: 'Icon替换' })}</Subheading>

<Subheading>{formatMessage({ defaultMessage: '额外节点' })}</Subheading>
<Description>
{formatMessage({
defaultMessage: '右侧附加额外的节点,可用于额外附加操作',
})}
</Description>
<Canvas>
<Story id="upgraded-collapse--extra" />
</Canvas>
<Subheading>{formatMessage({ defaultMessage: '手风琴效果' })}</Subheading>
<Description>
{formatMessage({
defaultMessage: '每次只打开一个 tab',
})}
</Description>
<Canvas>
<Story id="upgraded-collapse--accordion" />
</Canvas>
<Subheading>{formatMessage({ defaultMessage: '无边框' })}</Subheading>
<Canvas>
<Story id="upgraded-collapse--bordered" />
</Canvas>
<Subheading>{formatMessage({ defaultMessage: '二级菜单使用' })}</Subheading>
<Subheading>{formatMessage({ defaultMessage: '嵌套面板' })}</Subheading>
<Canvas>
<Story id="upgraded-collapse--secondmenu" />
</Canvas>
Expand Down

1 comment on commit 98103fd

@vercel
Copy link

@vercel vercel bot commented on 98103fd Apr 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

gio-design – ./

gio-design-git-master-growingio.vercel.app
gio-design.vercel.app
gio-design-growingio.vercel.app

Please sign in to comment.