From e5017ddeff35cf25be8bbc5293b093baa2a304f3 Mon Sep 17 00:00:00 2001 From: Tomek Zawadzki Date: Wed, 11 Sep 2024 11:31:11 +0200 Subject: [PATCH] Add missing C++ namespaces --- .../MarkdownShadowFamilyRegistry.cpp | 6 ++++++ .../RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h | 6 ++++++ .../MarkdownTextInputDecoratorShadowNode.cpp | 2 ++ .../MarkdownTextInputDecoratorShadowNode.h | 2 ++ example/ios/Podfile.lock | 10 +++++----- ios/MarkdownCommitHook.h | 2 ++ ios/MarkdownCommitHook.mm | 2 ++ ios/RCTLiveMarkdownModule.mm | 7 ++++--- ios/RCTTextInputComponentView+Markdown.mm | 2 ++ 9 files changed, 31 insertions(+), 8 deletions(-) diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp index 1a0f4a74..de564b32 100644 --- a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp +++ b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp @@ -2,6 +2,9 @@ #include "MarkdownShadowFamilyRegistry.h" +namespace expensify { +namespace livemarkdown { + std::set MarkdownShadowFamilyRegistry::familiesToUpdate_; std::set MarkdownShadowFamilyRegistry::forcedUpdates_; @@ -55,4 +58,7 @@ bool MarkdownShadowFamilyRegistry::shouldForceUpdate(facebook::react::Tag tag) { return false; } +} // namespace livemarkdown +} // namespace expensify + #endif diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h index f76c87d8..4e9431b5 100644 --- a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h +++ b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h @@ -6,6 +6,9 @@ #include #include +namespace expensify { +namespace livemarkdown { + // A registry to store pointers to the ShadowNodeFamilies of markdown // decorators. The only place we can _legally_ access the family of shadow node // is in the constructor and we need it inside commit hook. To achieve it, we @@ -32,4 +35,7 @@ class MarkdownShadowFamilyRegistry { static std::mutex mutex_; }; +} // namespace livemarkdown +} // namespace expensify + #endif diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp index 9240e9eb..ae56126d 100644 --- a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp +++ b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp @@ -5,6 +5,8 @@ #include "MarkdownShadowFamilyRegistry.h" #include "MarkdownTextInputDecoratorShadowNode.h" +using namespace expensify::livemarkdown; + namespace facebook { namespace react { diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h index 597752cb..3392d557 100644 --- a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h +++ b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h @@ -8,6 +8,8 @@ #include #include +using namespace expensify::livemarkdown; + namespace facebook { namespace react { diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index aab42016..a8b209b1 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1497,7 +1497,7 @@ PODS: - React-logger (= 0.75.2) - React-perflogger (= 0.75.2) - React-utils (= 0.75.2) - - RNLiveMarkdown (0.1.128): + - RNLiveMarkdown (0.1.135): - DoubleConversion - glog - hermes-engine @@ -1517,9 +1517,9 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNLiveMarkdown/common (= 0.1.128) + - RNLiveMarkdown/common (= 0.1.135) - Yoga - - RNLiveMarkdown/common (0.1.128): + - RNLiveMarkdown/common (0.1.135): - DoubleConversion - glog - hermes-engine @@ -1805,10 +1805,10 @@ SPEC CHECKSUMS: React-utils: 81a715d9c0a2a49047e77a86f3a2247408540deb ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b - RNLiveMarkdown: 44cc9af8742cfd5355733d29fa54e64e4edf0f0d + RNLiveMarkdown: 77f3338039cf98111a753256849b90567a41fc53 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: 2a45d7e59592db061217551fd3bbe2dd993817ae PODFILE CHECKSUM: 9b81b0f7bfba9e6fb4fa10efe8319f7860794e08 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/ios/MarkdownCommitHook.h b/ios/MarkdownCommitHook.h index 92f0acaf..ac6cc45e 100644 --- a/ios/MarkdownCommitHook.h +++ b/ios/MarkdownCommitHook.h @@ -11,6 +11,7 @@ using namespace facebook::react; +namespace expensify { namespace livemarkdown { struct MarkdownTextInputDecoratorPair { @@ -38,5 +39,6 @@ class MarkdownCommitHook : public UIManagerCommitHook { }; } // namespace livemarkdown +} // namespace expensify #endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/MarkdownCommitHook.mm b/ios/MarkdownCommitHook.mm index 53f3ddd3..6524cac9 100644 --- a/ios/MarkdownCommitHook.mm +++ b/ios/MarkdownCommitHook.mm @@ -11,6 +11,7 @@ using namespace facebook::react; +namespace expensify { namespace livemarkdown { MarkdownCommitHook::MarkdownCommitHook( @@ -192,5 +193,6 @@ } } // namespace livemarkdown +} // namespace expensify #endif // RCT_NEW_ARCH_ENABLED diff --git a/ios/RCTLiveMarkdownModule.mm b/ios/RCTLiveMarkdownModule.mm index 24bbcb84..53e91785 100644 --- a/ios/RCTLiveMarkdownModule.mm +++ b/ios/RCTLiveMarkdownModule.mm @@ -7,13 +7,15 @@ #import "MarkdownShadowFamilyRegistry.h" #import "RCTLiveMarkdownModule.h" +using namespace expensify::livemarkdown; + // A turbomodule used to register the commit hook // I think this is the easiest way to access the UIManager, which we need to // actually register the hook @implementation RCTLiveMarkdownModule { BOOL installed_; - std::shared_ptr commitHook_; + std::shared_ptr commitHook_; __weak RCTSurfacePresenter *surfacePresenter_; } @@ -23,8 +25,7 @@ - (NSNumber *)install { if (!installed_ && surfacePresenter_ != nil) { RCTScheduler *scheduler = [surfacePresenter_ scheduler]; - commitHook_ = - std::make_shared(scheduler.uiManager); + commitHook_ = std::make_shared(scheduler.uiManager); installed_ = YES; } return @1; diff --git a/ios/RCTTextInputComponentView+Markdown.mm b/ios/RCTTextInputComponentView+Markdown.mm index 3161e00d..5ce1e63e 100644 --- a/ios/RCTTextInputComponentView+Markdown.mm +++ b/ios/RCTTextInputComponentView+Markdown.mm @@ -8,6 +8,8 @@ #import "MarkdownShadowFamilyRegistry.h" +using namespace expensify::livemarkdown; + @implementation RCTTextInputComponentView (Markdown) - (void)setMarkdownUtils:(RCTMarkdownUtils *)markdownUtils {