jekyll-dice-tray 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e3b5e6ffc89df4600f4c4a25d765e3bc5efcd96d3671817cfc19c0edf540e7f
-  data.tar.gz: eeb98f0a9a72e5caac9dfa0608f402cfefb90c914c0ecacf2dc170d6484decd8
+  metadata.gz: f94a0efe5f9d8e77660ad59f9a455d7639c5c84f0aba09664f26d707bef1ad5f
+  data.tar.gz: ae0e7be86f93d73b93753b7394a38e2a0f45b9f77856803775c16b49048464d8
 SHA512:
-  metadata.gz: 76359d77b57187df74358db7c49116928b201ce19ffa3130e3af0584087cce008c220baacbea6185f2e5a39686c27b4c78c6010702a9d2576f258158a9df36b7
-  data.tar.gz: 0b6e4439a8265f518ee925cb7f497fe5c3daa6c2dfd180d67ba8e7dcbefab68495f25bb50805b4d594d2cf777b3f32ed4a9172c5564c512de072db5d80db1ccd
+  metadata.gz: f6a7a8507c6a193051373cb66ae7b6f7a71f911e87ac7c01a172c0ba26b62b5eb76793212ca38da475a64ff0bad0572de1518e9f12bb6088aff2f615580e2ed4
+  data.tar.gz: 7f3c908b2eee3946f710de9af643e79dd9d001eeb7838654cb818defd6b921f8b33025950a07ad782eb7619af96f471650fb9043c77e115a9b857619acd73179

data/README.md

@@ -4,7 +4,7 @@ A Jekyll plugin gem that:
 
 - Adds an overlay dice tray that accepts dice rolling input
 - Recognizes dice expressions in rendered pages like `d4`, `1d6`, `1d20+1` and turns them into clickable links that roll in the tray
-- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. One die in the header searches the whole table; multiple dice each search their own column group
+- Clicking a lookup-table die (any `dN`) rolls and shows the matching entry — supports any number of side-by-side key/value column groups, ranges like `3–12`, and tables with or without headers. Header dice always search the whole table (side-by-side column groups included)
 - Persists input history, result history, minimize status
 
 https://github.com/user-attachments/assets/6ef8d788-a1ee-49d4-ab26-f63899bb4a10

data/assets/jekyll-dice-tray/dice_tray.css

@@ -34,13 +34,16 @@
   border-radius: 12px;
   box-shadow: 0 18px 48px rgba(0, 0, 0, 0.22);
   overflow: hidden;
-  display: flex;
+  /* Stay collapsed until data-expanded="true". A default of flex overrides the
+     hidden attribute and paints the open tray before hydration. */
+  display: none;
   flex-direction: column;
   max-height: 360px;
 }
 
-#jekyll-dice-tray[data-expanded="false"] .jdt-body {
-  display: none;
+/* Only the pre-paint script or dice_tray.js sets this; absent means minimized. */
+#jekyll-dice-tray[data-expanded="true"] .jdt-body {
+  display: flex;
 }
 
 #jekyll-dice-tray .jdt-clue {

data/assets/jekyll-dice-tray/dice_tray.js

@@ -2,6 +2,7 @@
   "use strict";
 
   var STORAGE_PREFIX = "jekyll_dice_tray:";
+  // Also read before first paint by the inline script in HtmlRewriter.inject_tray.
   var STORAGE_EXPANDED = STORAGE_PREFIX + "expanded";
   var STORAGE_HISTORY = STORAGE_PREFIX + "history_v1";
   var STORAGE_INPUT_HISTORY = STORAGE_PREFIX + "input_history_v1";
@@ -179,14 +180,6 @@
       return Array.prototype.slice.call(row.querySelectorAll("td, th"));
     }
 
-    function cellColumnIndex(row, cell) {
-      var cells = rowCells(row);
-      for (var i = 0; i < cells.length; i++) {
-        if (cells[i] === cell) return i;
-      }
-      return -1;
-    }
-
     function rowLooksLikeHeader(row) {
       if (!row) return false;
       if (row.querySelector("th")) return true;
@@ -269,13 +262,11 @@
       return max;
     }
 
