From 380599383cef6684d979d69b1812961df9e8ef6a Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 9 Mar 2026 22:44:46 -0500 Subject: [PATCH] feat(pedigree): themed node rendering, glow rings, gold root node, breed label, zoom display --- client/src/components/PedigreeTree.jsx | 202 +++++++++++++++++-------- 1 file changed, 141 insertions(+), 61 deletions(-) diff --git a/client/src/components/PedigreeTree.jsx b/client/src/components/PedigreeTree.jsx index ee72413..a0e7d7d 100644 --- a/client/src/components/PedigreeTree.jsx +++ b/client/src/components/PedigreeTree.jsx @@ -1,6 +1,6 @@ import { useState, useCallback, useEffect } from 'react' import Tree from 'react-d3-tree' -import { ZoomIn, ZoomOut, Maximize2, Download } from 'lucide-react' +import { ZoomIn, ZoomOut, Maximize2 } from 'lucide-react' import './PedigreeTree.css' const PedigreeTree = ({ dogId, pedigreeData, coi }) => { @@ -12,90 +12,151 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => { const updateDimensions = () => { const container = document.getElementById('tree-container') if (container) { - setDimensions({ - width: container.offsetWidth, - height: container.offsetHeight - }) - setTranslate({ - x: container.offsetWidth / 4, - y: container.offsetHeight / 2 - }) + setDimensions({ width: container.offsetWidth, height: container.offsetHeight }) + setTranslate({ x: container.offsetWidth / 4, y: container.offsetHeight / 2 }) } } - updateDimensions() window.addEventListener('resize', updateDimensions) return () => window.removeEventListener('resize', updateDimensions) }, []) - const handleZoomIn = () => setZoom(z => Math.min(z + 0.2, 2)) + const handleZoomIn = () => setZoom(z => Math.min(z + 0.2, 2)) const handleZoomOut = () => setZoom(z => Math.max(z - 0.2, 0.2)) - const handleReset = () => { + const handleReset = () => { setZoom(0.8) - setTranslate({ - x: dimensions.width / 4, - y: dimensions.height / 2 - }) + setTranslate({ x: dimensions.width / 4, y: dimensions.height / 2 }) } - const renderCustomNode = ({ nodeDatum, toggleNode }) => { - const isMale = nodeDatum.attributes?.sex === 'male' - const nodeColor = isMale ? '#3b82f6' : '#ec4899' - + const renderCustomNode = ({ nodeDatum }) => { + const isRoot = nodeDatum.attributes?.isRoot + const isMale = nodeDatum.attributes?.sex === 'male' + const hasId = !!nodeDatum.attributes?.id + const breed = nodeDatum.attributes?.breed + + // Colour palette aligned to app theme + const maleColor = '#3b82f6' + const femaleColor = '#ec4899' + const rootGold = '#c2862a' // --primary + const rootAccent = '#9b3a10' // --accent + + const nodeColor = isRoot ? rootGold : (isMale ? maleColor : femaleColor) + const glowColor = isRoot + ? 'rgba(194,134,42,0.35)' + : (isMale ? 'rgba(59,130,246,0.3)' : 'rgba(236,72,153,0.3)') + const ringColor = isRoot ? rootAccent : nodeColor + + const r = isRoot ? 34 : 28 + return ( + {/* Glow halo */} + + {/* Outer ring */} + + + {/* Main node */} + { - if (nodeDatum.attributes?.id) { - window.location.href = `/dogs/${nodeDatum.attributes.id}` - } + if (hasId) window.location.href = `/dogs/${nodeDatum.attributes.id}` }} /> + + {/* SVG gradient definition for root node */} + {isRoot && ( + + + + + + + )} + + {/* Gender / crown icon */} - {isMale ? '♂' : '♀'} + {isRoot ? '👑' : (isMale ? '♂' : '♀')} + + {/* Name label */} {nodeDatum.name} - {nodeDatum.attributes?.registration && ( + + {/* Breed label (subtle) */} + {breed && ( + {breed} + + )} + + {/* Registration number */} + {nodeDatum.attributes?.registration && ( + {nodeDatum.attributes.registration} )} + + {/* Birth year */} {nodeDatum.attributes?.birth_year && ( ({nodeDatum.attributes.birth_year}) @@ -107,21 +168,24 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => { return (
+ + {/* Controls */}
- -
+ {coi !== null && coi !== undefined && (
- COI: + COI 10 ? 'high' : coi > 5 ? 'medium' : 'low'}`}> {coi.toFixed(2)}% @@ -129,31 +193,47 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => { )}
+ {/* Legend */}
-
- Male +
+ Sire
-
- Female +
+ Dam +
+
+
+ Subject
+ {/* Zoom indicator */} +
+ {Math.round(zoom * 100)}% +
+ + {/* Tree canvas */}
{pedigreeData && dimensions.width > 0 && ( { - setZoom(zoom) - setTranslate(translate) + onUpdate={({ zoom: z, translate: t }) => { + setZoom(z) + setTranslate(t) }} orientation="horizontal" pathFunc="step" - separation={{ siblings: 1.5, nonSiblings: 2 }} - nodeSize={{ x: 200, y: 150 }} + separation={{ siblings: 1.6, nonSiblings: 2.2 }} + nodeSize={{ x: 220, y: 160 }} renderCustomNodeElement={renderCustomNode} enableLegacyTransitions transitionDuration={300} @@ -164,4 +244,4 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => { ) } -export default PedigreeTree \ No newline at end of file +export default PedigreeTree