react-native-platform-components 1.3.0 → 1.5.0

package/android/src/main/java/com/platformcomponents/PCSegmentedControlView.kt

@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.graphics.drawable.BitmapDrawable
 import android.text.TextUtils
 import android.util.TypedValue
+import android.view.ContextThemeWrapper
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.LinearLayout
@@ -37,7 +38,9 @@ class PCSegmentedControlView(context: Context) :
     val iconScale: Float,
     val iconTinted: Boolean,
     val badge: String,
-    val accessibilityLabel: String
+    val accessibilityLabel: String,
+    val testID: String = "",
+    val iconRequest: String = ""
   ) {
     val hasIcon: Boolean get() = iconType == "drawable" || iconType == "image"
 
@@ -66,6 +69,8 @@ class PCSegmentedControlView(context: Context) :
   var labelVisibility: String = "auto" // "auto" | "labeled" | "unlabeled"
   // Matches iOS, where a UISegmentedControl selection cannot be cleared by tapping.
   var selectionRequired: Boolean = true
+  // android.material: "expressive" (the Material 3 Expressive connected buttons) | "m3"
+  var expressive: Boolean = true
 
   // --- Styling (null / empty = Material theme default) ---
   var selectedSegmentColor: Int? = null
@@ -79,6 +84,10 @@ class PCSegmentedControlView(context: Context) :
   var labelFontStyle: String = ""
   var badgeBackgroundColor: Int? = null
   var badgeTextColor: Int? = null
+  var maxFontSizeMultiplier: Float = 0f
+
+  /** The `haptics` prop; the manager plays it with the user's action (see PCHaptics). */
+  var haptics: String = ""
 
   // --- Events ---
   /** index -1 with an empty value means the selection was cleared. */
@@ -140,9 +149,10 @@ class PCSegmentedControlView(context: Context) :
     rebuildUI()
   }
 
