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

fix: accordion trigger doesn't close it content when state open #57

Merged
merged 2 commits into from
Nov 21, 2023
Merged

fix: accordion trigger doesn't close it content when state open #57

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
68b394e
fix: accordion trigger doesn't close it content
oidre Nov 19, 2023
726cd88
test: add accordion e2e test
oidre Nov 20, 2023
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
110 changes: 110 additions & 0 deletions apps/ui-storybook-e2e/src/integration/accordion/accordion.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
describe('accordion', () => {
const verifyAccordionSetup = () => {
cy.get('brn-accordion').should('have.attr', 'data-state', 'closed');
cy.get('brn-accordion-item').should('have.length', 3);
cy.get('brn-accordion-item').first().as('firstItem');
cy.get('@firstItem').next().as('secondItem');
cy.get('@secondItem').next().as('thirdItem');

cy.get('@firstItem').should('have.attr', 'data-state', 'closed');
cy.get('@secondItem').should('have.attr', 'data-state', 'closed');
cy.get('@thirdItem').should('have.attr', 'data-state', 'closed');

cy.get('@firstItem')
.find('brn-accordion-trigger')
.should('have.attr', 'role', 'heading')
.should('have.id', 'brn-accordion-trigger-0')
.should('have.attr', 'data-state', 'closed')
.should('have.attr', 'aria-expanded', 'false');
cy.get('@firstItem')
.find('brn-accordion-content')
.should('have.attr', 'role', 'region')
.should('have.id', 'brn-accordion-content-0')
.should('have.attr', 'data-state', 'closed');
};

const verifyAccordionStateOpen = () => {
cy.get('brn-accordion').should('have.attr', 'data-state', 'open');
};

const verifyAccordionStateClosed = () => {
cy.get('brn-accordion').should('have.attr', 'data-state', 'closed');
};

const verifyAccordionFirstItemStateOpen = () => {
cy.get('@firstItem').should('have.attr', 'data-state', 'open');
cy.get('@firstItem')
.find('brn-accordion-trigger')
.should('have.attr', 'data-state', 'open')
.should('have.attr', 'aria-expanded', 'true');
cy.get('@firstItem').find('brn-accordion-content').should('have.attr', 'data-state', 'open');
};

const verifyAccordionFirstItemStateClosed = () => {
cy.get('@firstItem').should('have.attr', 'data-state', 'closed');
cy.get('@firstItem')
.find('brn-accordion-trigger')
.should('have.attr', 'data-state', 'closed')
.should('have.attr', 'aria-expanded', 'false');
cy.get('@firstItem').find('brn-accordion-content').should('have.attr', 'data-state', 'closed');
};

const verifyAccordionSecondItemStateOpen = () => {
cy.get('@secondItem').should('have.attr', 'data-state', 'open');
cy.get('@secondItem')
.find('brn-accordion-trigger')
.should('have.attr', 'data-state', 'open')
.should('have.attr', 'aria-expanded', 'true');
cy.get('@secondItem').find('brn-accordion-content').should('have.attr', 'data-state', 'open');
};

const verifyAccordionSecondItemStateClosed = () => {
cy.get('@secondItem').should('have.attr', 'data-state', 'closed');
cy.get('@secondItem')
.find('brn-accordion-trigger')
.should('have.attr', 'data-state', 'closed')
.should('have.attr', 'aria-expanded', 'false');
cy.get('@secondItem').find('brn-accordion-content').should('have.attr', 'data-state', 'closed');
};

describe('default', () => {
beforeEach(() => {
cy.visit('/iframe.html?id=accordion--default');
cy.injectAxe();
});

it('click on trigger should open and close it content', () => {
verifyAccordionSetup();

// click trigger first item to open it content
cy.get('@firstItem').find('brn-accordion-trigger').click();
verifyAccordionStateOpen();
verifyAccordionFirstItemStateOpen();

// click trigger first item to close it content
cy.get('@firstItem').find('brn-accordion-trigger').click();
verifyAccordionStateClosed();
verifyAccordionFirstItemStateClosed();
});

it('click on trigger should open it content and click on another trigger should closed previous content and open newly triggered content', () => {
verifyAccordionSetup();

// click trigger first item to open it content
cy.get('@firstItem').find('brn-accordion-trigger').click();
verifyAccordionStateOpen();
verifyAccordionFirstItemStateOpen();

// click trigger second item to open it content and close previous content
cy.get('@secondItem').find('brn-accordion-trigger').click();
verifyAccordionStateOpen();
verifyAccordionSecondItemStateOpen();
verifyAccordionFirstItemStateClosed();

// click trigger second item to close it content
cy.get('@secondItem').find('brn-accordion-trigger').click();
verifyAccordionStateClosed();
verifyAccordionSecondItemStateClosed();
});
});
});
2 changes: 1 addition & 1 deletion libs/ui/accordion/brain/src/lib/brn-accordion.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class BrnAccordionComponent implements AfterContentInit {

public toggleItem(id: number) {
if (this._openItemIds().includes(id)) {
this._openItemIds.update((ids) => ids.filter((openId) => id == openId));
this._openItemIds.update((ids) => ids.filter((openId) => id !== openId));
return;
} else if (this.type === 'single') {
this._openItemIds.set([]);
Expand Down
Loading