From a64e90b1437da7fcc917349c4473ca19bade1edf Mon Sep 17 00:00:00 2001 From: fabriziobertoglio1987 Date: Thu, 10 Nov 2022 16:48:08 +0100 Subject: [PATCH 1/3] cpp AccessibilityUnit settings --- Libraries/Text/Text.js | 2 + .../react/uimanager/BaseViewManager.java | 12 +- .../uimanager/BaseViewManagerAdapter.java | 3 + .../facebook/react/uimanager/ViewProps.java | 1 + .../text/ReactTextAnchorViewManager.java | 11 ++ .../text/TextLayoutManagerMapBuffer.java | 4 + .../views/view/ReactMapBufferPropSetter.kt | 5 +- .../attributedstring/TextAttributes.cpp | 6 + .../attributedstring/TextAttributes.h | 4 +- .../renderer/attributedstring/conversions.h | 49 +++++++ .../renderer/attributedstring/primitives.h | 25 ++++ .../components/view/AccessibilityPrimitives.h | 3 +- .../view/AccessibilityPropsMapBuffer.cpp | 2 +- .../view/accessibilityPropsConversions.h | 4 +- packages/rn-tester/Podfile.lock | 132 +++++++++++++----- packages/rn-tester/RNTester/Info.plist | 24 ++-- .../RNTesterPods.xcodeproj/project.pbxproj | 6 +- .../Accessibility/AccessibilityExample.js | 18 +-- 18 files changed, 235 insertions(+), 76 deletions(-) diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js index 1f6524721cc820..c89f69cf96c74e 100644 --- a/Libraries/Text/Text.js +++ b/Libraries/Text/Text.js @@ -224,6 +224,7 @@ const Text: React.AbstractComponent< ops = new ArrayList<>(); + Log.w( + "TESTING::TextLayoutManagerMapBuffer", + "getMapBuffer(AS_KEY_FRAGMENTS): " + (attributedString.getMapBuffer(AS_KEY_FRAGMENTS))); buildSpannableFromFragment(context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), sb, ops); // TODO T31905686: add support for inline Images diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt index 0f5dd3fcb03b5d..1cf9b09387966a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt @@ -6,7 +6,6 @@ */ package com.facebook.react.views.view -import android.util.Log; import android.graphics.Color import android.graphics.Rect import androidx.core.view.ViewCompat @@ -108,7 +107,6 @@ object ReactMapBufferPropSetter { private const val UNDEF_COLOR = Int.MAX_VALUE fun setProps(view: ReactViewGroup, viewManager: ReactViewManager, props: MapBuffer) { - Log.w("TESTING::ReactMapBufferPropSetter", "props: " + ( props )); for (entry in props) { when (entry.key) { VP_ACCESSIBILITY_ACTIONS -> { @@ -133,7 +131,7 @@ object ReactMapBufferPropSetter { viewManager.accessibilityState(view, entry.mapBufferValue) } VP_ACCESSIBILITY_UNIT -> { - // viewManager.accessibilityUnit(view, entry.mapBufferValue) + viewManager.accessibilityUnit(view, entry.mapBufferValue) } VP_ACCESSIBILITY_VALUE -> { viewManager.accessibilityValue(view, entry.stringValue) @@ -284,7 +282,6 @@ object ReactMapBufferPropSetter { } private fun ReactViewManager.accessibilityUnit(view: ReactViewGroup, value: MapBuffer) { - Log.w("TESTING::ReactMapBufferPropSetter", "accessibilityUnit"); val accessibilityUnit = JavaOnlyMap() accessibilityUnit.putString("hours", "10") diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp index 24f5bbd07b8072..04d73ae810081a 100644 --- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp +++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp @@ -98,6 +98,9 @@ void TextAttributes::apply(TextAttributes textAttributes) { accessibilityRole = textAttributes.accessibilityRole.has_value() ? textAttributes.accessibilityRole : accessibilityRole; + accessibilityUnit = textAttributes.accessibilityUnit.has_value() + ? textAttributes.accessibilityUnit + : accessibilityUnit; } #pragma mark - Operators @@ -122,6 +125,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const { isHighlighted, layoutDirection, accessibilityRole, + accessibilityUnit, textTransform) == std::tie( rhs.foregroundColor, @@ -142,6 +146,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const { rhs.isHighlighted, rhs.layoutDirection, rhs.accessibilityRole, + rhs.accessibilityUnit, rhs.textTransform) && floatEquality(opacity, rhs.opacity) && floatEquality(fontSize, rhs.fontSize) && @@ -209,6 +214,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const { debugStringConvertibleItem("isHighlighted", isHighlighted), debugStringConvertibleItem("layoutDirection", layoutDirection), debugStringConvertibleItem("accessibilityRole", accessibilityRole), + debugStringConvertibleItem("accessibilityUnit", accessibilityUnit), }; } #endif diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h index 69400f2ed172f7..d0b965d2ad0f66 100644 --- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h +++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h @@ -79,6 +79,7 @@ class TextAttributes : public DebugStringConvertible { // construction. std::optional layoutDirection{}; std::optional accessibilityRole{}; + std::optional accessibilityUnit{}; #pragma mark - Operations @@ -131,7 +132,8 @@ struct hash { textAttributes.textShadowColor, textAttributes.isHighlighted, textAttributes.layoutDirection, - textAttributes.accessibilityRole); + textAttributes.accessibilityRole, + textAttributes.accessibilityUnit); } }; } // namespace std diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h index 857b37a673eb28..8193aab799c1e9 100644 --- a/ReactCommon/react/renderer/attributedstring/conversions.h +++ b/ReactCommon/react/renderer/attributedstring/conversions.h @@ -547,6 +547,55 @@ inline void fromRawValue( result = TextDecorationStyle::Solid; } +inline void fromRawValue( + const PropsParserContext &context, + const RawValue &value, + AccessibilityUnit &result) { + auto map = (butter::map)value; + auto hours = map.find("hours"); + if (hours->second.hasType()) { + result.hours = (int) hours->second; + } +} + /* + auto map = (butter::map)value; + auto selected = map.find("selected"); + if (selected != map.end()) { + fromRawValue(context, selected->second, result.selected); + } + auto disabled = map.find("disabled"); + if (disabled != map.end()) { + fromRawValue(context, disabled->second, result.disabled); + } + auto checked = map.find("checked"); + if (checked != map.end()) { + if (checked->second.hasType()) { + if ((std::string)checked->second == "mixed") { + result.checked = AccessibilityState::Mixed; + } else { + result.checked = AccessibilityState::None; + } + } else if (checked->second.hasType()) { + if ((bool)checked->second == true) { + result.checked = AccessibilityState::Checked; + } else { + result.checked = AccessibilityState::Unchecked; + } + } else { + result.checked = AccessibilityState::None; + } + } + auto busy = map.find("busy"); + if (busy != map.end()) { + fromRawValue(context, busy->second, result.busy); + } + auto expanded = map.find("expanded"); + if (expanded != map.end()) { + fromRawValue(context, expanded->second, result.expanded); + } + */ +} + inline std::string toString(const TextDecorationStyle &textDecorationStyle) { switch (textDecorationStyle) { case TextDecorationStyle::Solid: diff --git a/ReactCommon/react/renderer/attributedstring/primitives.h b/ReactCommon/react/renderer/attributedstring/primitives.h index 39e8f31e18b4a6..27e384e9c475ed 100644 --- a/ReactCommon/react/renderer/attributedstring/primitives.h +++ b/ReactCommon/react/renderer/attributedstring/primitives.h @@ -135,6 +135,24 @@ enum class AccessibilityRole { Toolbar, }; + +struct AccessibilityUnit1 { + int hours; +}; + +constexpr bool operator==( + AccessibilityUnit1 const &lhs, + AccessibilityUnit1 const &rhs) { + return lhs.hours == rhs.hours; +} + +constexpr bool operator!=( + AccessibilityUnit1 const &lhs, + AccessibilityUnit1 const &rhs) { + return !(rhs == lhs); +} + + enum class TextTransform { None, Uppercase, @@ -223,6 +241,13 @@ struct hash { } }; +template <> +struct hash { + size_t operator()(const facebook::react::AccessibilityRole &v) const { + return hash()(static_cast(v)); + } +}; + template <> struct hash { size_t operator()(const facebook::react::TextTransform &v) const { diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h index 3fed2e90f9d168..f3cda14697a828 100644 --- a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h +++ b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h @@ -89,7 +89,7 @@ constexpr bool operator!=( } struct AccessibilityUnit { - std::optional hours; + int hours; }; constexpr bool operator==( @@ -104,6 +104,7 @@ constexpr bool operator!=( return !(rhs == lhs); } + struct AccessibilityLabelledBy { std::vector value{}; }; diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp index 191dce6c7b21f9..0f33b52371b027 100644 --- a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp +++ b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp @@ -75,7 +75,7 @@ MapBuffer convertAccessibilityState(AccessibilityState const &state) { MapBuffer convertAccessibilityUnit(AccessibilityUnit const &state) { MapBufferBuilder builder(1); - builder.putString(ACCESSIBILITY_UNIT_HOURS, "10"); + builder.putInt(ACCESSIBILITY_UNIT_HOURS, 10); return builder.build(); } diff --git a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h index d2ce04e9319ca2..b0b85f082beb43 100644 --- a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h +++ b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h @@ -176,8 +176,8 @@ inline void fromRawValue( AccessibilityUnit &result) { auto map = (butter::map)value; auto hours = map.find("hours"); - if (hours != map.end()) { - fromRawValue(context, hours->second, result.hours); + if (hours->second.hasType()) { + result.hours = (int) hours->second; } } diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 1207d1bfa8a33a..75445c0d46589e 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -73,13 +73,6 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (1000.0.0): - - hermes-engine/Hermes (= 1000.0.0) - - hermes-engine/JSI (= 1000.0.0) - - hermes-engine/Public (= 1000.0.0) - - hermes-engine/Hermes (1000.0.0) - - hermes-engine/JSI (1000.0.0) - - hermes-engine/Public (1000.0.0) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): @@ -98,12 +91,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Futures (2021.07.22.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - libevent - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) @@ -128,12 +115,12 @@ PODS: - React-callinvoker (1000.0.0) - React-Codegen (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - - hermes-engine (= 1000.0.0) - RCT-Folly (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) - React-graphics (= 1000.0.0) + - React-jsc (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - React-rncore (= 1000.0.0) @@ -615,19 +602,14 @@ PODS: - React-graphics (1000.0.0): - RCT-Folly/Fabric (= 2021.07.22.00) - React-Core/Default (= 1000.0.0) - - React-hermes (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 1000.0.0) - - React-jsidynamic (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-jsinspector (= 1000.0.0) - - React-perflogger (= 1000.0.0) - - React-jsi (1000.0.0): - - hermes-engine + - React-jsc (1000.0.0): + - React-jsc/Default (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsc/Default (1000.0.0): + - React-jsi (= 1000.0.0) + - React-jsc/Fabric (1000.0.0): + - React-jsi (= 1000.0.0) + - React-jsi (1000.0.0) - React-jsidynamic (1000.0.0): - boost (= 1.76.0) - DoubleConversion @@ -783,8 +765,6 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../../third-party-podspecs/glog.podspec`) - - hermes-engine (from `../../sdks/hermes/hermes-engine.podspec`) - - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`) @@ -801,7 +781,8 @@ DEPENDENCIES: - React-cxxreact (from `../../ReactCommon/cxxreact`) - React-Fabric (from `../../ReactCommon`) - React-graphics (from `../../ReactCommon/react/renderer/graphics`) - - React-hermes (from `../../ReactCommon/hermes`) + - React-jsc (from `../../ReactCommon/jsi`) + - React-jsc/Fabric (from `../../ReactCommon/jsi`) - React-jsi (from `../../ReactCommon/jsi`) - React-jsidynamic (from `../../ReactCommon/jsi`) - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`) @@ -857,8 +838,6 @@ EXTERNAL SOURCES: :path: "../../React/FBReactNativeSpec" glog: :podspec: "../../third-party-podspecs/glog.podspec" - hermes-engine: - :podspec: "../../sdks/hermes/hermes-engine.podspec" RCT-Folly: :podspec: "../../third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -883,8 +862,8 @@ EXTERNAL SOURCES: :path: "../../ReactCommon" React-graphics: :path: "../../ReactCommon/react/renderer/graphics" - React-hermes: - :path: "../../ReactCommon/hermes" + React-jsc: + :path: "../../ReactCommon/jsi" React-jsi: :path: "../../ReactCommon/jsi" React-jsidynamic: @@ -938,8 +917,8 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 19e408e76fa9258dd32191a50d60c41444f52d29 - FBReactNativeSpec: 9761d52cf2d3727e2557fbf4014c514909d76b6b + FBLazyVector: 45c7398c09abbf7e44617d15b947ecccc6ee6f32 + FBReactNativeSpec: 9e19bf0092717d5afb049e1a5ad95d60dc7659af Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -951,10 +930,52 @@ SPEC CHECKSUMS: FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b +<<<<<<< Updated upstream hermes-engine: 05b2399259b25f6c105858adc778c04342c1f424 +||||||| Stash base + hermes-engine: 445a2267b04cb39ca4a0b2d6758b5a0e5a58ccad +======= +>>>>>>> Stashed changes libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 +<<<<<<< Updated upstream + RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e + RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc + React: 8d809d414723bb5763093ddec7658066a21ccabc + React-bridging: c8806159f8ef90f27443857eed1efdb8c85940e1 + React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1 + React-Codegen: d2434d5e4d238bceef25f40c4f58b199eb981ad0 + React-Core: 3965263aa4b4e1ebf7b4fdb50d2f49ce7bf28f63 + React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d + React-cxxreact: ebed982230716c3515ab2f435cb13aec8a56af02 + React-Fabric: 141459e61c825acf02d26ece099acbd9cbd87b99 + React-graphics: 2dda97baebb0082bb85499c862c3f269a194f416 + React-hermes: 4912383b4f062173cb623e570ead70ab380f7bef + React-jsi: c24dbcfdf7ea075138b73372387c7f17c0db56ef + React-jsidynamic: 2b14ac1b6d3a1b7daa1e5a424b98de87da981698 + React-jsiexecutor: 14e899380e3fe9ca74c4e19727540a03e7574721 + React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb + React-logger: a2b4f0f204e45e25f493ca4ce245a336217c923e + React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea + React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1 + React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e + React-RCTAppDelegate: e427b692bf829e40f9b318e2a29dca2ab5f36cf6 + React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9 + React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613 + React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9 + React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370 + React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317 + React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051 + React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6 + React-RCTTest: be92171ef0a1818f96324eac3be0356f4fa08844 + React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9 + React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf + React-rncore: 665c70690f404bbfa3948148de72689672a906d2 + React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7 + ReactCommon: b1f213aa09e3dfd0a89389b5023fdb1cd6528e96 + ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b +||||||| Stash base RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc React: 8d809d414723bb5763093ddec7658066a21ccabc @@ -989,9 +1010,46 @@ SPEC CHECKSUMS: React-rncore: 665c70690f404bbfa3948148de72689672a906d2 React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7 ReactCommon: b1f213aa09e3dfd0a89389b5023fdb1cd6528e96 + ScreenshotManager: 06cb3d1794c8082d92b3e91813d1678d0977a4fb +======= + RCTRequired: 78a5d871cdd33a78d58a568b660a2a9bfb346140 + RCTTypeSafety: 4e8a85fe2e9c2744c350ba7235fa81bae9b069e6 + React: 417cffae3e632d070d10a2e639e09200ea77f7a4 + React-bridging: b0ed21f798e796b80e3793a49d3f14b11bb01345 + React-callinvoker: a98fe9fd09559cabd0f50acf01ee4da8086d07a0 + React-Codegen: 8d84ffa99b8718430122d0e8741139d42c88f752 + React-Core: 9d258eac90e2c98166801a1b9a6702c7b9471259 + React-CoreModules: 17aa31aec66d0a2b275acf15f814fd4ad7accaf0 + React-cxxreact: b673279d52b0128897404eeb00bda6bfd3462cc4 + React-Fabric: b7b1ac4372ff983105eb028eef63f45eda918248 + React-graphics: 60351c160e98826769065f3e876a116d22f4a4c6 + React-jsc: b02cb7fc33dc4390f64967e941fd2e760277445c + React-jsi: d28d1e89ede46c674f6b95049172f4859f2310e5 + React-jsidynamic: 6b9e6540d558f76b638c1ddae0458a2f416f1fd9 + React-jsiexecutor: d841cfd247fc72619e56826a70844b158955c87e + React-jsinspector: b46db7d7051fe91dcb6084f74b95aef55d7f9502 + React-logger: aa8d53fa508a36b1489211d5cea2883f1ae88309 + React-perflogger: fd3945061e238e6866ea829909b9fbae85191a40 + React-RCTActionSheet: 998226e06b1896a5e5d0d8874eace1179e9fa107 + React-RCTAnimation: 84c5b1665024bfe2bfaddd16ea1ee732ab8912a6 + React-RCTAppDelegate: 972bcd8ca5895377008d0a180c26feb0f1b6899e + React-RCTBlob: cffec9c55a7597c4ca9473520edecb666f5d3705 + React-RCTFabric: 03ae5304d30f08ee911bd611e76d307db45164f9 + React-RCTImage: 79ebedab96bf68cfc05caa93a56c81dec30e294a + React-RCTLinking: 49294f63128ce91d7baafa094be19d28c7f13c26 + React-RCTNetwork: 6422f3f1853f59c9424e40505e6b5c53ae1c0314 + React-RCTPushNotification: eec023de3f70d059d572fc2d85c7c8a4d436488a + React-RCTSettings: f1882a48a7cf42e5caf45c86b9d75cd25fcd6948 + React-RCTTest: 2bfa748b6392978900960d6a7e6f7d8706d7afbd + React-RCTText: bc4fe22a4d996dcb3654b1cb43f9361b20c4441a + React-RCTVibration: 213474383e7d22de0470d76d18f4547c78b85d4c + React-rncore: a5cc8165f7d60f32eb786ea09031b7d77a14f2ae + React-runtimeexecutor: a81da4cf3ecdb9c46f13a7a32dba97dd8a89faff + ReactCommon: fbca652b1c41fa73cc5449764e24fc16a52560eb ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b +>>>>>>> Stashed changes SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07 + Yoga: 0ace589d1719f78a6bad550108f56a9cbd5cd561 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 20298ecd3f30aa788ad491637e593ed0d8c100ca diff --git a/packages/rn-tester/RNTester/Info.plist b/packages/rn-tester/RNTester/Info.plist index 788e4d6193c8d5..0b7f1d5d85183d 100644 --- a/packages/rn-tester/RNTester/Info.plist +++ b/packages/rn-tester/RNTester/Info.plist @@ -2,16 +2,6 @@ - LSApplicationQueriesSchemes - - tel - telprompt - http - fb - geo - - UIStatusBarStyle - UIStatusBarStyleBlackTranslucent CFBundleDevelopmentRegion en CFBundleExecutable @@ -43,6 +33,14 @@ CFBundleVersion 1 + LSApplicationQueriesSchemes + + tel + telprompt + http + fb + geo + LSRequiresIPhoneOS NSAppTransportSecurity @@ -52,12 +50,16 @@ NSLocationWhenInUseUsageDescription You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation, otherwise it is going to *fail silently*! + NSPhotoLibraryUsageDescription + You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*! UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities armv7 + UIStatusBarStyle + UIStatusBarStyleBlackTranslucent UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -66,7 +68,5 @@ UIViewControllerBasedStatusBarAppearance - NSPhotoLibraryUsageDescription - You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*! diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 3f1016eaf000f2..abe3820e463058 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -820,7 +820,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = N4Z278KJB7; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( @@ -840,7 +840,7 @@ "-framework", "\"JavaScriptCore\"", ); - PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment; + PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment1; PRODUCT_NAME = RNTester; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -852,7 +852,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = N4Z278KJB7; EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.4; diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js index 46be8a69c9de4b..03354c9b6bc23c 100644 --- a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js +++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js @@ -169,9 +169,10 @@ class AccessibilityExample extends React.Component<{}> { - My number is{' '} + My number is 17:00 @@ -413,6 +414,7 @@ class SwitchExample extends React.Component< _onSwitchToggle = () => { const switchState = !this.state.switchState; + console.log('switchState:', switchState); this.setState({ switchState: switchState, }); @@ -420,14 +422,12 @@ class SwitchExample extends React.Component< render(): React.Node { return ( - - Switch example - + console.log('onPress')} + disabled + accessibilityState={{disabled: true}}> + This is a Switch example + ); } } From 21babe63f03227811d53bcc365fb12c46637dad4 Mon Sep 17 00:00:00 2001 From: fabriziobertoglio1987 Date: Thu, 10 Nov 2022 16:56:26 +0100 Subject: [PATCH 2/3] remove podfile --- packages/rn-tester/Podfile.lock | 222 +++++++----------- packages/rn-tester/RNTester/Info.plist | 24 +- .../RNTesterPods.xcodeproj/project.pbxproj | 6 +- 3 files changed, 98 insertions(+), 154 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 75445c0d46589e..d6bfa85c149f95 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -73,6 +73,13 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) + - hermes-engine (1000.0.0): + - hermes-engine/Hermes (= 1000.0.0) + - hermes-engine/JSI (= 1000.0.0) + - hermes-engine/Public (= 1000.0.0) + - hermes-engine/Hermes (1000.0.0) + - hermes-engine/JSI (1000.0.0) + - hermes-engine/Public (1000.0.0) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): @@ -91,6 +98,12 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog + - RCT-Folly/Futures (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - libevent - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) @@ -109,21 +122,19 @@ PODS: - React-RCTSettings (= 1000.0.0) - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - - React-bridging (1000.0.0): - - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 1000.0.0) - React-callinvoker (1000.0.0) - React-Codegen (1000.0.0): - FBReactNativeSpec (= 1000.0.0) + - hermes-engine (= 1000.0.0) - RCT-Folly (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) - React-graphics (= 1000.0.0) - - React-jsc (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - React-rncore (= 1000.0.0) + - ReactCommon/turbomodule/bridging (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-Core (1000.0.0): - glog @@ -602,14 +613,19 @@ PODS: - React-graphics (1000.0.0): - RCT-Folly/Fabric (= 2021.07.22.00) - React-Core/Default (= 1000.0.0) - - React-jsc (1000.0.0): - - React-jsc/Default (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsc/Default (1000.0.0): - - React-jsi (= 1000.0.0) - - React-jsc/Fabric (1000.0.0): - - React-jsi (= 1000.0.0) - - React-jsi (1000.0.0) + - React-hermes (1000.0.0): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2021.07.22.00) + - RCT-Folly/Futures (= 2021.07.22.00) + - React-cxxreact (= 1000.0.0) + - React-jsidynamic (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-jsinspector (= 1000.0.0) + - React-perflogger (= 1000.0.0) + - React-jsi (1000.0.0): + - hermes-engine - React-jsidynamic (1000.0.0): - boost (= 1.76.0) - DoubleConversion @@ -706,11 +722,20 @@ PODS: - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): - React-jsi (= 1000.0.0) + - ReactCommon/turbomodule/bridging (1000.0.0): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 1000.0.0) + - React-Core (= 1000.0.0) + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-logger (= 1000.0.0) + - React-perflogger (= 1000.0.0) - ReactCommon/turbomodule/core (1000.0.0): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 1000.0.0) - React-callinvoker (= 1000.0.0) - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -722,7 +747,6 @@ PODS: - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 1000.0.0) - React-callinvoker (= 1000.0.0) - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -765,13 +789,14 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../../third-party-podspecs/glog.podspec`) + - hermes-engine (from `../../sdks/hermes/hermes-engine.podspec`) + - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../../Libraries/RCTRequired`) - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) - - React-bridging (from `../../ReactCommon`) - React-callinvoker (from `../../ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../../`) @@ -781,8 +806,7 @@ DEPENDENCIES: - React-cxxreact (from `../../ReactCommon/cxxreact`) - React-Fabric (from `../../ReactCommon`) - React-graphics (from `../../ReactCommon/react/renderer/graphics`) - - React-jsc (from `../../ReactCommon/jsi`) - - React-jsc/Fabric (from `../../ReactCommon/jsi`) + - React-hermes (from `../../ReactCommon/hermes`) - React-jsi (from `../../ReactCommon/jsi`) - React-jsidynamic (from `../../ReactCommon/jsi`) - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`) @@ -838,6 +862,8 @@ EXTERNAL SOURCES: :path: "../../React/FBReactNativeSpec" glog: :podspec: "../../third-party-podspecs/glog.podspec" + hermes-engine: + :podspec: "../../sdks/hermes/hermes-engine.podspec" RCT-Folly: :podspec: "../../third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -846,8 +872,6 @@ EXTERNAL SOURCES: :path: "../../Libraries/TypeSafety" React: :path: "../../" - React-bridging: - :path: "../../ReactCommon" React-callinvoker: :path: "../../ReactCommon/callinvoker" React-Codegen: @@ -862,8 +886,8 @@ EXTERNAL SOURCES: :path: "../../ReactCommon" React-graphics: :path: "../../ReactCommon/react/renderer/graphics" - React-jsc: - :path: "../../ReactCommon/jsi" + React-hermes: + :path: "../../ReactCommon/hermes" React-jsi: :path: "../../ReactCommon/jsi" React-jsidynamic: @@ -917,8 +941,8 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 45c7398c09abbf7e44617d15b947ecccc6ee6f32 - FBReactNativeSpec: 9e19bf0092717d5afb049e1a5ad95d60dc7659af + FBLazyVector: d68947eddece25638eb0f642d1b957c90388afd1 + FBReactNativeSpec: 9a029e7dec747a8836d785b3b7a433db5960504b Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -930,126 +954,46 @@ SPEC CHECKSUMS: FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b -<<<<<<< Updated upstream - hermes-engine: 05b2399259b25f6c105858adc778c04342c1f424 -||||||| Stash base - hermes-engine: 445a2267b04cb39ca4a0b2d6758b5a0e5a58ccad -======= ->>>>>>> Stashed changes + hermes-engine: d344c89c3f4657f7031e5280e1b3dd531b425bfd libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 -<<<<<<< Updated upstream - RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e - RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc - React: 8d809d414723bb5763093ddec7658066a21ccabc - React-bridging: c8806159f8ef90f27443857eed1efdb8c85940e1 - React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1 - React-Codegen: d2434d5e4d238bceef25f40c4f58b199eb981ad0 - React-Core: 3965263aa4b4e1ebf7b4fdb50d2f49ce7bf28f63 - React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d - React-cxxreact: ebed982230716c3515ab2f435cb13aec8a56af02 - React-Fabric: 141459e61c825acf02d26ece099acbd9cbd87b99 - React-graphics: 2dda97baebb0082bb85499c862c3f269a194f416 - React-hermes: 4912383b4f062173cb623e570ead70ab380f7bef - React-jsi: c24dbcfdf7ea075138b73372387c7f17c0db56ef - React-jsidynamic: 2b14ac1b6d3a1b7daa1e5a424b98de87da981698 - React-jsiexecutor: 14e899380e3fe9ca74c4e19727540a03e7574721 - React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb - React-logger: a2b4f0f204e45e25f493ca4ce245a336217c923e - React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea - React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1 - React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e - React-RCTAppDelegate: e427b692bf829e40f9b318e2a29dca2ab5f36cf6 - React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9 - React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613 - React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9 - React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370 - React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317 - React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051 - React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6 - React-RCTTest: be92171ef0a1818f96324eac3be0356f4fa08844 - React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9 - React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf - React-rncore: 665c70690f404bbfa3948148de72689672a906d2 - React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7 - ReactCommon: b1f213aa09e3dfd0a89389b5023fdb1cd6528e96 - ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b -||||||| Stash base - RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e - RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc - React: 8d809d414723bb5763093ddec7658066a21ccabc - React-bridging: c8806159f8ef90f27443857eed1efdb8c85940e1 - React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1 - React-Codegen: d2434d5e4d238bceef25f40c4f58b199eb981ad0 - React-Core: 3965263aa4b4e1ebf7b4fdb50d2f49ce7bf28f63 - React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d - React-cxxreact: ebed982230716c3515ab2f435cb13aec8a56af02 - React-Fabric: 141459e61c825acf02d26ece099acbd9cbd87b99 - React-graphics: 2dda97baebb0082bb85499c862c3f269a194f416 - React-hermes: 4912383b4f062173cb623e570ead70ab380f7bef - React-jsi: c24dbcfdf7ea075138b73372387c7f17c0db56ef - React-jsidynamic: 2b14ac1b6d3a1b7daa1e5a424b98de87da981698 - React-jsiexecutor: 14e899380e3fe9ca74c4e19727540a03e7574721 - React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb - React-logger: a2b4f0f204e45e25f493ca4ce245a336217c923e - React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea - React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1 - React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e - React-RCTAppDelegate: e427b692bf829e40f9b318e2a29dca2ab5f36cf6 - React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9 - React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613 - React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9 - React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370 - React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317 - React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051 - React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6 - React-RCTTest: be92171ef0a1818f96324eac3be0356f4fa08844 - React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9 - React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf - React-rncore: 665c70690f404bbfa3948148de72689672a906d2 - React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7 - ReactCommon: b1f213aa09e3dfd0a89389b5023fdb1cd6528e96 - ScreenshotManager: 06cb3d1794c8082d92b3e91813d1678d0977a4fb -======= - RCTRequired: 78a5d871cdd33a78d58a568b660a2a9bfb346140 - RCTTypeSafety: 4e8a85fe2e9c2744c350ba7235fa81bae9b069e6 - React: 417cffae3e632d070d10a2e639e09200ea77f7a4 - React-bridging: b0ed21f798e796b80e3793a49d3f14b11bb01345 - React-callinvoker: a98fe9fd09559cabd0f50acf01ee4da8086d07a0 - React-Codegen: 8d84ffa99b8718430122d0e8741139d42c88f752 - React-Core: 9d258eac90e2c98166801a1b9a6702c7b9471259 - React-CoreModules: 17aa31aec66d0a2b275acf15f814fd4ad7accaf0 - React-cxxreact: b673279d52b0128897404eeb00bda6bfd3462cc4 - React-Fabric: b7b1ac4372ff983105eb028eef63f45eda918248 - React-graphics: 60351c160e98826769065f3e876a116d22f4a4c6 - React-jsc: b02cb7fc33dc4390f64967e941fd2e760277445c - React-jsi: d28d1e89ede46c674f6b95049172f4859f2310e5 - React-jsidynamic: 6b9e6540d558f76b638c1ddae0458a2f416f1fd9 - React-jsiexecutor: d841cfd247fc72619e56826a70844b158955c87e - React-jsinspector: b46db7d7051fe91dcb6084f74b95aef55d7f9502 - React-logger: aa8d53fa508a36b1489211d5cea2883f1ae88309 - React-perflogger: fd3945061e238e6866ea829909b9fbae85191a40 - React-RCTActionSheet: 998226e06b1896a5e5d0d8874eace1179e9fa107 - React-RCTAnimation: 84c5b1665024bfe2bfaddd16ea1ee732ab8912a6 - React-RCTAppDelegate: 972bcd8ca5895377008d0a180c26feb0f1b6899e - React-RCTBlob: cffec9c55a7597c4ca9473520edecb666f5d3705 - React-RCTFabric: 03ae5304d30f08ee911bd611e76d307db45164f9 - React-RCTImage: 79ebedab96bf68cfc05caa93a56c81dec30e294a - React-RCTLinking: 49294f63128ce91d7baafa094be19d28c7f13c26 - React-RCTNetwork: 6422f3f1853f59c9424e40505e6b5c53ae1c0314 - React-RCTPushNotification: eec023de3f70d059d572fc2d85c7c8a4d436488a - React-RCTSettings: f1882a48a7cf42e5caf45c86b9d75cd25fcd6948 - React-RCTTest: 2bfa748b6392978900960d6a7e6f7d8706d7afbd - React-RCTText: bc4fe22a4d996dcb3654b1cb43f9361b20c4441a - React-RCTVibration: 213474383e7d22de0470d76d18f4547c78b85d4c - React-rncore: a5cc8165f7d60f32eb786ea09031b7d77a14f2ae - React-runtimeexecutor: a81da4cf3ecdb9c46f13a7a32dba97dd8a89faff - ReactCommon: fbca652b1c41fa73cc5449764e24fc16a52560eb - ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b ->>>>>>> Stashed changes + RCTRequired: 54a4f03dbbebb0cfdb4e2ba8d3b1d0b1258f8c08 + RCTTypeSafety: a41e253b4ed644708899857d912b2f50c7b6214d + React: 2fc6c4c656cccd6753016528ad41199c16fd558e + React-callinvoker: a7d5e883a83bb9bd3985b08be832c5e76451d18f + React-Codegen: 4a022870a58b95e17da8f32641ba3d72b551f268 + React-Core: 719bec4b41c93b1affb1e2c3a43956ec482ecb9f + React-CoreModules: feaa45c54c58e1420981f6dd544c8b3d01200caa + React-cxxreact: c5f93e7a35f3545489d8e1f89beb9d2d56acfde5 + React-Fabric: 8a854fd89c932ab073f67036bb45d1787d0d31a4 + React-graphics: cb8a85648695c60f33a00d732b985f734d1470d8 + React-hermes: 299c7f56d32e8953480fd8e7fba2a7968a534b3f + React-jsi: d40e13b7f545f9af2af780f153f5321018b5e2f8 + React-jsidynamic: 8aa406dfc1eff081f3443e55a28b51d11616a3bf + React-jsiexecutor: 04a945f040cc085d79655359ec29e5f501fb6e01 + React-jsinspector: a56861590ddfcb5cb544877ade3e007a32ff9616 + React-logger: 07c9b44040a6f948b8e2033207b23cb623f0b9b4 + React-perflogger: b4b9fb2ddd856b78003708ab3cf66ce03e6bc7c4 + React-RCTActionSheet: 1b1501ef80928be10702cd0ce09120358094cd82 + React-RCTAnimation: 6741f7be3e269e057c1426074cc70f34b56e114b + React-RCTAppDelegate: 0b3b2c1e02c02f952f5033535ddb23d690e3b890 + React-RCTBlob: 94feb99abafd0527a78f6caaa17a0bcec9ce3167 + React-RCTFabric: db1d7fe55db4811b63ae4060078e7048ebb4a918 + React-RCTImage: 055685a12c88939437f6520d9e7c120cd666cbf1 + React-RCTLinking: b149b3ff1f96fa93fc445230b9c171adb0e5572c + React-RCTNetwork: 21abb4231182651f48b7035beaa011b1ab7ae8f4 + React-RCTPushNotification: f3af966de34c1fe2df8860625d225fb2f581d15e + React-RCTSettings: 64b6acabfddf7f96796229b101bd91f46d14391b + React-RCTTest: 81ebfa8c2e1b0b482effe12485e6486dc0ff70d7 + React-RCTText: 4e5ae05b778a0ed2b22b012af025da5e1a1c4e54 + React-RCTVibration: ecfd04c1886a9c9a4e31a466c0fbcf6b36e92fde + React-rncore: 08566b41339706758229f407c8907b2f7987f058 + React-runtimeexecutor: c7b2cd6babf6cc50340398bfbb7a9da13c93093f + ReactCommon: fc336a81ae40421e172c3ca9496677e34d7e3ed5 + ScreenshotManager: 2bd28f9b590a13c811f1f4ce32aab767f8845c6b SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 0ace589d1719f78a6bad550108f56a9cbd5cd561 + Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 20298ecd3f30aa788ad491637e593ed0d8c100ca diff --git a/packages/rn-tester/RNTester/Info.plist b/packages/rn-tester/RNTester/Info.plist index 0b7f1d5d85183d..788e4d6193c8d5 100644 --- a/packages/rn-tester/RNTester/Info.plist +++ b/packages/rn-tester/RNTester/Info.plist @@ -2,6 +2,16 @@ + LSApplicationQueriesSchemes + + tel + telprompt + http + fb + geo + + UIStatusBarStyle + UIStatusBarStyleBlackTranslucent CFBundleDevelopmentRegion en CFBundleExecutable @@ -33,14 +43,6 @@ CFBundleVersion 1 - LSApplicationQueriesSchemes - - tel - telprompt - http - fb - geo - LSRequiresIPhoneOS NSAppTransportSecurity @@ -50,16 +52,12 @@ NSLocationWhenInUseUsageDescription You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation, otherwise it is going to *fail silently*! - NSPhotoLibraryUsageDescription - You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*! UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities armv7 - UIStatusBarStyle - UIStatusBarStyleBlackTranslucent UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -68,5 +66,7 @@ UIViewControllerBasedStatusBarAppearance + NSPhotoLibraryUsageDescription + You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*! diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index abe3820e463058..3f1016eaf000f2 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -820,7 +820,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = N4Z278KJB7; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( @@ -840,7 +840,7 @@ "-framework", "\"JavaScriptCore\"", ); - PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment1; + PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment; PRODUCT_NAME = RNTester; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -852,7 +852,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements; - DEVELOPMENT_TEAM = N4Z278KJB7; + DEVELOPMENT_TEAM = ""; EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 12.4; From 45eb305d56c7288aa72e43a22492f9b9f3bfab53 Mon Sep 17 00:00:00 2001 From: fabriziobertoglio1987 Date: Thu, 10 Nov 2022 17:00:27 +0100 Subject: [PATCH 3/3] remove podfile --- packages/rn-tester/Podfile.lock | 94 ++++++++++++++++----------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index d6bfa85c149f95..1207d1bfa8a33a 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -122,6 +122,9 @@ PODS: - React-RCTSettings (= 1000.0.0) - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) + - React-bridging (1000.0.0): + - RCT-Folly (= 2021.07.22.00) + - React-jsi (= 1000.0.0) - React-callinvoker (1000.0.0) - React-Codegen (1000.0.0): - FBReactNativeSpec (= 1000.0.0) @@ -134,7 +137,6 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - React-rncore (= 1000.0.0) - - ReactCommon/turbomodule/bridging (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-Core (1000.0.0): - glog @@ -722,20 +724,11 @@ PODS: - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): - React-jsi (= 1000.0.0) - - ReactCommon/turbomodule/bridging (1000.0.0): - - DoubleConversion - - glog - - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 1000.0.0) - - React-Core (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-logger (= 1000.0.0) - - React-perflogger (= 1000.0.0) - ReactCommon/turbomodule/core (1000.0.0): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) + - React-bridging (= 1000.0.0) - React-callinvoker (= 1000.0.0) - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -747,6 +740,7 @@ PODS: - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) + - React-bridging (= 1000.0.0) - React-callinvoker (= 1000.0.0) - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -797,6 +791,7 @@ DEPENDENCIES: - RCTRequired (from `../../Libraries/RCTRequired`) - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) + - React-bridging (from `../../ReactCommon`) - React-callinvoker (from `../../ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../../`) @@ -872,6 +867,8 @@ EXTERNAL SOURCES: :path: "../../Libraries/TypeSafety" React: :path: "../../" + React-bridging: + :path: "../../ReactCommon" React-callinvoker: :path: "../../ReactCommon/callinvoker" React-Codegen: @@ -941,8 +938,8 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: d68947eddece25638eb0f642d1b957c90388afd1 - FBReactNativeSpec: 9a029e7dec747a8836d785b3b7a433db5960504b + FBLazyVector: 19e408e76fa9258dd32191a50d60c41444f52d29 + FBReactNativeSpec: 9761d52cf2d3727e2557fbf4014c514909d76b6b Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -954,44 +951,45 @@ SPEC CHECKSUMS: FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: d344c89c3f4657f7031e5280e1b3dd531b425bfd + hermes-engine: 05b2399259b25f6c105858adc778c04342c1f424 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: 54a4f03dbbebb0cfdb4e2ba8d3b1d0b1258f8c08 - RCTTypeSafety: a41e253b4ed644708899857d912b2f50c7b6214d - React: 2fc6c4c656cccd6753016528ad41199c16fd558e - React-callinvoker: a7d5e883a83bb9bd3985b08be832c5e76451d18f - React-Codegen: 4a022870a58b95e17da8f32641ba3d72b551f268 - React-Core: 719bec4b41c93b1affb1e2c3a43956ec482ecb9f - React-CoreModules: feaa45c54c58e1420981f6dd544c8b3d01200caa - React-cxxreact: c5f93e7a35f3545489d8e1f89beb9d2d56acfde5 - React-Fabric: 8a854fd89c932ab073f67036bb45d1787d0d31a4 - React-graphics: cb8a85648695c60f33a00d732b985f734d1470d8 - React-hermes: 299c7f56d32e8953480fd8e7fba2a7968a534b3f - React-jsi: d40e13b7f545f9af2af780f153f5321018b5e2f8 - React-jsidynamic: 8aa406dfc1eff081f3443e55a28b51d11616a3bf - React-jsiexecutor: 04a945f040cc085d79655359ec29e5f501fb6e01 - React-jsinspector: a56861590ddfcb5cb544877ade3e007a32ff9616 - React-logger: 07c9b44040a6f948b8e2033207b23cb623f0b9b4 - React-perflogger: b4b9fb2ddd856b78003708ab3cf66ce03e6bc7c4 - React-RCTActionSheet: 1b1501ef80928be10702cd0ce09120358094cd82 - React-RCTAnimation: 6741f7be3e269e057c1426074cc70f34b56e114b - React-RCTAppDelegate: 0b3b2c1e02c02f952f5033535ddb23d690e3b890 - React-RCTBlob: 94feb99abafd0527a78f6caaa17a0bcec9ce3167 - React-RCTFabric: db1d7fe55db4811b63ae4060078e7048ebb4a918 - React-RCTImage: 055685a12c88939437f6520d9e7c120cd666cbf1 - React-RCTLinking: b149b3ff1f96fa93fc445230b9c171adb0e5572c - React-RCTNetwork: 21abb4231182651f48b7035beaa011b1ab7ae8f4 - React-RCTPushNotification: f3af966de34c1fe2df8860625d225fb2f581d15e - React-RCTSettings: 64b6acabfddf7f96796229b101bd91f46d14391b - React-RCTTest: 81ebfa8c2e1b0b482effe12485e6486dc0ff70d7 - React-RCTText: 4e5ae05b778a0ed2b22b012af025da5e1a1c4e54 - React-RCTVibration: ecfd04c1886a9c9a4e31a466c0fbcf6b36e92fde - React-rncore: 08566b41339706758229f407c8907b2f7987f058 - React-runtimeexecutor: c7b2cd6babf6cc50340398bfbb7a9da13c93093f - ReactCommon: fc336a81ae40421e172c3ca9496677e34d7e3ed5 - ScreenshotManager: 2bd28f9b590a13c811f1f4ce32aab767f8845c6b + RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e + RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc + React: 8d809d414723bb5763093ddec7658066a21ccabc + React-bridging: c8806159f8ef90f27443857eed1efdb8c85940e1 + React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1 + React-Codegen: d2434d5e4d238bceef25f40c4f58b199eb981ad0 + React-Core: 3965263aa4b4e1ebf7b4fdb50d2f49ce7bf28f63 + React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d + React-cxxreact: ebed982230716c3515ab2f435cb13aec8a56af02 + React-Fabric: 141459e61c825acf02d26ece099acbd9cbd87b99 + React-graphics: 2dda97baebb0082bb85499c862c3f269a194f416 + React-hermes: 4912383b4f062173cb623e570ead70ab380f7bef + React-jsi: c24dbcfdf7ea075138b73372387c7f17c0db56ef + React-jsidynamic: 2b14ac1b6d3a1b7daa1e5a424b98de87da981698 + React-jsiexecutor: 14e899380e3fe9ca74c4e19727540a03e7574721 + React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb + React-logger: a2b4f0f204e45e25f493ca4ce245a336217c923e + React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea + React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1 + React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e + React-RCTAppDelegate: e427b692bf829e40f9b318e2a29dca2ab5f36cf6 + React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9 + React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613 + React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9 + React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370 + React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317 + React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051 + React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6 + React-RCTTest: be92171ef0a1818f96324eac3be0356f4fa08844 + React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9 + React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf + React-rncore: 665c70690f404bbfa3948148de72689672a906d2 + React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7 + ReactCommon: b1f213aa09e3dfd0a89389b5023fdb1cd6528e96 + ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a