fix: Not break if tabBarExtraContent is empty object (#411)

react-component · Jul 29, 2021 · 48afe60 · 48afe60 · vercel · Jul 29, 2021
1 parent 0e9f8ab
commit 48afe60
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/TabNavList/index.tsx b/src/TabNavList/index.tsx
@@ -59,14 +59,20 @@ const ExtraContent = ({ position, prefixCls, extra }: ExtraContentProps) => {
 
   let content: React.ReactNode;
 
-  const assertExtra = extra as TabBarExtraMap;
+  // Parse extra
+  let assertExtra: TabBarExtraMap = {};
+  if (extra && typeof extra === 'object' && !React.isValidElement(extra)) {
+    assertExtra = extra as TabBarExtraMap;
+  } else {
+    assertExtra.right = extra;
+  }
 
   if (position === 'right') {
-    content = assertExtra.right || (!assertExtra.left && assertExtra) || null;
+    content = assertExtra.right;
   }
 
   if (position === 'left') {
-    content = assertExtra.left || null;
+    content = assertExtra.left;
   }
 
   return content ? <div className={`${prefixCls}-extra-content`}>{content}</div> : null;

diff --git a/tests/index.test.tsx b/tests/index.test.tsx
@@ -240,7 +240,7 @@ describe('Tabs.Basic', () => {
     expect(wrapper.find('.rc-tabs-extra-content').text()).toEqual('Bamboo');
   });
 
-  it('extra positon', () => {
+  it('extra position', () => {
     const wrapper = mount(
       getTabs({ tabBarExtraContent: { left: 'Left Bamboo', right: 'Right Bamboo' } }),
     );
@@ -249,6 +249,10 @@ describe('Tabs.Basic', () => {
     expect(wrapper.find('.rc-tabs-extra-content').at(1).text()).toEqual('Right Bamboo');
   });
 
+  it('no break of empty object', () => {
+    mount(getTabs({ tabBarExtraContent: {} }));
+  });
+
   describe('animated', () => {
     it('false', () => {
       const wrapper = mount(getTabs({ animated: false }));