Merge branch 'next' into feature/plugin-export

NervJS · Sep 9, 2022 · 36a2292 · 36a2292
2 parents e960631 + 41c6e81
commit 36a2292
Show file tree

Hide file tree

Showing 14 changed files with 307 additions and 213 deletions.
diff --git a/packages/postcss-pxtransform/__tests__/index.test.js b/packages/postcss-pxtransform/__tests__/index.test.js
@@ -72,6 +72,13 @@ describe('px2rem', function () {
 
     expect(processed).toBe(expected)
   })
+
+  it('8 should work on custom baseFontSize', function () {
+    const processed = postcss(px2rem({ platform: 'h5', baseFontSize: 15 })).process(basicCSS).css
+    const expected = '.rule { font-size: 0.5rem }'
+
+    expect(processed).toBe(expected)
+  })
 })
 
 describe('value parsing', function () {

diff --git a/packages/postcss-pxtransform/index.js b/packages/postcss-pxtransform/index.js
@@ -41,7 +41,7 @@ module.exports = postcss.plugin('postcss-pxtransform', function (options = {}) {
   options = Object.assign({}, DEFAULT_WEAPP_OPTIONS, options)
 
   const transUnits = ['px']
-  const baseFontSize = options.baseFontSize || options.minRootSize >= 1 ? options.minRootSize : 20
+  const baseFontSize = options.baseFontSize || (options.minRootSize >= 1 ? options.minRootSize : 20)
   const designWidth = input => typeof options.designWidth === 'function'
     ? options.designWidth(input)
     : options.designWidth

diff --git a/packages/taro-components-rn/src/components/Input/PropsType.tsx b/packages/taro-components-rn/src/components/Input/PropsType.tsx
@@ -22,7 +22,7 @@ export interface InputState {
 export interface InputProps extends FormItemProps{
   style?: StyleProp<ViewStyle>;
   value?: string;
-  type: 'text' | 'number' | 'idcard' | 'digit';
+  type?: 'text' | 'number' | 'idcard' | 'digit';
   password?: boolean;
   placeholder?: string;
   disabled?: boolean;
@@ -32,8 +32,8 @@ export interface InputProps extends FormItemProps{
   confirmType: 'done' | 'send' | 'search' | 'next' | 'go';
   confirmHold?: boolean;
   cursor?: number;
-  selectionStart: number;
-  selectionEnd: number;
+  selectionStart?: number;
+  selectionEnd?: number;
   placeholderStyle?: string;
   placeholderTextColor?: string;
   onInput?: (evt: Event) => void;