@gm-mobile/c-react 3.9.7-beta.4 → 3.9.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.7-beta.4",
+  "version": "3.9.7",
   "description": "> TODO: description",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-font": "^3.9.7-beta.4",
-    "@gm-mobile/c-tool": "^3.9.7-beta.4",
-    "@gm-mobile/locales": "^3.9.7-beta.4"
+    "@gm-mobile/c-font": "^3.9.7",
+    "@gm-mobile/c-tool": "^3.9.7",
+    "@gm-mobile/locales": "^3.9.7"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "4424cdf414312317331f3c649cc6e5902257d5fb"
+  "gitHead": "0899027d262122bf32d9d1ea09d3474fbd0247c5"
 }

package/src/component/calendar/base.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useState } from 'react'
 import { getLocale } from '@gm-mobile/locales'
-import moment from 'moment'
+import moment from 'dayjs'
 import classNames from 'classnames'
 import _ from 'lodash'
 

package/src/component/calendar/calendar.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from 'react'
-import moment from 'moment'
+import moment from 'dayjs'
 import _ from 'lodash'
 
 import BaseCalendar from './base'

package/src/component/calendar/day.tsx

@@ -1,6 +1,6 @@
 import { getLocale } from '@gm-mobile/locales'
 import React, { FC, memo } from 'react'
-import moment from 'moment'
+import moment from 'dayjs'
 import classNames from 'classnames'
 import _ from 'lodash'
 

package/src/component/calendar/month.tsx

@@ -1,7 +1,7 @@
 import { getLocale } from '@gm-mobile/locales'
 import React, { FC } from 'react'
 import _ from 'lodash'
-import moment, { Moment } from 'moment'
+import moment, { Dayjs } from 'dayjs'
 
 import { Flex } from '../flex'
 import Day from './day'
@@ -32,7 +32,7 @@ const Month: FC<MonthProps> = ({
   currentMoment,
   showDateLabel,
 }) => {
-  const getDayRowOfMonth = (currentMoment: Moment) => {
+  const getDayRowOfMonth = (currentMoment: Dayjs) => {
     if (
       moment(currentMoment).day(0).add(35, 'day').month() !==
       currentMoment.month()
@@ -64,7 +64,7 @@ const Month: FC<MonthProps> = ({
     return disabled
   }
 
-  const lastDay = moment(currentMoment).day(0).add(-1, 'day')
+  let lastDay = moment(currentMoment).day(0).add(-1, 'day')
   const month = currentMoment.month()
   const dayGroup = getDayRowOfMonth(currentMoment)
 
@@ -83,8 +83,8 @@ const Month: FC<MonthProps> = ({
           style={{ padding: _.size(dayGroup) > 5 ? '5px 0' : '9px 0' }}
         >
           {_.map(v, (value, index) => {
-            const day = moment(lastDay.add(1, 'day'))
-
+            lastDay = lastDay.add(1, 'day')
+            const day = moment(lastDay)
             return (
               <Day
                 key={`${value}${index}`}

package/src/component/calendar/months_list.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useRef, useEffect } from 'react'
-import moment, { Moment } from 'moment'
+import moment, { Dayjs } from 'dayjs'
 import _ from 'lodash'
 
 import { VList, VListRef } from '../v_list'
@@ -43,7 +43,7 @@ const MonthsList: FC<MonthListProps> = ({
     // eslint-disable-next-line
     while (mMin <= mMax) {
       arr.push(moment(mMin))
-      mMin.add(1, 'month')
+      mMin = mMin.add(1, 'month')
     }
 
     return arr
@@ -74,7 +74,7 @@ const MonthsList: FC<MonthListProps> = ({
       height={height}
       itemHeight={MONTH_HEIGHT}
       distance={0}
-      renderItem={(month: { item: Moment; index: number }) => {
+      renderItem={(month: { item: Dayjs; index: number }) => {
         return (
           <Month
             key={month.index}

package/src/component/calendar/types.ts

@@ -1,5 +1,5 @@
 import { HTMLAttributes } from 'react'
-import { Moment } from 'moment'
+import { Dayjs } from 'dayjs'
 
 type CalendarType = 'single' | 'range' | 'multiple'
 
@@ -9,7 +9,7 @@ interface DayProps {
   type: CalendarType
   onClick: (date: Date) => void
   /** 日期，可能是该月 / 上月 / 下月 */
-  value: Moment
+  value: Dayjs
   /** 当前日历所在月份 */
   currentMonth: number
   disabled: boolean
@@ -19,7 +19,7 @@ interface DayProps {
 }
 
 interface MonthProps {
-  currentMoment: Moment
+  currentMoment: Dayjs
   selected: Date[]
   type: CalendarType
   onSelectDay: (date: Date) => void

package/src/component/date_selector/container.tsx

@@ -1,12 +1,13 @@
 import React, { FC } from 'react'
 import { View } from '../view'
 import { Flex } from '../flex'
-import moment from 'moment'
+import moment, { extend } from 'dayjs'
 import _ from 'lodash'
 
+import weekday from 'dayjs/plugin/weekday'
 import { ContainerProps } from './types'
 import Day from './day'
-
+extend(weekday)
 const WEEK_COUNT = 7
 
 const Container: FC<ContainerProps> = ({ min, max, selected, ...rest }) => {

package/src/component/date_selector/date_selector.tsx

@@ -2,7 +2,7 @@ import { getLocale } from '@gm-mobile/locales'
 import React, { FC } from 'react'
 import { View } from '../view'
 import _ from 'lodash'
-import moment from 'moment'
+import moment from 'dayjs'
 
 import { DateSelectorProps } from './types'
 import Container from './container'

package/src/component/date_selector/day.tsx

@@ -1,13 +1,13 @@
 import React, { FC, memo } from 'react'
 import { getLocale } from '@gm-mobile/locales'
 import classNames from 'classnames'
-import moment, { Moment } from 'moment'
+import moment, { Dayjs } from 'dayjs'
 import { View } from '../view'
 import _ from 'lodash'
 
 import { DayProps } from './types'
 
-const formatDay = (day: Date, span = 0): Moment => {
+const formatDay = (day: Date, span = 0): Dayjs => {
   return moment(day).add(span, 'day').startOf('day')
 }
 

package/src/component/date_selector/stories.tsx

@@ -2,7 +2,8 @@ import React from 'react'
 import { View } from '../view'
 import _ from 'lodash'
 import { observable } from 'mobx'
-import moment from 'moment'
+import moment from 'dayjs'
+
 import { DateSelector } from './date_selector'
 
 const store = observable({

package/src/component/digital_keyboard/index.tsx

@@ -75,6 +75,7 @@ export class DigitalKeyboard {
             actionKeys={this.actionKeys}
             value={this.form[this.active]}
             onInput={(value, btn) => {
+              if (typeof wx !== 'undefined') wx.vibrateShort({ type: 'light' })
               const oldValue = value
               // rewriteMode
               if (state.needClear) {