react-native 0.70.3 → 0.71.0-rc.0

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -115,76 +115,76 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
 
 #pragma mark - Props
 
-  const std::string autoComplete{};
-  const std::string returnKeyLabel{};
-  const int numberOfLines{0};
-  const bool disableFullscreenUI{false};
-  const std::string textBreakStrategy{};
-  const SharedColor underlineColorAndroid{};
-  const std::string inlineImageLeft{};
-  const int inlineImagePadding{0};
-  const std::string importantForAutofill{};
-  const bool showSoftInputOnFocus{false};
-  const std::string autoCapitalize{};
-  const bool autoCorrect{false};
-  const bool autoFocus{false};
-  const bool allowFontScaling{false};
-  const Float maxFontSizeMultiplier{0.0};
-  const bool editable{false};
-  const std::string keyboardType{};
-  const std::string returnKeyType{};
-  const int maxLength{0};
-  const bool multiline{false};
-  const std::string placeholder{};
-  const SharedColor placeholderTextColor{};
-  const bool secureTextEntry{false};
-  const SharedColor selectionColor{};
-  const AndroidTextInputSelectionStruct selection{};
-  const std::string value{};
-  const std::string defaultValue{};
-  const bool selectTextOnFocus{false};
-  const bool blurOnSubmit{false};
-  const bool caretHidden{false};
-  const bool contextMenuHidden{false};
-  const SharedColor textShadowColor{};
-  const Float textShadowRadius{0.0};
-  const std::string textDecorationLine{};
-  const std::string fontStyle{};
-  const AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
-  const Float lineHeight{0.0};
-  const std::string textTransform{};
-  const SharedColor color{0};
-  const Float letterSpacing{0.0};
-  const Float fontSize{0.0};
-  const std::string textAlign{};
-  const bool includeFontPadding{false};
-  const std::string fontWeight{};
-  const std::string fontFamily{};
-  const std::string textAlignVertical{};
-  const SharedColor cursorColor{};
-  const int mostRecentEventCount{0};
-  const std::string text{};
+  std::string autoComplete{};
+  std::string returnKeyLabel{};
+  int numberOfLines{0};
+  bool disableFullscreenUI{false};
+  std::string textBreakStrategy{};
+  SharedColor underlineColorAndroid{};
+  std::string inlineImageLeft{};
+  int inlineImagePadding{0};
+  std::string importantForAutofill{};
+  bool showSoftInputOnFocus{false};
+  std::string autoCapitalize{};
+  bool autoCorrect{false};
+  bool autoFocus{false};
+  bool allowFontScaling{false};
+  Float maxFontSizeMultiplier{0.0};
+  bool editable{false};
+  std::string keyboardType{};
+  std::string returnKeyType{};
+  int maxLength{0};
+  bool multiline{false};
+  std::string placeholder{};
+  SharedColor placeholderTextColor{};
+  bool secureTextEntry{false};
+  SharedColor selectionColor{};
+  AndroidTextInputSelectionStruct selection{};
+  std::string value{};
+  std::string defaultValue{};
+  bool selectTextOnFocus{false};
+  std::string submitBehavior{};
+  bool caretHidden{false};
+  bool contextMenuHidden{false};
+  SharedColor textShadowColor{};
+  Float textShadowRadius{0.0};
+  std::string textDecorationLine{};
+  std::string fontStyle{};
+  AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
+  Float lineHeight{0.0};
+  std::string textTransform{};
+  SharedColor color{0};
+  Float letterSpacing{0.0};
+  Float fontSize{0.0};
+  std::string textAlign{};
+  bool includeFontPadding{false};
+  std::string fontWeight{};
+  std::string fontFamily{};
+  std::string textAlignVertical{};
+  SharedColor cursorColor{};
+  int mostRecentEventCount{0};
+  std::string text{};
 
   /*
    * Contains all prop values that affect visual representation of the
    * paragraph.
    */
-  ParagraphAttributes const paragraphAttributes{};
+  ParagraphAttributes paragraphAttributes{};
 
   /**
    * Auxiliary information to detect if these props are set or not.
    * See AndroidTextInputComponentDescriptor for usage.
    * TODO T63008435: can these, and this feature, be removed entirely?
    */
