pytech-ui 1.0.30 → 1.0.31

package/android/src/main/java/expo/modules/pytechui/SearchBar.kt

@@ -1,213 +1,213 @@
-@file:OptIn(ExperimentalMaterial3Api::class)
-
-package expo.modules.pytechui
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.relocation.BringIntoViewRequester
-import androidx.compose.foundation.relocation.bringIntoViewRequester
-import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowBackIosNew
-import androidx.compose.material.icons.rounded.Clear
-import androidx.compose.material.icons.rounded.Search
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.snapshotFlow
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.unit.dp
-import expo.modules.kotlin.views.ComposeProps
-import expo.modules.kotlin.views.FunctionalComposableScope
-import expo.modules.ui.ModifierList
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-import expo.modules.pytechui.theme.tokens.SearchBarTokens
-import expo.modules.pytechui.theme.ExtendedTheme
-
-import java.io.Serializable
-import expo.modules.kotlin.records.Field
-import expo.modules.kotlin.records.Record
-
-
-
-data class SearchBarDismissEvent(
-	@Field val dismissed: Boolean = true,
-) : Record, Serializable
-
-data class SearchBarChangeTextEvent(
-	@Field val text: String = "",
-) : Record, Serializable
-
-
-/**
- * Campo de búsqueda con look de chip M3 (sin expandir a pantalla completa).
- */
-data class SearchBarProps(
-	val placeholder: String? = null,
-	val autoFocus: Boolean = false,
-	/** Si es true, muestra ← clicable; si es false, muestra lupa decorativa. */
-	val showBackButton: Boolean = true,
-	val modifiers: ModifierList = emptyList(),
-) : ComposeProps
-
-@Composable
-internal fun FunctionalComposableScope.SearchBarViewContent(
-	props: SearchBarProps,
-	onDismiss: () -> Unit = {},
-	onChangeText: (String) -> Unit = {},
-) {
-	val textFieldState = rememberTextFieldState()
-	val focusRequester = remember { FocusRequester() }
-	val bringIntoViewRequester = remember { BringIntoViewRequester() }
-	val scope = rememberCoroutineScope()
-	val focusManager = LocalFocusManager.current
-	var isFocused by remember { mutableStateOf(false) }
-
-	val dismiss = {
-		focusManager.clearFocus()
-		onChangeText("")
-		onDismiss()
-	}
-
-	if (props.autoFocus) {
-		LaunchedEffect(Unit) {
-			delay(150)
-			runCatching { focusRequester.requestFocus() }
-		}
-	}
-
-	BackHandler(enabled = props.showBackButton && isFocused) {
-		dismiss()
-	}
-
-	LaunchedEffect(textFieldState) {
-		try {
-			snapshotFlow { textFieldState.text.toString() }.collect { text ->
-				onChangeText(text)
-			}
-		} finally {
-			onChangeText("")
-		}
-	}
-
-	val labelColor = ExtendedTheme.colorScheme.label
-	val placeholderColor = ExtendedTheme.colorScheme.placeholderText
-	val fieldTextStyle = LocalTextStyle.current
-
-	Surface(
-		modifier = Modifier
-			.fillMaxWidth()
-			.height(SearchBarTokens.ContainerHeight),
-		shape = SearchBarDefaults.inputFieldShape,
-		color = ExtendedTheme.colorScheme.secondarySystemGroupedBackground,
-
-	) {
-		SearchBarDefaults.InputField(
-			state = textFieldState,
-			onSearch = { focusManager.clearFocus() },
-			expanded = false,
-			onExpandedChange = { /* nunca expandir */ },
-			textStyle = fieldTextStyle,
-			placeholder = {
-				val text = props.placeholder
-				if (!text.isNullOrBlank()) {
-					Text(
-						text = text,
-						style = fieldTextStyle,
-						color = placeholderColor,
-					)
-				}
-			},
-			leadingIcon = {
-				if (props.showBackButton) {
-					IconButton(
-						onClick = dismiss,
-					) {
-						Icon(
-							imageVector = Icons.Rounded.ArrowBackIosNew,
-							contentDescription = "Volver",
-							tint = labelColor,
-							modifier = Modifier.size(20.dp),
-						)
-					}
-				} else {
-					Icon(
-						imageVector = Icons.Rounded.Search,
-						contentDescription = "Buscar",
-						tint = labelColor,
-						modifier = Modifier.size(24.dp),
-					)
-				}
-			},
-			trailingIcon = {
-				if (textFieldState.text.isNotEmpty()) {
-					IconButton(
-						onClick = {
-							textFieldState.edit {
-								replace(0, length, "")
-							}
-						}
-					) {
-						Icon(
-							imageVector = Icons.Rounded.Clear,
-							contentDescription = "Borrar",
-							tint = labelColor,
-							modifier = Modifier.size(24.dp),
-						)
-					}
-				}
-			},
-			modifier = Modifier
-				.fillMaxWidth()
-				.focusRequester(focusRequester)
-				.bringIntoViewRequester(bringIntoViewRequester)
-				.onFocusChanged { focusState ->
-					isFocused = focusState.isFocused
-					if (focusState.isFocused) {
-						scope.launch {
-							delay(100)
-							bringIntoViewRequester.bringIntoView()
-						}
-					}
-				},
-			shape = SearchBarDefaults.inputFieldShape,
-			colors = SearchBarDefaults.inputFieldColors(
-				focusedTextColor = labelColor,
-				unfocusedTextColor = labelColor,
-				focusedPlaceholderColor = placeholderColor,
-				unfocusedPlaceholderColor = placeholderColor,
-				focusedLeadingIconColor = labelColor,
-				unfocusedLeadingIconColor = labelColor,
-				focusedTrailingIconColor = labelColor,
-				unfocusedTrailingIconColor = labelColor,
-				cursorColor = ExtendedTheme.colorScheme.systemBlue,
-				focusedContainerColor = Color.Transparent,
-				unfocusedContainerColor = Color.Transparent,
-				disabledContainerColor = Color.Transparent,
-			),
-		)
-	}
-}
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package expo.modules.pytechui
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ArrowBackIosNew
+import androidx.compose.material.icons.rounded.Clear
+import androidx.compose.material.icons.rounded.Search
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.unit.dp
+import expo.modules.kotlin.views.ComposeProps
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.ui.ModifierList
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+import expo.modules.pytechui.theme.tokens.SearchBarTokens
+import expo.modules.pytechui.theme.ExtendedTheme
+
+import java.io.Serializable
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+
+
+
+data class SearchBarDismissEvent(
+	@Field val dismissed: Boolean = true,
+) : Record, Serializable
+
+data class SearchBarChangeTextEvent(
+	@Field val text: String = "",
+) : Record, Serializable
+
+
+/**
+ * Campo de búsqueda con look de chip M3 (sin expandir a pantalla completa).
+ */
+data class SearchBarProps(
+	val placeholder: String? = null,
+	val autoFocus: Boolean = false,
+	/** Si es true, muestra ← clicable; si es false, muestra lupa decorativa. */
+	val showBackButton: Boolean = true,
+	val modifiers: ModifierList = emptyList(),
+) : ComposeProps
+
+@Composable
+internal fun FunctionalComposableScope.SearchBarViewContent(
+	props: SearchBarProps,
+	onDismiss: () -> Unit = {},
+	onChangeText: (String) -> Unit = {},
+) {
+	val textFieldState = rememberTextFieldState()
+	val focusRequester = remember { FocusRequester() }
+	val bringIntoViewRequester = remember { BringIntoViewRequester() }
+	val scope = rememberCoroutineScope()
+	val focusManager = LocalFocusManager.current
+	var isFocused by remember { mutableStateOf(false) }
+
+	val dismiss = {
+		focusManager.clearFocus()
+		onChangeText("")
+		onDismiss()
+	}
+
+	if (props.autoFocus) {
+		LaunchedEffect(Unit) {
+			delay(150)
+			runCatching { focusRequester.requestFocus() }
+		}
+	}
+
+	BackHandler(enabled = props.showBackButton && isFocused) {
+		dismiss()
+	}
+
+	LaunchedEffect(textFieldState) {
+		try {
+			snapshotFlow { textFieldState.text.toString() }.collect { text ->
+				onChangeText(text)
+			}
+		} finally {
+			onChangeText("")
+		}
+	}
+
+	val labelColor = ExtendedTheme.colorScheme.label
+	val placeholderColor = ExtendedTheme.colorScheme.placeholderText
+	val fieldTextStyle = LocalTextStyle.current
+
+	Surface(
+		modifier = Modifier
+			.fillMaxWidth()
+			.height(SearchBarTokens.ContainerHeight),
+		shape = SearchBarDefaults.inputFieldShape,
+		color = ExtendedTheme.colorScheme.secondarySystemGroupedBackground,
+
+	) {
+		SearchBarDefaults.InputField(
+			state = textFieldState,
+			onSearch = { focusManager.clearFocus() },
+			expanded = false,
+			onExpandedChange = { /* nunca expandir */ },
+			textStyle = fieldTextStyle,
+			placeholder = {
+				val text = props.placeholder
+				if (!text.isNullOrBlank()) {
+					Text(
+						text = text,
+						style = fieldTextStyle,
+						color = placeholderColor,
+					)
+				}
+			},
+			leadingIcon = {
+				if (props.showBackButton) {
+					IconButton(
+						onClick = dismiss,
+					) {
+						Icon(
+							imageVector = Icons.Rounded.ArrowBackIosNew,
+							contentDescription = "Volver",
+							tint = labelColor,
+							modifier = Modifier.size(20.dp),
+						)
+					}
+				} else {
+					Icon(
+						imageVector = Icons.Rounded.Search,
+						contentDescription = "Buscar",
+						tint = labelColor,
+						modifier = Modifier.size(24.dp),
+					)
+				}
+			},
+			trailingIcon = {
+				if (textFieldState.text.isNotEmpty()) {
+					IconButton(
+						onClick = {
+							textFieldState.edit {
+								replace(0, length, "")
+							}
+						}
+					) {
+						Icon(
+							imageVector = Icons.Rounded.Clear,
+							contentDescription = "Borrar",
+							tint = labelColor,
+							modifier = Modifier.size(24.dp),
+						)
+					}
+				}
+			},
+			modifier = Modifier
+				.fillMaxWidth()
+				.focusRequester(focusRequester)
+				.bringIntoViewRequester(bringIntoViewRequester)
+				.onFocusChanged { focusState ->
+					isFocused = focusState.isFocused
+					if (focusState.isFocused) {
+						scope.launch {
+							delay(100)
+							bringIntoViewRequester.bringIntoView()
+						}
+					}
+				},
+			shape = SearchBarDefaults.inputFieldShape,
+			colors = SearchBarDefaults.inputFieldColors(
+				focusedTextColor = labelColor,
+				unfocusedTextColor = labelColor,
+				focusedPlaceholderColor = placeholderColor,
+				unfocusedPlaceholderColor = placeholderColor,
+				focusedLeadingIconColor = labelColor,
+				unfocusedLeadingIconColor = labelColor,
+				focusedTrailingIconColor = labelColor,
+				unfocusedTrailingIconColor = labelColor,
+				cursorColor = ExtendedTheme.colorScheme.systemBlue,
+				focusedContainerColor = Color.Transparent,
+				unfocusedContainerColor = Color.Transparent,
+				disabledContainerColor = Color.Transparent,
+			),
+		)
+	}
+}

