prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up code

Browse source
This commit is contained in:
Rupin Khandelwal 2022-07-06 12:54:17 +00:00
parent 12983cc0cb
commit a7eb8b0c39
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/web/components/elements/LabelColorDropdown.tsx
View file

@ -11,6 +11,7 @@ import {
LabelOptionProps,
} from '../../utils/settings-page/labels/types'
import {
colorLuminance,
getLuminanceFromRGB,
hextoRGB,
increaseBrightness,
@ -116,19 +117,15 @@ export const LabelColorDropdown = (props: LabelColorDropdownProps) => {
const [open, setOpen] = useState<boolean | undefined>(false)
const handleCustomColorChange = (color: string) => {
console.log(color);
const rgb = hextoRGB(color)
const luminance = rgb && getLuminanceFromRGB(rgb)
if (luminance && luminance < 0.4) {
console.log('luminance', luminance);
color = increaseBrightness(rgb)
let newColor = ''
if (luminance && luminance < 0.5) {
newColor = increaseBrightness(rgb, 4)
}
console.log('New color', color);
setLabelColorHex({
rowId: labelId,
value: color.toUpperCase() as LabelColor,
value: newColor.toUpperCase() as LabelColor,
})
}

14
packages/web/utils/settings-page/labels/labelColorObjects.tsx
View file

@ -71,11 +71,10 @@ export const hextoRGB = (hex: string) => {
}
// returns a hexadecimal value with increased brightness
export const increaseBrightness = (rgb: Array<number>) => {
// increase brightness by 50%
const r = Math.round(Math.min(255, rgb[0] * 1.5))
const g = Math.round(Math.min(255, rgb[1] * 1.5))
const b = Math.round(Math.min(255, rgb[2] * 1.5))
export const increaseBrightness = (rgb: Array<number>, brightness: number) => {
const r = Math.round(Math.min(Math.max(0, rgb[0] + rgb[0] * brightness), 255))
const g = Math.round(Math.min(Math.max(0, rgb[1] + rgb[1] * brightness), 255))
const b = Math.round(Math.min(Math.max(0, rgb[2] + rgb[2] * brightness), 255))
let red = r.toString(16)
let green = g.toString(16)
@ -99,8 +98,3 @@ export const getLuminanceFromRGB = (rgb: Array<number>) => {
const luminance = 0.2126 * red + 0.7152 * green + 0.0722 * blue
return luminance
}
// return '#' +
// ((0|(1<<8) + rgb[0] + (256 - rgb[0]) * percent / 100).toString(16)).substr(1) +
// ((0|(1<<8) + rgb[1] + (256 - rgb[1]) * percent / 100).toString(16)).substr(1) +
// ((0|(1<<8) + rgb[2] + (256 - rgb[2]) * percent / 100).toString(16)).substr(1);