[PM-25423] Force LTR direction for password and sensitive fields #6090
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.bitwarden.ui.platform.components.util | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.text.AnnotatedString | ||
| import androidx.compose.ui.text.input.OffsetMapping | ||
| import androidx.compose.ui.text.input.TransformedText | ||
| import androidx.compose.ui.text.input.VisualTransformation | ||
|
|
||
| /** | ||
| * A [VisualTransformation] that chains multiple other [VisualTransformation]s. | ||
| * | ||
| * This is useful for applying multiple transformations to a text field. The transformations | ||
| * are applied in the order they are provided. | ||
| */ | ||
| private class CompoundVisualTransformation( | ||
| vararg val transformations: VisualTransformation, | ||
| ) : VisualTransformation { | ||
| override fun filter(text: AnnotatedString): TransformedText { | ||
| return transformations.fold( | ||
| TransformedText( | ||
| text, | ||
| OffsetMapping.Identity, | ||
| ), | ||
| ) { acc, transformation -> | ||
| val result = transformation.filter(acc.text) | ||
|
|
||
| val composedMapping = object : OffsetMapping { | ||
| override fun originalToTransformed(offset: Int): Int { | ||
| val originalTransformed = acc.offsetMapping.originalToTransformed(offset) | ||
| return result.offsetMapping.originalToTransformed(originalTransformed) | ||
| } | ||
|
|
||
| override fun transformedToOriginal(offset: Int): Int { | ||
| val resultOriginal = result.offsetMapping.transformedToOriginal(offset) | ||
| return acc.offsetMapping.transformedToOriginal(resultOriginal) | ||
| } | ||
| } | ||
| TransformedText(result.text, composedMapping) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Remembers a [CompoundVisualTransformation] for the given [transformations]. | ||
| * | ||
| * This is an optimization to avoid creating a new [CompoundVisualTransformation] on every | ||
| * recomposition. | ||
| */ | ||
| @Composable | ||
| fun compoundVisualTransformation( | ||
| vararg transformations: VisualTransformation, | ||
| ): VisualTransformation = | ||
| remember(*transformations) { | ||
| CompoundVisualTransformation(*transformations) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package com.bitwarden.ui.platform.components.util | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.text.AnnotatedString | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.input.OffsetMapping | ||
| import androidx.compose.ui.text.input.TransformedText | ||
| import androidx.compose.ui.text.input.VisualTransformation | ||
|
|
||
| // Unicode characters for forcing LTR direction | ||
| private const val LRO = "\u202A" | ||
| private const val PDF = "\u202C" | ||
|
|
||
| /** | ||
| * A [VisualTransformation] that forces the output to have an LTR text direction. | ||
| * | ||
| * This is useful for password fields where the input should always be LTR, even when the rest of | ||
| * the UI is RTL. | ||
| */ | ||
| private object ForceLtrVisualTransformation : VisualTransformation { | ||
| override fun filter(text: AnnotatedString): TransformedText { | ||
| val forcedLtrText = buildAnnotatedString { | ||
| append(LRO) | ||
| append(text) | ||
| append(PDF) | ||
| } | ||
|
|
||
| val offsetMapping = object : OffsetMapping { | ||
| override fun originalToTransformed(offset: Int): Int = offset + 1 | ||
|
|
||
| override fun transformedToOriginal(offset: Int): Int = | ||
| (offset - 1).coerceIn(0, text.length) | ||
| } | ||
|
|
||
| return TransformedText(forcedLtrText, offsetMapping) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Remembers a [ForceLtrVisualTransformation] for the given [transformations]. | ||
| * | ||
| * This is an optimization to avoid creating a new [ForceLtrVisualTransformation] on every | ||
| * recomposition. | ||
| */ | ||
| @Composable | ||
| fun forceLtrVisualTransformation(): VisualTransformation = remember { | ||
|
Collaborator
There was a problem hiding this comment. Does the Remember do anything here?
Contributor
Author
There was a problem hiding this comment. Only to expose ForceLtrTransformation since it's |
||
| ForceLtrVisualTransformation | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.