@windstream/react-shared-components 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windstream/react-shared-components",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "type": "module",
   "description": "Shared React components for Kinetic applications",
   "main": "dist/index.js",

package/src/components/modal/index.tsx

@@ -1,171 +1,164 @@
-"use client";
-
-import React, { useEffect, useMemo, useState } from "react";
-import useBodyScrollLock from "../../hooks/use-body-scroll-lock";
-import { cx } from "../../utils";
-import { Button } from "../button";
-import { MaterialIcon } from "../material-icon";
-import { Animation, ModalProps, Shape, Size } from "./types";
-import ReactModal from "react-modal";
-import { Transition } from "react-transition-group";
-
-type ExtendedModalProps = ModalProps & {
-  bodyAttributes?: React.HTMLAttributes<HTMLDivElement>;
-};
-
-const Modal: React.FC<ExtendedModalProps> = ({
-  size = "md",
-  shape = "default",
-  animation = "popper",
-  centered,
-  title,
-  isOpen,
-  children,
-  bodyStyle,
-  className,
-  bodyClassName,
-  portalClassName,
-  overlayClassName,
-  closeButtonClassName,
-  closeWrapperClassName,
-  onRequestClose,
-  parentSelector,
-  hideScrollOnIsOpenFalse = true,
-  hideCloseButton = false,
-  bodyAttributes,
-  ...modalProps
-}: ExtendedModalProps) => {
-  // Use the custom hook to lock/unlock the body scroll when the modal is open/closed.
-  useBodyScrollLock(isOpen, hideScrollOnIsOpenFalse);
-
-  // Animation cannot run at the same time as the modal opening
-  const [isTransitioning, setIsTransitioning] = useState(false);
-
-  useEffect(() => {
-    // Run animation one frame after rendering the modal
-    setIsTransitioning(isOpen);
-  }, [isOpen]);
-
-  const parent = useMemo(() => {
-    /* istanbul ignore next */ if (typeof document === "undefined") return null;
-    let parent = document.querySelector("main") || document.body;
-    if (parentSelector)
-      parent = document.querySelector(parentSelector) || document.body;
-
-    return parent;
-  }, [parentSelector]);
-
-  if (!parent) return null;
-
-  // Don't render anything when modal is closed
-  if (!isOpen) {
-    return null;
-  }
-
-  const getSizeClasses = (size: Size) => {
-    const sizeMap = {
-      xl: "inset-[5%] min-h-fit",
-      lg: "inset-[10%] min-h-fit",
-      md: "inset-[15%] min-h-fit",
-      sm: "top-[18%] w-[640px]",
-      xs: "w-[calc(100%-30px)]",
-    };
-    return sizeMap[size];
-  };
-
-  const getAnimationClasses = (animation: Animation, state: string) => {
-    if (animation === "popper") {
-      const baseClasses = "transition-transform duration-300";
-      if (state === "entering" || state === "entered") {
-        return `${baseClasses} opacity-100 ${state === "entered" ? "translate-y-0 pointer-events-auto" : ""}`;
-      }
-      if (state === "exiting" || state === "exited") {
-        return `${baseClasses} opacity-0 translate-y-[-18px] duration-[180ms]`;
-      }
-      return `${baseClasses} opacity-0 translate-y-[-18px]`;
-    }
-    if (animation === "bottomSheet") {
-      const baseClasses = "transition-transform duration-200 ease-in-out";
-      if (state === "entering" || state === "entered") {
-        return `${baseClasses} opacity-100 ${state === "entered" ? "translate-y-0 pointer-events-auto" : ""}`;
-      }
-      if (state === "exiting" || state === "exited") {
-        return `${baseClasses} opacity-0 translate-y-full duration-[180ms]`;
-      }
-      return `${baseClasses} opacity-0 translate-y-full`;
-    }
-    return "";
-  };
-
-  return (
-    <Transition enter={true} exit={true} in={isTransitioning} timeout={0}>
-      {(state: string) => (
-        <ReactModal
-          ariaHideApp={false}
-          isOpen={isOpen}
-          onRequestClose={onRequestClose}
-          closeTimeoutMS={0}
-          parentSelector={() => parent}
-          className={cx(
-            "absolute min-w-[150px] max-w-[calc(100vw-30px)] overflow-auto rounded-lg bg-white outline-none",
-            getSizeClasses(size),
-            shape === "rounded" && "rounded-3xl",
-            centered && "top-0 translate-y-[calc(50vh-50%)]",
-            getAnimationClasses(animation, state),
-            className
-          )}
-          portalClassName={cx("z-80", portalClassName)}
-          overlayClassName={cx(
-            "z-80 fixed inset-0 bg-black/50 flex items-center justify-center pb-[300px]",
-            overlayClassName
-          )}
-          {...modalProps}
-        >
-          <div {...bodyAttributes}>
-            {!hideCloseButton && (
-              <div className={cx(closeWrapperClassName)}>
-                <Button
-                  className={cx(
-                    "absolute right-0 top-0 float-right h-6 cursor-pointer p-5 text-text",
-                    closeButtonClassName
-                  )}
-                  onClick={onRequestClose as () => void}
-                  data-testid="close-button"
-                  data-track-element-name="modal_close_button"
-                  data-track-click-text="Close Modal"
-                  data-track-element-clicked="modal"
-                >
-                  <MaterialIcon name="close" size={24} />
-                </Button>
-              </div>
-            )}
-
-            {title ? (
-              <div
-                className={cx(
-                  "border-b border-border-secondary-on-bg-fill px-[7px] py-[7px] text-text"
-                )}
-              >
-                {title}
-              </div>
-            ) : null}
-            <div
-              className={cx("p-5", bodyClassName)}
-              style={bodyStyle}
-              data-testid={modalProps["data-testid"]}
-              data-cy={modalProps["data-cy"]}
-            >
-              {children}
-            </div>
-          </div>
-        </ReactModal>
-      )}
-    </Transition>
-  );
-};
-
-export { Modal };
-
-Modal.displayName = "Modal";
-
-export type { ModalProps, Size, Shape, Animation };
+"use client";
+
+import React, { useEffect, useMemo, useState } from "react";
+import useBodyScrollLock from "../../hooks/use-body-scroll-lock";
+import { cx } from "../../utils";
+import { Button } from "../button";
+import { MaterialIcon } from "../material-icon";
+import { Animation, ModalProps, Shape, Size } from "./types";
+import ReactModal from "react-modal";
+import { Transition } from "react-transition-group";
+
+const Modal: React.FC<ModalProps> = ({
+  size = "md",
+  shape = "default",
+  animation = "popper",
+  centered,
+  title,
+  isOpen,
+  children,
+  bodyStyle,
+  className,
+  bodyClassName,
+  portalClassName,
+  overlayClassName,
+  closeButtonClassName,
+  closeWrapperClassName,
+  onRequestClose,
+  parentSelector,
+  hideScrollOnIsOpenFalse = true,
+  hideCloseButton = false,
+  ...modalProps
+}: ModalProps) => {
+  // Use the custom hook to lock/unlock the body scroll when the modal is open/closed.
+  useBodyScrollLock(isOpen, hideScrollOnIsOpenFalse);
+
+  // Animation cannot run at the same time as the modal opening
+  const [isTransitioning, setIsTransitioning] = useState(false);
+
+  useEffect(() => {
+    // Run animation one frame after rendering the modal
+    setIsTransitioning(isOpen);
+  }, [isOpen]);
+
+  const parent = useMemo(() => {
+    /* istanbul ignore next */ if (typeof document === "undefined") return null;
+    let parent = document.querySelector("main") || document.body;
+    if (parentSelector)
+      parent = document.querySelector(parentSelector) || document.body;
+
+    return parent;
+  }, [parentSelector]);
+
+  if (!parent) return null;
+
+  // Don't render anything when modal is closed
+  if (!isOpen) {
+    return null;
+  }
+
+  const getSizeClasses = (size: Size) => {
+    const sizeMap = {
+      xl: "inset-[5%] min-h-fit",
+      lg: "inset-[10%] min-h-fit",
+      md: "inset-[15%] min-h-fit",
+      sm: "top-[18%] w-[640px]",
+      xs: "w-[calc(100%-30px)]",
+    };
+    return sizeMap[size];
+  };
+
+  const getAnimationClasses = (animation: Animation, state: string) => {
+    if (animation === "popper") {
+      const baseClasses = "transition-transform duration-300";
+      if (state === "entering" || state === "entered") {
+        return `${baseClasses} opacity-100 ${state === "entered" ? "translate-y-0 pointer-events-auto" : ""}`;
+      }
+      if (state === "exiting" || state === "exited") {
+        return `${baseClasses} opacity-0 translate-y-[-18px] duration-[180ms]`;
+      }
+      return `${baseClasses} opacity-0 translate-y-[-18px]`;
+    }
+    if (animation === "bottomSheet") {
+      const baseClasses = "transition-transform duration-200 ease-in-out";
+      if (state === "entering" || state === "entered") {
+        return `${baseClasses} opacity-100 ${state === "entered" ? "translate-y-0 pointer-events-auto" : ""}`;
+      }
+      if (state === "exiting" || state === "exited") {
+        return `${baseClasses} opacity-0 translate-y-full duration-[180ms]`;
+      }
+      return `${baseClasses} opacity-0 translate-y-full`;
+    }
+    return "";
+  };
+
+  return (
+    <Transition enter exit in={isTransitioning} timeout={0}>
+      {(state: string) => (
+        <ReactModal
+          ariaHideApp={false}
+          isOpen={isOpen}
+          onRequestClose={onRequestClose}
+          closeTimeoutMS={0}
+          parentSelector={() => parent}
+          className={cx(
+            "absolute min-w-[150px] max-w-[calc(100vw-30px)] overflow-auto rounded-lg bg-white outline-none",
+            getSizeClasses(size),
+            shape === "rounded" && "rounded-3xl",
+            centered && "top-0 translate-y-[calc(50vh-50%)]",
+            getAnimationClasses(animation, state),
+            className
+          )}
+          portalClassName={cx("z-80", portalClassName)}
+          overlayClassName={cx(
+            "z-80 fixed inset-0 bg-black/50 flex items-center justify-center pb-[300px]",
+            overlayClassName
+          )}
+          {...modalProps}
+        >
+          {!hideCloseButton && (
+            <div className={cx(closeWrapperClassName)}>
+              <Button
+                className={cx(
+                  "absolute right-0 top-0 float-right h-6 cursor-pointer p-5 text-text",
+                  closeButtonClassName
+                )}
+                onClick={onRequestClose as () => void}
+                data-testid="close-button"
+                data-track-element-name="modal_close_button"
+                data-track-click-text="Close Modal"
+                data-track-element-clicked="modal"
+              >
+                <MaterialIcon name="close" size={24} />
+              </Button>
+            </div>
+          )}
+
+          {title ? (
+            <div
+              className={cx(
+                "border-b border-border-secondary-on-bg-fill px-[7px] py-[7px] text-text"
+              )}
+            >
+              {title}
+            </div>
+          ) : null}
+          <div
+            className={cx("p-5", bodyClassName)}
+            style={bodyStyle}
+            data-testid={modalProps["data-testid"]}
+            data-cy={modalProps["data-cy"]}
+          >
+            {children}
+          </div>
+        </ReactModal>
+      )}
+    </Transition>
+  );
+};
+
+export { Modal };
+
+Modal.displayName = "Modal";
+
+export type { ModalProps, Size, Shape, Animation };

