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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.3-beta.4",
+  "version": "3.9.3-beta.9",
   "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.3-beta.4",
-    "@gm-mobile/c-tool": "^3.9.3-beta.4",
-    "@gm-mobile/locales": "^3.9.3-beta.4"
+    "@gm-mobile/c-font": "^3.9.3-beta.9",
+    "@gm-mobile/c-tool": "^3.9.3-beta.9",
+    "@gm-mobile/locales": "^3.9.3-beta.9"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "932434b3252d7508adb9bb27a4fb3e1402bca34b"
+  "gitHead": "8a296c7fb7668d035feb60b3850cc5b724f556b6"
 }

package/src/component/button/button.tsx

@@ -73,7 +73,7 @@ export const Button: FC<ButtonProps> = ({
       onClick={handleClick}
     >
       {loadFlag && <Loading className='m-btn-loading' />}
-      <Flex alignCenter justifyCenter>
+      <Flex alignCenter justifyCenter style={{ display: 'inline-flex' }}>
         {children}
       </Flex>
     </BaseButton>

package/src/component/calendar/index.ts

@@ -5,5 +5,6 @@ export { default as MultipleCalendar } from './multiple_calendar'
 export type {
   BaseCalendarProps,
   RangeCalendarProps,
+  CalendarProps,
   MultipleCalendarProps,
 } from './types'

package/src/component/cell/style.less

@@ -30,7 +30,6 @@
       background: var(--m-color-bg-white);
     }
   }
-  .mCellBorderBottomAfter(15px, 0);
 
   &.m-cell-access {
     cursor: pointer;
@@ -41,10 +40,6 @@
     }
   }
 
-  &.m-cell-with-icon {
-    .mCellBorderBottomAfter(50px, 0);
-  }
-
   .m-cell-icon {
     width: 35px;
   }
@@ -105,4 +100,12 @@
   .m-cell:not(.m-cell-form):last-child::after {
     display: none;
   }
+  
+  .m-cell {
+    .mCellBorderBottomAfter(15px, 0);
+
+    &.m-cell-with-icon {
+      .mCellBorderBottomAfter(50px, 0);
+    }
+  }
 }

package/src/component/popup/popup.tsx

@@ -38,6 +38,7 @@ const PopupBase: FC<PopupProps> = ({
   /** 动画有卡顿现象，先禁用 */
   disabledAnimate = true,
   children,
+  disableBottomSafeArea,
   ...rest
 }) => {
   devWarnForHook(() => {
@@ -90,7 +91,7 @@ const PopupBase: FC<PopupProps> = ({
           </Flex>
         )}
         <View className='m-popup-content'>{children}</View>
-        <CustomTabbar />
+        {!disableBottomSafeArea && <CustomTabbar />}
       </View>
     </View>
   )

package/src/component/popup/popup_v1.tsx

@@ -51,6 +51,7 @@ const PopupBase: FC<PopupV1Props> = ({
   titleClassName,
   titleCenter,
   clickMaskClose = true,
+  disableBottomSafeArea,
   ...rest
 }) => {
   devWarnForHook(() => {
@@ -128,7 +129,7 @@ const PopupBase: FC<PopupV1Props> = ({
           </Flex>
         )}
         <View className='m-popup-content'>{children}</View>
-        <CustomTabbar />
+        {!disableBottomSafeArea && <CustomTabbar />}
       </View>
     </View>
   )

package/src/component/popup/types.ts

@@ -19,6 +19,7 @@ interface PopupProps extends HTMLAttributes<HTMLDivElement> {
   disabledAnimate?: boolean
   /** 内部用 */
   isPickPopup?: boolean
+  disableBottomSafeArea?: boolean
 }
 
 interface PopupStaticsTypes {

package/src/component/text_field/TextField.tsx

@@ -170,6 +170,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       onClick,
       onConfirm,
       fractionDigits,
+      alwaysEmbed = true,
       ...rest
       // 注意，不用传给input或area的props要在此列出来，不然rest会带过去
     } = this.props
@@ -207,6 +208,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
         focus,
         password,
         placeholderClass: 'text-field-placeholder',
+        alwaysEmbed: alwaysEmbed,
         onConfirm,
       })
     } else {

package/src/less/bg.less

@@ -26,6 +26,10 @@
   background: var(--m-color-bg-accent-light) !important;
 }
 
+.m-bg-transparent {
+  background: transparent !important;
+}
+
 .m-bg-white-active-with {
   .mBgWhiteActiveWith();
 }
@@ -61,4 +65,7 @@ each(@colors,.(@color,@colorKey,@index){
     .generate-colors(@opacity+1);
   }
   .generate-colors(0);
+  .m-bg-@{colorKey}{
+    background-color: @color!important;
+  }
 });

package/src/less/distance.less

@@ -23,6 +23,8 @@
   10: 10px;
   15: 15px;
   20: 20px;
+  25: 25px;
+  30: 30px;
 };
 
 each(@size, {

package/src/less/text.less

@@ -1,27 +1,3 @@
-.m-text-20 {
-  font-size: var(--m-size-text-20) !important;
-}
-
-.m-text-18 {
-  font-size: var(--m-size-text-18) !important;
-}
-
-.m-text-16 {
-  font-size: var(--m-size-text-16) !important;
-}
-
-.m-text-14 {
-  font-size: var(--m-size-text-14) !important;
-}
-
-.m-text-12 {
-  font-size: var(--m-size-text-12) !important;
-}
-
-.m-text-10 {
-  font-size: var(--m-size-text-10) !important;
-}
-
 .m-text-center {
   text-align: center !important;
 }
@@ -123,17 +99,20 @@ each(@colors,.(@color,@colorKey,@index){
     .generate-colors(@opacity+1);
   }
   .generate-colors(0);
+  .m-text-@{colorKey}{
+    color: @color!important;
+  }
 });
 
 // 生成size, .m-text-{8-32}, --m-size-text-{8-32}
 .generate-size(@size) when (@size<=32) {
   :root,
   page {
-    --m-size-text-@{size}: @{size}px;
+    --m-size-text-@{size}: ~'@{size}px';
   }
   .m-text-@{size} {
-    font-size: e(%("var(--m-size-text-%s ) !important", @size));
+    font-size: e(%('var(--m-size-text-%s)!important', @size));
   }
-  .generate-size(@size+2);
+  .generate-size(@size + 2);
 }
 .generate-size(8);