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: background parsing color #9559 (#9560)

Browse Source
This commit is contained in:
farfromrefuge
2021-09-22 06:41:34 +02:00
committed by GitHub
parent 889f6d73cf
commit 3e21748af4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/css/parser.ts
View File

@@ -23,7 +23,7 @@ export interface LinearGradient {
colors: ColorStop[]; colors: ColorStop[];
} }
export interface Background { export interface Background {
readonly color?: number; readonly color?: number | Color;
readonly image?: URL | LinearGradient; readonly image?: URL | LinearGradient;
readonly repeat?: BackgroundRepeat; readonly repeat?: BackgroundRepeat;
readonly position?: BackgroundPosition; readonly position?: BackgroundPosition;

5
packages/core/ui/styling/style-properties.ts
View File

@@ -838,7 +838,10 @@ backgroundPositionProperty.register(Style);
function convertToBackgrounds(this: void, value: string): [CssProperty<any, any>, any][] { function convertToBackgrounds(this: void, value: string): [CssProperty<any, any>, any][] {
if (typeof value === 'string') { if (typeof value === 'string') {
const backgrounds = parser.parseBackground(value).value; const backgrounds = parser.parseBackground(value).value;
const backgroundColor = backgrounds.color ? new Color(backgrounds.color) : unsetValue; let backgroundColor = unsetValue;
if (backgrounds.color) {
backgroundColor = backgrounds.color instanceof Color ? backgrounds.color : new Color(backgrounds.color);
}
let backgroundImage: string | LinearGradient; let backgroundImage: string | LinearGradient;
if (typeof backgrounds.image === 'object' && backgrounds.image) { if (typeof backgrounds.image === 'object' && backgrounds.image) {