From d2ad3473a146682788d684b7aa84808d1b438dcb Mon Sep 17 00:00:00 2001 From: Calinteodor Date: Fri, 5 Jul 2024 12:30:55 +0300 Subject: [PATCH] deps(react-native-gesture-handler/@react-native-clipboard/clipboard): Updates related to RN 0.73.8 (#14894) * deps(react-native-gesture-handler/@react-native-clipboard/clipboard): Updates related to RN 0.73.8 --- android/settings.gradle | 2 +- ios/Podfile.lock | 14 ++--- package-lock.json | 53 ++++++++++--------- package.json | 4 +- react-native-sdk/package.json | 2 +- react/features/base/util/copyText.native.ts | 2 +- .../polls/components/native/PollCreate.tsx | 3 +- 7 files changed, 43 insertions(+), 37 deletions(-) diff --git a/android/settings.gradle b/android/settings.gradle index 68053e1c1e..f7700aa84e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -11,7 +11,7 @@ project(':react-native-background-timer').projectDir = new File(rootProject.proj include ':react-native-calendar-events' project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android') include ':react-native-community_clipboard' -project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/clipboard/android') +project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-clipboard/clipboard/android') include ':react-native-community_netinfo' project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android') include ':react-native-default-preference' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index bd15143342..4f2234aa72 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1206,13 +1206,15 @@ PODS: - React - RNCAsyncStorage (1.23.1): - React-Core - - RNCClipboard (1.5.1): + - RNCClipboard (1.14.1): - React-Core - RNDefaultPreference (1.4.4): - React-Core - RNDeviceInfo (10.9.0): - React-Core - - RNGestureHandler (2.9.0): + - RNGestureHandler (2.17.1): + - glog + - RCT-Folly (= 2022.05.16.00) - React-Core - RNGoogleSignin (10.1.0): - GoogleSignIn (~> 7.0) @@ -1305,7 +1307,7 @@ DEPENDENCIES: - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - RNCalendarEvents (from `../node_modules/react-native-calendar-events`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" + - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" - RNDefaultPreference (from `../node_modules/react-native-default-preference`) - RNDeviceInfo (from `../node_modules/react-native-device-info`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) @@ -1472,7 +1474,7 @@ EXTERNAL SOURCES: RNCAsyncStorage: :path: "../node_modules/@react-native-async-storage/async-storage" RNCClipboard: - :path: "../node_modules/@react-native-community/clipboard" + :path: "../node_modules/@react-native-clipboard/clipboard" RNDefaultPreference: :path: "../node_modules/react-native-default-preference" RNDeviceInfo: @@ -1580,10 +1582,10 @@ SPEC CHECKSUMS: ReactCommon: 512222a2c036e9a7d1489d4c888aac178dfb0f3c RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3 RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c - RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 + RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37 RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31 RNDeviceInfo: 02ea8b23e2280fa18e00a06d7e62804d74028579 - RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39 + RNGestureHandler: 67d3f1f69d4d0c98d6e83f4229e3bbf997d1dc72 RNGoogleSignin: a6a612cce56a45ab701c5c5c6e36f5390522d100 RNScreens: e842cdccb23c0a084bd6307f6fa83fd1c1738029 RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852 diff --git a/package-lock.json b/package-lock.json index 22c1df21a1..3faf06bb27 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@microsoft/microsoft-graph-client": "3.0.1", "@mui/material": "5.12.1", "@react-native-async-storage/async-storage": "1.23.1", - "@react-native-community/clipboard": "1.5.1", + "@react-native-clipboard/clipboard": "1.14.1", "@react-native-community/netinfo": "11.1.0", "@react-native-community/slider": "4.4.3", "@react-native-google-signin/google-signin": "10.1.0", @@ -82,7 +82,7 @@ "react-native-default-preference": "1.4.4", "react-native-device-info": "10.9.0", "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", - "react-native-gesture-handler": "2.9.0", + "react-native-gesture-handler": "2.17.1", "react-native-get-random-values": "1.9.0", "react-native-immersive-mode": "2.0.1", "react-native-keep-awake": "4.0.0", @@ -4015,6 +4015,21 @@ "react-native": "^0.0.0-0 || >=0.60 <1.0" } }, + "node_modules/@react-native-clipboard/clipboard": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.14.1.tgz", + "integrity": "sha512-SM3el0A28SwoeJljVNhF217o0nI4E7RfalLmuRQcT1/7tGcxUjgFa3jyrEndYUct8/uxxK5EUNGUu1YEDqzxqw==", + "license": "MIT", + "workspaces": [ + "example" + ], + "peerDependencies": { + "react": "16.9.0 || 16.11.0 || 16.13.1 || 17.0.1 || 17.0.2 || 18.0.0 || 18.1.0 || 18.2.0", + "react-native": "^0.61.5 || ^0.62.3 || ^0.63.2 || ^0.64.2 || ^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.69.0 || ^0.70.0 || ^0.71.0 || ^0.72.0 || ^0.73.0", + "react-native-macos": "^0.61.0 || ^0.62.0 || ^0.63.0 || ^0.64.0 || ^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.69.0 || ^0.70.0 || ^0.71.0 || ^0.72.0 || ^0.73.0", + "react-native-windows": "^0.61.0 || ^0.62.0 || ^0.63.0 || ^0.64.0 || ^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.69.0 || ^0.70.0 || ^0.71.0 || ^0.72.0 || ^0.73.0" + } + }, "node_modules/@react-native-community/cli": { "version": "12.3.6", "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-12.3.6.tgz", @@ -5060,15 +5075,6 @@ "node": ">=8" } }, - "node_modules/@react-native-community/clipboard": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz", - "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==", - "peerDependencies": { - "react": ">=16.0", - "react-native": ">=0.57.0" - } - }, "node_modules/@react-native-community/netinfo": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.1.0.tgz", @@ -15299,14 +15305,14 @@ } }, "node_modules/react-native-gesture-handler": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.9.0.tgz", - "integrity": "sha512-a0BcH3Qb1tgVqUutc6d3VuWQkI1AM3+fJx8dkxzZs9t06qA27QgURYFoklpabuWpsUTzuKRpxleykp25E8m7tg==", + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.17.1.tgz", + "integrity": "sha512-pWfniN6NuVKUq40KACuD3NCMe+bWNQCpD3cmxL6aLSCTwPKYmf7l4Lp0/E/almpjvxhybJZtFLU0w4tmxnIKaA==", + "license": "MIT", "dependencies": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4", - "lodash": "^4.17.21", "prop-types": "^15.7.2" }, "peerDependencies": { @@ -21835,6 +21841,11 @@ "merge-options": "^3.0.4" } }, + "@react-native-clipboard/clipboard": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.14.1.tgz", + "integrity": "sha512-SM3el0A28SwoeJljVNhF217o0nI4E7RfalLmuRQcT1/7tGcxUjgFa3jyrEndYUct8/uxxK5EUNGUu1YEDqzxqw==" + }, "@react-native-community/cli": { "version": "12.3.6", "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-12.3.6.tgz", @@ -22537,11 +22548,6 @@ "joi": "^17.2.1" } }, - "@react-native-community/clipboard": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz", - "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==" - }, "@react-native-community/netinfo": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.1.0.tgz", @@ -30102,14 +30108,13 @@ "integrity": "sha512-MKbuBbovO8eGiAM9i6o0nrdBXivhRpzPQ+aVBXGJEPMH7RrCSNUKaCoEpkjfGHlTxjZimi6WjDCjjzCRSHlV1A==" }, "react-native-gesture-handler": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.9.0.tgz", - "integrity": "sha512-a0BcH3Qb1tgVqUutc6d3VuWQkI1AM3+fJx8dkxzZs9t06qA27QgURYFoklpabuWpsUTzuKRpxleykp25E8m7tg==", + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.17.1.tgz", + "integrity": "sha512-pWfniN6NuVKUq40KACuD3NCMe+bWNQCpD3cmxL6aLSCTwPKYmf7l4Lp0/E/almpjvxhybJZtFLU0w4tmxnIKaA==", "requires": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4", - "lodash": "^4.17.21", "prop-types": "^15.7.2" } }, diff --git a/package.json b/package.json index 6017906a6c..eaab448e5b 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@microsoft/microsoft-graph-client": "3.0.1", "@mui/material": "5.12.1", "@react-native-async-storage/async-storage": "1.23.1", - "@react-native-community/clipboard": "1.5.1", + "@react-native-clipboard/clipboard": "1.14.1", "@react-native-community/netinfo": "11.1.0", "@react-native-community/slider": "4.4.3", "@react-native-google-signin/google-signin": "10.1.0", @@ -88,7 +88,7 @@ "react-native-default-preference": "1.4.4", "react-native-device-info": "10.9.0", "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", - "react-native-gesture-handler": "2.9.0", + "react-native-gesture-handler": "2.17.1", "react-native-get-random-values": "1.9.0", "react-native-immersive-mode": "2.0.1", "react-native-keep-awake": "4.0.0", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index 72ce980452..3009598150 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -57,7 +57,7 @@ "@giphy/react-native-sdk": "0.0.0", "@react-native/metro-config": "*", "@react-native-async-storage/async-storage": "0.0.0", - "@react-native-community/clipboard": "0.0.0", + "@react-native-clipboard/clipboard": "0.0.0", "@react-native-community/netinfo": "0.0.0", "@react-native-community/slider": "0.0.0", "@react-native-google-signin/google-signin": "0.0.0", diff --git a/react/features/base/util/copyText.native.ts b/react/features/base/util/copyText.native.ts index bc4ec75231..db9ae71208 100644 --- a/react/features/base/util/copyText.native.ts +++ b/react/features/base/util/copyText.native.ts @@ -1,4 +1,4 @@ -import Clipboard from '@react-native-community/clipboard'; +import Clipboard from '@react-native-clipboard/clipboard'; /** * Tries to copy a given text to the clipboard. diff --git a/react/features/polls/components/native/PollCreate.tsx b/react/features/polls/components/native/PollCreate.tsx index dbbc492fce..7f53bdbe9f 100644 --- a/react/features/polls/components/native/PollCreate.tsx +++ b/react/features/polls/components/native/PollCreate.tsx @@ -1,6 +1,5 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; -import { FlatList, Platform, View, ViewStyle } from 'react-native'; -import { TextInput } from 'react-native-gesture-handler'; +import { FlatList, Platform, TextInput, View, ViewStyle } from 'react-native'; import { Divider } from 'react-native-paper'; import { useDispatch } from 'react-redux';