From 20a431e48c041fb2d0cccfebf1373db18748b6fc Mon Sep 17 00:00:00 2001
From: Kevin Vandy <kevinvandy656@gmail.com>
Date: Thu, 29 Sep 2022 21:40:42 -0500
Subject: [PATCH] fix detail panels crashing while isLoading is true

---
 .../examples/advanced/sandbox/package.json    |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../examples/basic/sandbox/package.json       |  2 +-
 .../column-actions-space/sandbox/package.json |  2 +-
 .../column-alignment/sandbox/package.json     |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../editing-crud/sandbox/package.json         |  2 +-
 .../enable-click-to-copy/sandbox/package.json |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../enable-detail-panel/sandbox/package.json  |  2 +-
 .../enable-editing-cell/sandbox/package.json  |  2 +-
 .../enable-editing-modal/sandbox/package.json |  2 +-
 .../enable-editing-row/sandbox/package.json   |  2 +-
 .../enable-editing-table/sandbox/package.json |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../enable-row-dragging/sandbox/package.json  |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../enable-row-ordering/sandbox/package.json  |  2 +-
 .../enable-row-selection/sandbox/package.json |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../enable-sticky-header/sandbox/package.json |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../export-to-csv/sandbox/package.json        |  2 +-
 .../font-awesome-icons/sandbox/package.json   |  2 +-
 .../infinite-scrolling/sandbox/package.json   |  2 +-
 .../localization-i18n-cs/sandbox/package.json |  2 +-
 .../localization-i18n-de/sandbox/package.json |  2 +-
 .../localization-i18n-es/sandbox/package.json |  2 +-
 .../localization-i18n-ja/sandbox/package.json |  2 +-
 .../localization-i18n-pl/sandbox/package.json |  2 +-
 .../sandbox/package.json                      |  2 +-
 .../localization-i18n-ru/sandbox/package.json |  2 +-
 .../manual-selection/sandbox/package.json     |  2 +-
 .../memoize-cells/sandbox/package.json        |  2 +-
 .../memoize-rows/sandbox/package.json         |  2 +-
 .../memoize-table-body/sandbox/package.json   |  2 +-
 .../examples/minimal/sandbox/package.json     |  2 +-
 .../examples/mui-theme/sandbox/package.json   |  2 +-
 .../examples/react-query/sandbox/package.json |  2 +-
 .../examples/remote/sandbox/package.json      |  2 +-
 .../single-row-selection/sandbox/package.json |  2 +-
 material-react-table-docs/package.json        |  2 +-
 material-react-table-docs/yarn.lock           |  8 +++----
 package.json                                  |  2 +-
 src/body/MRT_TableDetailPanel.tsx             |  8 ++++++-
 stories/features/Loading.stories.tsx          | 22 ++++++++++++++++++-
 58 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/material-react-table-docs/examples/advanced/sandbox/package.json b/material-react-table-docs/examples/advanced/sandbox/package.json
index 6ae635ed8..dded3f33d 100644
--- a/material-react-table-docs/examples/advanced/sandbox/package.json
+++ b/material-react-table-docs/examples/advanced/sandbox/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.10.6",
     "@mui/x-date-pickers": "^5.0.2",
     "dayjs": "^1.11.5",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json b/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json
index b17734726..7c7d96ac4 100644
--- a/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json
+++ b/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/alternate-detail-panel/sandbox/package.json b/material-react-table-docs/examples/alternate-detail-panel/sandbox/package.json
index 218c20d88..c04eabcc6 100644
--- a/material-react-table-docs/examples/alternate-detail-panel/sandbox/package.json
+++ b/material-react-table-docs/examples/alternate-detail-panel/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/basic/sandbox/package.json b/material-react-table-docs/examples/basic/sandbox/package.json
index 1b4ab7489..b4efec7f6 100644
--- a/material-react-table-docs/examples/basic/sandbox/package.json
+++ b/material-react-table-docs/examples/basic/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/column-actions-space/sandbox/package.json b/material-react-table-docs/examples/column-actions-space/sandbox/package.json
index 4a4af0060..b26ea6e88 100644
--- a/material-react-table-docs/examples/column-actions-space/sandbox/package.json
+++ b/material-react-table-docs/examples/column-actions-space/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/column-alignment/sandbox/package.json b/material-react-table-docs/examples/column-alignment/sandbox/package.json
index 0b196f143..09d545e9f 100644
--- a/material-react-table-docs/examples/column-alignment/sandbox/package.json
+++ b/material-react-table-docs/examples/column-alignment/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/customize-display-columns/sandbox/package.json b/material-react-table-docs/examples/customize-display-columns/sandbox/package.json
index a649ac2ae..6cd094f54 100644
--- a/material-react-table-docs/examples/customize-display-columns/sandbox/package.json
+++ b/material-react-table-docs/examples/customize-display-columns/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/customize-filter-components/sandbox/package.json b/material-react-table-docs/examples/customize-filter-components/sandbox/package.json
index c18357041..8994eb676 100644
--- a/material-react-table-docs/examples/customize-filter-components/sandbox/package.json
+++ b/material-react-table-docs/examples/customize-filter-components/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/customize-filter-modes/sandbox/package.json b/material-react-table-docs/examples/customize-filter-modes/sandbox/package.json
index 7106fc767..2861cb1c1 100644
--- a/material-react-table-docs/examples/customize-filter-modes/sandbox/package.json
+++ b/material-react-table-docs/examples/customize-filter-modes/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/customize-filter-variants/sandbox/package.json b/material-react-table-docs/examples/customize-filter-variants/sandbox/package.json
index 5883ca984..dfd41de27 100644
--- a/material-react-table-docs/examples/customize-filter-variants/sandbox/package.json
+++ b/material-react-table-docs/examples/customize-filter-variants/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/customize-row-selection/sandbox/package.json b/material-react-table-docs/examples/customize-row-selection/sandbox/package.json
index f5eb0ee48..785af797a 100644
--- a/material-react-table-docs/examples/customize-row-selection/sandbox/package.json
+++ b/material-react-table-docs/examples/customize-row-selection/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/disable-column-actions/sandbox/package.json b/material-react-table-docs/examples/disable-column-actions/sandbox/package.json
index 7f7c0079f..2a2bb2546 100644
--- a/material-react-table-docs/examples/disable-column-actions/sandbox/package.json
+++ b/material-react-table-docs/examples/disable-column-actions/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/disable-column-filters/sandbox/package.json b/material-react-table-docs/examples/disable-column-filters/sandbox/package.json
index 7c4413030..65db6b58f 100644
--- a/material-react-table-docs/examples/disable-column-filters/sandbox/package.json
+++ b/material-react-table-docs/examples/disable-column-filters/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/disable-column-hiding/sandbox/package.json b/material-react-table-docs/examples/disable-column-hiding/sandbox/package.json
index d360c0607..98efa7d1a 100644
--- a/material-react-table-docs/examples/disable-column-hiding/sandbox/package.json
+++ b/material-react-table-docs/examples/disable-column-hiding/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/disable-density-toggle/sandbox/package.json b/material-react-table-docs/examples/disable-density-toggle/sandbox/package.json
index ff1054e8a..ec7c995c6 100644
--- a/material-react-table-docs/examples/disable-density-toggle/sandbox/package.json
+++ b/material-react-table-docs/examples/disable-density-toggle/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/editing-crud/sandbox/package.json b/material-react-table-docs/examples/editing-crud/sandbox/package.json
index d8abe898c..17380d75a 100644
--- a/material-react-table-docs/examples/editing-crud/sandbox/package.json
+++ b/material-react-table-docs/examples/editing-crud/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-click-to-copy/sandbox/package.json b/material-react-table-docs/examples/enable-click-to-copy/sandbox/package.json
index 8bd6751b3..a30c85ea4 100644
--- a/material-react-table-docs/examples/enable-click-to-copy/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-click-to-copy/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-column-ordering/sandbox/package.json b/material-react-table-docs/examples/enable-column-ordering/sandbox/package.json
index 7c7f4825d..b01437306 100644
--- a/material-react-table-docs/examples/enable-column-ordering/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-column-ordering/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-column-pinning/sandbox/package.json b/material-react-table-docs/examples/enable-column-pinning/sandbox/package.json
index ef1933bca..9b4703fa6 100644
--- a/material-react-table-docs/examples/enable-column-pinning/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-column-pinning/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-column-resizing/sandbox/package.json b/material-react-table-docs/examples/enable-column-resizing/sandbox/package.json
index b2543e2f2..ab86df262 100644
--- a/material-react-table-docs/examples/enable-column-resizing/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-column-resizing/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-detail-panel/sandbox/package.json b/material-react-table-docs/examples/enable-detail-panel/sandbox/package.json
index 2ae3f0b33..61a136922 100644
--- a/material-react-table-docs/examples/enable-detail-panel/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-detail-panel/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-editing-cell/sandbox/package.json b/material-react-table-docs/examples/enable-editing-cell/sandbox/package.json
index e64ffaada..3cc28e0e7 100644
--- a/material-react-table-docs/examples/enable-editing-cell/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-editing-cell/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-editing-modal/sandbox/package.json b/material-react-table-docs/examples/enable-editing-modal/sandbox/package.json
index b195d5e3a..91edd1c4b 100644
--- a/material-react-table-docs/examples/enable-editing-modal/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-editing-modal/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-editing-row/sandbox/package.json b/material-react-table-docs/examples/enable-editing-row/sandbox/package.json
index 82e545985..416cf885f 100644
--- a/material-react-table-docs/examples/enable-editing-row/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-editing-row/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-editing-table/sandbox/package.json b/material-react-table-docs/examples/enable-editing-table/sandbox/package.json
index 28de74f8d..55b8f08a0 100644
--- a/material-react-table-docs/examples/enable-editing-table/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-editing-table/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-expanding-tree/sandbox/package.json b/material-react-table-docs/examples/enable-expanding-tree/sandbox/package.json
index efed2bbce..e11ed05b6 100644
--- a/material-react-table-docs/examples/enable-expanding-tree/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-expanding-tree/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-dragging/sandbox/package.json b/material-react-table-docs/examples/enable-row-dragging/sandbox/package.json
index a7cd9b3de..0fa912457 100644
--- a/material-react-table-docs/examples/enable-row-dragging/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-dragging/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-numbers-original/sandbox/package.json b/material-react-table-docs/examples/enable-row-numbers-original/sandbox/package.json
index a12e67c64..129375552 100644
--- a/material-react-table-docs/examples/enable-row-numbers-original/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-numbers-original/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-numbers-static/sandbox/package.json b/material-react-table-docs/examples/enable-row-numbers-static/sandbox/package.json
index 6d9b72dac..42802876d 100644
--- a/material-react-table-docs/examples/enable-row-numbers-static/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-numbers-static/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-ordering/sandbox/package.json b/material-react-table-docs/examples/enable-row-ordering/sandbox/package.json
index bb4b6cbb2..eb33d6532 100644
--- a/material-react-table-docs/examples/enable-row-ordering/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-ordering/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-selection/sandbox/package.json b/material-react-table-docs/examples/enable-row-selection/sandbox/package.json
index 5728c8fca..a8d849947 100644
--- a/material-react-table-docs/examples/enable-row-selection/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-selection/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-row-virtualization/sandbox/package.json b/material-react-table-docs/examples/enable-row-virtualization/sandbox/package.json
index e2a409a32..c8e73b13e 100644
--- a/material-react-table-docs/examples/enable-row-virtualization/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-row-virtualization/sandbox/package.json
@@ -14,7 +14,7 @@
     "@faker-js/faker": "^7.5.0",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/enable-sticky-header/sandbox/package.json b/material-react-table-docs/examples/enable-sticky-header/sandbox/package.json
