feat: 同步vant-weapp issues到最新的commit

AntmJS · Nov 2, 2021 · 83f917c · 83f917c
1 parent 4f50708
commit 83f917c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 8 deletions.
diff --git a/packages/vantui-demo/src/pages/tab/index.js b/packages/vantui-demo/src/pages/tab/index.js
@@ -14,7 +14,7 @@ export default class Index extends Component {
 
   state = {
     tabs2: [1, 2],
-    tabs3: [1, 2, 3],
+    tabs3: [1, 2, 3, 5, 6],
     tabs4: [1, 2, 3, 4],
     tabs6: [1, 2, 3, 4, 5, 6],
     tabsWithName: [

diff --git a/packages/vantui-doc/docs/home.md b/packages/vantui-doc/docs/home.md
@@ -43,7 +43,7 @@ React应用中使用
 
 ### 贡献代码
 
-使用过程中发现任何问题都可以提 [Issue](https://github.com/antmjs/vantui/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://github.com/antmjs/vantui/pulls)，同时，到目前为止我们已经对vant-weapp的[commit](https://github.com/youzan/vant-weapp/commits/dev)记录同步到了1.9.1的版本，我们也会持续同步
+使用过程中发现任何问题都可以提 [Issue](https://github.com/antmjs/vantui/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://github.com/antmjs/vantui/pulls)，同时，到目前为止我们已经对vant-weapp的[commit](https://github.com/youzan/vant-weapp/commits/dev)记录同步到了1.9.2的版本，我们也会持续同步
 
 ### 开源协议
 

diff --git a/packages/vantui/README.md b/packages/vantui/README.md
@@ -46,7 +46,7 @@ React应用中使用
 
 ### 贡献代码
 
-使用过程中发现任何问题都可以提 [Issue](https://github.com/antmjs/vantui/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://github.com/antmjs/vantui/pulls)，同时，到目前为止我们已经对vant-weapp的[commit](https://github.com/youzan/vant-weapp/commits/dev)记录同步到了1.9.1的版本，我们也会持续同步
+使用过程中发现任何问题都可以提 [Issue](https://github.com/antmjs/vantui/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://github.com/antmjs/vantui/pulls)，同时，到目前为止我们已经对vant-weapp的[commit](https://github.com/youzan/vant-weapp/commits/dev)记录同步到了1.9.2的版本，我们也会持续同步
 
 ### 开源协议
 

diff --git a/packages/vantui/src/components/field/index.tsx b/packages/vantui/src/components/field/index.tsx
@@ -57,6 +57,7 @@ export default function Index(props: FieldProps) {
     holdKeyboard,
     selectionEnd = -1,
     selectionStart = -1,
+    alwaysEmbed,
     disableDefaultPadding = true,
     confirmType,
     confirmHold,
@@ -286,6 +287,7 @@ export default function Index(props: FieldProps) {
             adjustPosition={adjustPosition}
             selectionEnd={selectionEnd}
             selectionStart={selectionStart}
+            alwaysEmbed={alwaysEmbed}
             password={password}
             onInput={_input}
             onClick={onClickInput}

diff --git a/packages/vantui/src/components/toast/index.tsx b/packages/vantui/src/components/toast/index.tsx
@@ -1,4 +1,4 @@
-import { View, Text } from '@tarojs/components'
+import { View, Text, RichText } from '@tarojs/components'
 import { useState, useEffect, useCallback } from 'react'
 import { ToastProps } from '../../../types/toast'
 import VanTransition from '../transition/index'
@@ -137,7 +137,7 @@ export default function Index(props: ToastProps) {
           id="van-toast"
           className={
             'van-toast van-toast--' +
-            (state.type === 'text' ? 'text' : 'icon') +
+            (state.type === 'icon' ? 'icon' : 'text') +
             ` van-toast--${state.position} ${className}`
           }
           style={style}
@@ -146,6 +146,8 @@ export default function Index(props: ToastProps) {
         >
           {state.type === 'text' ? (
             <Text>{state.message}</Text>
+          ) : state.type === 'html' ? (
+            <RichText nodes={state.message} />
           ) : (
             <View className="van-toast__box">
               {state.type === 'loading' ? (

diff --git a/packages/vantui/src/style/components/dropdown-menu.less b/packages/vantui/src/style/components/dropdown-menu.less
@@ -4,8 +4,8 @@
 
 .van-dropdown-menu {
   display: flex;
-  box-shadow: 0 4px 24px fade(@gray-7, 12);
   user-select: none;
+  .theme(dropdown-menu-box-shadow, '@dropdown-menu-box-shadow');
   .theme(height, '@dropdown-menu-height');
   .theme(background-color, '@dropdown-menu-background-color');
 

diff --git a/packages/vantui/src/style/components/tabs.less b/packages/vantui/src/style/components/tabs.less
@@ -40,7 +40,11 @@
     }
 
     &--card {
+      box-sizing: border-box;
       .theme(margin, '0 @padding-md');
+      .theme(border, '@border-width-base solid @tabs-default-color');
+      .theme(width, 'calc(100% - calc(@padding-md * 2))');
+      .theme(border-radius, '@border-radius-sm');
     }
 
     &::-webkit-scrollbar {

diff --git a/packages/vantui/src/style/var.less b/packages/vantui/src/style/var.less
@@ -649,6 +649,7 @@
 @dropdown-menu-title-padding: 0 @padding-xs;
 @dropdown-menu-title-line-height: 36px;
 @dropdown-menu-option-active-color: @red;
+@dropdown-menu-box-shadow: 0 4px 24px fade(@gray-7, 12);
 
 // IndexAnchor
 @index-anchor-padding: 0 @padding-md;

diff --git a/packages/vantui/types/field.d.ts b/packages/vantui/types/field.d.ts
@@ -47,6 +47,7 @@ export interface FieldProps extends StandardProps {
   arrowDirection?: 'left' | 'up' | 'down'
   showWordLimit?: boolean
   errorMessageAlign?: string
+  alwaysEmbed?: boolean
   readonly?: boolean
   clearable?: boolean
   clearTrigger?: string

diff --git a/packages/vantui/types/toast.d.ts b/packages/vantui/types/toast.d.ts
@@ -7,9 +7,9 @@ export interface ToastProps extends StandardProps {
   duration?: number
   mask?: boolean
   forbidClick?: boolean
-  type?: string
+  type?: 'loading' | 'success' | 'fail' | 'html' | 'text'
   position?: 'top' | 'middle' | 'bottom'
-  message?: string
+  message?: string | ReactNode
   loadingType?: 'circular' | 'spinner' | undefined
   selector?: string
   id?: string