Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump example apps to React Native 0.77 #6768

Merged
merged 48 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
93578ee
Refactor findNodeHandler
piaskowyk Nov 20, 2024
a4204f0
Update Fabric
piaskowyk Nov 20, 2024
37b6c87
Update events
piaskowyk Nov 22, 2024
835aca5
Linter
piaskowyk Nov 22, 2024
43305eb
Improvements after review
piaskowyk Nov 22, 2024
f699fb7
Conditions reorder
piaskowyk Nov 22, 2024
fdeee9f
Improvements after review
piaskowyk Nov 22, 2024
44fe723
Improve Fabric-Paper compatibility
piaskowyk Nov 22, 2024
c169616
Remove console log
piaskowyk Nov 22, 2024
3808092
Merge
piaskowyk Nov 22, 2024
6a0c4c6
Improvements
piaskowyk Nov 25, 2024
9413ae6
Bump React Native to 0.77.0-rc.0
tomekzaw Nov 27, 2024
ab851ae
Merge branch '@piaskowyk/findnodehandler-refactor' into @tomekzaw/rea…
tomekzaw Nov 27, 2024
7071b12
Run fabric-example on iOS
tomekzaw Nov 28, 2024
02191d9
Run paper-example on Android
tomekzaw Nov 28, 2024
8b21948
Try to run fabric-example on Android
tomekzaw Nov 29, 2024
65c4242
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Dec 7, 2024
954fdbd
Fix module override error on Android
tomekzaw Dec 8, 2024
7068334
Bump react-native to 0.77.0-rc.1
tomekzaw Dec 8, 2024
a885763
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Dec 10, 2024
1878fa9
Bump react-native to 0.77.0-rc.2
tomekzaw Dec 10, 2024
7c8c53a
Bump react-native to 0.77.0-rc.3
tomekzaw Dec 18, 2024
f3720b4
Bump react-native to 0.77.0-rc.5
tomekzaw Dec 31, 2024
02f4cd3
Bump react-native to 0.77.0-rc.6
tomekzaw Jan 7, 2025
c9ff363
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 8, 2025
93c9163
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 8, 2025
96093a1
Remove unnecessary import
tomekzaw Jan 8, 2025
30b1aaa
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 9, 2025
8375134
Restore `get` instead of `getEnforcing`
tomekzaw Jan 9, 2025
214d0d3
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 10, 2025
38ee9d2
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 10, 2025
d8bdae0
Restore app dependencies
tomekzaw Jan 10, 2025
bc163e5
Patch react-native-gesture-handler
tomekzaw Jan 10, 2025
d9f6dcc
Patch RNGestureHandlerPackage.kt
tomekzaw Jan 10, 2025
13005b4
Add nullcheck
piaskowyk Jan 10, 2025
c9eb1c0
Patch FlashList to fix `scrollTo` from UI thread
tomekzaw Jan 10, 2025
e864e7f
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 10, 2025
82a0c47
Bump react-native-screens to 4.5.0
tomekzaw Jan 10, 2025
717a75f
Add missing `@stylexjs/babel-plugin` in web-example
tomekzaw Jan 10, 2025
1423f96
Bump react-native-gesture-handler to 2.22.0
tomekzaw Jan 10, 2025
eaff01f
Update patch for `@shopify/flash-list` to fix building on RN 0.77
tomekzaw Jan 10, 2025
49b80a4
Restore common-app in paper-example
tomekzaw Jan 10, 2025
af1393a
Remove unused patch for react-native-gesture-handler
tomekzaw Jan 10, 2025
a57e13c
Update yarn.lock
tomekzaw Jan 10, 2025
149ec6c
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 10, 2025
4668987
Remove duplicate AppDelegate.swift in fabric-example
tomekzaw Jan 12, 2025
e30d134
Remove duplicate AppDelegate.swift in paper-example
tomekzaw Jan 12, 2025
e4d8ad3
Merge branch 'main' into @tomekzaw/react-native-0.77
tomekzaw Jan 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions .yarn/patches/@shopify-flash-list-npm-1.7.2-2a363895ca.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
diff --git a/package.json b/package.json
index b30a5bacd99db50c5d09d7662f06bfbccca599a1..9915fa6b5d96243a00e16100da605e0f9596bf53 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"license": "MIT",
"homepage": "https://shopify.github.io/flash-list/",
"main": "dist/index.js",
+ "react-native": "src/index.ts",
"types": "dist/index.d.ts",
"scripts": {
"up": "bundle install && yarn fixture:rn:up && yarn e2e:up && yarn build",
diff --git a/src/FlashList.tsx b/src/FlashList.tsx
index 0e9f071a53d113e85f3099ccf239d1f3d06361b6..877896f778b4fa27977b1aed9b550e2880c11e79 100644
--- a/src/FlashList.tsx
+++ b/src/FlashList.tsx
@@ -4,6 +4,7 @@ import {
RefreshControl,
LayoutChangeEvent,
NativeSyntheticEvent,
+ ScrollViewComponent,
StyleSheet,
NativeScrollEvent,
} from "react-native";
@@ -842,6 +843,12 @@ class FlashList<T> extends React.PureComponent<
return this.rlvRef?.getScrollableNode?.() || null;
}

