From 510e7f45739190ea7972acde03cce0b7751ac3c9 Mon Sep 17 00:00:00 2001
From: Kamran Ayub <kamran.ayub@gmail.com>
Date: Tue, 24 Jul 2018 09:09:27 -0500
Subject: [PATCH 1/3] Add some docs for disabled elements

---
 docs/src/pages/demos/tooltips/DisabledTooltips.js | 15 +++++++++++++++
 docs/src/pages/demos/tooltips/tooltips.md         |  6 ++++++
 2 files changed, 21 insertions(+)
 create mode 100644 docs/src/pages/demos/tooltips/DisabledTooltips.js

diff --git a/docs/src/pages/demos/tooltips/DisabledTooltips.js b/docs/src/pages/demos/tooltips/DisabledTooltips.js
new file mode 100644
index 00000000000000..9fe32a1323f366
--- /dev/null
+++ b/docs/src/pages/demos/tooltips/DisabledTooltips.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import Button from '@material-ui/core/Button';
+import Tooltip from '@material-ui/core/Tooltip';
+
+function DisabledTooltips() {
+  return (
+    <Tooltip title="You don't have permission to do this">
+      <span>
+        <Button disabled>A Disabled Button</Button>
+      </span>
+    </Tooltip>
+  );
+}
+
+export default DisabledTooltips;
diff --git a/docs/src/pages/demos/tooltips/tooltips.md b/docs/src/pages/demos/tooltips/tooltips.md
index b5bc40cbff2d0f..59727cf1048860 100644
--- a/docs/src/pages/demos/tooltips/tooltips.md
+++ b/docs/src/pages/demos/tooltips/tooltips.md
@@ -46,6 +46,12 @@ On mobile, the tooltip is displayed when the user longpresses the element and hi
 
 {{"demo": "pages/demos/tooltips/DelayTooltips.js"}}
 
+## Disabled Elements
+
+By default disabled elements like `Button` do not trigger user interactions so a `Tooltip` will not activate on normal events like hover. To accomodate disabled elements, add a simple wrapper element like a `span`.
+
+{{"demo": "pages/demos/tooltips/DisabledTooltips.js"}}
+
 ## Customized Tooltips
 
 {{"demo": "pages/demos/tooltips/CustomizedTooltips.js"}}

From 3454cc569bf9e274115dc26be50ecc081a468e51 Mon Sep 17 00:00:00 2001
From: Kamran Ayub <kamran.ayub@gmail.com>
Date: Tue, 24 Jul 2018 09:22:03 -0500
Subject: [PATCH 2/3] Add next.js reference

---
 pages/demos/tooltips.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pages/demos/tooltips.js b/pages/demos/tooltips.js
index 4b303049d5ab07..0bbdbe525e59f4 100644
--- a/pages/demos/tooltips.js
+++ b/pages/demos/tooltips.js
@@ -57,6 +57,13 @@ module.exports = require('fs')
   .readFileSync(require.resolve('docs/src/pages/demos/tooltips/CustomizedTooltips'), 'utf8')
 `,
         },
+        'pages/demos/tooltips/DisabledTooltips.js': {
+          js: require('docs/src/pages/demos/tooltips/DisabledTooltips').default,
+          raw: preval`
+module.exports = require('fs')
+  .readFileSync(require.resolve('docs/src/pages/demos/tooltips/DisabledTooltips'), 'utf8')
+`,
+        }
       }}
     />
   );

From cc552841ec51dbb0aa43a926bd9f33397f5e4654 Mon Sep 17 00:00:00 2001
From: Matthew Brookes <github@nospam.33m.co>
Date: Tue, 24 Jul 2018 16:37:19 +0100
Subject: [PATCH 3/3] Fix eslint

---
 pages/demos/tooltips.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/demos/tooltips.js b/pages/demos/tooltips.js
index 0bbdbe525e59f4..7c10b8cc4547d3 100644
--- a/pages/demos/tooltips.js
+++ b/pages/demos/tooltips.js
@@ -63,7 +63,7 @@ module.exports = require('fs')
 module.exports = require('fs')
   .readFileSync(require.resolve('docs/src/pages/demos/tooltips/DisabledTooltips'), 'utf8')
 `,
-        }
+        },
       }}
     />
   );