@uoguelph/react-components 1.4.1-rc.1 → 1.4.1

package/dist/pagination.js

@@ -1,11 +1,11 @@
 "use client";
-import { jsxs as u, jsx as t } from "react/jsx-runtime";
-import { j as x } from "./solid-D19hAF5t.js";
-import { FontAwesomeIcon as p } from "@fortawesome/react-fontawesome";
-import { useState as y, useEffect as q } from "react";
+import { jsxs as l, jsx as t } from "react/jsx-runtime";
+import { j as y } from "./solid-D19hAF5t.js";
+import { FontAwesomeIcon as m } from "@fortawesome/react-fontawesome";
+import { useState as x, useEffect as q } from "react";
 import { twMerge as B } from "tailwind-merge";
 import { tv as F } from "tailwind-variants";
-import { c as w } from "./math-utils-CnAd98v6.js";
+import { c as N } from "./math-utils-CnAd98v6.js";
 import { Button as G } from "./button.js";
 import { NumberInput as S } from "./number-input.js";
 var V = {
@@ -30,37 +30,46 @@ var V = {
   ]
 };
 function Z({
-  page: d,
+  page: h,
   count: e,
-  visible: N,
+  visible: w,
   defaultPage: b,
   onChange: f,
-  color: g = "yellow",
-  hideInput: $ = !1,
-  hideList: k = !1,
-  className: L
+  color: u = "yellow",
+  hideInput: P = !1,
+  hideList: $ = !1,
+  className: k
 }) {
-  const [r, M] = y(b ?? 0), [P, j] = y(b ?? 0), C = [...Array(e).keys()], i = Math.max(Math.ceil(N), 3);
+  const [r, C] = x(b ?? 0), [I, L] = x(b ?? 0), M = [...Array(e).keys()], i = Math.max(Math.ceil(w), 3);
   q(() => {
-    l(d ?? 0);
-  }, [d]);
-  const l = (o) => {
-    const v = w(o, 0, e - 1);
-    f == null || f(v), M(v);
-  }, m = (o) => /* @__PURE__ */ t(
-    "button",
-    {
-      className: `uofg-pagination-item ${W({ active: r === o })}`,
-      onClick: () => {
-        l(o);
+    n(h ?? 0);
+  }, [h]);
+  const n = (s) => {
+    const g = N(s, 0, e - 1);
+    f == null || f(g), C(g);
+  }, d = (s) => {
+    const g = r === s;
+    return /* @__PURE__ */ l(
+      "button",
+      {
+        className: `uofg-pagination-item ${A({ active: g })}`,
+        onClick: () => {
+          n(s);
+        },
+        children: [
+          /* @__PURE__ */ t("span", { className: "sr-only", children: "Page" }),
+          " ",
+          s + 1,
+          " ",
+          g ? /* @__PURE__ */ t("span", { className: "sr-only", children: "(Current Page)" }) : ""
+        ]
       },
-      children: o + 1
-    },
-    o
-  );
-  let s, a, n, c;
-  e <= i || e < 5 ? (s = 1, a = e - 1, n = !1, c = !1) : r < i - 1 ? (s = 1, a = i, c = !0, n = !1) : r > e - i ? (s = e - i, a = e - 1, n = !0, c = !1) : (s = r - Math.floor(i / 2), a = s + i, n = s > 1, c = a < e);
-  const { base: I, list: z, seperator: E, control: h, item: W, inputWrapper: A, goTo: R, input: T } = F({
+      s
+    );
+  };
+  let o, a, c, p;
+  e <= i || e < 5 ? (o = 1, a = e - 1, c = !1, p = !1) : r < i - 1 ? (o = 1, a = i, p = !0, c = !1) : r > e - i ? (o = e - i, a = e - 1, c = !0, p = !1) : (o = r - Math.floor(i / 2), a = o + i, c = o > 1, p = a < e);
+  const { base: j, list: z, seperator: E, control: v, item: A, inputWrapper: W, goTo: R, input: T } = F({
     slots: {
       base: "flex w-full flex-col items-center justify-center gap-4 md:flex-row",
       list: "flex items-center justify-center gap-4",
@@ -133,58 +142,65 @@ function Z({
       }
     ]
   })({
-    color: g ?? "yellow",
-    hideList: k ?? !1,
-    hideInput: $ ?? !1
+    color: u ?? "yellow",
+    hideList: $ ?? !1,
+    hideInput: P ?? !1
   });
-  return /* @__PURE__ */ u("div", { className: `uofg-pagination ${B(I(), L)}`, children: [
-    /* @__PURE__ */ u("div", { className: `uofg-pagination-list ${z()}`, children: [
-      /* @__PURE__ */ t(
+  return /* @__PURE__ */ l("div", { className: `uofg-pagination ${B(j(), k)}`, children: [
+    /* @__PURE__ */ l("div", { className: `uofg-pagination-list ${z()}`, children: [
+      /* @__PURE__ */ l(
         "button",
         {
           disabled: r <= 0,
-          className: `uofg-pagination-previous ${h()}`,
-          onClick: () => l(r - 1),
-          children: /* @__PURE__ */ t(p, { icon: _ })
+          className: `uofg-pagination-previous ${v()}`,
+          onClick: () => n(r - 1),
+          children: [
+            /* @__PURE__ */ t(m, { icon: _ }),
+            /* @__PURE__ */ t("span", { className: "sr-only", children: "Previous Page" })
+          ]
         }
       ),
-      m(0),
-      n && /* @__PURE__ */ t(p, { icon: x }),
-      C.slice(s, a).map(m),
-      c && /* @__PURE__ */ t(p, { icon: x }),
-      m(e - 1),
-      /* @__PURE__ */ t(
+      d(0),
+      c && /* @__PURE__ */ t(m, { icon: y }),
+      M.slice(o, a).map(d),
+      p && /* @__PURE__ */ t(m, { icon: y }),
+      d(e - 1),
+      /* @__PURE__ */ l(
         "button",
         {
           disabled: r >= e - 1,
-          className: `uofg-pagination-next ${h()}`,
-          onClick: () => l(r + 1),
-          children: /* @__PURE__ */ t(p, { icon: V })
+          className: `uofg-pagination-next ${v()}`,
+          onClick: () => n(r + 1),
+          children: [
+            /* @__PURE__ */ t(m, { icon: V }),
+            /* @__PURE__ */ t("span", { className: "sr-only", children: "Next Page" })
+          ]
         }
       )
     ] }),
     /* @__PURE__ */ t("span", { className: `uofg-pagination-seperator ${E()}` }),
-    /* @__PURE__ */ u("div", { className: `uofg-pagination-go-to-wrapper ${A()}`, children: [
+    /* @__PURE__ */ l("div", { className: `uofg-pagination-go-to-wrapper ${W()}`, children: [
       /* @__PURE__ */ t(
         S,
         {
-          color: g,
+          color: u,
           min: 1,
           max: e,
           value: r + 1,
-          onInput: (o) => {
-            j(isNaN(o) ? 0 : w(o - 1, 0, e - 1));
+          onInput: (s) => {
+            L(isNaN(s) ? 0 : N(s - 1, 0, e - 1));
           },
-          className: `uofg-pagination-go-to-input ${T()}`
+          className: `uofg-pagination-go-to-input ${T()}`,
+          children: /* @__PURE__ */ t("span", { className: "sr-only", children: "Input Page Number" })
         }
       ),
       /* @__PURE__ */ t(
         G,
         {
-          color: g,
+          color: u,
           className: `uofg-pagination-go-to-button ${R()}`,
           onClick: () => {
-            l(P);
+            n(I);
           },
           children: "Go to page"
         }

package/dist/text-input.js

@@ -1,26 +1,26 @@
 "use client";
-import { jsxs as c, jsx as o } from "react/jsx-runtime";
+import { jsxs as l, jsx as o } from "react/jsx-runtime";
 import { h as y } from "./regular-DmWV6rTj.js";
 import { FontAwesomeIcon as N } from "@fortawesome/react-fontawesome";
-import { Field as B, Label as E, Input as $ } from "@headlessui/react";
-import { useState as j, useRef as C, useEffect as I } from "react";
+import { Field as B, Label as C, Input as E } from "@headlessui/react";
+import { useState as $, useRef as j, useEffect as I } from "react";
 import { twMerge as k } from "tailwind-merge";
 import { tv as F } from "tailwind-variants";
 function P({
-  initialValue: p = "",
-  type: a = "text",
+  initialValue: c = "",
+  type: p = "text",
   placeholder: f = "",
   onInput: i,
-  children: u,
+  children: s,
   className: m,
   hideClear: x,
-  value: l,
+  value: u,
   ...b
 }) {
-  const [n, s] = j(p), e = C(null);
+  const [n, a] = $(c), e = j(null);
   I(() => {
-    s(l ?? "");
-  }, [l]);
+    a(u ?? "");
+  }, [u]);
   const d = F({
     slots: {
       base: "flex flex-col gap-0.5",
@@ -40,26 +40,26 @@ function P({
         }
       }
     }
-  }), { base: g, wrapper: w, input: h, clearButton: v } = d({ empty: (n == null ? void 0 : n.length) === 0 });
-  return /* @__PURE__ */ c(B, { className: `uofg-text-input-field ${k(g(), m)}`, children: [
-    u && /* @__PURE__ */ o(E, { className: "uofg-text-input-label", children: u }),
-    /* @__PURE__ */ c("div", { className: `uofg-text-input-wrapper ${w()}`, children: [
+  }), { base: g, wrapper: h, input: w, clearButton: v } = d({ empty: (n == null ? void 0 : n.length) === 0 });
+  return /* @__PURE__ */ l(B, { className: `uofg-text-input-field ${k(g(), m)}`, children: [
+    s && /* @__PURE__ */ o(C, { className: "uofg-text-input-label", children: s }),
+    /* @__PURE__ */ l("div", { className: `uofg-text-input-wrapper ${h()}`, children: [
       /* @__PURE__ */ o(
-        $,
+        E,
         {
           ...b,
           ref: e,
           value: n,
-          type: a,
+          type: p,
           placeholder: f,
           onInput: (t) => {
             var r;
-            s((r = t == null ? void 0 : t.target) == null ? void 0 : r.value), i == null || i(t);
+            a((r = t == null ? void 0 : t.target) == null ? void 0 : r.value), i == null || i(t);
           },
-          className: `uofg-text-input ${h()}`
+          className: `uofg-text-input ${w()}`
         }
       ),
-      /* @__PURE__ */ o(
+      /* @__PURE__ */ l(
         "button",
         {
           className: `uofg-text-input-clear-button ${v({ hide: x })}`,
@@ -69,7 +69,10 @@ function P({
             const t = (r = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value")) == null ? void 0 : r.set;
             t == null || t.call(e.current, ""), e.current.dispatchEvent(new Event("input", { bubbles: !0 })), e.current.focus();
           },
-          children: /* @__PURE__ */ o(N, { icon: y })
+          children: [
+            /* @__PURE__ */ o(N, { icon: y }),
+            /* @__PURE__ */ o("span", { className: "sr-only", children: "Clear text" })
+          ]
         }
       )
     ] })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uoguelph/react-components",
-  "version": "1.4.1-rc.1",
+  "version": "1.4.1",
   "description": "University of Guelph React Components Library",
   "type": "module",
   "scripts": {
@@ -76,5 +76,5 @@
   "bugs": {
     "url": "https://github.com/ccswbs/uofg-components/issues"
   },
-  "gitHead": "5f87db7b7c445202fe19bc7c9a81aa7283039bcb"
+  "gitHead": "451236eee706208e21e88751876f83b7918e11d9"
 }