Skip to content

Refactor TextFragmentList into AttributedString#42701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jakub-trzebiatowski wants to merge 1 commit into from
Closed

Refactor TextFragmentList into AttributedString#42701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.views.text.fragments.BridgeTextFragmentList;
import com.facebook.react.views.text.attributedstring.BridgeAttributedString;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
Expand DownExpand Up@@ -113,15 +113,15 @@ public static void deleteCachedSpannableForTag(int reactTag) {
sTagToSpannableCache.remove(reactTag);
}

private static void buildSpannableFromFragments(
private static void buildSpannableFromAttributedString(
Context context,
ReadableArray fragments,
ReadableMap attributedString,
SpannableStringBuilder sb,
List<SetSpanOperation> ops) {
if (ReactFeatureFlags.enableSpannableBuildingUnification) {
buildSpannableFromFragmentsUnified(context, fragments, sb, ops);
buildSpannableFromAttributedStringUnified(context, attributedString, sb, ops);
} else {
buildSpannableFromFragmentsDuplicated(context, fragments, sb, ops);
buildSpannableFromFragmentsDuplicated(context, attributedString.getArray("fragments"), sb, ops);
}
}

Expand DownExpand Up@@ -223,15 +223,15 @@ private static void buildSpannableFromFragmentsDuplicated(
}
}

