Return self if color not found.

Author: novykh

src/theme/utils.js

@@ -5,8 +5,10 @@ export const extendTheme = (theme, extension) => mergeDeepRight(theme, extension
 
 export const propOrElse = (pathName, defaultValue) => props => pathOr(defaultValue, pathName, props)
 
-export const getOrElse = (pathName, defaultValue) => ({ theme }) =>
-  pathOr(defaultValue, pathName, theme)
+export const getOrElse =
+  (pathName, defaultValue) =>
+  ({ theme }) =>
+    pathOr(defaultValue, pathName, theme)
 
 export const getSizeUnit = ({ theme }) => path(["constants", "SIZE_UNIT"], theme)
 
@@ -20,7 +22,7 @@ export const calcSize = expr => props => {
 
 export const getColor = colorPath => {
   const colorPaths = Array.isArray(colorPath) ? colorPath : [colorPath]
-  return getOrElse(["colors", ...colorPaths], "#fff")
+  return getOrElse(["colors", ...colorPaths], colorPath || "#fff")
 }
 
 export const getRgbColor = (colorPath, opacity = 1) => {
@@ -35,22 +37,23 @@ export const getRgbColor = (colorPath, opacity = 1) => {
   }
 }
 
-export const getSizeBy = (multiplier = 1) => props => {
-  const size = (getSizeUnit(props) || 0) * multiplier
-  return `${size}px`
-}
+export const getSizeBy =
+  (multiplier = 1) =>
+  props => {
+    const size = (getSizeUnit(props) || 0) * multiplier
+    return `${size}px`
+  }
 
 export const getGutterHeight = ({ theme }) => {
   const gutterValue = path(["constants", "GUTTER_HEIGHT"], theme) || 0
   return `${gutterValue}px`
 }
 
-export const getValidatedControlColor = (
-  defaultColorPath = "border",
-  defaultDisabledPath = "disabled"
-) => ({ theme, success, error, disabled }) => {
-  if (success) return getColor(["success"])({ theme })
-  if (error) return getColor(["error"])({ theme })
-  if (disabled) return getColor([defaultDisabledPath])({ theme })
-  return getColor([defaultColorPath])({ theme })
-}
+export const getValidatedControlColor =
+  (defaultColorPath = "border", defaultDisabledPath = "disabled") =>
+  ({ theme, success, error, disabled }) => {
+    if (success) return getColor(["success"])({ theme })
+    if (error) return getColor(["error"])({ theme })
+    if (disabled) return getColor([defaultDisabledPath])({ theme })
+    return getColor([defaultColorPath])({ theme })
+  }