From 8a8ff63b7dbb83adae941eb399adf606e475d41f Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 20 Oct 2019 20:51:09 -0700
Subject: [PATCH] Fabric: Unification of constructor signature of
 ComponentDescriptors

Summary:
This is the first step to migrate the registration of Android-specific `ComponentDescriptors` to `ComponentDescriptorProviderRegistry`.
`ComponentDescriptorProviderRegistry` is a never API for component registration that supports reactive registration and simplified signatures for `registry` (`add`) method.

It's tedious to keep those signatures in sync with the base class (`ComponentDescriptor`), we have an idea how to make it better by using a single struct with all params but a migration to that will be a separate effort.

The changes are pure syntactical.

Changelog: [Internal] Internal changes in Fabric.

Reviewed By: mdvacca

Differential Revision: D18010488

fbshipit-source-id: 4cbfdbcae235b32a94b38df2095c956299764e59
---
 .../components/modal/ModalHostViewComponentDescriptor.h   | 8 ++++++--
 .../androidswitch/AndroidSwitchComponentDescriptor.h      | 5 +++--
 .../AndroidTextInputComponentDescriptor.h                 | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h b/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h
index 6e4c21b891f..5d3d389f4f4 100644
--- a/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h
@@ -22,8 +22,12 @@ class ModalHostViewComponentDescriptor final
     : public ConcreteComponentDescriptor<ModalHostViewShadowNode> {
  public:
 #ifdef ANDROID
-  ModalHostViewComponentDescriptor(EventDispatcher::Weak eventDispatcher)
-      : ConcreteComponentDescriptor(eventDispatcher) {}
+  ModalHostViewComponentDescriptor(
+      EventDispatcher::Weak eventDispatcher,
+      ContextContainer::Shared const &contextContainer,
+      ComponentDescriptor::Flavor const &flavor = {})
+      : ConcreteComponentDescriptor(eventDispatcher, contextContainer, flavor) {
+  }
 #else
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 #endif
diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h
index 53e38645ec8..3c0f07c28f9 100644
--- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h
+++ b/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h
@@ -23,8 +23,9 @@ class AndroidSwitchComponentDescriptor final
  public:
   AndroidSwitchComponentDescriptor(
       EventDispatcher::Weak eventDispatcher,
-      ContextContainer::Shared const &contextContainer)
-      : ConcreteComponentDescriptor(eventDispatcher),
+      ContextContainer::Shared const &contextContainer,
+      ComponentDescriptor::Flavor const &flavor = {})
+      : ConcreteComponentDescriptor(eventDispatcher, contextContainer, flavor),
         measurementsManager_(std::make_shared<AndroidSwitchMeasurementsManager>(
             contextContainer)) {}
 
diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
index 48eb114d00c..14d0d0d23af 100644
--- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -21,10 +21,12 @@ class AndroidTextInputComponentDescriptor final
  public:
   AndroidTextInputComponentDescriptor(
       EventDispatcher::Weak eventDispatcher,
-      const ContextContainer::Shared &contextContainer)
+      const ContextContainer::Shared &contextContainer,
+      ComponentDescriptor::Flavor const &flavor = {})
       : ConcreteComponentDescriptor<AndroidTextInputShadowNode>(
             eventDispatcher,
-            contextContainer) {}
+            contextContainer,
+            flavor) {}
 
  protected:
   void adopt(UnsharedShadowNode shadowNode) const override {