chore: auto merge branches (#36431)

chore: Next merge master

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

@@ -3481,8 +3481,8 @@ exports[`renders ./components/calendar/demo/customize-header.md extend context c
                             />
                           </div>
                           <div
-                            aria-selected="false"
-                            class="ant-select-item ant-select-item-option year-item"
+                            aria-selected="true"
+                            class="ant-select-item ant-select-item-option year-item ant-select-item-option-selected"
                             title="2016"
                           >
                             <div

components/calendar/demo/customize-header.md

@@ -46,16 +46,16 @@ const App: React.FC = () => {
             months.push(localeData.monthsShort(current));
           }
 
-          for (let index = start; index < end; index++) {
+          for (let i = start; i < end; i++) {
             monthOptions.push(
-              <Select.Option className="month-item" key={`${index}`}>
-                {months[index]}
+              <Select.Option key={i} value={i} className="month-item">
+                {months[i]}
               </Select.Option>,
             );
           }
-          const month = value.month();
 
           const year = value.year();
+          const month = value.month();
           const options = [];
           for (let i = year - 10; i < year + 10; i += 1) {
             options.push(
@@ -83,11 +83,11 @@ const App: React.FC = () => {
                     size="small"
                     dropdownMatchSelectWidth={false}
                     className="my-year-select"
+                    value={year}
                     onChange={newYear => {
-                      const now = value.clone().year(Number(newYear));
+                      const now = value.clone().year(newYear);
                       onChange(now);
                     }}
-                    value={String(year)}
                   >
                     {options}
                   </Select>
@@ -96,11 +96,10 @@ const App: React.FC = () => {
                   <Select
                     size="small"
                     dropdownMatchSelectWidth={false}
-                    value={String(month)}
-                    onChange={selectedMonth => {
-                      const newValue = value.clone();
-                      newValue.month(parseInt(selectedMonth, 10));
-                      onChange(newValue);
+                    value={month}
+                    onChange={newMonth => {
+                      const now = value.clone().month(newMonth);
+                      onChange(now);
                     }}
                   >
                     {monthOptions}

components/form/index.en-US.md

@@ -495,7 +495,7 @@ React can not get correct interaction of controlled component with async value u
 
 See similar issues: [#28370](https://github.com/ant-design/ant-design/issues/28370) [#27994](https://github.com/ant-design/ant-design/issues/27994)
 
-`scrollToFirstError` and `scrollToField` deps on `id` attribute passed to form control, please mark sure that it hasn't been ignored in your custom form control. Check [codesandbox](https://codesandbox.io/s/antd-reproduction-template-forked-25nul?file=/index.js) for solution.
+`scrollToFirstError` and `scrollToField` deps on `id` attribute passed to form control, please make sure that it hasn't been ignored in your custom form control. Check [codesandbox](https://codesandbox.io/s/antd-reproduction-template-forked-25nul?file=/index.js) for solution.
 
 ### `setFieldsValue` do not trigger `onFieldsChange` or `onValuesChange`?
 

components/table/style/fixed.tsx

@@ -61,7 +61,7 @@ const genFixedStyle: GenerateStyle<TableToken, CSSObject> = token => {
           position: 'absolute',
           top: 0,
           bottom: 0,
-          zIndex: 1,
+          zIndex: zIndexTableFixed,
           width: 30,
           transition: `box-shadow ${motionDurationSlow}`,
           content: '""',

components/typography/index.zh-CN.md

@@ -113,7 +113,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/GOM1KQ24O/Typography.svg
 | onChange | 文本域编辑时触发 | function(event) | - |  |
 | onEnd | 按 ENTER 结束编辑状态时触发 | function | - | 4.14.0 |
 | onStart | 进入编辑中状态时触发 | function | - |  |
-| triggerType | Edit mode trigger - icon, text or both (not specifying icon as trigger hides it) | Array<`icon`\|`text`> | \[`icon`] |  |
+| triggerType | 编辑模式触发器类型，图标、文本或者两者都设置（不设置图标作为触发器时它会隐藏） | Array<`icon`\|`text`> | \[`icon`] |  |
 | enterIcon | 在编辑段中自定义“enter”图标（传递“null”将删除图标） | ReactNode | `<EnterOutlined />` | 4.17.0 |
 
 ### ellipsis

site/theme/style/themes/default.less

@@ -561,7 +561,7 @@
 @modal-header-title-line-height: 22px;
 @modal-header-title-font-size: @font-size-lg;
 @modal-header-border-color-split: @border-color-split;
-@modal-header-close-size: 56px;
+@modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
 @modal-content-bg: @component-background;
 @modal-heading-color: @heading-color;
 @modal-close-color: @text-color-secondary;

site/theme/style/themes/variable.less

@@ -616,7 +616,7 @@
 @modal-header-title-line-height: 22px;
 @modal-header-title-font-size: @font-size-lg;
 @modal-header-border-color-split: @border-color-split;
-@modal-header-close-size: 56px;
+@modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
 @modal-content-bg: @component-background;
 @modal-heading-color: @heading-color;
 @modal-close-color: @text-color-secondary;