You've already forked AstralRinth
fix: intercom bubble positioning properly (#6111)
* feat: fix intercom properly * fix: positioning size + css transition * fix: lint * fix: ts * fix: nitpick
This commit is contained in:
@@ -4,6 +4,14 @@ import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||
import { useModalStack } from '../../composables/modal-stack'
|
||||
import { injectPageContext } from '../../providers'
|
||||
|
||||
const visibleFloatingActionBars = new Set<symbol>()
|
||||
|
||||
function updateFloatingActionBarBodyClass() {
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
document.body.classList.toggle('floating-action-bar-shown', visibleFloatingActionBars.size > 0)
|
||||
}
|
||||
|
||||
const props = defineProps<{
|
||||
shown: boolean
|
||||
ariaLabel?: string
|
||||
@@ -20,6 +28,7 @@ const compact = ref(false)
|
||||
const { stackCount } = useModalStack()
|
||||
const pageContext = injectPageContext(null)
|
||||
const shown = computed(() => props.shown && (!props.hideWhenModalOpen || stackCount.value === 0))
|
||||
const floatingActionBarId = Symbol('floating-action-bar')
|
||||
const intercomBubbleClearanceRequestId = Symbol('floating-action-bar')
|
||||
const zIndex = computed(() => 100 + stackCount.value * 10 + 8 + (!props.belowModal ? 1 : 0))
|
||||
const leftOffset = computed(
|
||||
@@ -60,7 +69,13 @@ function updateIntercomBubbleClearance() {
|
||||
const intercomBubble = pageContext?.intercomBubble
|
||||
if (!intercomBubble) return
|
||||
|
||||
if (typeof window === 'undefined' || !shown.value || !barEl.value || !toolbarEl.value) {
|
||||
if (
|
||||
typeof window === 'undefined' ||
|
||||
!shown.value ||
|
||||
stackCount.value > 0 ||
|
||||
!barEl.value ||
|
||||
!toolbarEl.value
|
||||
) {
|
||||
clearIntercomBubbleClearance()
|
||||
return
|
||||
}
|
||||
@@ -86,7 +101,13 @@ function updateIntercomBubbleClearance() {
|
||||
function updateBodyState(isShown = shown.value) {
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
document.body.classList.toggle('floating-action-bar-shown', isShown)
|
||||
if (isShown) {
|
||||
visibleFloatingActionBars.add(floatingActionBarId)
|
||||
} else {
|
||||
visibleFloatingActionBars.delete(floatingActionBarId)
|
||||
}
|
||||
|
||||
updateFloatingActionBarBodyClass()
|
||||
if (!isShown) {
|
||||
clearIntercomBubbleClearance()
|
||||
}
|
||||
@@ -138,6 +159,7 @@ watch(
|
||||
shown,
|
||||
leftOffset,
|
||||
rightOffset,
|
||||
stackCount,
|
||||
() => pageContext?.intercomBubble?.horizontalPadding.value,
|
||||
() => pageContext?.intercomBubble?.width.value,
|
||||
],
|
||||
@@ -157,8 +179,9 @@ onUnmounted(() => {
|
||||
window.cancelAnimationFrame(updateFrame)
|
||||
}
|
||||
clearIntercomBubbleClearance()
|
||||
visibleFloatingActionBars.delete(floatingActionBarId)
|
||||
if (typeof document === 'undefined') return
|
||||
document.body.classList.remove('floating-action-bar-shown')
|
||||
updateFloatingActionBarBodyClass()
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
@@ -0,0 +1,288 @@
|
||||
import {
|
||||
boot as bootIntercom,
|
||||
Intercom,
|
||||
shutdown as shutdownIntercom,
|
||||
update as updateIntercom,
|
||||
} from '@intercom/messenger-js-sdk'
|
||||
import {
|
||||
computed,
|
||||
type MaybeRefOrGetter,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
ref,
|
||||
toValue,
|
||||
watch,
|
||||
} from 'vue'
|
||||
|
||||
import { useModalStack } from './modal-stack'
|
||||
|
||||
type FetchIntercomToken = () => Promise<{ token: string }>
|
||||
|
||||
export interface HostingIntercomIdentityUser {
|
||||
id?: string | null
|
||||
}
|
||||
|
||||
export interface UseHostingIntercomOptions {
|
||||
enabled: MaybeRefOrGetter<boolean>
|
||||
appId: MaybeRefOrGetter<string | undefined>
|
||||
fetchToken: FetchIntercomToken
|
||||
identityKey: MaybeRefOrGetter<string | null | undefined>
|
||||
horizontalPadding?: MaybeRefOrGetter<number | undefined>
|
||||
}
|
||||
|
||||
export function createHostingIntercomIdentityKey(
|
||||
user: HostingIntercomIdentityUser | null | undefined,
|
||||
serverId: string | null | undefined,
|
||||
): string {
|
||||
return `${user?.id ?? 'anonymous'}:${serverId ?? 'hosting'}`
|
||||
}
|
||||
|
||||
const DEFAULT_PADDING = 20
|
||||
const DEFAULT_LAUNCHER_WIDTH = 48
|
||||
const INTERCOM_STYLE_ID = 'modrinth-hosting-intercom-style'
|
||||
const LAUNCHER_SELECTOR =
|
||||
".intercom-lightweight-app-launcher, .intercom-launcher-frame, iframe[name='intercom-launcher-frame']"
|
||||
const RIGHT_VAR = '--modrinth-hosting-intercom-right'
|
||||
const BOTTOM_VAR = '--modrinth-hosting-intercom-bottom'
|
||||
const POINTER_EVENTS_VAR = '--modrinth-hosting-intercom-pointer-events'
|
||||
|
||||
function sanitizePixels(value: number | undefined, fallback = DEFAULT_PADDING) {
|
||||
if (typeof value !== 'number' || !Number.isFinite(value)) return fallback
|
||||
return Math.max(0, Math.ceil(value))
|
||||
}
|
||||
|
||||
function ensureIntercomStyle() {
|
||||
if (typeof document === 'undefined' || document.getElementById(INTERCOM_STYLE_ID)) return
|
||||
|
||||
const style = document.createElement('style')
|
||||
style.id = INTERCOM_STYLE_ID
|
||||
style.textContent = `
|
||||
.intercom-lightweight-app,
|
||||
.intercom-lightweight-app-launcher,
|
||||
.intercom-lightweight-app-messenger,
|
||||
.intercom-launcher-frame,
|
||||
.intercom-messenger-frame,
|
||||
#intercom-container,
|
||||
#intercom-frame,
|
||||
iframe[name='intercom-launcher-frame'],
|
||||
iframe[name='intercom-messenger-frame'] {
|
||||
z-index: 98 !important;
|
||||
pointer-events: var(${POINTER_EVENTS_VAR}, auto) !important;
|
||||
}
|
||||
|
||||
.intercom-lightweight-app-launcher,
|
||||
.intercom-launcher-frame,
|
||||
iframe[name='intercom-launcher-frame'] {
|
||||
right: var(${RIGHT_VAR}, ${DEFAULT_PADDING}px) !important;
|
||||
bottom: var(${BOTTOM_VAR}, ${DEFAULT_PADDING}px) !important;
|
||||
transition:
|
||||
right 0.12s ease-out,
|
||||
bottom 0.12s ease-out !important;
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.intercom-lightweight-app-launcher,
|
||||
.intercom-launcher-frame,
|
||||
iframe[name='intercom-launcher-frame'] {
|
||||
transition: none !important;
|
||||
}
|
||||
}
|
||||
`
|
||||
document.head.appendChild(style)
|
||||
}
|
||||
|
||||
export function useHostingIntercom(options: UseHostingIntercomOptions) {
|
||||
const { stackCount } = useModalStack()
|
||||
const horizontalPaddingRequests = new Map<symbol, number>()
|
||||
const verticalClearanceRequests = new Map<symbol, number>()
|
||||
const requestedHorizontalPadding = ref<number | null>(null)
|
||||
const requestedVerticalClearance = ref<number | null>(null)
|
||||
const launcherWidth = ref(DEFAULT_LAUNCHER_WIDTH)
|
||||
let booted = false
|
||||
let booting = false
|
||||
let bootedIdentity: string | null = null
|
||||
let bootRun = 0
|
||||
let syncAfterBoot = false
|
||||
let stopSync: (() => void) | null = null
|
||||
let stopPositionSync: (() => void) | null = null
|
||||
let stopModalSync: (() => void) | null = null
|
||||
let launcherObserver: ResizeObserver | null = null
|
||||
let documentObserver: MutationObserver | null = null
|
||||
let observedLauncher: Element | null = null
|
||||
|
||||
const horizontalPadding = computed(
|
||||
() =>
|
||||
requestedHorizontalPadding.value ??
|
||||
sanitizePixels(toValue(options.horizontalPadding), DEFAULT_PADDING),
|
||||
)
|
||||
const verticalPadding = computed(() => requestedVerticalClearance.value ?? DEFAULT_PADDING)
|
||||
const enabled = computed(
|
||||
() => Boolean(toValue(options.enabled)) && Boolean(toValue(options.appId)),
|
||||
)
|
||||
const identity = computed(() => String(toValue(options.identityKey) ?? 'hosting'))
|
||||
|
||||
function requestFromMap(
|
||||
requests: Map<symbol, number>,
|
||||
target: typeof requestedHorizontalPadding,
|
||||
id: symbol,
|
||||
value: number | null,
|
||||
) {
|
||||
if (value === null || !Number.isFinite(value)) {
|
||||
requests.delete(id)
|
||||
} else {
|
||||
requests.set(id, sanitizePixels(value))
|
||||
}
|
||||
|
||||
target.value = requests.size > 0 ? Math.max(...requests.values()) : null
|
||||
}
|
||||
|
||||
function applyPosition(updateSdk = false) {
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
document.documentElement.style.setProperty(RIGHT_VAR, `${horizontalPadding.value}px`)
|
||||
document.documentElement.style.setProperty(BOTTOM_VAR, `${verticalPadding.value}px`)
|
||||
document.documentElement.style.setProperty(
|
||||
POINTER_EVENTS_VAR,
|
||||
stackCount.value > 0 ? 'none' : 'auto',
|
||||
)
|
||||
|
||||
if (updateSdk && booted) {
|
||||
updateIntercom({
|
||||
horizontal_padding: horizontalPadding.value,
|
||||
vertical_padding: verticalPadding.value,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function updateLauncherWidth() {
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
const launcher = document.querySelector(LAUNCHER_SELECTOR)
|
||||
if (launcher !== observedLauncher) {
|
||||
launcherObserver?.disconnect()
|
||||
observedLauncher = launcher
|
||||
if (launcher) {
|
||||
launcherObserver = new ResizeObserver(updateLauncherWidth)
|
||||
launcherObserver.observe(launcher)
|
||||
}
|
||||
}
|
||||
|
||||
const width = launcher?.getBoundingClientRect().width
|
||||
launcherWidth.value =
|
||||
typeof width === 'number' && width > 0
|
||||
? sanitizePixels(width, DEFAULT_LAUNCHER_WIDTH)
|
||||
: DEFAULT_LAUNCHER_WIDTH
|
||||
}
|
||||
|
||||
function clearPosition() {
|
||||
if (typeof document === 'undefined') return
|
||||
|
||||
document.documentElement.style.removeProperty(RIGHT_VAR)
|
||||
document.documentElement.style.removeProperty(BOTTOM_VAR)
|
||||
document.documentElement.style.removeProperty(POINTER_EVENTS_VAR)
|
||||
}
|
||||
|
||||
function stop() {
|
||||
bootRun++
|
||||
syncAfterBoot = false
|
||||
if (booted) shutdownIntercom()
|
||||
booting = false
|
||||
booted = false
|
||||
bootedIdentity = null
|
||||
}
|
||||
|
||||
async function start(currentIdentity: string) {
|
||||
const appId = toValue(options.appId)
|
||||
if (!appId) return
|
||||
|
||||
const run = ++bootRun
|
||||
booting = true
|
||||
|
||||
try {
|
||||
const { token } = await options.fetchToken()
|
||||
if (run !== bootRun || !enabled.value || identity.value !== currentIdentity) return
|
||||
|
||||
const settings = {
|
||||
app_id: appId,
|
||||
intercom_user_jwt: token,
|
||||
session_duration: 1000 * 60 * 60 * 24,
|
||||
alignment: 'right',
|
||||
horizontal_padding: horizontalPadding.value,
|
||||
vertical_padding: verticalPadding.value,
|
||||
}
|
||||
if (typeof window !== 'undefined' && window.Intercom) {
|
||||
bootIntercom(settings)
|
||||
} else {
|
||||
Intercom(settings)
|
||||
}
|
||||
booted = true
|
||||
bootedIdentity = currentIdentity
|
||||
applyPosition()
|
||||
} catch (error) {
|
||||
if (run === bootRun) {
|
||||
console.warn('[HOSTING][INTERCOM] failed to initialize secure support chat', error)
|
||||
}
|
||||
} finally {
|
||||
if (run === bootRun) {
|
||||
booting = false
|
||||
if (syncAfterBoot) {
|
||||
syncAfterBoot = false
|
||||
sync()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function sync() {
|
||||
if (!enabled.value) {
|
||||
if (booted || booting) stop()
|
||||
return
|
||||
}
|
||||
|
||||
if (booted && bootedIdentity === identity.value) {
|
||||
applyPosition(true)
|
||||
} else if (booting) {
|
||||
syncAfterBoot = true
|
||||
} else {
|
||||
if (booted) stop()
|
||||
void start(identity.value)
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
ensureIntercomStyle()
|
||||
updateLauncherWidth()
|
||||
documentObserver = new MutationObserver(updateLauncherWidth)
|
||||
documentObserver.observe(document.body, {
|
||||
childList: true,
|
||||
subtree: true,
|
||||
})
|
||||
applyPosition()
|
||||
stopSync = watch([enabled, identity], sync, {
|
||||
immediate: true,
|
||||
})
|
||||
stopPositionSync = watch([horizontalPadding, verticalPadding], () => applyPosition(true))
|
||||
stopModalSync = watch(stackCount, () => applyPosition())
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
stopSync?.()
|
||||
stopPositionSync?.()
|
||||
stopModalSync?.()
|
||||
launcherObserver?.disconnect()
|
||||
documentObserver?.disconnect()
|
||||
stop()
|
||||
clearPosition()
|
||||
})
|
||||
|
||||
return {
|
||||
intercomBubble: {
|
||||
width: launcherWidth,
|
||||
horizontalPadding,
|
||||
requestHorizontalPadding: (id: symbol, value: number | null) =>
|
||||
requestFromMap(horizontalPaddingRequests, requestedHorizontalPadding, id, value),
|
||||
requestVerticalClearance: (id: symbol, value: number | null) =>
|
||||
requestFromMap(verticalClearanceRequests, requestedVerticalClearance, id, value),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ export * from './format-bytes'
|
||||
export * from './format-date-time'
|
||||
export * from './format-money'
|
||||
export * from './format-number'
|
||||
export * from './hosting-intercom'
|
||||
export * from './how-ago'
|
||||
export * from './i18n'
|
||||
export * from './i18n-debug'
|
||||
|
||||
@@ -343,7 +343,6 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Intercom, shutdown } from '@intercom/messenger-js-sdk'
|
||||
import type { Archon, Labrinth } from '@modrinth/api-client'
|
||||
import { ModrinthApiError, NuxtModrinthClient } from '@modrinth/api-client'
|
||||
import {
|
||||
@@ -431,8 +430,6 @@ const props = withDefaults(
|
||||
siteUrl?: string
|
||||
products?: Labrinth.Billing.Internal.Product[]
|
||||
authUser?: { id: string; username: string; email: string; created: string }
|
||||
fetchIntercomToken?: () => Promise<{ token: string }>
|
||||
intercomAppId?: string
|
||||
navigateToBilling?: () => void
|
||||
navigateToServers?: () => void
|
||||
browseModpacks?: (args: {
|
||||
@@ -455,8 +452,6 @@ const props = withDefaults(
|
||||
siteUrl: undefined,
|
||||
products: () => [],
|
||||
authUser: undefined,
|
||||
fetchIntercomToken: undefined,
|
||||
intercomAppId: 'ykeritl9',
|
||||
navigateToBilling: undefined,
|
||||
navigateToServers: undefined,
|
||||
browseModpacks: undefined,
|
||||
@@ -1360,18 +1355,11 @@ function initializeServer() {
|
||||
}
|
||||
}
|
||||
|
||||
let intercomInitialized = false
|
||||
|
||||
const cleanup = () => {
|
||||
isMounted.value = false
|
||||
|
||||
saveWsStateToCache()
|
||||
|
||||
if (intercomInitialized) {
|
||||
shutdown()
|
||||
intercomInitialized = false
|
||||
}
|
||||
|
||||
cleanupCoreRuntime(props.serverId)
|
||||
|
||||
isReconnecting.value = false
|
||||
@@ -1399,53 +1387,6 @@ onMounted(() => {
|
||||
})
|
||||
}
|
||||
|
||||
const tryInitIntercom = () => {
|
||||
if (intercomInitialized) return
|
||||
if (!props.authUser || !props.fetchIntercomToken) {
|
||||
console.debug('[PYROSERVERS][INTERCOM] waiting for auth user and token fetcher', {
|
||||
hasAuthUser: !!props.authUser,
|
||||
hasFetchIntercomToken: !!props.fetchIntercomToken,
|
||||
})
|
||||
return
|
||||
}
|
||||
intercomInitialized = true
|
||||
console.debug('[PYROSERVERS][INTERCOM] initializing secure support chat')
|
||||
props
|
||||
.fetchIntercomToken()
|
||||
.then(({ token }) => {
|
||||
console.debug('[PYROSERVERS][INTERCOM] fetched messenger JWT, booting widget')
|
||||
Intercom({
|
||||
app_id: props.intercomAppId!,
|
||||
intercom_user_jwt: token,
|
||||
session_duration: 1000 * 60 * 60 * 24,
|
||||
})
|
||||
window.setTimeout(() => {
|
||||
const hasWidget = !!document.querySelector(
|
||||
'.intercom-lightweight-app, #intercom-container, #intercom-frame',
|
||||
)
|
||||
if (!hasWidget) {
|
||||
console.warn(
|
||||
'[PYROSERVERS][INTERCOM] boot completed but no Intercom widget was detected',
|
||||
)
|
||||
}
|
||||
}, 2500)
|
||||
})
|
||||
.catch((error) => {
|
||||
intercomInitialized = false
|
||||
console.warn('[PYROSERVERS][INTERCOM] failed to initialize secure support chat', error)
|
||||
})
|
||||
}
|
||||
tryInitIntercom()
|
||||
const stopIntercomWatch = watch(
|
||||
() => props.authUser,
|
||||
(user) => {
|
||||
if (user) {
|
||||
tryInitIntercom()
|
||||
stopIntercomWatch()
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
DOMPurify.addHook(
|
||||
'afterSanitizeAttributes',
|
||||
(node: {
|
||||
|
||||
Reference in New Issue
Block a user