Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Button Colour Handling to CTA card #1418

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Added Button Colour Handling to CTA card #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a536a9
Updated tests
ronaldlangeveld Jan 24, 2025
7f1a1b0
Wired up text button color
ronaldlangeveld Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/kg-default-nodes/lib/nodes/call-to-action/CallToActionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export class CallToActionNode extends generateDecoratorNode({nodeType: 'call-to-
{name: 'buttonText', default: ''},
{name: 'buttonUrl', default: ''},
{name: 'buttonColor', default: ''},
{name: 'buttonTextColor', default: ''},
{name: 'hasSponsorLabel', default: false},
{name: 'hasBackground', default: false},
{name: 'backgroundColor', default: 'none'},
Expand All @@ -24,6 +25,7 @@ export class CallToActionNode extends generateDecoratorNode({nodeType: 'call-to-
buttonText,
buttonUrl,
buttonColor,
buttonTextColor,
hasSponsorLabel,
hasBackground,
backgroundColor,
Expand All @@ -37,6 +39,7 @@ export class CallToActionNode extends generateDecoratorNode({nodeType: 'call-to-
this.__buttonText = buttonText || '';
this.__buttonUrl = buttonUrl || '';
this.__buttonColor = buttonColor || 'none';
this.__buttonTextColor = buttonTextColor || 'none';
this.__hasSponsorLabel = hasSponsorLabel || false;
this.__hasBackground = hasBackground || false;
this.__backgroundColor = backgroundColor || 'none';
Expand Down
6 changes: 6 additions & 0 deletions packages/kg-default-nodes/test/nodes/call-to-action.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe('CallToActionNode', function () {
buttonText: 'click me',
buttonUrl: 'http://blog.com/post1',
buttonColor: 'none',
buttonTextColor: 'none',
hasSponsorLabel: true,
hasBackground: true,
backgroundColor: 'none',
Expand All @@ -60,6 +61,7 @@ describe('CallToActionNode', function () {
callToActionNode.buttonText.should.equal(dataset.buttonText);
callToActionNode.buttonUrl.should.equal(dataset.buttonUrl);
callToActionNode.buttonColor.should.equal(dataset.buttonColor);
callToActionNode.buttonTextColor.should.equal(dataset.buttonTextColor);
callToActionNode.hasSponsorLabel.should.equal(dataset.hasSponsorLabel);
callToActionNode.hasBackground.should.equal(dataset.hasBackground);
callToActionNode.backgroundColor.should.equal(dataset.backgroundColor);
Expand Down Expand Up @@ -94,6 +96,10 @@ describe('CallToActionNode', function () {
callToActionNode.buttonColor = 'red';
callToActionNode.buttonColor.should.equal('red');

callToActionNode.buttonTextColor.should.equal('none');
callToActionNode.buttonTextColor = 'black';
callToActionNode.buttonTextColor.should.equal('black');

callToActionNode.hasSponsorLabel.should.equal(false);
callToActionNode.hasSponsorLabel = true;

Expand Down
18 changes: 9 additions & 9 deletions packages/koenig-lexical/src/components/ui/cards/CtaCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ export const ctaColorPicker = [
];

export function CtaCard({
buttonText, //
buttonUrl, //
buttonColor, //
buttonText,
buttonUrl,
buttonColor,
buttonTextColor,
color, //
hasSponsorLabel, //
hasSponsorLabel,
htmlEditor,
htmlEditorInitialState,
imageSrc, //
isEditing, //
isSelected, //
layout, //
showButton, //
imageSrc,
isEditing,
isSelected,
layout,
showButton,
updateButtonText,
updateButtonUrl,
updateShowButton,
Expand Down
1 change: 1 addition & 0 deletions packages/koenig-lexical/src/nodes/CallToActionNode.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export class CallToActionNode extends BaseCallToActionNode {
backgroundColor={this.backgroundColor}
buttonColor={this.buttonColor}
buttonText={this.buttonText}
buttonTextColor={this.buttonTextColor}
buttonUrl={this.buttonUrl}
hasBackground={this.hasBackground}
hasImage={this.hasImage}
Expand Down
14 changes: 12 additions & 2 deletions packages/koenig-lexical/src/nodes/CallToActionNodeComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export const CallToActionNodeComponent = ({
showButton,
textValue,
buttonColor,
htmlEditor
htmlEditor,
buttonTextColor
}) => {
const [editor] = useLexicalComposerContext();
const {isEditing, isSelected, setEditing} = React.useContext(CardContext);
Expand Down Expand Up @@ -54,14 +55,23 @@ export const CallToActionNodeComponent = ({
});
};

const handleButtonColorChange = (val, matchingTextColor) => {
editor.update(() => {
const node = $getNodeByKey(nodeKey);
node.buttonColor = val;
node.buttonTextColor = matchingTextColor;
});
};

return (
<>
<CtaCard
buttonColor={buttonColor}
buttonText={buttonText}
buttonTextColor={buttonTextColor}
buttonUrl={buttonUrl}
color={backgroundColor}
handleButtonColor={() => {}}
handleButtonColor={handleButtonColorChange}
handleColorChange={() => {}}
hasBackground={hasBackground}
hasImage={hasImage}
Expand Down
50 changes: 50 additions & 0 deletions packages/koenig-lexical/test/e2e/cards/cta-card.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,54 @@ test.describe('Call To Action Card', async () => {

expect(await page.isVisible('[data-testid="cta-button"]')).toBe(true);
});

test('default button colour is accent', async function () {
await focusEditor(page);
await insertCard(page, {cardName: 'call-to-action'});
await page.click('[data-testid="button-settings"]');
expect(await page.getAttribute('[data-testid="cta-button"]', 'class')).toContain('bg-accent');
});

test('can change button colour to black', async function () {
await focusEditor(page);
await insertCard(page, {cardName: 'call-to-action'});
await page.click('[data-testid="button-settings"]');
// find the parent element cta-button-color and select child button with title=black
await page.click('[data-testid="cta-button-color"] button[title="Black"]');
// check if the button has style="background-color: rgb(0, 0, 0);"
expect(await page.getAttribute('[data-testid="cta-button"]', 'style')).toContain('background-color: rgb(0, 0, 0);');
});

test('can change button colour to grey', async function () {
await focusEditor(page);
await insertCard(page, {cardName: 'call-to-action'});
await page.click('[data-testid="button-settings"]');
// find the parent element cta-button-color and select child button with title=white
await page.click('[data-testid="cta-button-color"] button[title="Grey"]');
// check if the button has style="background-color: rgb(255, 255, 255);"
expect(await page.getAttribute('[data-testid="cta-button"]', 'style')).toContain('background-color: rgb(240, 240, 240);');
});

test('can use colour picker to change button colour', async function () {
await focusEditor(page);
await insertCard(page, {cardName: 'call-to-action'});
await page.click('[data-testid="button-settings"]');
await page.click('button[aria-label="Pick color"]');
await page.fill('input[aria-label="Color value"]', 'ff0000');
expect(await page.getAttribute('[data-testid="cta-button"]', 'style')).toContain('background-color: rgb(255, 0, 0);');
});

test('button text colour changes with button colour', async function () {
await focusEditor(page);
await insertCard(page, {cardName: 'call-to-action'});
await page.click('[data-testid="button-settings"]');
await page.fill('[data-testid="button-text"]', 'Click me');
await page.click('button[aria-label="Pick color"]');
await page.fill('input[aria-label="Color value"]', 'FFFFFF');
expect(await page.getAttribute('[data-testid="cta-button"]', 'style')).toContain('color: rgb(255, 255, 255);');

// change button colour to black
await page.click('[data-testid="cta-button-color"] button[title="Black"]');
expect(await page.getAttribute('[data-testid="cta-button"]', 'style')).toContain('color: rgb(0, 0, 0);');
});
});
Loading