chore: auto merge branches (#52014)

chore: merge master into feature

biome.json

@@ -65,6 +65,11 @@
       }
     }
   },
+  "css": {
+    "formatter": {
+      "quoteStyle": "single"
+    }
+  },
   "overrides": [
     {
       "include": ["**/*.test.ts", "**/*.test.tsx", "tests/**/*", "scripts/**/*", ".dumi/**/*"],

components/date-picker/locale/ko_KR.ts

@@ -7,7 +7,30 @@ import type { PickerLocale } from '../generatePicker';
 const locale: PickerLocale = {
   lang: {
     placeholder: '날짜 선택',
+    yearPlaceholder: '연도 선택',
+    quarterPlaceholder: '분기 선택',
+    monthPlaceholder: '월 선택',
+    weekPlaceholder: '주 선택',
     rangePlaceholder: ['시작일', '종료일'],
+    rangeYearPlaceholder: ['시작 연도', '종료 연도'],
+    rangeMonthPlaceholder: ['시작 월', '종료 월'],
+    rangeQuarterPlaceholder: ['시작 분기', '종료 분기'],
+    rangeWeekPlaceholder: ['시작 주', '종료 주'],
+    shortWeekDays: ['일', '월', '화', '수', '목', '금', '토'],
+    shortMonths: [
+      '1월',
+      '2월',
+      '3월',
+      '4월',
+      '5월',
+      '6월',
+      '7월',
+      '8월',
+      '9월',
+      '10월',
+      '11월',
+      '12월',
+    ],
     ...CalendarLocale,
   },
   timePickerLocale: {

components/divider/__tests__/index.test.tsx

@@ -28,22 +28,14 @@ describe('Divider', () => {
   });
 
   it('support bool dashed', () => {
-    const { container } = render(
+    const { container } = render(<Divider dashed>test test test</Divider>);
-      <Divider dashed>
-        test test test
-      </Divider>,
-    );
     expect(container?.querySelector<HTMLSpanElement>('.ant-divider-dashed')).toHaveStyle({
       borderStyle: 'dashed',
     });
   });
 
   it('support string variant', () => {
-    const { container } = render(
+    const { container } = render(<Divider variant="dotted">test dotted</Divider>);
-      <Divider variant="dotted">
-        test dotted
-      </Divider>,
-    );
     expect(container?.querySelector<HTMLSpanElement>('.ant-divider-dotted')).toHaveStyle({
       borderStyle: 'dotted',
     });

components/divider/demo/variant.tsx

@@ -12,12 +12,16 @@ const App: React.FC = () => (
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista
       probare, quae sunt a te dicta? Refert tamen, quo modo.
     </p>
-    <Divider variant="dotted" style={{ borderColor: '#7cb305' }}>Dotted</Divider>
+    <Divider variant="dotted" style={{ borderColor: '#7cb305' }}>
+      Dotted
+    </Divider>
     <p>
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista
       probare, quae sunt a te dicta? Refert tamen, quo modo.
     </p>
-    <Divider  variant="dashed" style={{  borderColor: '#7cb305' }} dashed >Dashed</Divider>
+    <Divider variant="dashed" style={{ borderColor: '#7cb305' }} dashed>
+      Dashed
+    </Divider>
     <p>
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista
       probare, quae sunt a te dicta? Refert tamen, quo modo.

components/list/Item.tsx

@@ -107,7 +107,7 @@ const InternalItem = React.forwardRef<HTMLDivElement, ListItemProps>((props, ref
   };
 
   const prefixCls = getPrefixCls('list', customizePrefixCls);
-  const actionsContent = (actions && actions.length > 0) && (
+  const actionsContent = actions && actions.length > 0 && (
     <ul
       className={classNames(`${prefixCls}-item-action`, moduleClass('actions'))}
       key="actions"

components/locale/ru_RU.ts

@@ -80,7 +80,7 @@ const localeValues: Locale = {
     copy: 'Копировать',
     copied: 'Скопировано',
     expand: 'Раскрыть',
-    collapse: "Свернуть",
+    collapse: 'Свернуть',
   },
   Form: {
     optional: '(необязательно)',
@@ -144,7 +144,7 @@ const localeValues: Locale = {
     transparent: 'Прозрачный',
     singleColor: 'Один цвет',
     gradientColor: 'Градиент',
-  }
+  },
 };
 
 export default localeValues;

components/locale/uz_UZ.ts

@@ -32,7 +32,7 @@ const localeValues: Locale = {
     selectAll: 'Barchasini tanlash',
     selectInvert: 'Tanlovni aylantirish',
     selectNone: "Barcha ma'lumotlarni tozalang",
-    selectionAll: "Barchasini tanlash",
+    selectionAll: 'Barchasini tanlash',
     sortTitle: 'Tartiblash',
     expand: 'Satirni yozish',
     collapse: "Satirni yig'ish",
@@ -47,7 +47,7 @@ const localeValues: Locale = {
   },
   Modal: {
     okText: 'OK',
-    cancelText: "Yopish",
+    cancelText: 'Yopish',
     justOkText: 'OK',
   },
   Popconfirm: {

components/table/index.en-US.md

@@ -203,7 +203,7 @@ One of the Table `columns` prop for describing the table's columns, Column has t
 | filterDropdownProps | Customized dropdown props, `filterDropdownOpen` and `onFilterDropdownOpenChange` were available before `<5.22.0` | [DropdownProps](/components/dropdown#api) | - | 5.22.0 |
 | fixed | (IE not support) Set column to be fixed: `true`(same as left) `'left'` `'right'` | boolean \| string | false |  |
 | key | Unique key of this column, you can ignore this prop if you've set a unique `dataIndex` | string | - |  |
-| render | Renderer of the table cell. The return value should be a ReactNode | function(text, record, index) {} | - |  |
+| render | Renderer of the table cell. `value` is the value of current cell; `record` is the value object of current row; `index` is the row number. The return value should be a ReactNode | function(value, record, index) {} | - |  |
 | responsive | The list of breakpoints at which to display this column. Always visible if not set | [Breakpoint](https://github.com/ant-design/ant-design/blob/015109b42b85c63146371b4e32b883cf97b088e8/components/_util/responsiveObserve.ts#L1)\[] | - | 4.2.0 |
 | rowScope | Set scope attribute for all cells in this column | `row` \| `rowgroup` | - | 5.1.0 |
 | shouldCellUpdate | Control cell render logic | (record, prevRecord) => boolean | - | 4.3.0 |

components/table/index.zh-CN.md

@@ -205,7 +205,7 @@ const columns = [
 | filterDropdownProps | 自定义下拉属性，在 `<5.22.0` 之前可用 `filterDropdownOpen` 和 `onFilterDropdownOpenChange` | [DropdownProps](/components/dropdown#api) | - | 5.22.0 |
 | fixed | （IE 下无效）列是否固定，可选 `true` (等效于 `left`) `left` `right` | boolean \| string | false |  |
 | key | React 需要的 key，如果已经设置了唯一的 `dataIndex`，可以忽略这个属性 | string | - |  |
-| render | 生成复杂数据的渲染函数，参数分别为当前行的值，当前行数据，行索引 | function(text, record, index) {} | - |  |
+| render | 生成复杂数据的渲染函数，参数分别为当前单元格的值，当前行数据，行索引 | function(value, record, index) {} | - |  |
 | responsive | 响应式 breakpoint 配置列表。未设置则始终可见。 | [Breakpoint](https://github.com/ant-design/ant-design/blob/015109b42b85c63146371b4e32b883cf97b088e8/components/_util/responsiveObserve.ts#L1)\[] | - | 4.2.0 |
 | rowScope | 设置列范围 | `row` \| `rowgroup` | - | 5.1.0 |
 | shouldCellUpdate | 自定义单元格渲染时机 | (record, prevRecord) => boolean | - | 4.3.0 |

package.json

@@ -125,20 +125,20 @@
     "rc-collapse": "~3.9.0",
     "rc-dialog": "~9.6.0",
     "rc-drawer": "~7.2.0",
-    "rc-dropdown": "~4.2.0",
+    "rc-dropdown": "~4.2.1",
-    "rc-field-form": "~2.6.0",
+    "rc-field-form": "~2.7.0",
     "rc-image": "~7.11.0",
     "rc-input": "~1.6.4",
     "rc-input-number": "~9.3.0",
     "rc-mentions": "~2.18.0",
     "rc-menu": "~9.16.0",
-    "rc-motion": "^2.9.3",
+    "rc-motion": "^2.9.4",
     "rc-notification": "~5.6.2",
     "rc-pagination": "~5.0.0",
     "rc-picker": "~4.8.3",
     "rc-progress": "~4.0.0",
     "rc-rate": "~2.13.0",
-    "rc-resize-observer": "^1.4.0",
+    "rc-resize-observer": "^1.4.1",
     "rc-segmented": "~2.7.0",
     "rc-select": "~14.16.4",
     "rc-slider": "~11.1.7",
@@ -151,7 +151,7 @@
     "rc-tree": "~5.10.1",
     "rc-tree-select": "~5.24.5",
     "rc-upload": "~4.8.1",
-    "rc-util": "^5.44.0",
+    "rc-util": "^5.44.2",
     "scroll-into-view-if-needed": "^3.1.0",
     "throttle-debounce": "^5.0.2"
   },

webpack.config.js

@@ -45,7 +45,7 @@ function addPluginsForProduction(config) {
         analyzerMode: 'static',
         openAnalyzer: false,
         reportFilename: '../report.html',
-      })
+      }),
     );
   }
   if (newConfig.mode === 'production' && !process.env.PRODUCTION_ONLY) {
@@ -53,7 +53,7 @@ function addPluginsForProduction(config) {
       new DuplicatePackageCheckerPlugin({
         verbose: true,
         emitError: true,
-      })
+      }),
     );
   }
 
@@ -65,7 +65,7 @@ function addPluginsForProduction(config) {
     }),
     new CircularDependencyPlugin({
       failOnError: true,
-    })
+    }),
   );
 
   return newConfig;