Merge pull request #1491 from garygong/tooltip

Add Field Level Help and Inline Help variants to Input

Author: interactivellama

components/component-docs.json

@@ -4507,6 +4507,13 @@
                 "required": false,
                 "description": "Message to display when the input is in an error state. When this is present, also visually highlights the component as in error."
             },
+            "fieldLevelHelpTooltip": {
+                "type": {
+                    "name": "node"
+                },
+                "required": false,
+                "description": "A [Tooltip](https://react.lightningdesignsystem.com/components/tooltips/) component that is displayed next to the label. The props from the component will be merged and override any default props."
+            },
             "fixedTextLeft": {
                 "type": {
                     "name": "union",
@@ -4565,6 +4572,13 @@
                 "required": false,
                 "description": "Every input must have a unique ID in order to support keyboard navigation and ARIA support."
             },
+            "inlineHelpText": {
+                "type": {
+                    "name": "string"
+                },
+                "required": false,
+                "description": "Displays help text under the input."
+            },
             "inputRef": {
                 "type": {
                     "name": "func"

components/input/__docs__/site-stories.js

@@ -8,6 +8,8 @@ const siteStories = [
 	require('raw-loader!@salesforce/design-system-react/components/input/__examples__/icons.jsx'),
 	require('raw-loader!@salesforce/design-system-react/components/input/__examples__/error.jsx'),
 	require('raw-loader!@salesforce/design-system-react/components/input/__examples__/inactiveInputs.jsx'),
+	require('raw-loader!@salesforce/design-system-react/components/input/__examples__/inline-help.jsx'),
+	require('raw-loader!@salesforce/design-system-react/components/input/__examples__/field-level-help.jsx'),
 ];
 
 module.exports = siteStories;