fix(Badge): update cached isDotRef when isHidden

ant-design · Apr 11, 2021 · c708f2a · c708f2a
1 parent aa9fac4
commit c708f2a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/components/badge/__tests__/index.test.js b/components/badge/__tests__/index.test.js
@@ -155,6 +155,19 @@ describe('Badge', () => {
 
     expect(wrapper.find('.ant-badge')).toHaveLength(2);
   });
+
+  it('Badge should work when status changes', () => {
+    const wrapper = mount(
+      <Badge status="warning">
+        <button type="button">Click me</button>
+      </Badge>,
+    );
+    wrapper.setProps({ status: undefined });
+
+    expect(wrapper.find('.ant-badge-count')).toHaveLength(0);
+    expect(wrapper.find('.ant-badge-dot')).toHaveLength(0);
+    expect(wrapper.find('.ant-badge-count-sm')).toHaveLength(0);
+  });
 });
 
 describe('Ribbon', () => {

diff --git a/components/badge/index.tsx b/components/badge/index.tsx
@@ -94,6 +94,8 @@ const Badge: CompoundedComponent = ({
   const isDotRef = useRef(showAsDot);
   if (!isHidden) {
     isDotRef.current = showAsDot;
+  } else {
+    isDotRef.current = false;
   }
 
   // =============================== Styles ===============================
@@ -186,8 +188,8 @@ const Badge: CompoundedComponent = ({
 
           const scrollNumberCls = classNames({
             [`${prefixCls}-dot`]: isDot,
-            [`${prefixCls}-count`]: !isDot,
-            [`${prefixCls}-count-sm`]: size === 'small',
+            [`${prefixCls}-count`]: !isDot && !isHidden,
+            [`${prefixCls}-count-sm`]: !isDot && !isHidden && size === 'small',
             [`${prefixCls}-multiple-words`]:
               !isDot && displayCount && displayCount?.toString().length > 1,
             [`${prefixCls}-status-${status}`]: !!status,