Skip to content

Commit

Permalink
Use hyphenated names
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewp committed Aug 22, 2023
1 parent 1fab2a1 commit 51861ef
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions packages/astro/components/ViewTransitions.astro
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const { fallback = 'animate' } = Astro.props as Props;
index: number;
scrollY: number;
};
type Events = 'astro:pageload' | 'astro:afterswap';
type Events = 'astro:page-load' | 'astro:after-swap';

const persistState = (state: State) => history.replaceState(state, '');

Expand All @@ -33,7 +33,7 @@ const { fallback = 'animate' } = Astro.props as Props;
const transitionEnabledOnThisPage = () =>
!!document.querySelector('[name="astro-view-transitions-enabled"]');
const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
const onPageLoad = () => triggerEvent('astro:pageload');
const onPageLoad = () => triggerEvent('astro:page-load');
const PERSIST_ATTR = 'data-astro-transition-persist';

const throttle = (cb: (...args: any[]) => any, delay: number) => {
Expand Down Expand Up @@ -175,7 +175,7 @@ const { fallback = 'animate' } = Astro.props as Props;
persistState(state);
}

triggerEvent('astro:afterswap');
triggerEvent('astro:after-swap');
};

// Wait on links to finish, to prevent FOUC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

toggle();
document.addEventListener('astro:afterswap', () => {
document.addEventListener('astro:after-swap', () => {
toggle();
})
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Layout from '../components/Layout.astro';
<article id="twoarticle"></article>
</Layout>
<script>
document.addEventListener('astro:load', () => {
document.addEventListener('astro:page-load', () => {
document.getElementById('twoarticle')!.textContent = 'works';
}, { once: true });
</script>
6 changes: 3 additions & 3 deletions packages/astro/e2e/view-transitions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ test.describe('View Transitions', () => {
await expect(p, 'imported CSS updated').toHaveCSS('font-size', '24px');
});

test('astro:load event fires when navigating to new page', async ({ page, astro }) => {
test('astro:page-load event fires when navigating to new page', async ({ page, astro }) => {
// Go to page 1
await page.goto(astro.resolveUrl('/one'));
const p = page.locator('#one');
Expand All @@ -159,14 +159,14 @@ test.describe('View Transitions', () => {
await expect(article, 'should have script content').toHaveText('works');
});

test('astro:load event fires when navigating directly to a page', async ({ page, astro }) => {
test('astro:page-load event fires when navigating directly to a page', async ({ page, astro }) => {
// Go to page 2
await page.goto(astro.resolveUrl('/two'));
const article = page.locator('#twoarticle');
await expect(article, 'should have script content').toHaveText('works');
});

test('astro:afterswap event fires right after the swap', async ({ page, astro }) => {
test('astro:after-swap event fires right after the swap', async ({ page, astro }) => {
// Go to page 1
await page.goto(astro.resolveUrl('/one'));
let p = page.locator('#one');
Expand Down

0 comments on commit 51861ef

Please sign in to comment.