From 47e96a027bdb86f0dbe533c98d17e5585f549e5c Mon Sep 17 00:00:00 2001
From: naweiss <naweiss@g.jct.ac.il>
Date: Mon, 11 May 2026 09:35:46 +0300
Subject: [PATCH 1/2] Add color pallete for changing wire color

---
 .../simulator/SelectionActionBar.tsx          | 96 +++++++++++++++++++
 .../components/simulator/SimulatorCanvas.tsx  |  5 +
 2 files changed, 101 insertions(+)

diff --git a/frontend/src/components/simulator/SelectionActionBar.tsx b/frontend/src/components/simulator/SelectionActionBar.tsx
index 52c33b49..43e196e3 100644
--- a/frontend/src/components/simulator/SelectionActionBar.tsx
+++ b/frontend/src/components/simulator/SelectionActionBar.tsx
@@ -18,6 +18,7 @@
 
 import React, { useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
+import { WIRE_KEY_COLORS } from '../../utils/wireUtils';
 
 export type SelectionKind = 'wire' | 'component' | 'board';
 
@@ -30,6 +31,8 @@ interface SelectionActionBarProps {
   onDelete: () => void;
   onRotate?: () => void;
   onDeselect: () => void;
+  onColorChange?: (color: string) => void;
+  currentColor?: string;
 }
 
 const ICON_SIZE = 16;
@@ -126,12 +129,16 @@ export const SelectionActionBar: React.FC<SelectionActionBarProps> = ({
   onDelete,
   onRotate,
   onDeselect,
+  onColorChange,
+  currentColor,
 }) => {
   const { t } = useTranslation();
+  const [showPalette, setShowPalette] = React.useState(false);
   const containerRef = useRef<HTMLDivElement | null>(null);
   const deleteRef = useRef<HTMLButtonElement | null>(null);
   const rotateRef = useRef<HTMLButtonElement | null>(null);
   const deselectRef = useRef<HTMLButtonElement | null>(null);
+  const colorToggleRef = useRef<HTMLButtonElement | null>(null);
 
   // Stop native touch events from reaching the canvas listener so it can't
   // call preventDefault on touchend (which would kill the synthetic click).
@@ -154,6 +161,7 @@ export const SelectionActionBar: React.FC<SelectionActionBarProps> = ({
   useTouchSafeAction(deleteRef, onDelete);
   useTouchSafeAction(rotateRef, onRotate ?? noop);
   useTouchSafeAction(deselectRef, onDeselect);
+  useTouchSafeAction(colorToggleRef, () => setShowPalette(!showPalette));
 
   if (!kind) return null;
 
@@ -163,6 +171,8 @@ export const SelectionActionBar: React.FC<SelectionActionBarProps> = ({
       role="toolbar"
       aria-label={t('editor.selectionBar.label')}
       className="selection-action-bar"
+      onMouseDown={(e) => e.stopPropagation()}
+      onClick={(e) => e.stopPropagation()}
       style={{
         position: 'absolute',
         top: 12,
@@ -196,6 +206,63 @@ export const SelectionActionBar: React.FC<SelectionActionBarProps> = ({
         {label}
       </span>
 
+      {kind === 'wire' && onColorChange && (
+        <div style={{ display: 'flex', alignItems: 'center', position: 'relative' }}>
+          <button
+            type="button"
+            ref={colorToggleRef}
+            onClick={() => setShowPalette(!showPalette)}
+            style={{ ...buttonStyle, padding: '6px 8px' }}
+            title="Change color"
+          >
+            <div
+              style={{
+                width: 20,
+                height: 20,
+                borderRadius: '50%',
+                backgroundColor: currentColor || '#22c55e',
+                border: '2px solid rgba(255,255,255,0.2)',
+              }}
+            />
+          </button>
+
+          {showPalette && (
+            <div
+              style={{
+                position: 'absolute',
+                top: '100%',
+                marginTop: 8,
+                left: '50%',
+                transform: 'translateX(-50%)',
+                display: 'flex',
+                flexWrap: 'wrap',
+                gap: 8,
+                padding: '10px',
+                background: '#252526',
+                border: '1px solid #3c3c3c',
+                borderRadius: 8,
+                boxShadow: '0 4px 16px rgba(0,0,0,0.5)',
+                justifyContent: 'center',
+                width: 240,
+                zIndex: 101,
+              }}
+            >
+              {Object.values(WIRE_KEY_COLORS).map((color) => (
+                <ColorButton
+                  key={color}
+                  color={color}
+                  isSelected={color.toLowerCase() === currentColor?.toLowerCase()}
+                  onClick={() => {
+                    onColorChange(color);
+                    setShowPalette(false);
+                  }}
+                />
+              ))}
+            </div>
+          )}
+        </div>
+      )}
+
       {canRotate && onRotate && (
         <button
           type="button"
@@ -240,6 +307,35 @@ export const SelectionActionBar: React.FC<SelectionActionBarProps> = ({
   );
 };
 
+const ColorButton: React.FC<{
+  color: string;
+  isSelected: boolean;
+  onClick: () => void;
+}> = ({ color, isSelected, onClick }) => {
+  const ref = useRef<HTMLButtonElement | null>(null);
+  useTouchSafeAction(ref, onClick);
+
+  return (
+    <button
+      ref={ref}
+      type="button"
+      onClick={onClick}
+      style={{
+        width: 22,
+        height: 22,
+        borderRadius: '50%',
+        backgroundColor: color,
+        border: isSelected ? '2px solid #fff' : '1px solid rgba(255,255,255,0.2)',
+        cursor: 'pointer',
+        padding: 0,
+        flexShrink: 0,
+        boxShadow: isSelected ? '0 0 6px rgba(255,255,255,0.5)' : 'none',
+      }}
+      title={color}
+    />
+  );
+};
+
 const noop = () => {};
 
 const buttonStyle: React.CSSProperties = {
diff --git a/frontend/src/components/simulator/SimulatorCanvas.tsx b/frontend/src/components/simulator/SimulatorCanvas.tsx
index b6183562..a259e75d 100644
--- a/frontend/src/components/simulator/SimulatorCanvas.tsx
+++ b/frontend/src/components/simulator/SimulatorCanvas.tsx
@@ -2344,10 +2344,15 @@ export const SimulatorCanvas = ({ headerSlot }: SimulatorCanvasProps = {}) => {
           {!wireInProgress &&
             (() => {
               if (selectedWireId) {
+                const wire = wires.find((w) => w.id === selectedWireId);
                 return (
                   <SelectionActionBar
                     kind="wire"
                     label="Wire"
+                    currentColor={wire?.color}
+                    onColorChange={(color) => {
+                      updateWire(selectedWireId, { color });
+                    }}
                     onDelete={() => {
                       // Recorded so the touch / mobile delete is also undoable.
                       recordRemoveWire(selectedWireId);

From 46f615ef6922c5ae524fb73c6fbe920e1f4a538e Mon Sep 17 00:00:00 2001
From: David Montero Crespo <davidmonterocrespo24@gmail.com>
Date: Mon, 11 May 2026 11:51:03 -0300
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 frontend/src/components/simulator/SimulatorCanvas.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/simulator/SimulatorCanvas.tsx b/frontend/src/components/simulator/SimulatorCanvas.tsx
index a259e75d..7f2f483a 100644
--- a/frontend/src/components/simulator/SimulatorCanvas.tsx
+++ b/frontend/src/components/simulator/SimulatorCanvas.tsx
@@ -2351,7 +2351,8 @@ export const SimulatorCanvas = ({ headerSlot }: SimulatorCanvasProps = {}) => {
                     label="Wire"
                     currentColor={wire?.color}
                     onColorChange={(color) => {
-                      updateWire(selectedWireId, { color });
+                      if (!wire) return;
+                      recordUpdateWire(selectedWireId, { color: wire.color }, { color });
                     }}
                     onDelete={() => {
                       // Recorded so the touch / mobile delete is also undoable.