-  const bool hasPadding{};
-  const bool hasPaddingHorizontal{};
-  const bool hasPaddingVertical{};
-  const bool hasPaddingLeft{};
-  const bool hasPaddingTop{};
-  const bool hasPaddingRight{};
-  const bool hasPaddingBottom{};
-  const bool hasPaddingStart{};
-  const bool hasPaddingEnd{};
+  bool hasPadding{};
+  bool hasPaddingHorizontal{};
+  bool hasPaddingVertical{};
+  bool hasPaddingLeft{};
+  bool hasPaddingTop{};
+  bool hasPaddingRight{};
+  bool hasPaddingBottom{};
+  bool hasPaddingStart{};
+  bool hasPaddingEnd{};
 
 #if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp

@@ -21,8 +21,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char AndroidTextInputComponentName[] = "AndroidTextInput";
 
@@ -141,17 +140,17 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   auto defaultTextAttributes = TextAttributes::defaultTextAttributes();
   defaultTextAttributes.apply(getConcreteProps().textAttributes);
 
-  auto newEventCount =
-      (state.reactTreeAttributedString == reactTreeAttributedString
-           ? 0
-           : getConcreteProps().mostRecentEventCount);
-  auto newAttributedString = getMostRecentAttributedString();
-
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
+  auto newEventCount =
+      state.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
+      ? 0
+      : getConcreteProps().mostRecentEventCount;
+  auto newAttributedString = getMostRecentAttributedString();
+
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
@@ -168,7 +167,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
 #pragma mark - LayoutableShadowNode
 
 Size AndroidTextInputShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   if (getStateData().cachedAttributedStringId != 0) {
     return textLayoutManager_
@@ -207,5 +206,4 @@ void AndroidTextInputShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp

@@ -10,10 +10,14 @@
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 AndroidTextInputState::AndroidTextInputState(
     int64_t mostRecentEventCount,
@@ -89,7 +93,23 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   }
   return newState;
 }
+
+MapBuffer AndroidTextInputState::getMapBuffer() const {
+  auto builder = MapBufferBuilder();
+  // See comment in getDynamic block.
+  if (cachedAttributedStringId == 0) {
+    builder.putInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT, mostRecentEventCount);
+
+    auto attStringMapBuffer = toMapBuffer(attributedString);
+    builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
+    auto paMapBuffer = toMapBuffer(paragraphAttributes);
+    builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
+
+    builder.putInt(TX_STATE_KEY_HASH, attStringMapBuffer.getInt(AS_KEY_HASH));
+  }
+  return builder.build();
+}
+
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h

@@ -94,9 +94,7 @@ class AndroidTextInputState final {
       AndroidTextInputState const &previousState,
       folly::dynamic const &data);
   folly::dynamic getDynamic() const;
-  MapBuffer getMapBuffer() const {
-    return MapBufferBuilder::EMPTY();
-  };
+  MapBuffer getMapBuffer() const;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK

