Merge remote-tracking branch 'fork/@jpiasecki/new-arch-ios' into @jpi…

…asecki/new-arch-ios
Expensify · Feb 27, 2024 · e78ee4b · e78ee4b
2 parents 2a423ff + 3e6e257
commit e78ee4b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/ios/MarkdownCommitHook.h b/ios/MarkdownCommitHook.h
@@ -14,8 +14,8 @@ using namespace facebook::react;
 namespace livemarkdown {
 
 struct MarkdownTextInputDecoratorPair {
-    std::shared_ptr<const TextInputShadowNode> textInput;
-    std::shared_ptr<const MarkdownTextInputDecoratorShadowNode> decorator;
+    const std::shared_ptr<const TextInputShadowNode> textInput;
+    const std::shared_ptr<const MarkdownTextInputDecoratorShadowNode> decorator;
 };
 
 class MarkdownCommitHook : public UIManagerCommitHook {
@@ -35,7 +35,7 @@ class MarkdownCommitHook : public UIManagerCommitHook {
       noexcept override;
 
  private:
-    std::shared_ptr<UIManager> uiManager_;
+    const std::shared_ptr<UIManager> uiManager_;
 };
 
 } // namespace reanimated

diff --git a/ios/MarkdownCommitHook.mm b/ios/MarkdownCommitHook.mm
@@ -1,4 +1,3 @@
-
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #include <react/renderer/core/ComponentDescriptor.h>
@@ -50,7 +49,7 @@
         std::vector<MarkdownTextInputDecoratorPair> nodesToUpdate;
         MarkdownShadowFamilyRegistry::runForEveryFamily([&rootNode, &nodesToUpdate](ShadowNodeFamily::Shared family) {
          // get the path from the root to the node from the decorator family
-         auto ancestors = family->getAncestors(*rootNode);
+         const auto ancestors = family->getAncestors(*rootNode);
 
          if (!ancestors.empty()) {
              auto &parentNode = ancestors.back().first.get();
@@ -74,7 +73,7 @@
          }
          });
 
-        for (auto &nodes : nodesToUpdate) {
+        for (const auto &nodes : nodesToUpdate) {
             const auto &textInputState = *std::static_pointer_cast<const ConcreteState<TextInputState>>(nodes.textInput->getState());
             const auto &stateData = textInputState.getData();
 

diff --git a/ios/MarkdownTextInputDecoratorState.h b/ios/MarkdownTextInputDecoratorState.h
@@ -13,8 +13,6 @@ class JSI_EXPORT MarkdownTextInputDecoratorState final {
   MarkdownTextInputDecoratorState(const ShadowNodeFamily::Shared textInputFamily_) : decoratorFamily(textInputFamily_) {};
 
   const ShadowNodeFamily::Shared decoratorFamily;
-
-#pragma mark - Getters
 };
 
 } // namespace react

diff --git a/ios/MarkdownTextInputDecoratorView.mm b/ios/MarkdownTextInputDecoratorView.mm
@@ -63,9 +63,6 @@ - (void)didMoveToWindow {
   [_markdownUtils setMarkdownStyle:_markdownStyle];
 
   [_textInput setMarkdownUtils:_markdownUtils];
-
-//    [_textInput performSelector:@selector(_updateState)];
-
   if ([backedTextInputView isKindOfClass:[RCTUITextField class]]) {
     RCTUITextField *textField = (RCTUITextField *)backedTextInputView;
     _adapter = [textField valueForKey:@"textInputDelegateAdapter"];

diff --git a/ios/RCTLiveMarkdownModule.mm b/ios/RCTLiveMarkdownModule.mm
@@ -17,7 +17,7 @@ @implementation RCTLiveMarkdownModule {
 
 RCT_EXPORT_MODULE(@"LiveMarkdownModule")
 
-- (NSNumber*)install
+- (NSNumber *)install
 {
     if (!installed_) {
         installed_ = YES;