Add PageEvent.next_event

demo/auth.py

@@ -89,7 +89,7 @@ def auth_login_content(kind: LoginKind) -> list[AnyComponent]:
                     )
                 ),
                 c.Paragraph(text='(Passwords are not saved and is email stored in the browser via a JWT only)'),
-                c.ModelForm(model=LoginForm, submit_url='/api/auth/login'),
+                c.ModelForm(model=LoginForm, submit_url='/api/auth/login', display_mode='page'),
             ]
         case 'github':
             return [

src/npm-fastui/src/events.ts

@@ -31,6 +31,9 @@ export function useFireEvent(): { fireEvent: (event?: AnyEvent) => void } {
         }
         const detail: PageEventDetail = { clear: event.clear || false, context: event.context }
         document.dispatchEvent(new CustomEvent(pageEventType(event), { detail }))
+        if (event.nextEvent) {
+          fireEventImpl(event.nextEvent)
+        }
         break
       }
       case 'go-to':
@@ -61,6 +64,8 @@ export function useFireEvent(): { fireEvent: (event?: AnyEvent) => void } {
     }
   }
 
+  // fireEventImpl is recursive, but it doens't make sense for fireEvent to have fireEventImpl as a dep
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   const fireEvent = useCallback(fireEventImpl, [location])
 
   return { fireEvent }
@@ -97,7 +102,6 @@ export function usePageEventListen(event?: PageEvent, initialContext: ContextTyp
     }
 
     const onEvent = (e: Event) => {
-      console.log('event:', e)
       const event = e as CustomEvent<PageEventDetail>
       const { context, clear } = event.detail
       if (clear) {

src/npm-fastui/src/models.d.ts

@@ -136,6 +136,7 @@ export interface PageEvent {
   pushPath?: string
   context?: ContextType
   clear?: boolean
+  nextEvent?: PageEvent | GoToEvent | BackEvent | AuthEvent
   type: 'page'
 }
 export interface ContextType {

src/python-fastui/fastui/events.py

@@ -11,6 +11,7 @@ class PageEvent(BaseModel):
     push_path: Union[str, None] = Field(default=None, serialization_alias='pushPath')
     context: Union[ContextType, None] = None
     clear: Union[bool, None] = None
+    next_event: 'Union[AnyEvent, None]' = Field(default=None, serialization_alias='nextEvent')
     type: Literal['page'] = 'page'