Merge pull request #430 from dnbexperience/develop

release of v6.1.3
dnbexperience · Feb 13, 2020 · 27ee9c9 · 27ee9c9
2 parents 90883bd + 590c37b
commit 27ee9c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js b/packages/dnb-ui-lib/src/components/date-picker/DatePicker.js
@@ -156,6 +156,10 @@ const propTypes = {
   no_animation: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
   direction: PropTypes.oneOf(['auto', 'top', 'bottom']),
   align_picker: PropTypes.oneOf(['auto', 'left', 'right']),
+  class: PropTypes.string,
+
+  // React
+  className: PropTypes.string,
 
   // Web Component props
   custom_element: PropTypes.object,
@@ -217,8 +221,12 @@ const defaultProps = {
   suffix: null,
   opened: false,
   no_animation: false,
-  align_picker: null,
   direction: 'auto',
+  align_picker: null,
+  class: null,
+
+  // React
+  className: null,
 
   // Web Component props
   custom_element: null,
@@ -692,6 +700,8 @@ export default class DatePicker extends PureComponent {
       opened: _opened, // eslint-disable-line
       direction: _direction, // eslint-disable-line
       id: _id, // eslint-disable-line
+      className,
+      class: _className,
       show_submit_button, // eslint-disable-line
       show_cancel_button, // eslint-disable-line
       show_reset_button, // eslint-disable-line
@@ -756,7 +766,9 @@ export default class DatePicker extends PureComponent {
           'dnb-date-picker--show-footer',
         align_picker && `dnb-date-picker--${align_picker}`,
         'dnb-form-component',
-        createSpacingClasses(props)
+        createSpacingClasses(props),
+        _className,
+        className
       )
     }
 

diff --git a/...ges/dnb-ui-lib/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap b/...ges/dnb-ui-lib/src/components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
@@ -5,6 +5,8 @@ exports[`DatePicker component have to match snapshot 1`] = `
   addon_element={null}
   align_picker={null}
   cancel_button_text="Avbryt"
+  class={null}
+  className={null}
   custom_element={null}
   custom_method={null}
   date="1970-01-01T00:00:00.000Z"