@windstream/react-shared-components 0.1.67 → 0.1.69

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

@@ -1,107 +1,107 @@
-"use client";
-
-import React from "react";
-import {
-  backdropAnimationVariants,
-  contentAnimationVariants,
-  sizeToPixel,
-} from "./constants";
-import { ModalProps } from "./types";
-import { motion } from "framer-motion";
-
-import * as Dialog from "@radix-ui/react-dialog";
-import { MaterialIcon } from "@shared/components/material-icon";
-import { Text } from "@shared/components/text";
-import { Button } from "@shared/contentful/blocks/button";
-import { cx } from "@shared/utils";
-
-type ExtendedModalProps = ModalProps & {
-  type?: string;
-  index?: number;
-};
-export const Modal: React.FC<ExtendedModalProps> = props => {
-  const {
-    isOpen,
-    onRequestClose,
-    size,
-    title,
-    content,
-    description,
-    children,
-    bodyClassName,
-    type = "modal",
-    index = 0,
-  } = props;
-
-  return (
-    <Dialog.Root
-      open={isOpen}
-      onOpenChange={() => isOpen && onRequestClose?.()}
-    >
-      <Dialog.Portal>
-        <motion.div
-          initial="closed"
-          animate={isOpen ? "open" : "closed"}
-          variants={backdropAnimationVariants}
-          transition={{ type: "tween", duration: 0.2, ease: "easeInOut" }}
-          className="fixed inset-0 z-[1000] bg-scrim-bg-modal"
-        >
-          <Dialog.Overlay />
-        </motion.div>
-        <div className="pointer-events-none fixed inset-0 z-[1001] flex items-center justify-center">
-          <motion.div
-            initial="closed"
-            animate={isOpen ? "open" : "closed"}
-            variants={contentAnimationVariants}
-            transition={{ type: "tween", duration: 0.3, ease: "easeInOut" }}
-            className="pointer-events-auto w-[calc(100vw-10px)] focus:outline-none sm:w-[calc(100vw-90px)]"
-          >
-            <Dialog.Content
-              className={cx(
-                "relative mx-auto w-full rounded-modal bg-bg p-[25px] shadow-drop focus:outline-none",
-                bodyClassName
-              )}
-              style={{ maxWidth: sizeToPixel[size || "lg"] }}
-            >
-              <div data-section-type={type} data-section-index={index}>
-                <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(
-                        "mb-3 mt-5 w-full pr-8 text-center sm:pr-0",
-                        "heading5 md:pt-0",
-                        "mb-4 md:mb-[60px]"
-                      )}
-                      as="h2"
-                    >
-                      {title}
-                    </Text>
-                  ) : null}
-
-                  {description ? (
-                    <Text as="div" className="mb-8 sm:mb-5">
-                      {description}
-                    </Text>
-                  ) : null}
-
-                  <div className="flex flex-col gap-4 sm:gap-5">
-                    {content}
-                    {children ? children : null}
-                  </div>
-                </div>
-              </div>
-            </Dialog.Content>
-          </motion.div>
-        </div>
-      </Dialog.Portal>
-    </Dialog.Root>
-  );
-};
+"use client";
+
+import React from "react";
+import {
+  backdropAnimationVariants,
+  contentAnimationVariants,
+  sizeToPixel,
+} from "./constants";
+import { ModalProps } from "./types";
+import { motion } from "framer-motion";
+
+import * as Dialog from "@radix-ui/react-dialog";
+import { MaterialIcon } from "@shared/components/material-icon";
+import { Text } from "@shared/components/text";
+import { Button } from "@shared/contentful/blocks/button";
+import { cx } from "@shared/utils";
+
+type ExtendedModalProps = ModalProps & {
+  type?: string;
+  index?: number;
+};
+export const Modal: React.FC<ExtendedModalProps> = props => {
+  const {
+    isOpen,
+    onRequestClose,
+    size,
+    title,
+    content,
+    description,
+    children,
+    bodyClassName,
+    type = "modal",
+    index = 0,
+  } = props;
+
+  return (
+    <Dialog.Root
+      open={isOpen}
+      onOpenChange={() => isOpen && onRequestClose?.()}
+    >
+      <Dialog.Portal>
+        <motion.div
+          initial="closed"
+          animate={isOpen ? "open" : "closed"}
+          variants={backdropAnimationVariants}
+          transition={{ type: "tween", duration: 0.2, ease: "easeInOut" }}
+          className="fixed inset-0 z-[1000] bg-scrim-bg-modal"
+        >
+          <Dialog.Overlay />
+        </motion.div>
+        <div className="pointer-events-none fixed inset-0 z-[1001] flex items-center justify-center">
+          <motion.div
+            initial="closed"
+            animate={isOpen ? "open" : "closed"}
+            variants={contentAnimationVariants}
+            transition={{ type: "tween", duration: 0.3, ease: "easeInOut" }}
+            className="pointer-events-auto w-[calc(100vw-10px)] focus:outline-none sm:w-[calc(100vw-90px)]"
+          >
+            <Dialog.Content
+              className={cx(
+                "relative mx-auto w-full rounded-modal bg-bg p-[25px] shadow-drop focus:outline-none",
+                bodyClassName
+              )}
+              style={{ maxWidth: sizeToPixel[size || "lg"] }}
+            >
+              <div data-section-type={type} data-section-index={index}>
+                <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(
+                        "mb-3 mt-5 w-full pr-8 text-center sm:pr-0",
+                        "heading5 md:pt-0",
+                        "mb-4 md:mb-[60px]"
+                      )}
+                      as="h2"
+                    >
+                      {title}
+                    </Text>
+                  ) : null}
+
+                  {description ? (
+                    <Text as="div" className="mb-8 sm:mb-5">
+                      {description}
+                    </Text>
+                  ) : null}
+
+                  <div className="flex flex-col gap-4 sm:gap-5">
+                    {content}
+                    {children ? children : null}
+                  </div>
+                </div>
+              </div>
+            </Dialog.Content>
+          </motion.div>
+        </div>
+      </Dialog.Portal>
+    </Dialog.Root>
+  );
+};

