expo-web-browser 10.1.1 → 11.0.0

package/CHANGELOG.md

@@ -10,7 +10,43 @@
 
 ### 💡 Others
 
-## 10.1.1 — 2022-02-01
+## 11.0.0 — 2022-07-07
+
+### 🎉 New features
+
+- Native module on Android is now written in Kotlin using the new API. ([#17454](https://github.com/expo/expo/pull/17454) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fixed `removeListener(): Method has been deprecated` warning. ([#17645](https://github.com/expo/expo/pull/17645) by [@barthap](https://github.com/barthap))
+- Fixed `service not registered` exception on Android. ([#17855](https://github.com/expo/expo/pull/17855) by [@lukmccall](https://github.com/lukmccall))
+- Fixed `redirectUrl` auth session argument to be optional and thus match documentation. ([#17953](https://github.com/expo/expo/pull/17953) by [@barthap](https://github.com/barthap))
+- Fixed `windowFeatures` property not being properly recognized on web. ([#18106](https://github.com/expo/expo/pull/18106) by [@barthap](https://github.com/barthap))
+
+### 💡 Others
+
+- Migrated Expo modules definitions to the new naming convention. ([#17193](https://github.com/expo/expo/pull/17193) by [@tsapeta](https://github.com/tsapeta))
+- Rewritten Android code to Kotlin. ([#17195](https://github.com/expo/expo/pull/17195) by [@barthap](https://github.com/barthap))
+
+## 10.2.1 — 2022-05-24
+
+### 🐛 Bug fixes
+
+- On Web fix popup being blocked by Safari. ([#17222](https://github.com/expo/expo/pull/17222) by [@sreuter](https://github.com/sreuter))
+
+## 10.2.0 — 2022-04-18
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the new API. ([#16201](https://github.com/expo/expo/pull/16201) by [@tsapeta](https://github.com/tsapeta))
+- Add `presentationStyle` option to customize browser window appearance on iOS. ([#16919](https://github.com/expo/expo/pull/16919) by [@barthap](https://github.com/barthap))
+- Add `preferEphemeralSession` option to `openAuthSessionAsync` to ask for a private auth session on iOS. ([#16926](https://github.com/expo/expo/pull/16926) by [@barthap](https://github.com/barthap))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 10.1.1 - 2022-02-01
 
 ### 🐛 Bug fixes
 

package/README.md

@@ -4,12 +4,12 @@ Provides access to the system's web browser and supports handling redirects. On
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/webbrowser.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/webbrowser/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/webbrowser.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/webbrowser/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/webbrowser/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/webbrowser/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -3,21 +3,36 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.1.1'
+version = '11.0.0'
 
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
@@ -45,18 +60,22 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 18
-    versionName '10.1.1'
+    versionName '11.0.0'
   }
   lintOptions {
     abortOnError false
@@ -68,10 +87,11 @@ dependencies {
 
   api "androidx.browser:browser:1.2.0"
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+  implementation "androidx.core:core-ktx:1.7.0"
 
-  if (project.findProject(':unimodules-test-core')) {
-    testImplementation project(':unimodules-test-core')
+  if (project.findProject(':expo-modules-test-core')) {
+    testImplementation project(':expo-modules-test-core')
   }
   testImplementation "org.robolectric:robolectric:4.3.1"
 }

package/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.kt

@@ -0,0 +1,123 @@
+package expo.modules.webbrowser
+
+import android.app.Activity
+import expo.modules.core.errors.CurrentActivityNotFoundException
+import android.content.pm.ResolveInfo
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabsClient
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsService
+import expo.modules.core.interfaces.ActivityProvider
+import java.util.ArrayList
+import java.util.LinkedHashSet
+
+private const val DUMMY_URL = "https://expo.dev"
+
+internal class CustomTabsActivitiesHelper(
+  private val activityProvider: ActivityProvider?
+) {
+
+  // region Actual custom tabs activities helper methods
+
+  /**
+   * @throws CurrentActivityNotFoundException
+   * @throws PackageManagerNotFoundException
+   */
+  fun canResolveIntent(intent: Intent): Boolean = getResolvingActivities(intent).isNotEmpty()
+
+  /**
+   * @throws PackageManagerNotFoundException
+   * @throws CurrentActivityNotFoundException
+   */
+  val customTabsResolvingActivities: ArrayList<String>
+    get() = getResolvingActivities(createDefaultCustomTabsIntent())
+      .mapToDistinctArrayList { resolveInfo: ResolveInfo ->
+        resolveInfo.activityInfo.packageName
+      }
+
+  /**
+   * @throws PackageManagerNotFoundException
+   * @throws CurrentActivityNotFoundException
+   */
+  val customTabsResolvingServices: ArrayList<String>
+    get() = packageManager.queryIntentServices(createDefaultCustomTabsServiceIntent(), 0)
+      .mapToDistinctArrayList { resolveInfo: ResolveInfo ->
+        resolveInfo.serviceInfo.packageName
+      }
+
+  /**
+   * @throws PackageManagerNotFoundException
+   * @throws CurrentActivityNotFoundException
+   */
+  fun getPreferredCustomTabsResolvingActivity(packages: List<String?>?): String? {
+    val resolvedPackages = packages ?: customTabsResolvingActivities
+    return CustomTabsClient.getPackageName(currentActivity, resolvedPackages)
+  }
+
+  /**
+   * @throws PackageManagerNotFoundException
+   * @throws CurrentActivityNotFoundException
+   */
+  val defaultCustomTabsResolvingActivity: String?
+    get() {
+      val info = packageManager.resolveActivity(createDefaultCustomTabsIntent(), 0)
+      return info?.activityInfo?.packageName
+    }
+
+  /**
+   * @throws CurrentActivityNotFoundException
+   */
+  fun startCustomTabs(intent: Intent) {
+    currentActivity.startActivity(intent)
+  }
+
+  // endregion
+
+  // region Private helpers
+
+  /**
+   * @throws CurrentActivityNotFoundException
+   * @throws PackageManagerNotFoundException
+   */
+  private fun getResolvingActivities(intent: Intent): List<ResolveInfo> {
+    return packageManager.queryIntentActivities(intent, 0)
+  }
+
+  /**
+   * @throws CurrentActivityNotFoundException
+   * @throws PackageManagerNotFoundException
+   */
+  private val packageManager: PackageManager
+    get() = currentActivity.packageManager ?: throw PackageManagerNotFoundException()
+
+  /**
+   * @throws CurrentActivityNotFoundException
+   */
+  private val currentActivity: Activity
+    get() {
+      return activityProvider?.currentActivity ?: throw CurrentActivityNotFoundException()
+    }
+
+  // endregion
+}
+
+private inline fun <T, R> Collection<T>.mapToDistinctArrayList(mapper: (T) -> R): ArrayList<R> {
+  val resultSet = LinkedHashSet<R>()
+  for (element in this) {
+    resultSet.add(mapper.invoke(element))
+  }
+  return ArrayList(resultSet)
+}
+
+private fun createDefaultCustomTabsIntent(): Intent {
+  val customTabsIntent = CustomTabsIntent.Builder().build()
+  return customTabsIntent.intent.apply {
+    data = Uri.parse(DUMMY_URL)
+  }
+}
+
+private fun createDefaultCustomTabsServiceIntent() = Intent().apply {
+  action = CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION
+}

package/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.kt

@@ -0,0 +1,97 @@
+package expo.modules.webbrowser
+
+import android.content.ComponentName
+import android.content.Context
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabsClient
+import androidx.browser.customtabs.CustomTabsServiceConnection
+import androidx.browser.customtabs.CustomTabsSession
+
+internal class CustomTabsConnectionHelper(
+  private val context: Context
+) : CustomTabsServiceConnection() {
+  private var currentPackageName: String? = null
+  private val clientActions = DeferredClientActionsQueue<CustomTabsClient>()
+  private val sessionActions = DeferredClientActionsQueue<CustomTabsSession?>()
+
+  // region lifecycle methods
+  fun destroy() = clearConnection()
+  // endregion
+
+  // region Actual connection helper methods
+  fun warmUp(packageName: String) {
+    clientActions.executeOrQueueAction { client: CustomTabsClient -> client.warmup(0) }
+    ensureConnection(packageName)
+  }
+
+  fun mayInitWithUrl(packageName: String, uri: Uri) {
+    sessionActions.executeOrQueueAction { session: CustomTabsSession? ->
+      session?.mayLaunchUrl(uri, null, null)
+    }
+    ensureConnection(packageName)
+    ensureSession()
+  }
+
+  fun coolDown(packageName: String): Boolean {
+    if (isConnectionStarted(packageName)) {
+      clearConnection()
+      return true
+    }
+    return false
+  }
+  // endregion
+
+  // region CustomTabsServiceConnection implementation
+  override fun onBindingDied(componentName: ComponentName) {
+    if (isConnectionStarted(componentName.packageName)) {
+      clearConnection()
+    }
+  }
+
+  override fun onCustomTabsServiceConnected(componentName: ComponentName, client: CustomTabsClient) {
+    if (isConnectionStarted(componentName.packageName)) {
+      clientActions.setClient(client)
+    }
+  }
+
+  override fun onServiceDisconnected(componentName: ComponentName) {
+    if (isConnectionStarted(componentName.packageName)) {
+      clearConnection()
+    }
+  }
+  // endregion
+
+  private fun ensureSession() {
+    if (sessionActions.hasClient()) {
+      return
+    }
+
+    clientActions.executeOrQueueAction { client: CustomTabsClient ->
+      sessionActions.setClient(client.newSession(null))
+    }
+  }
+
+  private fun ensureConnection(packageName: String) {
+    if (currentPackageName != null && currentPackageName != packageName) {
+      clearConnection()
+    }
+    if (!isConnectionStarted(packageName)) {
+      CustomTabsClient.bindCustomTabsService(context, packageName, this)
+      currentPackageName = packageName
+    }
+  }
+
+  private fun isConnectionStarted(packageName: String): Boolean {
+    return packageName == currentPackageName
+  }
+
+  private fun clearConnection() {
+    if (currentPackageName != null) {
+      context.unbindService(this)
+    }
+
+    currentPackageName = null
+    clientActions.clear()
+    sessionActions.clear()
+  }
+}

package/android/src/main/java/expo/modules/webbrowser/DeferredClientActionsQueue.kt

@@ -0,0 +1,45 @@
+package expo.modules.webbrowser
+
+import expo.modules.core.interfaces.Consumer
+import java.util.*
+
+class DeferredClientActionsQueue<T> {
+  private val actions: Queue<Consumer<T>> = LinkedList()
+  private var client: T? = null
+
+  fun setClient(client: T) {
+    this.client = client
+    executeQueuedActions()
+  }
+
+  fun hasClient(): Boolean = client != null
+
+  fun executeOrQueueAction(action: Consumer<T>) {
+    if (client != null) {
+      action.apply(client)
+    } else {
+      addActionToQueue(action)
+    }
+  }
+
+  fun clear() {
+    client = null
+    actions.clear()
+  }
+
+  private fun executeQueuedActions() {
+    if (client == null) {
+      return
+    }
+
+    var action = actions.poll()
+    while (action != null) {
+      action.apply(client)
+      action = actions.poll()
+    }
+  }
+
+  private fun addActionToQueue(consumer: Consumer<T>) {
+    actions.add(consumer)
+  }
+}

package/android/src/main/java/expo/modules/webbrowser/WebBrowserExceptions.kt

@@ -0,0 +1,13 @@
+package expo.modules.webbrowser
+
+import expo.modules.kotlin.exception.CodedException
+
+internal class NoPreferredPackageFound : CodedException(
+  code = "PREFERRED_PACKAGE_NOT_FOUND",
+  message = "Cannot determine preferred package without satisfying it",
+  cause = null
+)
+
+internal class PackageManagerNotFoundException : CodedException("Package Manager not found")
+
+internal class NoMatchingActivityException : CodedException("No matching browser activity found")

package/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.kt

@@ -0,0 +1,170 @@
+package expo.modules.webbrowser
+
+import expo.modules.core.errors.CurrentActivityNotFoundException
+import android.content.Intent
+import android.graphics.Color
+import android.net.Uri
+import android.os.Bundle
+import android.text.TextUtils
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.os.bundleOf
+import expo.modules.core.utilities.ifNull
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import java.lang.IllegalArgumentException
+
+private const val SERVICE_PACKAGE_KEY = "servicePackage"
+private const val BROWSER_PACKAGES_KEY = "browserPackages"
+private const val SERVICE_PACKAGES_KEY = "servicePackages"
+private const val PREFERRED_BROWSER_PACKAGE = "preferredBrowserPackage"
+private const val DEFAULT_BROWSER_PACKAGE = "defaultBrowserPackage"
+
+private const val MODULE_NAME = "ExpoWebBrowser"
+
+class WebBrowserModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name(MODULE_NAME)
+
+    OnCreate {
+      customTabsResolver = CustomTabsActivitiesHelper(appContext.activityProvider)
+      connectionHelper = CustomTabsConnectionHelper(
+        requireNotNull(appContext.reactContext) {
+          "Cannot initialize WebBrowser, ReactContext is null"
+        }
+      )
+    }
+
+    OnActivityDestroys {
+      connectionHelper.destroy()
+    }
+
+    AsyncFunction("warmUpAsync") { packageName: String? ->
+      val resolvedPackageName = givenOrPreferredPackageName(packageName)
+      connectionHelper.warmUp(resolvedPackageName)
+      return@AsyncFunction bundleOf(
+        SERVICE_PACKAGE_KEY to resolvedPackageName
+      )
+    }
+
+    AsyncFunction("coolDownAsync") { packageName: String? ->
+      val resolvedPackageName = givenOrPreferredPackageName(packageName)
+      val result = if (connectionHelper.coolDown(resolvedPackageName)) {
+        bundleOf(
+          SERVICE_PACKAGE_KEY to resolvedPackageName
+        )
+      } else {
+        Bundle()
+      }
+      return@AsyncFunction result
+    }
+
+    AsyncFunction("mayInitWithUrlAsync") { url: String, packageName: String? ->
+      val resolvedPackageName = givenOrPreferredPackageName(packageName)
+      connectionHelper.mayInitWithUrl(resolvedPackageName, Uri.parse(url))
+      return@AsyncFunction bundleOf(
+        SERVICE_PACKAGE_KEY to resolvedPackageName
+      )
+    }
+
+    // throws CurrentActivityNotFoundException
+    AsyncFunction("getCustomTabsSupportingBrowsersAsync") {
+      val activities = customTabsResolver.customTabsResolvingActivities
+      val services = customTabsResolver.customTabsResolvingServices
+      val preferredPackage = customTabsResolver.getPreferredCustomTabsResolvingActivity(activities)
+      val defaultPackage = customTabsResolver.defaultCustomTabsResolvingActivity
+
+      // It might happen, that default activity does not support Chrome Tabs. Then it will be ResolvingActivity and we don't want to return it as a result.
+      val defaultCustomTabsPackage: String? = defaultPackage.takeIf { activities.contains(it) }
+
+      return@AsyncFunction Bundle().apply {
+        putStringArrayList(BROWSER_PACKAGES_KEY, activities)
+        putStringArrayList(SERVICE_PACKAGES_KEY, services)
+        putString(PREFERRED_BROWSER_PACKAGE, preferredPackage)
+        putString(DEFAULT_BROWSER_PACKAGE, defaultCustomTabsPackage)
+      }
+    }
+
+    // throws CurrentActivityNotFoundException
+    AsyncFunction("openBrowserAsync") { url: String, options: OpenBrowserOptions ->
+      val intent = createCustomTabsIntent(options).apply {
+        data = Uri.parse(url)
+      }
+
+      if (!customTabsResolver.canResolveIntent(intent)) {
+        throw NoMatchingActivityException()
+      }
+
+      customTabsResolver.startCustomTabs(intent)
+
+      return@AsyncFunction bundleOf(
+        "type" to "opened"
+      )
+    }
+  }
+
+  // these must be `internal` to be able to be injected in tests
+  internal lateinit var customTabsResolver: CustomTabsActivitiesHelper
+  internal lateinit var connectionHelper: CustomTabsConnectionHelper
+
+  private fun createCustomTabsIntent(options: OpenBrowserOptions): Intent {
+    val builder = CustomTabsIntent.Builder()
+    val color = options.toolbarColor
+    val secondaryColor = options.secondaryToolbarColor
+
+    try {
+      if (!TextUtils.isEmpty(color)) {
+        val intColor = Color.parseColor(color)
+        builder.setToolbarColor(intColor)
+      }
+      if (!TextUtils.isEmpty(secondaryColor)) {
+        val intSecondaryColor = Color.parseColor(secondaryColor)
+        builder.setSecondaryToolbarColor(intSecondaryColor)
+      }
+    } catch (ignored: IllegalArgumentException) {
+    }
+
+    builder.setShowTitle(options.showTitle)
+
+    if (options.enableDefaultShareMenuItem) {
+      builder.addDefaultShareMenuItem()
+    }
+
+    return builder.build().intent.apply {
+      // We cannot use the builder's method enableUrlBarHiding, because there is
+      // no corresponding disable method and some browsers enable it by default.
+      putExtra(CustomTabsIntent.EXTRA_ENABLE_URLBAR_HIDING, options.enableBarCollapsing)
+
+      val packageName = options.browserPackage
+      if (!TextUtils.isEmpty(packageName)) {
+        setPackage(packageName)
+      }
+
+      if (options.shouldCreateTask) {
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        if (!options.showInRecents) {
+          addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+          addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
+        }
+      }
+    }
+  }
+
+  /**
+   * @throws NoPreferredPackageFound
+   */
+  private fun givenOrPreferredPackageName(packageName: String?): String {
+    val resolvedPackageName: String? = try {
+      packageName?.takeIf { it.isNotEmpty() }.ifNull {
+        customTabsResolver.getPreferredCustomTabsResolvingActivity(null)
+      }
+    } catch (ex: CurrentActivityNotFoundException) {
+      throw NoPreferredPackageFound()
+    } catch (ex: PackageManagerNotFoundException) {
+      throw NoPreferredPackageFound()
+    }
+
+    return resolvedPackageName?.takeIf { it.isNotEmpty() }
+      ?: throw NoPreferredPackageFound()
+  }
+}

package/android/src/main/java/expo/modules/webbrowser/WebBrowserOptions.kt

@@ -0,0 +1,15 @@
+package expo.modules.webbrowser
+
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+internal data class OpenBrowserOptions(
+  @Field var toolbarColor: String? = null,
+  @Field var secondaryToolbarColor: String? = null,
+  @Field var browserPackage: String? = null,
+  @Field var showTitle: Boolean = false,
+  @Field var enableDefaultShareMenuItem: Boolean = false,
+  @Field var enableBarCollapsing: Boolean = false,
+  @Field var showInRecents: Boolean = false,
+  @Field(key = "createTask") var shouldCreateTask: Boolean = true,
+) : Record

package/build/ExpoWebBrowser.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoWebBrowser.d.ts.map

package/build/ExpoWebBrowser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoWebBrowser.d.ts","sourceRoot":"","sources":["../src/ExpoWebBrowser.ts"],"names":[],"mappings":";AACA,wBAAgE"}

package/build/ExpoWebBrowser.web.d.ts

@@ -13,3 +13,4 @@ declare const _default: {
 };
 export default _default;
 export declare function featureObjectToString(features: Record<string, any>): string;
+//# sourceMappingURL=ExpoWebBrowser.web.d.ts.map

package/build/ExpoWebBrowser.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoWebBrowser.web.d.ts","sourceRoot":"","sources":["../src/ExpoWebBrowser.web.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACrB,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;;;0BAyCnB,MAAM,kBACI,qBAAqB,GACnC,QAAQ,gBAAgB,CAAC;;;;QAWsD;QAChF,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;KACjB;8BA8CM,MAAM,sFAGV,QAAQ,2BAA2B,CAAC;;AAtEzC,wBAyJE;AAqIF,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAY3E"}