Merge branch 'main' into @ksienkiewicz/fix-web-set-link-serialization-consistency

Author: hejsztynx

android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewLayoutManager.kt

@@ -8,17 +8,18 @@ class EnrichedTextInputViewLayoutManager(
   private var forceHeightRecalculationCounter: Int = 0
 
   fun invalidateLayout() {
+    val stateWrapper = view.stateWrapper ?: return
+
     val text = view.text
     val paint = view.paint
 
     val needUpdate = MeasurementStore.store(view.id, text, paint)
     if (!needUpdate) return
 
-    val counter = forceHeightRecalculationCounter
     forceHeightRecalculationCounter++
     val state = Arguments.createMap()
-    state.putInt("forceHeightRecalculationCounter", counter)
-    view.stateWrapper?.updateState(state)
+    state.putInt("forceHeightRecalculationCounter", forceHeightRecalculationCounter)
+    stateWrapper.updateState(state)
   }
 
   fun releaseMeasurementStore() {

android/src/main/java/com/swmansion/enriched/textinput/MeasurementStore.kt

@@ -130,7 +130,7 @@ object MeasurementStore {
     props: ReadableMap?,
   ): Float {
     val propsFontSize = props?.getDouble("fontSize")?.toFloat()
-    if (propsFontSize == null) return defaultView.textSize
+    if (propsFontSize == null || propsFontSize <= 0) return defaultView.textSize
 
     return ceil(pixelFromSpOrDp(propsFontSize, allowFontScalingFromProps(props)))
   }

android/src/main/new_arch/react/renderer/components/ReactNativeEnrichedSpec/EnrichedTextInputShadowNode.h

@@ -47,7 +47,7 @@ class EnrichedTextInputShadowNode final
                  const LayoutConstraints &layoutConstraints) const override;
 
 private:
-  int forceHeightRecalculationCounter_;
+  int forceHeightRecalculationCounter_{0};
   std::shared_ptr<EnrichedTextInputMeasurementManager> measurementsManager_;
 };
 } // namespace facebook::react