Merge branch 'main' into refactor/align-package-with-artifact-id

Author: t-jimbo

nubrick/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.nubrick"
-version = "0.7.0"
+version = "0.7.1"
 
 android {
     namespace = "io.nubrick.nubrick"

nubrick/src/main/kotlin/io/nubrick/nubrick/component/modal.kt

@@ -9,8 +9,10 @@ import androidx.compose.runtime.setValue
 import io.nubrick.nubrick.component.provider.pageblock.PageBlockData
 import io.nubrick.nubrick.schema.ModalPresentationStyle
 import io.nubrick.nubrick.schema.ModalScreenSize
+import io.nubrick.nubrick.schema.UIBlockEventDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.JsonElement
 
 internal data class ModalState(
     val modalStack: List<PageBlockData> = emptyList(),
@@ -27,6 +29,7 @@ internal class ModalViewModel(
     private val largeSheetState: SheetState,
     private val scope: CoroutineScope,
     private val onDismiss: () -> Unit,
+    private var onTrigger: ((trigger: UIBlockEventDispatcher, data: JsonElement) -> Unit) = { _, _ -> },
 ) {
     var modalState by mutableStateOf(ModalState())
         private set
@@ -52,7 +55,13 @@ internal class ModalViewModel(
         modalState = modalState.copy(displayedModalIndex = index)
     }
 
-    fun back() {
+    fun back(data: JsonElement) {
+        val currentPageBlock = modalState.modalStack[modalState.displayedModalIndex]
+        if (currentPageBlock.block.data?.triggerSetting?.onTrigger != null) {
+            currentPageBlock.block.data.triggerSetting.onTrigger.let { onTrigger(it, data) }
+            return
+        }
+
         val index = modalState.displayedModalIndex
         if (index <= 0) {
             close()
@@ -80,4 +89,8 @@ internal class ModalViewModel(
             }
         }
     }
+
+    fun setOnTrigger(onTrigger: ((trigger: UIBlockEventDispatcher, data: JsonElement) -> Unit)) {
+        this.onTrigger = onTrigger
+    }
 }

nubrick/src/main/kotlin/io/nubrick/nubrick/component/root.kt

@@ -63,6 +63,7 @@ import io.nubrick.nubrick.schema.UIRootBlock
 import io.nubrick.nubrick.template.compile
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
 
 private fun parseUIEventToEvent(event: UIBlockEventDispatcher): Event {
     return Event(
@@ -83,6 +84,11 @@ private fun parseUIEventToEvent(event: UIBlockEventDispatcher): Event {
     )
 }
 
+internal data class WebviewData(
+    val url: String,
+    val trigger: UIBlockEventDispatcher?,
+) {}
+
 internal class RootViewModel(
     private val root: UIRootBlock,
     private val modalViewModel: ModalViewModel,
@@ -93,7 +99,7 @@ internal class RootViewModel(
 ) : ViewModel() {
     private val pages: List<UIPageBlock> = root.data?.pages ?: emptyList()
     val displayedPageBlock = mutableStateOf<PageBlockData?>(null)
-    val webviewUrl = mutableStateOf("")
+    val webviewData = mutableStateOf<WebviewData?>(null)
 
     // We use them for sdk bridge between flutter <-> android.
     val currentPageBlock = mutableStateOf<UIPageBlock?>(null)
@@ -150,7 +156,10 @@ internal class RootViewModel(
         }
 
         if (destBlock.data?.kind == PageKind.WEBVIEW_MODAL) {
-            this.webviewUrl.value = destBlock.data.webviewUrl ?: ""
+            this.webviewData.value = WebviewData(
+                url = destBlock.data.webviewUrl ?: "",
+                trigger = destBlock.data.triggerSetting?.onTrigger
+            )
             return
         }
 
@@ -190,7 +199,7 @@ internal class RootViewModel(
     }
 
     fun handleWebviewDismiss() {
-        this.webviewUrl.value = ""
+        this.webviewData.value = null
     }
 }
 
@@ -287,6 +296,11 @@ internal fun Root(
             container.handleEvent(e)
         }
     }
+    LaunchedEffect(Unit) {
+        modalViewModel.setOnTrigger { trigger, data ->
+            listener(trigger, data)
+        }
+    }
 
     val currentPageBlock = viewModel.currentPageBlock.value
     val displayedPageBlock = viewModel.displayedPageBlock.value
@@ -321,7 +335,7 @@ internal fun Root(
 
                 if (modalState.modalVisibility) {
                     BackHandler(true) {
-                        modalViewModel.back()
+                        modalViewModel.back(JsonNull)
                     }
                     val isLarge =
                         modalState.modalPresentationStyle == ModalPresentationStyle.DEPENDS_ON_CONTEXT_OR_FULL_SCREEN
@@ -340,7 +354,7 @@ internal fun Root(
                         shape = RoundedCornerShape(topStart = 10.dp, topEnd = 10.dp),
                     ) {
                         ModalBottomSheetBackHandler {
-                            modalViewModel.back()
+                            modalViewModel.back(JsonNull)
                         }
                         Column(
                             modifier = if (modalState.modalPresentationStyle == ModalPresentationStyle.DEPENDS_ON_CONTEXT_OR_FULL_SCREEN) {
@@ -373,7 +387,7 @@ internal fun Root(
                                     it,
                                     stack.block,
                                     onClose = { modalViewModel.close() },
-                                    onBack = { modalViewModel.back() },
+                                    onBack = { modalViewModel.back(JsonNull) },
                                     isFullscreen,
                                 )
                                 ModalPage(
@@ -388,7 +402,7 @@ internal fun Root(
                     }
                 }
 
-                if (viewModel.webviewUrl.value.isNotEmpty()) {
+                if (viewModel.webviewData.value != null) {
                     Dialog(
                         properties = DialogProperties(
                             usePlatformDefaultWidth = true,
@@ -406,8 +420,11 @@ internal fun Root(
                                 .background(Color.LightGray)
                         ) {
                             WebViewPage(
-                                url = viewModel.webviewUrl.value,
+                                url = viewModel.webviewData.value?.url ?: "",
                                 onDismiss = {
+                                    viewModel.webviewData.value?.trigger?.let { trigger ->
+                                        listener(trigger, JsonNull)
+                                    }
                                     viewModel.handleWebviewDismiss()
                                 },
                                 modifier = Modifier

nubrick/src/main/kotlin/io/nubrick/nubrick/sdk.kt

@@ -34,7 +34,7 @@ import kotlin.time.Duration
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
-const val VERSION = "0.7.0"
+const val VERSION = "0.7.1"
 
 data class Endpoint(
     val cdn: String = "https://cdn.nativebrik.com",