chore: merge branch 'dev' into ui-next

Author: Garfield550

.travis.yml

@@ -23,7 +23,7 @@ jobs:
       script:
         - yarn run test:ci
     - stage: release
-      if: "(branch IN (master, ui-next)) AND (NOT (type IN (pull_request))) AND (tag =~ /^v3/)"
+      if: "(tag =~ /^v3/) AND (NOT (type IN (pull_request)))"
       before_install:
         - curl -o- -L https://yarnpkg.com/install.sh | bash
         - export PATH="$HOME/.yarn/bin:$PATH"

CHANGELOG.md

@@ -8,6 +8,19 @@
 
 
 # [3.0.0-alpha.0](https://github.com/nervjs/taro-ui/compare/v2.3.1...v3.0.0-alpha.0) (2020-03-28)
+## [2.3.3](https://github.com/nervjs/taro-ui/compare/v2.3.2...v2.3.3) (2020-04-11)
+
+
+### Bug Fixes
+
+* 删除过时的 form 参数, close [#998](https://github.com/nervjs/taro-ui/issues/998) ([ea31144](https://github.com/nervjs/taro-ui/commit/ea31144beb63cd634ab825e15375a98837d0ed9a))
+* 利用完整日期做唯一 ID, close [#976](https://github.com/nervjs/taro-ui/issues/976) ([ae6f01f](https://github.com/nervjs/taro-ui/commit/ae6f01f0961caf8082599cafc92150273b759328))
+* 用了箭头函数不应再用 bind ([d68541a](https://github.com/nervjs/taro-ui/commit/d68541a5c53079b3b1ea44a069eea72e3a1e42c6))
+* **input:** 修复 onChange 不能通过 return 改变 value 的问题, close [#980](https://github.com/nervjs/taro-ui/issues/980) ([c87d025](https://github.com/nervjs/taro-ui/commit/c87d025dae416c8d003018acd07c4661d72187d3))
+
+
+
+## [2.3.2](https://github.com/nervjs/taro-ui/compare/v2.3.1...v2.3.2) (2020-03-28)
 
 
 ### Bug Fixes
@@ -21,6 +34,9 @@
 * 修复页面跳转和循环key重复问题 ([dc1a9fc](https://github.com/nervjs/taro-ui/commit/dc1a9fc44beff9e1a25ca93b7ac6ac4fc02cb90b))
 * 更新 AtTextarea 的文档 ([19e3460](https://github.com/nervjs/taro-ui/commit/19e346023547e0040ec15447d950c5e38bd57976))
 * **input-number:** 在微信小程序中可以输入非数字或者不合法数字 [#985](https://github.com/nervjs/taro-ui/issues/985) ([#986](https://github.com/nervjs/taro-ui/issues/986)) ([5606017](https://github.com/nervjs/taro-ui/commit/56060177619497fd9e8a5685914cd7a9d45b78ef))
+* 更新 AtTextarea 的文档 ([19e3460](https://github.com/nervjs/taro-ui/commit/19e346023547e0040ec15447d950c5e38bd57976))
+* **input-number:** 在微信小程序中可以输入非数字或者不合法数字 [#985](https://github.com/nervjs/taro-ui/issues/985) ([#986](https://github.com/nervjs/taro-ui/issues/986)) ([5606017](https://github.com/nervjs/taro-ui/commit/56060177619497fd9e8a5685914cd7a9d45b78ef))
+* 使 AtGridItem 支持自定义字段 close [#983](https://github.com/nervjs/taro-ui/issues/983) ([8b25687](https://github.com/nervjs/taro-ui/commit/8b2568762a030d464facc8fe9dd6e447d5fd57ab))
 
 
 ### Features

packages/taro-ui/src/components/button/index.tsx

@@ -2,7 +2,8 @@ import classNames from 'classnames'
 import PropTypes, { InferProps } from 'prop-types'
 import React from 'react'
 import { Button, Form, View } from '@tarojs/components'
-import { CommonEvent } from '@tarojs/components/types/common'
+import { ButtonProps } from '@tarojs/components/types/Button'
+import { BaseEventOrig, CommonEvent } from '@tarojs/components/types/common'
 import Taro from '@tarojs/taro'
 import { AtButtonProps, AtButtonState } from '../../../types/button'
 import AtLoading from '../loading/index'
@@ -43,9 +44,10 @@ export default class AtButton extends React.Component<
     this.props.onGetUserInfo && this.props.onGetUserInfo(event)
   }
 
-  private onContact(event: CommonEvent): void {
-    // TODO: Change Taro button component types
-    this.props.onContact && this.props.onContact(event as any)
+  private onContact(
+    event: BaseEventOrig<ButtonProps.onContactEventDetail>
+  ): void {
+    this.props.onContact && this.props.onContact(event)
   }
 
   private onGetPhoneNumber(event: CommonEvent): void {
@@ -162,7 +164,6 @@ export default class AtButton extends React.Component<
         {isWEB && !disabled && webButton}
         {isWEAPP && !disabled && (
           <Form
-            reportSubmit
             onSubmit={this.onSumit.bind(this)}
             onReset={this.onReset.bind(this)}
           >

packages/taro-ui/src/components/calendar/ui/date-list/index.tsx

@@ -37,9 +37,9 @@ export default class AtCalendarList extends React.Component<Props> {
 
     return (
       <View className='at-calendar__list flex'>
-        {list.map((item, index) => (
+        {list.map((item: Calendar.Item) => (
           <View
-            key={`list-item-${index}`}
+            key={`list-item-${item.value}`}
             onClick={this.handleClick.bind(this, item)}
             onLongPress={this.handleLongClick.bind(this, item)}
             className={classnames(

packages/taro-ui/src/components/input/index.tsx

@@ -2,9 +2,16 @@ import classNames from 'classnames'
 import PropTypes, { InferProps } from 'prop-types'
 import React from 'react'
 import { Input, Label, Text, View } from '@tarojs/components'
-import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common'
+import { BaseEventOrig, ITouchEvent } from '@tarojs/components/types/common'
 import { InputProps } from '@tarojs/components/types/Input'
-import { AtInputProps } from '../../../types/input'
+import {
+  AtInputProps,
+  BlurEventDetail,
+  ConfirmEventDetail,
+  FocusEventDetail,
+  InputEventDetail,
+  KeyboardHeightEventDetail
+} from '../../../types/input'
 
 type PickAtInputProps = Pick<
   AtInputProps,
@@ -38,49 +45,66 @@ function getInputProps(props: AtInputProps): GetInputPropsReturn {
   return actualProps as GetInputPropsReturn
 }
 
-type ExtendEvent = {
-  target: {
-    value: string | number
-  }
-}
-
 export default class AtInput extends React.Component<AtInputProps> {
   public static defaultProps: AtInputProps
   public static propTypes: InferProps<AtInputProps>
+  // TODO: 有待考证是否为合理方式处理 #840
+  private inputClearing = false
 
-  private onInput = (event: CommonEvent & ExtendEvent): void => {
-    this.props.onChange(event.target.value, event)
-  }
+  private handleInput = (event: BaseEventOrig<InputEventDetail>): void =>
+    this.props.onChange(event.detail.value, event)
 
-  private onFocus = (event: CommonEvent & ExtendEvent): void => {
-    this.props.onFocus && this.props.onFocus(event.target.value, event)
+  private handleFocus = (event: BaseEventOrig<FocusEventDetail>): void => {
+    if (typeof this.props.onFocus === 'function') {
+      this.props.onFocus(event.detail.value, event)
+    }
   }
 
-  private onBlur = (event: CommonEvent & ExtendEvent): void => {
-    this.props.onBlur && this.props.onBlur(event.target.value, event)
-    // fix # 583 AtInput 不触发 onChange 的问题
-    this.props.onChange(event.target.value, event)
+  private handleBlur = (event: BaseEventOrig<BlurEventDetail>): void => {
+    if (typeof this.props.onBlur === 'function') {
+      this.props.onBlur(event.detail.value, event)
+    }
+    if (event.type === 'blur' && !this.inputClearing) {
+      // fix # 583 AtInput 不触发 onChange 的问题
+      this.props.onChange(
+        event.detail.value,
+        event as BaseEventOrig<InputEventDetail>
+      )
+    }
+    // 还原状态
+    this.inputClearing = false
   }
 
-  private onConfirm = (event: CommonEvent & ExtendEvent): void => {
-    this.props.onConfirm && this.props.onConfirm(event.target.value, event)
+  private handleConfirm = (event: BaseEventOrig<ConfirmEventDetail>): void => {
+    if (typeof this.props.onConfirm === 'function') {
+      this.props.onConfirm(event.detail.value, event)
+    }
   }
 
-  private onClick = (): void => {
-    if (!this.props.editable) {
-      this.props.onClick && this.props.onClick()
+  private handleClick = (event: ITouchEvent): void => {
+    if (!this.props.editable && typeof this.props.onClick === 'function') {
+      this.props.onClick(event)
     }
   }
 
-  private clearValue = (event: ITouchEvent): void => {
-    // fix #840
-    setTimeout(() => {
-      this.props.onChange('', event)
-    }, 50)
+  private handleClearValue = (event: ITouchEvent): void => {
+    this.inputClearing = true
+    this.props.onChange('', event)
   }
 
-  private onErrorClick = (): void =>
-    this.props.onErrorClick && this.props.onErrorClick()
+  private handleKeyboardHeightChange = (
+    event: BaseEventOrig<KeyboardHeightEventDetail>
+  ): void => {
+    if (typeof this.props.onKeyboardHeightChange === 'function') {
+      this.props.onKeyboardHeightChange(event)
+    }
+  }
+
+  private handleErrorClick = (event: ITouchEvent): void => {
+    if (typeof this.props.onErrorClick === 'function') {
+      this.props.onErrorClick(event)
+    }
+  }
 
   public render(): JSX.Element {
     const {
@@ -103,10 +127,7 @@ export default class AtInput extends React.Component<AtInputProps> {
       autoFocus,
       focus,
       value,
-      required,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      onKeyboardHeightChange
+      required
     } = this.props
     const { type, maxLength, disabled, password } = getInputProps(this.props)
 
@@ -129,7 +150,7 @@ export default class AtInput extends React.Component<AtInputProps> {
     return (
       <View className={rootCls} style={customStyle}>
         <View className={containerCls}>
-          <View className={overlayCls} onClick={this.onClick}></View>
+          <View className={overlayCls} onClick={this.handleClick}></View>
           {title && (
             <Label
               className={`at-input__title ${
@@ -159,23 +180,24 @@ export default class AtInput extends React.Component<AtInputProps> {
             selectionStart={selectionStart}
             selectionEnd={selectionEnd}
             adjustPosition={adjustPosition}
-            onInput={this.onInput}
-            // fix # 840 input 清除问题
-            // onChange={this.onInput}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            onConfirm={this.onConfirm}
+            onInput={this.handleInput}
+            onFocus={this.handleFocus}
+            onBlur={this.handleBlur}
+            onConfirm={this.handleConfirm}
             // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
             // @ts-ignore
-            onKeyboardHeightChange={onKeyboardHeightChange}
+            onKeyboardHeightChange={this.handleKeyboardHeightChange}
           />
           {clear && value && (
-            <View className='at-input__icon' onTouchEnd={this.clearValue}>
+            <View className='at-input__icon' onTouchEnd={this.handleClearValue}>
               <Text className='at-icon at-icon-close-circle at-input__icon-close'></Text>
             </View>
           )}
           {error && (
-            <View className='at-input__icon' onTouchStart={this.onErrorClick}>
+            <View
+              className='at-input__icon'
+              onTouchStart={this.handleErrorClick}
+            >
               <Text className='at-icon at-icon-alert-circle at-input__icon-alert'></Text>
             </View>
           )}

packages/taro-ui/src/components/swipe-action/index.tsx

@@ -241,7 +241,7 @@ export default class AtSwipeAction extends React.Component<
               <View
                 key={`${item.text}-${key}`}
                 style={item.style}
-                onClick={this.handleClick.bind(this, item, key)}
+                onClick={e => this.handleClick(item, key, e)}
                 className={classNames(
                   'at-swipe-action__option',
                   item.className

packages/taro-ui/types/input.d.ts

@@ -1,16 +1,51 @@
 import { ComponentClass } from 'react'
-import { CommonEvent } from '@tarojs/components/types/common'
+import { BaseEventOrig, ITouchEvent } from '@tarojs/components/types/common'
 import { InputProps } from '@tarojs/components/types/Input'
 import AtComponent from './base'
 
 declare type OmitInputProps = Omit<
   InputProps,
-  'className' | 'type' | 'onBlur' | 'onFocus' | 'onChange' | 'onConfirm'
+  | 'className'
+  | 'type'
+  | 'onBlur'
+  | 'onFocus'
+  | 'onChange'
+  | 'onConfirm'
+  | 'onKeyboardHeightChange'
 >
-declare type InputFunction<T extends string | number> = (
+
+declare type InputFunction<T extends string | number, U = any, R = void> = (
   value: T,
-  event: CommonEvent
-) => void
+  event?: BaseEventOrig<U>
+) => R
+
+declare type InputBaseEventDetail = {
+  /** 输入值 */
+  value: string | number
+}
+
+export declare type InputEventDetail = InputBaseEventDetail & {
+  /** 光标位置 */
+  cursor: number
+  /** 键值 */
+  keyCode: number
+}
+
+export declare type FocusEventDetail = InputBaseEventDetail & {
+  /** 键盘高度 */
+  height: number
+}
+
+export declare type BlurEventDetail = InputBaseEventDetail
+
+export declare type ConfirmEventDetail = InputBaseEventDetail
+
+export declare type KeyboardHeightEventDetail = {
+  /** 键盘高度 */
+  height: number
+  /** 持续时间 */
+  duration: number
+}
 
 export interface AtInputProps extends AtComponent, OmitInputProps {
   /**
@@ -86,28 +121,34 @@ export interface AtInputProps extends AtComponent, OmitInputProps {
   /**
    * 输入框失去焦点时触发的事件，v2.0.3 版本可以获取 event 参数
    */
-  onBlur?: InputFunction<string | number>
+  onBlur?: InputFunction<string | number, BlurEventDetail>
   /**
    * 输入框被选中时触发的事件，v2.0.3 版本可以获取 event 参数
    */
-  onFocus?: InputFunction<string | number>
+  onFocus?: InputFunction<string | number, FocusEventDetail>
   /**
    * 输入框值改变时触发的事件，开发者需要通过 onChange 事件来更新 value 值变化，onChange 函数必填。
    * 小程序中，如果想改变 value 的值，需要 return value 从而改变输入框的当前值, v2.0.3 版本可以获取 event 参数
    */
-  onChange: InputFunction<string | number>
+  onChange: InputFunction<string | number, InputEventDetail, any>
   /**
    * 点击完成按钮时触发，v2.0.3 版本可以获取 event 参数
    */
-  onConfirm?: InputFunction<string | number>
+  onConfirm?: InputFunction<string | number, ConfirmEventDetail>
+  /**
+   * 当 editable 为 false 时，点击组件触发的事件，v2.3.3 版本可以获取 event 参数
+   */
+  onClick?: (event?: ITouchEvent) => void
   /**
-   * 当 editable 为 false 时，点击组件触发的事件
+   * 键盘高度发生变化的时候触发此事件
    */
-  onClick?: () => void
+  onKeyboardHeightChange?: (
+    event?: BaseEventOrig<KeyboardHeightEventDetail>
+  ) => void
   /**
-   * 点击错误按钮触发的事件
+   * 点击错误按钮触发的事件，v2.3.3 版本可以获取 event 参数
    */
-  onErrorClick?: () => void
+  onErrorClick?: (event?: ITouchEvent) => void
 }
 
 declare const AtInput: ComponentClass<AtInputProps>