wip

Author: intergalacticspacehighway

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

@@ -8,7 +8,6 @@
 #include "ViewShadowNode.h"
 #include <react/renderer/components/view/HostPlatformViewTraitsInitializer.h>
 #include <react/renderer/components/view/primitives.h>
-#include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/graphics/BackgroundImage.h>
 #include <react/renderer/imagemanager/ImageManager.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -100,6 +99,7 @@ void ViewShadowNode::setImageManager(
     const std::shared_ptr<ImageManager>& imageManager) {
   ensureUnsealed();
   imageManager_ = imageManager;
+  updateStateIfNeeded();
 }
 
 void ViewShadowNode::updateStateIfNeeded() {
@@ -159,11 +159,4 @@ void ViewShadowNode::updateStateIfNeeded() {
   setStateData(std::move(state));
 }
 
-#pragma mark - LayoutableShadowNode
-
-void ViewShadowNode::layout(LayoutContext layoutContext) {
-  updateStateIfNeeded();
-  ConcreteViewShadowNode::layout(layoutContext);
-}
-
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h

@@ -41,10 +41,6 @@ class ViewShadowNode final : public ConcreteViewShadowNode<ViewComponentName, Vi
 
   void setImageManager(const std::shared_ptr<ImageManager> &imageManager);
 
-#pragma mark - LayoutableShadowNode
-
-  void layout(LayoutContext layoutContext) override;
-
  private:
   void initialize() noexcept;
   void updateStateIfNeeded();

packages/react-native/ReactCommon/react/renderer/components/view/ViewState.h

@@ -11,7 +11,7 @@
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/primitives.h>
 
-#ifdef ANDROID
+#ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
 
@@ -31,7 +31,7 @@ class ViewState final {
 
   const std::vector<BackgroundImageURLRequest>& getBackgroundImageRequests() const;
 
-#ifdef ANDROID
+#ifdef RN_SERIALIZABLE_STATE
   ViewState(const ViewState& previousState, folly::dynamic data) {}
 
   folly::dynamic getDynamic() const {