fix: RecyclerView id access from ListView (#1489)

Signed-off-by: Matheus Ribeiro <[email protected]>
ZupIT · Apr 15, 2021 · 12b533c · 12b533c
1 parent fbac822
commit 12b533c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/android/beagle/src/main/java/br/com/zup/beagle/android/components/ListView.kt b/android/beagle/src/main/java/br/com/zup/beagle/android/components/ListView.kt
@@ -249,7 +249,7 @@ constructor(
         observeBindChanges(rootView, recyclerView, dataSource!!) { value ->
             canScrollEnd = true
             val adapter = recyclerView.adapter as ListAdapter
-            adapter.setList(value)
+            adapter.setList(value, this.id)
             if (value?.isEmpty() == true) {
                 executeScrollEndActions()
             }

diff --git a/android/beagle/src/main/java/br/com/zup/beagle/android/components/list/ListAdapter.kt b/android/beagle/src/main/java/br/com/zup/beagle/android/components/list/ListAdapter.kt
@@ -26,6 +26,7 @@ import br.com.zup.beagle.android.context.AsyncActionData
 import br.com.zup.beagle.android.context.normalizeContextValue
 import br.com.zup.beagle.android.data.serializer.BeagleSerializer
 import br.com.zup.beagle.android.utils.setIsAutoGenerateIdEnabled
+import br.com.zup.beagle.android.utils.toAndroidId
 import br.com.zup.beagle.android.view.ViewFactory
 import br.com.zup.beagle.core.ServerDrivenComponent
 
@@ -155,11 +156,11 @@ internal class ListAdapter(
         holder.onViewAttachedToWindow()
     }
 
-    fun setList(list: List<Any>?) {
+    fun setList(list: List<Any>?, componentId: String? = null) {
         list?.let {
             if (list != listItems) {
                 clearAdapterContent()
-                notifyListViewIdViewModel(listItems.isEmpty())
+                notifyListViewIdViewModel(listItems.isEmpty(), componentId)
                 listItems = list
                 adapterItems = list.map { ListItem(data = it.normalizeContextValue()) }
                 notifyDataSetChanged()
@@ -172,10 +173,10 @@ internal class ListAdapter(
         createdViewHolders.clear()
     }
 
-    private fun notifyListViewIdViewModel(adapterPreviouslyEmpty: Boolean) {
+    private fun notifyListViewIdViewModel(adapterPreviouslyEmpty: Boolean, componentId: String?) {
         listViewModels
             .listViewIdViewModel
-            .createSingleManagerByListViewId(getRecyclerId(), adapterPreviouslyEmpty)
+            .createSingleManagerByListViewId(getRecyclerId(componentId), adapterPreviouslyEmpty)
     }
 
     private fun clearList() {
@@ -192,10 +193,11 @@ internal class ListAdapter(
         }
     }
 
-    private fun getRecyclerId(): Int {
-        return recyclerId.takeIf {
+    private fun getRecyclerId(componentId: String?): Int {
+        val id = recyclerId.takeIf {
             it != View.NO_ID
-        } ?: createTempId()
+        } ?: componentId?.toAndroidId()
+        return id ?: createTempId()
     }
 
     private fun createTempId(): Int {

diff --git a/android/beagle/src/main/java/br/com/zup/beagle/android/components/list/ListViewHolder.kt b/android/beagle/src/main/java/br/com/zup/beagle/android/components/list/ListViewHolder.kt
@@ -211,7 +211,7 @@ internal class ListViewHolder(
         position: Int,
         recyclerId: Int
     ) {
-        val itemViewId = bindIdToViewModel(itemView, isRecycled, position, recyclerId)
+        val itemViewId = bindIdToViewModel(position, recyclerId)
         setUpdatedIdToViewAndManagers(itemView, itemViewId, listItem, isRecycled)
 
         viewsWithId.forEach { (id, view) ->
@@ -223,14 +223,14 @@ internal class ListViewHolder(
 
         val viewsWithContextAndWithoutId = viewsWithContext.filterNot { viewsWithId.containsValue(it) }
         viewsWithContextAndWithoutId.forEach { view ->
-            val subViewId = bindIdToViewModel(view, isRecycled, position, recyclerId)
+            val subViewId = bindIdToViewModel(position, recyclerId)
             setUpdatedIdToViewAndManagers(view, subViewId, listItem, isRecycled)
         }
 
         val viewsWithOnInitAndWithoutIdAndContext =
             viewsWithOnInit.filterNot { viewsWithId.containsValue(it) || viewsWithContext.contains(it) }
         viewsWithOnInitAndWithoutIdAndContext.forEach { view ->
-            val subViewId = bindIdToViewModel(view, isRecycled, position, recyclerId)
+            val subViewId = bindIdToViewModel(position, recyclerId)
             setUpdatedIdToViewAndManagers(view, subViewId, listItem, isRecycled)
         }
 
@@ -241,12 +241,12 @@ internal class ListViewHolder(
                     viewsWithOnInit.contains(it)
             }
             .forEach { innerRecyclerWithoutId ->
-                val subViewId = bindIdToViewModel(innerRecyclerWithoutId, isRecycled, position, recyclerId)
+                val subViewId = bindIdToViewModel(position, recyclerId)
                 setUpdatedIdToViewAndManagers(innerRecyclerWithoutId, subViewId, listItem, isRecycled)
             }
     }
 
-    private fun bindIdToViewModel(view: View, isRecycled: Boolean, position: Int, recyclerId: Int): Int {
+    private fun bindIdToViewModel(position: Int, recyclerId: Int): Int {
         return listViewModels.listViewIdViewModel.getViewId(recyclerId, position)
     }
 

diff --git a/...-tests/src/main/kotlin/br/com/zup/beagle/automatedtests/builders/ListViewScreenBuilder.kt b/...-tests/src/main/kotlin/br/com/zup/beagle/automatedtests/builders/ListViewScreenBuilder.kt
@@ -16,6 +16,7 @@
 
 package br.com.zup.beagle.automatedtests.builders
 
+import br.com.zup.beagle.automatedtests.model.Genre
 import br.com.zup.beagle.core.Style
 import br.com.zup.beagle.ext.applyFlex
 import br.com.zup.beagle.ext.applyStyle
@@ -51,10 +52,6 @@ data class PageResponse(
     var result: Bind<List<Any>>
 )
 
-data class GenreResponse(
-    var genres: Any? = null
-)
-
 data class CategoryResponse(
     var category: Any? = null
 )
@@ -209,20 +206,6 @@ object ListViewScreenBuilder {
         )
 
     private fun secondListView() = Container(
-        context = ContextData(id = "genreResponse", value = GenreResponse()),
-        onInit = listOf(
-            SendRequest(
-                url = "/book-database/categories",
-                onSuccess = listOf(
-                    SetContext(
-                        contextId = "genreResponse",
-                        value = GenreResponse(
-                            genres = "@{onSuccess.data}"
-                        )
-                    )
-                )
-            )
-        ),
         children = listOf(
             Text("Categories List View (nested)")
                 .applyStyle(
@@ -240,7 +223,7 @@ object ListViewScreenBuilder {
         return ListView(
             key = "id",
             direction = ListDirection.VERTICAL,
-            dataSource = expressionOf("@{genreResponse.genres}"),
+            dataSource = valueOf(Genre.createMock()),
             template = Container(
                 context = ContextData(id = "categoryResponse", value = CategoryResponse()),
                 children = listOf(