Skip to content

Commit

Permalink
Add missing C++ namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
tomekzaw committed Sep 11, 2024
1 parent 1701063 commit e5017dd
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

#include "MarkdownShadowFamilyRegistry.h"

namespace expensify {
namespace livemarkdown {

std::set<facebook::react::ShadowNodeFamily::Shared>
MarkdownShadowFamilyRegistry::familiesToUpdate_;
std::set<facebook::react::Tag> MarkdownShadowFamilyRegistry::forcedUpdates_;
Expand Down Expand Up @@ -55,4 +58,7 @@ bool MarkdownShadowFamilyRegistry::shouldForceUpdate(facebook::react::Tag tag) {
return false;
}

} // namespace livemarkdown
} // namespace expensify

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <mutex>
#include <set>

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
Expand All @@ -32,4 +35,7 @@ class MarkdownShadowFamilyRegistry {
static std::mutex mutex_;
};

} // namespace livemarkdown
} // namespace expensify

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "MarkdownShadowFamilyRegistry.h"
#include "MarkdownTextInputDecoratorShadowNode.h"

using namespace expensify::livemarkdown;

namespace facebook {
namespace react {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <react/renderer/components/RNLiveMarkdownSpec/Props.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>

using namespace expensify::livemarkdown;

namespace facebook {
namespace react {

Expand Down
10 changes: 5 additions & 5 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions ios/MarkdownCommitHook.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

using namespace facebook::react;

namespace expensify {
namespace livemarkdown {

struct MarkdownTextInputDecoratorPair {
Expand Down Expand Up @@ -38,5 +39,6 @@ class MarkdownCommitHook : public UIManagerCommitHook {
};

} // namespace livemarkdown
} // namespace expensify

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 2 additions & 0 deletions ios/MarkdownCommitHook.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

using namespace facebook::react;

namespace expensify {
namespace livemarkdown {

MarkdownCommitHook::MarkdownCommitHook(
Expand Down Expand Up @@ -192,5 +193,6 @@
}

} // namespace livemarkdown
} // namespace expensify

#endif // RCT_NEW_ARCH_ENABLED
7 changes: 4 additions & 3 deletions ios/RCTLiveMarkdownModule.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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<livemarkdown::MarkdownCommitHook> commitHook_;
std::shared_ptr<MarkdownCommitHook> commitHook_;
__weak RCTSurfacePresenter *surfacePresenter_;
}

Expand All @@ -23,8 +25,7 @@ - (NSNumber *)install {
if (!installed_ && surfacePresenter_ != nil) {
RCTScheduler *scheduler = [surfacePresenter_ scheduler];

commitHook_ =
std::make_shared<livemarkdown::MarkdownCommitHook>(scheduler.uiManager);
commitHook_ = std::make_shared<MarkdownCommitHook>(scheduler.uiManager);
installed_ = YES;
}
return @1;
Expand Down
2 changes: 2 additions & 0 deletions ios/RCTTextInputComponentView+Markdown.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#import "MarkdownShadowFamilyRegistry.h"

using namespace expensify::livemarkdown;

@implementation RCTTextInputComponentView (Markdown)

- (void)setMarkdownUtils:(RCTMarkdownUtils *)markdownUtils {
Expand Down

0 comments on commit e5017dd

Please sign in to comment.