Migrate errorEventHandler to RecyclerBinderConfig

Summary: Migrate the `errorEventHandler` to the shared configuration. Reviewed By: pentiumao Differential Revision: D51849295 fbshipit-source-id: 976f1871cf8bf787d5f4b0ca9b092cc86c4c8ad9
facebook · Dec 9, 2023 · 193f2f5 · 193f2f5
1 parent 8ea902a
commit 193f2f5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 28 deletions.
diff --git a/...-widget/src/main/java/com/facebook/litho/sections/widget/RecyclerBinderConfiguration.java b/...-widget/src/main/java/com/facebook/litho/sections/widget/RecyclerBinderConfiguration.java
@@ -17,7 +17,6 @@
 package com.facebook.litho.sections.widget;
 
 import androidx.annotation.Nullable;
-import com.facebook.litho.ErrorEventHandler;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.litho.sections.SectionTree;
 import com.facebook.litho.sections.config.SectionsConfiguration;
@@ -46,7 +45,6 @@ public class RecyclerBinderConfiguration {
   private final boolean mIsIncrementalMountEnabled;
   private final boolean mIsLayoutDiffingEnabled;
   private final boolean mPostToFrontOfQueueForFirstChangeset;
-  @Nullable private final ErrorEventHandler mErrorEventHandler;
 
   private final RecyclerBinderConfig mRecyclerBinderConfig;
   private final boolean mShouldPreallocatePerMountContent;
@@ -72,7 +70,6 @@ private RecyclerBinderConfiguration(
       boolean isIncrementalMountEnabled,
       boolean isLayoutDiffingEnabled,
       boolean postToFrontOfQueueForFirstChangeset,
-      @Nullable ErrorEventHandler errorEventHandler,
       boolean shouldPreallocatePerMountContent) {
     mRangeRatio = rangeRatio;
     mLayoutHandlerFactory = layoutHandlerFactory;
@@ -85,7 +82,6 @@ private RecyclerBinderConfiguration(
     mIsIncrementalMountEnabled = isIncrementalMountEnabled;
     mIsLayoutDiffingEnabled = isLayoutDiffingEnabled;
     mPostToFrontOfQueueForFirstChangeset = postToFrontOfQueueForFirstChangeset;
-    mErrorEventHandler = errorEventHandler;
     mShouldPreallocatePerMountContent = shouldPreallocatePerMountContent;
     mRecyclerBinderConfig = recyclerBinderConfig;
   }
@@ -134,10 +130,6 @@ public boolean isPostToFrontOfQueueForFirstChangeset() {
     return mPostToFrontOfQueueForFirstChangeset;
   }
 
-  public @Nullable ErrorEventHandler getErrorEventHandler() {
-    return mErrorEventHandler;
-  }
-
   public @Nullable ComponentsConfiguration getComponentsConfiguration() {
     return mComponentsConfiguration;
   }
@@ -166,7 +158,6 @@ public static class Builder {
         !ComponentsConfiguration.isIncrementalMountGloballyDisabled;
     private boolean mIsLayoutDiffingEnabled = ComponentsConfiguration.isLayoutDiffingEnabled;
     private boolean mPostToFrontOfQueueForFirstChangeset;
-    private ErrorEventHandler mErrorEventHandler;
     private boolean mShouldPreallocatePerMountContent;
 
     Builder() {}
@@ -185,7 +176,6 @@ private Builder(RecyclerBinderConfiguration configuration) {
       this.mIsLayoutDiffingEnabled = configuration.mIsLayoutDiffingEnabled;
       this.mPostToFrontOfQueueForFirstChangeset =
           configuration.mPostToFrontOfQueueForFirstChangeset;
-      this.mErrorEventHandler = configuration.mErrorEventHandler;
       mShouldPreallocatePerMountContent = configuration.mShouldPreallocatePerMountContent;
     }
 
@@ -283,11 +273,6 @@ public Builder postToFrontOfQueueForFirstChangeset(
       return this;
     }
 
-    public Builder errorEventHandler(@Nullable ErrorEventHandler errorEventHandler) {
-      mErrorEventHandler = errorEventHandler;
-      return this;
-    }
-
     /**
      * Whether this Recycler children should preallocate mount content after being generated. This
      * will only work if the root {@link com.facebook.litho.ComponentTree} has set a preallocation
@@ -316,7 +301,6 @@ public RecyclerBinderConfiguration build() {
           mIsIncrementalMountEnabled,
           mIsLayoutDiffingEnabled,
           mPostToFrontOfQueueForFirstChangeset,
-          mErrorEventHandler,
           mShouldPreallocatePerMountContent);
     }
   }

diff --git a/...get/src/main/java/com/facebook/litho/sections/widget/RecyclerCollectionComponentSpec.java b/...get/src/main/java/com/facebook/litho/sections/widget/RecyclerCollectionComponentSpec.java
@@ -326,7 +326,6 @@ static void createInitialState(
             .componentsConfiguration(binderConfiguration.getComponentsConfiguration())
             .isReconciliationEnabled(binderConfiguration.isReconciliationEnabled())
             .isLayoutDiffingEnabled(binderConfiguration.isLayoutDiffingEnabled())
-            .errorEventHandler(binderConfiguration.getErrorEventHandler())
             .shouldPreallocatePerMountSpec(binderConfiguration.shouldPreallocatePerMountContent())
             .startupLogger(startupLogger);
 

diff --git a/...in/kotlin/com/facebook/litho/kotlin/widget/ExperimentalRecyclerCollectionComponentSpec.kt b/...in/kotlin/com/facebook/litho/kotlin/widget/ExperimentalRecyclerCollectionComponentSpec.kt
@@ -303,7 +303,6 @@ object ExperimentalRecyclerCollectionComponentSpec {
             .componentsConfiguration(binderConfiguration.componentsConfiguration)
             .isReconciliationEnabled(binderConfiguration.isReconciliationEnabled)
             .isLayoutDiffingEnabled(binderConfiguration.isLayoutDiffingEnabled)
-            .errorEventHandler(binderConfiguration.errorEventHandler)
             .startupLogger(startupLogger)
     val recyclerBinder = recyclerBinderBuilder.build(c)
     val targetBinder =

diff --git a/...get-kotlin/src/main/kotlin/com/facebook/litho/widget/collection/CollectionRecyclerSpec.kt b/...get-kotlin/src/main/kotlin/com/facebook/litho/widget/collection/CollectionRecyclerSpec.kt
@@ -159,7 +159,6 @@ object CollectionRecyclerSpec {
                 isReconciliationEnabled(isReconciliationEnabled)
                 incrementalMount(isIncrementalMountEnabled)
                 isLayoutDiffingEnabled(isLayoutDiffingEnabled)
-                errorEventHandler(errorEventHandler)
               }
             }
             .build(c)

diff --git a/litho-widget/src/main/java/com/facebook/litho/widget/RecyclerBinder.java b/litho-widget/src/main/java/com/facebook/litho/widget/RecyclerBinder.java
@@ -481,7 +481,6 @@ public static class Builder {
     private @RecyclingStrategy int recyclingStrategy =
         ComponentsConfiguration.recyclerBinderStrategy;
     private @Nullable LithoLifecycleProvider lifecycleProvider;
-    private @Nullable ErrorEventHandler errorEventHandler;
     private @Nullable RecyclerBinderAdapterDelegate adapterDelegate = null;
 
     /**
@@ -681,11 +680,6 @@ public Builder asyncInsertLayoutHandler(RunnableHandler handler) {
       return this;
     }
 
-    public Builder errorEventHandler(@Nullable ErrorEventHandler errorEventHandler) {
-      this.errorEventHandler = errorEventHandler;
-      return this;
-    }
-
     public Builder lithoLifecycleProvider(LithoLifecycleProvider lithoLifecycleProvider) {
       this.lifecycleProvider = lithoLifecycleProvider;
       return this;
@@ -903,7 +897,7 @@ private RecyclerBinder(Builder builder) {
     mPreallocatePerMountSpec = builder.shouldPreallocatePerMountSpec;
     mComponentWarmer = mRecyclerBinderConfig.componentWarmer;
     mStartupLogger = builder.startupLogger;
-    mErrorEventHandler = builder.errorEventHandler;
+    mErrorEventHandler = mRecyclerBinderConfig.errorEventHandler;
     mRecyclingStrategy = builder.recyclingStrategy;
   }
 

diff --git a/litho-widget/src/main/java/com/facebook/litho/widget/RecyclerBinderConfig.kt b/litho-widget/src/main/java/com/facebook/litho/widget/RecyclerBinderConfig.kt
@@ -18,6 +18,7 @@ package com.facebook.litho.widget
 
 import com.facebook.kotlin.compilerplugins.dataclassgenerate.annotation.DataClassGenerate
 import com.facebook.kotlin.compilerplugins.dataclassgenerate.annotation.Mode
+import com.facebook.litho.ErrorEventHandler
 import com.facebook.litho.config.LayoutThreadPoolConfiguration
 
 /**
@@ -110,7 +111,8 @@ data class RecyclerBinderConfig(
      * provided, the handler created by the factory will be used instead of the one that would have
      * been created by this config.
      */
-    @JvmField val threadPoolConfig: LayoutThreadPoolConfiguration? = null
+    @JvmField val threadPoolConfig: LayoutThreadPoolConfiguration? = null,
+    @JvmField val errorEventHandler: ErrorEventHandler? = null
 ) {
 
   init {
@@ -158,6 +160,7 @@ class RecyclerBinderConfigBuilder internal constructor(configuration: RecyclerBi
   private var itemViewCacheSize = configuration.itemViewCacheSize
   private var hasDynamicItemHeight = configuration.hasDynamicItemHeight
   private var threadPoolConfig = configuration.threadPoolConfig
+  private var errorEventHandler = configuration.errorEventHandler
 
   fun isCircular(isCircular: Boolean) = also { this.isCircular = isCircular }
 
@@ -193,6 +196,10 @@ class RecyclerBinderConfigBuilder internal constructor(configuration: RecyclerBi
       threadPoolConfig: LayoutThreadPoolConfiguration?
   ): RecyclerBinderConfigBuilder = also { this.threadPoolConfig = threadPoolConfig }
 
+  fun errorEventHandler(errorEventHandler: ErrorEventHandler?): RecyclerBinderConfigBuilder = also {
+    this.errorEventHandler = errorEventHandler
+  }
+
   fun build(): RecyclerBinderConfig {
     return RecyclerBinderConfig(
         isCircular = isCircular,
@@ -204,6 +211,7 @@ class RecyclerBinderConfigBuilder internal constructor(configuration: RecyclerBi
         componentWarmer = componentWarmer,
         estimatedViewportCount = estimatedViewportCount,
         hasDynamicItemHeight = hasDynamicItemHeight,
-        threadPoolConfig = threadPoolConfig)
+        threadPoolConfig = threadPoolConfig,
+        errorEventHandler = errorEventHandler)
   }
 }