Skip to content

Optional padding on modalOverlayOpening #383

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

Merged
chuckcarpenter merged 2 commits into from
May 30, 2019
Merged

Optional padding on modalOverlayOpening #383

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
4ca77ba
Add padding parameter to positionModalOpening
skmbr May 30, 2019
2491158
Add padding option when calling positionModalOpening
skmbr May 30, 2019
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
5 changes: 3 additions & 2 deletions src/js/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,13 @@ export class Modal {
_styleForStep(step) {
const modalOverlayOpening = this._modalOverlayOpening;
const targetElement = getElementForStep(step);
const modalOverlayOpeningPadding = step.options.modalOverlayOpeningPadding || 0;

if (targetElement) {
positionModalOpening(targetElement, modalOverlayOpening);
positionModalOpening(targetElement, modalOverlayOpening, modalOverlayOpeningPadding);

this._onScreenChange = debounce(
positionModalOpening.bind(this, targetElement, modalOverlayOpening),
positionModalOpening.bind(this, targetElement, modalOverlayOpening, modalOverlayOpeningPadding),
0
);

Expand Down
9 changes: 7 additions & 2 deletions src/js/utils/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,17 @@ function createModalOverlay() {
* @param {HTMLElement} targetElement The element the opening will expose
* @param {SVGElement} openingElement The svg mask for the opening
*/
function positionModalOpening(targetElement, openingElement) {
function positionModalOpening(targetElement, openingElement, modalOverlayOpeningPadding) {
if (targetElement.getBoundingClientRect && openingElement instanceof SVGElement) {
const { x, y, width, height, left, top } = targetElement.getBoundingClientRect();

// getBoundingClientRect is not consistent. Some browsers use x and y, while others use left and top
_setAttributes(openingElement, { x: x || left, y: y || top, width, height });
_setAttributes(openingElement, {
x: (x || left) - modalOverlayOpeningPadding,
y: (y || top) - modalOverlayOpeningPadding,
width: (width + (modalOverlayOpeningPadding * 2)),
height: (height + (modalOverlayOpeningPadding * 2))
});
}
}

Expand Down