From 9383ee32e3776b8b365eb087fbd5b0d9b904df3e Mon Sep 17 00:00:00 2001 From: Ryan Gossiaux Date: Sat, 10 Jun 2023 19:05:10 -0700 Subject: [PATCH] Rename the Transition events to match the Svelte names See #57 --- .../transitions/TransitionChild.svelte | 26 +++++++++---------- .../transitions/TransitionChildWrapper.svelte | 24 ++++++++--------- .../transitions/TransitionRoot.svelte | 16 ++++++------ src/routes/dialog/index.svelte | 2 +- src/routes/docs/latest/transition.svx | 10 ++++--- .../component-examples/modal.svelte | 8 +++--- 6 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/lib/components/transitions/TransitionChild.svelte b/src/lib/components/transitions/TransitionChild.svelte index cacd15f..1d5e7c5 100644 --- a/src/lib/components/transitions/TransitionChild.svelte +++ b/src/lib/components/transitions/TransitionChild.svelte @@ -76,17 +76,17 @@ /***** Events *****/ const dispatch = createEventDispatcher<{ - afterEnter: null; - afterLeave: null; - beforeEnter: null; - beforeLeave: null; + introstart: null; + introend: null; + outrostart: null; + outroend: null; }>(); const forwardEvents = forwardEventsBuilder(get_current_component(), [ - "beforeEnter", - "beforeLeave", - "afterEnter", - "afterLeave", + "introstart", + "introend", + "outrostart", + "outroend", ]); /***** Component *****/ @@ -112,7 +112,7 @@ if (!isTransitioning) { state = TreeStates.Hidden; $nestingContext.unregister(id); - dispatch("afterLeave"); + dispatch("outroend"); } }) ); @@ -167,8 +167,8 @@ isTransitioning = true; - if (show) dispatch("beforeEnter"); - if (!show) dispatch("beforeLeave"); + if (show) dispatch("introstart"); + if (!show) dispatch("outrostart"); return show ? transition( @@ -179,7 +179,7 @@ enteredClasses, (reason) => { isTransitioning = false; - if (reason === Reason.Finished) dispatch("afterEnter"); + if (reason === Reason.Finished) dispatch("introend"); } ) : transition( @@ -198,7 +198,7 @@ if (!hasChildren($nesting)) { state = TreeStates.Hidden; $nestingContext.unregister(id); - dispatch("afterLeave"); + dispatch("outroend"); } } ); diff --git a/src/lib/components/transitions/TransitionChildWrapper.svelte b/src/lib/components/transitions/TransitionChildWrapper.svelte index 3509d14..6e593c1 100644 --- a/src/lib/components/transitions/TransitionChildWrapper.svelte +++ b/src/lib/components/transitions/TransitionChildWrapper.svelte @@ -10,10 +10,10 @@ import type { HTMLActionArray } from "$lib/hooks/use-actions"; import { hasTransitionContext } from "./common.svelte"; const forwardEvents = forwardEventsBuilder(get_current_component(), [ - "beforeEnter", - "beforeLeave", - "afterEnter", - "afterLeave", + "introstart", + "introend", + "outrostart", + "outroend", ]); /***** Props *****/ @@ -35,10 +35,10 @@ {...$$props} {as} use={[...use, forwardEvents]} - on:afterEnter - on:afterLeave - on:beforeEnter - on:beforeLeave + on:introstart + on:introend + on:outrostart + on:outroend > @@ -47,10 +47,10 @@ {...$$props} {as} use={[...use, forwardEvents]} - on:afterEnter - on:afterLeave - on:beforeEnter - on:beforeLeave + on:introstart + on:introend + on:outrostart + on:outroend > diff --git a/src/lib/components/transitions/TransitionRoot.svelte b/src/lib/components/transitions/TransitionRoot.svelte index 4130d9b..b072e48 100644 --- a/src/lib/components/transitions/TransitionRoot.svelte +++ b/src/lib/components/transitions/TransitionRoot.svelte @@ -33,10 +33,10 @@ } from "./common.svelte"; import type { TRestProps } from "$lib/types"; const forwardEvents = forwardEventsBuilder(get_current_component(), [ - "beforeEnter", - "beforeLeave", - "afterEnter", - "afterLeave", + "introstart", + "introend", + "outrostart", + "outroend", ]); /***** Props *****/ @@ -121,10 +121,10 @@ {...$$restProps} {as} use={[...use, forwardEvents]} - on:afterEnter - on:afterLeave - on:beforeEnter - on:beforeLeave + on:introstart + on:introend + on:outrostart + on:outroend > diff --git a/src/routes/dialog/index.svelte b/src/routes/dialog/index.svelte index ee94182..1f33f0d 100644 --- a/src/routes/dialog/index.svelte +++ b/src/routes/dialog/index.svelte @@ -55,7 +55,7 @@ {#if nested} (nested = false)} /> {/if} - console.log("done")}> + console.log("done")}> (isOpen = false)}>
{ + on:introstart={() => { addEvent("Before enter"); }} - on:afterEnter={() => { + on:introend={() => { inputRef?.focus(); addEvent("After enter"); }} - on:beforeLeave={() => { + on:outrostart={() => { addEvent("Before leave (before confirm)"); window.confirm("Are you sure?"); addEvent("Before leave (after confirm)"); }} - on:afterLeave={(event) => { + on:outroend={(event) => { addEvent(`After leave (before alert)`); window.alert("Consider it done!"); addEvent(`After leave (after alert)`);