From c0304cca55a9a5e0fb4b801836373b85fb72a1cf Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 30 Mar 2022 16:38:08 +0800
Subject: [PATCH] fix: Pagination should display middle size Select when
 ConfigProvider componentSize is large (#34756)

* fix: Pagination should display middle size Select
when ConfigProvider componentSize is large

close #34744

* fix snapshot
---
 .../__snapshots__/components.test.js.snap     |   2 +-
 components/pagination/MiniSelect.tsx          |  12 -
 components/pagination/Pagination.tsx          |   6 +-
 components/pagination/Select.tsx              |  16 +
 .../__snapshots__/index.test.js.snap          | 362 ++++++++++++++----
 components/pagination/__tests__/index.test.js |  32 +-
 6 files changed, 319 insertions(+), 111 deletions(-)
 delete mode 100644 components/pagination/MiniSelect.tsx
 create mode 100644 components/pagination/Select.tsx

diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
index ef087a578f..9c8f2f73c5 100644
--- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap
+++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
@@ -16633,7 +16633,7 @@ exports[`ConfigProvider components Pagination configProvider componentSize large
     >
       <div
         aria-label="Page Size"
-        class="config-select config-select-lg config-pagination-options-size-changer config-select-single config-select-show-arrow"
+        class="config-select config-pagination-options-size-changer config-select-single config-select-show-arrow"
       >
         <div
           class="config-select-selector"
diff --git a/components/pagination/MiniSelect.tsx b/components/pagination/MiniSelect.tsx
deleted file mode 100644
index a1f65ff2bc..0000000000
--- a/components/pagination/MiniSelect.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as React from 'react';
-import Select from '../select';
-
-interface MiniSelectInterface extends React.FC<any> {
-  Option: typeof Select.Option;
-}
-
-const MiniSelect: MiniSelectInterface = props => <Select size="small" {...props} />;
-
-MiniSelect.Option = Select.Option;
-
-export default MiniSelect;
diff --git a/components/pagination/Pagination.tsx b/components/pagination/Pagination.tsx
index 1974199922..ad5ec55de6 100644
--- a/components/pagination/Pagination.tsx
+++ b/components/pagination/Pagination.tsx
@@ -9,9 +9,7 @@ import LeftOutlined from '@ant-design/icons/LeftOutlined';
 import RightOutlined from '@ant-design/icons/RightOutlined';
 import DoubleLeftOutlined from '@ant-design/icons/DoubleLeftOutlined';
 import DoubleRightOutlined from '@ant-design/icons/DoubleRightOutlined';
-
-import MiniSelect from './MiniSelect';
-import Select from '../select';
+import { MiniSelect, MiddleSelect } from './Select';
 import LocaleReceiver from '../locale-provider/LocaleReceiver';
 import { ConfigContext } from '../config-provider';
 import useBreakpoint from '../grid/hooks/useBreakpoint';
@@ -109,7 +107,7 @@ const Pagination: React.FC<PaginationProps> = ({
         prefixCls={prefixCls}
         selectPrefixCls={selectPrefixCls}
         className={extendedClassName}
-        selectComponentClass={selectComponentClass || (isSmall ? MiniSelect : Select)}
+        selectComponentClass={selectComponentClass || (isSmall ? MiniSelect : MiddleSelect)}
         locale={locale}
       />
     );
diff --git a/components/pagination/Select.tsx b/components/pagination/Select.tsx
new file mode 100644
index 0000000000..05e7fe0643
--- /dev/null
+++ b/components/pagination/Select.tsx
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import Select from '../select';
+import type { SelectProps } from '../select';
+
+interface MiniOrMiddleSelectInterface extends React.FC<SelectProps> {
+  Option: typeof Select.Option;
+}
+
+const MiniSelect: MiniOrMiddleSelectInterface = props => <Select {...props} size="small" />;
+const MiddleSelect: MiniOrMiddleSelectInterface = props => <Select {...props} size="middle" />;
+
+MiniSelect.Option = Select.Option;
+MiddleSelect.Option = Select.Option;
+
+export { MiniSelect, MiddleSelect };
+
diff --git a/components/pagination/__tests__/__snapshots__/index.test.js.snap b/components/pagination/__tests__/__snapshots__/index.test.js.snap
index d151760d7b..030c6964d7 100644
--- a/components/pagination/__tests__/__snapshots__/index.test.js.snap
+++ b/components/pagination/__tests__/__snapshots__/index.test.js.snap
@@ -1,89 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Pagination rtl render component should be rendered correctly in RTL direction 1`] = `
-<ul
-  class="ant-pagination ant-pagination-rtl"
-  unselectable="unselectable"
->
-  <li
-    aria-disabled="true"
-    class="ant-pagination-prev ant-pagination-disabled"
-    title="Previous Page"
-  >
-    <button
-      class="ant-pagination-item-link"
-      disabled=""
-      tabindex="-1"
-      type="button"
-    >
-      <span
-        aria-label="right"
-        class="anticon anticon-right"
-        role="img"
-      >
-        <svg
-          aria-hidden="true"
-          data-icon="right"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
-          />
-        </svg>
-      </span>
-    </button>
-  </li>
-  <li
-    class="ant-pagination-item ant-pagination-item-1 ant-pagination-item-disabled"
-    tabindex="0"
-    title="1"
-  >
-    <a
-      rel="nofollow"
-    >
-      1
-    </a>
-  </li>
-  <li
-    aria-disabled="true"
-    class="ant-pagination-next ant-pagination-disabled"
-    title="Next Page"
-  >
-    <button
-      class="ant-pagination-item-link"
-      disabled=""
-      tabindex="-1"
-      type="button"
-    >
-      <span
-        aria-label="left"
-        class="anticon anticon-left"
-        role="img"
-      >
-        <svg
-          aria-hidden="true"
-          data-icon="left"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"
-          />
-        </svg>
-      </span>
-    </button>
-  </li>
-</ul>
-`;
-
-exports[`Pagination should be rendered correctly in RTL 1`] = `
+exports[`Pagination ConfigProvider should be rendered correctly in RTL 1`] = `
 <ul
   class="ant-pagination ant-pagination-rtl"
   unselectable="unselectable"
@@ -209,3 +126,280 @@ exports[`Pagination should be rendered correctly in RTL 1`] = `
   </li>
 </ul>
 `;
+
+exports[`Pagination ConfigProvider should be rendered correctly when componentSize is large 1`] = `
+<ul
+  class="ant-pagination"
+  unselectable="unselectable"
+>
+  <li
+    aria-disabled="true"
+    class="ant-pagination-prev ant-pagination-disabled"
+    title="Previous Page"
+  >
+    <button
+      class="ant-pagination-item-link"
+      disabled=""
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="left"
+        class="anticon anticon-left"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="left"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-1 ant-pagination-item-active"
+    tabindex="0"
+    title="1"
+  >
+    <a
+      rel="nofollow"
+    >
+      1
+    </a>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-2"
+    tabindex="0"
+    title="2"
+  >
+    <a
+      rel="nofollow"
+    >
+      2
+    </a>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-3"
+    tabindex="0"
+    title="3"
+  >
+    <a
+      rel="nofollow"
+    >
+      3
+    </a>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-4"
+    tabindex="0"
+    title="4"
+  >
+    <a
+      rel="nofollow"
+    >
+      4
+    </a>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-5"
+    tabindex="0"
+    title="5"
+  >
+    <a
+      rel="nofollow"
+    >
+      5
+    </a>
+  </li>
+  <li
+    aria-disabled="false"
+    class="ant-pagination-next"
+    tabindex="0"
+    title="Next Page"
+  >
+    <button
+      class="ant-pagination-item-link"
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="right"
+        class="anticon anticon-right"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="right"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
+  <li
+    class="ant-pagination-options"
+  >
+    <div
+      aria-label="Page Size"
+      class="ant-select ant-pagination-options-size-changer ant-select-single ant-select-show-arrow"
+    >
+      <div
+        class="ant-select-selector"
+      >
+        <span
+          class="ant-select-selection-search"
+        >
+          <input
+            aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-expanded="false"
+            aria-haspopup="listbox"
+            aria-label="Page Size"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autocomplete="off"
+            class="ant-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            readonly=""
+            role="combobox"
+            style="opacity: 0;"
+            type="search"
+            unselectable="on"
+            value=""
+          />
+        </span>
+        <span
+          class="ant-select-selection-item"
+          title="10 / page"
+        >
+          10 / page
+        </span>
+      </div>
+      <span
+        aria-hidden="true"
+        class="ant-select-arrow"
+        style="user-select: none;"
+        unselectable="on"
+      >
+        <span
+          aria-label="down"
+          class="anticon anticon-down ant-select-suffix"
+          role="img"
+        >
+          <svg
+            aria-hidden="true"
+            data-icon="down"
+            fill="currentColor"
+            focusable="false"
+            height="1em"
+            viewBox="64 64 896 896"
+            width="1em"
+          >
+            <path
+              d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+            />
+          </svg>
+        </span>
+      </span>
+    </div>
+  </li>
+</ul>
+`;
+
+exports[`Pagination rtl render component should be rendered correctly in RTL direction 1`] = `
+<ul
+  class="ant-pagination ant-pagination-rtl"
+  unselectable="unselectable"
+>
+  <li
+    aria-disabled="true"
+    class="ant-pagination-prev ant-pagination-disabled"
+    title="Previous Page"
+  >
+    <button
+      class="ant-pagination-item-link"
+      disabled=""
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="right"
+        class="anticon anticon-right"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="right"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
+  <li
+    class="ant-pagination-item ant-pagination-item-1 ant-pagination-item-disabled"
+    tabindex="0"
+    title="1"
+  >
+    <a
+      rel="nofollow"
+    >
+      1
+    </a>
+  </li>
+  <li
+    aria-disabled="true"
+    class="ant-pagination-next ant-pagination-disabled"
+    title="Next Page"
+  >
+    <button
+      class="ant-pagination-item-link"
+      disabled=""
+      tabindex="-1"
+      type="button"
+    >
+      <span
+        aria-label="left"
+        class="anticon anticon-left"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="left"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M724 218.3V141c0-6.7-7.7-10.4-12.9-6.3L260.3 486.8a31.86 31.86 0 000 50.3l450.8 352.1c5.3 4.1 12.9.4 12.9-6.3v-77.3c0-4.9-2.3-9.6-6.1-12.6l-360-281 360-281.1c3.8-3 6.1-7.7 6.1-12.6z"
+          />
+        </svg>
+      </span>
+    </button>
+  </li>
+</ul>
+`;
diff --git a/components/pagination/__tests__/index.test.js b/components/pagination/__tests__/index.test.js
index 6e2271124a..0b872df83e 100644
--- a/components/pagination/__tests__/index.test.js
+++ b/components/pagination/__tests__/index.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, mount } from 'enzyme';
+import { mount } from 'enzyme';
 import Pagination from '..';
 import Select from '../../select';
 import ConfigProvider from '../../config-provider';
