poker-irongrid 1.2.0 → 1.3.0

package/README.md

@@ -85,6 +85,7 @@ npm install poker-irongrid
 | `defaultColor` | `string` | `'hsl(0, 0%, 100%)'` | Default background color for uncolored hands |
 | `defaultSelectedColor` | `string` | `'hsl(0, 0%, 85%)'` | Default color for selected hands without explicit color |
 | `evaluator` | `boolean` | `false` | Show hero's live equity against the hands on the grid (requires hero cards) |
+| `subgrid` | `boolean` | `false` | Split the grid into 3x3 blocks (A–T, 9–6, 5–2) with space after the T and 6 rows/columns; spacing set by `--irongrid-subgrid-gap` (default `6px`) |
 | `preflopTableUrl` | `string \| null` | `null` | URL of poker-bitvaljs's `bench/preflop-table.bin` for exact preflop equity (Monte Carlo without it) |
 
 #### Initial State Props

package/dist/poker-grid/components/DeadCardsInput.svelte

@@ -130,25 +130,14 @@
   function normalizeTokens(input) {
     if (!input || !input.trim()) return [];
     const symbolMap = { '♣': 'c', '♦': 'd', '♥': 'h', '♠': 's' };
-    const validRanks = new Set(['A','K','Q','J','T','9','8','7','6','5','4','3','2']);
-    const validSuits = new Set(['c','d','h','s']);
-    return input
-      .replace(/[_,]/g, ' ')
-      .trim()
-      .split(/\s+/)
-      .map(tok => {
-        if (!tok) return null;
-        let t = tok.trim();
-        t = t.replace(/[♣♦♥♠]/g, (m) => symbolMap[m] || m);
-        const rank = t.charAt(0).toUpperCase();
-        const suitRaw = t.charAt(1) || '';
-        const suit = suitRaw.toLowerCase();
-        if (validRanks.has(rank) && validSuits.has(suit)) {
-          return rank + suit;
-        }
-        return null;
-      })
-      .filter(Boolean);
+    const text = input.replace(/[♣♦♥♠]/g, (m) => symbolMap[m]);
+    // Cards with or without separators: 'As Ks', 'AsKs', 'A♠K♠', 'as,ks' all give ['As', 'Ks']
+    const cards = [];
+    for (const [, rank, suit] of text.matchAll(/([AKQJT2-9])([cdhs])/gi)) {
+      const card = rank.toUpperCase() + suit.toLowerCase();
+      if (!cards.includes(card)) cards.push(card);
+    }
+    return cards;
   }
 
   /** 

package/dist/poker-grid/components/Grid.svelte

@@ -18,6 +18,28 @@
   export let showTips = false;
   /** Whether to enable double-click details panel. */
   export let enableDetailsPanel = false;
+  /**
+   * Split the grid into 3x3 blocks: extra space after the T and 6 rows/columns (A-T, 9-6, 5-2).
+   * The space is set by the --irongrid-subgrid-gap CSS variable.
+   */
+  export let subgrid = false;
+
+  /** CSS grid line for a row/column index: with subgrid, spacer tracks follow T (index 4) and 6 (index 8). */
+  function gridLine(index, split) {
+    return index + 1 + (split ? (index >= 5 ? 1 : 0) + (index >= 9 ? 1 : 0) : 0);
+  }
+
+  /** The grid cell under a point (or null), from the cells' own positions, so it works with any spacing. */
+  function cellAtPoint(gridElement, x, y) {
+    const cells = gridElement.querySelectorAll('[data-row]');
+    for (const cell of cells) {
+      const r = cell.getBoundingClientRect();
+      if (x >= r.left && x < r.right && y >= r.top && y < r.bottom) {
+        return { element: cell, rect: r, row: Number(cell.dataset.row), col: Number(cell.dataset.col) };
+      }
+    }
+    return null;
+  }
 
   let isDragging = false;
   let tooltip = { visible: false, x: 0, y: 0, content: '' };
@@ -187,19 +209,16 @@
   function handleMouseMove(event) {
     if (!isDragging) return;
     const gridElement = event.currentTarget;
-    const rect = gridElement.getBoundingClientRect();
-    const cellSize = rect.width / 13;
     const coords = getEventCoordinates(event);
-    const x = coords.x - rect.left;
-    const y = coords.y - rect.top;
-    const colIndex = Math.floor(x / cellSize);
-    const rowIndex = Math.floor(y / cellSize);
-    if (colIndex < 0 || colIndex >= 13 || rowIndex < 0 || rowIndex >= 13) return;
-    const cellInfo = getCellInfo(rowIndex, colIndex);
-    const cellRect = { left: colIndex * cellSize, top: rowIndex * cellSize, width: cellSize, height: cellSize };
+    const hit = cellAtPoint(gridElement, coords.x, coords.y);
+    if (!hit) return;
+    const cellInfo = getCellInfo(hit.row, hit.col);
+    const cellSize = Math.min(hit.rect.width, hit.rect.height);
     const bufferSize = cellSize * 0.75;
     const bufferOffset = (cellSize - bufferSize) / 2;
-    const inHitZone = (x - cellRect.left) >= bufferOffset && (x - cellRect.left) <= bufferOffset + bufferSize && (y - cellRect.top) >= bufferOffset && (y - cellRect.top) <= bufferOffset + bufferSize;
+    const x = coords.x - hit.rect.left;
+    const y = coords.y - hit.rect.top;
+    const inHitZone = x >= bufferOffset && x <= bufferOffset + bufferSize && y >= bufferOffset && y <= bufferOffset + bufferSize;
     if (!inHitZone) return;
     if (!dragCells.has(cellInfo.hand)) {
       dragCells.add(cellInfo.hand);
@@ -404,7 +423,7 @@
 </script>
 
   <div class="poker-grid-container" role="region" aria-label="Poker hand grid container">
-    <div class="poker-grid" bind:this={gridElement} onmousemove={handleMouseMove} role="application" aria-label="Poker hand selection grid" tabindex={interactive ? 0 : -1} onmouseup={handleMouseUp}>
+    <div class="poker-grid" class:subgrid bind:this={gridElement} onmousemove={handleMouseMove} role="application" aria-label="Poker hand selection grid" tabindex={interactive ? 0 : -1} onmouseup={handleMouseUp}>
     {#each Array(13) as _, rowIndex}
       {#each Array(13) as __, colIndex}
         {@const cellInfo = getCellInfo(rowIndex, colIndex)}
@@ -412,7 +431,9 @@
           <button
             type="button"
             class="grid-cell {isDragging ? 'dragging' : ''} {interactive ? '' : showTips ? 'non-interactive show-tips' : 'non-interactive'}"
-            style="background: {gradients[cellInfo.hand]} !important"
+            style="background: {gradients[cellInfo.hand]} !important; grid-row: {gridLine(rowIndex, subgrid)}; grid-column: {gridLine(colIndex, subgrid)};"
+            data-row={rowIndex}
+            data-col={colIndex}
             onclick={(e) => handleClick(e, cellInfo)}
             ondblclick={(e) => handleDoubleClick(e, cellInfo)}
             onmousedown={(e) => handleMouseDown(e, cellInfo)}
@@ -425,7 +446,9 @@
         {:else}
           <div
             class="grid-cell non-interactive"
-            style="background: {gradients[cellInfo.hand]} !important"
+            style="background: {gradients[cellInfo.hand]} !important; grid-row: {gridLine(rowIndex, subgrid)}; grid-column: {gridLine(colIndex, subgrid)};"
+            data-row={rowIndex}
+            data-col={colIndex}
             role="presentation"
             title={cellInfo.display}
           >
@@ -463,6 +486,12 @@
     gap: 0; 
     border: var(--irongrid-border-width) solid var(--irongrid-color-border); 
   }
+  /* 3x3 blocks: spacer tracks after T and 6 (A-T | 9-6 | 5-2) */
+  .poker-grid.subgrid {
+    grid-template-columns: repeat(5, 1fr) var(--irongrid-subgrid-gap, 6px) repeat(4, 1fr) var(--irongrid-subgrid-gap, 6px) repeat(4, 1fr);
+    grid-template-rows: repeat(5, auto) var(--irongrid-subgrid-gap, 6px) repeat(4, auto) var(--irongrid-subgrid-gap, 6px) repeat(4, auto);
+    border: none;
+  }
   .grid-cell { 
     aspect-ratio: 1; 
     display: flex; 

package/dist/poker-grid/components/Grid.svelte.d.ts

@@ -8,6 +8,7 @@ type Grid = SvelteComponent<{
     interactive?: boolean;
     showTips?: boolean;
     enableDetailsPanel?: boolean;
+    subgrid?: boolean;
 }, {
     cellDetails: CustomEvent<any>;
     cellClick: CustomEvent<any>;
@@ -26,6 +27,7 @@ declare const Grid: $$__sveltets_2_IsomorphicComponent<{
     interactive?: boolean;
     showTips?: boolean;
     enableDetailsPanel?: boolean;
+    subgrid?: boolean;
 }, {
     cellDetails: CustomEvent<any>;
     cellClick: CustomEvent<any>;

package/dist/poker-grid/components/PokerGridPanel.svelte

@@ -25,6 +25,8 @@
   export let showSummary = true;
   export let showTips = false;
   export let enableDetailsPanel = false;
+  /** Split the grid into 3x3 blocks (A-T, 9-6, 5-2) with space between them. */
+  export let subgrid = false;
   export let evaluator = false;
   export let defaultColor = 'hsl(0, 0%, 100%)';
   export let defaultSelectedColor = 'hsl(0, 0%, 85%)';
@@ -265,6 +267,7 @@
       {interactive}
       {showTips}
       {enableDetailsPanel}
+      {subgrid}
       {manager}
       on:selectionChange={handleSelectionChange}
       on:cellDetails={handleCellDetails}

package/dist/poker-grid/components/PokerGridPanel.svelte.d.ts

@@ -10,6 +10,7 @@ type PokerGridPanel = SvelteComponent<{
     interactive?: boolean;
     showTips?: boolean;
     enableDetailsPanel?: boolean;
+    subgrid?: boolean;
     evaluator?: boolean;
     visibleHands?: {};
     ranges?: any[];
@@ -42,6 +43,7 @@ declare const PokerGridPanel: $$__sveltets_2_IsomorphicComponent<{
     interactive?: boolean;
     showTips?: boolean;
     enableDetailsPanel?: boolean;
+    subgrid?: boolean;
     evaluator?: boolean;
     visibleHands?: {};
     ranges?: any[];

package/dist/poker-grid/components/SelectionSummary.svelte

@@ -74,7 +74,11 @@
     </span>
   </span>
   <div class="flex items-center gap-2">
-    {#if showEquity}
+    {#if evaluator && heroCards?.length !== 2 && selected + highlighted > 0}
+      <div class="text-xs" style="color: var(--irongrid-color-text-secondary);">
+        <span>Enter 2 hero cards for equity</span>
+      </div>
+    {:else if showEquity}
       <div
         class="text-xs equity-readout"
         class:equity-pending={equityPending}

package/dist/poker-grid/theme.css

@@ -53,6 +53,7 @@
 
   /* Border Variables */
   --irongrid-border-width: 1px;
+  --irongrid-subgrid-gap: 6px; /* space between the 3x3 blocks with subgrid */
   --irongrid-border-radius-sm: 0.125rem;
   --irongrid-border-radius-md: 0.25rem;
   --irongrid-border-radius-lg: 0.375rem;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "poker-irongrid",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/DarraghGeo/poker-irongrid.git"