pytech-ui 1.0.30 → 1.0.32

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

@@ -1,65 +1,65 @@
-package expo.modules.pytechui.section
-
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import expo.modules.kotlin.views.ComposeProps
-import expo.modules.kotlin.views.FunctionalComposableScope
-import expo.modules.pytechui.Children
-import expo.modules.pytechui.getHost
-import expo.modules.ui.ModifierList
-
-data class SectionHostProps(
-  val modifiers: ModifierList = emptyList(),
-) : ComposeProps
-
-@Composable
-internal fun FunctionalComposableScope.SectionHostViewContent(
-  @Suppress("UNUSED_PARAMETER") props: SectionHostProps,
-) {
-  val host = getHost() ?: return
-  val state = remember(host) {
-    SectionHostState().also { host.tag = it }
-  }
-  var childGeneration by remember(host) { mutableIntStateOf(host.childCount) }
-
-  DisposableEffect(host) {
-    fun syncPositions() {
-      val count = host.childCount
-      if (childGeneration != count) {
-        childGeneration = count
-      }
-      state.update(host.collectListItemViewsDeep())
-    }
-
-    syncPositions()
-
-    val hierarchyListener = object : ViewGroup.OnHierarchyChangeListener {
-      override fun onChildViewAdded(parent: View?, child: View?) = syncPositions()
-      override fun onChildViewRemoved(parent: View?, child: View?) = syncPositions()
-    }
-
-    val layoutListener = View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-      syncPositions()
-    }
-
-    host.setOnHierarchyChangeListener(hierarchyListener)
-    host.addOnLayoutChangeListener(layoutListener)
-
-    onDispose {
-      host.setOnHierarchyChangeListener(null)
-      host.removeOnLayoutChangeListener(layoutListener)
-      host.tag = null
-    }
-  }
-
-  @Suppress("UNUSED_VARIABLE")
-  val generation = state.generation.intValue
-
-  Children()
-}
+package expo.modules.pytechui.section
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import expo.modules.kotlin.views.ComposeProps
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.pytechui.Children
+import expo.modules.pytechui.getHost
+import expo.modules.ui.ModifierList
+
+data class SectionHostProps(
+  val modifiers: ModifierList = emptyList(),
+) : ComposeProps
+
+@Composable
+internal fun FunctionalComposableScope.SectionHostViewContent(
+  @Suppress("UNUSED_PARAMETER") props: SectionHostProps,
+) {
+  val host = getHost() ?: return
+  val state = remember(host) {
+    SectionHostState().also { host.tag = it }
+  }
+  var childGeneration by remember(host) { mutableIntStateOf(host.childCount) }
+
+  DisposableEffect(host) {
+    fun syncPositions() {
+      val count = host.childCount
+      if (childGeneration != count) {
+        childGeneration = count
+      }
+      state.update(host.collectListItemViewsDeep())
+    }
+
+    syncPositions()
+
+    val hierarchyListener = object : ViewGroup.OnHierarchyChangeListener {
+      override fun onChildViewAdded(parent: View?, child: View?) = syncPositions()
+      override fun onChildViewRemoved(parent: View?, child: View?) = syncPositions()
+    }
+
+    val layoutListener = View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+      syncPositions()
+    }
+
+    host.setOnHierarchyChangeListener(hierarchyListener)
+    host.addOnLayoutChangeListener(layoutListener)
+
+    onDispose {
+      host.setOnHierarchyChangeListener(null)
+      host.removeOnLayoutChangeListener(layoutListener)
+      host.tag = null
+    }
+  }
+
+  @Suppress("UNUSED_VARIABLE")
+  val generation = state.generation.intValue
+
+  Children()
+}

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

