Fixed merge conflicts

salesforce · Jun 21, 2019 · 86b1bc8 · 86b1bc8
2 parents c82d2f1 + 66bc346
commit 86b1bc8
Show file tree

Hide file tree

Showing 111 changed files with 12,009 additions and 508 deletions.
diff --git a/components/builder-header/__docs__/__snapshots__/storybook-stories.storyshot b/components/builder-header/__docs__/__snapshots__/storybook-stories.storyshot
@@ -396,7 +396,6 @@ exports[`DOM snapshots SLDSBuilderHeader After Successful Save 1`] = `
               }
             >
               <span
-                aria-describedby="status-tooltip"
                 className="slds-color__text_gray-10 slds-align-middle slds-m-right_small"
                 onBlur={[Function]}
                 onFocus={[Function]}
@@ -1533,7 +1532,6 @@ exports[`DOM snapshots SLDSBuilderHeader Failed Save 1`] = `
               }
             >
               <span
-                aria-describedby="status-tooltip"
                 className="slds-color__text_gray-10 slds-align-middle slds-m-right_x-small"
                 onBlur={[Function]}
                 onFocus={[Function]}

diff --git a/components/combobox/__docs__/__snapshots__/storybook-stories.storyshot b/components/combobox/__docs__/__snapshots__/storybook-stories.storyshot
diff --git a/components/combobox/__examples__/input-prop.jsx b/components/combobox/__examples__/input-prop.jsx
@@ -79,8 +79,8 @@ class Example extends React.Component {
 		// example of passing in an SLDSInput component to a SLDSCombobox
 		const inputElement = (
 			<Input
+				label="Search"
 				autoComplete="test"
-				id="id_from_input_prop"
 				placeholder="My overridden placeholder"
 			/>
 		);

diff --git a/components/combobox/__examples__/snapshot/base-selected.jsx b/components/combobox/__examples__/snapshot/base-selected.jsx
@@ -46,6 +46,7 @@ class Example extends React.Component {
 		return (
 			<IconSettings iconPath="/assets/icons">
 				<Combobox
+					assistiveText={{ label: 'Search' }}
 					id="combobox-unique-id"
 					labels={{
 						placeholder: 'Search Salesforce',

diff --git a/components/combobox/combobox.jsx b/components/combobox/combobox.jsx
@@ -442,7 +442,7 @@ class Combobox extends React.Component {
 			footer: popoverFooter,
 			footerClassName: 'slds-popover__footer_form',
 			hasNoNubbin: true,
-			id: `${this.getId()}`,
+			id: this.getId(),
 			isOpen: this.state.isOpen,
 			hasNoTriggerStyles: true,
 			onOpen: this.handleOpen,
@@ -959,12 +959,14 @@ class Combobox extends React.Component {
 					aria-expanded={this.getIsOpen()}
 					aria-haspopup="listbox" // eslint-disable-line jsx-a11y/aria-proptypes
 					// used on menu's listbox
-					aria-owns={`${this.getId()}-listbox`} // eslint-disable-line jsx-a11y/aria-proptypes
+					aria-owns={this.getIsOpen() ? `${this.getId()}-listbox` : undefined} // eslint-disable-line jsx-a11y/aria-proptypes
 					role="combobox"
 				>
 					<InnerInput
 						aria-autocomplete="list"
-						aria-controls={`${this.getId()}-listbox`}
+						aria-controls={
+							this.getIsOpen() ? `${this.getId()}-listbox` : undefined
+						}
 						aria-activedescendant={
 							this.state.activeOption
 								? `${this.getId()}-listbox-option-${this.state.activeOption.id}`
@@ -1097,7 +1099,9 @@ class Combobox extends React.Component {
 				>
 					<InnerInput
 						aria-autocomplete="list"
-						aria-controls={`${this.getId()}-listbox`}
+						aria-controls={
+							this.getIsOpen() ? `${this.getId()}-listbox` : undefined
+						}
 						aria-activedescendant={
 							this.state.activeOption
 								? `${this.getId()}-listbox-option-${this.state.activeOption.id}`
@@ -1107,8 +1111,6 @@ class Combobox extends React.Component {
 						autoComplete="off"
 						className="slds-combobox__input"
 						containerProps={{
-							'aria-expanded': this.getIsOpen(),
-							'aria-haspopup': 'listbox',
 							className: 'slds-combobox__form-element',
 							role: 'none',
 						}}
@@ -1196,7 +1198,9 @@ class Combobox extends React.Component {
 					>
 						<InnerInput
 							aria-autocomplete="list"
-							aria-controls={`${this.getId()}-listbox`}
+							aria-controls={
+								this.getIsOpen() ? `${this.getId()}-listbox` : undefined
+							}
 							aria-activedescendant={
 								this.state.activeOption
 									? `${this.getId()}-listbox-option-${
@@ -1348,13 +1352,14 @@ class Combobox extends React.Component {
 						)}
 						aria-expanded={this.getIsOpen()}
 						aria-haspopup="dialog" // eslint-disable-line jsx-a11y/aria-proptypes
-						aria-owns={`${this.getId()}`} // eslint-disable-line jsx-a11y/aria-proptypes
 						role="combobox"
 					>
 						<Popover {...popoverProps}>
 							<InnerInput
 								aria-autocomplete="none"
-								aria-controls={`${this.getId()}`}
+								aria-controls={
+									this.getIsOpen() ? `${this.getId()}-popover` : undefined
+								}
 								aria-describedby={this.getErrorId()}
 								autoComplete="off"
 								className="slds-combobox__input"
@@ -1431,7 +1436,9 @@ class Combobox extends React.Component {
 					>
 						<InnerInput
 							aria-autocomplete="list"
-							aria-controls={`${this.getId()}-listbox`}
+							aria-controls={
+								this.getIsOpen() ? `${this.getId()}-listbox` : undefined
+							}
 							aria-activedescendant={
 								this.state.activeOption
 									? `${this.getId()}-listbox-option-${
@@ -1443,8 +1450,6 @@ class Combobox extends React.Component {
 							autoComplete="off"
 							className="slds-combobox__input"
 							containerProps={{
-								'aria-expanded': this.getIsOpen(),
-								'aria-haspopup': 'listbox',
 								className: 'slds-combobox__form-element',
 								role: 'none',
 							}}
@@ -1543,7 +1548,9 @@ class Combobox extends React.Component {
 					>
 						<InnerInput
 							aria-autocomplete="list"
-							aria-controls={`${this.getId()}-listbox`}
+							aria-controls={
+								this.getIsOpen() ? `${this.getId()}-listbox` : undefined
+							}
 							aria-activedescendant={
 								this.state.activeOption
 									? `${this.getId()}-listbox-option-${
@@ -1555,8 +1562,6 @@ class Combobox extends React.Component {
 							autoComplete="off"
 							className="slds-combobox__input"
 							containerProps={{
-								'aria-expanded': this.getIsOpen(),
-								'aria-haspopup': 'listbox',
 								className: 'slds-combobox__form-element',
 								role: 'none',
 							}}

diff --git a/components/component-docs.json b/components/component-docs.json
@@ -2991,8 +2991,7 @@
                     "name": "shape",
                     "value": {
                         "heading": {
-                            "name": "custom",
-                            "raw": "PropTypes.heading",
+                            "name": "string",
                             "required": false
                         },
                         "label": {
@@ -3131,21 +3130,21 @@
             },
             "onRenderVisualPicker": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown with checkbox (only for non-coverable visual picker variant)"
             },
             "onRenderVisualPickerSelected": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown if checkbox is not selected (only for visual picker variant)"
             },
             "onRenderVisualPickerNotSelected": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown if checkbox is not selected (only for visual picker variant)"
@@ -12410,8 +12409,7 @@
                     "name": "shape",
                     "value": {
                         "heading": {
-                            "name": "custom",
-                            "raw": "PropTypes.heading",
+                            "name": "string",
                             "required": false
                         },
                         "label": {
@@ -12421,7 +12419,7 @@
                     }
                 },
                 "required": false,
-                "description": "**Text labels for internationalization**\nThis object is merged with the default props object on every render.\n* `heading`: Heading for the visual picker variant\n* `label`: Label for the _enabled_ state of the Toggle variant. Defaults to \"Enabled\".\n* `toggleDisabled`: Label for the _disabled_ state of the Toggle variant. Defaults to \"Disabled\". Note that this uses SLDS language, and meaning, of \"Enabled\" and \"Disabled\"; referring to the state of whatever the checkbox is _toggling_, not whether the checkbox itself is enabled or disabled.\n* `toggleEnabled`: Label for the _enabled_ state of the Toggle variant. Defaults to \"Enabled\"."
+                "description": "**Text labels for internationalization**\nThis object is merged with the default props object on every render.\n* `heading`: Heading for the visual picker variant\n* `label`: Label for the radio input"
             },
             "name": {
                 "type": {
@@ -12493,21 +12491,21 @@
             },
             "onRenderVisualPicker": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown if radio is not selected (only for non-coverable visual picker variant)"
             },
             "onRenderVisualPickerSelected": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown if radio is not selected (only for visual picker variant)"
             },
             "onRenderVisualPickerNotSelected": {
                 "type": {
-                    "name": "node"
+                    "name": "func"
                 },
                 "required": false,
                 "description": "Allows icon to shown if radio is not selected (only for visual picker variant)"
@@ -15807,5 +15805,97 @@
         "display-name": "Vertical Navigation",
         "SLDS-component-path": "/components/vertical-navigation",
         "dependencies": []
+    },
+    "visual-picker": {
+        "description": "Visual Picker Component",
+        "methods": [],
+        "props": {
+            "id": {
+                "type": {
+                    "name": "string"
+                },
+                "required": false,
+                "description": "HTML id for component."
+            },
+            "className": {
+                "type": {
+                    "name": "union",
+                    "value": [
+                        {
+                            "name": "array"
+                        },
+                        {
+                            "name": "object"
+                        },
+                        {
+                            "name": "string"
+                        }
+                    ]
+                },
+                "required": false,
+                "description": "CSS classes to be added to tag with `.slds-form-element`. Uses `classNames` [API](https://github.com/JedWatson/classnames)."
+            },
+            "label": {
+                "type": {
+                    "name": "string"
+                },
+                "required": false,
+                "description": "Label for the visual picker"
+            },
+            "coverable": {
+                "type": {
+                    "name": "bool"
+                },
+                "required": false,
+                "description": "Whether the visual picker is coverable on selection"
+            },
+            "vertical": {
+                "type": {
+                    "name": "bool"
+                },
+                "required": false,
+                "description": "Whether the visual picker has a vertical layout",
+                "defaultValue": {
+                    "value": "false",
+                    "computed": false
+                }
+            },
+            "links": {
+                "type": {
+                    "name": "bool"
+                },
+                "required": false,
+                "description": "Whether the visual picker has links as children",
+                "defaultValue": {
+                    "value": "false",
+                    "computed": false
+                }
+            },
+            "size": {
+                "type": {
+                    "name": "enum",
+                    "value": [
+                        {
+                            "value": "'medium'",
+                            "computed": false
+                        },
+                        {
+                            "value": "'large'",
+                            "computed": false
+                        }
+                    ]
+                },
+                "required": false,
+                "description": "Size for visual picker",
+                "defaultValue": {
+                    "value": "'medium'",
+                    "computed": false
+                }
+            }
+        },
+        "route": "visual-pickers",
+        "display-name": "Visual Pickers",
+        "SLDS-component-path": "/components/visual-picker",
+        "dependencies": []
     }
 }
diff --git a/components/global-header/__docs__/__snapshots__/storybook-stories.storyshot b/components/global-header/__docs__/__snapshots__/storybook-stories.storyshot
@@ -51,7 +51,6 @@ exports[`DOM snapshots SLDSGlobalHeader Doc site Default 1`] = `
               <div
                 aria-expanded={false}
                 aria-haspopup="listbox"
-                aria-owns="header-search-custom-id-listbox"
                 className="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click ignore-react-onclickoutside"
                 role="combobox"
               >
@@ -62,7 +61,6 @@ exports[`DOM snapshots SLDSGlobalHeader Doc site Default 1`] = `
                   <input
                     aria-activedescendant={null}
                     aria-autocomplete="list"
-                    aria-controls="header-search-custom-id-listbox"
                     autoComplete="off"
                     className="slds-input slds-combobox__input"
                     id="header-search-custom-id"
@@ -537,7 +535,6 @@ exports[`DOM snapshots SLDSGlobalHeader Search + Navigation 1`] = `
               <div
                 aria-expanded={false}
                 aria-haspopup="listbox"
-                aria-owns="header-search-custom-id-listbox"
                 className="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click ignore-react-onclickoutside"
                 role="combobox"
               >
@@ -548,7 +545,6 @@ exports[`DOM snapshots SLDSGlobalHeader Search + Navigation 1`] = `
                   <input
                     aria-activedescendant={null}
                     aria-autocomplete="list"
-                    aria-controls="header-search-custom-id-listbox"
                     autoComplete="off"
                     className="slds-input slds-combobox__input"
                     id="header-search-custom-id"
@@ -914,7 +910,6 @@ exports[`DOM snapshots SLDSGlobalHeader With custom <Avatar/> 1`] = `
               <div
                 aria-expanded={false}
                 aria-haspopup="listbox"
-                aria-owns="header-search-custom-id-listbox"
                 className="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click ignore-react-onclickoutside"
                 role="combobox"
               >
@@ -925,7 +920,6 @@ exports[`DOM snapshots SLDSGlobalHeader With custom <Avatar/> 1`] = `
                   <input
                     aria-activedescendant={null}
                     aria-autocomplete="list"
-                    aria-controls="header-search-custom-id-listbox"
                     autoComplete="off"
                     className="slds-input slds-combobox__input"
                     id="header-search-custom-id"

diff --git a/components/input/__docs__/__snapshots__/storybook-stories.storyshot b/components/input/__docs__/__snapshots__/storybook-stories.storyshot
@@ -1616,7 +1616,6 @@ exports[`DOM snapshots SLDSInput Field Level Help 1`] = `
         }
       >
         <button
-          aria-describedby="field-level-help-tooltip"
           aria-disabled={true}
           className="slds-button slds-button_icon"
           disabled={false}
@@ -1712,7 +1711,7 @@ exports[`DOM snapshots SLDSInput Field Level Help, Tooltip Open 1`] = `
             Help
           </span>
         </button>
-        <section
+        <div
           className="absolute-positioned slds-nubbin_bottom-left slds-popover slds-popover_tooltip"
           id="field-level-help-tooltip"
           onKeyDown={[Function]}
@@ -1730,7 +1729,7 @@ exports[`DOM snapshots SLDSInput Field Level Help, Tooltip Open 1`] = `
           >
             Some helpful information
           </div>
-        </section>
+        </div>
       </div>
       <div
         className="slds-form-element__control"