Merge branch 'main' into @tomekzaw/worklets

Expensify · Oct 3, 2024 · ede3d9e · ede3d9e
2 parents bd8034d + 2252f70
commit ede3d9e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 31 deletions.
diff --git a/RNLiveMarkdown.podspec b/RNLiveMarkdown.podspec
@@ -35,8 +35,10 @@ Pod::Spec.new do |s|
     ])
   end
 
-  s.subspec "common" do |ss|
-    ss.source_files         = "cpp/**/*.{cpp,h}"
-    ss.header_dir           = "RNLiveMarkdown"
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+    s.subspec "newarch" do |ss|
+      ss.source_files         = "cpp/**/*.{cpp,h}"
+      ss.header_dir           = "RNLiveMarkdown"
+    end
   end
 end
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp
@@ -1,5 +1,3 @@
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
-
 #include "MarkdownShadowFamilyRegistry.h"
 
 namespace expensify {
@@ -60,5 +58,3 @@ bool MarkdownShadowFamilyRegistry::shouldForceUpdate(facebook::react::Tag tag) {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/ShadowNodeFamily.h>
 
@@ -37,5 +36,3 @@ class MarkdownShadowFamilyRegistry {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp
@@ -1,5 +1,3 @@
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
-
 #include "MarkdownTextInputDecoratorShadowNode.h"
 
 using namespace expensify::livemarkdown;
@@ -33,5 +31,3 @@ MarkdownTextInputDecoratorShadowNode::updateFragmentState(
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include "MarkdownShadowFamilyRegistry.h"
 #include "MarkdownTextInputDecoratorState.h"
@@ -45,5 +44,3 @@ class JSI_EXPORT MarkdownTextInputDecoratorShadowNode final
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorState.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorState.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/ShadowNodeFamily.h>
 
@@ -33,5 +32,3 @@ class JSI_EXPORT MarkdownTextInputDecoratorState final {
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/...enderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorViewComponentDescriptor.h b/...enderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorViewComponentDescriptor.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include "MarkdownTextInputDecoratorShadowNode.h"
 #include <react/debug/react_native_assert.h>
@@ -16,5 +15,3 @@ class MarkdownTextInputDecoratorViewComponentDescriptor final
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/OwningShadowNodeFragment.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/OwningShadowNodeFragment.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/ShadowNode.h>
@@ -27,5 +26,3 @@ struct OwningShadowNodeFragment {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1497,7 +1497,7 @@ PODS:
     - React-logger (= 0.75.3)
     - React-perflogger (= 0.75.3)
     - React-utils (= 0.75.3)
-  - RNLiveMarkdown (0.1.158):
+  - RNLiveMarkdown (0.1.162):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1517,10 +1517,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.158)
+    - RNLiveMarkdown/newarch (= 0.1.162)
     - RNReanimated/worklets
     - Yoga
-  - RNLiveMarkdown/common (0.1.158):
+  - RNLiveMarkdown/newarch (0.1.162):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1897,7 +1897,7 @@ SPEC CHECKSUMS:
   React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
   ReactCodegen: ff95a93d5ab5d9b2551571886271478eaa168565
   ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
-  RNLiveMarkdown: ac5c6ac4733467f1c08f51116f0056dabb1b6e72
+  RNLiveMarkdown: c3bde6671f4f1bf85efb330786b1370ccf2e13eb
   RNReanimated: 0cef37a4a4a32bebad5bad49bf20392c7de353b8
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.161",
+  "version": "0.1.162",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",