Skip to content

patch for tarojs bug #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kinfkong wants to merge 1 commit into
base: main
Choose a base branch
from
Open

patch for tarojs bug #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions update/copy/patches/@tarojs+components-rn+4.1.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ index e5b2464..698b9f0 100644
},
};
- return (React.createElement(View, { style: [styles.wrapperStyle] },
- React.createElement(ViewPager, Object.assign({}, vpProps, { style: this.props.style,
- React.createElement(ViewPager, Object.assign({}, vpProps, { style: this.props.style,
+ return (React.createElement(View, { style: [styles.wrapperStyle, this.props.style] },
+ React.createElement(ViewPager, Object.assign({}, vpProps, { style: styles.pageStyle,
// Lib does not support dynamically orientation change
Expand All @@ -183,8 +183,21 @@ index 4992721..76ecf23 100644
});
//# sourceMappingURL=styles.js.map
\ No newline at end of file
diff --git a/node_modules/@tarojs/components-rn/dist/components/Video/index.js b/node_modules/@tarojs/components-rn/dist/components/Video/index.js
index fe23552..cfe02b3 100644
--- a/node_modules/@tarojs/components-rn/dist/components/Video/index.js
+++ b/node_modules/@tarojs/components-rn/dist/components/Video/index.js
@@ -246,7 +246,7 @@ class _Video extends Component {
onPlaybackStatusUpdate: this.onPlaybackStatusUpdate,
};
// 第一次不显示又无法自动播放
- const showPlayBtn = this.state.isFirst ? true : showCenterPlayBtn;
+ const showPlayBtn = showCenterPlayBtn;
const videoNode = (React.createElement(View, { style: [
Styles['taro-video-container'],
isFullScreen && Styles['taro-video-type-fullscreen'],
diff --git a/node_modules/@tarojs/components-rn/dist/components/hooks/useClickable.js b/node_modules/@tarojs/components-rn/dist/components/hooks/useClickable.js
index 3a0243a..84c1040 100644
index 3a0243a..f7a11a5 100644
--- a/node_modules/@tarojs/components-rn/dist/components/hooks/useClickable.js
+++ b/node_modules/@tarojs/components-rn/dist/components/hooks/useClickable.js
@@ -15,11 +15,11 @@ export const clickableHandlers = [
Expand Down Expand Up @@ -223,17 +236,25 @@ index 3a0243a..84c1040 100644
};
})
};
@@ -113,14 +117,18 @@ const useClickable = (props) => {
@@ -113,14 +117,26 @@ const useClickable = (props) => {
onShouldBlockNativeResponder: () => false,
onPanResponderGrant: (evt) => {
const { onTouchStart } = ref.current.props;
- onTouchStart && onTouchStart(getWxAppEvent(evt));
+ onTouchStart && onTouchStart(getWxAppEvent(evt, 'touchstart'));
ref.current.startTimestamp = evt.nativeEvent.timestamp;
+ ref.current.touches = 1
setStartTimer();
},
+ onPanResponderMove: (evt) => {
+ const { onTouchMove } = ref.current.props;
+ const { onTouchMove, onTouchEnd, onTouchStart } = ref.current.props;
+ const currentTouchs = evt.nativeEvent.touches.length
+ if (ref.current.touches !== currentTouchs) {
+ // 模拟web端的行为，触摸数量变化，触发start和end事件
+ onTouchStart && onTouchStart(getWxAppEvent(evt, 'touchstart'))
+ onTouchEnd && onTouchEnd(getWxAppEvent(evt, 'touchend'))
+ ref.current.touches = currentTouchs
+ }
+ onTouchMove && onTouchMove(getWxAppEvent(evt, 'touchmove'));
+ },
onPanResponderTerminationRequest: () => true,
Expand All @@ -244,7 +265,7 @@ index 3a0243a..84c1040 100644
const endTimestamp = evt.nativeEvent.timestamp;
let gapTime = endTimestamp - ref.current.startTimestamp;
// 1 =>3, 修复部分android机型(三星折叠屏尤为明显),单击时dx,dy为>1，而被误判为move的情况。
@@ -137,17 +145,17 @@ const useClickable = (props) => {
@@ -137,17 +153,17 @@ const useClickable = (props) => {
}
}
if (gapTime <= 350) {
Expand All @@ -258,15 +279,16 @@ index 3a0243a..84c1040 100644
}
setStayTimer();
},
onPanResponderTerminate: () => {
- onPanResponderTerminate: () => {
- // const { onTouchCancel } = this.props
- // onTouchCancel && onTouchCancel(this.getWxAppEvent(evt))
+ onPanResponderTerminate: (evt) => {
+ const { onTouchCancel } = ref.current.props
+ onTouchCancel && onTouchCancel(getWxAppEvent(evt, 'touchcancel'))
setStayTimer();
}
})).current;
@@ -159,8 +167,8 @@ const useClickable = (props) => {
@@ -159,8 +175,8 @@ const useClickable = (props) => {
'onClick',
'onLongPress',
'onTouchStart',
Expand Down