build: Merge branch 'yym-3.x-swipe-action' of yymzy.github.com:yymzy/…

…taro-ui into next
yymzy · Aug 15, 2024 · 6e78309 · 6e78309
2 parents 6228449 + fcdc039
commit 6e78309
Show file tree

Hide file tree

Showing 9 changed files with 43,209 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "taro-ui",
+  "name": "taro-ui3",
   "description": "UI KIT for Taro",
   "author": "O2Team <aotu.io>",
   "homepage": "https://taro-ui.taro.zone",

diff --git a/packages/taro-ui-demo-rn/yarn.lock b/packages/taro-ui-demo-rn/yarn.lock
diff --git a/packages/taro-ui-demo/yarn.lock b/packages/taro-ui-demo/yarn.lock
diff --git a/packages/taro-ui/package.json b/packages/taro-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "taro-ui",
+  "name": "taro-ui3",
   "version": "3.3.0",
   "description": "UI KIT for Taro",
   "module": "dist/index.esm.js",

diff --git a/packages/taro-ui/src/components/input/index.tsx b/packages/taro-ui/src/components/input/index.tsx
@@ -127,7 +127,9 @@ export default class AtInput extends React.Component<AtInputProps> {
       autoFocus = false,
       focus = false,
       value,
-      required
+      required,
+      // @yym-mix
+      alwaysEmbed
     } = this.props
     const { type, maxLength, disabled, password } = getInputProps(this.props)
 
@@ -189,6 +191,8 @@ export default class AtInput extends React.Component<AtInputProps> {
             onBlur={this.handleBlur}
             onConfirm={this.handleConfirm}
             onKeyboardHeightChange={this.handleKeyboardHeightChange}
+            // @yym-mix
+            alwaysEmbed={alwaysEmbed}
           />
           {clear && value && (
             <View className='at-input__icon' onTouchEnd={this.handleClearValue}>
@@ -237,7 +241,9 @@ AtInput.defaultProps = {
   focus: false,
   required: false,
   // eslint-disable-next-line @typescript-eslint/no-empty-function
-  onChange: (): void => {}
+  onChange: (): void => {},
+  // @yym-mix
+  alwaysEmbed: false
 }
 
 AtInput.propTypes = {
@@ -271,5 +277,7 @@ AtInput.propTypes = {
   onConfirm: PropTypes.func,
   onErrorClick: PropTypes.func,
   onClick: PropTypes.func,
-  required: PropTypes.bool
+  required: PropTypes.bool,
+  // @yym-mix
+  alwaysEmbed: PropTypes.bool,
 }
diff --git a/packages/taro-ui/src/components/swipe-action/index.tsx b/packages/taro-ui/src/components/swipe-action/index.tsx
@@ -228,6 +228,7 @@ export default class AtSwipeAction extends React.Component<
                     style={item.style}
                     onClick={(e): void => this.handleClick(item, key, e)}
                     className={classNames(
+                      // @ts-ignore
                       'at-swipe-action__option',
                       item.className
                     )}

diff --git a/packages/taro-ui/src/components/tabs/index.tsx b/packages/taro-ui/src/components/tabs/index.tsx
@@ -218,6 +218,10 @@ export default class AtTabs extends React.Component<AtTabsProps, AtTabsState> {
             scrollLeft={_scrollLeft}
             scrollTop={_scrollTop}
             scrollIntoView={_scrollIntoView}
+            // @yym-mix
+            enableFlex
+            enhanced
+            showScrollbar={false}
           >
             {tabItems}
           </ScrollView>

diff --git a/packages/taro-ui/yarn.lock b/packages/taro-ui/yarn.lock