Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json

Author: stomita

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-lightning-design-system",
-  "version": "4.3.3",
+  "version": "4.4.2",
   "description": "Salesforce Lightning Design System components built with React",
   "main": "lib/scripts/index.js",
   "module": "module/scripts/index.js",
@@ -112,7 +112,7 @@
     "react-docgen-typescript-loader": "^3.1.0",
     "react-dom": "^16.8.2",
     "react-test-renderer": "^16.8.2",
-    "reg-keygen-git-hash-plugin": "^0.8.5",
+    "reg-keygen-git-hash-plugin": "^0.10.16",
     "reg-notify-github-plugin": "^0.8.5",
     "reg-publish-s3-plugin": "^0.8.5",
     "reg-suit": "^0.8.6",

src/scripts/DateInput.tsx

@@ -200,7 +200,9 @@ class DateInputInner extends Component<
   }
 
   onInputBlur(e: FocusEvent<HTMLInputElement | HTMLButtonElement>) {
-    this.setValueFromInput(e.target.value);
+    if (e.target.tagName.toLowerCase() === 'input') {
+      this.setValueFromInput(e.target.value);
+    }
     setTimeout(() => {
       if (!this.isFocusedInComponent()) {
         if (this.props.onBlur) {
@@ -358,7 +360,7 @@ class DateInputInner extends Component<
         ? this.state.inputValue
         : dateValue != null && mvalue.isValid()
         ? mvalue.format(this.getInputValueFormat())
-        : undefined;
+        : '';
     const isOpened = typeof opened !== 'undefined' ? opened : this.state.opened;
     const formElemProps = { id, totalCols, cols, label, required, error };
     return (

src/scripts/DropdownButton.tsx

@@ -19,6 +19,8 @@ export type Key = string | number;
 export type DropdownButtonProps<EventKey extends Key> = {
   className?: string;
   label?: React.ReactNode;
+  opened?: boolean;
+  defaultOpened?: boolean;
   menuAlign?: DropdownMenuAlign;
   menuSize?: DropdownMenuSize;
   menuHeader?: string;
@@ -55,7 +57,11 @@ class DropdownButtonInner<EventKey extends Key> extends Component<
 
   constructor(props: Readonly<DropdownButtonInnerProps<EventKey>>) {
     super(props);
-    this.state = { opened: false };
+    const opened =
+      typeof this.props.opened === 'undefined'
+        ? this.props.defaultOpened || false
+        : this.props.opened;
+    this.state = { opened };
     registerStyle('no-hover-popup', [
       [
         '.slds-dropdown-trigger:hover .slds-dropdown_menu.react-slds-no-hover-popup',
@@ -80,11 +86,15 @@ class DropdownButtonInner<EventKey extends Key> extends Component<
   };
 
   onKeyDown = (e: KeyboardEvent<HTMLButtonElement>) => {
+    const opened =
+      typeof this.props.opened === 'undefined'
+        ? this.state.opened
+        : this.props.opened;
     if (e.keyCode === 40) {
       // down
       e.preventDefault();
       e.stopPropagation();
-      if (!this.state.opened) {
+      if (!opened) {
         this.setState({ opened: true });
         if (this.props.onClick) {
           this.props.onClick(e);
@@ -205,9 +215,13 @@ class DropdownButtonInner<EventKey extends Key> extends Component<
       ...props
     } = this.props;
     let { icon } = this.props;
+    const opened =
+      typeof this.props.opened === 'undefined'
+        ? this.state.opened
+        : this.props.opened;
     const dropdownClassNames = classnames(className, 'slds-dropdown-trigger', {
       'slds-button-space-left': !props.grouped,
-      'react-slds-dropdown-opened': this.state.opened,
+      'react-slds-dropdown-opened': opened,
     });
     let iconMore = null;
     if (!label && !icon) {
@@ -242,7 +256,7 @@ class DropdownButtonInner<EventKey extends Key> extends Component<
         ref={(node) => (this.node = node)}
       >
         {this.renderButton({ type, label, icon, iconMore, ...props })}
-        {hoverPopup || this.state.opened ? dropdown : undefined}
+        {hoverPopup || opened ? dropdown : undefined}
       </div>
     );
   }

test/storyshots/__snapshots__/storyshots.test.js.snap

@@ -1791,6 +1791,7 @@ exports[`Storyshots DateInput Controlled with knobs 1`] = `
               onBlur={[Function]}
               onChange={[Function]}
               onKeyDown={[Function]}
+              value=""
             />
             <span
               className="react-slds-button-focus-wrapper"
@@ -13690,6 +13691,7 @@ exports[`Storyshots Form Compound Form 1`] = `
                       onChange={[Function]}
                       onKeyDown={[Function]}
                       placeholder="YYYY/MM/DD"
+                      value=""
                     />
                     <span
                       className="react-slds-button-focus-wrapper"
@@ -14218,6 +14220,7 @@ exports[`Storyshots Form Horizontal Form 1`] = `
                 onBlur={[Function]}
                 onChange={[Function]}
                 onKeyDown={[Function]}
+                value=""
               />
               <span
                 className="react-slds-button-focus-wrapper"
@@ -14671,6 +14674,7 @@ exports[`Storyshots Form Stacked Form 1`] = `
                 onBlur={[Function]}
                 onChange={[Function]}
                 onKeyDown={[Function]}
+                value=""
               />
               <span
                 className="react-slds-button-focus-wrapper"
@@ -46280,6 +46284,7 @@ exports[`Storyshots Modal Form elements 1`] = `
                               onBlur={[Function]}
                               onChange={[Function]}
                               onKeyDown={[Function]}
+                              value=""
                             />
                             <span
                               className="react-slds-button-focus-wrapper"
@@ -46336,6 +46341,7 @@ exports[`Storyshots Modal Form elements 1`] = `
                               onBlur={[Function]}
                               onChange={[Function]}
                               onKeyDown={[Function]}
+                              value=""
                             />
                             <span
                               className="react-slds-button-focus-wrapper"
@@ -46398,6 +46404,7 @@ exports[`Storyshots Modal Form elements 1`] = `
                           onBlur={[Function]}
                           onChange={[Function]}
                           onKeyDown={[Function]}
+                          value=""
                         />
                         <span
                           className="react-slds-button-focus-wrapper"