package/android/src/main/java/expo/modules/pytechui/Section/SectionHost.kt

@@ -1,81 +1,81 @@
-package expo.modules.pytechui.section
-
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.mutableIntStateOf
-import expo.modules.kotlin.views.ExpoComposeView
-import expo.modules.pytechui.ListItem.ListItemProps
-
-internal val SectionHostStateTag = Any()
-internal const val LIST_ITEM_VIEW_NAME = "ListItemView"
-
-data class SectionItemPosition(
-  val isFirst: Boolean,
-  val isLast: Boolean,
-)
-
-internal class SectionHostState {
-  val generation = mutableIntStateOf(0)
-  private val positions = mutableMapOf<ExpoComposeView<*>, SectionItemPosition>()
-
-  fun update(listItems: List<ExpoComposeView<*>>) {
-    positions.clear()
-    listItems.forEachIndexed { index, view ->
-      positions[view] = SectionItemPosition(
-        isFirst = index == 0,
-        isLast = index == listItems.lastIndex,
-      )
-    }
-    generation.intValue++
-  }
-
-  fun positionFor(view: ExpoComposeView<*>): SectionItemPosition? = positions[view]
-}
-
-internal fun isListItemView(view: ExpoComposeView<*>): Boolean {
-  if (view.props is ListItemProps) return true
-  return view.javaClass.name.contains(LIST_ITEM_VIEW_NAME, ignoreCase = true)
-}
-
-internal fun ViewGroup.collectListItemViewsDeep(): List<ExpoComposeView<*>> {
-  val result = mutableListOf<ExpoComposeView<*>>()
-  collectListItemViewsDeepInto(result)
-  return result
-}
-
-private fun ViewGroup.collectListItemViewsDeepInto(out: MutableList<ExpoComposeView<*>>) {
-  for (i in 0 until childCount) {
-    when (val child = getChildAt(i)) {
-      is ExpoComposeView<*> -> {
-        if (isListItemView(child)) {
-          out.add(child)
-        }
-        if (child is ViewGroup) {
-          child.collectListItemViewsDeepInto(out)
-        }
-      }
-      is ViewGroup -> child.collectListItemViewsDeepInto(out)
-    }
-  }
-}
-
-internal fun View.findSectionHostState(): SectionHostState? {
-  var current: View? = this
-  while (current != null) {
-    (current.tag as? SectionHostState)?.let { return it }
-    current = current.parent as? View
-  }
-  return null
-}
-
-internal fun ExpoComposeView<*>.sectionItemPosition(props: ListItemProps): SectionItemPosition? {
-  props.isFirst?.let { isFirst ->
-    props.isLast?.let { isLast ->
-      return SectionItemPosition(isFirst = isFirst, isLast = isLast)
-    }
-  }
-  val hostState = (this as View).findSectionHostState() ?: return null
-  @Suppress("UNUSED_VARIABLE")
-  val generation = hostState.generation.intValue
-  return hostState.positionFor(this)
-}
+package expo.modules.pytechui.section
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.mutableIntStateOf
+import expo.modules.kotlin.views.ExpoComposeView
+import expo.modules.pytechui.ListItem.ListItemProps
+
+internal val SectionHostStateTag = Any()
+internal const val LIST_ITEM_VIEW_NAME = "ListItemView"
+
+data class SectionItemPosition(
+  val isFirst: Boolean,
+  val isLast: Boolean,
+)
+
+internal class SectionHostState {
+  val generation = mutableIntStateOf(0)
+  private val positions = mutableMapOf<ExpoComposeView<*>, SectionItemPosition>()
+
+  fun update(listItems: List<ExpoComposeView<*>>) {
+    positions.clear()
+    listItems.forEachIndexed { index, view ->
+      positions[view] = SectionItemPosition(
+        isFirst = index == 0,
+        isLast = index == listItems.lastIndex,
+      )
+    }
+    generation.intValue++
+  }
+
+  fun positionFor(view: ExpoComposeView<*>): SectionItemPosition? = positions[view]
+}
+
+internal fun isListItemView(view: ExpoComposeView<*>): Boolean {
+  if (view.props is ListItemProps) return true
+  return view.javaClass.name.contains(LIST_ITEM_VIEW_NAME, ignoreCase = true)
+}
+
+internal fun ViewGroup.collectListItemViewsDeep(): List<ExpoComposeView<*>> {
+  val result = mutableListOf<ExpoComposeView<*>>()
+  collectListItemViewsDeepInto(result)
+  return result
+}
+
+private fun ViewGroup.collectListItemViewsDeepInto(out: MutableList<ExpoComposeView<*>>) {
+  for (i in 0 until childCount) {
+    when (val child = getChildAt(i)) {
+      is ExpoComposeView<*> -> {
+        if (isListItemView(child)) {
+          out.add(child)
+        }
+        if (child is ViewGroup) {
+          child.collectListItemViewsDeepInto(out)
+        }
+      }
+      is ViewGroup -> child.collectListItemViewsDeepInto(out)
+    }
+  }
+}
+
+internal fun View.findSectionHostState(): SectionHostState? {
+  var current: View? = this
+  while (current != null) {
+    (current.tag as? SectionHostState)?.let { return it }
+    current = current.parent as? View
+  }
+  return null
+}
+
+internal fun ExpoComposeView<*>.sectionItemPosition(props: ListItemProps): SectionItemPosition? {
+  props.isFirst?.let { isFirst ->
+    props.isLast?.let { isLast ->
+      return SectionItemPosition(isFirst = isFirst, isLast = isLast)
+    }
+  }
+  val hostState = (this as View).findSectionHostState() ?: return null
+  @Suppress("UNUSED_VARIABLE")
+  val generation = hostState.generation.intValue
+  return hostState.positionFor(this)
+}