Skip to content

Commit 68f97a1

Browse files
committed
Merge branch 'main' into @mbert/support-81
2 parents e47c183 + ae9394a commit 68f97a1

7 files changed

Lines changed: 8 additions & 7 deletions

File tree

packages/docs-gesture-handler/docs/components/drawer-layout.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Specifies whether context menu should be enabled after clicking on underlying vi
138138

139139
## Example:
140140

141-
See the [drawer example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/basic/horizontalDrawer/index.tsx) from GestureHandler Example App or view it directly on your phone by visiting [our expo demo](https://snack.expo.io/@adamgrzybowski/react-native-gesture-handler-demo).
141+
See the [drawer example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/basic/horizontalDrawer/index.tsx) from GestureHandler Example App or view it directly on your phone by visiting [our expo demo](https://snack.expo.io/@adamgrzybowski/react-native-gesture-handler-demo).
142142

143143
```js
144144
class Drawerable extends Component {

packages/docs-gesture-handler/docs/components/pressable.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ duration (in milliseconds) to wait after press down before calling `onPressIn`.
116116

117117
### Example:
118118

119-
See the full [pressable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/new_api/pressable/index.tsx) from `GestureHandler` example app.
119+
See the full [pressable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/new_api/pressable/index.tsx) from `GestureHandler` example app.
120120

121121
import GestureStateFlowExample from '@site/src/examples/GestureStateFlowExample';
122122

packages/docs-gesture-handler/docs/components/reanimated-drawer-layout.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ specifies whether context menu should be enabled after clicking on underlying vi
135135

136136
## Example:
137137

138-
See the [reanimated drawer layout example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/release_tests/reanimatedDrawerLayout/index.tsx) from GestureHandler example app.
138+
See the [reanimated drawer layout example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/release_tests/reanimatedDrawerLayout/index.tsx) from GestureHandler example app.
139139

140140
```js
141141
import React, { useRef } from 'react';

packages/docs-gesture-handler/docs/components/reanimated_swipeable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Unlike method `close`, this method does not trigger any animation.
191191
### Example:
192192

193193
For a more in-depth presentation of differences between the new and the legacy implementations,
194-
see [swipeable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/release_tests/swipeableReanimation/index.tsx) from GestureHandler Example App.
194+
see [swipeable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/release_tests/swipeableReanimation/index.tsx) from GestureHandler Example App.
195195

196196
```jsx
197197
import React from 'react';

packages/docs-gesture-handler/docs/components/swipeable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Unlike method `close`, this method does not trigger any animation.
187187

188188
### Example:
189189

190-
See the [swipeable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/showcase/swipeable/index.tsx) from GestureHandler Example App or view it directly on your phone by visiting [our expo demo](https://snack.expo.io/@adamgrzybowski/react-native-gesture-handler-demo).
190+
See the [swipeable example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/showcase/swipeable/index.tsx) from GestureHandler Example App or view it directly on your phone by visiting [our expo demo](https://snack.expo.io/@adamgrzybowski/react-native-gesture-handler-demo).
191191

192192
```js
193193
import React, { Component } from 'react';

packages/docs-gesture-handler/docs/components/touchables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ import {
5353
} from 'react-native-gesture-handler';
5454
```
5555

56-
For a comparison of both touchable implementations see our [touchables example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/release_tests/touchables/index.tsx)
56+
For a comparison of both touchable implementations see our [touchables example](https://github.com/software-mansion/react-native-gesture-handler/blob/main/apps/common-app/src/release_tests/touchables/index.tsx)

packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,9 @@ export default abstract class GestureHandler implements IGestureHandler {
685685
}
686686

687687
if (this.config.hitSlop.bottom !== undefined) {
688-
bottom = width + this.config.hitSlop.bottom;
688+
bottom = height + this.config.hitSlop.bottom;
689689
}
690+
690691
if (this.config.hitSlop.width !== undefined) {
691692
if (this.config.hitSlop.left !== undefined) {
692693
right = left + this.config.hitSlop.width;

0 commit comments

Comments
 (0)