[Part 2]: Sidebar and chat fixes (#6656)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina
2024-09-20 22:07:04 +07:00
committed by GitHub
parent 25ab61f488
commit f2c961c5d5
31 changed files with 185 additions and 95 deletions
@@ -24,7 +24,7 @@
{#if tab.data.thread}
<div class="root" style:height style:width>
<ThreadView _id={tab.data.thread} on:close />
<ThreadView _id={tab.data.thread} on:close on:channel />
</div>
{/if}
@@ -15,7 +15,7 @@
<script lang="ts">
import { Doc, Ref } from '@hcengineering/core'
import { createQuery, getClient } from '@hcengineering/presentation'
import { Breadcrumbs, Label, location as locationStore, Header } from '@hcengineering/ui'
import { Breadcrumbs, Label, location as locationStore, Header, BreadcrumbItem } from '@hcengineering/ui'
import { createEventDispatcher, onDestroy } from 'svelte'
import activity, { ActivityMessage, DisplayActivityMessage } from '@hcengineering/activity'
import { getMessageFromLoc, messageInFocus } from '@hcengineering/activity-resources'
@@ -104,7 +104,14 @@
channelName = res
})
function getBreadcrumbsItems (channel?: Doc, message?: DisplayActivityMessage, channelName?: string) {
let breadcrumbs: BreadcrumbItem[] = []
$: breadcrumbs = showHeader ? getBreadcrumbsItems(channel, message, channelName) : []
function getBreadcrumbsItems (
channel?: Doc,
message?: DisplayActivityMessage,
channelName?: string
): BreadcrumbItem[] {
if (message === undefined) {
return []
}
@@ -115,6 +122,7 @@
return [
{
id: 'channel',
icon: getObjectIcon(message.attachedToClass),
iconProps: { value: channel },
iconWidth: isPersonAvatar ? 'auto' : undefined,
@@ -122,14 +130,24 @@
title: channelName,
label: channelName ? undefined : chunter.string.Channel
},
{ label: chunter.string.Thread }
{ id: 'thread', label: chunter.string.Thread }
]
}
function handleBreadcrumbSelect (event: CustomEvent<number>): void {
const index = event.detail
const breadcrumb = breadcrumbs[index]
if (breadcrumb === undefined) return
if (breadcrumb.id !== 'channel') return
dispatch('channel')
}
</script>
{#if showHeader}
<Header type={'type-aside'} adaptive={'disabled'} on:close>
<Breadcrumbs items={getBreadcrumbsItems(channel, message, channelName)} currentOnly />
<Header type={'type-aside'} adaptive={'disabled'} closeOnEscape={false} on:close>
<Breadcrumbs items={breadcrumbs} on:select={handleBreadcrumbSelect} selected={1} />
</Header>
{/if}
@@ -141,8 +159,8 @@
skipLabels
object={message}
provider={dataProvider}
initialScrollBottom={false}
fullHeight={false}
fixedInput={false}
>
<svelte:fragment slot="header">
<div class="mt-3">