@gm-mobile/c-react 3.10.2 → 3.11.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.10.2",
+  "version": "3.11.0-beta.0",
   "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.10.2",
-    "@gm-mobile/c-tool": "^3.10.2",
-    "@gm-mobile/locales": "^3.10.2"
+    "@gm-mobile/c-font": "^3.11.0-beta.0",
+    "@gm-mobile/c-tool": "^3.11.0-beta.0",
+    "@gm-mobile/locales": "^3.11.0-beta.0"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "36b2d1e86cc9234ad829116299d3c61a2faaee6c"
+  "gitHead": "649f56a77dba3b7aeb46446d2fbef2338270ee8a"
 }

package/src/component/dialog/common/choose.tsx

@@ -24,6 +24,8 @@ export interface ChooseProps {
   /** 搜索功能 */
   // search?: boolean
   maxHeight?: string
+  /** 高度 */
+  height?: string
   onCancel?: () => void
 }
 
@@ -35,6 +37,7 @@ export default function ({
   multiSelect = false,
   defaultSelected = [],
   maxHeight = '50vh',
+  height,
   onCancel,
 }: ChooseProps) {
   if (multiSelect) needConfirm = true
@@ -45,7 +48,8 @@ export default function ({
       <View
         className='m-padding-tb-5'
         style={{
-          maxHeight: maxHeight,
+          maxHeight,
+          height,
           overflow: 'auto',
         }}
       >

package/src/component/popup/popup_v1.tsx

@@ -1,7 +1,6 @@
 import React, { FC } from 'react'
 import classNames from 'classnames'
 import _ from 'lodash'
-import { devWarnForHook } from '@gm-mobile/c-tool'
 
 import { Flex } from '../flex'
 import { Mask } from '../mask'
@@ -40,7 +39,7 @@ const PopupBase: FC<PopupV1Props> = ({
   style,
   id,
   onHide = _.noop,
-  isPickPopup,
+  isPickPopup = true,
   disabledHeader,
   disabledMask,
   /** 动画有卡顿现象，先禁用 */
@@ -52,35 +51,31 @@ const PopupBase: FC<PopupV1Props> = ({
   titleCenter,
   clickMaskClose = true,
   disableBottomSafeArea,
+  direction = 'bottom',
   ...rest
 }) => {
-  devWarnForHook(() => {
-    if (!left && !right && !bottom) {
-      console.error('need oneOf left right bottom')
-    }
-  })
-
+  const isLeft = left || direction === 'left'
+  const isRight = right || direction === 'right'
+  const isBottom = bottom || direction === 'bottom'
+  const isCenter = center || direction === 'center'
   const cn = classNames(
     'm-popup',
     {
-      'm-popup-left': left,
-      'm-popup-right': right,
-      'm-popup-bottom': bottom,
-      'm-popup-center': center,
+      'm-popup-left m-animated-slide-in-left': isLeft,
+      'm-popup-right m-animated-slide-in-right': isRight,
+      'm-popup-bottom m-animated-slide-in-bottom': isBottom,
+      'm-popup-center': isCenter,
       'm-popup-box-shadow': opacity === 0 || disabledMask,
       'm-animated': !disabledAnimate,
-      'm-animated-slide-in-left': left,
-      'm-animated-slide-in-right': right,
-      'm-animated-slide-in-bottom': bottom,
       'm-bottom-safe-area': !disableBottomSafeArea,
     },
     className
   )
 
   const s = Object.assign({}, style)
-  if ((left || right) && width) {
+  if ((isLeft || isRight) && width) {
     s.width = width
-  } else if (bottom) {
+  } else if (isBottom) {
     s.height = height
   }
 

package/src/component/popup/stories.tsx

@@ -90,17 +90,15 @@ export const PopupV1 = () => {
       onClick={() => {
         TempPopupV1.render({
           title:
-            '啦啦啦1(加了headerClassName： m-flex-justify-center  m-bg-back）',
+            '啦啦啦1 height: 60vh,(加了headerClassName： m-flex-justify-center  m-bg-back）',
           headerClassName: 'm-flex-justify-center m-bg-back',
           titleCenter: true,
-          bottom: true,
           children: (
             <View>
               <Button
                 onClick={() => {
                   TempPopupV1.render({
-                    title: '啦啦啦2',
-                    bottom: true,
+                    title: '啦啦啦2，height: 50vh',
                     children: (
                       <View>
                         点击关闭会提示【检测到弹窗关闭了，看要做什么回调】
@@ -108,21 +106,20 @@ export const PopupV1 = () => {
                           onClick={() => {
                             TempPopupV1.render({
                               title: '啦啦啦3',
-                              bottom: true,
                               children: (
                                 <View>
                                   <Button
                                     onClick={() => {
                                       const hdeId4 = TempPopupV1.render({
                                         title: '啦啦啦4',
-                                        left: true,
+                                        direction: 'left',
                                         children: (
                                           <Button
                                             type='primary'
                                             onClick={() => {
                                               TempPopupV1.render({
                                                 title: '啦啦啦5',
-                                                right: true,
+                                                direction: 'right',
                                                 children: (
                                                   <Button
                                                     type='primary'
@@ -132,7 +129,7 @@ export const PopupV1 = () => {
                                                   </Button>
                                                 ),
                                                 // onHide: Popup.hide,
-                                                height: '60vh',
+                                                height: '40vh',
                                                 className: 'xxxx',
                                                 closeText: (
                                                   <Text
@@ -165,7 +162,7 @@ export const PopupV1 = () => {
                                   </Button>
                                 </View>
                               ),
-                              height: '60vh',
+                              height: '40vh',
                             })
                           }}
                         >
@@ -176,7 +173,7 @@ export const PopupV1 = () => {
                     onHide: () => {
                       Toast.tip('检测到弹窗关闭了，看要做什么回调')
                     },
-                    height: '60vh',
+                    height: '50vh',
                   })
                 }}
               >

package/src/component/popup/types.ts

@@ -29,8 +29,9 @@ interface PopupStaticsTypes {
   render: (options: PopupProps) => void
   hide: () => void
 }
-
-interface PopupV1Props extends Omit<PopupProps, 'onHide'> {
+type PopupDirection = 'bottom' | 'left' | 'right' | 'center'
+interface PopupV1Props
+  extends Omit<PopupProps, 'onHide' | 'left' | 'right' | 'bottom'> {
   /** 默认关闭是个icon，如果不满足可自定义传入 */
   closeText?: ReactNode
   /** header的class,针对的是整个container */
@@ -41,9 +42,18 @@ interface PopupV1Props extends Omit<PopupProps, 'onHide'> {
   titleCenter?: boolean
   /** onHide是监听关闭后的回调，而不是关闭Popup的命令，如果要几秒后关闭弹窗可以返回一个Promise */
   onHide?: () => Promise<any> | void
-  center?: boolean
   /** 点击mask是否关闭弹窗 */
   clickMaskClose?: boolean
+  /** @deprecated 弃用，请用direction='left' 左侧弹出 */
+  left?: boolean
+  /** @deprecated 弃用，请用direction='right' 右侧弹出 */
+  right?: boolean
+  /** @deprecated 弃用，请用direction='bottom' 底部弹出 */
+  bottom?: boolean
+  /** @deprecated 弃用，请用direction='center' 中心弹出 */
+  center?: boolean
+  /** 从哪个方向弹出，默认从底部 */
+  direction?: PopupDirection
 }
 
 interface PopupStaticsV1Types {