-
Notifications
You must be signed in to change notification settings - Fork 392
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: OlgaLarina <[email protected]>
- Loading branch information
1 parent
885389d
commit 8bf9561
Showing
31 changed files
with
463 additions
and
447 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/survey-creator-core/src/components/tabs/theme-custom-questions/color-alpha.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
packages/survey-creator-core/src/creator-theme/creator-theme-model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/survey-creator-core/src/custom-questions/question-color.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
packages/survey-creator-core/src/property-grid/search-manager.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import { roundTo2Decimals } from "./utils"; | ||
|
|
||
| export class ColorCalculator { | ||
| colorSettings = { baseColorAlpha: 1, darkColorAlpha: 1, lightColorAlpha: 1, deltaDarkColor: 0, deltaLightColor: 0, newColorLight: "", newColorDark: "" }; | ||
|
|
||
| initialize(baseColor: string, lightColor: string, darkColor: string) { | ||
| let primaryColorRgba = parseRgbaFromString(baseColor); | ||
| if (primaryColorRgba.length === 0) { | ||
| primaryColorRgba = parseRgbaFromString(ingectAlpha(baseColor, 1)); | ||
| } | ||
| let primaryColorDarkRgba = parseRgbaFromString(darkColor); | ||
| if (primaryColorDarkRgba.length === 0) { | ||
| primaryColorDarkRgba = parseRgbaFromString(ingectAlpha(darkColor, 1)); | ||
| } | ||
| let primaryColorLightRgba = parseRgbaFromString(lightColor); | ||
| if (primaryColorLightRgba.length === 0) { | ||
| primaryColorLightRgba = parseRgbaFromString(ingectAlpha(lightColor, 1)); | ||
| } | ||
| this.colorSettings.baseColorAlpha = primaryColorRgba[3]; | ||
| this.colorSettings.darkColorAlpha = primaryColorDarkRgba[3]; | ||
| this.colorSettings.lightColorAlpha = primaryColorLightRgba[3]; | ||
|
|
||
| const primaryColorHSB = RGBToHSB(primaryColorRgba[0], primaryColorRgba[1], primaryColorRgba[2]); | ||
| const primaryColorDarkHSB = RGBToHSB(primaryColorDarkRgba[0], primaryColorDarkRgba[1], primaryColorDarkRgba[2]); | ||
| const primaryColorLightHSB = RGBToHSB(primaryColorLightRgba[0], primaryColorLightRgba[1], primaryColorLightRgba[2]); | ||
|
|
||
| this.colorSettings.deltaDarkColor = primaryColorHSB[2] - primaryColorDarkHSB[2]; | ||
| this.colorSettings.deltaLightColor = primaryColorHSB[2] - primaryColorLightHSB[2]; | ||
| } | ||
|
|
||
| calculateColors(newColor: string) { | ||
| let newColorRbg = parseRgbaFromString(newColor); | ||
| if (newColorRbg.length === 0) { | ||
| newColorRbg = parseRgbaFromString(ingectAlpha(newColor, 1)); | ||
| } | ||
| const newColorHsb = RGBToHSB(newColorRbg[0], newColorRbg[1], newColorRbg[2]); | ||
| const newPrimaryColorDarkRGB = HSBToRGB(newColorHsb[0], newColorHsb[1], newColorHsb[2] - this.colorSettings.deltaDarkColor); | ||
| const newPrimaryColorLightRGB = HSBToRGB(newColorHsb[0], newColorHsb[1], newColorHsb[2] - this.colorSettings.deltaLightColor); | ||
|
|
||
| this.colorSettings.newColorLight = convertRgbaToString(newPrimaryColorLightRGB, this.colorSettings.lightColorAlpha); | ||
| this.colorSettings.newColorDark = convertRgbaToString(newPrimaryColorDarkRGB, this.colorSettings.darkColorAlpha); | ||
| } | ||
| } | ||
|
|
||
| export function ingectAlpha(baseColor: any, alpha: number): any { | ||
| if (!!baseColor && alpha !== undefined) { | ||
| const rgbValue = HEXToRGB(baseColor); | ||
| return `rgba(${rgbValue[0]}, ${rgbValue[1]}, ${rgbValue[2]}, ${rgbValue[3] || alpha})`; | ||
| } | ||
| } | ||
|
|
||
| export function convertRgbaToString(rgbValues: Array<number>, alpha: number): string { | ||
| return `rgba(${rgbValues[0]}, ${rgbValues[1]}, ${rgbValues[2]}, ${alpha})`; | ||
| } | ||
|
|
||
| export function parseRgbaFromString(value: string = ""): Array<number> { | ||
| const matchRgb = value.match(/\((.*)\)/); | ||
| if (matchRgb) { | ||
| return matchRgb[1].split(",").map(i => parseFloat(i)); | ||
| } else { | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| export function parseColor(value: string = ""): { color: string, opacity: number } { | ||
| const rgbValues = parseRgbaFromString(value); | ||
| if (rgbValues.length !== 0) { | ||
| let opacity = 1; | ||
| if (rgbValues.length == 4) { | ||
| opacity = rgbValues.pop(); | ||
| } | ||
| const color = rgbValues.reduce((res: string, color: number) => { | ||
| const hex = color.toString(16); | ||
| return res + (hex.length == 1 ? "0" + hex : hex); | ||
| }, "#"); | ||
| return { color, opacity: roundTo2Decimals(opacity * 100) }; | ||
| } | ||
| else { | ||
| return { color: value, opacity: 100 }; | ||
| } | ||
| } | ||
| export function HEXToRGB(baseColor: any): any { | ||
| if (!!baseColor) { | ||
| const r = parseInt(baseColor.slice(1, 3), 16); | ||
| const g = parseInt(baseColor.slice(3, 5), 16); | ||
| const b = parseInt(baseColor.slice(5, 7), 16); | ||
| const alpha = roundTo2Decimals(parseInt(baseColor.slice(7, 9), 16) / 255); | ||
|
|
||
| return [r, g, b, alpha]; | ||
| } | ||
| return []; | ||
| } | ||
|
|
||
| export function HSBToRGB(h, s, b) { | ||
| s /= 100; | ||
| b /= 100; | ||
| const k = (n) => (n + h / 60) % 6; | ||
| const f = (n) => b * (1 - s * Math.max(0, Math.min(k(n), 4 - k(n), 1))); | ||
| return [Math.round(255 * f(5)), Math.round(255 * f(3)), Math.round(255 * f(1))]; | ||
| } | ||
|
|
||
| export function RGBToHSB(r, g, b) { | ||
| r /= 255; | ||
| g /= 255; | ||
| b /= 255; | ||
| const v = Math.max(r, g, b), | ||
| n = v - Math.min(r, g, b); | ||
| const h = n === 0 ? 0 : n && v === r ? (g - b) / n : v === g ? 2 + (b - r) / n : 4 + (r - g) / n; | ||
| return [60 * (h < 0 ? h + 6 : h), v && (n / v) * 100, v * 100]; | ||
| } | ||
|
|
||
| export function colorsAreEqual(color1: string, color2: string) { | ||
| const color1Value = parseColor(color1); | ||
| color1Value.color = color1Value.color.substring(0, 7).toUpperCase(); | ||
| const color2Value = parseColor(color2); | ||
| color2Value.color = color2Value.color.substring(0, 7).toUpperCase(); | ||
| return color1Value.color === color2Value.color && color1Value.opacity === color2Value.opacity; | ||
| } |
Oops, something went wrong.