From 7314256a646c9bf7bb46656fe697911a380159c6 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Fri, 17 Nov 2023 22:17:05 +0800
Subject: [PATCH] refactor: adjust the priority of Modifier in TextField

---
 .../com/highcapable/flexiui/component/TextField.kt    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
index 3f9c8b6..c1edfa3 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
@@ -239,13 +239,14 @@ private fun TextFieldDecorationBox(
         else -> style.borderInactive
     }.copy(animatedBorderWidth, SolidColor(animatedBorderColor))
     Box(
-        Modifier.textField(
+        modifier = Modifier.textField(
             colors = colors,
             style = style,
             border = border,
             enabled = enabled,
-            interactionSource = interactionSource
-        ).then(modifier)
+            interactionSource = interactionSource,
+            modifier = modifier
+        )
     ) {
         Row {
             header()
@@ -267,13 +268,15 @@ private fun Modifier.textField(
     style: TextFieldStyle,
     border: BorderStroke,
     enabled: Boolean,
-    interactionSource: MutableInteractionSource
+    interactionSource: MutableInteractionSource,
+    modifier: Modifier
 ) = status(enabled)
     .focusable(enabled, interactionSource)
     .hoverable(interactionSource, enabled)
     .clip(style.shape)
     .background(colors.backgroundColor, style.shape)
     .borderOrNot(border, style.shape)
+    .then(modifier)
     .padding(
         top = style.topPadding.orElse() ?: style.padding,
         start = style.startPadding.orElse() ?: style.padding,