Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

TextLayoutUtils: Use named arguments (#42593)

Browse Source 
Summary:
`TextLayoutUtils`: Use named arguments to ensure same-type arguments (like `start`/`end`) are not confused

This is a minor readability follow-up to https://github.com/facebook/react-native/pull/39630.

## Changelog:

<!-- Help reviewers and the release process by writing your own changelog entry.

Pick one each for the category and type tags:

[ANDROID|GENERAL|IOS|INTERNAL] [BREAKING|ADDED|CHANGED|DEPRECATED|REMOVED|FIXED|SECURITY] - Message

For more details, see:
https://reactnative.dev/contributing/changelogs-in-pull-requests
-->

[INTERNAL] [CHANGED] - Increase the `TextLayoutUtils` readability slightly

Pull Request resolved: https://github.com/facebook/react-native/pull/42593

Reviewed By: NickGerleman

Differential Revision: D53028402

Pulled By: mdvacca

fbshipit-source-id: 39e99ba70b93eecfc51bda19d30a5b1977cfe406
This commit is contained in:
Jakub Trzebiatowski
2024-01-25 02:49:30 -08:00
committed by Facebook GitHub Bot
parent 78967b33c0
commit 87bcaa3fa1
1 changed files with 110 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt
+110 -25
View File
@@ -14,6 +14,7 @@ import android.view.View
import com.facebook.react.common.ReactConstants
import com.facebook.react.uimanager.PixelUtil
import com.facebook.react.uimanager.ReactAccessibilityDelegate
import com.facebook.react.views.text.fragments.TextFragment
import com.facebook.react.views.text.fragments.TextFragmentList
/** Utility methods for building [Spannable]s */
@@ -27,26 +28,53 @@ internal object TextLayoutUtils {
sb: SpannableStringBuilder,
ops: MutableList<SetSpanOperation>,
) {
for (i in 0 until textFragmentList.count) {
val fragment = textFragmentList.getFragment(i)
val start = sb.length
// ReactRawText
val textAttributes = fragment.textAttributeProps
addApplicableFragmentSpans(
context = context,
fragment = fragment,
sb = sb,
ops = ops,
)
}
}
addText(sb, fragment.string, textAttributes)
private fun addApplicableFragmentSpans(
context: Context,
fragment: TextFragment,
sb: SpannableStringBuilder,
ops: MutableList<SetSpanOperation>,
) {
val start = sb.length
val end = sb.length
val reactTag = if (fragment.hasReactTag()) fragment.reactTag else View.NO_ID
if (fragment.hasIsAttachment() && fragment.isAttachment) {
val width = PixelUtil.toPixelFromSP(fragment.width)
val height = PixelUtil.toPixelFromSP(fragment.height)
// ReactRawText
val textAttributes = fragment.textAttributeProps
addInlineViewPlaceholderSpan(ops, sb, reactTag, width, height)
} else if (end >= start) {
addApplicableTextAttributeSpans(ops, textAttributes, reactTag, context, start, end)
}
addText(sb, fragment.string, textAttributes)
val end = sb.length
val reactTag = if (fragment.hasReactTag()) fragment.reactTag else View.NO_ID
if (fragment.hasIsAttachment() && fragment.isAttachment) {
val width = PixelUtil.toPixelFromSP(fragment.width)
val height = PixelUtil.toPixelFromSP(fragment.height)
addInlineViewPlaceholderSpan(
ops = ops,
sb = sb,
reactTag = reactTag,
width = width,
height = height,
)
} else if (end >= start) {
addApplicableTextAttributeSpans(
ops = ops,
textAttributeProvider = textAttributes,
reactTag = reactTag,
context = context,
start = start,
end = end,
)
}
}
@@ -83,27 +111,84 @@ internal object TextLayoutUtils {
start: Int,
end: Int
) {
addColorSpanIfApplicable(ops, textAttributeProvider, start, end)
addColorSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addBackgroundColorSpanIfApplicable(ops, textAttributeProvider, start, end)
addBackgroundColorSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addLinkSpanIfApplicable(ops, textAttributeProvider, reactTag, start, end)
addLinkSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
reactTag,
start = start,
end = end,
)
addLetterSpacingSpanIfApplicable(ops, textAttributeProvider, start, end)
addLetterSpacingSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addFontSizeSpanIfApplicable(ops, textAttributeProvider, start, end)
addFontSizeSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addCustomStyleSpanIfApplicable(ops, textAttributeProvider, context, start, end)
addCustomStyleSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
context,
start = start,
end = end,
)
addUnderlineSpanIfApplicable(ops, textAttributeProvider, start, end)
addUnderlineSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addStrikethroughSpanIfApplicable(ops, textAttributeProvider, start, end)
addStrikethroughSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addShadowStyleSpanIfApplicable(ops, textAttributeProvider, start, end)
addShadowStyleSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addLineHeightSpanIfApplicable(ops, textAttributeProvider, start, end)
addLineHeightSpanIfApplicable(
ops = ops,
textAttributeProvider = textAttributeProvider,
start = start,
end = end,
)
addReactTagSpan(ops, start, end, reactTag)
addReactTagSpan(
ops = ops,
start = start,
end = end,
reactTag = reactTag,
)
}
@JvmStatic