Skip to content

POC: Focus trap in non-AMP #298

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

Draft
adekbadek wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −1
Draft

POC: Focus trap in non-AMP #298

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
2 changes: 1 addition & 1 deletion includes/class-newspack-popups-model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ function ( $evts ) use ( $popup, $body, $element_id ) {

ob_start();
?>
<amp-layout <?php echo self::get_access_attrs( $popup ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>" role="button" tabindex="0" id="<?php echo esc_attr( $element_id ); ?>">
<amp-layout data-amp-delay="<?php echo esc_html( self::get_delay( $popup ) ); ?>" <?php echo self::get_access_attrs( $popup ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> class="<?php echo esc_attr( implode( ' ', $classes ) ); ?>" role="button" tabindex="0" id="<?php echo esc_attr( $element_id ); ?>">
<div class="newspack-popup-wrapper" style="<?php echo esc_attr( self::container_style( $popup ) ); ?>">
<div class="newspack-popup">
<?php if ( ! empty( $popup['title'] ) && $display_title ) : ?>
Expand Down
13 changes: 13 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
"@wordpress/dom-ready": "^2.9.0",
"@wordpress/element": "^2.11.0",
"@wordpress/i18n": "^3.9.0",
"focus-trap": "^6.1.4",
"newspack-components": "^1.0.5",
"qs": "^6.9.1"
}
Expand Down
25 changes: 25 additions & 0 deletions src/view/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* External dependencies
*/
import { createFocusTrap } from 'focus-trap';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -89,6 +94,25 @@ const manageForms = container => {
} );
};

const manageOverlays = () => {
[ ...document.querySelectorAll( '.newspack-lightbox' ) ].forEach( element => {
const wrapper = element.querySelector( '.newspack-popup-wrapper' );
if ( wrapper ) {
const observer = new MutationObserver( mutationsList => {
[ ...mutationsList ].forEach( mutation => {
const isHidden = mutation.target.hasAttribute( 'amp-access-hide' );
const delayValue = mutation.target.getAttribute( 'data-amp-delay' );
if ( ! isHidden && delayValue ) {
// Timeout for the animation.
setTimeout( () => createFocusTrap( wrapper ).activate(), parseInt( delayValue ) + 500 );
}
} );
} );
observer.observe( element, { attributes: true, subtree: false } );
}
} );
};

if ( typeof window !== 'undefined' ) {
domReady( () => {
manageAnalytics();
Expand All @@ -99,5 +123,6 @@ if ( typeof window !== 'undefined' ) {
campaignArray.forEach( campaign => {
manageForms( campaign );
} );
manageOverlays();
} );
}