@@ -10,15 +10,6 @@ describe('Pagination', () => {
   mountTest(Pagination);
   rtlTest(Pagination);
 
-  it('should be rendered correctly in RTL', () => {
-    const wrapper = mount(
-      <ConfigProvider direction="rtl">
-        <Pagination defaultCurrent={1} total={50} />
-      </ConfigProvider>,
-    );
-    expect(render(wrapper)).toMatchSnapshot();
-  });
-
   it('should pass disabled to prev and next buttons', () => {
     const itemRender = (current, type, originalElement) => {
       if (type === 'prev') {
@@ -69,4 +60,25 @@ describe('Pagination', () => {
     );
     expect(wrapper.find('.custom-select').length).toBeTruthy();
   });
+
+  describe('ConfigProvider', () => {
+    it('should be rendered correctly in RTL', () => {
+      const wrapper = mount(
+        <ConfigProvider direction="rtl">
+          <Pagination defaultCurrent={1} total={50} />
+        </ConfigProvider>,
+      );
+      expect(wrapper.render()).toMatchSnapshot();
+    });
+
+    it('should be rendered correctly when componentSize is large', () => {
+      const wrapper = mount(
+        <ConfigProvider componentSize="large">
+          <Pagination defaultCurrent={1} total={50} showSizeChanger />
+        </ConfigProvider>,
+      );
+      expect(wrapper.render()).toMatchSnapshot();
+      expect(wrapper.find('.ant-select-lg').length).toBe(0);
+    });
+  });
 });