From 0cdfdbc751f32d79b27672be55ac0c8bfba6c1ba Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sun, 6 Jul 2025 17:38:27 +0200 Subject: [PATCH] Don't propagate clicks on edit and box --- frontend/src/components/JobCard.tsx | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/JobCard.tsx b/frontend/src/components/JobCard.tsx index 569beb6..6e6b80c 100644 --- a/frontend/src/components/JobCard.tsx +++ b/frontend/src/components/JobCard.tsx @@ -139,6 +139,23 @@ const JobCard: React.FC = ({ job, onEdit, onDelete, onUpdateProduc } }; + const handleProducedClick = (e: React.MouseEvent) => { + e.stopPropagation(); + if (job.status !== 'Closed') { + setIsEditingProduced(true); + } + }; + + const handleEditClick = (e: React.MouseEvent) => { + e.stopPropagation(); + onEdit(job); + }; + + const handleDeleteClick = (e: React.MouseEvent) => { + e.stopPropagation(); + onDelete(job.id); + }; + return ( @@ -157,7 +174,7 @@ const JobCard: React.FC = ({ job, onEdit, onDelete, onUpdateProduc size="sm" className="p-1 h-6 w-6 relative group" onClick={(e) => { - e.preventDefault(); + e.stopPropagation(); copyBillOfMaterials(); }} > @@ -192,7 +209,7 @@ const JobCard: React.FC = ({ job, onEdit, onDelete, onUpdateProduc size="sm" className="p-1 h-6 w-6 relative group" onClick={(e) => { - e.preventDefault(); + e.stopPropagation(); copyConsumedMaterials(); }} > @@ -231,13 +248,14 @@ const JobCard: React.FC = ({ job, onEdit, onDelete, onUpdateProduc onChange={(e) => setProducedValue(e.target.value)} onBlur={handleProducedUpdate} onKeyDown={handleProducedKeyPress} + onClick={(e) => e.stopPropagation()} className="w-24 h-6 px-2 py-1 inline-block bg-gray-800 border-gray-600 text-white" min="0" autoFocus /> ) : ( job.status !== 'Closed' && setIsEditingProduced(true)} + onClick={handleProducedClick} className={job.status !== 'Closed' ? "cursor-pointer hover:text-blue-400" : undefined} title={job.status !== 'Closed' ? "Click to edit" : undefined} > @@ -255,7 +273,7 @@ const JobCard: React.FC = ({ job, onEdit, onDelete, onUpdateProduc