javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): corrected background color between Label and nested spans (#10701)

Browse Source
This commit is contained in:
Dimitris-Rafail Katsampas
2025-02-20 21:37:50 +02:00
committed by GitHub
parent 70e7248c97
commit 04aa2bacbc
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/ui/text-base/index.android.ts
View File

@@ -624,8 +624,10 @@ function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span,
ssb.setSpan(new android.text.style.ForegroundColorSpan(color.android), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
if (spanStyle.backgroundColor) {
ssb.setSpan(new android.text.style.BackgroundColorSpan(spanStyle.backgroundColor.android), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
// Use span or formatted string color
const backgroundColor = spanStyle.backgroundColor || span.parent.backgroundColor;
if (backgroundColor) {
ssb.setSpan(new android.text.style.BackgroundColorSpan(backgroundColor.android), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
const textDecoration: CoreTypes.TextDecorationType = getClosestPropertyValue(textDecorationProperty, span);

3
packages/core/ui/text-base/index.ios.ts
View File

@@ -394,8 +394,9 @@ export class TextBase extends TextBaseCommon {
const fontScale = adjustMinMaxFontScale(span.style.fontScaleInternal, span);
const font = new Font(span.style.fontFamily, span.style.fontSize, span.style.fontStyle, span.style.fontWeight, fontScale, span.style.fontVariationSettings);
const iosFont = font.getUIFont(this.nativeTextViewProtected.font);
// Use span or formatted string color
const backgroundColor = span.style.backgroundColor || span.parent.backgroundColor;
const backgroundColor = <Color>(span.style.backgroundColor || (<FormattedString>span.parent).backgroundColor || (<TextBase>span.parent.parent).backgroundColor);
return {
text,
iosFont,

16
packages/core/ui/text-base/span.d.ts vendored
View File

@@ -2,6 +2,7 @@
import { ViewBase } from '../core/view-base';
import { FontStyleType, FontVariationSettingsType, FontWeightType } from '../styling/font';
import { CoreTypes } from '../../core-types';
import { FormattedString } from './formatted-string';
/**
* A class used to create a single part of formatted string with a common text properties.
@@ -9,6 +10,15 @@ import { CoreTypes } from '../../core-types';
* @nsView Span
*/
export class Span extends ViewBase {
/**
* String value used when hooking to linkTap event.
*
* @nsEvent linkTap
*/
public static linkTapEvent: string;
declare parent: FormattedString;
/**
* Gets or sets the font family of the span.
*
@@ -92,12 +102,6 @@ export class Span extends ViewBase {
* @nsProperty
*/
public text: string;
/**
* String value used when hooking to linkTap event.
*
* @nsEvent linkTap
*/
public static linkTapEvent: string;
/**
* Gets if the span is tappable or not.

6
packages/core/ui/text-base/span.ts
View File

@@ -5,12 +5,16 @@ import { FontStyleType, FontVariationSettingsType, FontWeightType } from '../sty
import { CoreTypes } from '../../core-types';
import { EventData } from '../../data/observable';
import { isNullOrUndefined, isString } from '../../utils/types';
import type { FormattedString } from './formatted-string';
export class Span extends ViewBase implements SpanDefinition {
static linkTapEvent = 'linkTap';
public static linkTapEvent = 'linkTap';
private _text: string;
private _tappable = false;
declare parent: FormattedString;
get fontFamily(): string {
return this.style.fontFamily;
}