Merge branch 'master' into dataViz-annotations

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index b5ca53a33..330ca59f9 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -555,7 +555,7 @@ export function returnAll(): 'all' {
     return 'all';
 }
 
-export function returnNone() {
+export function returnNone(): 'none' {
     return 'none';
 }
 
@@ -758,7 +758,7 @@ export function DashColor(color: string) {
 }
 
 export function lightOrDark(color: any) {
-    if (color === 'transparent') return Colors.DARK_GRAY;
+    if (color === 'transparent' || !color) return Colors.DARK_GRAY;
     if (color.startsWith?.('linear')) return Colors.BLACK;
     const nonAlphaColor = color.startsWith('#') ? (color as string).substring(0, 7) : color.startsWith('rgba') ? color.replace(/,.[^,]*\)/, ')').replace('rgba', 'rgb') : color;
     const col = DashColor(nonAlphaColor).rgb();