Update wysiwyg to v2.20.0 (#1921)
* Update wysiwyg to v2.20.0 * Workaround line height for composer, remove unused test code. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
parent
c739ebc0ee
commit
8953b9cdae
3 changed files with 4 additions and 6 deletions
|
|
@ -37,7 +37,7 @@ serialization_json = "1.6.1"
|
||||||
showkase = "1.0.2"
|
showkase = "1.0.2"
|
||||||
appyx = "1.4.0"
|
appyx = "1.4.0"
|
||||||
sqldelight = "2.0.0"
|
sqldelight = "2.0.0"
|
||||||
wysiwyg = "2.19.0"
|
wysiwyg = "2.20.0"
|
||||||
|
|
||||||
# DI
|
# DI
|
||||||
dagger = "2.48.1"
|
dagger = "2.48.1"
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ package io.element.android.libraries.textcomposer
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
import io.element.android.libraries.designsystem.theme.bgSubtleTertiary
|
import io.element.android.libraries.designsystem.theme.bgSubtleTertiary
|
||||||
import io.element.android.compound.theme.ElementTheme
|
import io.element.android.compound.theme.ElementTheme
|
||||||
import io.element.android.wysiwyg.compose.RichTextEditorDefaults
|
import io.element.android.wysiwyg.compose.RichTextEditorDefaults
|
||||||
|
|
@ -39,7 +40,8 @@ internal object ElementRichTextEditorStyle {
|
||||||
m3colors.primary
|
m3colors.primary
|
||||||
} else {
|
} else {
|
||||||
m3colors.secondary
|
m3colors.secondary
|
||||||
}
|
},
|
||||||
|
lineHeight = 16.25.sp,
|
||||||
),
|
),
|
||||||
cursor = RichTextEditorDefaults.cursorStyle(
|
cursor = RichTextEditorDefaults.cursorStyle(
|
||||||
color = colors.iconAccentTertiary,
|
color = colors.iconAccentTertiary,
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@ import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
|
|
@ -85,7 +84,6 @@ import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
|
||||||
import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
|
import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
|
||||||
import io.element.android.libraries.textcomposer.model.VoiceMessageState
|
import io.element.android.libraries.textcomposer.model.VoiceMessageState
|
||||||
import io.element.android.libraries.ui.strings.CommonStrings
|
import io.element.android.libraries.ui.strings.CommonStrings
|
||||||
import io.element.android.wysiwyg.compose.PillStyle
|
|
||||||
import io.element.android.wysiwyg.compose.RichTextEditor
|
import io.element.android.wysiwyg.compose.RichTextEditor
|
||||||
import io.element.android.wysiwyg.compose.RichTextEditorState
|
import io.element.android.wysiwyg.compose.RichTextEditorState
|
||||||
import io.element.android.wysiwyg.display.TextDisplay
|
import io.element.android.wysiwyg.display.TextDisplay
|
||||||
|
|
@ -444,8 +442,6 @@ private fun TextInput(
|
||||||
.fillMaxWidth(),
|
.fillMaxWidth(),
|
||||||
style = ElementRichTextEditorStyle.create(
|
style = ElementRichTextEditorStyle.create(
|
||||||
hasFocus = state.hasFocus
|
hasFocus = state.hasFocus
|
||||||
).copy(
|
|
||||||
pill = PillStyle(Color.Red)
|
|
||||||
),
|
),
|
||||||
resolveMentionDisplay = resolveMentionDisplay,
|
resolveMentionDisplay = resolveMentionDisplay,
|
||||||
resolveRoomMentionDisplay = resolveRoomMentionDisplay,
|
resolveRoomMentionDisplay = resolveRoomMentionDisplay,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue