diff --git a/source/Tracker.ts b/source/Tracker.ts index 3e80fc4a7..ce3bde045 100644 --- a/source/Tracker.ts +++ b/source/Tracker.ts @@ -7,7 +7,9 @@ declare global { } } -type PushArgs = ['trackPageView'] | ['trackEvent', ...Array] +type TrackingAction = 'trackPageView' | 'trackEvent' | 'disableCookies' + +type PushArgs = [TrackingAction, ...Array] type PushType = (args: PushArgs) => void const ua = window.navigator.userAgent @@ -22,18 +24,15 @@ export default class Tracker { previousPath: string | undefined constructor( - pushFunction: PushType = args => { - // There is an issue with the way Safari handle cookies in iframe, cf. - // https://gist.github.com/iansltx/18caf551baaa60b79206. We could probably - // do better but for now we don't track action of iOs Safari user in - // iFrame -- to avoid errors in the number of visitors in our stats. - if (!(iOSSafari && inIframe)) { - window._paq.push(args) - } - } + pushFunction: PushType = args => (window?._paq ?? []).push(args) ) { - if (typeof window !== 'undefined') window._paq = window._paq || [] this.push = debounce(200, pushFunction) as PushType + // There is an issue with the way Safari handle cookies in iframe, cf. + // https://gist.github.com/iansltx/18caf551baaa60b79206. + // TODO : We don't need to disable cookies if a cookie is already set + if (iOSSafari && inIframe) { + pushFunction(['disableCookies']) + } } connectToHistory(history: History) {