package/src/contentful/blocks/modal/types.ts

@@ -1,12 +1,12 @@
-import React from "react";
-
-export type ModalProps = {
-  isOpen: boolean;
-  onRequestClose?: () => void;
-  size?: "lg" | "md" | "sm" | "xl" | "xs";
-  title?: string;
-  description?: React.ReactNode;
-  content?: React.ReactNode;
-  children?: React.ReactNode;
-  bodyClassName?: string;
-};
+import React from "react";
+
+export type ModalProps = {
+  isOpen: boolean;
+  onRequestClose?: () => void;
+  size?: "lg" | "md" | "sm" | "xl" | "xs";
+  title?: string;
+  description?: React.ReactNode;
+  content?: React.ReactNode;
+  children?: React.ReactNode;
+  bodyClassName?: string;
+};

package/src/contentful/blocks/navigation/desktop-link-groups.tsx/index.tsx

@@ -1,113 +1,124 @@
-import React, { CSSProperties } from "react";
-
-import { MaterialIcon } from "@shared/components/material-icon";
-import { Text } from "@shared/components/text";
-import { Button } from "@shared/contentful/blocks/button";
-import { ButtonProps as ContentfulButtonProps } from "@shared/contentful/blocks/button/types";
-import { useOutsideClick } from "@shared/hooks/use-outside-click";
-import { cx } from "@shared/utils";
-
-type ComponentButtonGroup = {
-  anchorId?: string | null;
-  title?: string | null;
-  items?: { items?: ContentfulButtonProps[] | null } | null;
-};
-
-type Link = ContentfulButtonProps | ComponentButtonGroup;
-
-type LinkGroupsProps = {
-  link?: Link;
-  anchorName: string;
-};
-
-const isButton = (link: Link): link is ContentfulButtonProps => {
-  // If your group never has `href`, this is a simple and effective guard
-  return typeof (link as ContentfulButtonProps).href === "string";
-};
-
-export const DesktopLinkGroups: React.FC<LinkGroupsProps> = ({
-  link,
-  anchorName,
-}) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-
-  const ref = React.useRef<HTMLDivElement>(null);
-  useOutsideClick(ref, () => setIsOpen(false));
-
-  if (!link) return null;
-
-  // Single button
-  if (isButton(link)) {
-    return (
-      <Button
-        key={`submenu-link-btn-${link.anchorId}`}
-        {...link}
-        linkClassName="body3 flex items-center text-text h-full"
-        linkVariant="unstyled"
-      />
-    );
-  }
-
-  // Group
-  const { anchorId, title, items } = link;
-  const subMenu = Array.isArray(items?.items) ? items!.items! : [];
-  const fullAnchorName = `--link-anchor-${anchorName}`;
-
-  return (
-    <div
-      className="relative h-full"
-      style={{ anchorName: fullAnchorName } as CSSProperties}
-      ref={ref}
-    >
-      <Button
-        onClick={() => setIsOpen(prev => !prev)}
-        aria-expanded={isOpen}
-        buttonClassName="group body3 flex h-full text-text items-center"
-        key={anchorId}
-        showButtonAs="unstyled"
-      >
-        <Text as="span" className="group-hover:underline">
-          {title ?? null}
-        </Text>
-        <MaterialIcon
-          weight="200"
-          size={24}
-          className="text-icon-secondary group-hover:opacity-50"
-          name={isOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"}
-        />
-      </Button>
-
-      <div
-        className={cx(
-          "shadow-navDrop fixed z-[1001] min-w-44 rounded-input-poppers border border-border bg-bg",
-          "transition-[opacity,transform] ease-out",
-          isOpen && subMenu.length > 0
-            ? "pointer-events-auto translate-y-0 opacity-100 duration-75"
-            : "pointer-events-none -translate-y-2 opacity-0 duration-0"
-        )}
-        style={
-          {
-            positionAnchor: fullAnchorName,
-            top: "anchor(bottom)",
-            left: "calc((anchor(left) + anchor(right)) / 2)",
-            translate: "-50% 0",
-          } as CSSProperties
-        }
-      >
-        <ul className="flex flex-col gap-2 py-2">
-          {subMenu.map((site, index) => {
-            return (
-              <li key={`submenu-link-${index}`} className="submenu-link">
-                <Button
-                  {...site}
-                  linkVariant="unstyled"
-                  linkClassName="body3 px-4 hover:bg-bg-surface-hover flex items-center w-full h-11 text-text-link"
-                />
-              </li>
-            );
-          })}
-        </ul>
-      </div>
-    </div>
-  );
-};
+import React, { CSSProperties } from "react";
+
+import { MaterialIcon } from "@shared/components/material-icon";
+import { Text } from "@shared/components/text";
+import { Button } from "@shared/contentful/blocks/button";
+import { ButtonProps as ContentfulButtonProps } from "@shared/contentful/blocks/button/types";
+import { useOutsideClick } from "@shared/hooks/use-outside-click";
+import { cx } from "@shared/utils";
+
+type ComponentButtonGroup = {
+  anchorId?: string | null;
+  title?: string | null;
+  items?: { items?: ContentfulButtonProps[] | null } | null;
+};
+
+type Link = ContentfulButtonProps | ComponentButtonGroup;
+
+type LinkGroupsProps = {
+  link?: Link;
+  anchorName: string;
+};
+
+const isButton = (link: Link): link is ContentfulButtonProps => {
+  // If your group never has `href`, this is a simple and effective guard
+  return typeof (link as ContentfulButtonProps).href === "string";
+};
+
+export const DesktopLinkGroups: React.FC<LinkGroupsProps> = ({
+  link,
+  anchorName,
+}) => {
+  const [isOpen, setIsOpen] = React.useState(false);
+
+  const ref = React.useRef<HTMLDivElement>(null);
+  useOutsideClick(ref, () => setIsOpen(false));
+
+  if (!link) return null;
+
+  // Single button
+  if (isButton(link)) {
+    return (
+      <Button
+        key={`submenu-link-btn-${link.anchorId}`}
+        {...link}
+        linkClassName="body3 flex items-center text-text h-full"
+        linkVariant="unstyled"
+      />
+    );
+  }
+
+  // Group
+  const { anchorId, title, items } = link;
+  const subMenu = Array.isArray(items?.items) ? items!.items! : [];
+  const fullAnchorName = `--link-anchor-${anchorName}`;
+
+  return (
+    <div
+      className="relative h-full"
+      style={{ anchorName: fullAnchorName } as CSSProperties}
+      ref={ref}
+    >
+      <Button
+        onClick={() => setIsOpen(prev => !prev)}
+        aria-expanded={isOpen}
+        buttonClassName="group body3 flex h-full text-text items-center"
+        key={anchorId}
+        showButtonAs="unstyled"
+      >
+        <Text as="span" className="group-hover:underline">
+          {title ?? null}
+        </Text>
+        <MaterialIcon
+          weight="200"
+          size={24}
+          className="text-icon-secondary group-hover:opacity-50"
+          name={isOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"}
+        />
+      </Button>
+
+      <div
+        className={cx(
+          "shadow-navDrop fixed z-[1001] min-w-44 rounded-input-poppers border border-border bg-bg",
+          "transition-[opacity,transform] ease-out",
+          isOpen && subMenu.length > 0
+            ? "pointer-events-auto translate-y-0 opacity-100 duration-75"
+            : "pointer-events-none -translate-y-2 opacity-0 duration-0"
+        )}
+        style={
+          {
+            positionAnchor: fullAnchorName,
+            top: "anchor(bottom)",
+            left: "calc((anchor(left) + anchor(right)) / 2)",
+            translate: "-50% 0",
+          } as CSSProperties
+        }
+      >
+        <ul
+          className="flex flex-col gap-2 py-2"
+          onClick={event => {
+            // Close the popup when a submenu link is clicked.
+            // Required for Pages Router where this component persists across
+            // client-side navigations and `isOpen` would otherwise stay true.
+            const target = event.target as HTMLElement | null;
+            if (target?.closest("a")) {
+              setIsOpen(false);
+            }
+          }}
+        >
+          {subMenu.map((site, index) => {
+            return (
+              <li key={`submenu-link-${index}`} className="submenu-link">
+                <Button
+                  {...site}
+                  linkVariant="unstyled"
+                  linkClassName="body3 px-4 hover:bg-bg-surface-hover flex items-center w-full h-11 text-text-link"
+                />
+              </li>
+            );
+          })}
+        </ul>
+      </div>
+    </div>
+  );
+};