@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -33,13 +32,16 @@ rn_xplat_cxx_library(
         # TODO(shergin) T26519801 Figure out better directories structure
         prefix = "react/renderer/components/iostextinput",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
+    fbandroid_deps = [
+        "//xplat/folly:dynamic",
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -48,13 +50,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -92,7 +87,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":iostextinput",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp

@@ -7,8 +7,7 @@
 
 #include "TextInputEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static jsi::Value textInputMetricsPayload(
     jsi::Runtime &runtime,
@@ -138,5 +137,4 @@ void TextInputEventEmitter::dispatchTextInputEvent(
       priority);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h

@@ -45,8 +45,8 @@ class TextInputEventEmitter : public ViewEventEmitter {
   void onSelectionChange(TextInputMetrics const &textInputMetrics) const;
   void onEndEditing(TextInputMetrics const &textInputMetrics) const;
   void onSubmitEditing(TextInputMetrics const &textInputMetrics) const;
-  void onKeyPress(KeyPressMetrics const &textInputMetrics) const;
-  void onKeyPressSync(KeyPressMetrics const &textInputMetrics) const;
+  void onKeyPress(KeyPressMetrics const &keyPressMetrics) const;
+  void onKeyPressSync(KeyPressMetrics const &keyPressMetrics) const;
   void onScroll(TextInputMetrics const &textInputMetrics) const;
 
  private:

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp

@@ -12,8 +12,7 @@
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TextInputProps::TextInputProps(
     const PropsParserContext &context,
@@ -142,5 +141,4 @@ ParagraphAttributes TextInputProps::getEffectiveParagraphAttributes() const {
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp

@@ -14,8 +14,7 @@
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern char const TextInputComponentName[] = "TextInput";
 
@@ -120,5 +119,4 @@ void TextInputShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp

@@ -7,13 +7,12 @@
 
 #include "TextInputState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 TextInputState::TextInputState(
-    TextInputState const &previousState,
-    folly::dynamic const &data){};
+    TextInputState const & /*previousState*/,
+    folly::dynamic const & /*data*/){};
 
 /*
  * Empty implementation for Android because it doesn't use this class.
@@ -30,5 +29,4 @@ MapBuffer TextInputState::getMapBuffer() const {
 };
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h

@@ -126,6 +126,26 @@ inline void fromRawValue(
   abort();
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    SubmitBehavior &result) {
+  auto string = (std::string)value;
+  if (string == "newline") {
+    result = SubmitBehavior::Newline;
+    return;
+  }
+  if (string == "submit") {
+    result = SubmitBehavior::Submit;
+    return;
+  }
+  if (string == "blurAndSubmit") {
+    result = SubmitBehavior::BlurAndSubmit;
+    return;
+  }
+  abort();
+}
+
 inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,

package/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h

@@ -48,6 +48,14 @@ enum class ReturnKeyType {
   Continue,
 };
 
+// iOS & Android.
+enum class SubmitBehavior {
+  Default,
+  Submit,
+  BlurAndSubmit,
+  Newline,
+};
+
 // iOS-only
 enum class TextInputAccessoryVisibilityMode {
   Never,
@@ -170,9 +178,9 @@ class TextInputTraits final {
 
   /*
    * iOS & Android
-   * Default value: `false`.
+   * Default value: `Default`.
    */
-  bool blurOnSubmit{false};
+  SubmitBehavior submitBehavior{SubmitBehavior::Default};
 
   /*
    * iOS-only (implemented only on iOS for now)

package/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h

@@ -93,12 +93,12 @@ static TextInputTraits convertRawProp(
       "secureTextEntry",
       sourceTraits.secureTextEntry,
       defaultTraits.secureTextEntry);
-  traits.blurOnSubmit = convertRawProp(
+  traits.submitBehavior = convertRawProp(
       context,
       rawProps,
-      "blurOnSubmit",
-      sourceTraits.blurOnSubmit,
-      defaultTraits.blurOnSubmit);
+      "submitBehavior",
+      sourceTraits.submitBehavior,
+      defaultTraits.submitBehavior);
   traits.clearTextOnFocus = convertRawProp(
       context,
       rawProps,

package/ReactCommon/react/renderer/components/unimplementedview/BUCK

@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -29,11 +28,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/unimplementedview",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -44,12 +43,6 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -71,7 +64,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":unimplementedview",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )

package/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt

@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_unimplementedview_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_unimplementedview SHARED ${rrc_unimplementedview_SRC})

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp

@@ -7,8 +7,7 @@
 
 #include "UnimplementedViewComponentDescriptor.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentHandle UnimplementedViewComponentDescriptor::getComponentHandle()
     const {
@@ -40,5 +39,4 @@ Props::Shared UnimplementedViewComponentDescriptor::cloneProps(
   return unimplementedViewProps;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp

@@ -7,8 +7,7 @@
 
 #include <react/renderer/components/unimplementedview/UnimplementedViewProps.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void UnimplementedViewProps::setComponentName(ComponentName componentName) {
   componentName_ = componentName;
@@ -18,5 +17,4 @@ ComponentName UnimplementedViewProps::getComponentName() const {
   return componentName_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp

@@ -7,10 +7,8 @@
 
 #include "UnimplementedViewShadowNode.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char UnimplementedViewComponentName[] = "UnimplementedView";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react