@@ -1,251 +1,251 @@
-package expo.modules.pytechui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusDirection
-import androidx.compose.ui.focus.FocusManager
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import expo.modules.kotlin.records.Field
-import expo.modules.kotlin.records.Record
-import expo.modules.kotlin.types.OptimizedRecord
-import expo.modules.kotlin.views.AsyncFunctionHandle
-import expo.modules.kotlin.views.ComposeProps
-import expo.modules.kotlin.views.FunctionalComposableScope
-import expo.modules.pytechui.theme.ExtendedTheme
-import expo.modules.ui.ModifierList
-import java.io.Serializable
-import androidx.compose.foundation.relocation.BringIntoViewRequester
-import androidx.compose.foundation.relocation.bringIntoViewRequester
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.focus.onFocusEvent
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-
-data class TextFieldValueChangeEvent(
-	@Field val value: String = ""
-) : Record, Serializable
-
-data class TextFieldFocusChangeEvent(
-  	@Field val value: Boolean = false
-) : Record, Serializable
-
-@OptimizedRecord
-data class TextFieldKeyboardOptionsRecord(
-  @Field val capitalization: String? = null,
-  @Field val autoCorrectEnabled: Boolean? = null,
-  @Field val keyboardType: String? = null,
-  @Field val imeAction: String? = null
-) : Record
-
-data class KeyboardActionEvent(
-	@Field val action: String,
-	@Field val value: String
-) : Record
-
-/**
- * [value] es solo el valor inicial; el texto editado vive en estado interno.
- * [headlineText] opcional: se muestra a la izquierda del campo (misma fila que el input).
- */
-data class TextFieldProps(
-	val value: String = "",
-	val placeholder: String? = null,
-	val headlineText: String? = null,
-	val enabled: Boolean = true,
-	val autoFocus: Boolean = false,
-	val lines: Int = 1,
-	val keyboardOptions: TextFieldKeyboardOptionsRecord? = null,
-	val rowModifiers: ModifierList = emptyList(),
-	val textFieldModifiers: ModifierList = emptyList()
-) : ComposeProps
-
-private fun String?.toKeyboardType(): KeyboardType = when (this) {
-	"text" -> KeyboardType.Text
-	"number" -> KeyboardType.Number
-	"email" -> KeyboardType.Email
-	"phone" -> KeyboardType.Phone
-	"decimal" -> KeyboardType.Decimal
-	"password" -> KeyboardType.Password
-	"ascii" -> KeyboardType.Ascii
-	"uri" -> KeyboardType.Uri
-	"numberPassword" -> KeyboardType.NumberPassword
-	else -> KeyboardType.Text
-}
-
-private fun String?.toCapitalization(): KeyboardCapitalization = when (this) {
-	"characters" -> KeyboardCapitalization.Characters
-	"none" -> KeyboardCapitalization.None
-	"sentences" -> KeyboardCapitalization.Sentences
-	"words" -> KeyboardCapitalization.Words
-	else -> KeyboardCapitalization.None
-}
-
-private fun String?.toImeAction(): ImeAction = when (this) {
-	"default" -> ImeAction.Default
-	"none" -> ImeAction.None
-	"go" -> ImeAction.Go
-	"search" -> ImeAction.Search
-	"send" -> ImeAction.Send
-	"previous" -> ImeAction.Previous
-	"next" -> ImeAction.Next
-	"done" -> ImeAction.Done
-	else -> ImeAction.Default
-}
-
-private fun FocusManager.performDefaultKeyboardAction(imeAction: ImeAction) {
-	when (imeAction) {
-		ImeAction.Next -> clearFocus() //moveFocus(FocusDirection.Down)
-		ImeAction.Previous -> clearFocus() //moveFocus(FocusDirection.Up)
-		ImeAction.Done, ImeAction.Go, ImeAction.Search, ImeAction.Send -> clearFocus()
-		else -> Unit
-	}
-}
-
-data class ExampleComposeViewProps(
-	@Field val title: String = "",
-	@Field val modifiers: ModifierList = emptyList()
-) : ComposeProps
-
-
-@Composable
-internal fun FunctionalComposableScope.TextFieldContent(
-	props: TextFieldProps,
-	focus: AsyncFunctionHandle<Unit>,
-	blur: AsyncFunctionHandle<Unit>,
-	onValueChange: (String) -> Unit,
-	onFocusChanged: (Boolean) -> Unit,
-	onKeyboardActionTriggered: (KeyboardActionEvent) -> Unit
-) {
-	var text by remember { mutableStateOf(props.value) }
-	val focusManager = LocalFocusManager.current
-	val focusRequester = remember { FocusRequester() }
-	val keyboardController = LocalSoftwareKeyboardController.current
-
-	focus.handle {
-		focusRequester.requestFocus()
-		keyboardController?.show()
-	}
-	blur.handle {
-		focusManager.clearFocus()
-	}
-
-	if (props.autoFocus) {
-		LaunchedEffect(Unit) {
-			delay(300)
-			runCatching {
-				focusRequester.requestFocus()
-				keyboardController?.show()
-			}
-		}
-	}
-
-	val kbOpts = props.keyboardOptions
-	val keyboardTypeKey = kbOpts?.keyboardType
-	val visualTransformation =
-		if (keyboardTypeKey == "password" || keyboardTypeKey == "numberPassword") {
-			PasswordVisualTransformation()
-		} else {
-			VisualTransformation.None
-		}
-	val keyboardOptions = KeyboardOptions.Default.copy(
-		keyboardType = keyboardTypeKey.toKeyboardType(),
-		autoCorrectEnabled = kbOpts?.autoCorrectEnabled ?: true,
-		capitalization = kbOpts?.capitalization.toCapitalization(),
-		imeAction = kbOpts?.imeAction.toImeAction()
-	)
-	val currentText = { text }
-	val keyboardActions = KeyboardActions(
-		onDone = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Done)
-			onKeyboardActionTriggered(KeyboardActionEvent("done", currentText()))
-		},
-		onGo = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Go)
-			onKeyboardActionTriggered(KeyboardActionEvent("go", currentText()))
-		},
-		onNext = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Next)
-			onKeyboardActionTriggered(KeyboardActionEvent("next", currentText()))
-		},
-		onPrevious = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Previous)
-			onKeyboardActionTriggered(KeyboardActionEvent("previous", currentText()))
-		},
-		onSearch = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Search)
-			onKeyboardActionTriggered(KeyboardActionEvent("search", currentText()))
-		},
-		onSend = {
-			focusManager.performDefaultKeyboardAction(ImeAction.Send)
-			onKeyboardActionTriggered(KeyboardActionEvent("send", currentText()))
-		},
-	)
-
-	val bringIntoViewRequester = remember { BringIntoViewRequester() }
-	val scope = rememberCoroutineScope()
-
-	BasicTextField(
-		value = text,
-		onValueChange = { newValue ->
-			text = newValue
-			onValueChange(newValue)
-		},
-		modifier = Modifier
-			.fillMaxWidth()
-			.focusRequester(focusRequester)
-			.onFocusChanged { onFocusChanged(it.isFocused) }
-			.bringIntoViewRequester(bringIntoViewRequester)
-			.onFocusChanged { focusState ->
-				onFocusChanged(focusState.isFocused)
-				if (focusState.isFocused) {
-					scope.launch {
-						kotlinx.coroutines.delay(100)
-						bringIntoViewRequester.bringIntoView()
-					}
-				}
-			},
-		enabled = props.enabled,
-		textStyle = LocalTextStyle.current,
-		singleLine = props.lines == 1,
-		maxLines = if (props.lines > 1) props.lines.coerceAtLeast(2) else Int.MAX_VALUE,
-		cursorBrush = SolidColor(ExtendedTheme.colorScheme.systemBlue),
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-		visualTransformation = visualTransformation,
-		decorationBox = { innerTextField ->
-			if (text.isEmpty() && !props.placeholder.isNullOrBlank()) {
-				Text(
-					text = props.placeholder!!,
-					color = ExtendedTheme.colorScheme.placeholderText
-				)
-			}
-			innerTextField()
-		},
-	)
-}
+package expo.modules.pytechui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import expo.modules.kotlin.types.OptimizedRecord
+import expo.modules.kotlin.views.AsyncFunctionHandle
+import expo.modules.kotlin.views.ComposeProps
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.pytechui.theme.ExtendedTheme
+import expo.modules.ui.ModifierList
+import java.io.Serializable
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.focus.onFocusEvent
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+
+data class TextFieldValueChangeEvent(
+	@Field val value: String = ""
+) : Record, Serializable
+
+data class TextFieldFocusChangeEvent(
+  	@Field val value: Boolean = false
+) : Record, Serializable
+
+@OptimizedRecord
+data class TextFieldKeyboardOptionsRecord(
+  @Field val capitalization: String? = null,
+  @Field val autoCorrectEnabled: Boolean? = null,
+  @Field val keyboardType: String? = null,
+  @Field val imeAction: String? = null
+) : Record
+
+data class KeyboardActionEvent(
+	@Field val action: String,
+	@Field val value: String
+) : Record
+
+/**
+ * [value] es solo el valor inicial; el texto editado vive en estado interno.
+ * [headlineText] opcional: se muestra a la izquierda del campo (misma fila que el input).
+ */
+data class TextFieldProps(
+	val value: String = "",
+	val placeholder: String? = null,
+	val headlineText: String? = null,
+	val enabled: Boolean = true,
+	val autoFocus: Boolean = false,
+	val lines: Int = 1,
+	val keyboardOptions: TextFieldKeyboardOptionsRecord? = null,
+	val rowModifiers: ModifierList = emptyList(),
+	val textFieldModifiers: ModifierList = emptyList()
+) : ComposeProps
+
+private fun String?.toKeyboardType(): KeyboardType = when (this) {
+	"text" -> KeyboardType.Text
+	"number" -> KeyboardType.Number
+	"email" -> KeyboardType.Email
+	"phone" -> KeyboardType.Phone
+	"decimal" -> KeyboardType.Decimal
+	"password" -> KeyboardType.Password
+	"ascii" -> KeyboardType.Ascii
+	"uri" -> KeyboardType.Uri
+	"numberPassword" -> KeyboardType.NumberPassword
+	else -> KeyboardType.Text
+}
+
+private fun String?.toCapitalization(): KeyboardCapitalization = when (this) {
+	"characters" -> KeyboardCapitalization.Characters
+	"none" -> KeyboardCapitalization.None
+	"sentences" -> KeyboardCapitalization.Sentences
+	"words" -> KeyboardCapitalization.Words
+	else -> KeyboardCapitalization.None
+}
+
+private fun String?.toImeAction(): ImeAction = when (this) {
+	"default" -> ImeAction.Default
+	"none" -> ImeAction.None
+	"go" -> ImeAction.Go
+	"search" -> ImeAction.Search
+	"send" -> ImeAction.Send
+	"previous" -> ImeAction.Previous
+	"next" -> ImeAction.Next
+	"done" -> ImeAction.Done
+	else -> ImeAction.Default
+}
+
+private fun FocusManager.performDefaultKeyboardAction(imeAction: ImeAction) {
+	when (imeAction) {
+		ImeAction.Next -> clearFocus() //moveFocus(FocusDirection.Down)
+		ImeAction.Previous -> clearFocus() //moveFocus(FocusDirection.Up)
+		ImeAction.Done, ImeAction.Go, ImeAction.Search, ImeAction.Send -> clearFocus()
+		else -> Unit
+	}
+}
+
+data class ExampleComposeViewProps(
+	@Field val title: String = "",
+	@Field val modifiers: ModifierList = emptyList()
+) : ComposeProps
+
+
+@Composable
+internal fun FunctionalComposableScope.TextFieldContent(
+	props: TextFieldProps,
+	focus: AsyncFunctionHandle<Unit>,
+	blur: AsyncFunctionHandle<Unit>,
+	onValueChange: (String) -> Unit,
+	onFocusChanged: (Boolean) -> Unit,
+	onKeyboardActionTriggered: (KeyboardActionEvent) -> Unit
+) {
+	var text by remember { mutableStateOf(props.value) }
+	val focusManager = LocalFocusManager.current
+	val focusRequester = remember { FocusRequester() }
+	val keyboardController = LocalSoftwareKeyboardController.current
+
+	focus.handle {
+		focusRequester.requestFocus()
+		keyboardController?.show()
+	}
+	blur.handle {
+		focusManager.clearFocus()
+	}
+
+	if (props.autoFocus) {
+		LaunchedEffect(Unit) {
+			delay(300)
+			runCatching {
+				focusRequester.requestFocus()
+				keyboardController?.show()
+			}
+		}
+	}
+
+	val kbOpts = props.keyboardOptions
+	val keyboardTypeKey = kbOpts?.keyboardType
+	val visualTransformation =
+		if (keyboardTypeKey == "password" || keyboardTypeKey == "numberPassword") {
+			PasswordVisualTransformation()
+		} else {
+			VisualTransformation.None
+		}
+	val keyboardOptions = KeyboardOptions.Default.copy(
+		keyboardType = keyboardTypeKey.toKeyboardType(),
+		autoCorrectEnabled = kbOpts?.autoCorrectEnabled ?: true,
+		capitalization = kbOpts?.capitalization.toCapitalization(),
+		imeAction = kbOpts?.imeAction.toImeAction()
+	)
+	val currentText = { text }
+	val keyboardActions = KeyboardActions(
+		onDone = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Done)
+			onKeyboardActionTriggered(KeyboardActionEvent("done", currentText()))
+		},
+		onGo = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Go)
+			onKeyboardActionTriggered(KeyboardActionEvent("go", currentText()))
+		},
+		onNext = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Next)
+			onKeyboardActionTriggered(KeyboardActionEvent("next", currentText()))
+		},
+		onPrevious = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Previous)
+			onKeyboardActionTriggered(KeyboardActionEvent("previous", currentText()))
+		},
+		onSearch = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Search)
+			onKeyboardActionTriggered(KeyboardActionEvent("search", currentText()))
+		},
+		onSend = {
+			focusManager.performDefaultKeyboardAction(ImeAction.Send)
+			onKeyboardActionTriggered(KeyboardActionEvent("send", currentText()))
+		},
+	)
+
+	val bringIntoViewRequester = remember { BringIntoViewRequester() }
+	val scope = rememberCoroutineScope()
+
+	BasicTextField(
+		value = text,
+		onValueChange = { newValue ->
+			text = newValue
+			onValueChange(newValue)
+		},
+		modifier = Modifier
+			.fillMaxWidth()
+			.focusRequester(focusRequester)
+			.onFocusChanged { onFocusChanged(it.isFocused) }
+			.bringIntoViewRequester(bringIntoViewRequester)
+			.onFocusChanged { focusState ->
+				onFocusChanged(focusState.isFocused)
+				if (focusState.isFocused) {
+					scope.launch {
+						kotlinx.coroutines.delay(100)
+						bringIntoViewRequester.bringIntoView()
+					}
+				}
+			},
+		enabled = props.enabled,
+		textStyle = LocalTextStyle.current,
+		singleLine = props.lines == 1,
+		maxLines = if (props.lines > 1) props.lines.coerceAtLeast(2) else Int.MAX_VALUE,
+		cursorBrush = SolidColor(ExtendedTheme.colorScheme.systemBlue),
+		keyboardOptions = keyboardOptions,
+		keyboardActions = keyboardActions,
+		visualTransformation = visualTransformation,
+		decorationBox = { innerTextField ->
+			if (text.isEmpty() && !props.placeholder.isNullOrBlank()) {
+				Text(
+					text = props.placeholder!!,
+					color = ExtendedTheme.colorScheme.placeholderText
+				)
+			}
+			innerTextField()
+		},
+	)
+}