@expo/ui 55.0.0 → 55.0.2

package/CHANGELOG.md

@@ -10,6 +10,39 @@
 
 ### 💡 Others
 
+## 55.0.2 — 2026-03-11
+
+### 🎉 New features
+
+- [Android] Added `graphicsLayer` modifier and animation helpers for per-value animation in it. Added `indication` option to `clickable` modifier to control ripple effects. ([#43655](https://github.com/expo/expo/pull/43655) by [@vonovak](https://github.com/vonovak))
+- [Android] Added border color customization for `Switch` and `Checkbox` components. ([#43770](https://github.com/expo/expo/pull/43770) by [@liestig](https://github.com/liestig))
+- [iOS] Added `rotation3DEffect` modifier for 3D rotation transforms ([#43640](https://github.com/expo/expo/pull/43640) by [@vonovak](https://github.com/vonovak))
+- [iOS] Added `ControlGroup` component. ([#43581](https://github.com/expo/expo/pull/43581) by [@nishan](https://github.com/intergalacticspacehighway))
+- [android] detect FAB in HorizontalFloatingToolbar ([#43601](https://github.com/expo/expo/pull/43601) by [@Ubax](https://github.com/Ubax))
+- [android] Add `elementColors` prop to the `DateTimePicker` component ([#43787](https://github.com/expo/expo/pull/43787) by [@iankberry](https://github.com/iankberry))
+- [iOS] Added `AccessoryWidgetBackground` component ([#43729](https://github.com/expo/expo/pull/43729) by [@huextrat](https://github.com/huextrat))
+- [iOS] Add support for local image uri ([#43707](https://github.com/expo/expo/pull/43707) by [@jakex7](https://github.com/jakex7))
+
+### 🐛 Bug fixes
+
+- [iOS] Fix `Slider` thumb snapping back during drag by guarding `.onReceive` with `isEditing` state. ([#43701](https://github.com/expo/expo/issues/43701) by [@fedeciancaglini](https://github.com/fedeciancaglini)) ([#43797](https://github.com/expo/expo/pull/43797) by [@fedeciancaglini](https://github.com/fedeciancaglini))
+- [Android] Fix touch events for RN views inside Compose BottomSheet. ([#43716](https://github.com/expo/expo/pull/43716) by [@nishan](https://github.com/intergalacticspacehighway))
+- [Android] Fix `RNHostView` child parent related crash. ([#43691](https://github.com/expo/expo/pull/43691) by [@nishan](https://github.com/intergalacticspacehighway))
+- [Android] Added `RNHostView` to improve RN component layout inside Compose views. ([#43495](https://github.com/expo/expo/pull/43495) by [@nishan](https://github.com/intergalacticspacehighway))
+- [Android] Fix `ContextMenu` not expanding when triggered by `IconButton`. ([#43592](https://github.com/expo/expo/pull/43592) by [@nishan](https://github.com/intergalacticspacehighway))
+
+### 💡 Others
+
+- [iOS] Add `AsyncFunction` support in `ExpoUIView` definition function. ([#43669](https://github.com/expo/expo/pull/43669) by [@nishan](https://github.com/intergalacticspacehighway))
+- [iOS] Introduce `SlotView` to replace structural child view types with a single generic slot. ([#43607](https://github.com/expo/expo/pull/43607) by [@nishan](https://github.com/intergalacticspacehighway))
+- [iOS] Make RNHostView SwiftUI view ([#43570](https://github.com/expo/expo/pull/43570) by [@nishan](https://github.com/intergalacticspacehighway))
+
+## 55.0.1 — 2026-02-25
+
+### 🎉 New features
+
+- [iOS] Added `luminanceToAlpha` modifier. ([#43417](https://github.com/expo/expo/pull/43417) by [@jakex7](https://github.com/jakex7))
+
 ## 55.0.0 — 2026-02-25
 
 ### 🎉 New features

package/CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Contributing to `@expo/ui`
+
+`@expo/ui` maps native UI frameworks (SwiftUI on iOS, Jetpack Compose on Android) to React Native.
+
+## Before opening a PR
+
+- [ ] Rebuilt JS output: `yarn build` (from `packages/expo-ui/`) and committed the `build/` output.
+
+### When adding or updating a component
+
+- [ ] Added an example to the relevant screen in `apps/native-component-list/src/screens/UI/`
+- [ ] Regenerated docs (from repo root): `et gdad -p "expo-ui/swift-ui/<component>"` and/or `et gdad -p "expo-ui/jetpack-compose/<component>"`
+- [ ] Added an example in the relevant docs page
+
+### When adding or updating a modifier
+
+- [ ] Added an example to the relevant screen in `apps/native-component-list/src/screens/UI/`
+- [ ] Regenerated docs (from repo root): `et gdad -p "expo-ui/swift-ui/modifiers"` and/or `et gdad -p "expo-ui/jetpack-compose/modifiers"`
+
+## Project structure
+
+- `packages/expo-ui/ios/` - Swift/SwiftUI source files
+- `packages/expo-ui/android/` - Kotlin/Jetpack Compose source files
+- `packages/expo-ui/src/swift-ui/` - TypeScript components and types for the SwiftUI side
+- `packages/expo-ui/src/jetpack-compose/` - TypeScript components and types for the Compose side
+
+## General guidelines
+
+- **Match the native APIs** — prop names, types, and behavior should mirror their SwiftUI / Jetpack Compose counterparts as closely as possible.
+- **Reuse existing types** — before creating a new Record or TypeScript type, check if one already exists.

package/android/build.gradle

@@ -12,13 +12,13 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'expo.modules.ui'
-version = '55.0.0'
+version = '55.0.2'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "55.0.0"
+    versionName "55.0.2"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

package/android/src/main/java/expo/modules/ui/DatePickerView.kt

@@ -47,6 +47,49 @@ enum class Variant(val value: String) : Enumerable {
   }
 }
 
+class DateTimePickerColorOverrides : Record {
+  // DatePicker colors
+  @Field val containerColor: AndroidColor? = null
+  @Field val titleContentColor: AndroidColor? = null
+  @Field val headlineContentColor: AndroidColor? = null
+  @Field val weekdayContentColor: AndroidColor? = null
+  @Field val subheadContentColor: AndroidColor? = null
+  @Field val navigationContentColor: AndroidColor? = null
+  @Field val yearContentColor: AndroidColor? = null
+  @Field val disabledYearContentColor: AndroidColor? = null
+  @Field val currentYearContentColor: AndroidColor? = null
+  @Field val selectedYearContentColor: AndroidColor? = null
+  @Field val disabledSelectedYearContentColor: AndroidColor? = null
+  @Field val selectedYearContainerColor: AndroidColor? = null
+  @Field val disabledSelectedYearContainerColor: AndroidColor? = null
+  @Field val dayContentColor: AndroidColor? = null
+  @Field val disabledDayContentColor: AndroidColor? = null
+  @Field val selectedDayContentColor: AndroidColor? = null
+  @Field val disabledSelectedDayContentColor: AndroidColor? = null
+  @Field val selectedDayContainerColor: AndroidColor? = null
+  @Field val disabledSelectedDayContainerColor: AndroidColor? = null
+  @Field val todayContentColor: AndroidColor? = null
+  @Field val todayDateBorderColor: AndroidColor? = null
+  @Field val dayInSelectionRangeContentColor: AndroidColor? = null
+  @Field val dayInSelectionRangeContainerColor: AndroidColor? = null
+  @Field val dividerColor: AndroidColor? = null
+
+  // TimePicker colors
+  @Field val clockDialColor: AndroidColor? = null
+  @Field val clockDialSelectedContentColor: AndroidColor? = null
+  @Field val clockDialUnselectedContentColor: AndroidColor? = null
+  @Field val selectorColor: AndroidColor? = null
+  @Field val periodSelectorBorderColor: AndroidColor? = null
+  @Field val periodSelectorSelectedContainerColor: AndroidColor? = null
+  @Field val periodSelectorUnselectedContainerColor: AndroidColor? = null
+  @Field val periodSelectorSelectedContentColor: AndroidColor? = null
+  @Field val periodSelectorUnselectedContentColor: AndroidColor? = null
+  @Field val timeSelectorSelectedContainerColor: AndroidColor? = null
+  @Field val timeSelectorUnselectedContainerColor: AndroidColor? = null
+  @Field val timeSelectorSelectedContentColor: AndroidColor? = null
+  @Field val timeSelectorUnselectedContentColor: AndroidColor? = null
+}
+
 data class DateTimePickerProps(
   val title: String = "",
   val initialDate: Long? = null,
@@ -55,6 +98,7 @@ data class DateTimePickerProps(
   val showVariantToggle: Boolean = true,
   val is24Hour: Boolean = true,
   val color: AndroidColor? = null,
+  val elementColors: DateTimePickerColorOverrides = DateTimePickerColorOverrides(),
   val modifiers: ModifierList = emptyList()
 ) : ComposeProps
 
@@ -94,15 +138,39 @@ fun ExpoDatePicker(modifier: Modifier = Modifier, props: DateTimePickerProps, on
     onDateSelected(DatePickerResult(date = state.selectedDateMillis))
   }
 
+  val elementColors = props.elementColors
+  val colorProp = props.color.composeOrNull
+  val defaults = DatePickerDefaults.colors()
+
   DatePicker(
     modifier = modifier,
     state = state,
     showModeToggle = props.showVariantToggle,
     colors = DatePickerDefaults.colors().copy(
-      titleContentColor = colorToComposeColor(props.color),
-      selectedDayContainerColor = colorToComposeColor(props.color),
-      todayDateBorderColor = colorToComposeColor(props.color),
-      headlineContentColor = colorToComposeColor(props.color)
+      containerColor = elementColors.containerColor.composeOrNull ?: defaults.containerColor,
+      titleContentColor = elementColors.titleContentColor.composeOrNull ?: colorProp ?: defaults.titleContentColor,
+      headlineContentColor = elementColors.headlineContentColor.composeOrNull ?: colorProp ?: defaults.headlineContentColor,
+      weekdayContentColor = elementColors.weekdayContentColor.composeOrNull ?: defaults.weekdayContentColor,
+      subheadContentColor = elementColors.subheadContentColor.composeOrNull ?: defaults.subheadContentColor,
+      navigationContentColor = elementColors.navigationContentColor.composeOrNull ?: defaults.navigationContentColor,
+      yearContentColor = elementColors.yearContentColor.composeOrNull ?: defaults.yearContentColor,
+      disabledYearContentColor = elementColors.disabledYearContentColor.composeOrNull ?: defaults.disabledYearContentColor,
+      currentYearContentColor = elementColors.currentYearContentColor.composeOrNull ?: defaults.currentYearContentColor,
+      selectedYearContentColor = elementColors.selectedYearContentColor.composeOrNull ?: defaults.selectedYearContentColor,
+      disabledSelectedYearContentColor = elementColors.disabledSelectedYearContentColor.composeOrNull ?: defaults.disabledSelectedYearContentColor,
+      selectedYearContainerColor = elementColors.selectedYearContainerColor.composeOrNull ?: defaults.selectedYearContainerColor,
+      disabledSelectedYearContainerColor = elementColors.disabledSelectedYearContainerColor.composeOrNull ?: defaults.disabledSelectedYearContainerColor,
+      dayContentColor = elementColors.dayContentColor.composeOrNull ?: defaults.dayContentColor,
+      disabledDayContentColor = elementColors.disabledDayContentColor.composeOrNull ?: defaults.disabledDayContentColor,
+      selectedDayContentColor = elementColors.selectedDayContentColor.composeOrNull ?: defaults.selectedDayContentColor,
+      disabledSelectedDayContentColor = elementColors.disabledSelectedDayContentColor.composeOrNull ?: defaults.disabledSelectedDayContentColor,
+      selectedDayContainerColor = elementColors.selectedDayContainerColor.composeOrNull ?: colorProp ?: defaults.selectedDayContainerColor,
+      disabledSelectedDayContainerColor = elementColors.disabledSelectedDayContainerColor.composeOrNull ?: defaults.disabledSelectedDayContainerColor,
+      todayContentColor = elementColors.todayContentColor.composeOrNull ?: defaults.todayContentColor,
+      todayDateBorderColor = elementColors.todayDateBorderColor.composeOrNull ?: colorProp ?: defaults.todayDateBorderColor,
+      dayInSelectionRangeContentColor = elementColors.dayInSelectionRangeContentColor.composeOrNull ?: defaults.dayInSelectionRangeContentColor,
+      dayInSelectionRangeContainerColor = elementColors.dayInSelectionRangeContainerColor.composeOrNull ?: defaults.dayInSelectionRangeContainerColor,
+      dividerColor = elementColors.dividerColor.composeOrNull ?: defaults.dividerColor
     )
   )
 }
@@ -137,14 +205,29 @@ fun ExpoTimePicker(modifier: Modifier = Modifier, props: DateTimePickerProps, on
     onDateSelected(DatePickerResult(date = cal.time.time))
   }
 
+  val elementColors = props.elementColors
+  val colorProp = props.color.composeOrNull
+  val defaults = TimePickerDefaults.colors()
+
   TimePicker(
     modifier = modifier,
     state = state,
     layoutType = TimePickerLayoutType.Vertical,
     colors = TimePickerDefaults.colors().copy(
-      selectorColor = colorToComposeColor(props.color),
-      timeSelectorSelectedContainerColor = colorToComposeColor(props.color),
-      clockDialColor = colorToComposeColor(props.color).copy(alpha = 0.3f)
+      containerColor = elementColors.containerColor.composeOrNull ?: defaults.containerColor,
+      clockDialColor = elementColors.clockDialColor.composeOrNull ?: colorProp?.copy(alpha = 0.3f) ?: defaults.clockDialColor,
+      clockDialSelectedContentColor = elementColors.clockDialSelectedContentColor.composeOrNull ?: defaults.clockDialSelectedContentColor,
+      clockDialUnselectedContentColor = elementColors.clockDialUnselectedContentColor.composeOrNull ?: defaults.clockDialUnselectedContentColor,
+      selectorColor = elementColors.selectorColor.composeOrNull ?: colorProp ?: defaults.selectorColor,
+      periodSelectorBorderColor = elementColors.periodSelectorBorderColor.composeOrNull ?: defaults.periodSelectorBorderColor,
+      periodSelectorSelectedContainerColor = elementColors.periodSelectorSelectedContainerColor.composeOrNull ?: defaults.periodSelectorSelectedContainerColor,
+      periodSelectorUnselectedContainerColor = elementColors.periodSelectorUnselectedContainerColor.composeOrNull ?: defaults.periodSelectorUnselectedContainerColor,
+      periodSelectorSelectedContentColor = elementColors.periodSelectorSelectedContentColor.composeOrNull ?: defaults.periodSelectorSelectedContentColor,
+      periodSelectorUnselectedContentColor = elementColors.periodSelectorUnselectedContentColor.composeOrNull ?: defaults.periodSelectorUnselectedContentColor,
+      timeSelectorSelectedContainerColor = elementColors.timeSelectorSelectedContainerColor.composeOrNull ?: colorProp ?: defaults.timeSelectorSelectedContainerColor,
+      timeSelectorUnselectedContainerColor = elementColors.timeSelectorUnselectedContainerColor.composeOrNull ?: defaults.timeSelectorUnselectedContainerColor,
+      timeSelectorSelectedContentColor = elementColors.timeSelectorSelectedContentColor.composeOrNull ?: defaults.timeSelectorSelectedContentColor,
+      timeSelectorUnselectedContentColor = elementColors.timeSelectorUnselectedContentColor.composeOrNull ?: defaults.timeSelectorUnselectedContentColor
     )
   )
 }

package/android/src/main/java/expo/modules/ui/HorizontalFloatingToolbarView.kt

@@ -51,13 +51,26 @@ fun FunctionalComposableScope.HorizontalFloatingToolbarContent(props: Horizontal
   }
 
   val scrollBehavior = composableScope.nestedScrollConnection as? FloatingToolbarScrollBehavior
-  HorizontalFloatingToolbar(
-    expanded = true,
-    colors = colors,
-    scrollBehavior = scrollBehavior,
-    modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
-    floatingActionButton = floatingActionButton
-  ) {
-    Children(ComposableScope(), filter = { !isSlotView(it) })
+  val modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
+
+  if (fabSlotView != null) {
+    HorizontalFloatingToolbar(
+      expanded = true,
+      floatingActionButton = floatingActionButton,
+      colors = colors,
+      scrollBehavior = scrollBehavior,
+      modifier = modifier,
+    ) {
+      Children(ComposableScope(), filter = { !isSlotView(it) })
+    }
+  } else {
+    HorizontalFloatingToolbar(
+      expanded = true,
+      colors = colors,
+      scrollBehavior = scrollBehavior,
+      modifier = modifier,
+    ) {
+      Children(ComposableScope(), filter = { !isSlotView(it) })
+    }
   }
 }

package/android/src/main/java/expo/modules/ui/ModifierRegistry.kt

@@ -27,14 +27,20 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.toShape
 import androidx.compose.runtime.Composable
+import expo.modules.ui.convertibles.resolveAnimatable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.blur
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.CompositingStrategy
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.zIndex
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.records.Field
@@ -43,6 +49,8 @@ import expo.modules.kotlin.records.recordFromMap
 import expo.modules.kotlin.types.Enumerable
 import expo.modules.kotlin.views.ComposableScope
 import expo.modules.ui.convertibles.AlignmentType
+import expo.modules.ui.convertibles.CompositingStrategyType
+import expo.modules.ui.convertibles.GraphicsLayerParams
 
 typealias ModifierType = Map<String, Any?>
 typealias ModifierList = List<ModifierType>
@@ -172,6 +180,10 @@ internal data class SelectableParams(
   @Field val selected: Boolean = false
 ) : Record
 
+internal data class ClickableParams(
+  @Field val indication: Boolean = true
+) : Record
+
 // endregion
 
 /**
@@ -191,6 +203,43 @@ object ModifierRegistry {
 
   private val modifierFactories: MutableMap<String, ModifierFactory> = mutableMapOf()
 
+  @Composable
+  private fun resolveShape(shape: BuiltinShapeRecord): Shape? {
+    return when (shape.type) {
+      BuiltinShapeType.RECTANGLE -> RectangleShape
+      BuiltinShapeType.CIRCLE -> CircleShape
+      BuiltinShapeType.ROUNDED_CORNER -> {
+        val hasPerCorner = shape.topStart != null || shape.topEnd != null || shape.bottomStart != null || shape.bottomEnd != null
+        if (hasPerCorner) {
+          RoundedCornerShape(
+            topStart = (shape.topStart ?: 0f).dp,
+            topEnd = (shape.topEnd ?: 0f).dp,
+            bottomStart = (shape.bottomStart ?: 0f).dp,
+            bottomEnd = (shape.bottomEnd ?: 0f).dp
+          )
+        } else {
+          RoundedCornerShape((shape.radius ?: 0f).dp)
+        }
+      }
+      BuiltinShapeType.CUT_CORNER -> {
+        val hasPerCorner = shape.topStart != null || shape.topEnd != null || shape.bottomStart != null || shape.bottomEnd != null
+        if (hasPerCorner) {
+          CutCornerShape(
+            topStart = (shape.topStart ?: 0f).dp,
+            topEnd = (shape.topEnd ?: 0f).dp,
+            bottomStart = (shape.bottomStart ?: 0f).dp,
+            bottomEnd = (shape.bottomEnd ?: 0f).dp
+          )
+        } else {
+          CutCornerShape((shape.radius ?: 0f).dp)
+        }
+      }
+      BuiltinShapeType.MATERIAL -> {
+        shape.name?.toRoundedPolygon()?.toShape()
+      }
+    }
+  }
+
   init {
     registerBuiltInModifiers()
   }
@@ -342,6 +391,48 @@ object ModifierRegistry {
       Modifier.rotate(params.degrees)
     }
 
+    register("graphicsLayer") { map, _, _, _ ->
+      val rotationX = resolveAnimatable(map, "rotationX", 0f)
+      val rotationY = resolveAnimatable(map, "rotationY", 0f)
+      val rotationZ = resolveAnimatable(map, "rotationZ", 0f)
+      val scaleX = resolveAnimatable(map, "scaleX", 1f)
+      val scaleY = resolveAnimatable(map, "scaleY", 1f)
+      val alphaVal = resolveAnimatable(map, "alpha", 1f)
+      val translationX = resolveAnimatable(map, "translationX", 0f)
+      val translationY = resolveAnimatable(map, "translationY", 0f)
+      val shadowElevation = resolveAnimatable(map, "shadowElevation", 0f)
+
+      // Non-animatable params parsed via Record
+      val params = recordFromMap<GraphicsLayerParams>(map)
+      val composeShape = params.shape?.let { resolveShape(it) } ?: RectangleShape
+      val compositingStrategy = when (params.compositingStrategy) {
+        CompositingStrategyType.OFFSCREEN -> CompositingStrategy.Offscreen
+        CompositingStrategyType.MODULATE -> CompositingStrategy.ModulateAlpha
+        else -> CompositingStrategy.Auto
+      }
+
+      val density = LocalDensity.current.density
+
+      Modifier.graphicsLayer {
+        this.rotationX = rotationX
+        this.rotationY = rotationY
+        this.rotationZ = rotationZ
+        this.scaleX = scaleX
+        this.scaleY = scaleY
+        this.alpha = alphaVal
+        this.translationX = translationX * density
+        this.translationY = translationY * density
+        this.cameraDistance = params.cameraDistance * density
+        this.shadowElevation = shadowElevation * density
+        this.transformOrigin = TransformOrigin(params.transformOriginX, params.transformOriginY)
+        this.clip = params.clip
+        this.shape = composeShape
+        this.compositingStrategy = compositingStrategy
+        params.ambientShadowColor?.let { this.ambientShadowColor = it.compose }
+        params.spotShadowColor?.let { this.spotShadowColor = it.compose }
+      }
+    }
+
     register("zIndex") { map, _, _, _ ->
       val params = recordFromMap<ZIndexParams>(map)
       Modifier.zIndex(params.index)
@@ -393,48 +484,23 @@ object ModifierRegistry {
     register("clip") { map, _, _, _ ->
       val params = recordFromMap<ClipParams>(map)
       params.shape?.let { shape ->
-        val composeShape = when (shape.type) {
-          BuiltinShapeType.RECTANGLE -> RectangleShape
-          BuiltinShapeType.CIRCLE -> CircleShape
-          BuiltinShapeType.ROUNDED_CORNER -> {
-            val hasPerCorner = shape.topStart != null || shape.topEnd != null || shape.bottomStart != null || shape.bottomEnd != null
-            if (hasPerCorner) {
-              RoundedCornerShape(
-                topStart = (shape.topStart ?: 0f).dp,
-                topEnd = (shape.topEnd ?: 0f).dp,
-                bottomStart = (shape.bottomStart ?: 0f).dp,
-                bottomEnd = (shape.bottomEnd ?: 0f).dp
-              )
-            } else {
-              RoundedCornerShape((shape.radius ?: 0f).dp)
-            }
-          }
-          BuiltinShapeType.CUT_CORNER -> {
-            val hasPerCorner = shape.topStart != null || shape.topEnd != null || shape.bottomStart != null || shape.bottomEnd != null
-            if (hasPerCorner) {
-              CutCornerShape(
-                topStart = (shape.topStart ?: 0f).dp,
-                topEnd = (shape.topEnd ?: 0f).dp,
-                bottomStart = (shape.bottomStart ?: 0f).dp,
-                bottomEnd = (shape.bottomEnd ?: 0f).dp
-              )
-            } else {
-              CutCornerShape((shape.radius ?: 0f).dp)
-            }
-          }
-          BuiltinShapeType.MATERIAL -> {
-            shape.name?.toRoundedPolygon()?.toShape()
-          }
-        }
-        composeShape?.let {
-          Modifier.clip(it)
-        }
+        resolveShape(shape)?.let { Modifier.clip(it) }
       } ?: Modifier
     }
 
-    register("clickable") { _, _, _, eventDispatcher ->
-      Modifier.clickable {
-        eventDispatcher("clickable", emptyMap())
+    register("clickable") { map, _, _, eventDispatcher ->
+      val params = recordFromMap<ClickableParams>(map)
+      if (params.indication) {
+        Modifier.clickable {
+          eventDispatcher("clickable", emptyMap())
+        }
+      } else {
+        Modifier.clickable(
+          interactionSource = null,
+          indication = null
+        ) {
+          eventDispatcher("clickable", emptyMap())
+        }
       }
     }