@yourdash/uikit 1.0.2 → 1.0.3

package/views/carousel/carousel.tsx

@@ -1,138 +1,138 @@
-import page from "@yourdash/web/src/deprecatedLogin/Page.tsx";
-import React, { useEffect, useRef, useState } from "react";
-import Card from "../../components/card/card.tsx";
-import Container from "../../components/container/container.tsx";
-import { UKIcon } from "../../components/icon/iconDictionary.ts";
-import IconButton from "../../components/iconButton/iconButton.tsx";
-import styles from "./carousel.module.scss";
-import clippy from "@yourdash/shared/web/helpers/clippy.ts";
-
-const Carousel: React.FC<{
-  items: { element: React.ReactElement; id: string }[];
-  className?: string;
-}> = ({ items, className }) => {
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const [currentPage, setCurrentPage] = useState<number>(0);
-
-  useEffect(() => {
-    const scrollElement = scrollRef.current;
-
-    if (!scrollElement) return;
-
-    console.log(Array.from(scrollElement.children));
-
-    let timer: Timer;
-    let listener = () => {
-      clearTimeout(timer);
-      timer = setTimeout(function () {
-        Array.from(scrollElement.children).forEach((ele: Element, index: number) => {
-          if (
-            Math.abs(
-              ele.getBoundingClientRect().left +
-                ele.getBoundingClientRect().width / 2 -
-                (scrollElement.getBoundingClientRect().left + scrollElement.getBoundingClientRect().width / 2),
-            ) <
-            ele.getBoundingClientRect().width / 2
-          ) {
-            setCurrentPage(index);
-            return;
-          }
-        });
-      }, 25);
-    };
-
-    scrollElement.addEventListener("scroll", listener);
-
-    return () => {
-      scrollElement.removeEventListener("scroll", listener);
-      clearTimeout(timer);
-    };
-  }, []);
-
-  return (
-    <Container className={clippy(styles.containerComponent, className)}>
-      <div
-        className={styles.component}
-        ref={scrollRef}
-      >
-        {items.map((child) => {
-          return (
-            <div
-              key={child.id}
-              className={styles.page}
-            >
-              {child.element}
-            </div>
-          );
-        })}
-      </div>
-      <div className={styles.controls}>
-        <IconButton
-          accessibleLabel={"previous page"}
-          icon={UKIcon.ChevronLeft}
-          className={styles.pageControl}
-          onClick={() => {
-            const scrollElement = scrollRef.current;
-
-            if (!scrollElement) {
-              return;
-            }
-
-            const carouselTargetPage = scrollElement.children[currentPage - 1] as HTMLDivElement;
-
-            if (!carouselTargetPage) {
-              return;
-            }
-
-            carouselTargetPage.scrollIntoView({ behavior: "smooth" });
-          }}
-        />
-        <Card className={styles.indicator}>
-          {items.map((page, index) => {
-            return (
-              <button
-                key={page.id}
-                className={clippy(styles.pageIndicator, index === currentPage && styles.selected)}
-                onClick={() => {
-                  const scrollElement = scrollRef.current;
-
-                  if (!scrollElement) {
-                    return;
-                  }
-
-                  scrollElement.scrollIntoView({ behavior: "smooth" });
-
-                  const carouselTargetPage = scrollElement.children[index] as HTMLDivElement;
-
-                  carouselTargetPage.scrollIntoView({ behavior: "smooth" });
-                }}
-              />
-            );
-          })}
-        </Card>
-        <IconButton
-          accessibleLabel={"next page"}
-          icon={UKIcon.ChevronRight}
-          className={styles.pageControl}
-          onClick={() => {
-            const scrollElement = scrollRef.current;
-
-            if (!scrollElement) {
-              return;
-            }
-
-            const carouselTargetPage = scrollElement.children[currentPage + 1] as HTMLDivElement;
-
-            if (!carouselTargetPage) {
-              return;
-            }
-
-            carouselTargetPage.scrollIntoView({ behavior: "smooth" });
-          }}
-        />
-      </div>
-    </Container>
-  );
-};
-
-export default Carousel;
+import page from "@yourdash/web/src/deprecatedLogin/Page.tsx";
+import React, { useEffect, useRef, useState } from "react";
+import Card from "../../components/card/card.tsx";
+import Container from "../../components/container/container.tsx";
+import { UKIcon } from "../../components/icon/iconDictionary.ts";
+import IconButton from "../../components/iconButton/iconButton.tsx";
+import styles from "./carousel.module.scss";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+
+const Carousel: React.FC<{
+  items: { element: React.ReactElement; id: string }[];
+  className?: string;
+}> = ({ items, className }) => {
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const [currentPage, setCurrentPage] = useState<number>(0);
+
+  useEffect(() => {
+    const scrollElement = scrollRef.current;
+
+    if (!scrollElement) return;
+
+    console.log(Array.from(scrollElement.children));
+
+    let timer: Timer;
+    let listener = () => {
+      clearTimeout(timer);
+      timer = setTimeout(function () {
+        Array.from(scrollElement.children).forEach((ele: Element, index: number) => {
+          if (
+            Math.abs(
+              ele.getBoundingClientRect().left +
+                ele.getBoundingClientRect().width / 2 -
+                (scrollElement.getBoundingClientRect().left + scrollElement.getBoundingClientRect().width / 2),
+            ) <
+            ele.getBoundingClientRect().width / 2
+          ) {
+            setCurrentPage(index);
+            return;
+          }
+        });
+      }, 25);
+    };
+
+    scrollElement.addEventListener("scroll", listener);
+
+    return () => {
+      scrollElement.removeEventListener("scroll", listener);
+      clearTimeout(timer);
+    };
+  }, []);
+
+  return (
+    <Container className={clippy(styles.containerComponent, className)}>
+      <div
+        className={styles.component}
+        ref={scrollRef}
+      >
+        {items.map((child) => {
+          return (
+            <div
+              key={child.id}
+              className={styles.page}
+            >
+              {child.element}
+            </div>
+          );
+        })}
+      </div>
+      <div className={styles.controls}>
+        <IconButton
+          accessibleLabel={"previous page"}
+          icon={UKIcon.ChevronLeft}
+          className={styles.pageControl}
+          onClick={() => {
+            const scrollElement = scrollRef.current;
+
+            if (!scrollElement) {
+              return;
+            }
+
+            const carouselTargetPage = scrollElement.children[currentPage - 1] as HTMLDivElement;
+
+            if (!carouselTargetPage) {
+              return;
+            }
+
+            carouselTargetPage.scrollIntoView({ behavior: "smooth" });
+          }}
+        />
+        <Card className={styles.indicator}>
+          {items.map((page, index) => {
+            return (
+              <button
+                key={page.id}
+                className={clippy(styles.pageIndicator, index === currentPage && styles.selected)}
+                onClick={() => {
+                  const scrollElement = scrollRef.current;
+
+                  if (!scrollElement) {
+                    return;
+                  }
+
+                  scrollElement.scrollIntoView({ behavior: "smooth" });
+
+                  const carouselTargetPage = scrollElement.children[index] as HTMLDivElement;
+
+                  carouselTargetPage.scrollIntoView({ behavior: "smooth" });
+                }}
+              />
+            );
+          })}
+        </Card>
+        <IconButton
+          accessibleLabel={"next page"}
+          icon={UKIcon.ChevronRight}
+          className={styles.pageControl}
+          onClick={() => {
+            const scrollElement = scrollRef.current;
+
+            if (!scrollElement) {
+              return;
+            }
+
+            const carouselTargetPage = scrollElement.children[currentPage + 1] as HTMLDivElement;
+
+            if (!carouselTargetPage) {
+              return;
+            }
+
+            carouselTargetPage.scrollIntoView({ behavior: "smooth" });
+          }}
+        />
+      </div>
+    </Container>
+  );
+};
+
+export default Carousel;

