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

Merge branch 'color_changes_2' of github.com:Akylas/NativeScript

Browse Source 
# Conflicts:
#	packages/core/color/color-common.ts
#	packages/core/color/index.d.ts
This commit is contained in:
Martin Guillon
2021-05-22 13:00:19 +02:00
parent 390b8e4e31 2c59024507
commit 3d4b46c403
2 changed files with 61 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
packages/core/color/color-common.ts
View File

@ -26,12 +26,9 @@ export class Color implements definition.Color {
const argb = knownColors.getKnownColor(arg); const argb = knownColors.getKnownColor(arg);
this._name = arg; this._name = arg;
this._argb = argb; this._argb = argb;
} else if (arg[0].charAt(0) === SHARP && (arg.length === 4 || arg.length === 7 || arg.length === 9)) { } else if (arg[0] === SHARP) {
// we dont use the regexp as it is quite slow. Instead we expect it to be a valid hex format // The parameter is a "#AARRGGBB" formatted string
// strange that it would not be. And if it is not a thrown error seems best this._argb = this._argbFromString(arg);
// The parameter is a "#RRGGBBAA" formatted string
const hex = this._normalizeHex(arg);
this._argb = this._argbFromString(hex);
} else { } else {
throw new Error('Invalid color: ' + arg); throw new Error('Invalid color: ' + arg);
} }
@ -93,7 +90,7 @@ export class Color implements definition.Color {
public _argbFromString(hex: string): number { public _argbFromString(hex: string): number {
// always called as SHARP as first char // always called as SHARP as first char
hex = hex.substr(1); hex = hex.substr(1);
const length = hex.length; const length = hex.length;
// first we normalize // first we normalize
if (length === 3) { if (length === 3) {
@ -163,16 +160,6 @@ export class Color implements definition.Color {
return hex; return hex;
} }
private _normalizeHex(hexStr: string): string {
// we expect this to already has a # as first char as it is supposed to be tested before
if (hexStr.length === 4) {
// Duplicate each char after the #, so "#123" becomes "#112233"
hexStr = hexStr.charAt(0) + hexStr.charAt(1) + hexStr.charAt(1) + hexStr.charAt(2) + hexStr.charAt(2) + hexStr.charAt(3) + hexStr.charAt(3);
}
return hexStr;
}
public toString(): string { public toString(): string {
return this.hex; return this.hex;
@ -212,9 +199,9 @@ export class Color implements definition.Color {
*/ */
public getLuminance() { public getLuminance() {
let R, G, B; let R, G, B;
const RsRGB = this.r / 255; const RsRGB = this.r / 255;
const GsRGB = this.g / 255; const GsRGB = this.g/255;
const BsRGB = this.b / 255; const BsRGB = this.b/255;
if (RsRGB <= 0.03928) { if (RsRGB <= 0.03928) {
R = RsRGB / 12.92; R = RsRGB / 12.92;
@ -248,7 +235,7 @@ export class Color implements definition.Color {
* *
*/ */
public toHsl() { public toHsl() {
const hsl = rgbToHsl(this.r, this.g, this.b); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this.a }; return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this.a };
} }
@ -257,10 +244,8 @@ export class Color implements definition.Color {
* *
*/ */
public toHslString() { public toHslString() {
const hsl = rgbToHsl(this.r, this.g, this.b); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
const h = Math.round(hsl.h * 360), const h = Math.round(hsl.h * 360), s = Math.round(hsl.s * 100), l = Math.round(hsl.l * 100);
s = Math.round(hsl.s * 100),
l = Math.round(hsl.l * 100);
const a = this.a; const a = this.a;
return a == 255 ? 'hsl(' + h + ', ' + s + '%, ' + l + '%)' : 'hsla(' + h + ', ' + s + '%, ' + l + '%, ' + (a / 255).toFixed(2) + ')'; return a == 255 ? 'hsl(' + h + ', ' + s + '%, ' + l + '%)' : 'hsla(' + h + ', ' + s + '%, ' + l + '%, ' + (a / 255).toFixed(2) + ')';
} }
@ -270,7 +255,7 @@ export class Color implements definition.Color {
* *
*/ */
public toHsv() { public toHsv() {
const hsv = rgbToHsv(this.r, this.g, this.b); const hsv = rgbToHsv(this.r / 255, this.g / 255, this.b / 255);
return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this.a }; return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this.a };
} }
@ -279,10 +264,8 @@ export class Color implements definition.Color {
* *
*/ */
public toHsvString() { public toHsvString() {
const hsv = rgbToHsv(this.r, this.g, this.b); const hsv = rgbToHsv(this.r / 255, this.g / 255, this.b / 255);
const h = Math.round(hsv.h * 360), const h = Math.round(hsv.h * 360), s = Math.round(hsv.s * 100), v = Math.round(hsv.v * 100);
s = Math.round(hsv.s * 100),
v = Math.round(hsv.v * 100);
const a = this.a; const a = this.a;
return a == 255 ? 'hsv(' + h + ', ' + s + '%, ' + v + '%)' : 'hsva(' + h + ', ' + s + '%, ' + v + '%, ' + (a / 255).toFixed(2) + ')'; return a == 255 ? 'hsv(' + h + ', ' + s + '%, ' + v + '%)' : 'hsva(' + h + ', ' + s + '%, ' + v + '%, ' + (a / 255).toFixed(2) + ')';
} }
@ -302,8 +285,8 @@ export class Color implements definition.Color {
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
*/ */
public desaturate(amount: number) { public desaturate(amount: number) {
amount = amount === 0 ? 0 : amount || 10; amount = (amount === 0) ? 0 : (amount || 10);
const hsl = this.toHsl(); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
hsl.s -= amount / 100; hsl.s -= amount / 100;
hsl.s = Math.min(1, Math.max(0, hsl.s)); hsl.s = Math.min(1, Math.max(0, hsl.s));
return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l); return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
@ -315,8 +298,8 @@ export class Color implements definition.Color {
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
*/ */
public saturate(amount: number) { public saturate(amount: number) {
amount = amount === 0 ? 0 : amount || 10; amount = (amount === 0) ? 0 : (amount || 10);
const hsl = this.toHsl(); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
hsl.s += amount / 100; hsl.s += amount / 100;
hsl.s = Math.min(1, Math.max(0, hsl.s)); hsl.s = Math.min(1, Math.max(0, hsl.s));
return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l); return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
@ -335,9 +318,9 @@ export class Color implements definition.Color {
* *
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
*/ */
public lighten(amount: number) { public lighten (amount: number) {
amount = amount === 0 ? 0 : amount || 10; amount = (amount === 0) ? 0 : (amount || 10);
const hsl = this.toHsl(); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
hsl.l += amount / 100; hsl.l += amount / 100;
hsl.l = Math.min(1, Math.max(0, hsl.l)); hsl.l = Math.min(1, Math.max(0, hsl.l));
return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l); return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
@ -350,9 +333,9 @@ export class Color implements definition.Color {
*/ */
public brighten(amount: number) { public brighten(amount: number) {
amount = amount === 0 ? 0 : amount || 10; amount = amount === 0 ? 0 : amount || 10;
const r = Math.max(0, Math.min(255, this.r - Math.round(255 * -(amount / 100)))); const r = Math.max(0, Math.min(255, this.r - Math.round(255 * - (amount / 100))));
const g = Math.max(0, Math.min(255, this.g - Math.round(255 * -(amount / 100)))); const g = Math.max(0, Math.min(255, this.g - Math.round(255 * - (amount / 100))));
const b = Math.max(0, Math.min(255, this.b - Math.round(255 * -(amount / 100)))); const b = Math.max(0, Math.min(255, this.b - Math.round(255 * - (amount / 100))));
return new Color(this.a, r, g, b); return new Color(this.a, r, g, b);
} }
@ -361,9 +344,9 @@ export class Color implements definition.Color {
* *
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
*/ */
public darken(amount: number) { public darken (amount: number) {
amount = amount === 0 ? 0 : amount || 10; amount = (amount === 0) ? 0 : (amount || 10);
const hsl = this.toHsl(); const hsl = rgbToHsl(this.r / 255, this.g / 255, this.b / 255);
hsl.l -= amount / 100; hsl.l -= amount / 100;
hsl.l = Math.min(1, Math.max(0, hsl.l)); hsl.l = Math.min(1, Math.max(0, hsl.l));
return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l); return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
@ -391,10 +374,7 @@ export class Color implements definition.Color {
return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l); return Color.fromHSL(this.a, hsl.h, hsl.s, hsl.l);
} }
static mix(color1: Color, color2: Color, amount) { static mix(color1: Color, color2: Color, amount = 50) {
amount = (amount === 0) ? 0 : (amount || 50);
const p = amount / 100; const p = amount / 100;
const rgba = { const rgba = {
@ -405,7 +385,7 @@ export class Color implements definition.Color {
}; };
return new Color(rgba.a, rgba.r, rgba.g, rgba.b); return new Color(rgba.a, rgba.r, rgba.g, rgba.b);
} };
} }
function isRgbOrRgba(value: string): boolean { function isRgbOrRgba(value: string): boolean {
@ -476,12 +456,12 @@ function rgbToHsl(r, g, b) {
let h, s; let h, s;
const l = (max + min) / 2; const l = (max + min) / 2;
if (max == min) { if(max == min) {
h = s = 0; // achromatic h = s = 0; // achromatic
} else { } else {
const d = max - min; const d = max - min;
s = l > 0.5 ? d / (2 - max - min) : d / (max + min); s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
switch (max) { switch(max) {
case r: case r:
h = (g - b) / d + (g < b ? 6 : 0); h = (g - b) / d + (g < b ? 6 : 0);
break; break;
@ -500,11 +480,11 @@ function rgbToHsl(r, g, b) {
} }
function hue2rgb(p, q, t) { function hue2rgb(p, q, t) {
if (t < 0) t += 1; if(t < 0) t += 1;
if (t > 1) t -= 1; if(t > 1) t -= 1;
if (t < 1 / 6) return p + (q - p) * 6 * t; if(t < 1/6) return p + (q - p) * 6 * t;
if (t < 1 / 2) return q; if(t < 1/2) return q;
if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6; if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
return p; return p;
} }
@ -514,14 +494,14 @@ function hue2rgb(p, q, t) {
// *Returns:* { r, g, b } in the set [0, 255] // *Returns:* { r, g, b } in the set [0, 255]
function hslToRgb(h, s, l) { function hslToRgb(h, s, l) {
let r, g, b; let r, g, b;
if (s === 0) { if(s === 0) {
r = g = b = l; // achromatic r = g = b = l; // achromatic
} else { } else {
const q = l < 0.5 ? l * (1 + s) : l + s - l * s; const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
const p = 2 * l - q; const p = 2 * l - q;
r = hue2rgb(p, q, h + 1 / 3); r = hue2rgb(p, q, h + 1/3);
g = hue2rgb(p, q, h); g = hue2rgb(p, q, h);
b = hue2rgb(p, q, h - 1 / 3); b = hue2rgb(p, q, h - 1/3);
} }
return { r: r * 255, g: g * 255, b: b * 255 }; return { r: r * 255, g: g * 255, b: b * 255 };
@ -540,10 +520,10 @@ function rgbToHsv(r, g, b) {
const d = max - min; const d = max - min;
const s = max === 0 ? 0 : d / max; const s = max === 0 ? 0 : d / max;
if (max == min) { if(max == min) {
h = 0; // achromatic h = 0; // achromatic
} else { } else {
switch (max) { switch(max) {
case r: case r:
h = (g - b) / d + (g < b ? 6 : 0); h = (g - b) / d + (g < b ? 6 : 0);
break; break;

4
packages/core/color/index.d.ts vendored
View File

@ -162,7 +162,7 @@ export class Color {
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
* @returns olor : Color * @returns olor : Color
*/ */
public lighten(amount: number): Color; public lighten (amount: number): Color;
/** /**
* Brighten the color a given amount, from 0 to 100. * Brighten the color a given amount, from 0 to 100.
@ -176,7 +176,7 @@ export class Color {
* *
* @param amount (between 0 and 100) * @param amount (between 0 and 100)
*/ */
public darken(amount: number): Color; public darken (amount: number): Color;
/** /**
* Spin the hue a given amount, from -360 to 360. Calling with 0, 360, or -360 will do nothing (since it sets the hue back to what it was before). * Spin the hue a given amount, from -360 to 360. Calling with 0, 360, or -360 will do nothing (since it sets the hue back to what it was before).