@yourdash/uikit 1.0.1 → 1.0.3

package/components/icon/icon.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import { UKIcon } from "./iconDictionary.js";
+import { UKIcon } from "./iconDictionary.ts";
 import styles from "./icon.module.scss";
 import { FC } from "react";
 

package/components/iconButton/iconButton.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   font-family: var(#{$theme}#{$font}#{$family});

package/components/iconButton/iconButton.tsx

@@ -3,9 +3,9 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
-import Icon from "../icon/icon.js";
-import { UKIcon } from "../icon/iconDictionary.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+import Icon from "../icon/icon.tsx";
+import { UKIcon } from "../icon/iconDictionary.ts";
 import styles from "./iconButton.module.scss";
 import { FC } from "react";
 

package/components/image/image.module.scss

@@ -3,8 +3,79 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.componentContainer {
+  position: relative;
+}
 
 .component {
   border-radius: var(#{$theme}#{$radius});
+  opacity: 0;
+  max-width: 100%;
+  max-height: 100%;
+  min-width: 2rem;
+  min-height: 2rem;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  pointer-events: none;
+
+  &.noRounding {
+    border-radius: 0;
+  }
+}
+
+.loaded {
+  transition: opacity 750ms linear;
+  opacity: 1;
+}
+
+.loading {
+  @keyframes loading {
+    from {
+      background-position: calc(var(--background-size) * -1) calc(var(--background-size) * -1);
+    }
+
+    to {
+      background-position: var(--background-size) var(--background-size);
+    }
+  }
+
+  & {
+    background: linear-gradient(to bottom right, transparent 12.5%, #bbbbbb, #ffffff 25%, transparent 12.5%, transparent 12.5%, #bbbbbb, #ffffff 25%, transparent 12.5%);
+    background-repeat: no-repeat;
+    background-size: calc(var(--background-size) * 4) calc(var(--background-size) * 4);
+    animation: loading 1.25s infinite forwards cubic-bezier(0.25, 0.5, 0.5, 0.25);
+    box-shadow: inset 0 0 0.5rem #0003;
+  }
+}
+
+.serverError {
+  --size: 4rem;
+
+  @keyframes fail {
+    0% {
+      background-size: var(--background-size) var(--background-size);
+    }
+
+    50% {
+      background-size: calc(var(--background-size) * 4) calc(var(--background-size) * 4);
+    }
+
+    100% {
+      background-size: var(--background-size) var(--background-size);
+    }
+  }
+
+  & {
+    background: radial-gradient(transparent, #ff0000);
+    background-repeat: no-repeat;
+    background-size: var(--background-size) var(--background-size);
+    background-position: center center;
+    animation: fail 1s infinite forwards cubic-bezier(0.4, 0, 0.2, 1);
+    box-shadow: 0 0 1rem #fff;
+    border-radius: 0;
+  }
 }

package/components/image/image.tsx

@@ -3,25 +3,80 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import csi from "@yourdash/csi/csi.js";
+import Icon from "../icon/icon.tsx";
+import { UKIcon } from "../icon/iconDictionary.ts";
 import styles from "./image.module.scss";
-import { FC } from "react";
+import { FC, useEffect, useRef, useState } from "react";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 
 const Image: FC<{
   src: string;
   accessibleLabel: string;
+  containerClassName?: string;
   className?: string;
-  authenticatedImage?: boolean;
   disableLazyLoading?: boolean;
+  noRounding?: boolean;
+  width?: number;
+  height?: number;
 }> = (props) => {
+  const ref = useRef<HTMLDivElement>(null);
+  const [src, setSrc] = useState<string>(props.src);
+  const [loaded, setLoaded] = useState<boolean>(false);
+  const [hasFailed, setHasFailed] = useState<boolean>(false);
+  const [backgroundSize, setBackgroundSize] = useState<number>(0);
+
+  useEffect(() => {
+    const rc = ref.current;
+
+    if (!rc) {
+      return;
+    }
+
+    setTimeout(() => {
+      const bounds = rc.getBoundingClientRect();
+
+      setBackgroundSize(bounds.height > bounds.width ? bounds.height : bounds.width);
+    }, 0);
+  }, [src]);
+
+  useEffect(() => {
+    setHasFailed(false);
+    setLoaded(false);
+  }, [src]);
+
+  useEffect(() => {
+    if (props.src !== src) {
+      setSrc(props.src);
+    }
+  }, [props.src]);
+
   return (
-    <img
-      className={`${styles.component} ${props.className}`}
-      src={(props.authenticatedImage ? csi.getInstanceUrl() : "") + props.src}
-      draggable={false}
-      loading={props.disableLazyLoading ? "eager" : "lazy"}
-      alt={props.accessibleLabel}
-    />
+    <div
+      ref={ref}
+      className={clippy(styles.componentContainer, props.containerClassName, !loaded && styles.loading, hasFailed && styles.serverError)}
+      style={{
+        // @ts-ignore
+        "--background-size": backgroundSize + "px",
+      }}
+    >
+      {!hasFailed ? (
+        <img
+          className={clippy(styles.component, props.className, loaded && styles.loaded, props.noRounding && styles.noRounding)}
+          draggable={false}
+          width={props.width}
+          height={props.height}
+          onError={() => setHasFailed(true)}
+          loading={props.disableLazyLoading ? "eager" : "lazy"}
+          alt={props.accessibleLabel}
+          onLoad={(e) => {
+            setLoaded(e.currentTarget.complete);
+          }}
+          src={src}
+        />
+      ) : (
+        <Icon icon={UKIcon.ServerError} />
+      )}
+    </div>
   );
 };
 

package/components/link/link.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   display: inline-block;

package/components/link/link.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./link.module.scss";
 import { FC } from "react";
 

package/components/progressBar/progressBar.module.scss

@@ -0,0 +1,25 @@
+/*!
+ * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
+ * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
+ */
+
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.component {
+  padding: var(#{$theme+$padding});
+  border: var(#{$theme+$border});
+  border-radius: var(#{$theme+$radius});
+  background-color: var(#{$theme+$background});
+  user-select: none;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.bar {
+  background: var(#{$theme+$accent});
+  width: var(--ukcomp-progress);
+  height: 1rem;
+  transition: var(#{$theme+$transition});
+}

package/components/progressBar/progressBar.tsx

@@ -0,0 +1,21 @@
+/*
+ * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
+ * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
+ */
+
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+import styles from "./progressBar.module.scss";
+import { FC } from "react";
+
+// TODO: rewrite this component to use the HTML progress bar
+const ProgressBar: FC<{ maxValue?: number; value: number; className?: string }> = ({ maxValue, value, className }) => {
+  return (
+    <progress
+      max={maxValue}
+      value={value}
+      className={className}
+    />
+  );
+};
+
+export default ProgressBar;

package/components/redirect/redirect.tsx

@@ -3,8 +3,8 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import { useNavigate } from "@solidjs/router";
 import { FC } from "react";
+import { useNavigate } from "react-router";
 
 const Redirect: FC<{ to: string | null }> = (props) => {
   const navigate = useNavigate();

package/components/separator/separator.module.scss

@@ -3,11 +3,10 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   display: flex;
-
   border: var(#{$theme}#{$border});
   border-bottom: none;
   border-radius: var(#{$theme}#{$radius});
@@ -16,13 +15,19 @@
 .row {
   width: 0;
   height: calc(100% - calc(var(#{$theme}#{$gap})) * 2);
-
   margin: var(#{$theme}#{$gap});
+
+  &.disableMargin {
+    height: 100%;
+  }
 }
 
 .column {
   width: calc(100% - calc(var(#{$theme}#{$gap})) * 2);
   height: 0;
-
   margin: var(#{$theme}#{$gap});
+
+  &.disableMargin {
+    width: 100%;
+  }
 }

package/components/separator/separator.tsx

@@ -3,12 +3,12 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./separator.module.scss";
 import { FC } from "react";
 
-const Separator: FC<{ direction: "column" | "row" }> = (props) => {
-  return <div className={clippy(styles.component, styles[props.direction])} />;
+const Separator: FC<{ direction: "column" | "row"; disableMargin?: boolean }> = (props) => {
+  return <div className={clippy(styles.component, styles[props.direction], props.disableMargin && styles.disableMargin)} />;
 };
 
 export default Separator;

package/components/spinner/spinner.module.scss

@@ -1,9 +1,4 @@
-/*!
- * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
- * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
- */
-
-@import "@yourdash/uikit/theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   padding: var(#{$theme+$padding});

package/components/spinner/spinner.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./spinner.module.scss";
 import { FC } from "react";
 

package/components/subtext/subtext.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   color: var(#{$theme+$subcolor});

package/components/subtext/subtext.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./subtext.module.scss";
 import { FC } from "react";
 

package/components/tag/tag.module.scss

@@ -0,0 +1,13 @@
+/*!
+ * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
+ * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
+ */
+
+@use "@yourdash/uikit/theme/themeValues" as *;
+
+.component {
+  display: inline-block;
+  font-weight: var(#{$theme+$font+$weight});
+  font-size: var(#{$theme+$font+$size});
+  font-family: var(#{$theme+$font+$family});
+}

package/components/tag/tag.tsx

@@ -0,0 +1,21 @@
+/*
+ * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
+ * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
+ */
+
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+import styles from "./text.module.scss";
+import { FC } from "react";
+
+const Tag: FC<{ text: string; color: string; className?: string }> = (props) => {
+  return (
+    <div
+      className={clippy(styles.component, props.className)}
+      style={{ backgroundColor: props.color }}
+    >
+      {props.text}
+    </div>
+  );
+};
+
+export default Tag;

package/components/text/text.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   display: inline-block;

package/components/text/text.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./text.module.scss";
 import { FC } from "react";
 

package/components/textButton/textButton.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import "../../theme/themeValues";
+@use "@yourdash/uikit/theme/themeValues" as *;
 
 .component {
   font-family: var(#{$theme}#{$font}#{$family});

package/components/textButton/textButton.tsx

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-import clippy from "@yourdash/shared/web/helpers/clippy.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
 import styles from "./textButton.module.scss";
 import { FC } from "react";
 

package/components/textInput/textInput.module.scss

@@ -3,7 +3,7 @@
  * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
  */
 
-@import '../../theme/themeValues';
+@use '../../theme/themeValues' as *;
 
 .component {
   display: flex;

package/components/textInput/textInput.tsx

@@ -1,26 +1,53 @@
 /*
- * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
- * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
+ * 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.js";
-import Icon from "../icon/icon.js";
-import { UKIcon } from "../icon/iconDictionary.js";
+import clippy from "@yourdash/shared/web/helpers/clippy.ts";
+import Icon from "../icon/icon.tsx";
+import { UKIcon } from "../icon/iconDictionary.ts";
 import styles from "./textInput.module.scss";
-import { FC } from "react";
+import React, { useEffect, useRef, useState } from "react";
 
 // TODO: maybe remove onEnter for onSubmit
 
-const TextInput: FC<{
+const TextInputComponent: React.ForwardRefExoticComponent<{
   onChange?: (value: string) => void;
   onSubmit?: (value: string) => void;
   placeholder: string;
   icon?: UKIcon;
   onEnter?: (value: string) => void;
   defaultValue?: string;
+  value?: string;
   accessibleName: string;
   className?: string;
-}> = (props) => {
+  type?: string;
+}> = (props, fwrdRef) => {
+  const ref = useRef<HTMLInputElement>(null);
+
+  React.useImperativeHandle(fwrdRef, () => ref.current);
+
+  const [value, setValue] = useState(props.defaultValue || "");
+
+  useEffect(() => {
+    if (props.value) setValue(props.value);
+  }, [props.value]);
+
+  useEffect(() => {
+    if (!ref.current) return;
+
+    ref.current.value = value;
+  }, [value]);
+
+  useEffect(() => {
+    setTimeout(() => {
+      if (ref.current?.value !== props.defaultValue) {
+        ref.current?.onkeyup?.({ currentTarget: ref.current } as unknown as KeyboardEvent);
+        ref.current?.onchange?.({ currentTarget: ref.current } as unknown as Event);
+      }
+    }, 500);
+  }, []);
+
   return (
     <div className={clippy(styles.component, props.className)}>
       {props.icon && (
@@ -30,12 +57,13 @@ const TextInput: FC<{
         />
       )}
       <input
+        ref={ref}
+        type={props.type || "text"}
         aria-label={props.accessibleName}
-        defaultValue={props.defaultValue}
         className={clippy(styles.input, !props.icon && styles.noIcon)}
         placeholder={props.placeholder}
-        type="text"
         onKeyUp={(e) => {
+          setValue(e.currentTarget.value);
           props.onChange?.(e.currentTarget.value);
         }}
         onChange={(e) => props.onSubmit?.(e.currentTarget.value)}
@@ -51,4 +79,6 @@ const TextInput: FC<{
   );
 };
 
+const TextInput = React.forwardRef(TextInputComponent);
+
 export default TextInput;

package/components/toast/toast.module.scss

@@ -1,31 +1,71 @@
-/*!
- * Copyright ©2024 Ewsgit<https://github.com/ewsgit> and YourDash<https://github.com/yourdash> contributors.
- * YourDash is licensed under the MIT License. (https://ewsgit.mit-license.org)
- */
-
-.container {
-  position: fixed;
-  bottom: 1rem;
-  right: 1rem;
-  z-index: 10000;
-}
-
-.component {
-  border-radius: 0.5rem;
-}
-
-.success {
-  border-color: #2ea967;
-}
-
-.error {
-  border-color: #ff4500;
-}
-
-.warning {
-  border-color: #daa520;
-}
-
-.info {
-  border-color: #00b8ff;
-}
+/*!
+ * Copyright ©2024 Ewsgit<https://ewsgit.uk> and YourDash<https://yourdash.ewsgit.uk> contributors.
+ * YourDash is licensed under the MIT License. (https://mit.ewsgit.uk)
+ */
+
+.container {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 10000;
+  text-align: start;
+  opacity: 0.75;
+  overflow: hidden;
+  pointer-events: none;
+  gap: 0.25rem;
+  display: flex;
+  flex-direction: column;
+}
+
+.component {
+  border-radius: 0.5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  pointer-events: none;
+  backdrop-filter: blur(1rem);
+  max-width: 32rem;
+  margin-right: 0.5rem;
+
+  &:first-child {
+    margin-top: 0.5rem;
+  }
+}
+
+.cardContent {
+  gap: 0;
+  padding: 0.25rem;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  margin-right: -0.5rem;
+}
+
+.success {
+  border-right: 0.5rem solid #2ea967;
+}
+
+.error {
+  border-right: 0.5rem solid #ff4500;
+}
+
+.warning {
+  border-right: 0.5rem solid #daa520;
+}
+
+.info {
+  border-right: 0.5rem solid #00b8ff;
+}
+
+.heading {
+  text-align: left;
+  line-height: 1;
+  padding-top: 0.25rem;
+}
+
+.body {
+
+}
+
+.pointerEvents {
+  pointer-events: all;
+}

package/components/toast/toast.ts

@@ -0,0 +1,12 @@
+/*
+ * 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 type IToastAction from "./toastAction.ts";
+
+export default interface Toast {
+  type: "success" | "error" | "warning" | "info" | "debug";
+  content: { title: string; body: string; actions?: IToastAction[] };
+  persist?: boolean;
+}