@mackin.com/styleguide 8.0.0-beta.20 → 8.0.0-beta.21

package/index.js

@@ -1123,7 +1123,7 @@ const useLogger = (componentName, enabled) => {
     return (...messages) => {
         if (enabled) {
             // tslint:disable-next-line
-            console.log(componentName, ...messages);
+            console.log(`[${componentName}]`, ...messages);
         }
     };
 };
@@ -1463,17 +1463,22 @@ const Modal = (p) => {
     const theme = useThemeSafely();
     const hasHeader = p.closeButton || p.heading;
     const contentRef = React__default['default'].useRef(null);
-    const log = useLogger(`Modal ${(_a = p.id) !== null && _a !== void 0 ? _a : '?'}`, (_b = p.__debug) !== null && _b !== void 0 ? _b : false);
+    const log = useLogger((_a = p.id) !== null && _a !== void 0 ? _a : 'Modal', (_b = p.__debug) !== null && _b !== void 0 ? _b : false);
+    const tryRemoveBodyStyles = () => {
+        if (backdrop.showCount <= 1 && htmlBodyStyles) {
+            log('backdrop.showCount', backdrop.showCount, 'removing singleton htmlBodyStyles');
+            document.body.classList.remove(htmlBodyStyles);
+        }
+    };
     React.useEffect(() => {
         log('mounted');
         return () => {
             var _a;
             // handle the use of modals that are rendered only as show=true and then unmounted.
-            backdrop.setShow(false, (_a = p.id) !== null && _a !== void 0 ? _a : 'Modal');
-            log('backdrop.setShow', false);
-            if (backdrop.showCount <= 1 && htmlBodyStyles) {
-                log('backdrop.showCount', backdrop.showCount, 'removing htmlBodyStyles');
-                document.body.classList.remove(htmlBodyStyles);
+            if (p.show) {
+                backdrop.setShow(false, (_a = p.id) !== null && _a !== void 0 ? _a : 'Modal');
+                log('backdrop.setShow', false);
+                tryRemoveBodyStyles();
             }
             log('un-mounted');
         };
@@ -1491,14 +1496,11 @@ const Modal = (p) => {
             });
         }
         if (show) {
-            log('adding htmlBodyStyles');
+            log('adding singleton htmlBodyStyles');
             document.body.classList.add(htmlBodyStyles);
         }
         else {
-            if (backdrop.showCount <= 1) {
-                log('backdrop.showCount', backdrop.showCount, 'removing htmlBodyStyles');
-                document.body.classList.remove(htmlBodyStyles);
-            }
+            tryRemoveBodyStyles();
         }
     }, p.show);
     React__default['default'].useLayoutEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mackin.com/styleguide",
-	"version": "8.0.0-beta.20",
+	"version": "8.0.0-beta.21",
 	"description": "",
 	"main": "./index.js",
 	"types": "./index.d.ts",