diff --git a/components/icon/__tests__/index.test.js b/components/icon/__tests__/index.test.js
index 22fd760f8567..5a2469de2a09 100644
--- a/components/icon/__tests__/index.test.js
+++ b/components/icon/__tests__/index.test.js
@@ -241,7 +241,11 @@ describe('utils', () => {
expect(errorSpy).toHaveBeenLastCalledWith(
"Warning: [antd: Icon] Icon 'canlendar' is typo and depracated, please use 'calendar' instead.",
);
- expect(errorSpy).toHaveBeenCalledTimes(3);
+ render();
+ expect(errorSpy).toHaveBeenLastCalledWith(
+ "Warning: [antd: Icon] Icon 'colum-height' is typo and depracated, please use 'column-height' instead.",
+ );
+ expect(errorSpy).toHaveBeenCalledTimes(4);
errorSpy.mockRestore();
});
});
diff --git a/components/icon/utils.ts b/components/icon/utils.ts
index 92e0b9a5511d..9717a1719954 100644
--- a/components/icon/utils.ts
+++ b/components/icon/utils.ts
@@ -63,6 +63,10 @@ export function alias(type: string) {
case 'canlendar':
newType = 'calendar';
break;
+ // https://github.com/ant-design/ant-design/issues/17448
+ case 'colum-height':
+ newType = 'column-height';
+ break;
default:
}
warning(
diff --git a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
index 915641571409..ee53a488289d 100644
--- a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
+++ b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap
@@ -1,5 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`Popconfirm should show overlay when trigger is clicked 1`] = `"
"`;
+exports[`Popconfirm should show overlay when trigger is clicked 1`] = `""`;
-exports[`Popconfirm should show overlay when trigger is clicked 2`] = `""`;
+exports[`Popconfirm should show overlay when trigger is clicked 2`] = `""`;
diff --git a/package.json b/package.json
index b56d46279919..e74c266935f4 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
},
"dependencies": {
"@ant-design/create-react-context": "^0.2.4",
- "@ant-design/icons": "~2.1.0",
+ "@ant-design/icons": "~2.1.1",
"@ant-design/icons-react": "~2.0.1",
"@types/react-slick": "^0.23.4",
"array-tree-filter": "^2.1.0",
diff --git a/site/theme/template/IconDisplay/fields.ts b/site/theme/template/IconDisplay/fields.ts
index 9a2391efdd25..06024ac24f52 100644
--- a/site/theme/template/IconDisplay/fields.ts
+++ b/site/theme/template/IconDisplay/fields.ts
@@ -6,7 +6,9 @@ Object.keys(manifest).forEach(theme => {
});
// Hide typo-name icons
-allIcons = allIcons.filter((name: string) => !['interation', 'canlendar'].includes(name));
+allIcons = allIcons.filter(
+ (name: string) => !['interation', 'canlendar', 'colum-height'].includes(name),
+);
export const categories = {
all: [...new Set(allIcons)],
@@ -125,8 +127,6 @@ export const categories = {
'font-colors',
'font-size',
'line-height',
- 'colum-height',
- 'colum-width',
'dash',
'small-dash',
'sort-ascending',
@@ -136,6 +136,7 @@ export const categories = {
'unordered-list',
'radius-setting',
'column-width',
+ 'column-height',
],
data: [
'area-chart',