-  fun applyAndroidProps(required: Boolean) {
-    if (selectionRequired != required) {
+  fun applyAndroidProps(required: Boolean, expressiveStyle: Boolean) {
+    if (selectionRequired != required || expressive != expressiveStyle) {
       selectionRequired = required
+      expressive = expressiveStyle
       rebuildUI()
     }
   }
@@ -184,6 +194,12 @@ class PCSegmentedControlView(context: Context) :
     rebuildUI()
   }
 
+  fun applyMaxFontSizeMultiplier(value: Float) {
+    if (maxFontSizeMultiplier == value) return
+    maxFontSizeMultiplier = value
+    rebuildUI()
+  }
+
   fun applyLabelStyle(fontFamily: String, fontSize: Float, fontWeight: String, fontStyle: String) {
     if (labelFontFamily == fontFamily && labelFontSize == fontSize &&
       labelFontWeight == fontWeight && labelFontStyle == fontStyle
@@ -224,7 +240,11 @@ class PCSegmentedControlView(context: Context) :
     val generation = rebuildGeneration
 
     // Material widgets need a Material theme; fall back to Material 3 defaults instead of crashing.
-    val themedContext = PCThemeSupport.materialContext(context, "SegmentedControl")
+    val materialContext = PCThemeSupport.materialContext(context, "SegmentedControl")
+    // Expressive: the connected button group styles (2dp gaps, small inner
+    // corners, the selected segment a pill) in place of the classic segmented buttons.
+    val themedContext =
+      if (expressive) ContextThemeWrapper(materialContext, R.style.PCExpressiveOverlay) else materialContext
     val group = MaterialButtonToggleGroup(themedContext).apply {
       layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
       isSingleSelection = true
@@ -248,6 +268,8 @@ class PCSegmentedControlView(context: Context) :
         isAllCaps = false  // Preserve original text casing
         // Screen readers (and Detox) always get the label, even when hidden
         contentDescription = segment.spokenLabel
+        // Detox matches the view tag
+        tag = segment.testID.ifEmpty { null }
         isEnabled = !segment.disabled && interactivity == "enabled"
 
         // Enable text truncation with ellipsis when space is limited
@@ -281,6 +303,9 @@ class PCSegmentedControlView(context: Context) :
 
     group.addOnButtonCheckedListener { toggleGroup, checkedId, isChecked ->
       if (suppressCallbacks) return@addOnButtonCheckedListener
+      // Material toggles immediately. Restore the latest controlled prop once
+      // that update finishes, including when the parent rejects the selection.
+      post { updateSelection() }
 
       if (!isChecked) {
         // In single-selection mode switching from A to B reports A as unchecked
@@ -327,7 +352,7 @@ class PCSegmentedControlView(context: Context) :
         if (isResourceName) {
           button.icon = ResourceDrawableIdHelper.instance.getResourceDrawable(context, uri)
         } else {
-          PCImageLoader.load(context, uri, segment.iconScale) { bitmap ->
+          PCImageLoader.load(context, uri, segment.iconScale, segment.iconRequest) { bitmap ->
             if (bitmap == null || generation != rebuildGeneration) return@load
             button.icon = BitmapDrawable(resources, bitmap)
             requestLayout()
@@ -416,22 +441,15 @@ class PCSegmentedControlView(context: Context) :
         context.assets
       )
     }
+    button.setTag(R.id.pc_capped_text_size, null)
+    PCThemeSupport.capTextSize(button, maxFontSizeMultiplier)
   }
 
   private fun updateSelection() {
-    suppressCallbacks = true
     val group = toggleGroup ?: return
-
-    if (selectedValue.isEmpty()) {
-      group.clearChecked()
-    } else {
-      for ((id, segment) in buttonIdToSegment) {
-        if (segment.value == selectedValue) {
-          group.check(id)
-          break
-        }
-      }
-    }
+    suppressCallbacks = true
+    val selectedId = buttonIdToSegment.entries.firstOrNull { it.value.value == selectedValue }?.key
+    if (selectedId == null) group.clearChecked() else group.check(selectedId)
     suppressCallbacks = false
   }
 

package/android/src/main/java/com/platformcomponents/PCSegmentedControlViewManager.kt

@@ -48,6 +48,7 @@ class PCSegmentedControlViewManager :
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)
 
     view.onSelect = { index, value ->
+      PCHaptics.perform(view, view.haptics)
       dispatcher?.dispatchEvent(SelectEvent(view.id, index, value))
     }
   }
@@ -59,7 +60,7 @@ class PCSegmentedControlViewManager :
     if (hasKey(key) && !isNull(key)) getDouble(key) else fallback
 
   // segments: array of {label, value, disabled, iconType, iconName, iconUri,
-  //                     iconScale, iconTinted, accessibilityLabel}
+  //                     iconScale, iconTinted, accessibilityLabel, testID}
   override fun setSegments(view: PCSegmentedControlView, value: ReadableArray?) {
     val out = ArrayList<PCSegmentedControlView.Segment>()
     if (value != null) {
@@ -74,10 +75,12 @@ class PCSegmentedControlViewManager :
             iconType = m.stringOr("iconType", ""),
             iconName = m.stringOr("iconName", ""),
             iconUri = m.stringOr("iconUri", ""),
+            iconRequest = m.stringOr("iconRequest", ""),
             iconScale = if (scale > 0) scale.toFloat() else 1f,
             iconTinted = m.stringOr("iconTinted", "true") != "false",
             badge = m.stringOr("badge", ""),
-            accessibilityLabel = m.stringOr("accessibilityLabel", "")
+            accessibilityLabel = m.stringOr("accessibilityLabel", ""),
+            testID = m.stringOr("testID", "")
           )
         )
       }
@@ -118,6 +121,10 @@ class PCSegmentedControlViewManager :
     view.applyBadgeColors(view.badgeBackgroundColor, value)
   }
 
+  override fun setMaxFontSizeMultiplier(view: PCSegmentedControlView, value: Double) {
+    view.applyMaxFontSizeMultiplier(value.toFloat())
+  }
+
   // labelStyle: {fontFamily, fontSize, fontWeight, fontStyle}; empty / 0 = default
   override fun setLabelStyle(view: PCSegmentedControlView, value: ReadableMap?) {
     view.applyLabelStyle(
@@ -137,6 +144,11 @@ class PCSegmentedControlViewManager :
     view.applyInteractivity(value)
   }
 
+  // "" (none added) | "none" | "selection" | "light" | "medium" | "heavy" | "success" | "warning" | "error"
+  override fun setHaptics(view: PCSegmentedControlView, value: String?) {
+    view.haptics = PCHaptics.configure(view, value)
+  }
+
   override fun setAndroid(view: PCSegmentedControlView, value: ReadableMap?) {
     // Spec sentinel: "true" | "false"; missing means the default (required).
     val selectionRequired = if (
@@ -146,7 +158,12 @@ class PCSegmentedControlViewManager :
     } else {
       true
     }
-    view.applyAndroidProps(selectionRequired)
+    // Spec sentinel: "expressive" (default) | "m3"
+    val expressive = !(
+      value != null && value.hasKey("material") && !value.isNull("material") &&
+        value.getString("material") == "m3"
+      )
+    view.applyAndroidProps(selectionRequired, expressive)
   }
 
   override fun setIos(view: PCSegmentedControlView, value: ReadableMap?) {