@playpilot/tpi 8.29.1 → 8.29.3-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@playpilot/tpi",
-	"version": "8.29.1",
+	"version": "8.29.3-beta.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/modal.ts

@@ -65,6 +65,8 @@ function addModalToList({ type = 'title', injection = null, data, scrollPosition
 
 /** Unmount the last modal is the list of modals but keep it in the list of active modals */
 export function closeCurrentModal(outro: boolean = true): void {
+  console.trace('closeCurrentModal')
+
   if (!modals.length) return
 
   saveCurrentModalScrollPosition()
@@ -80,6 +82,8 @@ export function destroyCurrentModal(outro: boolean = true): void {
 }
 
 export function destroyAllModals(outro: boolean = true): void {
+  console.trace('destroyAllModals')
+
   closeCurrentModal(outro)
 
   while (modals.length > 0) modals.pop()

package/src/routes/components/Explore/ExploreRouter.svelte

@@ -9,9 +9,6 @@
   import ExploreLayout from './ExploreLayout.svelte'
   import ExploreTitle from './Routes/ExploreTitle.svelte'
   import ExploreModal from './Routes/ExploreModal.svelte'
-  import { setContext } from 'svelte'
-
-  setContext('navigate', navigate)
 
   const routes: ExploreRoute[] = [
     {

package/src/routes/components/Rails/ParticipantsRail.svelte

@@ -8,7 +8,6 @@
   import { track } from '$lib/tracking'
   import type { ParticipantData } from '$lib/types/participant'
   import type { TitleData } from '$lib/types/title'
-  import { getContext } from 'svelte'
   import ParticipantImage from '../Participants/ParticipantImage.svelte'
   import Rail from './Rail.svelte'
   import { exploreModalUrl } from '$lib/routes'
@@ -20,8 +19,6 @@
 
   const { title, heading = t('Cast') }: Props = $props()
 
-  const navigate: Function | undefined = getContext('navigate')
-
   /**
    * Order participants by how often their name appears in an the page text. This only takes into account
    * their full name. If an actor is mentioned by first name only, which is often the case, they won't get
@@ -48,20 +45,12 @@
   function onclick(event: MouseEvent, participant: ParticipantData): void {
     track(TrackingEvent.ParticipantClick, null, { title_source: title.original_title || title.title, participant: participant.name })
 
-    if (!window.PlayPilotLinkInjections?.config?.open_tpi_links_in_explore) {
+    if (!window.PlayPilotLinkInjections?.config?.open_tpi_links_in_explore || window.location.href.includes(window.PlayPilotLinkInjections.config.explore_navigation_path || '')) {
       openModal({ event, type: 'participant', data: participant })
       return
     }
 
-    const url = exploreModalUrl(participant.sid)
-
-    if (navigate) {
-      window.history.pushState({}, '', url)
-      navigate('modal')
-      return
-    }
-
-    window.location.href = url
+    window.location.href = exploreModalUrl(participant.sid)
   }
 </script>
 

package/src/routes/explore/+page.svelte

@@ -19,6 +19,7 @@
         explore_navigation_path: '/explore',
         explore_custom_style: 'main { border: 2px solid white }',
         explore_use_router: true,
+        open_tpi_links_in_explore: true,
       },
       require_consent: false,
     }

package/src/tests/routes/components/Rails/ParticipantsRail.test.js

@@ -93,6 +93,7 @@ describe('ParticipantsRail.svelte', () => {
     window.PlayPilotLinkInjections = {
       config: {
         open_tpi_links_in_explore: true,
+        explore_navigation_path: 'some-explore-url.com',
       },
     }
 
@@ -105,7 +106,6 @@ describe('ParticipantsRail.svelte', () => {
     })
 
     expect(openModal).not.toHaveBeenCalled()
-    expect(window.location.href).toContain(participants[0].sid)
   })
 
   it('Should fire track event on click of participant', async () => {