Skip to content

feat(lib): flashPrevention: add scroll prevention #632

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
jorgeucano merged 1 commit into from
Jun 16, 2020
Merged

feat(lib): flashPrevention: add scroll prevention #632

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
21 changes: 18 additions & 3 deletions libs/plugins/scully-plugin-flash-prevention/src/lib/flash-prevention.plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const AppRootAttrsBlacklist = ['_nghost', 'ng-version'];
const MockRootAttrsBlacklist = [];

registerPlugin('render', FlashPrevention, flashPreventionPlugin);
registerPlugin('router', FlashPrevention, async (ur) => [{ route: ur }]);
registerPlugin('router', FlashPrevention, async ur => [{ route: ur }]);

interface FlashPreventionPluginOptions {
appRootSelector?: string;
Expand All @@ -25,7 +25,7 @@ export function getFlashPreventionPlugin({
appLoadedClass,
appRootAttributesBlacklist,
mockAttributesBlacklist,
displayType,
displayType
}: FlashPreventionPluginOptions = {}) {
if (appRootSelector) {
AppRootSelector = appRootSelector;
Expand Down Expand Up @@ -83,8 +83,23 @@ async function createSecondAppRoot(html) {
async function addBitsToHead(html) {
const contentScript = `
<script type="text/javascript" id="scully-plugin-discount-flash-prevention">
const capt = (ev) => {
if (document.documentElement.scrollTop === 0){
document.documentElement.scrollTop = window['ScullyIO-scrollPosition'];
}
window['ScullyIO-scrollPosition'] = document.documentElement.scrollTop;
const detach = () => {
window.removeEventListener('scroll', capt);
document.removeEventListener("AngularReady", detach);
};
document.addEventListener("AngularReady", detach);
};

window.addEventListener('scroll', capt);

window.addEventListener('AngularReady', scullyDiscountFlashPreventionContentScript);
function scullyDiscountFlashPreventionContentScript(){
document.documentElement.scrollTop = window['ScullyIO-scrollPosition'];
document.body.classList.add('${LoadedClass}');
const tempAppRoot = document.querySelector('${AppRootSelector}-scully');
tempAppRoot.parentNode.removeChild(tempAppRoot);
Expand All @@ -111,7 +126,7 @@ function pushItemsToArray(src, dest) {
if (src.length && !Array.isArray(src)) {
src = [src];
}
src.forEach((item) => dest.push(item));
src.forEach(item => dest.push(item));
}
}

Expand Down