From 8e406e78e7b8419a1f0bbe6527e287f2b14fcabb Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Wed, 15 Jan 2020 09:34:53 +0100
Subject: [PATCH 1/4] fix #19210 use <span> as default tag to prevent error log
 if Skeleton text is used in inline html tags like <p>

---
 packages/material-ui-lab/src/Skeleton/Skeleton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.js b/packages/material-ui-lab/src/Skeleton/Skeleton.js
index c4696edc76d578..0da634a4dde3af 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.js
@@ -74,7 +74,7 @@ const Skeleton = React.forwardRef(function Skeleton(props, ref) {
     animation = 'pulse',
     classes,
     className,
-    component: Component = 'div',
+    component: Component = ['rect', 'circle'].includes(props.variant) ? 'div' : 'span',
     height,
     variant = 'text',
     width,

From 5bdd0a8a00440a4165f15a1d5970da0ee3e990e8 Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Wed, 15 Jan 2020 10:15:37 +0100
Subject: [PATCH 2/4] fix IE11 compatibility

---
 packages/material-ui-lab/src/Skeleton/Skeleton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.js b/packages/material-ui-lab/src/Skeleton/Skeleton.js
index 0da634a4dde3af..ca76a25e66afbe 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.js
@@ -74,7 +74,7 @@ const Skeleton = React.forwardRef(function Skeleton(props, ref) {
     animation = 'pulse',
     classes,
     className,
-    component: Component = ['rect', 'circle'].includes(props.variant) ? 'div' : 'span',
+    component: Component = ['rect', 'circle'].indexOf(props.variant) > -1 ? 'div' : 'span',
     height,
     variant = 'text',
     width,

From c73f3be64b80b6f39a36adf7e418323897b9a4eb Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Wed, 15 Jan 2020 10:22:53 +0100
Subject: [PATCH 3/4] update test cases for Skeleton

---
 .../src/Skeleton/Skeleton.test.js             | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
index 502c377c676722..932dc986d66d53 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
@@ -20,6 +20,27 @@ describe('<Skeleton />', () => {
   });
 
   describeConformance(<Skeleton />, () => ({
+    classes,
+    inheritComponent: 'span',
+    mount,
+    refInstanceof: window.HTMLSpanElement,
+  }));
+
+  describeConformance(<Skeleton variant="text" />, () => ({
+    classes,
+    inheritComponent: 'span',
+    mount,
+    refInstanceof: window.HTMLSpanElement,
+  }));
+
+  describeConformance(<Skeleton variant="rect" />, () => ({
+    classes,
+    inheritComponent: 'div',
+    mount,
+    refInstanceof: window.HTMLDivElement,
+  }));
+
+  describeConformance(<Skeleton variant="circle" />, () => ({
     classes,
     inheritComponent: 'div',
     mount,

From c4547fd5c1267ce81801395752e097178fd10318 Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Wed, 15 Jan 2020 10:29:31 +0100
Subject: [PATCH 4/4] remove unnecessary describeConformance tests for skeleton

---
 .../src/Skeleton/Skeleton.test.js             | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
index 932dc986d66d53..8d9323a15595a7 100644
--- a/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
+++ b/packages/material-ui-lab/src/Skeleton/Skeleton.test.js
@@ -26,27 +26,6 @@ describe('<Skeleton />', () => {
     refInstanceof: window.HTMLSpanElement,
   }));
 
-  describeConformance(<Skeleton variant="text" />, () => ({
-    classes,
-    inheritComponent: 'span',
-    mount,
-    refInstanceof: window.HTMLSpanElement,
-  }));
-
-  describeConformance(<Skeleton variant="rect" />, () => ({
-    classes,
-    inheritComponent: 'div',
-    mount,
-    refInstanceof: window.HTMLDivElement,
-  }));
-
-  describeConformance(<Skeleton variant="circle" />, () => ({
-    classes,
-    inheritComponent: 'div',
-    mount,
-    refInstanceof: window.HTMLDivElement,
-  }));
-
   it('should render', () => {
     const { container } = render(<Skeleton />);