@depup/react-native 0.86.2-depup.0 → 0.87.1-depup.0

package/React/Views/ScrollView/RCTScrollView.h

@@ -6,84 +6,3 @@
  */
 
 #import <UIKit/UIScrollView.h>
-
-#ifndef RCT_REMOVE_LEGACY_ARCH
-
-#import <React/RCTAutoInsetsProtocol.h>
-#import <React/RCTDefines.h>
-#import <React/RCTEventDispatcherProtocol.h>
-#import <React/RCTScrollableProtocol.h>
-#import <React/RCTView.h>
-
-@protocol UIScrollViewDelegate;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wdeprecated"
-__attribute__((deprecated("This API will be removed along with the legacy architecture.")))
-@interface RCTScrollView : RCTView<UIScrollViewDelegate, RCTScrollableProtocol, RCTAutoInsetsProtocol>
-#pragma clang diagnostic pop
-
-- (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher NS_DESIGNATED_INITIALIZER;
-
-/**
- * The `RCTScrollView` may have at most one single subview. This will ensure
- * that the scroll view's `contentSize` will be efficiently set to the size of
- * the single subview's frame. That frame size will be determined somewhat
- * efficiently since it will have already been computed by the off-main-thread
- * layout system.
- */
-@property (nonatomic, readonly) UIView *contentView;
-
-/**
- * The underlying scrollView (TODO: can we remove this?)
- */
-@property (nonatomic, readonly) UIScrollView *scrollView;
-
-@property (nonatomic, assign) UIEdgeInsets contentInset;
-@property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
-@property (nonatomic, assign) BOOL automaticallyAdjustKeyboardInsets;
-@property (nonatomic, assign) BOOL DEPRECATED_sendUpdatedChildFrames;
-@property (nonatomic, assign) NSTimeInterval scrollEventThrottle;
-@property (nonatomic, assign) BOOL centerContent;
-@property (nonatomic, copy) NSDictionary *maintainVisibleContentPosition;
-@property (nonatomic, assign) BOOL scrollToOverflowEnabled;
-@property (nonatomic, assign) int snapToInterval;
-@property (nonatomic, assign) BOOL disableIntervalMomentum;
-@property (nonatomic, copy) NSArray<NSNumber *> *snapToOffsets;
-@property (nonatomic, assign) BOOL snapToStart;
-@property (nonatomic, assign) BOOL snapToEnd;
-@property (nonatomic, copy) NSString *snapToAlignment;
-@property (nonatomic, assign) BOOL inverted;
-/** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
-@property (nonatomic, assign) CGRect firstResponderFocus;
-/** newly-activated text input outside of the scroll view */
-@property (nonatomic, weak) UIView *firstResponderViewOutsideScrollView;
-
-// NOTE: currently these event props are only declared so we can export the
-// event names to JS - we don't call the blocks directly because scroll events
-// need to be coalesced before sending, for performance reasons.
-@property (nonatomic, copy) RCTDirectEventBlock onScrollBeginDrag;
-@property (nonatomic, copy) RCTDirectEventBlock onScroll;
-@property (nonatomic, copy) RCTDirectEventBlock onScrollToTop;
-@property (nonatomic, copy) RCTDirectEventBlock onScrollEndDrag;
-@property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollBegin;
-@property (nonatomic, copy) RCTDirectEventBlock onMomentumScrollEnd;
-
-@end
-
-@interface UIView (RCTScrollView)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
-- (void)reactUpdateResponderOffsetForScrollView:(RCTScrollView *)scrollView;
-#pragma clang diagnostic pop
-@end
-
-@interface RCTScrollView (Internal)
-
-- (void)updateContentSizeIfNeeded;
-
-@end
-
-RCT_EXTERN void RCTSendFakeScrollEvent(id<RCTEventDispatcherProtocol> eventDispatcher, NSNumber *reactTag);
-
-#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/ScrollView/RCTScrollableProtocol.h

@@ -42,7 +42,3 @@
 @property (nonatomic, weak) UIScrollView *scrollView;
 
 @end
-
-__attribute__((deprecated("Use RCTCustomRefreshControlProtocol instead")))
-@protocol RCTCustomRefreshContolProtocol<RCTCustomRefreshControlProtocol>
-@end

package/React-Core-prebuilt.podspec

@@ -17,36 +17,64 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
+
+  # We vend two xcframeworks that ship together in the prebuilt tarball:
+  #  - React.xcframework: the compiled core. Its per-slice React.framework carries
+  #    every <React/...> header + the framework module map, so `#import <React/...>`
+  #    and `@import React;` resolve through FRAMEWORK_SEARCH_PATHS automatically.
+  #  - ReactNativeHeaders.xcframework: headers-only, PURE-RN. Carries every other
+  #    RN namespace (<react/...>, <yoga/...>, ...). Its headers are flattened into
+  #    a top-level Headers/ (see prepare_command) and exposed via the standard pod
+  #    header search path. The third-party deps namespaces (folly/glog/boost/...)
+  #    are NOT here — the ReactNativeDependencies pod serves them from its own
+  #    artifact (see scripts/cocoapods/__docs__/prebuilt-deps.md), wired through
+  #    add_rn_third_party_dependencies below. (<hermes/...> is supplied by the
+  #    hermes-engine pod here; it is folded into ReactNativeHeaders only on the
+  #    SwiftPM consumer side.)
+  # There is no clang VFS overlay.
   s.vendored_frameworks    = "React.xcframework"
 
   s.preserve_paths       = '**/*.*'
-  s.header_mappings_dir  = 'React.xcframework/Headers'
-  s.source_files         = 'React.xcframework/Headers/**/*.{h,hpp}'
-
-  s.module_name          = 'React'
-  s.module_map           = 'React.xcframework/Modules/module.modulemap'
-  s.public_header_files  = 'React.xcframework/Headers/**/*.h'
+  s.header_mappings_dir  = 'Headers'
+  s.source_files         = 'Headers/**/*.{h,hpp}'
+  s.public_header_files  = 'Headers/**/*.h'
 
   add_rn_third_party_dependencies(s)
 
-  # We need to make sure that the React.xcframework is copied correctly - in the downloaded tarball
-  # the root directory is the framework, but when using it we need to have it in a subdirectory
-  # called React.xcframework, so we need to move the contents of the tarball into that directory.
-  # This is done in the prepare_command.
-  # We need to make sure that the headers are copied to the right place - local tar.gz has a different structure
-  # than the one from the maven repo
+  # The downloaded tarball ships React.xcframework and ReactNativeHeaders.xcframework
+  # at its root. We make sure React.xcframework is in its own subdirectory (the Maven
+  # tarball lays the framework contents at the root; the local tar.gz has a different
+  # structure) and flatten ReactNativeHeaders' headers into a top-level Headers/ dir
+  # so CocoaPods exposes them on the header search path.
   s.prepare_command = <<~'CMD'
     CURRENT_PATH=$(pwd)
     XCFRAMEWORK_PATH="${CURRENT_PATH}/React.xcframework"
 
-    # Check if XCFRAMEWORK_PATH is empty
-    if [ -z "$XCFRAMEWORK_PATH" ]; then
-      echo "ERROR: XCFRAMEWORK_PATH is empty."
-      exit 0
+    # Flatten ReactNativeHeaders' headers (identical across slices) into Headers/
+    # BEFORE we sweep stray root entries into React.xcframework. Fail closed:
+    # a tarball without ReactNativeHeaders.xcframework (an artifact published
+    # before the headers-spec layout, or a truncated download) would otherwise
+    # yield a green install with an empty Headers/ and every <react/...> or
+    # <yoga/...> include failing much later, far from the cause.
+    mkdir -p Headers
+    RNH_XCFRAMEWORK_PATH=$(find "$CURRENT_PATH" -type d -name "ReactNativeHeaders.xcframework" | head -n 1)
+    if [ -z "$RNH_XCFRAMEWORK_PATH" ]; then
+      echo "[React-Core-prebuilt] ERROR: ReactNativeHeaders.xcframework not found in the prebuilt tarball." >&2
+      echo "The artifact predates the headers-spec layout or is incomplete; use a matching react-native version." >&2
+      exit 1
+    fi
+    RNH_HEADERS_PATH=$(find "$RNH_XCFRAMEWORK_PATH" -type d -name "Headers" | head -n 1)
+    if [ -z "$RNH_HEADERS_PATH" ]; then
+      echo "[React-Core-prebuilt] ERROR: no Headers directory inside $RNH_XCFRAMEWORK_PATH." >&2
+      exit 1
     fi
+    cp -R "$RNH_HEADERS_PATH/." Headers
+    rm -rf "$RNH_XCFRAMEWORK_PATH"
 
     mkdir -p "${XCFRAMEWORK_PATH}"
-    find "$CURRENT_PATH" -mindepth 1 -maxdepth 1 ! -name "$(basename "$XCFRAMEWORK_PATH")" -exec mv {} "$XCFRAMEWORK_PATH" \;
+    find "$CURRENT_PATH" -mindepth 1 -maxdepth 1 \
+      ! -name "$(basename "$XCFRAMEWORK_PATH")" ! -name "Headers" \
+      -exec mv {} "$XCFRAMEWORK_PATH" \;
   CMD
 
   # If we are passing a local tarball, we don't want to switch between Debug and Release

package/React-Core.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -51,7 +51,6 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.resource_bundle        = { "RCTI18nStrings" => ["React/I18n/strings/*.lproj"]}
   s.compiler_flags         = js_engine_flags()
   s.header_dir             = "React"
   s.weak_framework         = "JavaScriptCore"
@@ -122,7 +121,15 @@ Pod::Spec.new do |s|
     s.dependency "React-hermes"
   end
 
-  s.resource_bundles = {'React-Core_privacy' => 'React/Resources/PrivacyInfo.xcprivacy'}
+  # Both bundles in one declaration: a second `resource_bundle(s) =` would replace
+  # (not merge) the first. RCTI18nStrings holds React-Core's localized strings
+  # (loaded by RCTLocalizedString); React-Core_privacy is the privacy manifest.
+  # (Prebuilt/SwiftPM get both from inside React.xcframework instead — see
+  # scripts/ios-prebuild/framework-resources.js — but source builds ship them here.)
+  s.resource_bundles = {
+    'RCTI18nStrings' => ['React/I18n/strings/*.lproj'],
+    'React-Core_privacy' => 'React/Resources/PrivacyInfo.xcprivacy',
+  }
 
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')

package/React.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")