@atlaskit/item
Advanced tools
Comparing version
# @atlaskit/item | ||
## 7.0.6 | ||
- [patch] Fix getThemeStyle to support some valid falsy values [4f1894e](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/4f1894e) | ||
- [none] Updated dependencies [4f1894e](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/4f1894e) | ||
## 7.0.5 | ||
@@ -4,0 +8,0 @@ - [patch] Clean Changelogs - remove duplicates and empty entries [e7756cd](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/e7756cd) |
@@ -83,2 +83,6 @@ 'use strict'; | ||
var isValidCssValue = function isValidCssValue(value) { | ||
return value !== undefined && value !== null && value !== ''; | ||
}; | ||
// Returns the theme that contains the requested theme key(s), preferring the user-supplied | ||
@@ -88,5 +92,5 @@ // theme if it is provided. | ||
if (parentKey) { | ||
return maybeTheme && maybeTheme[parentKey] && maybeTheme[parentKey][key] ? maybeTheme : defaultTheme; | ||
return maybeTheme && maybeTheme[parentKey] && isValidCssValue(maybeTheme[parentKey][key]) ? maybeTheme : defaultTheme; | ||
} | ||
return maybeTheme && maybeTheme[key] ? maybeTheme : defaultTheme; | ||
return maybeTheme && isValidCssValue(maybeTheme[key]) ? maybeTheme : defaultTheme; | ||
}; | ||
@@ -93,0 +97,0 @@ |
@@ -75,2 +75,6 @@ import { colors, gridSize as akGridSize, borderRadius } from '@atlaskit/theme'; | ||
var isValidCssValue = function isValidCssValue(value) { | ||
return value !== undefined && value !== null && value !== ''; | ||
}; | ||
// Returns the theme that contains the requested theme key(s), preferring the user-supplied | ||
@@ -80,5 +84,5 @@ // theme if it is provided. | ||
if (parentKey) { | ||
return maybeTheme && maybeTheme[parentKey] && maybeTheme[parentKey][key] ? maybeTheme : defaultTheme; | ||
return maybeTheme && maybeTheme[parentKey] && isValidCssValue(maybeTheme[parentKey][key]) ? maybeTheme : defaultTheme; | ||
} | ||
return maybeTheme && maybeTheme[key] ? maybeTheme : defaultTheme; | ||
return maybeTheme && isValidCssValue(maybeTheme[key]) ? maybeTheme : defaultTheme; | ||
}; | ||
@@ -85,0 +89,0 @@ |
{ | ||
"name": "@atlaskit/item", | ||
"version": "7.0.4" | ||
"version": "7.0.5" | ||
} |
{ | ||
"name": "@atlaskit/item", | ||
"version": "7.0.5", | ||
"version": "7.0.6", | ||
"description": "A generic item component to be used within other components", | ||
@@ -50,2 +50,2 @@ "license": "Apache-2.0", | ||
] | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
144590
0.6%1559
0.39%