@@ -389,25 +389,27 @@ try {
389
389
// No Storybook
390
390
}
391
391
392
- const onDestroyCallbacks = new Set < ( ) => void > ( ) ;
393
- const beforeNavigateCallbacks = new Set < ( nav : BeforeNavigate ) => Promise < void > > ( ) ;
394
- let lifeCycleHandlersInited = false ;
392
+ const lifeCycleCallbacks = {
393
+ onDestroy : new Set < ( ) => void > ( ) ,
394
+ beforeNavigate : new Set < ( nav : BeforeNavigate ) => Promise < void > > ( )
395
+ }
396
+ let componentInitialized = false ;
395
397
function initLifeCycleCallbacks ( ) {
396
- if ( lifeCycleHandlersInited ) return ;
397
- lifeCycleHandlersInited = true ;
398
+ if ( componentInitialized ) return ;
399
+ componentInitialized = true ;
398
400
399
401
onDestroy ( ( ) => {
400
- for ( const callback of onDestroyCallbacks ) {
402
+ for ( const callback of lifeCycleCallbacks . onDestroy ) {
401
403
callback ( ) ;
402
404
}
403
- onDestroyCallbacks . clear ( ) ;
405
+ lifeCycleCallbacks . onDestroy . clear ( ) ;
404
406
} ) ;
405
407
406
408
beforeNavigate ( ( nav : BeforeNavigate ) => {
407
- for ( const callback of beforeNavigateCallbacks ) {
409
+ for ( const callback of lifeCycleCallbacks . beforeNavigate ) {
408
410
callback ( nav ) ;
409
411
}
410
- beforeNavigateCallbacks . clear ( ) ;
412
+ lifeCycleCallbacks . beforeNavigate . clear ( ) ;
411
413
} ) ;
412
414
}
413
415
@@ -548,7 +550,7 @@ export function superForm<
548
550
549
551
///// From here, form is properly initialized /////
550
552
551
- onDestroyCallbacks . add ( ( ) => {
553
+ lifeCycleCallbacks . onDestroy . add ( ( ) => {
552
554
Unsubscriptions_unsubscribe ( ) ;
553
555
NextChange_clear ( ) ;
554
556
EnhancedForm_destroy ( ) ;
@@ -1380,7 +1382,7 @@ export function superForm<
1380
1382
// Tainted check
1381
1383
const defaultMessage = 'Leave page? Changes that you made may not be saved.' ;
1382
1384
let forceRedirection = false ;
1383
- beforeNavigateCallbacks . add ( async ( nav : BeforeNavigate ) => {
1385
+ lifeCycleCallbacks . beforeNavigate . add ( async ( nav : BeforeNavigate ) => {
1384
1386
if ( options . taintedMessage && ! Data . submitting && ! forceRedirection ) {
1385
1387
if ( Tainted_isTainted ( ) ) {
1386
1388
const { taintedMessage } = options ;
0 commit comments