🐛 Fix filterIcon Tooltip title is not working

close #20049
ant-design · Dec 3, 2019 · c49b9c3 · c49b9c3
1 parent 92b4589
commit c49b9c3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/components/table/__tests__/Table.filter.test.js b/components/table/__tests__/Table.filter.test.js
@@ -671,6 +671,25 @@ describe('Table.filter', () => {
     expect(wrapper.render()).toMatchSnapshot();
   });
 
+  it('renders custom filter icon with right Tooltip title', () => {
+    const filterIcon = () => (
+      <Tooltip title="title" visible>
+        Tooltip
+      </Tooltip>
+    );
+    const wrapper = mount(
+      createTable({
+        columns: [
+          {
+            ...column,
+            filterIcon,
+          },
+        ],
+      }),
+    );
+    expect(wrapper.render()).toMatchSnapshot();
+  });
+
   // https://github.com/ant-design/ant-design/issues/13028
   it('reset dropdown filter correctly', () => {
     class Demo extends React.Component {

diff --git a/components/table/filterDropdown.tsx b/components/table/filterDropdown.tsx
@@ -224,7 +224,7 @@ class FilterMenu<T> extends React.Component<FilterMenuProps<T>, FilterMenuState<
 
     if (React.isValidElement(filterIcon)) {
       return React.cloneElement(filterIcon, {
-        title: locale.filterTitle,
+        title: filterIcon.props.title || locale.filterTitle,
         className: classNames(`${prefixCls}-icon`, dropdownIconClass, filterIcon.props.className),
         onClick: stopPropagation,
       });