index 142acad64..29cd0bad9 100644
--- a/material-react-table-docs/examples/enable-sticky-header/sandbox/package.json
+++ b/material-react-table-docs/examples/enable-sticky-header/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/expanding-tree-expanded/sandbox/package.json b/material-react-table-docs/examples/expanding-tree-expanded/sandbox/package.json
index 9f1890063..ea89cf323 100644
--- a/material-react-table-docs/examples/expanding-tree-expanded/sandbox/package.json
+++ b/material-react-table-docs/examples/expanding-tree-expanded/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/export-to-csv/sandbox/package.json b/material-react-table-docs/examples/export-to-csv/sandbox/package.json
index debf62ae7..f33816b5e 100644
--- a/material-react-table-docs/examples/export-to-csv/sandbox/package.json
+++ b/material-react-table-docs/examples/export-to-csv/sandbox/package.json
@@ -14,7 +14,7 @@
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
     "export-to-csv": "^0.2.1",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/font-awesome-icons/sandbox/package.json b/material-react-table-docs/examples/font-awesome-icons/sandbox/package.json
index ac5b97e2a..96708ad59 100644
--- a/material-react-table-docs/examples/font-awesome-icons/sandbox/package.json
+++ b/material-react-table-docs/examples/font-awesome-icons/sandbox/package.json
@@ -16,7 +16,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/infinite-scrolling/sandbox/package.json b/material-react-table-docs/examples/infinite-scrolling/sandbox/package.json
index 7ecc83deb..18fa691d9 100644
--- a/material-react-table-docs/examples/infinite-scrolling/sandbox/package.json
+++ b/material-react-table-docs/examples/infinite-scrolling/sandbox/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.10.6",
     "@tanstack/react-query": "^4.3.9",
     "axios": "^0.27.2",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-cs/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-cs/sandbox/package.json