private static void buildSpannableFromFragmentsUnified(
private static void buildSpannableFromAttributedStringUnified(
Context context,
ReadableArray fragments,
ReadableMap attributedString,
SpannableStringBuilder sb,
List<SetSpanOperation> ops) {

final BridgeTextFragmentList textFragmentList = new BridgeTextFragmentList(fragments);
final BridgeAttributedString bridgeAttributedString = new BridgeAttributedString(attributedString);

TextLayoutUtils.buildSpannableFromTextFragmentList(context, textFragmentList, sb, ops);
TextLayoutUtils.buildSpannableFromAttributedString(context, bridgeAttributedString, sb, ops);
}

// public because both ReactTextViewManager and ReactTextInputManager need to use this
Expand All@@ -256,7 +256,7 @@ private static Spannable createSpannableFromAttributedString(
// a new spannable will be wiped out
List<SetSpanOperation> ops = new ArrayList<>();

buildSpannableFromFragments(context, attributedString.getArray("fragments"), sb, ops);
buildSpannableFromAttributedString(context, attributedString, sb, ops);

// TODO T31905686: add support for inline Images
// While setting the Spans on the final text, we also check whether any of them are images.
Expand Down
20 changes: 10 additions & 10 deletions .../ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,9 @@
import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.views.text.attributedstring.MapBufferAttributedString;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.fragments.MapBufferTextFragmentList;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
Expand DownExpand Up@@ -138,12 +138,12 @@ public static boolean isRTL(MapBuffer attributedString) {
== LayoutDirection.RTL;
}

private static void buildSpannableFromFragments(
Context context, MapBuffer fragments, SpannableStringBuilder sb, List<SetSpanOperation> ops) {
private static void buildSpannableFromAttributedString(
Context context, MapBuffer attributedString, SpannableStringBuilder sb, List<SetSpanOperation> ops) {
if (ReactFeatureFlags.enableSpannableBuildingUnification) {
buildSpannableFromFragmentsUnified(context, fragments, sb, ops);
buildSpannableFromFragmentsDuplicated(context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), sb, ops);
} else {
buildSpannableFromFragmentsDuplicated(context, fragments, sb, ops);
buildSpannableFromAttributedStringUnified(context, attributedString, sb, ops);
}
}

Expand DownExpand Up@@ -241,12 +241,12 @@ private static void buildSpannableFromFragmentsDuplicated(
}
}

private static void buildSpannableFromFragmentsUnified(
Context context, MapBuffer fragments, SpannableStringBuilder sb, List<SetSpanOperation> ops) {
private static void buildSpannableFromAttributedStringUnified(
Context context, MapBuffer attributedString, SpannableStringBuilder sb, List<SetSpanOperation> ops) {

final MapBufferTextFragmentList textFragmentList = new MapBufferTextFragmentList(fragments);
final MapBufferAttributedString mapBufferAttributedString = new MapBufferAttributedString(attributedString);

TextLayoutUtils.buildSpannableFromTextFragmentList(context, textFragmentList, sb, ops);
TextLayoutUtils.buildSpannableFromAttributedString(context, mapBufferAttributedString, sb, ops);
}

// public because both ReactTextViewManager and ReactTextInputManager need to use this
Expand DownExpand Up@@ -292,7 +292,7 @@ private static Spannable createSpannableFromAttributedString(
// a new spannable will be wiped out
List<SetSpanOperation> ops = new ArrayList<>();

buildSpannableFromFragments(context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), sb, ops);
buildSpannableFromAttributedString(context, attributedString, sb, ops);

// TODO T31905686: add support for inline Images
// While setting the Spans on the final text, we also check whether any of them are images.
Expand Down
15 changes: 8 additions & 7 deletions .../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,8 +15,8 @@ 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
import com.facebook.react.views.text.attributedstring.AttributedString
import com.facebook.react.views.text.attributedstring.AttributedStringFragment
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan
import com.facebook.react.views.text.internal.span.CustomStyleSpan
Expand All@@ -36,14 +36,14 @@ internal object TextLayoutUtils {
private const val INLINE_VIEW_PLACEHOLDER = "0"

@JvmStatic
fun buildSpannableFromTextFragmentList(
fun buildSpannableFromAttributedString(
context: Context,
textFragmentList: TextFragmentList,
attributedString: AttributedString,
sb: SpannableStringBuilder,
ops: MutableList<SetSpanOperation>,
) {
for (i in 0 until textFragmentList.count) {
val fragment = textFragmentList.getFragment(i)
for (i in 0 until attributedString.fragmentCount) {
val fragment = attributedString.getFragment(i)

addApplicableFragmentSpans(
context = context,
Expand All@@ -54,9 +54,10 @@ internal object TextLayoutUtils {
}
}

@JvmStatic
private fun addApplicableFragmentSpans(
context: Context,
fragment: TextFragment,
fragment: AttributedStringFragment,
sb: SpannableStringBuilder,
ops: MutableList<SetSpanOperation>,
) {
Expand Down
15 changes: 15 additions & 0 deletions ...tAndroid/src/main/java/com/facebook/react/views/text/attributedstring/AttributedString.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.attributedstring

/** Interface for an attributed string */

@NickGerlemanNickGerlemanJan 29, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment, and same for AttributedStringFragment are not meaningful to someone who wants to learn what this interface represents and is used for.

internal interface AttributedString {
fun getFragment(index: Int): AttributedStringFragment

val fragmentCount: Int
}
6 changes: 3 additions & 3 deletions ...eact/views/text/fragments/TextFragment.kt → ...ributedstring/AttributedStringFragment.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.fragments
package com.facebook.react.views.text.attributedstring

import com.facebook.react.views.text.TextAttributeProps

/** Interface for a text fragment */
internal interface TextFragment {
/** Interface for an attributed string fragment */
internal interface AttributedStringFragment {
val textAttributeProps: TextAttributeProps

val string: String?
Expand Down
22 changes: 22 additions & 0 deletions ...id/src/main/java/com/facebook/react/views/text/attributedstring/BridgeAttributedString.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.attributedstring

import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.ReadableMap

/** An [AttributedString] backed by a [ReadableMap] */
internal class BridgeAttributedString(private val attributedString: ReadableMap) : AttributedString {
override fun getFragment(index: Int): AttributedStringFragment = BridgeAttributedStringFragment(fragments.getMap(index))

override val fragmentCount: Int
get() = fragments.size()

private val fragments: ReadableArray
get() = attributedString.getArray("fragments")!!
}
6 changes: 3 additions & 3 deletions ...iews/text/fragments/BridgeTextFragment.kt → ...dstring/BridgeAttributedStringFragment.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.fragments
package com.facebook.react.views.text.attributedstring

import com.facebook.react.bridge.ReadableMap
import com.facebook.react.uimanager.ReactStylesDiffMap
import com.facebook.react.uimanager.ViewProps
import com.facebook.react.views.text.TextAttributeProps

/** A [TextFragment] implementation backed by a a [ReadableMap] */
internal class BridgeTextFragment(private val fragment: ReadableMap) : TextFragment {
/** Am [AttributedStringFragment] implementation backed by a a [ReadableMap] */
internal class BridgeAttributedStringFragment(private val fragment: ReadableMap) : AttributedStringFragment {
override val textAttributeProps: TextAttributeProps
get() =
TextAttributeProps.fromReadableMap(ReactStylesDiffMap(fragment.getMap("textAttributes")))
Expand Down
23 changes: 23 additions & 0 deletions ...src/main/java/com/facebook/react/views/text/attributedstring/MapBufferAttributedString.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.attributedstring

import com.facebook.react.common.mapbuffer.MapBuffer
import com.facebook.react.views.text.TextLayoutManagerMapBuffer.AS_KEY_FRAGMENTS

/** An [AttributedString] backed by a [MapBuffer] */
internal class MapBufferAttributedString(private val attributedString: MapBuffer) : AttributedString {
override fun getFragment(index: Int): AttributedStringFragment =
MapBufferAttributedStringFragment(fragments.getMapBuffer(index))

override val fragmentCount: Int
get() = fragments.count

private val fragments: MapBuffer
get() = attributedString.getMapBuffer(AS_KEY_FRAGMENTS.toInt())
}
6 changes: 3 additions & 3 deletions ...s/text/fragments/MapBufferTextFragment.kt → ...ring/MapBufferAttributedStringFragment.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text.fragments
package com.facebook.react.views.text.attributedstring

import com.facebook.react.common.mapbuffer.MapBuffer
import com.facebook.react.views.text.TextAttributeProps
Expand All@@ -16,8 +16,8 @@ import com.facebook.react.views.text.TextLayoutManagerMapBuffer.FR_KEY_STRING
import com.facebook.react.views.text.TextLayoutManagerMapBuffer.FR_KEY_TEXT_ATTRIBUTES
import com.facebook.react.views.text.TextLayoutManagerMapBuffer.FR_KEY_WIDTH

/** A [TextFragment] implementation backed by a [MapBuffer] */
internal class MapBufferTextFragment(private val fragment: MapBuffer) : TextFragment {
/** An [AttributedStringFragment] implementation backed by a [MapBuffer] */
internal class MapBufferAttributedStringFragment(private val fragment: MapBuffer) : AttributedStringFragment {
override val textAttributeProps: TextAttributeProps
get() = TextAttributeProps.fromMapBuffer(fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES.toInt()))

Expand Down
18 changes: 0 additions & 18 deletions ...ctAndroid/src/main/java/com/facebook/react/views/text/fragments/BridgeTextFragmentList.kt
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions ...ndroid/src/main/java/com/facebook/react/views/text/fragments/MapBufferTextFragmentList.kt
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...ve/ReactAndroid/src/main/java/com/facebook/react/views/text/fragments/TextFragmentList.kt
View file
Open in desktop

This file was deleted.