@jirawatpyk/aura-react 5.1.1 → 5.3.0

package/dist/esm/Combobox.js

@@ -1,6 +1,6 @@
 'use client';
 import * as React from "react";
-import { useStrings } from "./locale.js";
+import { useStrings, useDensity } from "./locale.js";
 import { createPortal } from "react-dom";
 import { cx, uid, useMaybeControlled, useMounted, useIsoLayoutEffect, useMergedRef } from "./internal.js";
 import { Icon } from "./Icon.js";
@@ -24,6 +24,7 @@ const Combobox = React.forwardRef(
     const multi = all.multiple === true;
     const mp = all;
     const t = useStrings();
+    const density = useDensity();
     const auto = uid(), id = props.id || auto, listId = id + "-list";
     const options = (props.options || []).map(toOpt);
     const st = useMaybeControlled(
@@ -187,7 +188,7 @@ const Combobox = React.forwardRef(
       return id + "-opt-" + i;
     };
     const list = open && mounted && posState[0] ? createPortal(
-      /* @__PURE__ */ React.createElement("div", { ref: listRef, className: "aura-combo__popover", style: posState[0] }, live.length ? /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement("div", { ref: listRef, "data-density": density, className: "aura-combo__popover", style: posState[0] }, live.length ? /* @__PURE__ */ React.createElement(
         "ul",
         {
           id: listId,

package/dist/esm/DataTable.js

@@ -243,11 +243,12 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
     if (lv && boxWidth[0] == null) hideTerms += " + " + w + "px * var(--aura-h" + lv + "-on, 1)";
     else fixedSum += w;
   });
-  let pinOffsets = {}, acc = 0;
+  let pinOffsets = {}, acc = "0px";
   vis.forEach(function(c) {
     if (isPinned(c)) {
       pinOffsets[c.key] = acc;
-      acc += widthOf(c);
+      const lv = hideLevel(c);
+      acc += " + " + widthOf(c) + "px" + (lv && boxWidth[0] == null ? " * var(--aura-h" + lv + "-on, 1)" : "");
     }
   });
   const selW = selectable ? " + var(--aura-table-select-width)" : "";
@@ -262,7 +263,7 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
       s["--aura-cell-flex"] = !hasFlex && i === vis.length - 1 ? "1 0 auto" : "none";
       s["--aura-cell-w"] = w + "px";
     }
-    if (isPinned(c)) s["--aura-cell-left"] = "calc(var(--aura-space-6)" + selW + " + " + pinOffsets[c.key] + "px)";
+    if (isPinned(c)) s["--aura-cell-left"] = "calc(var(--aura-space-6)" + selW + " + " + pinOffsets[c.key] + ")";
     return s;
   }
   const sortCol = sort && sort.key ? byKey[sort.key] : void 0;
@@ -308,6 +309,20 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
   const pageRows = pageSize && !manual ? view.slice(first, first + pageSize) : view;
   const canSortAny = !busy && (manual ? total > 1 : rows.length > 1);
   const shownTotal = manual && props.totalRows == null ? first + rows.length : total;
+  const prevCount = React.useRef(pageCount);
+  React.useEffect(
+    function() {
+      if (busy) return;
+      const before = prevCount.current;
+      prevCount.current = pageCount;
+      const asked = pageState[0] || 1;
+      if (asked === page || pageCount >= before || asked > before) return;
+      if (props.getPageHref && !props.onPageChange && !props.onStateChange) return;
+      pageState[1](page);
+      emit(sort, page);
+    },
+    [pageState[0], page, busy, pageCount]
+  );
   const linkPaging = !!props.getPageHref && !props.onPageChange && !oneCallback;
   const prevLink = React.useRef(null), nextLink = React.useRef(null), jumpLink = React.useRef(null);
   const jumpState = React.useState(null);
@@ -376,9 +391,10 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
   const visibleRows = Math.max(1, Math.floor(bodyH / ROW_H));
   const nCols = vis.length + (selectable ? 1 : 0);
   const nRows = loading ? 0 : pageRows.length;
+  const hasTotal = !!(props.footer && rows.length && !loading), T = nRows + 1, lastR = nRows + (hasTotal ? 1 : 0);
   const active = activeState[0];
-  const ar = Math.min(active.r, nRows), ac = Math.min(active.c, nCols - 1);
-  const activeRendered = ar === 0 || ar - 1 >= start && ar - 1 < end;
+  const ar = Math.min(active.r, lastR), ac = Math.min(active.c, nCols - 1);
+  const activeRendered = ar === 0 || hasTotal && ar === T || ar - 1 >= start && ar - 1 < end;
   function colAt(ci) {
     return selectable ? ci === 0 ? null : vis[ci - 1] : vis[ci];
   }
@@ -409,12 +425,33 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
     }
   });
   function focusCell(r, c) {
-    r = Math.max(0, Math.min(r, nRows));
+    r = Math.max(0, Math.min(r, lastR));
     c = Math.max(0, Math.min(c, nCols - 1));
     if (stacked && r === 0 && nRows > 0 && !(selectable && c === 0)) r = 1;
+    if (gridRef.current && r === T && hasTotal) {
+      const shown2 = function(cc) {
+        const e = gridRef.current.querySelector('[data-rc="' + r + ":" + cc + '"]');
+        return !!e && e.getClientRects().length > 0;
+      };
+      if (!shown2(c))
+        for (let d = 1; d < nCols; d++) {
+          if (c + d < nCols && shown2(c + d)) {
+            c = c + d;
+            break;
+          }
+          if (c - d >= 0 && shown2(c - d)) {
+            c = c - d;
+            break;
+          }
+        }
+    }
     activeState[1]({ r, c });
     pending.current = { r, c };
-    if (virtual && r > 0) {
+    if (virtual && hasTotal && r === T && !props.stickyFooter) {
+      const sc = scrollRef.current;
+      sc.scrollTop = sc.scrollHeight;
+      setScrollTop(sc.scrollTop);
+    } else if (virtual && r > 0 && r <= nRows) {
       const sc = scrollRef.current, top = (r - 1) * ROW_H;
       if (top < sc.scrollTop) sc.scrollTop = top;
       else if (top + ROW_H > sc.scrollTop + bodyH) sc.scrollTop = top + ROW_H - bodyH;
@@ -657,7 +694,7 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
       return;
     }
     const p = rc.split(":"), r = +p[0], c = +p[1], k = e.key, col = colAt(c);
-    const row = r > 0 ? pageRows[r - 1] : null;
+    const row = r > 0 && r <= nRows ? pageRows[r - 1] : null, isTotal = hasTotal && r === T;
     let handled = true;
     if (r === 0 && col && e.altKey && (k === "ArrowLeft" || k === "ArrowRight") && canResize(col))
       setW(col, widthOf(col) + (k === "ArrowLeft" ? -1 : 1) * (e.shiftKey ? 48 : 16), true);
@@ -668,21 +705,23 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
     else if (k === "ArrowRight") focusCell(r, c + 1);
     else if (k === "ArrowLeft") focusCell(r, c - 1);
     else if (k === "ArrowDown") {
-      if (r < nRows) focusCell(r + 1, c);
+      if (r < lastR) focusCell(r + 1, c);
       else if (pageSize && page < pageCount && goPage(page + 1, { r: 1, c })) activeState[1]({ r: 1, c });
     } else if (k === "ArrowUp") {
       if (r > 1 || r === 1 && !(pageSize && page > 1)) focusCell(r - 1, c);
       else if (r === 1 && goPage(page - 1, { r: pageSize, c })) activeState[1]({ r: pageSize, c });
     } else if (k === "Home") focusCell(e.ctrlKey ? 1 : r, 0);
-    else if (k === "End") focusCell(e.ctrlKey ? nRows : r, nCols - 1);
+    else if (k === "End") focusCell(e.ctrlKey ? lastR : r, nCols - 1);
     else if (k === "PageDown") {
       if (pageSize) {
         if (goPage(page + 1, { r: 1, c })) activeState[1]({ r: 1, c });
-      } else focusCell(Math.min(nRows, r + visibleRows), c);
+      } else focusCell(Math.min(lastR, r + visibleRows), c);
     } else if (k === "PageUp") {
       if (pageSize) {
         if (goPage(page - 1, { r: 1, c })) activeState[1]({ r: 1, c });
       } else focusCell(Math.max(1, r - visibleRows), c);
+    } else if (isTotal && (k === " " || k === "Enter" || k === "F2")) {
+      handled = false;
     } else if (k === "F2" && r > 0) {
       const inner = target.querySelector("button, a[href], input, select, textarea");
       if (inner) inner.focus();
@@ -1053,9 +1092,10 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
       }
     );
   }
