From 0ff6c606401805c1821d825fafe721aa8194ee7b Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 23 Mar 2026 09:23:06 -0400 Subject: [PATCH] Swap preview pane actions. --- .../PaletteEditor/PaletteEditor.test.cy.tsx | 12 +++--- .../PaletteEditor/PaletteEditor.tsx | 40 +++++++++++-------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/components/PaletteEditor/PaletteEditor.test.cy.tsx b/src/components/PaletteEditor/PaletteEditor.test.cy.tsx index deffed2..8bb0205 100644 --- a/src/components/PaletteEditor/PaletteEditor.test.cy.tsx +++ b/src/components/PaletteEditor/PaletteEditor.test.cy.tsx @@ -170,7 +170,7 @@ it("can perform actions in normal mode", () => { cy.get("@row2").contains("#000000"); }); -it("can manually sync picker and palette", () => { +it.only("can manually sync picker and palette", () => { cy.mount(); cy.dataCy("hex-value-input").as("hex"); @@ -189,10 +189,10 @@ it("can manually sync picker and palette", () => { // Select a color and sync it to the picker cy.get("@row1").click(); - cy.get("@palette") - .should("have.css", "background-color", "rgb(0, 255, 0)") - .click(); - cy.get("@picker").should("have.css", "background-color", "rgb(0, 255, 0)"); + cy.get("@palette").should("have.css", "background-color", "rgb(0, 255, 0)"); + cy.get("@picker") + .click() + .should("have.css", "background-color", "rgb(0, 255, 0)"); cy.get("@hex").should("have.value", "#00FF00"); // Select a new color, picker remains the same @@ -203,7 +203,7 @@ it("can manually sync picker and palette", () => { // Change picker color, sync back to palette. cy.get("@hex").focus().type("FFFF00{esc}").wait(0); cy.get("@picker").should("have.css", "background-color", "rgb(255, 255, 0)"); - cy.get("@picker").click(); + cy.get("@palette").click(); cy.get("@row0").contains("#FFFF00"); }); diff --git a/src/components/PaletteEditor/PaletteEditor.tsx b/src/components/PaletteEditor/PaletteEditor.tsx index 7ac37a4..94d9a1a 100644 --- a/src/components/PaletteEditor/PaletteEditor.tsx +++ b/src/components/PaletteEditor/PaletteEditor.tsx @@ -384,13 +384,15 @@ function PaletteCard({ @@ -446,20 +448,20 @@ function CardHeader({ function PickerColor({ pickerColor, - paletteColorId, - setPaletteColor, + setPickerColor, + selectedColor, isSynced, }: { pickerColor: HexColor; - paletteColorId: string | null; - setPaletteColor: (id: string, hex: HexColor) => void; + setPickerColor: (hex: HexColor) => void; + selectedColor: HexColor | null; isSynced: boolean; }) { const arrowToken = useContrastToken(() => luminanceFromHex(pickerColor)); const handleClick = () => { - if (!isSynced && paletteColorId) { - setPaletteColor(paletteColorId, pickerColor); + if (!isSynced && selectedColor) { + setPickerColor(selectedColor); } }; @@ -472,7 +474,7 @@ function PickerColor({ backgroundColor: formatHexString(pickerColor), }} onClick={handleClick} - title={!isSynced ? "Send to Picker" : ""} + title={!isSynced ? "Set to Palette Color" : ""} > {!isSynced && (
- +
)} @@ -491,19 +493,23 @@ function PickerColor({ function PaletteColor({ selectedColor, - setPickerColor, + pickerColor, + paletteColorId, + setPaletteColor, isSynced, }: { selectedColor: HexColor | null; - setPickerColor: (hex: HexColor) => void; + pickerColor: HexColor; + paletteColorId: string | null; + setPaletteColor: (id: string, hex: HexColor) => void; isSynced: boolean; }) { const bgColor = selectedColor || DEFAULT_BG; const arrowToken = useContrastToken(() => luminanceFromHex(bgColor)); const handleClick = () => { - if (!isSynced && selectedColor) { - setPickerColor(selectedColor); + if (!isSynced && paletteColorId) { + setPaletteColor(paletteColorId, pickerColor); } }; @@ -516,7 +522,7 @@ function PaletteColor({ backgroundColor: formatHexString(bgColor), }} onClick={handleClick} - title={!isSynced ? "Send to Palette" : ""} + title={!isSynced ? "Set to Picker Color" : ""} > {!isSynced && (
- +
)}