Merge remote-tracking branch 'origin/main' into rn-0.75

2024-09-24 16:54:44 -07:00
parent 0ba21a2e97 2429d5d1ae
commit ec05e72e9a
217 changed files with 2476 additions and 2598 deletions
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm b/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
+index caa5540..c5d4e67 100644
+--- a/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
+++ b/node_modules/react-native/Libraries/Blob/RCTFileReaderModule.mm
+@@ -73,7 +73,7 @@ @implementation RCTFileReaderModule
+     } else {
+       NSString *type = [RCTConvert NSString:blob[@"type"]];
+       NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
+-                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
+                                                  ![type isEqual:[NSNull null]] && [type length] > 0 ? type : @"application/octet-stream",
+                                                   [data base64EncodedStringWithOptions:0]];
+
+       resolve(text);