Fabric: remove LocalData from mounting layer

Summary: Changelog: [Internal] We are moving away from LocalData in favour of State. LocalData isn't used on iOS anymore, this diff removes it so it can't be reintroduced Reviewed By: shergin Differential Revision: D19250731 fbshipit-source-id: aaa5d79b4d885b6bf9b2df2d67d80ecd3d6982bc
facebook · Jan 6, 2020 · b920bf8 · b920bf8
1 parent 0c64733
commit b920bf8
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 33 deletions.
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -12,7 +12,6 @@
 #import <react/components/text/ParagraphState.h>
 #import <react/components/text/RawTextComponentDescriptor.h>
 #import <react/components/text/TextComponentDescriptor.h>
-#import <react/core/LocalData.h>
 #import <react/graphics/Geometry.h>
 #import <react/textlayoutmanager/RCTTextLayoutManager.h>
 #import <react/textlayoutmanager/TextLayoutManager.h>

diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -10,7 +10,6 @@
 #import <React/RCTPrimitives.h>
 #import <react/core/EventEmitter.h>
 #import <react/core/LayoutMetrics.h>
-#import <react/core/LocalData.h>
 #import <react/core/Props.h>
 #import <react/core/State.h>
 #import <react/uimanager/ComponentDescriptorProvider.h>
@@ -24,12 +23,11 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
   RNComponentViewUpdateMaskNone = 0,
   RNComponentViewUpdateMaskProps = 1 << 0,
   RNComponentViewUpdateMaskEventEmitter = 1 << 1,
-  RNComponentViewUpdateMaskLocalData = 1 << 2,
   RNComponentViewUpdateMaskState = 1 << 3,
   RNComponentViewUpdateMaskLayoutMetrics = 1 << 4,
 
   RNComponentViewUpdateMaskAll = RNComponentViewUpdateMaskProps | RNComponentViewUpdateMaskEventEmitter |
-      RNComponentViewUpdateMaskLocalData | RNComponentViewUpdateMaskState | RNComponentViewUpdateMaskLayoutMetrics
+      RNComponentViewUpdateMaskState | RNComponentViewUpdateMaskLayoutMetrics
 };
 
 /*
@@ -73,13 +71,6 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
 - (void)updateProps:(facebook::react::Props::Shared const &)props
            oldProps:(facebook::react::Props::Shared const &)oldProps;
 
-/*
- * Called for updating component's local data.
- * Receiver must update native view props accordingly changed local data.
- */
-- (void)updateLocalData:(facebook::react::SharedLocalData)localData
-           oldLocalData:(facebook::react::SharedLocalData)oldLocalData;
-
 /*
  * Called for updating component's state.
  * Receiver must update native view according to changed state.

diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -106,15 +106,6 @@ static void RNUpdateLayoutMetricsMountInstruction(
                                    oldLayoutMetrics:oldShadowView.layoutMetrics];
 }
 
-// `Update LocalData` instruction
-static void RNUpdateLocalDataMountInstruction(ShadowViewMutation const &mutation, RCTComponentViewRegistry *registry)
-{
-  auto const &oldShadowView = mutation.oldChildShadowView;
-  auto const &newShadowView = mutation.newChildShadowView;
-  auto const &componentViewDescriptor = [registry componentViewDescriptorWithTag:newShadowView.tag];
-  [componentViewDescriptor.view updateLocalData:newShadowView.localData oldLocalData:oldShadowView.localData];
-}
-
 // `Update State` instruction
 static void RNUpdateStateMountInstruction(ShadowViewMutation const &mutation, RCTComponentViewRegistry *registry)
 {
@@ -157,7 +148,6 @@ static void RNPerformMountInstructions(
       case ShadowViewMutation::Insert: {
         RNUpdatePropsMountInstruction(mutation, registry);
         RNUpdateEventEmitterMountInstruction(mutation, registry);
-        RNUpdateLocalDataMountInstruction(mutation, registry);
         RNUpdateStateMountInstruction(mutation, registry);
         RNUpdateLayoutMetricsMountInstruction(mutation, registry);
         RNFinalizeUpdatesMountInstruction(mutation, RNComponentViewUpdateMaskAll, registry);
@@ -182,10 +172,6 @@ static void RNPerformMountInstructions(
           RNUpdateEventEmitterMountInstruction(mutation, registry);
           mask |= RNComponentViewUpdateMaskEventEmitter;
         }
-        if (oldChildShadowView.localData != newChildShadowView.localData) {
-          RNUpdateLocalDataMountInstruction(mutation, registry);
-          mask |= RNComponentViewUpdateMaskLocalData;
-        }
         if (oldChildShadowView.state != newChildShadowView.state) {
           RNUpdateStateMountInstruction(mutation, registry);
           mask |= RNComponentViewUpdateMaskState;

diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
@@ -27,9 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updateEventEmitter:(facebook::react::EventEmitter::Shared const &)eventEmitter;
 
-- (void)updateLocalData:(facebook::react::SharedLocalData)localData
-           oldLocalData:(facebook::react::SharedLocalData)oldLocalData;
-
 - (void)updateState:(facebook::react::State::Shared const &)state
            oldState:(facebook::react::State::Shared const &)oldState;
 

diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
@@ -49,11 +49,6 @@ - (void)updateEventEmitter:(EventEmitter::Shared const &)eventEmitter
   // Default implementation does nothing.
 }
 
-- (void)updateLocalData:(SharedLocalData)localData oldLocalData:(SharedLocalData)oldLocalData
-{
-  // Default implementation does nothing.
-}
-
 - (void)updateState:(facebook::react::State::Shared const &)state
            oldState:(facebook::react::State::Shared const &)oldState
 {