Merge remote-tracking branch 'origin/feature' into next

.github/workflows/test.yml

@@ -138,7 +138,7 @@ jobs:
           key: dist-${{ github.sha }}
 
       - name: dist
-        run: npm run dist
+        run: CI=1 npm run dist
         env:
           NODE_OPTIONS: --max_old_space_size=4096
     needs: setup
@@ -233,6 +233,7 @@ jobs:
       matrix:
         react: ['16', '17', '18']
         module: ['dom', 'node', 'dist']
+        shard: ['1/4', '2/4', '3/4', '4/4']
     env:
       REACT: ${{ matrix.react }}
     runs-on: ubuntu-latest
@@ -285,12 +286,11 @@ jobs:
       # dom test
       - name: dom test
         if: ${{ matrix.module == 'dom' }}
-        run: npm test -- -w 1 --coverage
+        run: npm test -- --maxWorkers=2 --shard=${{matrix.shard}} --coverage
 
-      # > 17 only
       - name: coverage
+        uses: codecov/codecov-action@v3
         if: ${{ matrix.module == 'dom' && matrix.react == '17' }}
-        run: bash <(curl -s https://codecov.io/bash)
 
       # node test
       - name: node test
@@ -350,6 +350,7 @@ jobs:
       matrix:
         react: ['16', '17', '18']
         module: [lib, es]
+        shard: ['1/4', '2/4', '3/4', '4/4']
     env:
       REACT: ${{ matrix.react }}
     steps:
@@ -397,7 +398,7 @@ jobs:
       - name: test
         # lib only run in master branch not in pull request
         if: ${{ github.event_name != 'pull_request' || matrix.module != 'lib' }}
-        run: npm test
+        run: npm test -- --maxWorkers=2 --shard=${{matrix.shard}}
         env:
           LIB_DIR: ${{ matrix.module }}
     needs: compile

components/collapse/Collapse.tsx

@@ -90,14 +90,9 @@ const Collapse: CollapseInterface = props => {
       )
     ) as React.ReactNode;
 