index fd6f8c3b3..ca5e631a5 100644
--- a/material-react-table-docs/examples/localization-i18n-cs/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-cs/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-de/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-de/sandbox/package.json
index d260a6722..66d6aa78f 100644
--- a/material-react-table-docs/examples/localization-i18n-de/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-de/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-es/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-es/sandbox/package.json
index 7f1e53d5c..628d5b810 100644
--- a/material-react-table-docs/examples/localization-i18n-es/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-es/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-ja/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-ja/sandbox/package.json
index 4b82d84b4..bce4a5b29 100644
--- a/material-react-table-docs/examples/localization-i18n-ja/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-ja/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-pl/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-pl/sandbox/package.json
index e39775b5c..2eea037e0 100644
--- a/material-react-table-docs/examples/localization-i18n-pl/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-pl/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-pt-BR/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-pt-BR/sandbox/package.json
index 3a9e82bdc..e39e88352 100644
--- a/material-react-table-docs/examples/localization-i18n-pt-BR/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-pt-BR/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/localization-i18n-ru/sandbox/package.json b/material-react-table-docs/examples/localization-i18n-ru/sandbox/package.json
index 92612e182..624014857 100644
--- a/material-react-table-docs/examples/localization-i18n-ru/sandbox/package.json
+++ b/material-react-table-docs/examples/localization-i18n-ru/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/manual-selection/sandbox/package.json b/material-react-table-docs/examples/manual-selection/sandbox/package.json
index 0769b4cfa..c3b136d28 100644
--- a/material-react-table-docs/examples/manual-selection/sandbox/package.json
+++ b/material-react-table-docs/examples/manual-selection/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/memoize-cells/sandbox/package.json b/material-react-table-docs/examples/memoize-cells/sandbox/package.json
index a33344cf1..e53c9915e 100644
--- a/material-react-table-docs/examples/memoize-cells/sandbox/package.json
+++ b/material-react-table-docs/examples/memoize-cells/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/memoize-rows/sandbox/package.json b/material-react-table-docs/examples/memoize-rows/sandbox/package.json
index 8b4e60fe6..0a1972ed6 100644
--- a/material-react-table-docs/examples/memoize-rows/sandbox/package.json
+++ b/material-react-table-docs/examples/memoize-rows/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/memoize-table-body/sandbox/package.json b/material-react-table-docs/examples/memoize-table-body/sandbox/package.json
index 4de7d9fc1..aa72c7a79 100644
--- a/material-react-table-docs/examples/memoize-table-body/sandbox/package.json
+++ b/material-react-table-docs/examples/memoize-table-body/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/minimal/sandbox/package.json b/material-react-table-docs/examples/minimal/sandbox/package.json
index 03d9ca0b6..b19c5c5e5 100644
--- a/material-react-table-docs/examples/minimal/sandbox/package.json
+++ b/material-react-table-docs/examples/minimal/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/mui-theme/sandbox/package.json b/material-react-table-docs/examples/mui-theme/sandbox/package.json
index d242a176d..282b45a6b 100644
--- a/material-react-table-docs/examples/mui-theme/sandbox/package.json
+++ b/material-react-table-docs/examples/mui-theme/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/react-query/sandbox/package.json b/material-react-table-docs/examples/react-query/sandbox/package.json
index 92184084d..bd7adb243 100644
--- a/material-react-table-docs/examples/react-query/sandbox/package.json
+++ b/material-react-table-docs/examples/react-query/sandbox/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.10.6",
     "@tanstack/react-query": "^4.3.9",
     "axios": "^0.27.2",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/remote/sandbox/package.json b/material-react-table-docs/examples/remote/sandbox/package.json
index c70fbec5e..b5489ab5e 100644
--- a/material-react-table-docs/examples/remote/sandbox/package.json
+++ b/material-react-table-docs/examples/remote/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/examples/single-row-selection/sandbox/package.json b/material-react-table-docs/examples/single-row-selection/sandbox/package.json
index 63b3e8d28..787c2b9f1 100644
--- a/material-react-table-docs/examples/single-row-selection/sandbox/package.json
+++ b/material-react-table-docs/examples/single-row-selection/sandbox/package.json
@@ -13,7 +13,7 @@
     "@emotion/styled": "^11.10.4",
     "@mui/icons-material": "^5.10.6",
     "@mui/material": "^5.10.6",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/material-react-table-docs/package.json b/material-react-table-docs/package.json
