fix: Use Lab for calculating text contrast color value (fix #3084)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
11
package-lock.json
generated
11
package-lock.json
generated
@@ -23,6 +23,7 @@
|
|||||||
"@nextcloud/router": "^2.1.2",
|
"@nextcloud/router": "^2.1.2",
|
||||||
"@nextcloud/vue": "^7.12.4",
|
"@nextcloud/vue": "^7.12.4",
|
||||||
"blueimp-md5": "^2.19.0",
|
"blueimp-md5": "^2.19.0",
|
||||||
|
"chroma-js": "^2.4.2",
|
||||||
"dompurify": "^3.0.5",
|
"dompurify": "^3.0.5",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^13.0.1",
|
||||||
@@ -6713,6 +6714,11 @@
|
|||||||
"fsevents": "~2.3.2"
|
"fsevents": "~2.3.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/chroma-js": {
|
||||||
|
"version": "2.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz",
|
||||||
|
"integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="
|
||||||
|
},
|
||||||
"node_modules/chrome-trace-event": {
|
"node_modules/chrome-trace-event": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -24826,6 +24832,11 @@
|
|||||||
"readdirp": "~3.6.0"
|
"readdirp": "~3.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"chroma-js": {
|
||||||
|
"version": "2.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz",
|
||||||
|
"integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="
|
||||||
|
},
|
||||||
"chrome-trace-event": {
|
"chrome-trace-event": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"peer": true
|
"peer": true
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
"@nextcloud/router": "^2.1.2",
|
"@nextcloud/router": "^2.1.2",
|
||||||
"@nextcloud/vue": "^7.12.4",
|
"@nextcloud/vue": "^7.12.4",
|
||||||
"blueimp-md5": "^2.19.0",
|
"blueimp-md5": "^2.19.0",
|
||||||
|
"chroma-js": "^2.4.2",
|
||||||
"dompurify": "^3.0.5",
|
"dompurify": "^3.0.5",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^13.0.1",
|
||||||
|
|||||||
@@ -65,6 +65,7 @@
|
|||||||
|
|
||||||
<CardMenu v-if="!editing && compactMode" :card="card" class="right" />
|
<CardMenu v-if="!editing && compactMode" :card="card" class="right" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<transition-group v-if="card.labels && card.labels.length"
|
<transition-group v-if="card.labels && card.labels.length"
|
||||||
name="zoom"
|
name="zoom"
|
||||||
tag="ul"
|
tag="ul"
|
||||||
|
|||||||
@@ -20,76 +20,19 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import chroma from "chroma-js"
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
methods: {
|
methods: {
|
||||||
hexToRgb(hex) {
|
|
||||||
const result = /^#?([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex)
|
|
||||||
if (result) {
|
|
||||||
return {
|
|
||||||
r: parseInt(result[1], 16),
|
|
||||||
g: parseInt(result[2], 16),
|
|
||||||
b: parseInt(result[3], 16),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
},
|
|
||||||
rgb2hls(rgb) {
|
|
||||||
// RGB2HLS by Garry Tan
|
|
||||||
// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
|
|
||||||
const r = rgb.r / 255
|
|
||||||
const g = rgb.g / 255
|
|
||||||
const b = rgb.b / 255
|
|
||||||
const max = Math.max(r, g, b)
|
|
||||||
const min = Math.min(r, g, b)
|
|
||||||
let h
|
|
||||||
let s
|
|
||||||
const l = (max + min) / 2
|
|
||||||
|
|
||||||
if (max === min) {
|
|
||||||
h = s = 0 // achromatic
|
|
||||||
} else {
|
|
||||||
const d = max - min
|
|
||||||
s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
|
|
||||||
switch (max) {
|
|
||||||
case r:
|
|
||||||
h = (g - b) / d + (g < b ? 6 : 0)
|
|
||||||
break
|
|
||||||
case g:
|
|
||||||
h = (b - r) / d + 2
|
|
||||||
break
|
|
||||||
case b:
|
|
||||||
h = (r - g) / d + 4
|
|
||||||
break
|
|
||||||
}
|
|
||||||
h /= 6
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
h, l, s,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
textColor(hex) {
|
textColor(hex) {
|
||||||
|
return chroma(hex).get('lab.l') > 50 ? '#000000' : '#ffffff'
|
||||||
const rgb = this.hexToRgb(hex)
|
|
||||||
if (rgb === null) {
|
|
||||||
return '#000000'
|
|
||||||
}
|
|
||||||
const { l } = this.rgb2hls(rgb)
|
|
||||||
|
|
||||||
if (l < 0.5) {
|
|
||||||
return '#ffffff'
|
|
||||||
} else {
|
|
||||||
return '#000000'
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
},
|
||||||
colorIsValid(hex) {
|
colorIsValid(hex) {
|
||||||
|
|
||||||
const re = /[A-Fa-f0-9]{6}/
|
const re = /[A-Fa-f0-9]{6}/
|
||||||
if (re.test(hex)) {
|
if (re.test(hex)) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
|
||||||
},
|
},
|
||||||
randomColor() {
|
randomColor() {
|
||||||
return Math.floor(Math.random() * (0xffffff + 1)).toString(16).padStart(6, '0')
|
return Math.floor(Math.random() * (0xffffff + 1)).toString(16).padStart(6, '0')
|
||||||
|
|||||||
Reference in New Issue
Block a user