package/src/contentful/blocks/modal/index.tsx

@@ -15,7 +15,10 @@ import { Text } from "@shared/components/text";
 import { Button } from "@shared/contentful/blocks/button";
 import { cx } from "@shared/utils";
 
-export const Modal: React.FC<ModalProps> = props => {
+type ExtendedModalProps = ModalProps & {
+  containerAttributes?: React.HTMLAttributes<HTMLDivElement>;
+};
+export const Modal: React.FC<ExtendedModalProps> = props => {
   const {
     isOpen,
     onRequestClose,
@@ -25,6 +28,7 @@ export const Modal: React.FC<ModalProps> = props => {
     description,
     children,
     bodyClassName,
+    containerAttributes,
   } = props;
 
   return (
@@ -56,32 +60,34 @@ export const Modal: React.FC<ModalProps> = props => {
             )}
             style={{ maxWidth: sizeToPixel[size || "lg"] }}
           >
-            <Dialog.Close asChild={true}>
-              <Button
-                showButtonAs="unstyled"
-                buttonClassName="absolute right-0 top-0 mr-2 mt-2 bg-bg"
-              >
-                <MaterialIcon name="close" />
-              </Button>
-            </Dialog.Close>
-            <div className="custom-modal-body max-h-[85vh] overflow-visible">
-              {title ? (
-                <Text
-                  className={cx(
-                    "mx-auto mb-3 mt-5 text-center",
-                    "heading5 md:max-w-[80%] md:pt-0",
-                    "mb-5 md:mb-[60px]"
-                  )}
-                  as="h2"
+            <div {...containerAttributes}>
+              <Dialog.Close asChild={true}>
+                <Button
+                  showButtonAs="unstyled"
+                  buttonClassName="absolute right-0 top-0 mr-2 mt-2 bg-bg"
                 >
-                  {title}
-                </Text>
-              ) : null}
+                  <MaterialIcon name="close" />
+                </Button>
+              </Dialog.Close>
+              <div className="custom-modal-body max-h-[85vh] overflow-visible">
+                {title ? (
+                  <Text
+                    className={cx(
+                      "mx-auto mb-3 mt-5 text-center",
+                      "heading5 md:max-w-[80%] md:pt-0",
+                      "mb-5 md:mb-[60px]"
+                    )}
+                    as="h2"
+                  >
+                    {title}
+                  </Text>
+                ) : null}
 
-              {description ? <Text as="div">{description}</Text> : null}
+                {description ? <Text as="div">{description}</Text> : null}
 
-              {content}
-              {children ? children : null}
+                {content}
+                {children ? children : null}
+              </div>
             </div>
           </Dialog.Content>
         </motion.div>