package/views/header/header.module.scss

@@ -1,16 +1,16 @@
-/*!
- * Copyright ©2024 Ewsgit <https://ewsgit.uk> and YourDash <https://yourdash.ewsgit.uk> contributors.
- * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
- */
-
-@import "@yourdash/uikit/theme/themeValues";
-
-.view {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: var(#{$theme+$padding});
-  padding-top: calc(var(#{$theme+$padding}) * 4);
-  padding-bottom: calc(var(#{$theme+$padding}) * 4);
-}
+/*!
+ * Copyright ©2024 Ewsgit <https://ewsgit.uk> and YourDash <https://yourdash.ewsgit.uk> contributors.
+ * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
+ */
+
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.view {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(#{$theme+$padding});
+  padding-top: calc(var(#{$theme+$padding}) * 4);
+  padding-bottom: calc(var(#{$theme+$padding}) * 4);
+}

package/views/header/header.tsx

@@ -1,28 +1,28 @@
-/*
- * Copyright ©2024 Ewsgit <https://ewsgit.uk> and YourDash <https://yourdash.ewsgit.uk> contributors.
- * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
- */
-
-import React from "react";
-import Heading from "../../components/heading/heading.tsx";
-import styles from "./header.module.scss";
-
-const Header: React.FC<{ backgroundImage?: string; heading: string }> = ({ backgroundImage, heading }) => {
-  return (
-    <>
-      <div
-        className={styles.view}
-        style={
-          backgroundImage ? { backgroundImage: backgroundImage } : { backgroundImage: "linear-gradient(-45deg, #ff8093aa, #ffd264aa)" }
-        }
-      >
-        <Heading
-          level={1}
-          text={heading}
-        />
-      </div>
-    </>
-  );
-};
-
-export default Header;
+/*
+ * Copyright ©2024 Ewsgit <https://ewsgit.uk> and YourDash <https://yourdash.ewsgit.uk> contributors.
+ * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
+ */
+
+import React from "react";
+import Heading from "../../components/heading/heading.tsx";
+import styles from "./header.module.scss";
+
+const Header: React.FC<{ backgroundImage?: string; heading: string }> = ({ backgroundImage, heading }) => {
+  return (
+    <>
+      <div
+        className={styles.view}
+        style={
+          backgroundImage ? { backgroundImage: backgroundImage } : { backgroundImage: "linear-gradient(-45deg, #ff8093aa, #ffd264aa)" }
+        }
+      >
+        <Heading
+          level={1}
+          text={heading}
+        />
+      </div>
+    </>
+  );
+};
+
+export default Header;

package/views/infiniteScroll/infiniteScroll.module.scss

@@ -1,26 +1,26 @@
-/*!
- * Copyright ©2024 Ewsgit<https://ewsgit.uk> and YourDash<https://yourdash.ewsgit.uk> contributors.
- * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
- */
-
-@import "@yourdash/uikit/theme/themeValues";
-
-.component {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  gap: 1rem;
-  align-items: center;
-}
-
-.items {
-  height: 100%;
-}
-
-.endOfItems {
-  text-align: center;
-  padding: var(#{$theme+$padding});
-  gap: var(#{$theme+$gap});
-  width: calc(100% - calc(var(#{$theme+$padding}) * 2));
-}
+/*!
+ * Copyright ©2024 Ewsgit<https://ewsgit.uk> and YourDash<https://yourdash.ewsgit.uk> contributors.
+ * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
+ */
+
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.component {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  gap: 1rem;
+  align-items: center;
+}
+
+.items {
+  height: 100%;
+}
+
+.endOfItems {
+  text-align: center;
+  padding: var(#{$theme+$padding});
+  gap: var(#{$theme+$gap});
+  width: calc(100% - calc(var(#{$theme+$padding}) * 2));
+}

package/views/infiniteScroll/infiniteScroll.tsx

@@ -1,90 +1,90 @@
-/*
- *    Copyright ©2024 Ewsgit<https://ewsgit.uk> and YourDash<https://yourdash.ewsgit.uk> contributors.
- *    YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
- */
-
-import clippy from "@yourdash/shared/web/helpers/clippy.ts";
-import React, { useEffect, useState } from "react";
-import Heading from "../../components/heading/heading.tsx";
-import Separator from "../../components/separator/separator.tsx";
-import Text from "../../components/text/text.tsx";
-import styles from "./infiniteScroll.module.scss";
-
-const InfiniteScroll: React.FC<{
-  children: React.ReactNode | React.ReactNode[];
-  fetchNextPage: (nextPageNumber: number) => Promise<{ hasAnotherPage?: boolean }>;
-  containerClassName?: string;
-  className?: string;
-  resetState?: string;
-}> = ({ children, fetchNextPage, containerClassName, className, resetState }) => {
-  const endOfItemsRef = React.useRef<HTMLDivElement>(null);
-  const lastFetchedPage = React.useRef<number>(-1);
-  const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [isLastPage, setIsLastPage] = useState<boolean>(false);
-
-  useEffect(() => {
-    lastFetchedPage.current = -1;
-    setIsLoading(false);
-    setIsLastPage(false);
-    fetchNextPageWrapper();
-  }, [resetState]);
-
-  async function fetchNextPageWrapper() {
-    if (isLoading) return;
-    setIsLoading(true);
-    const { hasAnotherPage } = await fetchNextPage(lastFetchedPage.current + 1);
-    lastFetchedPage.current++;
-    setIsLoading(false);
-    setIsLastPage(hasAnotherPage || false);
-  }
-
-  useEffect(() => {
-    if (!endOfItemsRef.current) return;
-
-    const element: HTMLDivElement = endOfItemsRef.current;
-
-    const observer = new IntersectionObserver((elem) => {
-      console.log("observer update");
-      const isVisible = elem[0].isIntersecting;
-
-      if (isVisible) fetchNextPageWrapper();
-    });
-
-    observer.observe(element);
-  }, []);
-
-  // TODO: Use interaction observer to detect when the last item is shown on the screen and fetch the next page
-
-  return (
-    <div className={clippy(containerClassName, styles.component)}>
-      {/* @ts-ignore */}
-      {children?.length > 0 ? (
-        <div className={clippy(className, styles.items)}>{children}</div>
-      ) : (
-        <div className={"text-center"}>
-          <Heading
-            level={1}
-            text={"Whoops."}
-          />
-          <Separator direction={"column"} />
-          <Text text={"It looks like nothing could be found..."} />
-        </div>
-      )}
-      <div
-        ref={endOfItemsRef}
-        className={styles.endOfItems}
-      >
-        {isLoading && <Text text={"Loading more content"} />}
-        <Separator direction={"column"} />
-        {isLastPage && (
-          <Text
-            text={"No more items to load"}
-            className={styles.endOfItems}
-          />
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default InfiniteScroll;
+/*
+ *    Copyright ©2024 Ewsgit<https://ewsgit.uk> and YourDash<https://yourdash.ewsgit.uk> contributors.
+ *    YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
+ */
+
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+import React, { useEffect, useState } from "react";
+import Heading from "../../components/heading/heading.tsx";
+import Separator from "../../components/separator/separator.tsx";
+import Text from "../../components/text/text.tsx";
+import styles from "./infiniteScroll.module.scss";
+
+const InfiniteScroll: React.FC<{
+  children: React.ReactNode | React.ReactNode[];
+  fetchNextPage: (nextPageNumber: number) => Promise<{ hasAnotherPage?: boolean }>;
+  containerClassName?: string;
+  className?: string;
+  resetState?: string;
+}> = ({ children, fetchNextPage, containerClassName, className, resetState }) => {
+  const endOfItemsRef = React.useRef<HTMLDivElement>(null);
+  const lastFetchedPage = React.useRef<number>(-1);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [isLastPage, setIsLastPage] = useState<boolean>(false);
+
+  useEffect(() => {
+    lastFetchedPage.current = -1;
+    setIsLoading(false);
+    setIsLastPage(false);
+    fetchNextPageWrapper();
+  }, [resetState]);
+
+  async function fetchNextPageWrapper() {
+    if (isLoading) return;
+    setIsLoading(true);
+    const { hasAnotherPage } = await fetchNextPage(lastFetchedPage.current + 1);
+    lastFetchedPage.current++;
+    setIsLoading(false);
+    setIsLastPage(hasAnotherPage || false);
+  }
+
+  useEffect(() => {
+    if (!endOfItemsRef.current) return;
+
+    const element: HTMLDivElement = endOfItemsRef.current;
+
+    const observer = new IntersectionObserver((elem) => {
+      console.log("observer update");
+      const isVisible = elem[0].isIntersecting;
+
+      if (isVisible) fetchNextPageWrapper();
+    });
+
+    observer.observe(element);
+  }, []);
+
+  // TODO: Use interaction observer to detect when the last item is shown on the screen and fetch the next page
+
+  return (
+    <div className={clippy(containerClassName, styles.component)}>
+      {/* @ts-ignore */}
+      {children?.length > 0 ? (
+        <div className={clippy(className, styles.items)}>{children}</div>
+      ) : (
+        <div className={"text-center"}>
+          <Heading
+            level={1}
+            text={"Whoops."}
+          />
+          <Separator direction={"column"} />
+          <Text text={"It looks like nothing could be found..."} />
+        </div>
+      )}
+      <div
+        ref={endOfItemsRef}
+        className={styles.endOfItems}
+      >
+        {isLoading && <Text text={"Loading more content"} />}
+        <Separator direction={"column"} />
+        {isLastPage && (
+          <Text
+            text={"No more items to load"}
+            className={styles.endOfItems}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default InfiniteScroll;

package/views/navBar/components/navImage/navImage.module.scss

@@ -1,7 +1,7 @@
-@import "../../../../theme/themeValues";
-
-.component {
-    height: calc(var(--nav-height) - var(#{$theme+$padding}));
-    aspect-ratio: 1 / 1;
-    border-radius: 0;
-}
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.component {
+    height: calc(var(--nav-height) - var(#{$theme+$padding}));
+    aspect-ratio: 1 / 1;
+    border-radius: 0;
+}

package/views/navBar/components/navImage/navImage.tsx

@@ -1,15 +1,15 @@
-import React from "react";
-import Image from "../../../../components/image/image.tsx";
-import styles from "./navImage.module.scss";
-
-const NavImage: React.FC<{ src: string }> = ({ src }) => {
-  return (
-    <Image
-      accessibleLabel=""
-      src={src}
-      className={styles.component}
-    />
-  );
-};
-
-export default NavImage;
+import React from "react";
+import Image from "../../../../components/image/image.tsx";
+import styles from "./navImage.module.scss";
+
+const NavImage: React.FC<{ src: string }> = ({ src }) => {
+  return (
+    <Image
+      accessibleLabel=""
+      src={src}
+      className={styles.component}
+    />
+  );
+};
+
+export default NavImage;