From 00d42df57476399b0aa187bdc308bc96605ab7bd Mon Sep 17 00:00:00 2001 From: FunkyZc Date: Sun, 23 May 2021 02:45:59 -0500 Subject: [PATCH] feat(GridItem): add icon-color prop (#8753) --- src/grid-item/GridItem.tsx | 2 ++ src/grid/README.md | 1 + src/grid/README.zh-CN.md | 1 + src/grid/test/index.spec.js | 13 +++++++++++++ 4 files changed, 17 insertions(+) diff --git a/src/grid-item/GridItem.tsx b/src/grid-item/GridItem.tsx index 6a62d0d3a..fa8ed3d86 100644 --- a/src/grid-item/GridItem.tsx +++ b/src/grid-item/GridItem.tsx @@ -24,6 +24,7 @@ export default defineComponent({ icon: String, badge: [Number, String], iconPrefix: String, + iconColor: String, }), setup(props, { slots }) { @@ -89,6 +90,7 @@ export default defineComponent({ badge={props.badge} class={bem('icon')} classPrefix={props.iconPrefix} + color={props.iconColor} /> ); } diff --git a/src/grid/README.md b/src/grid/README.md index e83ba6344..5d37a16b5 100644 --- a/src/grid/README.md +++ b/src/grid/README.md @@ -120,6 +120,7 @@ app.use(GridItem); | text | Text | _string_ | - | | icon | Icon name or URL | _string_ | - | | icon-prefix | Icon className prefix | _string_ | `van-icon` | +| icon-color | Icon color | _string_ | - | | dot | Whether to show red dot | _boolean_ | `false` | | badge | Content of the badge | _number \| string_ | - | | url | Link URL | _string_ | - | diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md index 892819036..aba70bd26 100644 --- a/src/grid/README.zh-CN.md +++ b/src/grid/README.zh-CN.md @@ -136,6 +136,7 @@ app.use(GridItem); | text | 文字 | _string_ | - | | icon | [图标名称](#/zh-CN/icon)或图片链接 | _string_ | - | | icon-prefix | 图标类名前缀,同 Icon 组件的 [class-prefix 属性](#/zh-CN/icon#props) | _string_ | `van-icon` | +| icon-color | 图标颜色,同 Icon 组件的 [color 属性](#/zh-CN/icon#props) | _string_ | - | | dot | 是否显示图标右上角小红点 | _boolean_ | `false` | | badge | 图标右上角徽标的内容 | _number \| string_ | - | | url | 点击后跳转的链接地址 | _string_ | - | diff --git a/src/grid/test/index.spec.js b/src/grid/test/index.spec.js index d73e21f9d..c477cbd7f 100644 --- a/src/grid/test/index.spec.js +++ b/src/grid/test/index.spec.js @@ -32,6 +32,19 @@ test('should change icon size when using icon-size prop', () => { expect(wrapper.find('.van-grid-item__icon').style.fontSize).toEqual('10px'); }); +test('should change icon color when using icon-color prop', () => { + const wrapper = mount({ + render() { + return ( + + + + ); + }, + }); + expect(wrapper.find('.van-grid-item__icon').style.color).toEqual('red'); +}); + test('should render icon-slot correctly', () => { const wrapper = mount({ render() {