feat: higher level early return

Author: hejsztynx

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

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

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

@@ -44,23 +44,16 @@ object MeasurementStore {
     id: Int,
     spannable: Spannable?,
     paint: TextPaint,
-    invalidateShadowNode: () -> Boolean,
-  ) {
+  ): Boolean {
     val cachedWidth = data[id]?.cachedWidth ?: 0f
     val cachedSize = data[id]?.cachedSize ?: 0L
     val initialized = data[id]?.initialized ?: true
 
     val size = measure(cachedWidth, spannable, paint)
     val paintParams = PaintParams(paint.typeface, paint.textSize)
 
-    // stateWrapper might be null during the first measures,
-    // we want to cache the size only when it was actually
-    // handled in the shadow node. The cached size and the actual
-    // rendered one should be in sync.
-    val invalidated = cachedSize != size && invalidateShadowNode()
-    val storedSize = if (invalidated) size else cachedSize
-
-    data[id] = MeasurementParams(initialized, cachedWidth, storedSize, spannable, paintParams)
+    data[id] = MeasurementParams(initialized, cachedWidth, size, spannable, paintParams)
+    return cachedSize != size
   }
 
   fun release(id: Int) {