Skip to content

Add onkeydown event handler to DsfrSearchCmp , DsfrHeaderCmp and DsfrCardTileListCmp #14

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

Open
naouioumaimaa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add onkeydown event handler to DsfrSearchCmp , DsfrHeaderCmp and DsfrCardTileListCmp #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions force-app/main/default/lwc/dsfrHeaderCmp/dsfrHeaderCmp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export default class DsfrHeaderCmp extends NavigationMixin(LightningElement) {
mainMenuItems;
complexMenuItems;
currentIndex = -1;
openAccordion = null; // Track the currently open accordion

//-----------------------------------
// Custom Labels
Expand Down Expand Up @@ -682,20 +683,48 @@ export default class DsfrHeaderCmp extends NavigationMixin(LightningElement) {

if (currentStatus == "true") {
if (this.isDebug) console.log('toggleMenu: collapsing menu');
currentMenu.classList?.remove("fr-collapse--expanded");
event.target.ariaExpanded = "false";
this.closeList(currentTargetId);
}
else {
if (this.isDebug) console.log('toggleMenu: collapsing previous menu (if any)');
this.collapseMenu();
if (this.isDebug) console.log('toggleMenu: expanding new menu');
currentMenu.classList.add("fr-collapse--expanded");
event.target.ariaExpanded = "true";
this.openAccordion = currentTargetId;
document.addEventListener('keydown',this.handleEscape, false);
}

if (this.isDebug) console.log('toggleMenu: END for Header');
}

handleEscape = event => {
if (this.isDebug) console.log('handleEscape: START');
if (event?.key === 'Escape') {
this.closeList(this.openAccordion);
}
else {
if (this.isDebug) console.log('handleEscape: END / ignoring key ',event.key);
}
}

closeList(currentTarget){
const currentMenu = this.template.querySelector("div.fr-collapse[id='" + currentTarget + "']")
|| this.template.querySelector("div.fr-collapse[data-name='" + currentTarget + "']");
const buttonTarget = this.template.querySelector("button[value='" + currentTarget + "']");

if (this.isDebug) console.log('closeList: currentMenu ',currentMenu);
if (this.isDebug) console.log('closeList: currentTarget ',buttonTarget);

if (this.isDebug) console.log('closeList: collapsing menu');
currentMenu.classList?.remove("fr-collapse--expanded");
if (buttonTarget) {
buttonTarget.ariaExpanded = "false";
}
this.openAccordion = null;
document.removeEventListener('keydown',this.handleEscape);
}

//----------------------------------------------------------------
// Utilities
//----------------------------------------------------------------
Expand Down
27 changes: 25 additions & 2 deletions force-app/main/extensions/lwc/dsfrCardTileListCmp/dsfrCardTileListCmp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,20 +529,43 @@ export default class DsfrCardTileListCmp extends LightningElement {
if (this.isDebug) console.log('toggleSort: current Menu classList ',sortMenu.classList);
if (sortMenu.classList.contains('fr-collapse--expanded')) {
if (this.isDebug) console.log('toggleSort: closing menu');
sortMenu.classList.remove('fr-collapse--expanded');
sortButton.setAttribute('aria-expanded',false);
this.closeList();
}
else {
if (this.isDebug) console.log('toggleSort: opening menu');
sortMenu.classList.add('fr-collapse--expanded');
sortButton.setAttribute('aria-expanded',true);
document.addEventListener('keydown',this.handleEscape, false);
}
if (this.isDebug) console.log('toggleSort: Menu classList updated ',sortMenu.classList);
}

if (this.isDebug) console.log('toggleSort: END for card/tile list');
}

handleEscape = event => {
if (this.isDebug) console.log('handleEscape: START');
if (event?.key === 'Escape') {
this.closeList();
}
else {
if (this.isDebug) console.log('handleEscape: END / ignoring key ',event.key);
}
}

closeList(){
const sortMenu = this.refs.sortMenu;
if (this.isDebug) console.log('closeList: sortMenu found ',sortMenu);
const sortButton = this.refs.sortButton;
if (this.isDebug) console.log('closeList: sortButton found ',sortButton);

if (this.isDebug) console.log('closeList: closing menu');
sortMenu.classList.remove('fr-collapse--expanded');
sortButton.setAttribute('aria-expanded',false);

document.removeEventListener('keydown',this.handleEscape);
}

selectSort(event){
if (this.isDebug) console.log('selectSort: START for card/tile list',event);
event.stopPropagation();
Expand Down
42 changes: 35 additions & 7 deletions force-app/main/extensions/lwc/dsfrSearchCmp/dsfrSearchCmp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ export default class DsfrSearchCmp extends NavigationMixin(LightningElement) {
criteriaList; // additional criteria values
criteriaSelected; // list of selected additional criteria

openAccordion = null; // Track the currently open accordion

isReady = false;

//-----------------------------------------------------
Expand Down Expand Up @@ -259,23 +261,49 @@ export default class DsfrSearchCmp extends NavigationMixin(LightningElement) {
let currentStatus = event.target?.ariaExpanded;
if (this.isDebug) console.log('expandCollapse: current status fetched ', currentStatus);

let currentSection = this.template.querySelector("div.fr-collapse[data-name='" + currentTarget + "']");
if (this.isDebug) console.log('expandCollapse: current section fetched ', currentSection);

if (currentStatus == "true") {
if (this.isDebug) console.log('expandCollapse: collapsing section');
currentSection.classList?.remove("fr-collapse--expanded");
event.target.ariaExpanded = "false";
if (currentStatus == "true" && currentTarget) {
this.closeList(currentTarget);
}
else {
let currentSection = this.template.querySelector("div.fr-collapse[data-name='" + currentTarget + "']");
if (this.isDebug) console.log('expandCollapse: current section fetched ', currentSection);
if (this.isDebug) console.log('expandCollapse: expanding section');
currentSection.classList.add("fr-collapse--expanded");
event.target.ariaExpanded = "true";
this.openAccordion = currentTarget;

document.addEventListener('keydown',this.handleEscape, false);
}

if (this.isDebug) console.log('expandCollapse: END');
}

handleEscape = event => {
if (this.isDebug) console.log('handleEscape: START');
if (event?.key === 'Escape' && this.openAccordion) {
this.closeList(this.openAccordion);
}
else {
if (this.isDebug) console.log('handleEscape: END / ignoring key ',event.key);
}
}

closeList(currentTarget){
const currentSection = this.template.querySelector("div.fr-collapse[data-name='" + currentTarget + "']");
const buttonTarget = this.template.querySelector("button[value='" + currentTarget + "']");

if (this.isDebug) console.log('closeList: currentSection ',currentSection);
if (this.isDebug) console.log('closeList: currentTarget ',buttonTarget);

if (this.isDebug) console.log('closeList: collapsing section');
currentSection.classList?.remove("fr-collapse--expanded");
if (buttonTarget) {
buttonTarget.ariaExpanded = "false";
}
this.openAccordion = null;
document.removeEventListener('keydown',this.handleEscape);
}

// Search term input events
handleInputLeave(event){
if (this.isDebug) console.log('handleInputLeave: START for search with term ',this.searchTerm);
Expand Down