[] = [];
+ const active = useSharedValue(false);
+
+ for (let i = 0; i < 12; i++) {
+ trackedPointers[i] =
+ useSharedValue <
+ Pointer >
+ {
+ visible: false,
+ x: 0,
+ y: 0,
+ };
+ }
+
+ const gesture = Gesture.Manual();
+
+ return (
+
+
+ {trackedPointers.map((pointer, index) => (
+
+ ))}
+
+
+ );
+}
+```
diff --git a/docs/versioned_docs/version-2.4.0/manual-gestures/step4.md b/docs/versioned_docs/version-2.4.0/manual-gestures/step4.md
new file mode 100644
index 0000000000..36ec2c34bd
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/manual-gestures/step4.md
@@ -0,0 +1,15 @@
+```jsx {2-15}
+const gesture = Gesture.Manual().onTouchesDown((e, manager) => {
+ for (const touch of e.changedTouches) {
+ trackedPointers[touch.id].value = {
+ visible: true,
+ x: touch.x,
+ y: touch.y,
+ };
+ }
+
+ if (e.numberOfTouches >= 2) {
+ manager.activate();
+ }
+});
+```
diff --git a/docs/versioned_docs/version-2.4.0/manual-gestures/step5.md b/docs/versioned_docs/version-2.4.0/manual-gestures/step5.md
new file mode 100644
index 0000000000..d2f9377cc8
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/manual-gestures/step5.md
@@ -0,0 +1,13 @@
+```jsx {3-12}
+const gesture = Gesture.Manual()
+ ...
+ .onTouchesMove((e, _manager) => {
+ for (const touch of e.changedTouches) {
+ trackedPointers[touch.id].value = {
+ visible: true,
+ x: touch.x,
+ y: touch.y,
+ };
+ }
+ })
+```
diff --git a/docs/versioned_docs/version-2.4.0/manual-gestures/step6.md b/docs/versioned_docs/version-2.4.0/manual-gestures/step6.md
new file mode 100644
index 0000000000..323f9516cb
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/manual-gestures/step6.md
@@ -0,0 +1,17 @@
+```jsx {3-16}
+const gesture = Gesture.Manual()
+ ...
+ .onTouchesUp((e, manager) => {
+ for (const touch of e.changedTouches) {
+ trackedPointers[touch.id].value = {
+ visible: false,
+ x: touch.x,
+ y: touch.y,
+ };
+ }
+
+ if (e.numberOfTouches === 0) {
+ manager.end();
+ }
+ })
+```
diff --git a/docs/versioned_docs/version-2.4.0/manual-gestures/step7.md b/docs/versioned_docs/version-2.4.0/manual-gestures/step7.md
new file mode 100644
index 0000000000..913e766ae8
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/manual-gestures/step7.md
@@ -0,0 +1,10 @@
+```jsx {3-10}
+const gesture = Gesture.Manual()
+ ...
+ .onStart(() => {
+ active.value = true;
+ })
+ .onEnd(() => {
+ active.value = false;
+ });
+```
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/quickstart.md b/docs/versioned_docs/version-2.4.0/quickstart/quickstart.md
new file mode 100644
index 0000000000..c1ba3d7219
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/quickstart.md
@@ -0,0 +1,67 @@
+---
+id: quickstart
+title: Quick start
+sidebar_label: Quick start
+---
+
+import Step, { Divider } from '@site/src/theme/Step';
+import Step1 from './step1.md';
+import Step2 from './step2.md';
+import Step3 from './step3.md';
+import Step4 from './step4.md';
+import Step5 from './step5.md';
+
+RNGH2 provides much simpler way to add gestures to your app. All you need to do is wrap the view that you want your gesture to work on with [`GestureDetector`](../api/gestures/gesture-detector), define the gesture and pass it to detector. That's all!
+
+To demonstrate how you would use the new API, let's make a simple app where you can drag a ball around. You will need to add `react-native-gesture-handler` (for gestures) and `react-native-reanimated` (for animations) modules.
+
+
+
+
+ First let's define styles we will need to make the app:
+
+
+
+
+
+
+ Then we can start writing our `Ball` component:
+
+
+
+
+
+
+
+ We also need to define{' '}
+
+ shared values
+ {' '}
+ to keep track of the ball position and create animated styles in order to be
+ able to position the ball on the screen:
+
And add it to the ball's styles:
+
+
+
+
+
+
+
+ The only thing left is to define the pan gesture and assign it to the
+ detector:
+
+
+
+
+
+
+Note the `start` shared value. We need it to store the position of the ball at the moment we grab it to be able to correctly position it later, because we only have access to translation relative to the starting point of the gesture.
+
+Now you can just add `Ball` component to some view in the app and see the results! (Or you can just check the code [here](https://github.com/software-mansion/react-native-gesture-handler/blob/main/example/src/new_api/reanimated/index.tsx) and see it in action in the Example app.)
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/step1.md b/docs/versioned_docs/version-2.4.0/quickstart/step1.md
new file mode 100644
index 0000000000..1995cd907c
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/step1.md
@@ -0,0 +1,11 @@
+```jsx
+const styles = StyleSheet.create({
+ ball: {
+ width: 100,
+ height: 100,
+ borderRadius: 100,
+ backgroundColor: 'blue',
+ alignSelf: 'center',
+ },
+});
+```
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/step2.md b/docs/versioned_docs/version-2.4.0/quickstart/step2.md
new file mode 100644
index 0000000000..34c528266b
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/step2.md
@@ -0,0 +1,9 @@
+```jsx
+function Ball() {
+ return (
+
+
+
+ );
+}
+```
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/step3.md b/docs/versioned_docs/version-2.4.0/quickstart/step3.md
new file mode 100644
index 0000000000..ee7184ffc7
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/step3.md
@@ -0,0 +1,14 @@
+```jsx
+const isPressed = useSharedValue(false);
+const offset = useSharedValue({ x: 0, y: 0 });
+const animatedStyles = useAnimatedStyle(() => {
+ return {
+ transform: [
+ { translateX: offset.value.x },
+ { translateY: offset.value.y },
+ { scale: withSpring(isPressed.value ? 1.2 : 1) },
+ ],
+ backgroundColor: isPressed.value ? 'yellow' : 'blue',
+ };
+});
+```
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/step4.md b/docs/versioned_docs/version-2.4.0/quickstart/step4.md
new file mode 100644
index 0000000000..8e2112a3cd
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/step4.md
@@ -0,0 +1,9 @@
+```jsx {4}
+...
+return (
+
+
+
+);
+...
+```
diff --git a/docs/versioned_docs/version-2.4.0/quickstart/step5.md b/docs/versioned_docs/version-2.4.0/quickstart/step5.md
new file mode 100644
index 0000000000..c7c2e07265
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/quickstart/step5.md
@@ -0,0 +1,32 @@
+```jsx
+const start = useSharedValue({ x: 0, y: 0 });
+const gesture = Gesture.Pan()
+ .onBegin(() => {
+ isPressed.value = true;
+ })
+ .onUpdate((e) => {
+ offset.value = {
+ x: e.translationX + start.value.x,
+ y: e.translationY + start.value.y,
+ };
+ })
+ .onEnd(() => {
+ start.value = {
+ x: offset.value.x,
+ y: offset.value.y,
+ };
+ })
+ .onFinalize(() => {
+ isPressed.value = false;
+ });
+```
+
+```jsx {3}
+...
+return (
+
+
+
+);
+...
+```
diff --git a/docs/versioned_docs/version-2.4.0/troubleshooting.md b/docs/versioned_docs/version-2.4.0/troubleshooting.md
new file mode 100644
index 0000000000..3ce6df850c
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/troubleshooting.md
@@ -0,0 +1,35 @@
+---
+id: troubleshooting
+title: Troubleshooting
+---
+
+## Troubleshooting
+
+Thanks for giving this library a try! We are sorry that you might have encountered issues though. Here is how you can seek help:
+
+1. Search over the [issues on Github](https://github.com/software-mansion/react-native-gesture-handler/issues). There is a chance someone had this problem in the past and it has been resolved!
+2. When sure your problem hasn't been reported or was reported but the proposed solution doesn't work for you please follow [our issue reporting guidelines](#reporting-issues).
+3. You can try seeking help on [Expo Developers Discord](https://chat.expo.dev/) where we often hang out.
+4. If you feel like reading the source code I highly recommend it, as this is by far the best resource and gives you the most up to date insights into how the library works and what might be causing the bug.
+5. If you managed to find the solution consider [contributing](introduction.md#contributing) a fix or update our documentation to make this information easier to find for the others in the future.
+
+## Reporting issues
+
+This library is maintained by a very small team.
+Please be mindful of that when reporting issue and when it happens that we can't get back to you as soon as you might expect.
+We would love to fix all the problems as soon as possible, but often our time is constraint with other issues/features or projects.
+To make it easier for us to understand your issue and to be able to approach it sooner you can help by:
+
+- Making sure the issue description is complete. Please include all the details about your environment (library version, RN version, device OS etc).
+- It is the best to provide an example app that reproduces the issue you are having. Put it up on [gist](https://gist.github.com/), [snack](https://snack.expo.io) or create a repo on Github – it doesn't matter as long as we can easily pull it in, run and see the issue.
+- Explain how you run your repro app and what steps to take to reproduce the issue.
+- Isolate your issue from other dependencies you might be using and make the repro app as minimal as possible.
+- If you have spent some time figuring out the root cause of the problem you can leave a note about your findings so far.
+- **Do not comment on closed issues**. It is very unlikely that we are going to notice your comment in such a case. If the issue has been closed, but the proposed solution doesn't work for you, please open a new one providing all the information necessary and linking to the solution you have tried.
+
+## It's not a bug, it's a feature
+
+- Changing `enabled` prop during a gesture has no effect, only when a gesture starts (that is a finger touches the screen) the `enabled` prop is taken into consideration to decide whether to extract (or not) the gesture and provide it with stream of events to analyze.
+- `Native` gesture may not conform to the standard state flow due to platform specific workarounds to incorporate native views into RNGH.
+- Keep in mind that `Touchables` from RNGH are rendering two additional views that may need to be styled separately to achieve desired effect (`style` and `containerStyle` props).
+- In order for the gesture composition to work, all composed gestures must be attached to the same `GestureHandlerRootView`.
diff --git a/docs/versioned_docs/version-2.4.0/under-the-hood/how-does-it-work.md b/docs/versioned_docs/version-2.4.0/under-the-hood/how-does-it-work.md
new file mode 100644
index 0000000000..aebed78316
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/under-the-hood/how-does-it-work.md
@@ -0,0 +1,22 @@
+---
+id: how-does-it-work
+title: How does it work?
+sidebar_label: How does it work?
+---
+
+### Units
+
+All handler component properties and event attributes that represent onscreen dimensions are expressed in screen density independent units we refer to as "points".
+These are the units commonly used in React Native ecosystem (e.g. in the [layout system](http://facebook.github.io/react-native/docs/flexbox.html)).
+They do not map directly to physical pixels but instead to [iOS's points](https://developer.apple.com/library/content/documentation/2DDrawing/Conceptual/DrawingPrintingiOS/GraphicsDrawingOverview/GraphicsDrawingOverview.html#//apple_ref/doc/uid/TP40010156-CH14-SW7) and to [dp](https://developer.android.com/guide/topics/resources/more-resources#Dimension) units on Android.
+
+## iOS
+
+All gestures are implemented using [UIGestureRecognizers](https://developer.apple.com/documentation/uikit/uigesturerecognizer?language=objc), some of them have been slightly modified to allow for more customization and to conform to the state flow of RNGH. When you assign a gesture configuration to the `GestureDetector`, it creates all the required recognizers and assigns them to the child view of the detector. From this point most of the heavy lifting is handled by the [UIKit](https://developer.apple.com/documentation/uikit?language=objc) (with our help to correctly implement interactions between gestures).
+
+## Android
+
+Unfortunately, Android doesn't provide an easy way of handling gestures hence most of them were implemented from scratch, including a system for managing how the gestures should interact with each other. Here's a quick overview of how it works:
+When you wrap a component with `GestureHandlerRootView` it allows for the RNGH to intercept all touch events on that component and process them, deciding whether they should be handled by one of the gesture handlers or passed to the underlying view. Gesture handlers are created when you assign a gesture configuration to the `GestureDetector`, it initializes all of the necessary handlers natively. Every `GestureHandlerRootView` also has a specific handler to decide whether to pass the touch events or to consume them. It can never activate, only begin, end or be cancelled. When this handler is in the `UNDETERMINED` state it means that there is no touch in progress, however when the touch starts it transitions to the `BEGAN` state. As long as it stays in that state, no touch event is consumed, but as soon as it gets cancelled (meaning that some handler has activated) all incoming touch events get consumed, preventing underlying view from receiving them.
+
+When a pointer touches the screen the view tree is traversed in order to extract all handlers attached to the views below the finger (including the one attached to the `GestureHandlerRootView`) and all extracted handlers transition to the `BEGAN` state, signalling that the gesture may heve began. The touch events continue to be delivered to all extracted handlers until one of them recognizes the gesture and tries to activate. At this point the orchestrator checks whether this gesture should wait for any other of the extracted gestures to fail. If it does, it's put to the waiting list, if it doesn't, it gets activated and all other gestures (that are not simultaneous with it) get cancelled. When a gesture handlers transitions to a finished state (the gesture recognized by it stops, it fails or gets cancelled) the orchestrator check the waiting handlers. Every one of them that waited for the gesture that just failed tries to activate again (and again the orchestrator checks if it should wait for any of the extracted gestures...).
diff --git a/docs/versioned_docs/version-2.4.0/under-the-hood/states-events.md b/docs/versioned_docs/version-2.4.0/under-the-hood/states-events.md
new file mode 100644
index 0000000000..600f16a5cc
--- /dev/null
+++ b/docs/versioned_docs/version-2.4.0/under-the-hood/states-events.md
@@ -0,0 +1,94 @@
+---
+id: states-events
+title: Gesture states & events
+sidebar_label: Gesture states & events
+---
+
+Every gesture can be treated as ["state machine"](https://en.wikipedia.org/wiki/Finite-state_machine).
+At any given time, each handler instance has an assigned state that can change when new touch events occur or can be forced to change by the touch system in certain circumstances.
+
+A gesture can be in one of the six possible states:
+
+- #### UNDETERMINED
+
+ This is the initial state of each gesture recognizer and it goes into this state after it's done recognizing a gesture.
+
+- #### FAILED
+
+ A gesture recognizer received some touches but for some reason didn't recognize them. For example, if a finger travels more distance than a defined `maxDist` property allows, then the gesture won't become active but will fail instead. Afterwards, it's state will be reset to `UNDETERMINED`.
+
+- #### BEGAN
+
+ Gesture recognizer has started receiving touch stream but hasn't yet received enough data to either [fail](#failed) or [activate](#active).
+
+- #### CANCELLED
+
+ The gesture recognizer has received a signal (possibly new touches or a command from the touch system controller) resulting in the cancellation of a continuous gesture. The gesture's state will become `CANCELLED` until it is finally reset to the initial state, `UNDETERMINED`.
+
+- #### ACTIVE
+
+ Recognizer has recognized a gesture. It will become and stay in the `ACTIVE` state until the gesture finishes (e.g. when user lifts the finger) or gets cancelled by the touch system. Under normal circumstances the state will then turn into `END`. In the case that a gesture is cancelled by the touch system, its state would then become `CANCELLED`.
+
+- #### END
+
+ The gesture recognizer has received touches signalling the end of a gesture. Its state will become `END` until it is reset to `UNDETERMINED`.
+
+## State flows
+
+The most typical flow of state is when a gesture picks up on an initial touch event, then recognizes it, then acknowledges its ending and resets itself back to the initial state.
+
+The flow looks as follows (longer arrows represent that there are possibly more touch events received before the state changes):
+
+[`UNDETERMINED`](#undetermined) -> [`BEGAN`](#began) ------> [`ACTIVE`](#active) ------> [`END`](#end) -> [`UNDETERMINED`](#undetermined)
+
+Another possible flow is when a handler receives touches that cause a recognition failure:
+
+[`UNDETERMINED`](#undetermined) -> [`BEGAN`](#began) ------> [`FAILED`](#failed) -> [`UNDETERMINED`](#undetermined)
+
+At last, when a handler does properly recognize the gesture but then is interrupted by the touch system the gesture recognition is canceled and the flow looks as follows:
+
+[`UNDETERMINED`](#undetermined) -> [`BEGAN`](#began) ------> [`ACTIVE`](#active) ------> [`CANCELLED`](#cancelled) -> [`UNDETERMINED`](#undetermined)
+
+## Events
+
+There are three types of events in RNGH2: `StateChangeEvent`, `GestureEvent` and `PointerEvent`. The `StateChangeEvent` is send every time a gesture moves to a different state, while `GestureEvent` is send every time a gesture is updated. The first two carry a gesture-specific data and a `state` property, indicating the current state of the gesture. `StateChangeEvent` also carries a `oldState` property indicating the previous state of the gesture. `PointerEvent` carries information about raw touch events, like touching the screen or moving the finger. These events are handled internally before they are passed along to the correct callbacks:
+
+### `onBegin`
+
+Is called when a gesture transitions to the [`BEGAN`](#began) state.
+
+### `onStart`
+
+Is called when a gesture transitions to the [`ACTIVE`](#active) state.
+
+### `onEnd`
+
+Is called when a gesture transitions from the [`ACTIVE`](#active) state to the [`END`](#end), [`FAILED`](#failed), or [`CANCELLED`](#cancelled) state. If the gesture transitions to the [`END`](#end) state, the `success` argument is set to `true` otherwise it is set to `false`.
+
+### `onFinalize`
+
+Is called when a gesture transitions to the [`END`](#end), [`FAILED`](#failed), or [`CANCELLED`](#cancelled) state. If the gesture transitions to the [`END`](#end) state, the `success` argument is set to `true` otherwise it is set to `false`. If the gesture transitions from the [`ACTIVE`](#active) state, it will be called after `onEnd`.
+
+### `onUpdate`
+
+Is called every time a gesture is updated while it is in the [`ACTIVE`](#active) state.
+
+### `onPointerDown`
+
+Is called when new pointers are placed on the screen. It may carry information about more than one pointer because the events are batched.
+
+### `onPointerMove`
+
+Is called when pointers are moved on the screen. It may carry information about more than one pointer because the events are batched.
+
+### `onPointerUp`
+
+Is called when pointers are lifted from the screen. It may carry information about more than one pointer because the events are batched.
+
+### `onPointerCancelled`
+
+Is called when there will be no more information about this pointer. It may be called because the gesture has ended or was interrupted. It may carry information about more than one pointer because the events are batched.
+
+### `onPointerChange`
+
+Is called before `onPointerDown`, `onPointerMove`, `onPointerUp` and `onPointerCancelled` with the same event, which may be useful in case you share logic between them. It may carry information about more than one pointer because the events are batched.
diff --git a/docs/versioned_sidebars/version-2.4.0-sidebars.json b/docs/versioned_sidebars/version-2.4.0-sidebars.json
new file mode 100644
index 0000000000..00ccf47473
--- /dev/null
+++ b/docs/versioned_sidebars/version-2.4.0-sidebars.json
@@ -0,0 +1,214 @@
+{
+ "version-2.4.0/docs": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/introduction"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/installation"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/troubleshooting"
+ },
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "Guides",
+ "items": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/quickstart/quickstart"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-composition"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/manual-gestures/manual-gestures"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/under-the-hood/states-events"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/basics/about-handlers"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/basics/interactions"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/guides/testing"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/guides/migrating-off-rnghenabledroot"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/guides/upgrading-to-2"
+ }
+ ]
+ },
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "API reference",
+ "items": [
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "Gestures",
+ "items": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/gesture-detector"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/pan-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/tap-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/long-press-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/rotation-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/pinch-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/fling-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/force-touch-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/native-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/manual-gesture"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/composed-gestures"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/touch-events"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/gestures/state-manager"
+ }
+ ]
+ },
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "Components",
+ "items": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/components/buttons"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/components/swipeable"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/components/touchables"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/components/drawer-layout"
+ }
+ ]
+ },
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "Gesture Handlers",
+ "items": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/common-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/pan-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/tap-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/longpress-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/rotation-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/fling-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/pinch-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/force-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/nativeview-gh"
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/gesture-handlers/api/create-native-wrapper"
+ }
+ ]
+ },
+ {
+ "type": "doc",
+ "id": "version-2.4.0/api/test-api"
+ }
+ ]
+ },
+ {
+ "collapsed": true,
+ "type": "category",
+ "label": "Under the hood",
+ "items": [
+ {
+ "type": "doc",
+ "id": "version-2.4.0/under-the-hood/how-does-it-work"
+ }
+ ]
+ }
+ ]
+}
diff --git a/docs/versions.json b/docs/versions.json
index fc36a52558..22ea8ba0a4 100644
--- a/docs/versions.json
+++ b/docs/versions.json
@@ -1,4 +1,5 @@
[
+ "2.4.0",
"2.3.0",
"2.1.1",
"2.0.0",
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 7ec1775951..4383e2fdfb 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -2259,9 +2259,9 @@ async-limiter@~1.0.0:
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
async@^2.6.1, async@^2.6.2:
- version "2.6.3"
- resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
- integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+ version "2.6.4"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+ integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
dependencies:
lodash "^4.17.14"
@@ -4119,9 +4119,9 @@ events@^3.0.0:
integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
eventsource@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
- integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+ integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
dependencies:
original "^1.0.0"
@@ -6478,9 +6478,9 @@ minimatch@3.0.4, minimatch@^3.0.4:
brace-expansion "^1.1.7"
minimist@^1.2.0, minimist@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
- integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+ integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
minipass-collect@^1.0.2:
version "1.0.2"
diff --git a/example/.eslintrc.js b/example/.eslintrc.js
new file mode 100644
index 0000000000..40c6dcd05f
--- /dev/null
+++ b/example/.eslintrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+ root: true,
+ extends: '@react-native-community',
+};
diff --git a/example/.gitignore b/example/.gitignore
index 6a5e410aba..2efd719f44 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -59,5 +59,6 @@ buck-out/
# Bundle artifact
*.jsbundle
-# CocoaPods
+# Ruby / CocoaPods
/ios/Pods/
+/vendor/bundle/
diff --git a/example/.prettierrc.json b/example/.prettierrc.json
index 6e5e96b3c5..792c8d89e6 100644
--- a/example/.prettierrc.json
+++ b/example/.prettierrc.json
@@ -1,5 +1,5 @@
{
- "jsxBracketSameLine": true,
+ "bracketSameLine": true,
"printWidth": 80,
"tabWidth": 2,
"semi": true,
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 22c41e14ef..3c27b46b14 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -127,7 +127,10 @@ def enableHermes = project.ext.react.get("enableHermes", false);
/**
* Architectures to build native code for in debug.
*/
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+def reactNativeArchitectures() {
+ def value = project.getProperties().get("reactNativeArchitectures")
+ return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
android {
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -138,13 +141,72 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
+ buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+ if (isNewArchitectureEnabled()) {
+ // We configure the NDK build only if you decide to opt-in for the New Architecture.
+ externalNativeBuild {
+ ndkBuild {
+ arguments "APP_PLATFORM=android-21",
+ "APP_STL=c++_shared",
+ "NDK_TOOLCHAIN_VERSION=clang",
+ "GENERATED_SRC_DIR=$buildDir/generated/source",
+ "PROJECT_BUILD_DIR=$buildDir",
+ "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+ "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build"
+ cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+ cppFlags "-std=c++17"
+ // Make sure this target name is the same you specify inside the
+ // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+ targets "example_appmodules"
+ }
+ }
+ }
+ }
+ if (isNewArchitectureEnabled()) {
+ // We configure the NDK build only if you decide to opt-in for the New Architecture.
+ externalNativeBuild {
+ ndkBuild {
+ path "$projectDir/src/main/jni/Android.mk"
+ }
+ }
+ def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+ def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+ dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+ from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+ into("$buildDir/react-ndk/exported")
+ }
+ def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+ dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+ from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+ into("$buildDir/react-ndk/exported")
+ }
+ afterEvaluate {
+ // If you wish to add a custom TurboModule or component locally,
+ // you should uncomment this line.
+ // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+ preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+ preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+ // Due to a bug inside AGP, we have to explicitly set a dependency
+ // between configureNdkBuild* tasks and the preBuild tasks.
+ // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+ configureNdkBuildRelease.dependsOn(preReleaseBuild)
+ configureNdkBuildDebug.dependsOn(preDebugBuild)
+ reactNativeArchitectures().each { architecture ->
+ tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+ dependsOn("preDebugBuild")
+ }
+ tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+ dependsOn("preReleaseBuild")
+ }
+ }
+ }
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
- include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+ include (*reactNativeArchitectures())
}
}
signingConfigs {
@@ -158,11 +220,6 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
- if (nativeArchitectures) {
- ndk {
- abiFilters nativeArchitectures.split(',')
- }
- }
}
release {
// Caution! In production, you need to generate your own keystore file.
@@ -221,6 +278,18 @@ dependencies {
}
}
+if (isNewArchitectureEnabled()) {
+ // If new architecture is enabled, we let you build RN from source
+ // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+ // This will be applied to all the imported transtitive dependency.
+ configurations.all {
+ resolutionStrategy.dependencySubstitution {
+ substitute(module("com.facebook.react:react-native"))
+ .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source")
+ }
+ }
+}
+
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
@@ -229,3 +298,11 @@ task copyDownloadableDepsToLibs(type: Copy) {
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+ // To opt-in for the New Architecture, you can either:
+ // - Set `newArchEnabled` to true inside the `gradle.properties` file
+ // - Invoke gradle with `-newArchEnabled=true`
+ // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+ return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
diff --git a/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java b/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
index a1b70b8aa2..2c80a80313 100644
--- a/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
+++ b/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
@@ -19,6 +19,7 @@
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
@@ -51,7 +52,7 @@ public void apply(OkHttpClient.Builder builder) {
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
- new ReactInstanceManager.ReactInstanceEventListener() {
+ new ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 6e27a2a310..a16f9e42bc 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -13,15 +13,16 @@
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
-
+
diff --git a/example/android/app/src/main/java/com/example/MainActivity.java b/example/android/app/src/main/java/com/example/MainActivity.java
index 557797a890..d6c1569976 100644
--- a/example/android/app/src/main/java/com/example/MainActivity.java
+++ b/example/android/app/src/main/java/com/example/MainActivity.java
@@ -1,6 +1,8 @@
package com.example;
import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
public class MainActivity extends ReactActivity {
@@ -12,4 +14,25 @@ public class MainActivity extends ReactActivity {
protected String getMainComponentName() {
return "Example";
}
+
+ /**
+ * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
+ * you can specify the rendered you wish to use (Fabric or the older renderer).
+ */
+ @Override
+ protected ReactActivityDelegate createReactActivityDelegate() {
+ return new MainActivityDelegate(this, getMainComponentName());
+ }
+ public static class MainActivityDelegate extends ReactActivityDelegate {
+ public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
+ super(activity, mainComponentName);
+ }
+ @Override
+ protected ReactRootView createRootView() {
+ ReactRootView reactRootView = new ReactRootView(getContext());
+ // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+ reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+ return reactRootView;
+ }
+ }
}
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
index f022d35521..4b83cec3da 100644
--- a/example/android/app/src/main/java/com/example/MainApplication.java
+++ b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -7,6 +7,7 @@
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.soloader.SoLoader;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -43,14 +44,22 @@ protected JSIModulePackage getJSIModulePackage() {
}
};
+ private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
+
@Override
public ReactNativeHost getReactNativeHost() {
- return mReactNativeHost;
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ return mNewArchitectureNativeHost;
+ } else {
+ return mReactNativeHost;
+ }
}
@Override
public void onCreate() {
super.onCreate();
+ // If you opted-in for the New Architecture, we enable the TurboModule system
+ ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
SoLoader.init(this, /* native exopackage */ false);
initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
diff --git a/example/android/app/src/main/java/com/example/MainApplicationReactNativeHost.java b/example/android/app/src/main/java/com/example/MainApplicationReactNativeHost.java
new file mode 100644
index 0000000000..94d4fe8569
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/MainApplicationReactNativeHost.java
@@ -0,0 +1,102 @@
+package com.example;
+
+import android.app.Application;
+import androidx.annotation.NonNull;
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleProvider;
+import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.react.fabric.CoreComponentsRegistry;
+import com.facebook.react.fabric.EmptyReactNativeConfig;
+import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.example.BuildConfig;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
+ * TurboModule delegates and the Fabric Renderer.
+ *
+ * Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationReactNativeHost extends ReactNativeHost {
+ public MainApplicationReactNativeHost(Application application) {
+ super(application);
+ }
+ @Override
+ public boolean getUseDeveloperSupport() {
+ return BuildConfig.DEBUG;
+ }
+ @Override
+ protected List getPackages() {
+ List packages = new PackageList(this).getPackages();
+ // Packages that cannot be autolinked yet can be added manually here, for example:
+ // packages.add(new MyReactNativePackage());
+ // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
+ // packages.add(new TurboReactPackage() { ... });
+ // If you have custom Fabric Components, their ViewManagers should also be loaded here
+ // inside a ReactPackage.
+ return packages;
+ }
+ @Override
+ protected String getJSMainModuleName() {
+ return "index";
+ }
+ @NonNull
+ @Override
+ protected ReactPackageTurboModuleManagerDelegate.Builder
+ getReactPackageTurboModuleManagerDelegateBuilder() {
+ // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
+ // for the new architecture and to use TurboModules correctly.
+ return new MainApplicationTurboModuleManagerDelegate.Builder();
+ }
+ @Override
+ protected JSIModulePackage getJSIModulePackage() {
+ return new JSIModulePackage() {
+ @Override
+ public List getJSIModules(
+ final ReactApplicationContext reactApplicationContext,
+ final JavaScriptContextHolder jsContext) {
+ final List specs = new ArrayList<>();
+ // Here we provide a new JSIModuleSpec that will be responsible of providing the
+ // custom Fabric Components.
+ specs.add(
+ new JSIModuleSpec() {
+ @Override
+ public JSIModuleType getJSIModuleType() {
+ return JSIModuleType.UIManager;
+ }
+ @Override
+ public JSIModuleProvider getJSIModuleProvider() {
+ final ComponentFactory componentFactory = new ComponentFactory();
+ CoreComponentsRegistry.register(componentFactory);
+ // Here we register a Components Registry.
+ // The one that is generated with the template contains no components
+ // and just provides you the one from React Native core.
+ MainComponentsRegistry.register(componentFactory);
+ final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+ ViewManagerRegistry viewManagerRegistry =
+ new ViewManagerRegistry(
+ reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+ return new FabricJSIModuleProvider(
+ reactApplicationContext,
+ componentFactory,
+ new EmptyReactNativeConfig(),
+ viewManagerRegistry);
+ }
+ });
+ return specs;
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/example/android/app/src/main/java/com/example/MainApplicationTurboModuleManagerDelegate.java b/example/android/app/src/main/java/com/example/MainApplicationTurboModuleManagerDelegate.java
new file mode 100644
index 0000000000..8fd0f3cab9
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/MainApplicationTurboModuleManagerDelegate.java
@@ -0,0 +1,41 @@
+package com.example;
+
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+/**
+ * Class responsible to load the TurboModules. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationTurboModuleManagerDelegate
+ extends ReactPackageTurboModuleManagerDelegate {
+ private static volatile boolean sIsSoLibraryLoaded;
+ protected MainApplicationTurboModuleManagerDelegate(
+ ReactApplicationContext reactApplicationContext, List packages) {
+ super(reactApplicationContext, packages);
+ }
+ protected native HybridData initHybrid();
+ native boolean canCreateTurboModule(String moduleName);
+ public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+ protected MainApplicationTurboModuleManagerDelegate build(
+ ReactApplicationContext context, List packages) {
+ return new MainApplicationTurboModuleManagerDelegate(context, packages);
+ }
+ }
+ @Override
+ protected synchronized void maybeLoadOtherSoLibraries() {
+ if (!sIsSoLibraryLoaded) {
+ // If you change the name of your application .so file in the Android.mk file,
+ // make sure you update the name here as well.
+ SoLoader.loadLibrary("rndiffapp_appmodules");
+ sIsSoLibraryLoaded = true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/example/android/app/src/main/java/com/example/MainComponentsRegistry.java b/example/android/app/src/main/java/com/example/MainComponentsRegistry.java
new file mode 100644
index 0000000000..f7fff5db70
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/MainComponentsRegistry.java
@@ -0,0 +1,31 @@
+package com.example;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.soloader.SoLoader;
+/**
+ * Class responsible to load the custom Fabric Components. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+@DoNotStrip
+public class MainComponentsRegistry {
+ static {
+ SoLoader.loadLibrary("fabricjni");
+ }
+ @DoNotStrip private final HybridData mHybridData;
+ @DoNotStrip
+ private native HybridData initHybrid(ComponentFactory componentFactory);
+ @DoNotStrip
+ private MainComponentsRegistry(ComponentFactory componentFactory) {
+ mHybridData = initHybrid(componentFactory);
+ }
+ @DoNotStrip
+ public static MainComponentsRegistry register(ComponentFactory componentFactory) {
+ return new MainComponentsRegistry(componentFactory);
+ }
+}
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/Android.mk b/example/android/app/src/main/jni/Android.mk
new file mode 100644
index 0000000000..c26f9362a7
--- /dev/null
+++ b/example/android/app/src/main/jni/Android.mk
@@ -0,0 +1,40 @@
+THIS_DIR := $(call my-dir)
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to include the following autogenerated makefile.
+# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
+include $(CLEAR_VARS)
+LOCAL_PATH := $(THIS_DIR)
+# You can customize the name of your application .so file here.
+LOCAL_MODULE := example_appmodules
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to uncomment those lines to include the generated source
+# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
+#
+# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# Here you should add any native library you wish to depend on.
+LOCAL_SHARED_LIBRARIES := \
+ libfabricjni \
+ libfbjni \
+ libfolly_futures \
+ libfolly_json \
+ libglog \
+ libjsi \
+ libreact_codegen_rncore \
+ libreact_debug \
+ libreact_nativemodule_core \
+ libreact_render_componentregistry \
+ libreact_render_core \
+ libreact_render_debug \
+ libreact_render_graphics \
+ librrc_view \
+ libruntimeexecutor \
+ libturbomodulejsijni \
+ libyoga
+LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp
new file mode 100644
index 0000000000..4b722c7a12
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -0,0 +1,20 @@
+#include "MainApplicationModuleProvider.h"
+#include
+namespace facebook {
+namespace react {
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms) {
+ // Here you can provide your own module provider for TurboModules coming from
+ // either your application or from external libraries. The approach to follow
+ // is similar to the following (for a library called `samplelibrary`:
+ //
+ // auto module = samplelibrary_ModuleProvider(moduleName, params);
+ // if (module != nullptr) {
+ // return module;
+ // }
+ // return rncore_ModuleProvider(moduleName, params);
+ return rncore_ModuleProvider(moduleName, params);
+}
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainApplicationModuleProvider.h b/example/android/app/src/main/jni/MainApplicationModuleProvider.h
new file mode 100644
index 0000000000..f89ddbd02d
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -0,0 +1,11 @@
+#pragma once
+#include
+#include
+#include
+namespace facebook {
+namespace react {
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms);
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
new file mode 100644
index 0000000000..decb4e17e0
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -0,0 +1,38 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+namespace facebook {
+namespace react {
+jni::local_ref
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+ jni::alias_ref) {
+ return makeCxxInstance();
+}
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+ registerHybrid({
+ makeNativeMethod(
+ "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+ makeNativeMethod(
+ "canCreateTurboModule",
+ MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+ });
+}
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) {
+ // Not implemented yet: provide pure-C++ NativeModules here.
+ return nullptr;
+}
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) {
+ return MainApplicationModuleProvider(name, params);
+}
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+ std::string name) {
+ return getTurboModule(name, nullptr) != nullptr ||
+ getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
new file mode 100644
index 0000000000..051d962cf7
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -0,0 +1,30 @@
+#include
+#include
+#include
+#include
+namespace facebook {
+namespace react {
+class MainApplicationTurboModuleManagerDelegate
+ : public jni::HybridClass<
+ MainApplicationTurboModuleManagerDelegate,
+ TurboModuleManagerDelegate> {
+ public:
+ // Adapt it to the package you used for your Java class.
+ static constexpr auto kJavaDescriptor =
+ "Lcom/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+ static jni::local_ref initHybrid(jni::alias_ref);
+ static void registerNatives();
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) override;
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) override;
+ /**
+ * Test-only method. Allows user to verify whether a TurboModule can be
+ * created by instances of this class.
+ */
+ bool canCreateTurboModule(std::string name);
+};
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainComponentsRegistry.cpp b/example/android/app/src/main/jni/MainComponentsRegistry.cpp
new file mode 100644
index 0000000000..01da5875a8
--- /dev/null
+++ b/example/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -0,0 +1,48 @@
+#include "MainComponentsRegistry.h"
+#include
+#include
+#include
+#include
+namespace facebook {
+namespace react {
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+std::shared_ptr
+MainComponentsRegistry::sharedProviderRegistry() {
+ auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+ // Custom Fabric Components go here. You can register custom
+ // components coming from your App or from 3rd party libraries here.
+ //
+ // providerRegistry->add(concreteComponentDescriptorProvider<
+ // AocViewerComponentDescriptor>());
+ return providerRegistry;
+}
+jni::local_ref
+MainComponentsRegistry::initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate) {
+ auto instance = makeCxxInstance(delegate);
+ auto buildRegistryFunction =
+ [](EventDispatcher::Weak const &eventDispatcher,
+ ContextContainer::Shared const &contextContainer)
+ -> ComponentDescriptorRegistry::Shared {
+ auto registry = MainComponentsRegistry::sharedProviderRegistry()
+ ->createComponentDescriptorRegistry(
+ {eventDispatcher, contextContainer});
+ auto mutableRegistry =
+ std::const_pointer_cast(registry);
+ mutableRegistry->setFallbackComponentDescriptor(
+ std::make_shared(
+ ComponentDescriptorParameters{
+ eventDispatcher, contextContainer, nullptr}));
+ return registry;
+ };
+ delegate->buildRegistryFunction = buildRegistryFunction;
+ return instance;
+}
+void MainComponentsRegistry::registerNatives() {
+ registerHybrid({
+ makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+ });
+}
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/MainComponentsRegistry.h b/example/android/app/src/main/jni/MainComponentsRegistry.h
new file mode 100644
index 0000000000..068f82b6fb
--- /dev/null
+++ b/example/android/app/src/main/jni/MainComponentsRegistry.h
@@ -0,0 +1,24 @@
+#pragma once
+#include
+#include
+#include
+#include
+namespace facebook {
+namespace react {
+class MainComponentsRegistry
+ : public facebook::jni::HybridClass {
+ public:
+ // Adapt it to the package you used for your Java class.
+ constexpr static auto kJavaDescriptor =
+ "Lcom/example/newarchitecture/components/MainComponentsRegistry;";
+ static void registerNatives();
+ MainComponentsRegistry(ComponentFactory *delegate);
+ private:
+ static std::shared_ptr
+ sharedProviderRegistry();
+ static jni::local_ref initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate);
+};
+} // namespace react
+} // namespace facebook
\ No newline at end of file
diff --git a/example/android/app/src/main/jni/OnLoad.cpp b/example/android/app/src/main/jni/OnLoad.cpp
new file mode 100644
index 0000000000..6f2082d2a2
--- /dev/null
+++ b/example/android/app/src/main/jni/OnLoad.cpp
@@ -0,0 +1,10 @@
+#include
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+ return facebook::jni::initialize(vm, [] {
+ facebook::react::MainApplicationTurboModuleManagerDelegate::
+ registerNatives();
+ facebook::react::MainComponentsRegistry::registerNatives();
+ });
+}
\ No newline at end of file
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 88566b8121..4d17f64050 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -3,17 +3,19 @@
buildscript {
ext.kotlin_version = '1.5.20'
ext {
- buildToolsVersion = "30.0.2"
+ buildToolsVersion = "31.0.0"
minSdkVersion = 21
- compileSdkVersion = 30
- targetSdkVersion = 30
+ compileSdkVersion = 31
+ targetSdkVersion = 31
}
repositories {
google()
jcenter()
}
dependencies {
- classpath("com.android.tools.build:gradle:4.2.2")
+ classpath("com.android.tools.build:gradle:7.0.4")
+ classpath("com.facebook.react:react-native-gradle-plugin")
+ classpath("de.undercouch:gradle-download-task:4.1.2")
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 30f0c824f9..83b98f1ea8 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -10,7 +10,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
@@ -25,4 +26,14 @@ android.useAndroidX=true
android.enableJetifier=true
# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.99.0
+FLIPPER_VERSION=0.125.0
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index a0f7639f7d..669386b870 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/example/android/gradlew b/example/android/gradlew
index 2fe81a7d95..a58591e97b 100755
--- a/example/android/gradlew
+++ b/example/android/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
\ No newline at end of file
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index 5635978020..9a329b33c5 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -3,3 +3,9 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
include ':app'
include ':react-native-gesture-handler'
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../../android')
+
+includeBuild('../node_modules/react-native-gradle-plugin')
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+ include(":ReactAndroid")
+ project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+}
diff --git a/example/ios/Example.xcodeproj/project.pbxproj b/example/ios/Example.xcodeproj/project.pbxproj
index 3f9128c743..ea52a3c442 100644
--- a/example/ios/Example.xcodeproj/project.pbxproj
+++ b/example/ios/Example.xcodeproj/project.pbxproj
@@ -9,10 +9,10 @@
/* Begin PBXBuildFile section */
00E356F31AD99517003FC87E /* ExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ExampleTests.m */; };
110A0048258675A500B148CB /* MBFingerTipWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 110A0046258675A400B148CB /* MBFingerTipWindow.m */; };
- 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+ 2D02E4BC1E0B4A80006451C7 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DCD954D1E0B4F2C00145EB5 /* ExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ExampleTests.m */; };
@@ -50,7 +50,7 @@
110A0047258675A500B148CB /* MBFingerTipWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBFingerTipWindow.h; sourceTree = ""; };
13B07F961A680F5B00A75B9A /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Example/AppDelegate.h; sourceTree = ""; };
- 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Example/AppDelegate.m; sourceTree = ""; };
+ 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Example/AppDelegate.mm; sourceTree = ""; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Example/Images.xcassets; sourceTree = ""; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Example/Info.plist; sourceTree = ""; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Example/main.m; sourceTree = ""; };
@@ -132,7 +132,7 @@
110A0046258675A400B148CB /* MBFingerTipWindow.m */,
008F07F21AC5B25A0029DE68 /* main.jsbundle */,
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
- 13B07FB01A68108700A75B9A /* AppDelegate.m */,
+ 13B07FB01A68108700A75B9A /* AppDelegate.mm */,
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
@@ -509,11 +509,13 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
+ "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
@@ -529,11 +531,13 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
+ "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
@@ -616,7 +620,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
110A0048258675A500B148CB /* MBFingerTipWindow.m in Sources */,
);
@@ -627,7 +631,7 @@
buildActionMask = 2147483647;
files = (
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */,
- 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */,
+ 2D02E4BC1E0B4A80006451C7 /* AppDelegate.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/example/ios/Example/AppDelegate.m b/example/ios/Example/AppDelegate.m
deleted file mode 100644
index b5748fa704..0000000000
--- a/example/ios/Example/AppDelegate.m
+++ /dev/null
@@ -1,61 +0,0 @@
-#import "AppDelegate.h"
-
-#import
-#import
-#import
-#import "MBFingerTipWindow.h"
-
-#ifdef FB_SONARKIT_ENABLED
-#import
-#import
-#import
-#import
-#import
-#import
-
-static void InitializeFlipper(UIApplication *application) {
- FlipperClient *client = [FlipperClient sharedClient];
- SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
- [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
- [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
- [client addPlugin:[FlipperKitReactPlugin new]];
- [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
- [client start];
-}
-#endif
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-#ifdef FB_SONARKIT_ENABLED
- InitializeFlipper(application);
-#endif
-
- RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
- RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
- moduleName:@"Example"
- initialProperties:nil];
-
- rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
-
- MBFingerTipWindow *window = [[MBFingerTipWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
- window.alwaysShowTouches = YES;
- self.window = window;
- UIViewController *rootViewController = [UIViewController new];
- rootViewController.view = rootView;
- self.window.rootViewController = rootViewController;
- [self.window makeKeyAndVisible];
- return YES;
-}
-
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-#if DEBUG
- return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-#else
- return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#endif
-}
-
-@end
diff --git a/example/ios/Example/AppDelegate.mm b/example/ios/Example/AppDelegate.mm
new file mode 100644
index 0000000000..594681eec1
--- /dev/null
+++ b/example/ios/Example/AppDelegate.mm
@@ -0,0 +1,168 @@
+#import "AppDelegate.h"
+#import "MBFingerTipWindow.h"
+#import
+#import
+#import
+#import
+#if RCT_NEW_ARCH_ENABLED
+#import
+#import
+#import
+#import
+#import
+#import
+
+#import
+
+@interface AppDelegate () {
+ RCTTurboModuleManager *_turboModuleManager;
+ RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
+ std::shared_ptr _reactNativeConfig;
+ facebook::react::ContextContainer::Shared _contextContainer;
+}
+@end
+#endif
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+ RCTAppSetupPrepareApp(application);
+ RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+
+#if RCT_NEW_ARCH_ENABLED
+ _contextContainer = std::make_shared();
+ _reactNativeConfig = std::make_shared();
+ _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+ _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
+ bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
+#endif
+
+ UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"Example", nil);
+
+ if (@available(iOS 13.0, *)) {
+ rootView.backgroundColor = [UIColor systemBackgroundColor];
+ } else {
+ rootView.backgroundColor = [UIColor whiteColor];
+ }
+
+ MBFingerTipWindow *window = [[MBFingerTipWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+ window.alwaysShowTouches = YES;
+ self.window = window;
+ UIViewController *rootViewController = [UIViewController new];
+ rootViewController.view = rootView;
+ self.window.rootViewController = rootViewController;
+ [self.window makeKeyAndVisible];
+ return YES;
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+#if DEBUG
+ return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+ return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+#if RCT_NEW_ARCH_ENABLED
+
+#pragma mark - RCTCxxBridgeDelegate
+
+- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+ _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+ delegate:self
+ jsInvoker:bridge.jsCallInvoker];
+ return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+}
+
+#pragma mark RCTTurboModuleManagerDelegate
+
+- (Class)getModuleClassFromName:(const char *)name
+{
+ return RCTCoreModulesClassProvider(name);
+}
+
+- (std::shared_ptr)getTurboModule:(const std::string &)name
+ jsInvoker:(std::shared_ptr)jsInvoker
+{
+ return nullptr;
+}
+
+- (std::shared_ptr)getTurboModule:(const std::string &)name
+ initParams:
+ (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+ return nullptr;
+}
+
+- (id)getModuleInstanceFromClass:(Class)moduleClass
+{
+ return RCTAppSetupDefaultModuleFromClass(moduleClass);
+}
+#endif
+
+@end
+
+// #import "AppDelegate.h"
+
+// #import
+// #import
+// #import
+// #import "MBFingerTipWindow.h"
+
+// #ifdef FB_SONARKIT_ENABLED
+// #import
+// #import
+// #import
+// #import
+// #import
+// #import
+
+// static void InitializeFlipper(UIApplication *application) {
+// FlipperClient *client = [FlipperClient sharedClient];
+// SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
+// [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
+// [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
+// [client addPlugin:[FlipperKitReactPlugin new]];
+// [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
+// [client start];
+// }
+// #endif
+
+// @implementation AppDelegate
+
+// - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+// {
+// #ifdef FB_SONARKIT_ENABLED
+// InitializeFlipper(application);
+// #endif
+
+// RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+// RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
+// moduleName:@"Example"
+// initialProperties:nil];
+
+// rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+
+// MBFingerTipWindow *window = [[MBFingerTipWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+// window.alwaysShowTouches = YES;
+// self.window = window;
+// UIViewController *rootViewController = [UIViewController new];
+// rootViewController.view = rootView;
+// self.window.rootViewController = rootViewController;
+// [self.window makeKeyAndVisible];
+// return YES;
+// }
+
+// - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+// {
+// #if DEBUG
+// return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+// #else
+// return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+// #endif
+// }
+
+// @end
diff --git a/example/ios/Podfile b/example/ios/Podfile
index c1d324cba5..fb0b642830 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -2,14 +2,21 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
platform :ios, '11.0'
+install! 'cocoapods', :deterministic_uuids => false
target 'Example' do
config = use_native_modules!
+ # Flags change depending on the env values.
+ flags = get_default_flags()
+
use_react_native!(
:path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods
- :hermes_enabled => false
+ :hermes_enabled => flags[:hermes_enabled],
+ :fabric_enabled => flags[:fabric_enabled],
+ # An absolute path to your application root.
+ :app_path => "#{Pod::Config.instance.installation_root}/.."
)
pod 'RNGestureHandler', :path => '../..'
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 50139e29ed..64e18b3b60 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -2,78 +2,79 @@ PODS:
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- - FBLazyVector (0.67.2)
- - FBReactNativeSpec (0.67.2):
+ - FBLazyVector (0.68.0)
+ - FBReactNativeSpec (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTRequired (= 0.67.2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - Flipper (0.99.0):
+ - RCTRequired (= 0.68.0)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Core (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - Flipper (0.125.0):
- Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.4)
- Flipper-Boost-iOSX (1.76.0.1.11)
- - Flipper-DoubleConversion (3.1.7)
+ - Flipper-DoubleConversion (3.2.0)
- Flipper-Fmt (7.1.7)
- - Flipper-Folly (2.6.7):
+ - Flipper-Folly (2.6.10):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- - OpenSSL-Universal (= 1.1.180)
- - Flipper-Glog (0.3.6)
+ - OpenSSL-Universal (= 1.1.1100)
+ - Flipper-Glog (0.5.0.4)
- Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.6)
- - FlipperKit (0.99.0):
- - FlipperKit/Core (= 0.99.0)
- - FlipperKit/Core (0.99.0):
- - Flipper (~> 0.99.0)
+ - FlipperKit (0.125.0):
+ - FlipperKit/Core (= 0.125.0)
+ - FlipperKit/Core (0.125.0):
+ - Flipper (~> 0.125.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- - FlipperKit/CppBridge (0.99.0):
- - Flipper (~> 0.99.0)
- - FlipperKit/FBCxxFollyDynamicConvert (0.99.0):
+ - SocketRocket (~> 0.6.0)
+ - FlipperKit/CppBridge (0.125.0):
+ - Flipper (~> 0.125.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
- Flipper-Folly (~> 2.6)
- - FlipperKit/FBDefines (0.99.0)
- - FlipperKit/FKPortForwarding (0.99.0):
+ - FlipperKit/FBDefines (0.125.0)
+ - FlipperKit/FKPortForwarding (0.125.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- - FlipperKit/FlipperKitHighlightOverlay (0.99.0)
- - FlipperKit/FlipperKitLayoutHelpers (0.99.0):
+ - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
+ - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- - FlipperKit/FlipperKitLayoutIOSDescriptors (0.99.0):
+ - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18)
- - FlipperKit/FlipperKitLayoutPlugin (0.99.0):
+ - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- - FlipperKit/FlipperKitLayoutTextSearchable (0.99.0)
- - FlipperKit/FlipperKitNetworkPlugin (0.99.0):
+ - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
+ - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitReactPlugin (0.99.0):
+ - FlipperKit/FlipperKitReactPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitUserDefaultsPlugin (0.99.0):
+ - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/SKIOSNetworkPlugin (0.99.0):
+ - FlipperKit/SKIOSNetworkPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- libevent (2.1.12)
- - OpenSSL-Universal (1.1.180)
+ - OpenSSL-Universal (1.1.1100)
- RCT-Folly (2021.06.28.00-v2):
- boost
- DoubleConversion
@@ -85,192 +86,201 @@ PODS:
- DoubleConversion
- fmt (~> 6.2.1)
- glog
- - RCTRequired (0.67.2)
- - RCTTypeSafety (0.67.2):
- - FBLazyVector (= 0.67.2)
+ - RCTRequired (0.68.0)
+ - RCTTypeSafety (0.68.0):
+ - FBLazyVector (= 0.68.0)
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTRequired (= 0.67.2)
- - React-Core (= 0.67.2)
- - React (0.67.2):
- - React-Core (= 0.67.2)
- - React-Core/DevSupport (= 0.67.2)
- - React-Core/RCTWebSocket (= 0.67.2)
- - React-RCTActionSheet (= 0.67.2)
- - React-RCTAnimation (= 0.67.2)
- - React-RCTBlob (= 0.67.2)
- - React-RCTImage (= 0.67.2)
- - React-RCTLinking (= 0.67.2)
- - React-RCTNetwork (= 0.67.2)
- - React-RCTSettings (= 0.67.2)
- - React-RCTText (= 0.67.2)
- - React-RCTVibration (= 0.67.2)
- - React-callinvoker (0.67.2)
- - React-Core (0.67.2):
+ - RCTRequired (= 0.68.0)
+ - React-Core (= 0.68.0)
+ - React (0.68.0):
+ - React-Core (= 0.68.0)
+ - React-Core/DevSupport (= 0.68.0)
+ - React-Core/RCTWebSocket (= 0.68.0)
+ - React-RCTActionSheet (= 0.68.0)
+ - React-RCTAnimation (= 0.68.0)
+ - React-RCTBlob (= 0.68.0)
+ - React-RCTImage (= 0.68.0)
+ - React-RCTLinking (= 0.68.0)
+ - React-RCTNetwork (= 0.68.0)
+ - React-RCTSettings (= 0.68.0)
+ - React-RCTText (= 0.68.0)
+ - React-RCTVibration (= 0.68.0)
+ - React-callinvoker (0.68.0)
+ - React-Codegen (0.68.0):
+ - FBReactNativeSpec (= 0.68.0)
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTRequired (= 0.68.0)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Core (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-Core (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-Core/Default (= 0.67.2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-Core/Default (= 0.68.0)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/CoreModulesHeaders (0.67.2):
+ - React-Core/CoreModulesHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/Default (0.67.2):
+ - React-Core/Default (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/DevSupport (0.67.2):
+ - React-Core/DevSupport (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-Core/Default (= 0.67.2)
- - React-Core/RCTWebSocket (= 0.67.2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-jsinspector (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-Core/Default (= 0.68.0)
+ - React-Core/RCTWebSocket (= 0.68.0)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-jsinspector (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTActionSheetHeaders (0.67.2):
+ - React-Core/RCTActionSheetHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTAnimationHeaders (0.67.2):
+ - React-Core/RCTAnimationHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTBlobHeaders (0.67.2):
+ - React-Core/RCTBlobHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTImageHeaders (0.67.2):
+ - React-Core/RCTImageHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTLinkingHeaders (0.67.2):
+ - React-Core/RCTLinkingHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTNetworkHeaders (0.67.2):
+ - React-Core/RCTNetworkHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTSettingsHeaders (0.67.2):
+ - React-Core/RCTSettingsHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTTextHeaders (0.67.2):
+ - React-Core/RCTTextHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTVibrationHeaders (0.67.2):
+ - React-Core/RCTVibrationHeaders (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- React-Core/Default
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-Core/RCTWebSocket (0.67.2):
+ - React-Core/RCTWebSocket (0.68.0):
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-Core/Default (= 0.67.2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsiexecutor (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-Core/Default (= 0.68.0)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsiexecutor (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- Yoga
- - React-CoreModules (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - React-CoreModules (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core/CoreModulesHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-RCTImage (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-cxxreact (0.67.2):
+ - RCTTypeSafety (= 0.68.0)
+ - React-Codegen (= 0.68.0)
+ - React-Core/CoreModulesHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-RCTImage (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-cxxreact (0.68.0):
- boost (= 1.76.0)
- DoubleConversion
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-callinvoker (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-jsinspector (= 0.67.2)
- - React-logger (= 0.67.2)
- - React-perflogger (= 0.67.2)
- - React-runtimeexecutor (= 0.67.2)
- - React-jsi (0.67.2):
+ - React-callinvoker (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-jsinspector (= 0.68.0)
+ - React-logger (= 0.68.0)
+ - React-perflogger (= 0.68.0)
+ - React-runtimeexecutor (= 0.68.0)
+ - React-jsi (0.68.0):
- boost (= 1.76.0)
- DoubleConversion
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-jsi/Default (= 0.67.2)
- - React-jsi/Default (0.67.2):
+ - React-jsi/Default (= 0.68.0)
+ - React-jsi/Default (0.68.0):
- boost (= 1.76.0)
- DoubleConversion
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-jsiexecutor (0.67.2):
+ - React-jsiexecutor (0.68.0):
- DoubleConversion
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-perflogger (= 0.67.2)
- - React-jsinspector (0.67.2)
- - React-logger (0.67.2):
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-perflogger (= 0.68.0)
+ - React-jsinspector (0.68.0)
+ - React-logger (0.68.0):
- glog
- react-native-safe-area-context (3.1.9):
- React-Core
@@ -278,76 +288,76 @@ PODS:
- React
- react-native-viewpager (4.2.1):
- React-Core
- - React-perflogger (0.67.2)
- - React-RCTActionSheet (0.67.2):
- - React-Core/RCTActionSheetHeaders (= 0.67.2)
- - React-RCTAnimation (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - React-perflogger (0.68.0)
+ - React-RCTActionSheet (0.68.0):
+ - React-Core/RCTActionSheetHeaders (= 0.68.0)
+ - React-RCTAnimation (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core/RCTAnimationHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTBlob (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTAnimationHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTBlob (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - React-Core/RCTBlobHeaders (= 0.67.2)
- - React-Core/RCTWebSocket (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-RCTNetwork (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTImage (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTBlobHeaders (= 0.68.0)
+ - React-Core/RCTWebSocket (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-RCTNetwork (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTImage (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core/RCTImageHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-RCTNetwork (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTLinking (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
- - React-Core/RCTLinkingHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTNetwork (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTImageHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-RCTNetwork (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTLinking (0.68.0):
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTLinkingHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTNetwork (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core/RCTNetworkHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTSettings (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTNetworkHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTSettings (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - RCTTypeSafety (= 0.67.2)
- - React-Core/RCTSettingsHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-RCTText (0.67.2):
- - React-Core/RCTTextHeaders (= 0.67.2)
- - React-RCTVibration (0.67.2):
- - FBReactNativeSpec (= 0.67.2)
+ - RCTTypeSafety (= 0.68.0)
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTSettingsHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-RCTText (0.68.0):
+ - React-Core/RCTTextHeaders (= 0.68.0)
+ - React-RCTVibration (0.68.0):
- RCT-Folly (= 2021.06.28.00-v2)
- - React-Core/RCTVibrationHeaders (= 0.67.2)
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (= 0.67.2)
- - React-runtimeexecutor (0.67.2):
- - React-jsi (= 0.67.2)
- - ReactCommon/turbomodule/core (0.67.2):
+ - React-Codegen (= 0.68.0)
+ - React-Core/RCTVibrationHeaders (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (= 0.68.0)
+ - React-runtimeexecutor (0.68.0):
+ - React-jsi (= 0.68.0)
+ - ReactCommon/turbomodule/core (0.68.0):
- DoubleConversion
- glog
- RCT-Folly (= 2021.06.28.00-v2)
- - React-callinvoker (= 0.67.2)
- - React-Core (= 0.67.2)
- - React-cxxreact (= 0.67.2)
- - React-jsi (= 0.67.2)
- - React-logger (= 0.67.2)
- - React-perflogger (= 0.67.2)
+ - React-callinvoker (= 0.68.0)
+ - React-Core (= 0.68.0)
+ - React-cxxreact (= 0.68.0)
+ - React-jsi (= 0.68.0)
+ - React-logger (= 0.68.0)
+ - React-perflogger (= 0.68.0)
- RNCMaskedView (0.1.10):
- React
- - RNGestureHandler (2.2.0):
+ - RNGestureHandler (2.5.0):
- React-Core
- - RNReanimated (2.3.1):
+ - RNReanimated (2.6.0):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
@@ -355,7 +365,6 @@ PODS:
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- - React
- React-callinvoker
- React-Core
- React-Core/DevSupport
@@ -375,8 +384,10 @@ PODS:
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- - RNScreens (2.15.0):
+ - RNScreens (3.13.1):
- React-Core
+ - React-RCTImage
+ - SocketRocket (0.6.0)
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
@@ -386,34 +397,35 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- - Flipper (= 0.99.0)
+ - Flipper (= 0.125.0)
- Flipper-Boost-iOSX (= 1.76.0.1.11)
- - Flipper-DoubleConversion (= 3.1.7)
+ - Flipper-DoubleConversion (= 3.2.0)
- Flipper-Fmt (= 7.1.7)
- - Flipper-Folly (= 2.6.7)
- - Flipper-Glog (= 0.3.6)
+ - Flipper-Folly (= 2.6.10)
+ - Flipper-Glog (= 0.5.0.4)
- Flipper-PeerTalk (= 0.0.4)
- Flipper-RSocket (= 1.4.3)
- - FlipperKit (= 0.99.0)
- - FlipperKit/Core (= 0.99.0)
- - FlipperKit/CppBridge (= 0.99.0)
- - FlipperKit/FBCxxFollyDynamicConvert (= 0.99.0)
- - FlipperKit/FBDefines (= 0.99.0)
- - FlipperKit/FKPortForwarding (= 0.99.0)
- - FlipperKit/FlipperKitHighlightOverlay (= 0.99.0)
- - FlipperKit/FlipperKitLayoutPlugin (= 0.99.0)
- - FlipperKit/FlipperKitLayoutTextSearchable (= 0.99.0)
- - FlipperKit/FlipperKitNetworkPlugin (= 0.99.0)
- - FlipperKit/FlipperKitReactPlugin (= 0.99.0)
- - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0)
- - FlipperKit/SKIOSNetworkPlugin (= 0.99.0)
+ - FlipperKit (= 0.125.0)
+ - FlipperKit/Core (= 0.125.0)
+ - FlipperKit/CppBridge (= 0.125.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
+ - FlipperKit/FBDefines (= 0.125.0)
+ - FlipperKit/FKPortForwarding (= 0.125.0)
+ - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
+ - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
+ - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
+ - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- - OpenSSL-Universal (= 1.1.180)
+ - OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
+ - React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
@@ -459,6 +471,7 @@ SPEC REPOS:
- fmt
- libevent
- OpenSSL-Universal
+ - SocketRocket
- YogaKit
EXTERNAL SOURCES:
@@ -482,6 +495,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/"
React-callinvoker:
:path: "../node_modules/react-native/ReactCommon/callinvoker"
+ React-Codegen:
+ :path: build/generated/ios
React-Core:
:path: "../node_modules/react-native/"
React-CoreModules:
@@ -541,55 +556,57 @@ SPEC CHECKSUMS:
boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
- FBLazyVector: 244195e30d63d7f564c55da4410b9a24e8fbceaa
- FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52
- Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
+ FBLazyVector: d2fd875e2b24bbc350722df0df9d383cb891b9f2
+ FBReactNativeSpec: 7493e074a31512df3253160059295264a84b8149
+ Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
- Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
+ Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
- Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
- Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
+ Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
+ Flipper-Glog: 87bc98ff48de90cb5b0b5114ed3da79d85ee2dd4
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
- FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
+ FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
- OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
+ OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
- RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
- RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
- React: dec6476bc27155b250eeadfc11ea779265f53ebf
- React-callinvoker: e5047929e80aea942e6fdd96482504ef0189ca63
- React-Core: e382655566b2b9a6e3b4f641d777b7bfdbe52358
- React-CoreModules: cf262e82fa101c0aee022b6f90d1a5b612038b64
- React-cxxreact: 69d53de3b30c7c161ba087ca1ecdffed9ccb1039
- React-jsi: ce9a2d804adf75809ce2fe2374ba3fbbf5d59b03
- React-jsiexecutor: 52beb652bbc61201bd70cbe4f0b8edb607e8da4f
- React-jsinspector: 595f76eba2176ebd8817a1fffd47b84fbdab9383
- React-logger: 23de8ea0f44fa00ee77e96060273225607fd4d78
+ RCTRequired: bab4a7c3d7eb9553b13773ee190f279712efd1fc
+ RCTTypeSafety: efbeb6e450ff6cef8e19c2cb5314c6d8bfeeef77
+ React: 28e4d45839b7d0fd9512af899e0379a17a5172ec
+ React-callinvoker: 5585d1ef6795786f288690b19e08bed253c33155
+ React-Codegen: 80ce98fda08a8ddb6f47116375ae2c1670bf8cda
+ React-Core: 122639d111d791eb00c2bc8d678cfeec46671744
+ React-CoreModules: 4dee89a87599055ca172e73924e27531eb4dd570
+ React-cxxreact: 15728f254c7e3b94ac9d53c626bff554a7c42b10
+ React-jsi: 4d135a7813ea815981b434ec37c6cfd8280b127b
+ React-jsiexecutor: 010a66edf644339f6da72b34208b070089680415
+ React-jsinspector: 90f0bfd5d04e0b066c29216a110ffb9a6c34f23f
+ React-logger: 8474fefa09d05f573a13c044cb0dfd751d4e52e3
react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94
react-native-slider: e99fc201cefe81270fc9d81714a7a0f5e566b168
react-native-viewpager: 40876e00dbd7bcee4c627cf5a9640e6593a019b4
- React-perflogger: 3c9bb7372493e49036f07a82c44c8cf65cbe88db
- React-RCTActionSheet: 052606483045a408693aa7e864410b4a052f541a
- React-RCTAnimation: 08d4cac13222bb1348c687a0158dfd3b577cdb63
- React-RCTBlob: 928ad1df65219c3d9e2ac80983b943a75b5c3629
- React-RCTImage: 524d7313b142a39ee0e20fa312b67277917fe076
- React-RCTLinking: 44036ea6f13a2e46238be07a67566247fee35244
- React-RCTNetwork: 9b6faacf1e0789253e319ca53b1f8d92c2ac5455
- React-RCTSettings: ecd8094f831130a49581d5112a8607220e5d12a5
- React-RCTText: 14ba976fb48ed283cfdb1a754a5d4276471e0152
- React-RCTVibration: 99c7f67fba7a5ade46e98e870c6ff2444484f995
- React-runtimeexecutor: 2450b43df7ffe8e805a0b3dcb2abd4282f1f1836
- ReactCommon: d98c6c96b567f9b3a15f9fd4cc302c1eda8e3cf2
+ React-perflogger: 15cb741d6c2379f4d3fc8f9e4d4e1110ef3020cb
+ React-RCTActionSheet: ea9099db0597bd769430db1e2d011fd5fdb7fc5e
+ React-RCTAnimation: 252df4749866f2654f37612f839522cac91c1165
+ React-RCTBlob: ae9ea73c6f84685ad9cd8ba2275cce6eaa26699d
+ React-RCTImage: 99ae69c73d31e7937cb250a4f470ae6a3f5d16e4
+ React-RCTLinking: cff4ca5547612607ae29a5859b466410a58a920d
+ React-RCTNetwork: 2783868d750a000d33a63bc3c3a140e6f812a735
+ React-RCTSettings: 12fc409d5e337cda891058fe2fd1427fa23ab5e1
+ React-RCTText: 6db924036c02a9fd98f30d9038756fafac17201c
+ React-RCTVibration: 82fc52d3d96549b8c59a6c8c017d5a1a11457049
+ React-runtimeexecutor: 9b1304f48e344c55bb3c36e13bf11461cb4da5d8
+ ReactCommon: fab89a13b52f1ac42b59a0e4b4f76f21aea9eebe
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
- RNGestureHandler: fec63e3f262c1a69b6888ebe8239b4f6fd932e76
- RNReanimated: 1326679461fa5d2399d54c18ca1432ba3e816b9e
- RNScreens: 2ad555d4d9fa10b91bb765ca07fe9b29d59573f0
- Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121
+ RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
+ RNReanimated: 89a32ebf01d2dac2eb35b3b1628952f626db93d7
+ RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
+ SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
+ Yoga: 6671cf077f614314c22fd09ddf87d7abeee64e96
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: 25d0906e1aa3e7904eeb1a3ea9428717a9ddaa52
+PODFILE CHECKSUM: 5a09699c42e00bbb7d83dcc949de54de2a3bb630
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/example/package.json b/example/package.json
index bda019d08c..ca83167088 100644
--- a/example/package.json
+++ b/example/package.json
@@ -16,21 +16,24 @@
"@react-native-community/masked-view": "^0.1.10",
"@react-native-community/slider": "^3.0.3",
"@react-native-community/viewpager": "^4.2.1",
- "@react-navigation/native": "^5.8.10",
- "@react-navigation/stack": "^5.12.8",
+ "@react-navigation/elements": "^1.3.1",
+ "@react-navigation/native": "^6.0.8",
+ "@react-navigation/stack": "^6.1.1",
"expo": "^40.0.0",
"hoist-non-react-statics": "^3.3.2",
"invariant": "^2.2.4",
"react": "17.0.2",
- "react-native": "0.67.2",
- "react-native-reanimated": "2.3.1",
+ "react-native": "0.68.0",
+ "react-native-reanimated": "2.6.0",
"react-native-safe-area-context": "^3.1.9",
- "react-native-screens": "^2.15.0"
+ "react-native-screens": "3.13.1"
},
"devDependencies": {
- "@babel/core": "^7.8.4",
+ "@babel/core": "^7.17.8",
+ "@babel/preset-env": "^7.1.6",
"@babel/runtime": "^7.12.5",
"@expo/webpack-config": "^0.12.52",
+ "@react-native-community/eslint-config": "^3.0.0",
"@types/jest": "^25.2.3",
"@types/react-native": "^0.64.2",
"@types/react-test-renderer": "^17.0.1",
@@ -38,15 +41,20 @@
"babel-jest": "^25.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-preset-expo": "^8.3.0",
- "eslint": "^7.16.0",
+ "eslint": "^8.12.0",
"glob-to-regexp": "^0.4.1",
"jest": "^25.1.0",
"metro-config": "^0.64.0",
- "metro-react-native-babel-preset": "^0.66.2",
- "prettier": "^2.2.1",
+ "metro-react-native-babel-preset": "^0.67.0",
+ "prettier": "^2.6.1",
"react-test-renderer": "17.0.2",
"typescript": "^4.5.5"
},
+ "resolutions": {
+ "@typescript-eslint/eslint-plugin": "^5.17.0",
+ "@typescript-eslint/parser": "^5.17.0",
+ "eslint-plugin-react-native": "^4.0.0"
+ },
"jest": {
"preset": "react-native",
"moduleFileExtensions": [
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 5d87ef7086..01d1331230 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -1,12 +1,5 @@
import React from 'react';
-import {
- Text,
- View,
- StyleSheet,
- SectionList,
- Platform,
- LogBox,
-} from 'react-native';
+import { Text, View, StyleSheet, SectionList, Platform } from 'react-native';
import {
createStackNavigator,
StackScreenProps,
@@ -50,10 +43,6 @@ import DragNDrop from './new_api/drag_n_drop';
import BetterHorizontalDrawer from './new_api/betterHorizontalDrawer';
import ManualGestures from './new_api/manualGestures/index';
-LogBox.ignoreLogs([
- "[react-native-gesture-handler] Seems like you're using an old API with gesture components, check out new Gestures system!",
-]);
-
interface Example {
name: string;
component: React.ComponentType;
diff --git a/example/src/basic/bouncing/index.tsx b/example/src/basic/bouncing/index.tsx
index 0ea9e1151a..edbf32f0ec 100644
--- a/example/src/basic/bouncing/index.tsx
+++ b/example/src/basic/bouncing/index.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, PropsWithChildren } from 'react';
import { Animated, StyleSheet, View } from 'react-native';
import {
@@ -13,7 +13,7 @@ import {
import { USE_NATIVE_DRIVER } from '../../config';
-class Snappable extends Component> {
+class Snappable extends Component>> {
private onGestureEvent?: (event: PanGestureHandlerGestureEvent) => void;
private transX: Animated.AnimatedInterpolation;
private dragX: Animated.Value;
@@ -59,7 +59,7 @@ class Snappable extends Component> {
}
}
-class Twistable extends Component {
+class Twistable extends Component> {
private gesture: Animated.Value;
private onGestureEvent?: (event: RotationGestureHandlerGestureEvent) => void;
private rot: Animated.AnimatedInterpolation;
diff --git a/example/src/new_api/betterHorizontalDrawer/BetterHorizonatalDrawer.tsx b/example/src/new_api/betterHorizontalDrawer/BetterHorizonatalDrawer.tsx
index c3d8719bd6..950505b7d8 100644
--- a/example/src/new_api/betterHorizontalDrawer/BetterHorizonatalDrawer.tsx
+++ b/example/src/new_api/betterHorizontalDrawer/BetterHorizonatalDrawer.tsx
@@ -249,6 +249,7 @@ export const DrawerLayout = React.forwardRef<
drawerSavedOffset.value = 0;
setDrawerVisible(false);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [drawerWidth, drawerPosition, drawerType]);
// measure the container
diff --git a/example/src/new_api/bottom_sheet/index.tsx b/example/src/new_api/bottom_sheet/index.tsx
index d6e791fa16..0eff42588d 100644
--- a/example/src/new_api/bottom_sheet/index.tsx
+++ b/example/src/new_api/bottom_sheet/index.tsx
@@ -6,6 +6,7 @@ import {
PanGestureHandlerEventPayload,
} from 'react-native-gesture-handler';
import Animated, {
+ runOnJS,
useAnimatedStyle,
useSharedValue,
withSpring,
@@ -27,7 +28,11 @@ function Example() {
const scrollOffset = useSharedValue(0);
const bottomSheetTranslateY = useSharedValue(CLOSED_SNAP_POINT);
+ const onHandlerEndOnJS = (point: number) => {
+ setSnapPoint(point);
+ };
const onHandlerEnd = ({ velocityY }: PanGestureHandlerEventPayload) => {
+ 'worklet';
const dragToss = 0.05;
const endOffsetY =
bottomSheetTranslateY.value + translationY.value + velocityY * dragToss;
@@ -57,10 +62,8 @@ function Example() {
bottomSheetTranslateY.value = withSpring(destSnapPoint, {
mass: 0.5,
});
-
- setSnapPoint(destSnapPoint);
+ runOnJS(onHandlerEndOnJS)(destSnapPoint);
};
-
const panGesture = Gesture.Pan()
.onUpdate((e) => {
// when bottom sheet is not fully opened scroll offset should not influence
diff --git a/example/src/new_api/camera/index.tsx b/example/src/new_api/camera/index.tsx
index 69ccb619ca..74c680c796 100644
--- a/example/src/new_api/camera/index.tsx
+++ b/example/src/new_api/camera/index.tsx
@@ -20,10 +20,8 @@ export default function Home() {
const [selectedFilter, setSelectedFilter] = useState(0);
const [isRecording, setIsRecording] = useState(false);
const [remainingTimeMs, setRemainingTimeMs] = useState(MAX_VIDEO_DURATION_MS);
- const [
- recordingIntervalHandle,
- setRecordingIntervalHandle,
- ] = useState | null>(null);
+ const [recordingIntervalHandle, setRecordingIntervalHandle] =
+ useState | null>(null);
const filtersPanGesture = Gesture.Pan()
.onUpdate((e) => {
diff --git a/example/src/new_api/chat_heads/index.tsx b/example/src/new_api/chat_heads/index.tsx
index 16702a2462..502ccda4a9 100644
--- a/example/src/new_api/chat_heads/index.tsx
+++ b/example/src/new_api/chat_heads/index.tsx
@@ -8,7 +8,7 @@ import Animated, {
withSpring,
} from 'react-native-reanimated';
import { SafeAreaView } from 'react-native-safe-area-context';
-import { useHeaderHeight } from '@react-navigation/stack';
+import { useHeaderHeight } from '@react-navigation/elements';
const CHAT_HEADS = [
{ imageUrl: 'https://avatars0.githubusercontent.com/u/379606?v=4&s=460' },
diff --git a/example/src/new_api/drag_n_drop/DragAndDrop.tsx b/example/src/new_api/drag_n_drop/DragAndDrop.tsx
index 748f22d97d..e5a9832390 100644
--- a/example/src/new_api/drag_n_drop/DragAndDrop.tsx
+++ b/example/src/new_api/drag_n_drop/DragAndDrop.tsx
@@ -68,13 +68,11 @@ function DragAndDrop({
// used to calculate position of currently dragged element in relation to drag start position
// we are using dragged element center as calculations point - then we just add translationX/Y from gesture
// this way we can easily calculate proper index based of current gesture position
- const [
- activeElementInitialPosition,
- setActiveElementInitialPosition,
- ] = useState({
- x: 0,
- y: 0,
- });
+ const [activeElementInitialPosition, setActiveElementInitialPosition] =
+ useState({
+ x: 0,
+ y: 0,
+ });
const updateDataOnDragEnd = () => {
const newData = [...data];
@@ -185,6 +183,7 @@ function DragAndDrop({
// react to activeElement change
setActiveElementPositionFromIndex();
setPlaceholderIndex(getActiveElementIndex());
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [activeElementId]);
const onPositionUpdate = (e: PanGestureHandlerEventPayload) => {
diff --git a/example/src/new_api/drag_n_drop/Draggable.tsx b/example/src/new_api/drag_n_drop/Draggable.tsx
index 2454a9f834..81f92a4471 100644
--- a/example/src/new_api/drag_n_drop/Draggable.tsx
+++ b/example/src/new_api/drag_n_drop/Draggable.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React from 'react';
import { StyleSheet } from 'react-native';
import {
PanGestureHandlerEventPayload,
@@ -27,9 +27,10 @@ interface DraggableProps {
tileSize: number;
rowGap: number;
columnGap: number;
+ children?: React.ReactNode;
}
-const Draggable: FunctionComponent = ({
+const Draggable = ({
id,
children,
onLongPress,
@@ -40,7 +41,7 @@ const Draggable: FunctionComponent = ({
columnGap,
rowGap,
position,
-}) => {
+}: DraggableProps) => {
const tapGesture = Gesture.LongPress()
.minDuration(300)
.onStart(() => runOnJS(onLongPress)(id))
diff --git a/example/src/new_api/drag_n_drop/Tile.tsx b/example/src/new_api/drag_n_drop/Tile.tsx
index 43dafdca94..0a7d83e059 100644
--- a/example/src/new_api/drag_n_drop/Tile.tsx
+++ b/example/src/new_api/drag_n_drop/Tile.tsx
@@ -54,6 +54,7 @@ function Tile({ data, draggingActive, tileSize, isActive }: TileProps) {
animateOnDraggingDisabled();
}
draggingActivePrevious.current = draggingActive;
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [draggingActive]);
const tileAnimatedStyle = useAnimatedStyle(() => {
diff --git a/example/src/new_api/manualGestures/index.tsx b/example/src/new_api/manualGestures/index.tsx
index d74ccfada4..6e68b6aee0 100644
--- a/example/src/new_api/manualGestures/index.tsx
+++ b/example/src/new_api/manualGestures/index.tsx
@@ -99,7 +99,6 @@ export default function Example() {
{trackedPointers.map((pointer, index) => (
- // eslint-disable-next-line react/no-array-index-key
))}
diff --git a/example/src/recipes/scaleAndRotate/index.tsx b/example/src/recipes/scaleAndRotate/index.tsx
index f46a377619..a6e7876d4d 100644
--- a/example/src/recipes/scaleAndRotate/index.tsx
+++ b/example/src/recipes/scaleAndRotate/index.tsx
@@ -135,7 +135,6 @@ export class PinchableBox extends React.Component {
],
},
]}
- // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
source={require('./swmansion.png')}
/>
})
+})
+ })
+})
+})
+ })
+})
+})
+})
+![]({useBaseUrl("gifs/sampleswipeable.gif")})
+
+ 
+