+  const openTotal = manual && props.totalRows == null && !!pageSize && rows.length >= pageSize;
   if (pageSize && (rows.length || busy || page > 1)) {
     const from = rows.length ? first + 1 : 0, to = manual ? first + rows.length : Math.min(first + pageSize, view.length);
-    foot = /* @__PURE__ */ React.createElement("div", { className: "aura-table__foot" }, /* @__PURE__ */ React.createElement("span", { "aria-live": "polite" }, busy ? t.loading : t.range(from, to, shownTotal)), /* @__PURE__ */ React.createElement("span", { className: "aura-table__pager" }, /* @__PURE__ */ React.createElement("span", null, t.page(page, pageCount)), pagerButton(-1), pagerButton(1)));
+    foot = /* @__PURE__ */ React.createElement("div", { className: "aura-table__foot" }, /* @__PURE__ */ React.createElement("span", { "aria-live": "polite" }, busy ? t.loading : openTotal ? t.rangeOpen(from, to) : t.range(from, to, shownTotal)), /* @__PURE__ */ React.createElement("span", { className: "aura-table__pager" }, /* @__PURE__ */ React.createElement("span", null, openTotal ? t.pageOpen(page) : t.page(page, pageCount)), pagerButton(-1), pagerButton(1)));
   } else if (height && rows.length && !loading) {
     foot = /* @__PURE__ */ React.createElement("div", { className: "aura-table__foot" }, /* @__PURE__ */ React.createElement("span", null, t.rowCount(shownTotal)), selectable && selected.length ? /* @__PURE__ */ React.createElement("span", null, t.selectedCount(selected.length)) : /* @__PURE__ */ React.createElement("span", null));
   }
