Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### Changes:
- Fix: Compose VirtusizeInPageMini VirtusizeInPageStandard update fix

### 2.12.20
- Fix: Prevent send event userSawProduct when productValid = false or repeated product load

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Button
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -43,45 +47,55 @@ internal fun VirtusizeSampleApp() {
)
}

VirtusizeButton(
product = product,
modifier = Modifier.align(Alignment.CenterHorizontally),
colors =
VirtusizeButtonDefaults.colors(
containerColor = VirtusizeColors.Teal,
contentColor = VirtusizeColors.White,
),
onEvent = { event ->
Log.i(VIRTUSIZE_BUTTON_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_BUTTON_TAG, error.message)
},
)
Spacer(modifier = Modifier.height(16.dp))
VirtusizeInPageStandard(
product = product,
modifier = Modifier.padding(horizontal = 16.dp),
backgroundColor = VirtusizeColors.Black,
onEvent = { event ->
Log.i(VIRTUSIZE_INPAGE_STANDARD_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_INPAGE_STANDARD_TAG, error.message)
},
)
Spacer(modifier = Modifier.height(16.dp))
VirtusizeInPageMini(
product = product,
modifier = Modifier.padding(horizontal = 16.dp),
backgroundColor = VirtusizeColors.Teal,
onEvent = { event ->
Log.i(VIRTUSIZE_INPAGE_MINI_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_INPAGE_MINI_TAG, error.message)
},
)
var someKey by remember { mutableStateOf(true) }
Button({ someKey = !someKey }) {
Text("Reenter composition")
}

key(someKey) {
VirtusizeButton(
product = product,
modifier = Modifier.align(Alignment.CenterHorizontally),
colors =
VirtusizeButtonDefaults.colors(
containerColor = VirtusizeColors.Teal,
contentColor = VirtusizeColors.White,
),
onEvent = { event ->
Log.i(VIRTUSIZE_BUTTON_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_BUTTON_TAG, error.message)
},
)

Spacer(modifier = Modifier.height(16.dp))

VirtusizeInPageStandard(
product = product,
modifier = Modifier.padding(horizontal = 16.dp),
backgroundColor = VirtusizeColors.Black,
onEvent = { event ->
Log.i(VIRTUSIZE_INPAGE_STANDARD_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_INPAGE_STANDARD_TAG, error.message)
},
)

Spacer(modifier = Modifier.height(16.dp))
VirtusizeInPageMini(
product = product,
modifier = Modifier.padding(horizontal = 16.dp),
backgroundColor = VirtusizeColors.Teal,
onEvent = { event ->
Log.i(VIRTUSIZE_INPAGE_MINI_TAG, event.name)
},
onError = { error ->
Log.e(VIRTUSIZE_INPAGE_MINI_TAG, error.message)
},
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ internal class VirtusizeComposeViewModel : ViewModel() {
fun load(
product: VirtusizeProduct,
virtusizeView: VirtusizeView,
force: Boolean = false,
) {
virtusize.setupVirtusizeView(product = product, virtusizeView = virtusizeView)
if (lastLoadedProductId != product.externalId) {
if (force || lastLoadedProductId != product.externalId) {
lastLoadedProductId = product.externalId
virtusize.load(product)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ fun VirtusizeInPageMini(

VirtusizeInPageMini(
modifier = modifier,
create = { virtusizeInPageMini ->
viewModel.load(product = product, virtusizeView = virtusizeInPageMini, force = true)
},
update = { virtusizeInPageMini ->
viewRef.value = virtusizeInPageMini
viewModel.load(product = product, virtusizeView = virtusizeInPageMini)
viewModel.load(product = product, virtusizeView = virtusizeInPageMini, force = false)
},
)

Expand All @@ -72,11 +75,12 @@ fun VirtusizeInPageMini(
@Composable
private fun VirtusizeInPageMini(
modifier: Modifier = Modifier,
create: (VirtusizeInPageMini) -> Unit = {},
update: (VirtusizeInPageMini) -> Unit = NoOpUpdate,
) {
AndroidView(
modifier = modifier,
factory = { context -> VirtusizeInPageMini(context) },
factory = { context -> VirtusizeInPageMini(context).also { create(it) } },
update = update,
onRelease = { virtusizeView ->
Virtusize.getInstanceOrNull()?.cleanupVirtusizeView(virtusizeView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ fun VirtusizeInPageStandard(

VirtusizeInPageStandard(
modifier = modifier,
create = { virtusizeInPageStandard ->
viewModel.load(product = product, virtusizeView = virtusizeInPageStandard, force = true)
},
update = { virtusizeInPageStandard ->
viewRef.value = virtusizeInPageStandard
viewModel.load(product = product, virtusizeView = virtusizeInPageStandard)
viewModel.load(product = product, virtusizeView = virtusizeInPageStandard, force = false)
},
)

Expand All @@ -73,6 +76,7 @@ fun VirtusizeInPageStandard(
@Composable
private fun VirtusizeInPageStandard(
modifier: Modifier = Modifier,
create: (VirtusizeInPageStandard) -> Unit = {},
update: (VirtusizeInPageStandard) -> Unit = NoOpUpdate,
) {
AndroidView(
Expand All @@ -81,7 +85,7 @@ private fun VirtusizeInPageStandard(
VirtusizeInPageStandard(context).apply {
horizontalMargin = 0
clipChildren = false
}
}.also { create(it) }
},
update = update,
onRelease = { virtusizeView ->
Expand Down