Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 22 additions & 10 deletions .dev/assets/shared/js/frontend/vendor/responsive-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,12 @@ import debounce from "../utility/debounce";
if ( open_item && open_item.classList ) {
open_item.classList.remove('submenu-is-open');
open_item.parentNode.classList.remove('child-has-focus');

// Set aria-expanded=false on the SVG element within this menu item
var svgElement = open_item.parentNode.querySelector( 'svg' );
if ( svgElement ) {
svgElement.setAttribute( 'aria-expanded', 'false' );
}
}

if ( open_item && open_item.parentNode && open_item.parentNode.querySelector( '.sub-menu' ) ) {
Expand All @@ -276,6 +282,12 @@ import debounce from "../utility/debounce";
closed_item.classList.add( 'submenu-is-open' );
closed_item.parentNode.classList.add( 'child-has-focus' );

// Set aria-expanded=true on the SVG element within this menu item
var svgElement = closed_item.parentNode.querySelector( 'svg' );
if ( svgElement ) {
svgElement.setAttribute( 'aria-expanded', 'true' );
}

if ( closed_item.parentNode.querySelector( '.sub-menu' ) ) {
closed_item.parentNode.querySelector( '.sub-menu' ).setAttribute( 'aria-hidden', 'false' );
}
Expand All @@ -296,9 +308,10 @@ import debounce from "../utility/debounce";

// Loop through all submenus and bind events when needed
for ( i = 0; i < menu_items_with_children_count; i++ ) {
var svgElements = menu_items_with_children[i].querySelectorAll( 'svg' );
for ( var q = 0; q < svgElements.length; q = q + 1 ) {
svgElements[q].addEventListener( 'click', listener_submenu_click );
var svgElement = menu_items_with_children[i].querySelector( 'svg' );
if ( svgElement ) {
svgElement.addEventListener( 'click', listener_submenu_click );
svgElement.setAttribute( 'aria-expanded', 'false' );
}
menu_items_with_children[i].removeEventListener( 'focusin', listener_submenu_focus );
} // for
Expand Down Expand Up @@ -403,14 +416,13 @@ import debounce from "../utility/debounce";
if ( get_screen_size( 'has-offscreen-nav' ) || sub_menu_acion === 'click' ) {
menu_items_with_children[i].addEventListener( 'click', listener_submenu_click );

var svgElements = menu_items_with_children[i].querySelectorAll( 'svg' );

for ( var z = 0; z < svgElements.length; z = z + 1 ) {

svgElements[z].addEventListener( 'click', listener_submenu_click );
svgElements[z].addEventListener( 'keypress', ( e ) => { ['Space', 'Enter'].includes( e.code ) && listener_submenu_click( e ) } );
svgElements[z].setAttribute( 'tabindex', '0' );
var svgElement = menu_items_with_children[i].querySelector( 'svg' );

if ( svgElement ) {
svgElement.addEventListener( 'click', listener_submenu_click );
svgElement.addEventListener( 'keypress', ( e ) => { ['Space', 'Enter'].includes( e.code ) && listener_submenu_click( e ) } );
svgElement.setAttribute( 'tabindex', '0' );
svgElement.setAttribute( 'aria-expanded', 'false' );
}

menu.classList.add( sub_menu_acion === 'click' ? 'uses-click' : 'uses-hover' );
Expand Down
2 changes: 1 addition & 1 deletion .dev/tests/php/test-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ function testAddDropdownIcons() {

$title = Go\Core\add_dropdown_icons( 'Title', $item, $args, 0 );

$this->assertEquals( 'Title<svg role="img" viewBox="0 0 10 6" xmlns="http://www.w3.org/2000/svg"><path d="M1 1l4 4 4-4" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="square" /></svg>', trim( $title ) );
$this->assertEquals( 'Title<svg aria-label="Title Menu" role="img" viewBox="0 0 10 6" xmlns="http://www.w3.org/2000/svg"><path d="M1 1l4 4 4-4" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd" stroke-linecap="square" /></svg>', trim( $title ) );

}

Expand Down
9 changes: 8 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@ module.exports = {
'react-dom': true,
},

parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
babelOptions: {
presets: [ '@babel/preset-env' ],
},
requireConfigFile: false,
},

rules: {
'@wordpress/no-global-active-element': 0, // because we are not using React, no need for this
'jsdoc/check-tag-names': [ 2, {
definedTags: [ 'jest-environment' ],
} ],
'jsdoc/newline-after-description': 'off', // Rule doesn't exist in current eslint-plugin-jsdoc version
},
};
2 changes: 1 addition & 1 deletion .github/workflows/bump-woo-template-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
git config --global user.email "plugins@godaddy.com"

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
ref: ${{ github.event.repository.default_branch }}

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand All @@ -80,7 +80,7 @@ jobs:
themes: '["."]'

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
themes: '["."]'

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
git config --global user.email "plugins@godaddy.com"

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand All @@ -46,7 +46,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
24
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"johnpbloch/wordpress-core": "^6.0.1",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"wp-coding-standards/wpcs": "^2.1",
"wp-coding-standards/wpcs": "^3.0",
"phpunit/phpunit": "^9.5.21",
"wp-phpunit/wp-phpunit": "^6.0.1",
"yoast/phpunit-polyfills": "^1.1.0"
},
"scripts": {
"lint": "@php ./vendor/bin/phpcs --standard=phpcs.xml --extensions=php --colors -s -p -v ./",
"lint": "@php ./vendor/bin/phpcs --standard=phpcs.xml --warning-severity=0 --extensions=php --colors -s -p -v ./",
"test": "@php ./vendor/bin/phpunit",
"install-phpunit": ".dev/deploy-scripts/local-install-wp-tests.sh wordpress_test root '' localhost latest"
}
Expand Down
Loading