Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3390836
D5531.id18066.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D5531.id18066.diff
View Options
diff --git a/native/chat/text-message-tooltip-modal.react.js b/native/chat/text-message-tooltip-modal.react.js
--- a/native/chat/text-message-tooltip-modal.react.js
+++ b/native/chat/text-message-tooltip-modal.react.js
@@ -1,6 +1,6 @@
// @flow
-import Clipboard from '@react-native-community/clipboard';
+import Clipboard from '@react-native-clipboard/clipboard';
import invariant from 'invariant';
import * as React from 'react';
diff --git a/native/crash.react.js b/native/crash.react.js
--- a/native/crash.react.js
+++ b/native/crash.react.js
@@ -1,6 +1,6 @@
// @flow
-import Clipboard from '@react-native-community/clipboard';
+import Clipboard from '@react-native-clipboard/clipboard';
import invariant from 'invariant';
import _shuffle from 'lodash/fp/shuffle';
import * as React from 'react';
diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -849,7 +849,7 @@
- React
- RNCAsyncStorage (1.17.10):
- React-Core
- - RNCClipboard (1.5.1):
+ - RNCClipboard (1.11.1):
- React-Core
- SDWebImage (~> 5.8)
- RNCMaskedView (0.2.8):
@@ -1014,7 +1014,7 @@
- ReactNativeKeyboardInput (from `../../node_modules/react-native-keyboard-input`)
- ReactNativeKeyboardTrackingView (from `../../node_modules/react-native-keyboard-tracking-view`)
- "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`)"
- "RNCMaskedView (from `../../node_modules/@react-native-masked-view/masked-view`)"
- RNDeviceInfo (from `../../node_modules/react-native-device-info`)
- RNExitApp (from `../../node_modules/react-native-exit-app`)
@@ -1187,7 +1187,7 @@
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"
RNCMaskedView:
:path: "../../node_modules/@react-native-masked-view/masked-view"
RNDeviceInfo:
@@ -1300,7 +1300,7 @@
ReactNativeKeyboardInput: 266ba27a2e9921f5bdc0b4cc30289b2a2f46b157
ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca
- RNCClipboard: f470a4445c779f99c10201b038ab3f9e24e71dbc
+ RNCClipboard: f66930407a30948ffdecf43a2459bcf05aa59804
RNCMaskedView: bc0170f389056201c82a55e242e5d90070e18e5a
RNDeviceInfo: 55463fa6e252ca3f0e2ba6001a7b82f879914338
RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
diff --git a/native/media/image-modal.react.js b/native/media/image-modal.react.js
--- a/native/media/image-modal.react.js
+++ b/native/media/image-modal.react.js
@@ -1,6 +1,6 @@
// @flow
-import Clipboard from '@react-native-community/clipboard';
+import Clipboard from '@react-native-clipboard/clipboard';
import invariant from 'invariant';
import * as React from 'react';
import {
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -55,8 +55,8 @@
"@commapp/sqlcipher-amalgamation": "^4.4.3-a",
"@expo/react-native-action-sheet": "^3.14.0",
"@react-native-async-storage/async-storage": "^1.17.10",
+ "@react-native-clipboard/clipboard": "^1.11.1",
"@react-native-community/art": "^1.2.0",
- "@react-native-community/clipboard": "^1.5.1",
"@react-native-community/netinfo": "^6.0.0",
"@react-native-masked-view/masked-view": "^0.2.8",
"@react-navigation/bottom-tabs": "^6.4.0",
diff --git a/patches/@react-native-community+clipboard+1.5.1.patch b/patches/@react-native-clipboard+clipboard+1.11.1.patch
rename from patches/@react-native-community+clipboard+1.5.1.patch
rename to patches/@react-native-clipboard+clipboard+1.11.1.patch
--- a/patches/@react-native-community+clipboard+1.5.1.patch
+++ b/patches/@react-native-clipboard+clipboard+1.11.1.patch
@@ -1,19 +1,18 @@
-diff --git a/node_modules/@react-native-community/clipboard/RNCClipboard.podspec b/node_modules/@react-native-community/clipboard/RNCClipboard.podspec
-index 095b496..b19b07f 100644
---- a/node_modules/@react-native-community/clipboard/RNCClipboard.podspec
-+++ b/node_modules/@react-native-community/clipboard/RNCClipboard.podspec
-@@ -17,4 +17,6 @@ Pod::Spec.new do |s|
+diff --git a/node_modules/@react-native-clipboard/clipboard/RNCClipboard.podspec b/node_modules/@react-native-clipboard/clipboard/RNCClipboard.podspec
+index 3a708ca..a809a9b 100644
+--- a/node_modules/@react-native-clipboard/clipboard/RNCClipboard.podspec
++++ b/node_modules/@react-native-clipboard/clipboard/RNCClipboard.podspec
+@@ -17,4 +17,5 @@ Pod::Spec.new do |s|
s.osx.source_files = "macos/**/*.{h,m,mm}"
s.dependency 'React-Core'
+ s.dependency 'SDWebImage', '~> 5.8'
-+
end
-diff --git a/node_modules/@react-native-community/clipboard/dist/Clipboard.js b/node_modules/@react-native-community/clipboard/dist/Clipboard.js
-index c0c652d..20ef163 100644
---- a/node_modules/@react-native-community/clipboard/dist/Clipboard.js
-+++ b/node_modules/@react-native-community/clipboard/dist/Clipboard.js
-@@ -32,6 +32,83 @@ exports.Clipboard = {
+diff --git a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
+index 67b7237..a485338 100644
+--- a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
++++ b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
+@@ -111,6 +111,83 @@ exports.Clipboard = {
setString: function (content) {
NativeClipboard_1.default.setString(content);
},
@@ -95,26 +94,23 @@
+ return NativeClipboard_1.default.getImageFilePath();
+ },
/**
- * Returns whether the clipboard has content or is empty.
- * This method returns a `Promise`, so you can use following code to get clipboard content
-diff --git a/node_modules/@react-native-community/clipboard/ios/RNCClipboard.m b/node_modules/@react-native-community/clipboard/ios/RNCClipboard.m
-index 3b848c2..4d50dba 100644
---- a/node_modules/@react-native-community/clipboard/ios/RNCClipboard.m
-+++ b/node_modules/@react-native-community/clipboard/ios/RNCClipboard.m
-@@ -1,9 +1,11 @@
- #import "RNCClipboard.h"
-
-
-+#import <MobileCoreServices/MobileCoreServices.h>
+ * Set content of string array type. You can use following code to set clipboard content
+ * ```javascript
+diff --git a/node_modules/@react-native-clipboard/clipboard/ios/RNCClipboard.m b/node_modules/@react-native-clipboard/clipboard/ios/RNCClipboard.m
+index 04143f4..97a4359 100644
+--- a/node_modules/@react-native-clipboard/clipboard/ios/RNCClipboard.m
++++ b/node_modules/@react-native-clipboard/clipboard/ios/RNCClipboard.m
+@@ -4,6 +4,8 @@
#import <UIKit/UIKit.h>
#import <React/RCTBridge.h>
#import <React/RCTEventDispatcher.h>
++#import <MobileCoreServices/MobileCoreServices.h>
+#import <SDWebImage/SDWebImageManager.h>
- @implementation RNCClipboard
-@@ -28,6 +30,100 @@ - (dispatch_queue_t)methodQueue
- resolve((clipboard.string ? : @""));
+ @implementation RNCClipboard {
+@@ -146,6 +148,100 @@ - (void) listener:(NSNotification *) notification
+ resolve([NSNumber numberWithBool: imagePresent]);
}
+RCT_EXPORT_METHOD(setImageFromBase64:(NSString *)image)
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -3117,6 +3117,11 @@
dependencies:
merge-options "^3.0.4"
+"@react-native-clipboard/clipboard@^1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.1.tgz#d3a9e685ce2383b1e92b89a334896c5575cc103d"
+ integrity sha512-nvSIIHzybVWqYxcJE5hpT17ekxAAg383Ggzw5WrYHtkKX61N1AwaKSNmXs5xHV7pmKSOe/yWjtSwxIzfW51I5Q==
+
"@react-native-community/art@^1.1.2", "@react-native-community/art@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@react-native-community/art/-/art-1.2.0.tgz#386d95393f6042d9006f9d4bc6063fb898794460"
@@ -3263,11 +3268,6 @@
sudo-prompt "^9.0.0"
wcwidth "^1.0.1"
-"@react-native-community/clipboard@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@react-native-community/clipboard/-/clipboard-1.5.1.tgz#32abb3ea2eb91ee3f9c5fb1d32d5783253c9fabe"
- integrity sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==
-
"@react-native-community/netinfo@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-6.0.0.tgz#2a4d7190b508dd0c2293656c9c1aa068f6f60a71"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Dec 1, 1:10 AM (21 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2603104
Default Alt Text
D5531.id18066.diff (8 KB)
Attached To
Mode
D5531: [native] Update to react-native-clipboard@1.11.1
Attached
Detach File
Event Timeline
Log In to Comment