-    return (
+    return cloneElement(icon, () => ({
-      // Create additional div here to make arrow align to center of first line
+      className: classNames((icon as any).props.className, `${prefixCls}-arrow`),
-      <div>
+    }));
-        {cloneElement(icon, () => ({
-          className: classNames((icon as any).props.className, `${prefixCls}-arrow`),
-        }))}
-      </div>
-    );
   };
 
   const collapseClassName = classNames(

components/collapse/__tests__/__snapshots__/demo-extend.test.ts.snap

@@ -14,7 +14,9 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -35,7 +37,11 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
   </div>
   <div
@@ -47,7 +53,9 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -68,7 +76,11 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -80,7 +92,9 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -101,7 +115,11 @@ exports[`renders ./components/collapse/demo/accordion.md extend context correctl
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -120,7 +138,9 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -142,7 +162,11 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -169,7 +193,9 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -190,7 +216,11 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -202,7 +232,9 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -223,7 +255,11 @@ exports[`renders ./components/collapse/demo/basic.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -242,7 +278,9 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -264,7 +302,11 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -289,7 +331,9 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -310,7 +354,11 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -322,7 +370,9 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -343,7 +393,11 @@ exports[`renders ./components/collapse/demo/borderless.md extend context correct
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -366,10 +420,10 @@ exports[`renders ./components/collapse/demo/collapsible.md extend context correc
         <div
           aria-expanded="true"
           class="ant-collapse-header ant-collapse-header-collapsible-only"
-          role="button"
-          tabindex="0"
         >
-          <div>
+          <div
+            class="ant-collapse-expand-icon"
+          >
             <span
               aria-label="right"
               class="anticon anticon-right ant-collapse-arrow"
@@ -430,7 +484,9 @@ exports[`renders ./components/collapse/demo/collapsible.md extend context correc
           role="button"
           tabindex="-1"
         >
-          <div>
+          <div
+            class="ant-collapse-expand-icon"
+          >
             <span
               aria-label="right"
               class="anticon anticon-right ant-collapse-arrow"
@@ -451,7 +507,11 @@ exports[`renders ./components/collapse/demo/collapsible.md extend context correc
               </svg>
             </span>
           </div>
-          This panel can't be collapsed
+          <span
+            class="ant-collapse-header-text"
+          >
+            This panel can't be collapsed
+          </span>
         </div>
       </div>
     </div>
@@ -472,7 +532,9 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -494,7 +556,11 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -521,7 +587,9 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -542,7 +610,11 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -554,7 +626,9 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -575,7 +649,11 @@ exports[`renders ./components/collapse/demo/custom.md extend context correctly 1
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -595,7 +673,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -617,7 +697,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 1
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 1
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -668,7 +752,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -689,7 +775,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 2
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 2
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -725,7 +815,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -746,7 +838,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 3
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 3
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -936,7 +1032,9 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -958,7 +1056,11 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -985,7 +1087,9 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1006,7 +1110,11 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -1018,7 +1126,9 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1039,7 +1149,11 @@ exports[`renders ./components/collapse/demo/ghost.md extend context correctly 1`
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -1058,7 +1172,9 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1079,7 +1195,11 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
   </div>
   <div
@@ -1091,7 +1211,9 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1112,7 +1234,11 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -1124,7 +1250,9 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1145,7 +1273,11 @@ exports[`renders ./components/collapse/demo/mix.md extend context correctly 1`]
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -1164,7 +1296,9 @@ exports[`renders ./components/collapse/demo/noarrow.md extend context correctly
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1186,7 +1320,11 @@ exports[`renders ./components/collapse/demo/noarrow.md extend context correctly
           </svg>
         </span>
       </div>
-      This is panel header with arrow icon
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header with arrow icon
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -1213,7 +1351,11 @@ exports[`renders ./components/collapse/demo/noarrow.md extend context correctly
       role="button"
       tabindex="0"
     >
-      This is panel header with no arrow icon
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header with no arrow icon
+      </span>
     </div>
   </div>
 </div>

components/collapse/__tests__/__snapshots__/demo.test.js.snap

@@ -14,7 +14,9 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -35,7 +37,11 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
   </div>
   <div
@@ -47,7 +53,9 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -68,7 +76,11 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -80,7 +92,9 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
       role="tab"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -101,7 +115,11 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -120,7 +138,9 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -142,7 +162,11 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -169,7 +193,9 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -190,7 +216,11 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -202,7 +232,9 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -223,7 +255,11 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -242,7 +278,9 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -264,7 +302,11 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -289,7 +331,9 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -310,7 +354,11 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -322,7 +370,9 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -343,7 +393,11 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -366,10 +420,10 @@ exports[`renders ./components/collapse/demo/collapsible.md correctly 1`] = `
         <div
           aria-expanded="true"
           class="ant-collapse-header ant-collapse-header-collapsible-only"
-          role="button"
-          tabindex="0"
         >
-          <div>
+          <div
+            class="ant-collapse-expand-icon"
+          >
             <span
               aria-label="right"
               class="anticon anticon-right ant-collapse-arrow"
@@ -430,7 +484,9 @@ exports[`renders ./components/collapse/demo/collapsible.md correctly 1`] = `
           role="button"
           tabindex="-1"
         >
-          <div>
+          <div
+            class="ant-collapse-expand-icon"
+          >
             <span
               aria-label="right"
               class="anticon anticon-right ant-collapse-arrow"
@@ -451,7 +507,11 @@ exports[`renders ./components/collapse/demo/collapsible.md correctly 1`] = `
               </svg>
             </span>
           </div>
-          This panel can't be collapsed
+          <span
+            class="ant-collapse-header-text"
+          >
+            This panel can't be collapsed
+          </span>
         </div>
       </div>
     </div>
@@ -472,7 +532,9 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -494,7 +556,11 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -521,7 +587,9 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -542,7 +610,11 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -554,7 +626,9 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="caret-right"
           class="anticon anticon-caret-right ant-collapse-arrow"
@@ -575,7 +649,11 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -595,7 +673,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -617,7 +697,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 1
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 1
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -668,7 +752,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -689,7 +775,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 2
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 2
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -725,7 +815,9 @@ Array [
         role="button"
         tabindex="0"
       >
-        <div>
+        <div
+          class="ant-collapse-expand-icon"
+        >
           <span
             aria-label="right"
             class="anticon anticon-right ant-collapse-arrow"
@@ -746,7 +838,11 @@ Array [
             </svg>
           </span>
         </div>
-        This is panel header 3
+        <span
+          class="ant-collapse-header-text"
+        >
+          This is panel header 3
+        </span>
         <div
           class="ant-collapse-extra"
         >
@@ -854,7 +950,9 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -876,7 +974,11 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -903,7 +1005,9 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -924,7 +1028,11 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -936,7 +1044,9 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -957,7 +1067,11 @@ exports[`renders ./components/collapse/demo/ghost.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -976,7 +1090,9 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -997,7 +1113,11 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
   </div>
   <div
@@ -1009,7 +1129,9 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1030,7 +1152,11 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 2
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 2
+      </span>
     </div>
   </div>
   <div
@@ -1042,7 +1168,9 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1063,7 +1191,11 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 3
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 3
+      </span>
     </div>
   </div>
 </div>
@@ -1082,7 +1214,9 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -1104,7 +1238,11 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header with arrow icon
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header with arrow icon
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -1131,7 +1269,11 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
       role="button"
       tabindex="0"
     >
-      This is panel header with no arrow icon
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header with no arrow icon
+      </span>
     </div>
   </div>
 </div>

components/collapse/__tests__/__snapshots__/index.test.js.snap

@@ -13,7 +13,9 @@ exports[`Collapse could override default openMotion 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -35,7 +37,11 @@ exports[`Collapse could override default openMotion 1`] = `
           </svg>
         </span>
       </div>
-      This is panel header 1
+      <span
+        class="ant-collapse-header-text"
+      >
+        This is panel header 1
+      </span>
     </div>
     <div
       class="ant-collapse-content ant-collapse-content-active"
@@ -63,7 +69,9 @@ exports[`Collapse should render extra node of panel 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -84,7 +92,11 @@ exports[`Collapse should render extra node of panel 1`] = `
           </svg>
         </span>
       </div>
-      header
+      <span
+        class="ant-collapse-header-text"
+      >
+        header
+      </span>
       <div
         class="ant-collapse-extra"
       >
@@ -105,7 +117,9 @@ exports[`Collapse should render extra node of panel 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -126,7 +140,11 @@ exports[`Collapse should render extra node of panel 1`] = `
           </svg>
         </span>
       </div>
-      header
+      <span
+        class="ant-collapse-header-text"
+      >
+        header
+      </span>
       <div
         class="ant-collapse-extra"
       >
@@ -154,8 +172,11 @@ exports[`Collapse should support remove expandIcon 1`] = `
       role="button"
       tabindex="0"
     >
-      <div />
+      <span
-      header
+        class="ant-collapse-header-text"
+      >
+        header
+      </span>
     </div>
   </div>
 </div>

components/collapse/__tests__/index.test.js

@@ -98,8 +98,6 @@ describe('Collapse', () => {
       'Warning: [antd: Collapse.Panel] `disabled` is deprecated. Please use `collapsible="disabled"` instead.',
     );
 
-    expect(wrapper.find('.ant-collapse-header-text').exists()).toBeFalsy();
-
     expect(wrapper.find('.ant-collapse-item-disabled').length).toBe(1);
 
     wrapper.find('.ant-collapse-header').simulate('click');

components/config-provider/__tests__/__snapshots__/components.test.js.snap

@@ -12231,7 +12231,9 @@ exports[`ConfigProvider components Collapse configProvider 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="config-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right config-collapse-arrow"
@@ -12252,7 +12254,11 @@ exports[`ConfigProvider components Collapse configProvider 1`] = `
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="config-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12271,7 +12277,9 @@ exports[`ConfigProvider components Collapse configProvider componentDisabled 1`]
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="config-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right config-collapse-arrow"
@@ -12292,7 +12300,11 @@ exports[`ConfigProvider components Collapse configProvider componentDisabled 1`]
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="config-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12311,7 +12323,9 @@ exports[`ConfigProvider components Collapse configProvider componentSize large 1
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="config-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right config-collapse-arrow"
@@ -12332,7 +12346,11 @@ exports[`ConfigProvider components Collapse configProvider componentSize large 1
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="config-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12351,7 +12369,9 @@ exports[`ConfigProvider components Collapse configProvider componentSize middle
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="config-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right config-collapse-arrow"
@@ -12372,7 +12392,11 @@ exports[`ConfigProvider components Collapse configProvider componentSize middle
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="config-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12391,7 +12415,9 @@ exports[`ConfigProvider components Collapse configProvider virtual and dropdownM
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -12412,7 +12438,11 @@ exports[`ConfigProvider components Collapse configProvider virtual and dropdownM
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="ant-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12431,7 +12461,9 @@ exports[`ConfigProvider components Collapse normal 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="ant-collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right ant-collapse-arrow"
@@ -12452,7 +12484,11 @@ exports[`ConfigProvider components Collapse normal 1`] = `
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="ant-collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>
@@ -12471,7 +12507,9 @@ exports[`ConfigProvider components Collapse prefixCls 1`] = `
       role="button"
       tabindex="0"
     >
-      <div>
+      <div
+        class="prefix-Collapse-expand-icon"
+      >
         <span
           aria-label="right"
           class="anticon anticon-right prefix-Collapse-arrow"
@@ -12492,7 +12530,11 @@ exports[`ConfigProvider components Collapse prefixCls 1`] = `
           </svg>
         </span>
       </div>
-      Bamboo
+      <span
+        class="prefix-Collapse-header-text"
+      >
+        Bamboo
+      </span>
     </div>
   </div>
 </div>

package.json

@@ -127,7 +127,7 @@
     "memoize-one": "^6.0.0",
     "rc-cascader": "~3.5.0",
     "rc-checkbox": "~2.3.0",
-    "rc-collapse": "~3.1.0",
+    "rc-collapse": "~3.3.0",
     "rc-dialog": "~8.8.1",
     "rc-drawer": "~4.4.2",
     "rc-dropdown": "~3.6.0",
@@ -164,6 +164,7 @@
   "devDependencies": {
     "@ant-design/bisheng-plugin": "^3.2.0",
     "@ant-design/hitu": "^0.0.0-alpha.13",
+    "@ant-design/jest-image-snapshot": "^4.5.2",
     "@ant-design/tools": "^15.0.2",
     "@docsearch/css": "^3.0.0",
     "@qixian.cs/github-contributors-list": "^1.0.3",
@@ -243,7 +244,6 @@
     "jest-axe": "^6.0.0",
     "jest-environment-jsdom": "^28.0.2",
     "jest-environment-node": "^28.0.2",
-    "@ant-design/jest-image-snapshot": "^4.5.2",
     "jest-puppeteer": "^6.0.0",
     "jquery": "^3.4.1",
     "jsdom": "^19.0.0",

webpack.config.js

@@ -116,13 +116,15 @@ if (process.env.RUN_ENV === 'PRODUCTION') {
       });
     }
 
-    config.plugins.push(
+    if (!process.env.CI) {
-      new BundleAnalyzerPlugin({
+      config.plugins.push(
-        analyzerMode: 'static',
+        new BundleAnalyzerPlugin({
-        openAnalyzer: false,
+          analyzerMode: 'static',
-        reportFilename: '../report.html',
+          openAnalyzer: false,
-      }),
+          reportFilename: '../report.html',
-    );
+        }),
+      );
+    }
 
     if (!process.env.NO_DUP_CHECK) {
       config.plugins.push(