Merging Discord's React Native's changes into React Native 0.70 Branch

Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -21,12 +21,14 @@ type NativeBackgroundProp = $ReadOnly<{|
   color: ?number,
   borderless: boolean,
   rippleRadius: ?number,
+  rippleCornerRadius: ?number,
 |}>;
 
 export type RippleConfig = {|
   color?: ColorValue,
   borderless?: boolean,
   radius?: number,
+  cornerRadius?: number,
   foreground?: boolean,
 |};
 
@@ -45,7 +47,8 @@ export default function useAndroidRippleForView(
     | $ReadOnly<{|nativeBackgroundAndroid: NativeBackgroundProp|}>
     | $ReadOnly<{|nativeForegroundAndroid: NativeBackgroundProp|}>,
 |}> {
-  const {color, borderless, radius, foreground} = rippleConfig ?? {};
+  const {color, borderless, radius, cornerRadius, foreground} =
+    rippleConfig ?? {};
 
   return useMemo(() => {
     if (
@@ -64,6 +67,7 @@ export default function useAndroidRippleForView(
         color: processedColor,
         borderless: borderless === true,
         rippleRadius: radius,
+        rippleCornerRadius: cornerRadius,
       };
 
       return {

Libraries/Components/View/ViewPropTypes.js

@@ -248,6 +248,7 @@ type AndroidDrawableRipple = $ReadOnly<{|
   color?: ?number,
   borderless?: ?boolean,
   rippleRadius?: ?number,
+  rippleCornerRadius?: ?number,
 |}>;
 
 type AndroidDrawable = AndroidDrawableThemeAttr | AndroidDrawableRipple;

Libraries/WebSocket/RCTSRWebSocket.h

@@ -80,6 +80,8 @@ extern NSString *const RCTSRHTTPResponseErrorKey;
 - (void)open;
 
 - (void)close;
+- (void)flush;
+
 - (void)closeWithCode:(NSInteger)code reason:(NSString *)reason;
 
 // Send a UTF8 String or Data.

Libraries/WebSocket/RCTSRWebSocket.m

@@ -549,6 +549,13 @@ - (void)unscheduleFromRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode
   [_scheduledRunloops removeObject:@[aRunLoop, mode]];
 }
 
+- (void)flush
+{
+    // By queueing an empty block, all blocks queued before
+    // need to finish executing as this is a serial queue
+    dispatch_sync(_workQueue, ^{});
+}
+
 - (void)close
 {
   [self closeWithCode:RCTSRStatusCodeNormal reason:nil];
@@ -1389,7 +1396,7 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
             // If we get closed in this state it's probably not clean because we should be sending this when we send messages
             [self _performDelegateBlock:^{
               if ([self.delegate respondsToSelector:@selector(webSocket:didCloseWithCode:reason:wasClean:)]) {
-                [self.delegate webSocket:self didCloseWithCode:RCTSRStatusCodeGoingAway reason:@"Stream end encountered" wasClean:NO];
+                [self.delegate webSocket:self didCloseWithCode:self->_closeCode reason:self->_closeReason wasClean:NO];
               }
             }];
           }

React/Base/RCTDisplayLink.m

@@ -19,7 +19,8 @@
 #define RCTAssertRunLoop() \
   RCTAssert(_runLoop == [NSRunLoop currentRunLoop], @"This method must be called on the CADisplayLink run loop")
 
-@implementation RCTDisplayLink {
+@implementation RCTDisplayLink
+{
   CADisplayLink *_jsDisplayLink;
   NSMutableSet<RCTModuleData *> *_frameUpdateObservers;
   NSRunLoop *_runLoop;

React/CoreModules/RCTTiming.mm

@@ -146,6 +146,11 @@ - (void)setup
                                                  name:name
                                                object:nil];
   }
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(deviceProximityStateDidChange)
+                                               name:UIDeviceProximityStateDidChangeNotification
+                                             object:nil];
 }
 
 - (void)dealloc
@@ -182,6 +187,15 @@ - (void)appDidMoveToForeground
   [self startTimers];
 }
 
+- (void)deviceProximityStateDidChange
+{
+  if ([[UIDevice currentDevice] proximityState]) {
+    [self appDidMoveToBackground];
+  } else {
+    [self appDidMoveToForeground];
+  }
+}
+
 - (void)stopTimers
 {
   if (_inBackground) {

React/CoreModules/RCTWebSocketModule.h

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)sendData:(NSData *)data forSocketID:(nonnull NSNumber *)socketID;
 
+// Blocking call that waits until there are no more remaining actions on the queue
+- (void)flush;
+
 @end
 
 @interface RCTBridge (RCTWebSocketModule)

React/CoreModules/RCTWebSocketModule.mm

@@ -51,6 +51,14 @@ - (NSArray *)supportedEvents
   return @[ @"websocketMessage", @"websocketOpen", @"websocketFailed", @"websocketClosed" ];
 }
 
+
+- (void)flush
+{
+  for (RCTSRWebSocket *socket in _sockets.allValues) {
+    [socket flush];
+  }
+}
+
 - (void)invalidate
 {
   [super invalidate];
@@ -167,7 +175,6 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
   NSNumber *socketID = [webSocket reactTag];
   _contentHandlers[socketID] = nil;
-  _sockets[socketID] = nil;
   NSDictionary *body =
       @{@"message" : error.localizedDescription ?: @"Undefined, error is nil", @"id" : socketID ?: @(-1)};
   [self sendEventWithName:@"websocketFailed" body:body];
@@ -180,7 +187,6 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket
 {
   NSNumber *socketID = [webSocket reactTag];
   _contentHandlers[socketID] = nil;
-  _sockets[socketID] = nil;
   [self sendEventWithName:@"websocketClosed"
                      body:@{
                        @"code" : @(code),

React/Views/RCTSwitchManager.m

@@ -49,7 +49,17 @@ - (void)onChange:(RCTSwitch *)sender
 RCT_EXPORT_VIEW_PROPERTY(onTintColor, UIColor);
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor);
 RCT_EXPORT_VIEW_PROPERTY(thumbTintColor, UIColor);
-RCT_REMAP_VIEW_PROPERTY(value, on, BOOL);
+//RCT_REMAP_VIEW_PROPERTY(value, on, BOOL);
+RCT_CUSTOM_VIEW_PROPERTY(value, BOOL, RCTSwitch)
+{
+    if (json) {
+        BOOL on = [RCTConvert BOOL:json];
+        if (view.wasOn != on) {
+            [(UISwitch *)view setOn:on animated:YES];
+            view.wasOn = on;
+        }
+    }
+}
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock);
 RCT_CUSTOM_VIEW_PROPERTY(disabled, BOOL, RCTSwitch)
 {

ReactAndroid/build.gradle

@@ -97,11 +97,24 @@ task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
     dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
 }
 
+// A temporary workaround for build failing on some machines.
+// See: https://github.com/facebook/react-native/issues/28298
+def follyReplaceContent = '''
+  ssize_t r;
+  do {
+    r = open(name, flags, mode);
+  } while (r == -1 && errno == EINTR);
+  return r;
+'''
+
 task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy) {
     from(dependenciesPath ?: tarTree(downloadFolly.dest))
     from("src/main/jni/third-party/folly/")
     include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk", "CMakeLists.txt")
     eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
+    // Fixes problem with Folly failing to build on certain systems.
+    // See https://github.com/facebook/react-native/issues/28298
+    filter { line -> line.replaceAll('return int\\(wrapNoInt\\(open, name, flags, mode\\)\\);', follyReplaceContent) }
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/folly")
 }
@@ -482,8 +495,8 @@ afterEvaluate {
 
         repositories {
             maven {
-                name = "npm"
-                url = AAR_OUTPUT_URL
+                name = "discord"
+                url = uri("gcs://discord-maven")
             }
         }
     }

ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java

@@ -108,10 +108,9 @@ public String getName() {
 
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   private boolean getIsReduceMotionEnabledValue() {
-    String value =
-        Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE);
-
-    return value != null && value.equals("0.0");
+    float defaultAnimationScale = Float.parseFloat(Settings.Global.TRANSITION_ANIMATION_SCALE);
+    float animationScale = Settings.Global.getFloat(mContentResolver, defaultAnimationScale);
+    return animationScale == 0f;
   }
 
   @Override

ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java

@@ -48,6 +48,13 @@ public interface ContentHandler {
     void onMessage(ByteString byteString, WritableMap params);
   }
 
+  public interface OnOpenHandler {
+
+    void onOpen(final WebSocket webSocket, final int socketId);
+  }
+
+  public @Nullable OnOpenHandler mOnOpenHandler = null;
+
   private final Map<Integer, WebSocket> mWebSocketConnections = new ConcurrentHashMap<>();
   private final Map<Integer, ContentHandler> mContentHandlers = new ConcurrentHashMap<>();
 
@@ -154,6 +161,10 @@ public void onOpen(WebSocket webSocket, Response response) {
             params.putInt("id", id);
             params.putString("protocol", response.header("Sec-WebSocket-Protocol", ""));
             sendEvent("websocketOpen", params);
+
+            if (mOnOpenHandler != null) {
+              mOnOpenHandler.onOpen(webSocket, id);
+            }
           }
 
           @Override

ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java

@@ -114,6 +114,11 @@ public String getName() {
     return REACT_CLASS;
   }
 
+  @ReactProp(name = "useSmallCache")
+  public void setUseSmallCache(ReactImageView view, boolean useSmallCache) {
+    view.setUseSmallCache(useSmallCache);
+  }
+
   @ReactProp(name = "accessible")
   public void setAccessible(ReactImageView view, boolean accessible) {
     view.setFocusable(accessible);