chore: master merge feature

docs/guide/i18n.en.md

@@ -33,6 +33,7 @@ The following languages are currently supported:
 | Danish                | da-DK    |
 | Norwegian (Bokmål)    | nb-NO    |
 | Dutch (Netherlands)   | nl-NL    |
+| Russian (Russia)      | ru-RU    |
 
 See more usage at [ConfigProvider](../components/config-provider).
 

docs/guide/i18n.zh.md

@@ -33,6 +33,7 @@ return (
 | 丹麦语               | da-DK  |
 | 挪威                 | nb-NO  |
 | 荷兰语               | nl-NL  |
+| 俄罗斯语             | ru-RU  |
 
 具体的使用方法请参考 [ConfigProvider](../components/config-provider) 文档。
 

src/components/calendar/convert.ts

@@ -5,12 +5,8 @@ export function convertValueToRange(
   selectionMode: 'single' | 'range' | undefined,
   value: Date | [Date, Date] | null
 ): DateRange {
-  if (selectionMode === undefined) {
-    return null
-  }
-  if (value === null) {
-    return null
-  }
+  if (selectionMode === undefined || value === null) return null
+
   if (Array.isArray(value)) {
     return value
   }

src/components/capsule-tabs/capsule-tabs.tsx

@@ -2,7 +2,7 @@ import React, {
   FC,
   ReactNode,
   ReactElement,
-  ComponentProps,
+  isValidElement,
   useRef,
 } from 'react'
 import classNames from 'classnames'
@@ -25,9 +25,7 @@ export type CapsuleTabProps = {
   children?: ReactNode
 } & NativeProps
 
-export const CapsuleTab: FC<CapsuleTabProps> = () => {
-  return null
-}
+export const CapsuleTab: FC<CapsuleTabProps> = () => null
 
 export type CapsuleTabsProps = {
   activeKey?: string | null
@@ -42,10 +40,10 @@ export const CapsuleTabs: FC<CapsuleTabsProps> = props => {
   const keyToIndexRecord: Record<string, number> = {}
   let firstActiveKey: string | null = null
 
-  const panes: ReactElement<ComponentProps<typeof CapsuleTab>>[] = []
+  const panes: ReactElement<CapsuleTabProps>[] = []
 
   traverseReactNode(props.children, (child, index) => {
-    if (!React.isValidElement(child)) return
+    if (!isValidElement<CapsuleTabProps>(child)) return
     const key = child.key
     if (typeof key !== 'string') return
     if (index === 0) {

src/components/checkbox/checkbox.tsx

@@ -25,6 +25,7 @@ export type CheckboxProps = {
   id?: string
   icon?: (checked: boolean, indeterminate: boolean) => React.ReactNode
   children?: React.ReactNode
+  onClick?: (event: React.MouseEvent<HTMLLabelElement, MouseEvent>) => void
 } & NativeProps<'--icon-size' | '--font-size' | '--gap'>
 
 const defaultProps = {
@@ -110,6 +111,7 @@ export const Checkbox = forwardRef<CheckboxRef, CheckboxProps>((p, ref) => {
   return withNativeProps(
     props,
     <label
+      onClick={props.onClick}
       className={classNames(classPrefix, {
         [`${classPrefix}-checked`]: checked && !props.indeterminate,
         [`${classPrefix}-indeterminate`]: props.indeterminate,

src/components/checkbox/index.en.md

@@ -33,6 +33,7 @@ type CheckboxValue = string | number
 | id | The id of the input element, often used in conjunction with the label | `string` | - |
 | indeterminate | To set the `indeterminate` state, only responsible for style control | `boolean` | `false` |
 | onChange | Callback function when changing | `(val: boolean) => void` | - |
+| onClick | Checkbox's click event | `(event: React.MouseEvent<HTMLLabelElement, MouseEvent>) => void` | - |
 | value | The value carrying identification, used in `Group` mode | `CheckboxValue` | - |
 
 ### Ref

src/components/checkbox/index.zh.md

@@ -33,6 +33,7 @@ type CheckboxValue = string | number
 | id | `input` 元素的 `id`，常用来配合 `label` 使用 | `string` | - |
 | indeterminate | 设置 `indeterminate` 状态，只负责样式控制 | `boolean` | `false` |
 | onChange | 变化时回调函数 | `(val: boolean) => void` | - |
+| onClick | Checkbox 的点击事件 | `(event: React.MouseEvent<HTMLLabelElement, MouseEvent>) => void` | - |
 | value | 携带的标识值，用于 `Group` 模式 | `CheckboxValue` | - |
 
 ### Ref

src/components/checkbox/tests/checkbox.test.tsx

@@ -28,7 +28,16 @@ describe('Checkbox', () => {
     expect(input).not.toBeChecked()
     expect(checkbox).not.toHaveClass(`${classPrefix}-checked`)
   })
+  test('Checkbox click', () => {
+    const handleClick = jest.fn()
+    const { container } = render(
+      <Checkbox onClick={handleClick}>click</Checkbox>
+    )
+    const checkbox = container.getElementsByTagName('label')[0]
 
+    fireEvent.click(checkbox)
+    expect(handleClick).toHaveBeenCalledTimes(1)
+  })
   test('renders with disabled', async () => {
     const { container } = render(<Checkbox disabled>Checkbox</Checkbox>)
     const input = container.querySelectorAll('input')[0]

src/components/collapse/collapse.tsx

@@ -1,4 +1,4 @@
-import React, { FC, ReactElement, ComponentProps, useRef } from 'react'
+import React, { FC, ReactElement, isValidElement, useRef } from 'react'
 import { NativeProps, withNativeProps } from '../../utils/native-props'
 import List from '../list'
 import { DownOutline } from 'antd-mobile-icons'
@@ -120,11 +120,12 @@ export type CollapseProps = (
 } & NativeProps
 
 export const Collapse: FC<CollapseProps> = props => {
-  const panels: ReactElement<ComponentProps<typeof CollapsePanel>>[] = []
+  const panels: ReactElement<CollapsePanelProps>[] = []
   traverseReactNode(props.children, child => {
-    if (!React.isValidElement(child)) return
+    if (!isValidElement<CollapsePanelProps>(child)) return
     const key = child.key
     if (typeof key !== 'string') return
+
     panels.push(child)
   })