+ public getNativeScrollRef(): React.ElementRef<
+ typeof ScrollViewComponent
+ > | null {
+ return this.rlvRef?.getNativeScrollRef?.() || null;
+ }
+
/**
* Allows access to internal recyclerlistview. This is useful for enabling access to its public APIs.
* Warning: We may swap recyclerlistview for something else in the future. Use with caution.
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
index 4c9080790230cc75f48e4ee68c84df1080986bd6..29f81e03caed5c97401de153c53fe71c3cce9e10 100644
--- a/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
+++ b/android/src/paper/java/com/facebook/react/viewmanagers/AutoLayoutViewManagerDelegate.java
@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;

import android.view.View;
import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;

-public class AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class AutoLayoutViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & AutoLayoutViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public AutoLayoutViewManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java b/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
index 2b64af7d5ff936793bf027cba249f31777daba9f..4ba6e5fd815aeac1da56374c8c48a9fcd7f57061 100644
--- a/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
+++ b/android/src/paper/java/com/facebook/react/viewmanagers/CellContainerManagerDelegate.java
@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;

import android.view.View;
import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;

-public class CellContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class CellContainerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & CellContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public CellContainerManagerDelegate(U viewManager) {
super(viewManager);
}
20 changes: 10 additions & 10 deletions apps/common-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"react-strict-dom": "*"
},
"devDependencies": {
"@react-native-async-storage/async-storage": "^1.24.0",
"@react-native-community/slider": "^4.5.5",
"@react-native-masked-view/masked-view": "^0.3.1",
"@react-native-async-storage/async-storage": "2.1.0",
"@react-native-community/slider": "4.5.5",
"@react-native-masked-view/masked-view": "0.3.2",
"@react-navigation/bottom-tabs": "^7.0.0",
"@react-navigation/native": "^7.0.0",
"@react-navigation/native-stack": "^7.0.0",
"@react-navigation/stack": "^7.0.0",
"@shopify/flash-list": "^1.7.1",
"@shopify/flash-list": "patch:@shopify/flash-list@npm%3A1.7.2#~/.yarn/patches/@shopify-flash-list-npm-1.7.2-2a363895ca.patch",
"@tsconfig/react-native": "^3.0.0",
"@types/d3-shape": "^3.1.1",
"d3-shape": "^3.2.0",
Expand All @@ -46,13 +46,13 @@
"patch-package": "^8.0.0",
"prettier": "^3.3.3",
"react": "18.3.1",
"react-native": "0.76.5",
"react-native-gesture-handler": "2.20.2",
"react-native-pager-view": "^6.4.1",
"react-native": "0.77.0-rc.6",
"react-native-gesture-handler": "2.22.0",
"react-native-pager-view": "6.6.1",
"react-native-reanimated": "workspace:*",
"react-native-safe-area-context": "^4.13.1",
"react-native-screens": "^4.0.0",
"react-native-svg": "^15.8.0",
"react-native-safe-area-context": "5.1.0",
"react-native-screens": "4.5.0",
"react-native-svg": "15.11.1",
"react-strict-dom": "0.0.27",
"typescript": "~5.3.0"
}
Expand Down
4 changes: 2 additions & 2 deletions apps/fabric-example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 34
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.24"
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
}
repositories {
google()
Expand Down
Loading
Loading