-    function collectRowEntriesForGroups(row, groups, allowedKeyIndices) {
+    function collectRowEntriesForGroups(row, groups) {
       var cells = rowCells(row);
       var entries = [];
-      var allowAll = !allowedKeyIndices || !allowedKeyIndices.length;
       for (var g = 0; g < groups.length; g++) {
         var group = groups[g];
-        if (!allowAll && allowedKeyIndices.indexOf(group.keyIndex) === -1) continue;
         var keyCell = cells[group.keyIndex];
         if (!keyCell) continue;
         var key = parseKeyEntry(normalizeCellText(keyCell));
@@ -302,16 +293,17 @@
       if (!table || !groups || !groups.length) return false;
       var matches = 0;
       eachDataRow(table, headerRow, function (row) {
-        matches += collectRowEntriesForGroups(row, groups, null).length;
+        matches += collectRowEntriesForGroups(row, groups).length;
       });
       return matches >= 2;
     }
 
-    function findLookupMatch(table, headerRow, groups, rollTotal, allowedKeyIndices) {
+    // Header dice (one or many side-by-side) always search every key column in the table.
+    function findLookupMatch(table, headerRow, groups, rollTotal) {
       var exact = null;
       var range = null;
       eachDataRow(table, headerRow, function (row) {
-        var entries = collectRowEntriesForGroups(row, groups, allowedKeyIndices);
+        var entries = collectRowEntriesForGroups(row, groups);
         for (var e = 0; e < entries.length; e++) {
           var entry = entries[e];
           if (entry.key.kind === "exact" && entry.key.value === rollTotal) {
@@ -329,45 +321,18 @@
       return exact || range;
     }
 
-    function headerDiceCount(headerRow) {
-      if (!headerRow) return 0;
-      return headerRow.querySelectorAll('a[data-dice]').length;
-    }
-
-    function groupForColumn(groups, columnIndex) {
-      for (var g = 0; g < groups.length; g++) {
-        var group = groups[g];
-        if (columnIndex === group.keyIndex) return group;
-        if (group.valueIndices.indexOf(columnIndex) !== -1) return group;
-      }
-      return null;
-    }
-
-    // One die in the header (e.g. d100 over many pairs) => search every group.
-    // Several dice (e.g. d10 | Weather | d10 | Terrain | d6 | Mood) => only the clicked group.
-    function allowedKeyIndicesForClick(headerRow, clickCell, groups) {
-      if (!headerRow || !clickCell || !groups.length) return null;
-      if (headerDiceCount(headerRow) <= 1) return null;
-      var col = cellColumnIndex(headerRow, clickCell);
-      if (col < 0) return null;
-      var group = groupForColumn(groups, col);
-      return group ? [group.keyIndex] : null;
-    }
-
     function getLookupTableContext(anchor, rollTotal) {
       if (!anchor || !anchor.closest || rollTotal == null) return null;
 
       var cell = null;
       var table = null;
       var headerRow = null;
-      var allowedKeys = null;
       var sourceTable = anchor._jdtSourceTable;
 
       if (sourceTable && sourceTable.querySelector) {
         // Re-roll from a previous table result in the tray.
         table = sourceTable;
         headerRow = findTableHeaderRow(table);
-        allowedKeys = anchor._jdtAllowedKeyIndices || null;
       } else {
         cell = anchor.closest("td, th");
         if (!cell) return null;
@@ -384,10 +349,7 @@
       var groups = buildColumnGroups(keyColumns, tableColumnCount(table, headerRow));
       if (!isLookupTable(table, headerRow, groups)) return null;
 
-      if (allowedKeys == null && cell && headerRow) {
-        allowedKeys = allowedKeyIndicesForClick(headerRow, cell, groups);
-      }
-      var matched = findLookupMatch(table, headerRow, groups, rollTotal, allowedKeys);
+      var matched = findLookupMatch(table, headerRow, groups, rollTotal);
       if (!matched) return null;
 
       var headerCells = headerRow ? rowCells(headerRow) : [];
@@ -420,9 +382,7 @@
         });
       }
 
-      return columns.length
-        ? { columns: columns, _sourceTable: table, _allowedKeyIndices: allowedKeys }
-        : null;
+      return columns.length ? { columns: columns, _sourceTable: table } : null;
     }
 
     function serializableTableContext(tableContext) {
@@ -459,9 +419,6 @@
             if (tableContext._sourceTable && tableContext._sourceTable.querySelector) {
               reroll._jdtSourceTable = tableContext._sourceTable;
             }
-            if (tableContext._allowedKeyIndices) {
-              reroll._jdtAllowedKeyIndices = tableContext._allowedKeyIndices;
-            }
             headerSpan.appendChild(reroll);
           } else if (col.header_html) {
             headerSpan.innerHTML = col.header_html;
@@ -565,6 +522,7 @@
       root.setAttribute("data-expanded", expanded ? "true" : "false");
       // Some themes override [hidden], so enforce display too.
       body.hidden = !expanded;
+      // Clear the pre-paint inline lock so the expanded stylesheet rule can show the body.
       body.style.display = expanded ? "" : "none";
       saveBool(STORAGE_EXPANDED, expanded);
       if (expanded) {

data/lib/jekyll/dice_tray/html_rewriter.rb

@@ -199,18 +199,42 @@ module Jekyll
       def self.inject_tray(html, assets_path:)
         return html if html.include?('data-dice-tray-root="true"')
 
+        # Start collapsed. Inline display:none holds the body shut until the script
+        # below runs: the hidden attribute loses to author CSS (including ours), and
+        # the deferred dice_tray.js can run after first paint, which flashes the
+        # open tray on navigation. This script reads the same localStorage key as
+        # STORAGE_EXPANDED in dice_tray.js and applies it before first paint.
         tray = <<~HTML
-          <div id="jekyll-dice-tray" data-dice-tray-root="true" data-version="#{VERSION}" aria-live="polite">
+          <div id="jekyll-dice-tray" data-dice-tray-root="true" data-version="#{VERSION}" data-expanded="false" aria-live="polite">
             <div class="jdt-header">
               <button type="button" class="jdt-toggle" aria-expanded="false" title="Toggle dice tray">Dice</button>
             </div>
-            <div class="jdt-body" hidden>
+            <div class="jdt-body" hidden style="display:none">
               <div class="jdt-clue">Type <code>1d20+5</code> or <code>/help</code>, then press Enter.</div>
               <div class="jdt-log" role="log" aria-label="Dice roll log"></div>
               <input class="jdt-input" type="text" inputmode="text" autocomplete="off" spellcheck="false"
                 placeholder="Roll: 1d6, d4, 2d8+1, /help" />
             </div>
           </div>
+          <script>
+          // Synchronous on purpose: must finish before the browser paints the tray.
+          (function () {
+            try {
+              // Keep in sync with STORAGE_EXPANDED in dice_tray.js.
+              var expanded = localStorage.getItem("jekyll_dice_tray:expanded") === "true";
+              var root = document.getElementById("jekyll-dice-tray");
+              if (!root) return;
+              root.setAttribute("data-expanded", expanded ? "true" : "false");
+              var toggle = root.querySelector(".jdt-toggle");
+              if (toggle) toggle.setAttribute("aria-expanded", expanded ? "true" : "false");
+              var body = root.querySelector(".jdt-body");
+              if (!body) return;
+              body.hidden = !expanded;
+              // Inline display wins over theme rules that override [hidden].
+              body.style.display = expanded ? "flex" : "none";
+            } catch (e) {}
+          })();
+          </script>
         HTML
 
         tags = <<~HTML

data/lib/jekyll/dice_tray/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module DiceTray
-    VERSION = "0.5.0"
+    VERSION = "0.5.2"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-dice-tray
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - directsun