@gm-mobile/c-react 3.9.3-beta.8 → 3.9.3-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gm-mobile/c-react",
3
- "version": "3.9.3-beta.8",
3
+ "version": "3.9.3-beta.9",
4
4
  "description": "> TODO: description",
5
5
  "author": "liyatang <liyatang@qq.com>",
6
6
  "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
21
21
  "url": "https://github.com/gmfe/gm-mobile/issues"
22
22
  },
23
23
  "dependencies": {
24
- "@gm-mobile/c-font": "^3.9.3-beta.8",
25
- "@gm-mobile/c-tool": "^3.9.3-beta.8",
26
- "@gm-mobile/locales": "^3.9.3-beta.8"
24
+ "@gm-mobile/c-font": "^3.9.3-beta.9",
25
+ "@gm-mobile/c-tool": "^3.9.3-beta.9",
26
+ "@gm-mobile/locales": "^3.9.3-beta.9"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
33
33
  "prop-types": "^15.7.2",
34
34
  "react": "^16.13.1"
35
35
  },
36
- "gitHead": "1a399bd891e2971777a509ddf1968d77dcd514a7"
36
+ "gitHead": "8a296c7fb7668d035feb60b3850cc5b724f556b6"
37
37
  }
@@ -38,6 +38,7 @@ const PopupBase: FC<PopupProps> = ({
38
38
  /** 动画有卡顿现象,先禁用 */
39
39
  disabledAnimate = true,
40
40
  children,
41
+ disableBottomSafeArea,
41
42
  ...rest
42
43
  }) => {
43
44
  devWarnForHook(() => {
@@ -90,7 +91,7 @@ const PopupBase: FC<PopupProps> = ({
90
91
  </Flex>
91
92
  )}
92
93
  <View className='m-popup-content'>{children}</View>
93
- <CustomTabbar />
94
+ {!disableBottomSafeArea && <CustomTabbar />}
94
95
  </View>
95
96
  </View>
96
97
  )
@@ -51,6 +51,7 @@ const PopupBase: FC<PopupV1Props> = ({
51
51
  titleClassName,
52
52
  titleCenter,
53
53
  clickMaskClose = true,
54
+ disableBottomSafeArea,
54
55
  ...rest
55
56
  }) => {
56
57
  devWarnForHook(() => {
@@ -128,7 +129,7 @@ const PopupBase: FC<PopupV1Props> = ({
128
129
  </Flex>
129
130
  )}
130
131
  <View className='m-popup-content'>{children}</View>
131
- <CustomTabbar />
132
+ {!disableBottomSafeArea && <CustomTabbar />}
132
133
  </View>
133
134
  </View>
134
135
  )
@@ -19,6 +19,7 @@ interface PopupProps extends HTMLAttributes<HTMLDivElement> {
19
19
  disabledAnimate?: boolean
20
20
  /** 内部用 */
21
21
  isPickPopup?: boolean
22
+ disableBottomSafeArea?: boolean
22
23
  }
23
24
 
24
25
  interface PopupStaticsTypes {
@@ -23,6 +23,8 @@
23
23
  10: 10px;
24
24
  15: 15px;
25
25
  20: 20px;
26
+ 25: 25px;
27
+ 30: 30px;
26
28
  };
27
29
 
28
30
  each(@size, {