react-native-gizwits-scroll-ruler 2.0.2 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRuler.java +3 -0
  2. package/index.android.js +1 -1
  3. package/ios/RCTScrollRuler/RCTScrollRuler.h +1 -1
  4. package/ios/RCTScrollRuler/RCTScrollRulerManager.m +1 -1
  5. package/package.json +2 -2
package/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRuler.java CHANGED
@@ -365,6 +365,9 @@ public class RNScrollRuler extends View {
365
365
  velocityTracker.addMovement(event);
366
366
  switch (event.getAction()) {
367
367
  case MotionEvent.ACTION_DOWN:
368
+ if (getParent() != null) {
369
+ getParent().requestDisallowInterceptTouchEvent(true);
370
+ }
368
371
  //按下时如果属性动画还没执行完,就终止,记录下当前按下点的位置
369
372
  if (valueAnimator != null && valueAnimator.isRunning()) {
370
373
  valueAnimator.end();
package/index.android.js CHANGED
@@ -72,7 +72,7 @@ export default class ReactScrollRuler extends Component {
72
72
 
73
73
  return (
74
74
  <View
75
- {...generateSimplePanresponder()}
75
+ // {...generateSimplePanresponder()}
76
76
  style={{width: '100%'}}
77
77
  >
78
78
  <RNScrollRuler
package/ios/RCTScrollRuler/RCTScrollRuler.h CHANGED
@@ -23,7 +23,7 @@
23
23
  @end
24
24
  @interface RCTScrollRuler : UIView
25
25
 
26
- @property (nonatomic, copy) RCTBubblingEventBlock onSelect;
26
+ @property (nonatomic, copy) RCTDirectEventBlock onSelect;
27
27
 
28
28
  @property(nonatomic,weak)id<RCTScrollRulerDelegate> delegate;
29
29
 
package/ios/RCTScrollRuler/RCTScrollRulerManager.m CHANGED
@@ -39,7 +39,7 @@ RCT_EXPORT_VIEW_PROPERTY(unit, NSString);
39
39
 
40
40
  RCT_EXPORT_VIEW_PROPERTY(tintColor, NSString);
41
41
 
42
- RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTBubblingEventBlock)
42
+ RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTDirectEventBlock)
43
43
 
44
44
  RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL);
45
45
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "react-native-gizwits-scroll-ruler",
3
- "version": "2.0.2",
4
- "description": "修正安卓滚动条影响",
3
+ "version": "2.0.4",
4
+ "description": "修正ios注册事件",
5
5
  "main": "index.js",
6
6
  "scripts": {
7
7
  "test": "echo \"Error: no test specified\" && exit 1"