diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerComponentDescriptor.h b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerComponentDescriptor.h deleted file mode 100644 index b5b1b1df..00000000 --- a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerComponentDescriptor.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "RNCViewPagerShadowNode.h" -#include - -namespace facebook { -namespace react { - -using RNCViewPagerComponentDescriptor = ConcreteComponentDescriptor; - -} -} diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.cpp b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.cpp deleted file mode 100644 index a81506ac..00000000 --- a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "RNCViewPagerShadowNode.h" - -#include -#include - -namespace facebook { -namespace react { - -const char RNCViewPagerComponentName[] = "RNCViewPager"; - -void RNCViewPagerShadowNode::updateStateIfNeeded() { - ensureUnsealed(); - - auto contentBoundingRect = Rect{}; - for (const auto &childNode : getLayoutableChildNodes()) { - contentBoundingRect.unionInPlace(childNode->getLayoutMetrics().frame); - } - - auto state = getStateData(); - - if (state.contentBoundingRect != contentBoundingRect) { - state.contentBoundingRect = contentBoundingRect; - setStateData(std::move(state)); - } -} - -#pragma mark - LayoutableShadowNode - -void RNCViewPagerShadowNode::layout(LayoutContext layoutContext) { - ConcreteViewShadowNode::layout(layoutContext); - updateStateIfNeeded(); -} - -} -} diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h deleted file mode 100644 index aa5f904f..00000000 --- a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -//These imports come from the common/cpp directory -#include -#include -//This import comes from the codegen directory -#include -#include -#include - -namespace facebook { -namespace react { - -extern const char RNCViewPagerComponentName[]; - -class RNCViewPagerShadowNode final : public ConcreteViewShadowNode< - RNCViewPagerComponentName, - RNCViewPagerProps, - RNCViewPagerEventEmitter, - RNCViewPagerState> { -public: - using ConcreteViewShadowNode::ConcreteViewShadowNode; - -#pragma mark - LayoutableShadowNode - - void layout(LayoutContext layoutContext) override; - -private: - void updateStateIfNeeded(); -}; - -} -} diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.cpp b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.cpp deleted file mode 100644 index a99afaff..00000000 --- a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "RNCViewPagerState.h" - -namespace facebook { -namespace react { - -Size RNCViewPagerState::getContentSize() const { - return contentBoundingRect.size; -} - -} -} diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.h b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.h deleted file mode 100644 index ac43dadf..00000000 --- a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerState.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include - -namespace facebook { -namespace react { - -class RNCViewPagerState final { -public: - Point contentOffset; - Rect contentBoundingRect; - - Size getContentSize() const; - -}; - -} -} diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f6fe4613..aa18cecd 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1243,28 +1243,6 @@ PODS: - ReactCommon/turbomodule/core - Yoga - react-native-pager-view (6.6.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - react-native-pager-view/common (= 6.6.0) - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - - react-native-pager-view/common (6.6.0): - DoubleConversion - glog - hermes-engine @@ -2112,7 +2090,7 @@ SPEC CHECKSUMS: React-logger: 26155dc23db5c9038794db915f80bd2044512c2e React-Mapbuffer: ad1ba0205205a16dbff11b8ade6d1b3959451658 React-microtasksnativemodule: e771eb9eb6ace5884ee40a293a0e14a9d7a4343c - react-native-pager-view: ef50f5798b5932134eeec2e5c349bd867b86cdec + react-native-pager-view: 7f8b1f81aee3c953ea25851553e88b69a7c0413d react-native-safe-area-context: 2500e4fe998caad50ad3bc51ec23ef951308569e React-nativeconfig: aeed6e2a8ac02b2df54476afcc7c663416c12bf7 React-NativeModulesApple: c5b7813da94136f50ef084fa1ac077332dcfc658 @@ -2150,7 +2128,7 @@ SPEC CHECKSUMS: RNScreens: 2fe13c8d610ef2d9d5ace2e7d85b716ec0f5217c RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - Yoga: f6dc1b6029519815d5516a1241821c6a9074af6d + Yoga: 3deb2471faa9916c8a82dda2a22d3fba2620ad37 PODFILE CHECKSUM: c21f5b764d10fb848650e6ae2ea533b823c1f648 diff --git a/package.json b/package.json index ad3aab57..718f9e6f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "lib", "android", "ios", - "common", "react-native-pager-view.podspec", "!lib/typescript/example", "!android/build", diff --git a/react-native-pager-view.podspec b/react-native-pager-view.podspec index d28edada..9b42aaee 100644 --- a/react-native-pager-view.podspec +++ b/react-native-pager-view.podspec @@ -17,14 +17,6 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm}" - if new_arch_enabled - s.subspec "common" do |ss| - ss.source_files = "common/cpp/**/*.{cpp,h}" - ss.header_dir = "RNCViewPager" - ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" } - end - end - # install_modules_dependencies has been defined in RN 0.70 # This check ensure that the library can work on older versions of RN if defined?(install_modules_dependencies)