@@ -1069,15 +1109,32 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
       style: rowStyle
     },
     /* @__PURE__ */ React.createElement("span", { className: "aura-table__gutter", "aria-hidden": true }),
-    selectable ? /* @__PURE__ */ React.createElement("span", { className: cx("aura-table__sel", nPinned && "is-pinned"), "aria-hidden": true }) : null,
+    selectable ? /* @__PURE__ */ React.createElement(
+      "span",
+      {
+        role: "gridcell",
+        "aria-colindex": 1,
+        className: cx("aura-table__sel", nPinned && "is-pinned"),
+        tabIndex: tabFor(T, 0),
+        "data-rc": T + ":0",
+        onFocus: function() {
+          activeState[1]({ r: T, c: 0 });
+        }
+      }
+    ) : null,
     vis.map(function(c, j) {
-      const pin = isPinned(c);
+      const pin = isPinned(c), ci = j + (selectable ? 1 : 0);
       return /* @__PURE__ */ React.createElement(
         "span",
         {
           key: c.key,
           role: "gridcell",
           "aria-colindex": j + (selectable ? 2 : 1),
+          tabIndex: tabFor(T, ci),
+          "data-rc": T + ":" + ci,
+          onFocus: function() {
+            if (activeState[0].r !== T || activeState[0].c !== ci) activeState[1]({ r: T, c: ci });
+          },
           className: cx(
             "aura-table__td",
             c.mono && "aura-table__mono",
@@ -1103,7 +1160,7 @@ const DataTable = React.forwardRef(function DataTable2(props, ref) {
     )
   ) : null;
   const scrollStyle = {
-    scrollPaddingLeft: "calc(var(--aura-space-6)" + selW + " + " + acc + "px)",
+    scrollPaddingLeft: "calc(var(--aura-space-6)" + selW + " + " + acc + ")",
     scrollPaddingTop: ROW_H + "px",
     scrollPaddingBottom: stickyTotal ? ROW_H + "px" : void 0
   };

package/dist/esm/DatePicker.js

@@ -294,16 +294,16 @@ function useCalendarPopover(boxRef) {
   const pos = React.useState(null), popRef = React.useRef(null), mounted = useMounted();
   function place() {
     if (!boxRef.current) return;
-    const r = boxRef.current.getBoundingClientRect(), H = 380;
-    const up = window.innerHeight - r.bottom < H && r.top > H;
-    const left = Math.max(8, Math.min(r.left, window.innerWidth - 320 - 8));
+    const el = popRef.current, r = boxRef.current.getBoundingClientRect(), W = el ? el.offsetWidth : 320, H = el ? el.offsetHeight : 380;
+    const up = window.innerHeight - r.bottom < H + 12 && r.top > H + 12;
+    const left = Math.max(8, Math.min(r.left, window.innerWidth - W - 8));
     pos[1](up ? { left, bottom: window.innerHeight - r.top + 4 } : { left, top: r.bottom + 4 });
   }
   useIsoLayoutEffect(
     function() {
       if (open) place();
     },
-    [open]
+    [open, !!pos[0]]
   );
   React.useEffect(
     function() {

package/dist/esm/FileUpload.js

@@ -62,6 +62,7 @@ const FileUpload = React.forwardRef(function FileUpload2(props, ref) {
     [items, props.name]
   );
   function thumb(it) {
+    if (!it.file && it.url && /^image\//.test(it.type || "")) return it.url;
     if (!it.file || !/^image\//.test(it.type || "") || typeof URL === "undefined" || !URL.createObjectURL) return null;
     if (!urls.current[it.id]) urls.current[it.id] = URL.createObjectURL(it.file);
     return urls.current[it.id];
@@ -167,7 +168,7 @@ const FileUpload = React.forwardRef(function FileUpload2(props, ref) {
     ),
     items.length ? /* @__PURE__ */ React.createElement("ul", { className: "aura-upload__list", "aria-live": "polite" }, items.map(function(it) {
       const src = thumb(it);
-      return /* @__PURE__ */ React.createElement("li", { key: it.id, className: cx("aura-upload__item", it.error && "is-error") }, src ? /* @__PURE__ */ React.createElement("img", { className: "aura-upload__thumb", src, alt: "" }) : /* @__PURE__ */ React.createElement("span", { className: "aura-upload__thumb is-icon", "aria-hidden": true }, /* @__PURE__ */ React.createElement(Icon, { name: /^image\//.test(it.type || "") ? "image" : "file", size: "md" })), /* @__PURE__ */ React.createElement("span", { className: "aura-upload__meta" }, /* @__PURE__ */ React.createElement("span", { className: "aura-upload__name" }, it.name), /* @__PURE__ */ React.createElement("span", { className: "aura-upload__sub" }, it.error ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Icon, { name: "circle-alert", size: 12 }), it.error) : it.status === "uploading" ? t.uploading + (it.progress != null ? " " + Math.round(it.progress) + "%" : "") : it.status === "done" ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Icon, { name: "circle-check", size: 12 }), formatBytes(it.size)) : formatBytes(it.size)), it.status === "uploading" ? /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement("li", { key: it.id, className: cx("aura-upload__item", it.error && "is-error") }, src ? /* @__PURE__ */ React.createElement("img", { className: "aura-upload__thumb", src, alt: "" }) : /* @__PURE__ */ React.createElement("span", { className: "aura-upload__thumb is-icon", "aria-hidden": true }, /* @__PURE__ */ React.createElement(Icon, { name: /^image\//.test(it.type || "") ? "image" : "file", size: "md" })), /* @__PURE__ */ React.createElement("span", { className: "aura-upload__meta" }, it.url && !it.error ? /* @__PURE__ */ React.createElement("a", { className: "aura-upload__name", href: it.url, target: "_blank", rel: "noreferrer" }, it.name) : /* @__PURE__ */ React.createElement("span", { className: "aura-upload__name" }, it.name), /* @__PURE__ */ React.createElement("span", { className: "aura-upload__sub" }, it.error ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Icon, { name: "circle-alert", size: 12 }), it.error) : it.status === "uploading" ? t.uploading + (it.progress != null ? " " + Math.round(it.progress) + "%" : "") : it.status === "done" ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Icon, { name: "circle-check", size: 12 }), formatBytes(it.size)) : formatBytes(it.size)), it.status === "uploading" ? /* @__PURE__ */ React.createElement(
         "span",
         {
           className: "aura-upload__bar",

package/dist/esm/Popover.js

@@ -14,13 +14,20 @@ import {
 import { useDensity, useStrings } from "./locale.js";
 import { createPortal } from "react-dom";
 function position(anchor, pop, placement) {
-  const r = anchor.getBoundingClientRect(), pw = pop.offsetWidth, ph = pop.offsetHeight, vw = window.innerWidth, vh = window.innerHeight, gap = 6;
+  const r = anchor.getBoundingClientRect(), pw = pop.offsetWidth, ph = pop.scrollHeight, vw = window.innerWidth, vh = window.innerHeight, gap = 6;
   let side = (placement || "bottom-start").split("-")[0], align = (placement || "bottom-start").split("-")[1] || "start";
   if (side === "bottom" && r.bottom + gap + ph > vh - 8 && r.top - gap - ph > 8) side = "top";
   else if (side === "top" && r.top - gap - ph < 8 && r.bottom + gap + ph < vh - 8) side = "bottom";
-  const top = side === "top" ? r.top - gap - ph : r.bottom + gap;
+  const below = vh - r.bottom - gap - 8, above = r.top - gap - 8;
+  let maxHeight;
+  if (ph > below && ph > above) {
+    side = above > below ? "top" : "bottom";
+    maxHeight = Math.max(120, side === "top" ? above : below);
+  }
+  const h = maxHeight ? Math.min(ph, maxHeight) : ph;
+  const top = side === "top" ? r.top - gap - h : r.bottom + gap;
   const left = align === "end" ? r.right - pw : align === "center" ? r.left + r.width / 2 - pw / 2 : r.left;
-  return { top: Math.max(8, top), left: Math.max(8, Math.min(left, vw - pw - 8)), side };
+  return { top: Math.max(8, top), left: Math.max(8, Math.min(left, vw - pw - 8)), side, maxHeight };
 }
 const Popover = React.forwardRef(function Popover2(props, ref) {
   const t = useStrings();
@@ -100,7 +107,11 @@ const Popover = React.forwardRef(function Popover2(props, ref) {
         },
         className: cx("aura-popover", pos[0] && "is-" + pos[0].side, props.className),
         style: Object.assign(
-          { top: pos[0] ? pos[0].top : -9999, left: pos[0] ? pos[0].left : -9999 },
+          {
+            top: pos[0] ? pos[0].top : -9999,
+            left: pos[0] ? pos[0].left : -9999,
+            maxHeight: pos[0] && pos[0].maxHeight ? pos[0].maxHeight : void 0
+          },
           props.width ? { width: props.width } : null
         ),
         onKeyDown: function(e) {