index c9bf3d6be..68862454e 100644
--- a/material-react-table-docs/package.json
+++ b/material-react-table-docs/package.json
@@ -27,7 +27,7 @@
     "axios": "^0.27.2",
     "dayjs": "^1.11.5",
     "export-to-csv": "^0.2.1",
-    "material-react-table": "^1.2.0",
+    "material-react-table": "^1.2.1",
     "next": "12.3.1",
     "next-sitemap": "^3.1.22",
     "prism-react-renderer": "^1.3.5",
diff --git a/material-react-table-docs/yarn.lock b/material-react-table-docs/yarn.lock
index f5e3ae63b..00bcf1b7c 100644
--- a/material-react-table-docs/yarn.lock
+++ b/material-react-table-docs/yarn.lock
@@ -2265,10 +2265,10 @@ markdown-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3"
   integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==
 
-material-react-table@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/material-react-table/-/material-react-table-1.2.0.tgz#62cab112b29cbe35bc2a1489bf3dbb68fd000242"
-  integrity sha512-eRexr9DXeau3rHv3i4Tsyu9AnEwQKxE4r1IzjvVkzblG6+EhOW5aq+FG0zY+CYjQkmGg0rJkVWRZYtK736vEVA==
+material-react-table@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/material-react-table/-/material-react-table-1.2.1.tgz#f584cf7ba8eaedc3e3b1ba83d2a78c964d34fe30"
+  integrity sha512-MwZUhNv7AHHRhG+Qw3CrvLLG6enPPLF30iKBytmOLnHUxur+Wzj6FX957A3xZKfCF2czgTGzehJMFTJUlSEQQg==
   dependencies:
     "@tanstack/match-sorter-utils" "8.1.1"
     "@tanstack/react-table" "8.5.13"
diff --git a/package.json b/package.json
index 6344d4a9d..433919663 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",
diff --git a/src/body/MRT_TableDetailPanel.tsx b/src/body/MRT_TableDetailPanel.tsx
index 8ffa131ba..67d00e7bd 100644
--- a/src/body/MRT_TableDetailPanel.tsx
+++ b/src/body/MRT_TableDetailPanel.tsx
@@ -10,12 +10,14 @@ interface Props {
 export const MRT_TableDetailPanel: FC<Props> = ({ row, table }) => {
   const {
     getVisibleLeafColumns,
+    getState,
     options: {
       muiTableBodyRowProps,
       muiTableDetailPanelProps,
       renderDetailPanel,
     },
   } = table;
+  const { isLoading } = getState();
 
   const tableRowProps =
     muiTableBodyRowProps instanceof Function
@@ -44,7 +46,11 @@ export const MRT_TableDetailPanel: FC<Props> = ({ row, table }) => {
         })}
       >
         {renderDetailPanel && (
-          <Collapse unmountOnExit mountOnEnter in={row.getIsExpanded()}>
+          <Collapse
+            in={!isLoading && row.getIsExpanded()}
+            mountOnEnter
+            unmountOnExit
+          >
             {renderDetailPanel({ row, table })}
           </Collapse>
         )}
diff --git a/stories/features/Loading.stories.tsx b/stories/features/Loading.stories.tsx
index 93c4ff129..e42b7397c 100644
--- a/stories/features/Loading.stories.tsx
+++ b/stories/features/Loading.stories.tsx
@@ -44,7 +44,27 @@ const data = [...Array(100)].map(() => ({
 }));
 
 export const LoadingExample: Story<MaterialReactTableProps> = () => (
-  <MaterialReactTable columns={columns} data={[]} state={{ isLoading: true }} />
+  <MaterialReactTable
+    columns={columns}
+    data={[]}
+    state={{ isLoading: true }}
+  />
+);
+
+export const LoadingWithDetailPanelExample: Story<MaterialReactTableProps> = () => (
+  <MaterialReactTable
+    columns={columns}
+    data={[]}
+    state={{ isLoading: true }}
+    renderDetailPanel={({ row }) => (
+      <div style={{ display: 'grid' }}>
+        <span>City: {row.original.firstName}</span>
+        <span>State: {row.original.state}</span>
+        <span>Address: {row.original.address}</span>
+        <span>Phone: {row.original.phoneNumber}</span>
+      </div>
+    )}
+  />
 );
 
 export const SkeletonDisplayColumns: Story<MaterialReactTableProps> = () => (