terra-base
Advanced tools
Comparing version 2.5.0 to 2.6.0
@@ -7,2 +7,7 @@ Changelog | ||
2.6.0 - (October 6, 2017) | ||
------------------ | ||
### Changed | ||
* Updated parameters passed to component while rendering and also the test scripts. | ||
2.5.0 - (September 26, 2017) | ||
@@ -9,0 +14,0 @@ ------------------ |
@@ -8,4 +8,4 @@ # Dependency Information | ||
| prop-types | ^15.5.8 | -- | Runtime type checking for React props and similar objects. | | ||
| terra-i18n | ^1.8.0 | ^15.4.2 | The terra-i18n component provides the internationalization to the React component. Terra supports the following locales: 'de' 'es' 'en' 'en-US' 'en-GB', 'fi-FI', 'fr', 'pt'. All locales related files are loading on demand. | | ||
| terra-mixins | ^1.10.0 | -- | terra-mixins | | ||
| terra-i18n | ^1.9.0 | ^15.4.2 | The terra-i18n component provides the internationalization to the React component. Terra supports the following locales: 'de' 'es' 'en' 'en-US' 'en-GB', 'fi-FI', 'fr', 'pt'. All locales related files are loading on demand. | | ||
| terra-mixins | ^1.11.0 | -- | terra-mixins | | ||
@@ -15,3 +15,3 @@ ## devDependencies | ||
|-|-|-|-| | ||
| terra-props-table | ^1.8.0 | ^15.4.2 | terra-props-table | | ||
| terra-props-table | ^1.9.0 | ^15.4.2 | terra-props-table | | ||
@@ -23,2 +23,2 @@ ## peerDependencies | ||
| react-dom | ^15.4.2 | ^15.6.2 | React package for working with the DOM. | | ||
| terra-mixins | ^1.10.0 | -- | terra-mixins | | ||
| terra-mixins | ^1.11.0 | -- | terra-mixins | |
@@ -105,11 +105,12 @@ 'use strict'; | ||
var childComponent = _react2.default.createElement( | ||
'div', | ||
customProps, | ||
children | ||
); | ||
var messages = _extends({}, this.state.messages, customMessages); | ||
if (locale === undefined) return childComponent; | ||
if (locale === undefined) { | ||
return _react2.default.createElement( | ||
'div', | ||
customProps, | ||
children | ||
); | ||
} | ||
if (!this.state.areTranslationsLoaded) return _react2.default.createElement( | ||
@@ -122,4 +123,4 @@ 'div', | ||
_terraI18n.I18nProvider, | ||
{ locale: this.state.locale, messages: messages }, | ||
childComponent | ||
_extends({}, customProps, { locale: this.state.locale, messages: messages }), | ||
children | ||
); | ||
@@ -126,0 +127,0 @@ } |
{ | ||
"name": "terra-base", | ||
"main": "lib/Base.js", | ||
"version": "2.5.0", | ||
"version": "2.6.0", | ||
"description": "The base component sets minimal global styles for an application.", | ||
@@ -24,3 +24,3 @@ "repository": { | ||
"devDependencies": { | ||
"terra-props-table": "^1.9.0" | ||
"terra-props-table": "^1.10.0" | ||
}, | ||
@@ -35,3 +35,3 @@ "peerDependencies": { | ||
"prop-types": "^15.5.8", | ||
"terra-i18n": "^1.9.0", | ||
"terra-i18n": "^1.10.0", | ||
"terra-mixins": "^1.11.0" | ||
@@ -38,0 +38,0 @@ }, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
26816
117
Updatedterra-i18n@^1.10.0