@canopy-iiif/app 1.12.1 → 1.12.3

package/lib/build/iiif.js

@@ -1783,8 +1783,10 @@ async function buildIiifCollectionPages(CONFIG) {
         trimmed.toLowerCase().replace(/[^a-z0-9]+/g, "-") ||
         trimmed;
       if (!valueSlug) continue;
-      if (!valueMap.has(valueSlug)) {
-        valueMap.set(valueSlug, {value: trimmed, slug: valueSlug});
+      if (valueMap.has(valueSlug)) {
+        valueMap.get(valueSlug).count += 1;
+      } else {
+        valueMap.set(valueSlug, {value: trimmed, slug: valueSlug, count: 1});
       }
     }
   }

package/lib/components/navigation.js

@@ -1,4 +1,10 @@
-const {fs, path, CONTENT_DIR, rootRelativeHref} = require("../common");
+const {
+  fs,
+  path,
+  CONTENT_DIR,
+  rootRelativeHref,
+  canonicalizeLocaleCode,
+} = require("../common");
 const mdx = require("../build/mdx.js");
 const {getPageContext} = require("../page-context");
 
@@ -38,6 +44,33 @@ function slugFromRelative(relativePath) {
   return {slug, segments, isIndex};
 }
 
+// Returns true when the segment is a configured (non-default) locale code that
+// prefixes content routes, e.g. "fr" for content/fr/...
+function isLocaleSegment(segment) {
+  if (!segment) return false;
+  try {
+    return !!canonicalizeLocaleCode(segment);
+  } catch (_) {
+    return false;
+  }
+}
+
+// Depth (number of leading segments) that identifies a navigation section root
+// for a page. Locale-prefixed routes root at <locale>/<section>; everything else
+// roots at <section>.
+function rootDepthForSegments(segments) {
+  if (!Array.isArray(segments) || !segments.length) return 0;
+  if (segments.length > 1 && isLocaleSegment(segments[0])) return 2;
+  return 1;
+}
+
+// Slug of the section root for a page's segments (locale-aware).
+function rootSegmentForSegments(segments) {
+  const depth = rootDepthForSegments(segments);
+  if (!depth) return "";
+  return segments.slice(0, depth).join("/");
+}
+
 function pageSortKey(relativePath) {
   const normalized = normalizeRelativePath(relativePath).toLowerCase();
   if (!normalized) return "";
@@ -210,7 +243,11 @@ function getNavigationCache() {
 
   const roots = new Map();
   for (const node of nodes.values()) {
-    if (node.segments.length === 1) {
+    // A section root is either a top-level node (<section>) or, for
+    // locale-prefixed content, a <locale>/<section> node. Rooting a
+    // locale-prefixed sidebar at the locale segment alone would list every
+    // section under that locale instead of just the current one.
+    if (rootDepthForSegments(node.segments) === node.segments.length) {
       roots.set(node.slug, node);
     }
   }
@@ -266,7 +303,7 @@ function getPageInfo(relativePath) {
       slug: page.slug,
       segments: page.segments.slice(),
       relativePath: page.relativePath,
-      rootSegment: page.segments[0] || "",
+      rootSegment: rootSegmentForSegments(page.segments),
       isIndex: page.isIndex,
     };
   }
@@ -278,7 +315,7 @@ function getPageInfo(relativePath) {
     slug,
     segments,
     relativePath: normalized,
-    rootSegment: segments[0] || "",
+    rootSegment: rootSegmentForSegments(segments),
     isIndex: false,
   };
 }
@@ -289,10 +326,12 @@ function buildNavigationForFile(relativePath) {
   const page = cache.pagesByRelative.get(normalized);
   const fallback = slugFromRelative(normalized);
   const slug = page ? page.slug : fallback.slug;
-  const rootSegment = page
-    ? page.segments[0] || ""
-    : fallback.segments[0] || "";
-  if (!slug || !rootSegment || EXCLUDED_ROOTS.has(rootSegment)) {
+  const segments = page ? page.segments : fallback.segments;
+  const rootSegment = rootSegmentForSegments(segments);
+  // The section name is the last segment of the root (the segment after an
+  // optional locale prefix), e.g. "works" for both "works" and "fr/works".
+  const sectionName = rootSegment.split("/").pop() || "";
+  if (!slug || !rootSegment || EXCLUDED_ROOTS.has(sectionName)) {
     return null;
   }
   const rootNode = cache.roots.get(rootSegment);
@@ -312,7 +351,8 @@ function buildNavigationRoots(currentSlug) {
   const result = {};
   const normalizedSlug = typeof currentSlug === "string" ? currentSlug : "";
   for (const [segment, rootNode] of cache.roots.entries()) {
-    if (!segment || EXCLUDED_ROOTS.has(segment)) continue;
+    const sectionName = segment.split("/").pop() || "";
+    if (!segment || EXCLUDED_ROOTS.has(sectionName)) continue;
     const shouldExpand =
       normalizedSlug &&
       (normalizedSlug === segment || normalizedSlug.startsWith(segment + "/"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.12.1",
+  "version": "1.12.3",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",

package/ui/dist/server.mjs

@@ -4260,7 +4260,8 @@ function normalizeEntries(entries) {
       const dedupeKey = `${labelSlug}__${slug}`;
       if (seen.has(dedupeKey)) return;
       seen.add(dedupeKey);
-      values.push({ value: trimmed, slug });
+      const count = valueEntry && typeof valueEntry === "object" && typeof valueEntry.count === "number" ? valueEntry.count : void 0;
+      values.push({ value: trimmed, slug, ...count !== void 0 && { count } });
     });
     if (!values.length) return;
     normalized.push({ label, slug: labelSlug, values });
@@ -4374,6 +4375,8 @@ function Index({
   limit = 15,
   expandLabel = "Show more",
   collapseLabel = "Show less",
+  sortOrder = "alphabetically",
+  showCount = false,
   className = "",
   ...rest
 }) {
@@ -4390,7 +4393,9 @@ function Index({
       values: entry.values,
       limit,
       expandLabel,
-      collapseLabel
+      collapseLabel,
+      sortOrder,
+      showCount
     }
   )), /* @__PURE__ */ React34.createElement(
     "script",
@@ -4400,18 +4405,34 @@ function Index({
     }
   ));
 }
-function IndexGroup({ label, labelSlug, values, limit, expandLabel, collapseLabel }) {
+function sortValues(values, sortOrder) {
+  const copy = [...values];
+  if (sortOrder === "count") {
+    copy.sort((a, b) => {
+      var _a, _b;
+      return ((_a = b.count) != null ? _a : 0) - ((_b = a.count) != null ? _b : 0);
+    });
+  } else {
+    copy.sort(
+      (a, b) => String(a.value).localeCompare(String(b.value), void 0, { sensitivity: "base" })
+    );
+  }
+  return copy;
+}
+function IndexGroup({ label, labelSlug, values, limit, expandLabel, collapseLabel, sortOrder, showCount }) {
   const parsedLimit = Number(limit);
+  const showAll = Number.isFinite(parsedLimit) && Math.floor(parsedLimit) === 0;
   const clampedLimit = Number.isFinite(parsedLimit) ? Math.max(1, Math.floor(parsedLimit)) : 15;
-  const maxVisible = clampedLimit;
-  const hasOverflow = values.length > maxVisible;
-  const visibleValues = hasOverflow ? values.slice(0, maxVisible) : values;
-  const hiddenValues = hasOverflow ? values.slice(maxVisible) : [];
+  const sorted = sortValues(values, sortOrder);
+  const hasOverflow = !showAll && sorted.length > clampedLimit;
+  const visibleValues = hasOverflow ? sorted.slice(0, clampedLimit) : sorted;
+  const hiddenValues = hasOverflow ? sorted.slice(clampedLimit) : [];
   const labelCollapsed = typeof expandLabel === "string" && expandLabel.trim() ? expandLabel.trim() : "Show more";
   const labelExpanded = typeof collapseLabel === "string" && collapseLabel.trim() ? collapseLabel.trim() : "Show less";
   return /* @__PURE__ */ React34.createElement("dl", { className: "canopy-index__group", "data-canopy-index-group": "", "data-expanded": "0" }, /* @__PURE__ */ React34.createElement("dt", null, label), /* @__PURE__ */ React34.createElement("div", { className: "canopy-index__values" }, visibleValues.map((value) => {
     const href = buildSearchHref(labelSlug, value.slug);
     const key = `${labelSlug || label}-${value.slug || value.value}`;
+    const displayText = showCount && value.count != null ? `${value.value} (${value.count})` : value.value;
     return /* @__PURE__ */ React34.createElement("dd", { key }, href ? /* @__PURE__ */ React34.createElement(
       "a",
       {
@@ -4420,11 +4441,12 @@ function IndexGroup({ label, labelSlug, values, limit, expandLabel, collapseLabe
         "data-index-label": labelSlug,
         "data-index-value": value.slug
       },
-      value.value
-    ) : value.value);
+      displayText
+    ) : displayText);
   }), hiddenValues.map((value) => {
     const href = buildSearchHref(labelSlug, value.slug);
     const key = `${labelSlug || label}-hidden-${value.slug || value.value}`;
+    const displayText = showCount && value.count != null ? `${value.value} (${value.count})` : value.value;
     return /* @__PURE__ */ React34.createElement("dd", { key, "data-canopy-index-hidden": "", hidden: true }, href ? /* @__PURE__ */ React34.createElement(
       "a",
       {
@@ -4433,8 +4455,8 @@ function IndexGroup({ label, labelSlug, values, limit, expandLabel, collapseLabe
         "data-index-label": labelSlug,
         "data-index-value": value.slug
       },
-      value.value
-    ) : value.value);
+      displayText
+    ) : displayText);
   })), hasOverflow && /* @__PURE__ */ React34.createElement("div", { className: "canopy-index__more-wrapper" }, /* @__PURE__ */ React34.createElement(
     "button",
     {