fcb924d3a5
* refactor WIP * Button design changes * FE2 FormButton Updates * ts composition api * CommonTextLink Changes * CommonTextLink prop updates * Add disabled styles * WIP * Design system updates * Colour Updates * New Text Styles. Initial FE2 changes * More fe2 styling classes * Minor update * Minor update * Fix build * More updates for discussion * More styling updates * Minor updates to inputs * Revert change to size options * More text updates * More font class swapping * Revert dui3 changes * Confirmed Lineheights * Add story files for new text styles * Minor copy changes * Minor typo * Revert variant>color * New Colours WIP * andrew/web-1371-misalignment-in-account-dropdown * andrew/web-1374-settings-text-styles-are-not-right * andrew/web-1375-nav-texts-should-be-14px * andrew/web-1376-decrease-size-of-versions-header * andrew/web-1377-version-card-title * Updates * semibold>medium * Colour updates * Sizing updates * Colour updates * Colour updates * Measure mode * Updates * Fix build * Fix build * WIP Updates * Changes from PR * Updated login, registration and reset password styling * Make share dropdown bg white * Updated viewer titles * Fix: Resize panel highlight color in the viewer should be blue * Fix: Blue + Add link in Models. And other blue links in Viewer * Add labelPosition Prop. Fix Button stories * Updated CommonLink to remove default underline * Add Highlight Color * Card updates from Michal * Updated discussion icon on version card * Small tweaks to version card * Small tweaks to version card * Fix: Ghost button doesn't have padding * Fix: Write Delete... * Fix: Version hover border color * Updates to Project Card. Updates to PageTabs * Fix: Adjust title in announcement modal * Updates from Comments * Select Background Colour * Fix: Select dropdown color * Improve list view. Improve discussions * Fix: Minor tweaks to onboarding checklist * Fix: Clean up nav * Hide third item when not >md * Change project heading size * Add border to version card * Adjust spacing in dropdowns * Slight change * Update button style in Version card * Tweaked nav menu * Tweaked nav menu * Various styling tweaks * Fix settings modal subheader * Various styling tweaks and fixes * Tweak settings dialog styling * Tweak simple scrollbar * Minor tweaks to model page * Minor tweaks to model page * Minor tweak to login * Tweak discussion card * Tweak settings page * Tweak vertical tabs * Tweak Dialog alignment * Fix some paddings * Change IconVersions to ClockIcon * Tweak spacing between icons * Updates to Card Icons * Bold "connectors" in empty project message * Remove padding in Profile field * Update inline model create * Remove icons from share menu * Updated Delete dialog * Wrong text positioning in alert * Updated copy in dropdown * Change bg to bg-foundation in select dropdown component * Fix merge conflicy * Selection Info title colour * Wrong text class * Update card colours based on call * Update card colours * Update empty state * Input label font weight * Updates to Embed * Various styling fixes * Fix; Viewer panel header styling * Fix; Adjust BG in dev mode list items * Fix; Fix button placement in video modal * Fix: Share menu is not using LayoutMenu * Fix: Buttons clash under filters * Fix: Adjust spacing in selection info * Fix: Adjust gray BG behind model preview images * Fix: No hover cursor on model card * Fix: Align text styling in dev mode and selection info panel * Fix for menu width * Fix mobile problems * Fix Add spacing on new login screens * Revert prose change. Add prose-sm * Text - Use contain for bg image * Fix onboarding screens * Responsive fixes * Fix hydration errors * Added padding to Add Model Dialog * Fix versions buttons * Fix build problem * Changes PRE PR * Final Pre PR Changes * Remove DUI3 change * Fix small issue with dialog after merge conflict * Remove label classes from Visibility Select * Revert changes made in Controls.vue * Remove old-webhooks * Add highlight colours to Storybook * Add v-keyboard-clickable --------- Co-authored-by: Mike Tasset <mike.tasset@gmail.com>
283 lines
8.6 KiB
Vue
283 lines
8.6 KiB
Vue
<template>
|
|
<div
|
|
ref="parentEl"
|
|
class="absolute w-full h-full pointer-events-none overflow-hidden"
|
|
>
|
|
<!-- Add new thread bubble -->
|
|
<ViewerAnchoredPointNewThread
|
|
v-if="shouldShowNewThread"
|
|
v-model="buttonState"
|
|
:can-post-comment="canPostComment"
|
|
class="z-[13]"
|
|
@close="closeNewThread"
|
|
@login="showLoginDialog = true"
|
|
/>
|
|
|
|
<!-- Comment bubbles -->
|
|
<ViewerAnchoredPointThread
|
|
v-for="thread in Object.values(commentThreads)"
|
|
v-show="!hideBubbles || isOpenThread(thread.id)"
|
|
:key="thread.id"
|
|
:model-value="thread"
|
|
:class="openThread?.id === thread.id ? 'z-[12]' : 'z-[11]'"
|
|
@update:model-value="onThreadUpdate"
|
|
@update:expanded="onThreadExpandedChange"
|
|
@next="(model) => openNextThread(model)"
|
|
@prev="(model) => openPrevThread(model)"
|
|
@login="showLoginDialog = true"
|
|
/>
|
|
|
|
<div v-if="!isEmbedEnabled">
|
|
<!-- Active users -->
|
|
<ViewerAnchoredPointUser
|
|
v-for="user in Object.values(users)"
|
|
:key="user.state.sessionId"
|
|
:user="user"
|
|
class="z-[10]"
|
|
/>
|
|
</div>
|
|
|
|
<AuthLoginPanel
|
|
v-model:open="showLoginDialog"
|
|
dialog-mode
|
|
max-width="sm"
|
|
subtitle="Join the conversation"
|
|
/>
|
|
|
|
<!-- Active user avatars in navbar -->
|
|
<Portal to="secondary-actions">
|
|
<ViewerScope :state="state">
|
|
<div
|
|
v-if="usersWithAvatars.length > 0"
|
|
class="scale-90 flex space-x-1 items-center"
|
|
>
|
|
<!-- <UserAvatarGroup :users="activeUserAvatars" :overlap="false" hover-effect /> -->
|
|
<template v-for="user in usersWithAvatars" :key="user.id">
|
|
<button @click="setUserSpotlight(user.sessionId)">
|
|
<UserAvatar
|
|
v-tippy="
|
|
`${
|
|
user.sessionId === spotlightUserSessionId
|
|
? 'Stop following'
|
|
: 'Follow'
|
|
} ${user.user.name}`
|
|
"
|
|
:user="user.user"
|
|
hover-effect
|
|
:active="user.sessionId === spotlightUserSessionId"
|
|
/>
|
|
</button>
|
|
</template>
|
|
</div>
|
|
</ViewerScope>
|
|
</Portal>
|
|
|
|
<!-- Active user tracking cancel & Follower count display -->
|
|
<div
|
|
v-if="
|
|
(!isEmbedEnabled && spotlightUserSessionId && spotlightUser) ||
|
|
followers.length !== 0
|
|
"
|
|
class="absolute w-screen z-10 p-1"
|
|
:class="
|
|
isEmbedEnabled
|
|
? 'h-[calc(100dvh-3.5rem)]'
|
|
: 'h-[calc(100dvh-3.5rem)] mt-[3.5rem]'
|
|
"
|
|
>
|
|
<div
|
|
class="w-full h-full outline -outline-offset-0 outline-8 rounded-md outline-blue-500"
|
|
>
|
|
<div class="absolute top-0 left-0 w-full justify-center flex">
|
|
<svg
|
|
class="mt-1"
|
|
width="8"
|
|
height="8"
|
|
viewBox="0 0 8 8"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
>
|
|
<path d="M0 0C4.5 0 8 3.5 8 8V0H0Z" class="fill-blue-500" />
|
|
</svg>
|
|
<div
|
|
class="pointer-events-auto bg-primary text-white text-xs px-3 h-8 flex items-center rounded-b-md cursor-default"
|
|
>
|
|
<div v-if="spotlightUserSessionId && spotlightUser">
|
|
Following {{ spotlightUser?.userName.split(' ')[0] }}
|
|
<FormButton
|
|
color="outline"
|
|
size="sm"
|
|
class="ml-1 -mr-1.5"
|
|
@click="() => (spotlightUserSessionId = null)"
|
|
>
|
|
<span>Stop</span>
|
|
</FormButton>
|
|
</div>
|
|
<div
|
|
v-else
|
|
v-tippy="{ placement: 'bottom' }"
|
|
:content="followers.map((u) => u.name).join(', ')"
|
|
>
|
|
Followed by {{ followers[0].name.split(' ')[0] }}
|
|
<span v-if="followers.length > 1">
|
|
& {{ followers.length - 1 }}
|
|
{{ followers.length - 1 === 1 ? 'other' : 'others' }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<svg
|
|
class="mt-1"
|
|
width="8"
|
|
height="8"
|
|
viewBox="0 0 8 8"
|
|
xmlns="http://www.w3.org/2000/svg"
|
|
>
|
|
<path d="M0 0H8C3.5 0 0 3.5 0 8V0Z" class="fill-blue-500" />
|
|
</svg>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
<script setup lang="ts">
|
|
import type { Nullable } from '@speckle/shared'
|
|
import { useEmbed } from '~/lib/viewer/composables/setup/embed'
|
|
import { useActiveUser } from '~~/lib/auth/composables/activeUser'
|
|
import type { LimitedUser } from '~~/lib/common/generated/gql/graphql'
|
|
import type { SetFullyRequired } from '~~/lib/common/helpers/type'
|
|
import { useMixpanel } from '~~/lib/core/composables/mp'
|
|
import { useViewerUserActivityTracking } from '~~/lib/viewer/composables/activity'
|
|
import {
|
|
useViewerCommentBubblesProjection,
|
|
useViewerNewThreadBubble
|
|
} from '~~/lib/viewer/composables/commentBubbles'
|
|
import type { CommentBubbleModel } from '~~/lib/viewer/composables/commentBubbles'
|
|
import { useCheckViewerCommentingAccess } from '~~/lib/viewer/composables/commentManagement'
|
|
import {
|
|
useInjectedViewerInterfaceState,
|
|
useInjectedViewerState
|
|
} from '~~/lib/viewer/composables/setup'
|
|
import { useThreadUtilities } from '~~/lib/viewer/composables/ui'
|
|
|
|
const parentEl = ref(null as Nullable<HTMLElement>)
|
|
const { isLoggedIn } = useActiveUser()
|
|
const { sessionId } = useInjectedViewerState()
|
|
const { users } = useViewerUserActivityTracking({ parentEl })
|
|
const { isOpenThread, open } = useThreadUtilities()
|
|
|
|
const canPostComment = useCheckViewerCommentingAccess()
|
|
|
|
const { isEnabled: isEmbedEnabled } = useEmbed()
|
|
|
|
const followers = computed(() => {
|
|
if (!isLoggedIn.value) return []
|
|
const res = [] as LimitedUser[]
|
|
Object.values(users.value).forEach((model) => {
|
|
if (model.state.ui.spotlightUserSessionId === sessionId.value)
|
|
res.push(model.user as LimitedUser)
|
|
})
|
|
return res
|
|
})
|
|
|
|
const {
|
|
spotlightUserSessionId,
|
|
threads: {
|
|
openThread: { thread: openThread },
|
|
items: commentThreads,
|
|
hideBubbles
|
|
}
|
|
} = useInjectedViewerInterfaceState()
|
|
|
|
const showLoginDialog = ref(false)
|
|
|
|
useViewerCommentBubblesProjection({ parentEl })
|
|
|
|
const { buttonState, closeNewThread } = useViewerNewThreadBubble({
|
|
parentEl
|
|
})
|
|
|
|
const state = useInjectedViewerState()
|
|
|
|
const onThreadUpdate = (thread: CommentBubbleModel) => {
|
|
// Being careful not to mutate old value directly to ensure watchers work properly
|
|
commentThreads.value = {
|
|
...commentThreads.value,
|
|
[thread.id]: thread
|
|
}
|
|
}
|
|
|
|
const onThreadExpandedChange = (isExpanded: boolean) => {
|
|
if (isExpanded) {
|
|
closeNewThread()
|
|
}
|
|
}
|
|
|
|
const shouldShowNewThread = computed(
|
|
() =>
|
|
!isEmbedEnabled.value && !state.ui.measurement.enabled.value && canPostComment.value
|
|
)
|
|
|
|
const allThreadsChronologicalOrder = computed(() => {
|
|
const vals = Object.values(commentThreads.value)
|
|
return vals.sort(
|
|
(a, b) => new Date(b.createdAt).getUTCDate() - new Date(a.createdAt).getUTCDate()
|
|
)
|
|
})
|
|
|
|
const openNextThread = (currentThread: CommentBubbleModel) => {
|
|
const threadCount = allThreadsChronologicalOrder.value.length
|
|
let currentThreadIndex = allThreadsChronologicalOrder.value.findIndex(
|
|
(t) => currentThread.id === t.id
|
|
)
|
|
if (++currentThreadIndex > threadCount - 1) currentThreadIndex = 0
|
|
const nextThread = allThreadsChronologicalOrder.value[currentThreadIndex]
|
|
if (!nextThread) return
|
|
|
|
open(nextThread.id)
|
|
}
|
|
|
|
const openPrevThread = (currentThread: CommentBubbleModel) => {
|
|
const threadCount = allThreadsChronologicalOrder.value.length
|
|
let currentThreadIndex = allThreadsChronologicalOrder.value.findIndex(
|
|
(t) => currentThread.id === t.id
|
|
)
|
|
if (--currentThreadIndex < 0) currentThreadIndex = threadCount - 1
|
|
const nextThread = allThreadsChronologicalOrder.value[currentThreadIndex]
|
|
if (!nextThread) return
|
|
|
|
open(nextThread.id)
|
|
}
|
|
|
|
const usersWithAvatars = computed(() =>
|
|
Object.values(users.value).filter(
|
|
(u): u is SetFullyRequired<typeof u, 'user'> => !!u.user
|
|
)
|
|
)
|
|
const spotlightUser = computed(() => {
|
|
return Object.values(users.value).find(
|
|
(u) => u.sessionId === spotlightUserSessionId.value
|
|
)
|
|
})
|
|
|
|
const mp = useMixpanel()
|
|
function setUserSpotlight(sessionId: string) {
|
|
if (spotlightUserSessionId.value === sessionId) {
|
|
spotlightUserSessionId.value = null
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'spotlight-mode',
|
|
action: 'stop',
|
|
source: 'navbar'
|
|
})
|
|
return
|
|
}
|
|
|
|
spotlightUserSessionId.value = sessionId
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'spotlight-mode',
|
|
action: 'start',
|
|
source: 'navbar'
|
|
})
|
|
}
|
|
</script>
|