From d05a5f6528f1071c06121bd0739276615863b816 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Thu, 16 Jan 2025 04:36:35 +0300 Subject: [PATCH 01/11] PresenceAvatars fixed limit for mobile (#7677) --- .../presence-resources/src/components/PresenceAvatars.svelte | 5 +++-- tests/sanity/tests/model/common-page.ts | 1 + tests/sanity/tests/model/recruiting/applications-page.ts | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/presence-resources/src/components/PresenceAvatars.svelte b/plugins/presence-resources/src/components/PresenceAvatars.svelte index e5b2704d8a..65bd25d1a5 100644 --- a/plugins/presence-resources/src/components/PresenceAvatars.svelte +++ b/plugins/presence-resources/src/components/PresenceAvatars.svelte @@ -18,7 +18,7 @@ import { type Person, formatName } from '@hcengineering/contact' import { Avatar, personByIdStore } from '@hcengineering/contact-resources' import { getEmbeddedLabel } from '@hcengineering/platform' - import { IconSize, tooltip } from '@hcengineering/ui' + import { IconSize, tooltip, deviceOptionsStore as deviceInfo, checkAdaptiveMatching } from '@hcengineering/ui' import PresenceList from './PresenceList.svelte' import { presenceByObjectId } from '../store' @@ -33,10 +33,11 @@ .map((p) => $personByIdStore.get(p)) .filter((p): p is Person => p !== undefined) $: overLimit = persons.length > limit + $: adaptive = checkAdaptiveMatching($deviceInfo.size, 'md') || overLimit {#if persons.length > 0} - {#if overLimit} + {#if adaptive}
{ await this.viewStringDeleteObjectButtonPrimary().click() + await expect(this.viewStringDeleteObjectButtonPrimary()).not.toBeVisible({ timeout: 1000 }) } async addNewTagPopup (page: Page, title: string, description: string): Promise { diff --git a/tests/sanity/tests/model/recruiting/applications-page.ts b/tests/sanity/tests/model/recruiting/applications-page.ts index 12faf8ec2f..15737d4c16 100644 --- a/tests/sanity/tests/model/recruiting/applications-page.ts +++ b/tests/sanity/tests/model/recruiting/applications-page.ts @@ -78,6 +78,9 @@ export class ApplicationsPage extends CommonRecruitingPage { .locator('tr', { hasText: `${talentName.lastName} ${talentName.firstName}` }) .locator('div[class*="firstCell"]') .click() + await expect( + this.page.locator('div.hulyHeader-container div.hulyHeader-titleGroup', { hasText: talentName.lastName }) + ).toBeVisible({ timeout: 1000 }) } async checkApplicationState (talentName: TalentName, done: string): Promise { From 8e498027f610eeabdaddd4fa20ba6ca5096dd019 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Thu, 16 Jan 2025 07:22:22 +0300 Subject: [PATCH 02/11] Fixed the height of the sidebar in the mobile theme (#7682) Signed-off-by: Alexander Platov --- .../src/components/sidebar/SidebarExpanded.svelte | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte index 2b393de8c9..404872c80f 100644 --- a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte +++ b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte @@ -99,7 +99,7 @@ } -
+
{#if float && !($deviceInfo.isMobile && $deviceInfo.isPortrait && $deviceInfo.minWidth)} {/if} @@ -178,10 +178,16 @@ :global(.mobile-theme) & { overflow: hidden; - height: calc(100% - var(--app-panel-width)); border: 1px solid var(--theme-divider-color); border-radius: var(--medium-BorderRadius); filter: var(--theme-navpanel-shadow-mobile); + + &.apps-horizontal { + height: calc(100% - var(--app-panel-width)); + } + :global(.antiSeparator) { + display: none; + } } } } From 475e7ee62dc23e526f2786ae0694e880affaff5a Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Thu, 16 Jan 2025 18:21:13 +0300 Subject: [PATCH 03/11] CopyTextToClipboard fixed for mobile browsers (#7672) --- packages/presentation/src/utils.ts | 21 ++++++++++++++++++++- packages/theme/styles/_layouts.scss | 5 +++++ plugins/view-resources/src/actionImpl.ts | 13 +++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts index 787882bb06..0906e9daab 100644 --- a/packages/presentation/src/utils.ts +++ b/packages/presentation/src/utils.ts @@ -549,6 +549,23 @@ export async function getBlobURL (blob: Blob): Promise { }) } +/** + * @public + */ +export function copyTextToClipboardOldBrowser (text: string): void { + const textarea = document.createElement('textarea') + textarea.value = text + textarea.classList.add('hulyClipboardArea') + document.body.appendChild(textarea) + textarea.select() + try { + document.execCommand('copy') + } catch (err) { + console.error(err) + } + document.body.removeChild(textarea) +} + /** * @public */ @@ -562,7 +579,9 @@ export async function copyTextToClipboard (text: string | Promise): Prom await navigator.clipboard.write([clipboardItem]) } catch { // Fallback to default clipboard API implementation - await navigator.clipboard.writeText(text instanceof Promise ? await text : text) + if (navigator.clipboard != null && typeof navigator.clipboard.writeText === 'function') { + await navigator.clipboard.writeText(text instanceof Promise ? await text : text) + } else copyTextToClipboardOldBrowser(text instanceof Promise ? await text : text) } } diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 0002c6d0e6..ff4842d656 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -917,6 +917,11 @@ a.no-line { .text-line-through { text-decoration: line-through; } +.hulyClipboardArea { + width: 0; + height: 0; + opacity: 0; +} .hidden-text { position: absolute; visibility: hidden; diff --git a/plugins/view-resources/src/actionImpl.ts b/plugins/view-resources/src/actionImpl.ts index b4d8304553..f0734891bb 100644 --- a/plugins/view-resources/src/actionImpl.ts +++ b/plugins/view-resources/src/actionImpl.ts @@ -9,7 +9,14 @@ import { getCurrentAccount } from '@hcengineering/core' import { type Asset, type IntlString, type Resource, getResource } from '@hcengineering/platform' -import { MessageBox, getClient, updateAttribute, type ContextStore, contextStore } from '@hcengineering/presentation' +import { + MessageBox, + getClient, + updateAttribute, + type ContextStore, + contextStore, + copyTextToClipboardOldBrowser +} from '@hcengineering/presentation' import { type AnyComponent, type AnySvelteComponent, @@ -73,7 +80,9 @@ async function CopyTextToClipboard ( const text = Array.isArray(doc) ? (await Promise.all(doc.map(async (d) => await getText(d, props.props)))).join(',') : await getText(doc, props.props) - await navigator.clipboard.writeText(text) + if (navigator.clipboard != null && typeof navigator.clipboard.writeText === 'function') { + await navigator.clipboard.writeText(text) + } else copyTextToClipboardOldBrowser(text) } } From 1eb8977a6ca1079d191be8bc382464666504b76b Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Thu, 16 Jan 2025 21:03:47 +0500 Subject: [PATCH 04/11] Set due date when create application (#7683) Signed-off-by: Denis Bykhov --- .../calendar/DueDatePresenter.svelte | 2 ++ .../src/components/CreateApplication.svelte | 7 ++---- .../src/components/DueDateEditor.svelte | 23 +++++++++++-------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/ui/src/components/calendar/DueDatePresenter.svelte b/packages/ui/src/components/calendar/DueDatePresenter.svelte index 4190131e72..fa1dba5047 100644 --- a/packages/ui/src/components/calendar/DueDatePresenter.svelte +++ b/packages/ui/src/components/calendar/DueDatePresenter.svelte @@ -16,6 +16,7 @@ import { Timestamp } from '@hcengineering/core' import DueDatePopup from './DueDatePopup.svelte' import { tooltip } from '../../tooltips' + import ui from '../../plugin' import DatePresenter from './DatePresenter.svelte' import { getDaysDifference, getDueDateIconModifier, getFormattedDate } from './internal/DateUtils' import { ButtonKind, ButtonSize } from '../../types' @@ -67,6 +68,7 @@ : undefined} > diff --git a/plugins/task-resources/src/components/DueDateEditor.svelte b/plugins/task-resources/src/components/DueDateEditor.svelte index fd8f3e4e75..e67d6ccd89 100644 --- a/plugins/task-resources/src/components/DueDateEditor.svelte +++ b/plugins/task-resources/src/components/DueDateEditor.svelte @@ -10,6 +10,7 @@ export let size: ButtonSize = 'medium' export let kind: ButtonKind = 'link' export let editable: boolean = true + export let onChange: ((value: any) => void) | undefined const client = getClient() $: status = $statusStore.byId.get(object.status) @@ -21,15 +22,19 @@ return } - await client.updateCollection( - object._class, - object.space, - object._id, - object.attachedTo, - object.attachedToClass, - object.collection, - { dueDate: newDueDate } - ) + if (onChange !== undefined) { + onChange(newDueDate) + } else { + await client.updateCollection( + object._class, + object.space, + object._id, + object.attachedTo, + object.attachedToClass, + object.collection, + { dueDate: newDueDate } + ) + } } From a31bfa2dc1c10389de1d02cf9e3e538b4955800e Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Thu, 16 Jan 2025 23:15:54 +0500 Subject: [PATCH 05/11] Add viber (#7684) Signed-off-by: Denis Bykhov --- models/contact/src/index.ts | 11 +++++++++++ models/contact/src/plugin.ts | 2 ++ plugins/contact-assets/assets/icons.svg | 26 +++++++++++++++++++++++++ plugins/contact-assets/lang/cs.json | 4 +++- plugins/contact-assets/lang/de.json | 4 +++- plugins/contact-assets/lang/en.json | 4 +++- plugins/contact-assets/lang/es.json | 4 +++- plugins/contact-assets/lang/fr.json | 4 +++- plugins/contact-assets/lang/it.json | 4 +++- plugins/contact-assets/lang/pt.json | 4 +++- plugins/contact-assets/lang/ru.json | 4 +++- plugins/contact-assets/lang/zh.json | 4 +++- plugins/contact-assets/src/index.ts | 1 + plugins/contact/src/index.ts | 6 ++++-- 14 files changed, 71 insertions(+), 11 deletions(-) diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index b417998587..60e26b083d 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -696,6 +696,17 @@ export function createModel (builder: Builder): void { contact.channelProvider.Profile ) + builder.createDoc( + contact.class.ChannelProvider, + core.space.Model, + { + label: contact.string.Viber, + icon: contact.icon.Viber, + placeholder: contact.string.ViberPlaceholder + }, + contact.channelProvider.Viber + ) + builder.createDoc( contact.class.AvatarProvider, core.space.Model, diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts index e3189451f8..cbb7e1b4a8 100644 --- a/models/contact/src/plugin.ts +++ b/models/contact/src/plugin.ts @@ -91,6 +91,8 @@ export default mergeIds(contactId, contact, { SkypePlaceholder: '' as IntlString, Profile: '' as IntlString, ProfilePlaceholder: '' as IntlString, + Viber: '' as IntlString, + ViberPlaceholder: '' as IntlString, CurrentEmployee: '' as IntlString, diff --git a/plugins/contact-assets/assets/icons.svg b/plugins/contact-assets/assets/icons.svg index 7e0f0c61c0..d66d763cf2 100644 --- a/plugins/contact-assets/assets/icons.svg +++ b/plugins/contact-assets/assets/icons.svg @@ -95,4 +95,30 @@ + + + + + + + diff --git a/plugins/contact-assets/lang/cs.json b/plugins/contact-assets/lang/cs.json index 0337643477..3c68f91b41 100644 --- a/plugins/contact-assets/lang/cs.json +++ b/plugins/contact-assets/lang/cs.json @@ -105,6 +105,8 @@ "For": "Pro", "SelectUsers": "Vyberte uživatele", "AddGuest": "Přidat hosta", - "ViewProfile": "Zobrazit profil" + "ViewProfile": "Zobrazit profil", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/de.json b/plugins/contact-assets/lang/de.json index bfa05c591f..2d1c7467bd 100644 --- a/plugins/contact-assets/lang/de.json +++ b/plugins/contact-assets/lang/de.json @@ -105,6 +105,8 @@ "For": "Für", "SelectUsers": "Benutzer auswählen", "AddGuest": "Gast hinzufügen", - "ViewProfile": "Profil anzeigen" + "ViewProfile": "Profil anzeigen", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json index ac4c99f0dd..c0823fd5eb 100644 --- a/plugins/contact-assets/lang/en.json +++ b/plugins/contact-assets/lang/en.json @@ -105,6 +105,8 @@ "For": "For", "SelectUsers": "Select users", "AddGuest": "Add guest", - "ViewProfile": "View profile" + "ViewProfile": "View profile", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/es.json b/plugins/contact-assets/lang/es.json index a8c491f331..5e3f8a6835 100644 --- a/plugins/contact-assets/lang/es.json +++ b/plugins/contact-assets/lang/es.json @@ -105,6 +105,8 @@ "For": "Para", "SelectUsers": "Seleccionar usuarios", "AddGuest": "Añadir invitado", - "ViewProfile": "Ver perfil" + "ViewProfile": "Ver perfil", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/fr.json b/plugins/contact-assets/lang/fr.json index 090d7e8421..e6bcf4546f 100644 --- a/plugins/contact-assets/lang/fr.json +++ b/plugins/contact-assets/lang/fr.json @@ -105,6 +105,8 @@ "For": "Pour", "SelectUsers": "Sélectionner des utilisateurs", "AddGuest": "Ajouter un invité", - "ViewProfile": "Voir le profil" + "ViewProfile": "Voir le profil", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/it.json b/plugins/contact-assets/lang/it.json index 6be24cb527..3be4148a48 100644 --- a/plugins/contact-assets/lang/it.json +++ b/plugins/contact-assets/lang/it.json @@ -105,6 +105,8 @@ "For": "Per", "SelectUsers": "Seleziona utenti", "AddGuest": "Aggiungi ospite", - "ViewProfile": "Visualizza profilo" + "ViewProfile": "Visualizza profilo", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/pt.json b/plugins/contact-assets/lang/pt.json index eaefaf537f..ca1f70e0bc 100644 --- a/plugins/contact-assets/lang/pt.json +++ b/plugins/contact-assets/lang/pt.json @@ -105,6 +105,8 @@ "For": "Para", "SelectUsers": "Selecionar utilizadores", "AddGuest": "Adicionar convidado", - "ViewProfile": "Ver perfil" + "ViewProfile": "Ver perfil", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/ru.json b/plugins/contact-assets/lang/ru.json index 8e063ae76b..15c2c3231d 100644 --- a/plugins/contact-assets/lang/ru.json +++ b/plugins/contact-assets/lang/ru.json @@ -105,6 +105,8 @@ "For": "Для", "SelectUsers": "Выберите пользователей", "AddGuest": "Добавить гостя", - "ViewProfile": "Посмотреть профиль" + "ViewProfile": "Посмотреть профиль", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/lang/zh.json b/plugins/contact-assets/lang/zh.json index a06acb8acc..65f6de469d 100644 --- a/plugins/contact-assets/lang/zh.json +++ b/plugins/contact-assets/lang/zh.json @@ -105,6 +105,8 @@ "For": "为", "SelectUsers": "选择用户", "AddGuest": "添加访客", - "ViewProfile": "查看资料" + "ViewProfile": "查看资料", + "Viber": "Viber", + "ViberPlaceholder": "Viber" } } diff --git a/plugins/contact-assets/src/index.ts b/plugins/contact-assets/src/index.ts index 6cc90fb578..37d0347d9a 100644 --- a/plugins/contact-assets/src/index.ts +++ b/plugins/contact-assets/src/index.ts @@ -28,6 +28,7 @@ loadMetadata(contact.icon, { Telegram: `${icons}#telegram`, Twitter: `${icons}#twitter`, VK: `${icons}#vk`, + Viber: `${icons}#viber`, WhatsApp: `${icons}#whatsapp`, Skype: `${icons}#skype`, Youtube: `${icons}#youtube`, diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts index b19b6ff83d..9dd17c0d4c 100644 --- a/plugins/contact/src/index.ts +++ b/plugins/contact/src/index.ts @@ -235,7 +235,8 @@ export const contactPlugin = plugin(contactId, { Homepage: '' as Ref, Whatsapp: '' as Ref, Skype: '' as Ref, - Profile: '' as Ref + Profile: '' as Ref, + Viber: '' as Ref }, avatarProvider: { Color: '' as Ref, @@ -273,7 +274,8 @@ export const contactPlugin = plugin(contactId, { ComponentMembers: '' as Asset, Profile: '' as Asset, KickUser: '' as Asset, - Contacts: '' as Asset + Contacts: '' as Asset, + Viber: '' as Asset }, space: { Contacts: '' as Ref From 4820785009527fec9d03cd0bdcbfbc5febf17a96 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Fri, 17 Jan 2025 07:47:25 +0300 Subject: [PATCH 06/11] Fixed the behavior of the navigator and sidebar on the mobile (#7694) --- packages/ui/src/index.ts | 1 - packages/ui/src/types.ts | 1 - plugins/chunter-resources/src/navigation.ts | 7 +-- .../src/components/Settings.svelte | 1 - .../src/components/Workbench.svelte | 54 +++++++++---------- .../src/components/sidebar/Sidebar.svelte | 2 +- .../components/sidebar/SidebarExpanded.svelte | 4 +- plugins/workbench-resources/src/sidebar.ts | 19 +++---- 8 files changed, 40 insertions(+), 49 deletions(-) diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index 5608e58ca1..49bf278d9f 100644 --- a/packages/ui/src/index.ts +++ b/packages/ui/src/index.ts @@ -320,7 +320,6 @@ export const deviceOptionsStore = writable({ isPortrait: false, isMobile: false, navigator: { visible: true, float: false, direction: 'vertical' }, - aside: { visible: true, float: false }, fontSize: 0, size: null, sizes: { xs: false, sm: false, md: false, lg: false, xl: false, xxl: false }, diff --git a/packages/ui/src/types.ts b/packages/ui/src/types.ts index 77121dea8d..9b66828ae6 100644 --- a/packages/ui/src/types.ts +++ b/packages/ui/src/types.ts @@ -381,7 +381,6 @@ export interface DeviceOptions { isPortrait: boolean isMobile: boolean navigator: { visible: boolean, float: boolean, direction: 'vertical' | 'horizontal' } - aside: { visible: boolean, float: boolean } fontSize: number size: WidthType | null sizes: Record diff --git a/plugins/chunter-resources/src/navigation.ts b/plugins/chunter-resources/src/navigation.ts index 6dc72ed16e..8e13ecae37 100644 --- a/plugins/chunter-resources/src/navigation.ts +++ b/plugins/chunter-resources/src/navigation.ts @@ -5,8 +5,7 @@ import { getLocation, type Location, navigate, - languageStore, - deviceOptionsStore as deviceInfo + languageStore } from '@hcengineering/ui' import { type Ref, type Doc, type Class, generateId } from '@hcengineering/core' import activity, { type ActivityMessage } from '@hcengineering/activity' @@ -180,10 +179,6 @@ export async function replyToThread (message: ActivityMessage, e: Event): Promis const fromSidebar = isElementFromSidebar(e.target as HTMLElement) const loc = getCurrentLocation() - const dev = get(deviceInfo) - dev.aside.visible = true - deviceInfo.set(dev) - threadMessagesStore.set(message) if (fromSidebar) { diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte index bd3301a299..c6801a375c 100644 --- a/plugins/setting-resources/src/components/Settings.svelte +++ b/plugins/setting-resources/src/components/Settings.svelte @@ -136,7 +136,6 @@ const widget = client.getModel().findAllSync(workbench.class.Widget, { _id: settingPlg.ids.SettingsWidget })[0] $: if (moveASide && asideComponent != null && $sidebarStore.widget !== widget._id) { openWidget(widget, { component: asideComponent, ...asideProps }, { active: true, openedByUser: true }) - $deviceInfo.aside.visible = true } else if (moveASide && asideComponent == null && $sidebarStore.widget === widget._id) { closeWidget(widget._id) minimizeSidebar() diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte index b30b41233c..61e2449c38 100644 --- a/plugins/workbench-resources/src/components/Workbench.svelte +++ b/plugins/workbench-resources/src/components/Workbench.svelte @@ -159,19 +159,12 @@ const linkProviders = client.getModel().findAllSync(view.mixin.LinkIdProvider, {}) + const mobileAdaptive = $deviceInfo.isMobile && $deviceInfo.minWidth const defaultNavigator = !(getMetadata(workbench.metadata.NavigationExpandedDefault) ?? true) const savedNavigator = localStorage.getItem('hiddenNavigator') - const savedAside = localStorage.getItem('hiddenAside') let hiddenNavigator: boolean = savedNavigator !== null ? savedNavigator === 'true' : defaultNavigator - let hiddenAside: boolean = savedAside !== null ? savedAside === 'true' : defaultNavigator + let hiddenAside: boolean = true $deviceInfo.navigator.visible = !hiddenNavigator - $deviceInfo.aside.visible = !hiddenAside - sidebarStore.subscribe((sidebar) => { - if (!$deviceInfo.aside.float) { - hiddenAside = sidebar.variant === SidebarVariant.MINI - localStorage.setItem('hiddenAside', `${hiddenAside}`) - } - }) async function toggleNav (): Promise { $deviceInfo.navigator.visible = !$deviceInfo.navigator.visible @@ -642,37 +635,42 @@ } } checkWorkbenchWidth() - $: if ($deviceInfo.docWidth <= FLOAT_ASIDE && !$deviceInfo.aside.float) { - $deviceInfo.aside.visible = false - $deviceInfo.aside.float = true - } else if ($deviceInfo.docWidth > FLOAT_ASIDE && $deviceInfo.aside.float) { - $deviceInfo.aside.float = false - $deviceInfo.aside.visible = !hiddenAside + $: if ($deviceInfo.docWidth <= FLOAT_ASIDE && !$sidebarStore.float) { + hiddenAside = $sidebarStore.variant === SidebarVariant.MINI + $sidebarStore.float = true + } else if ($deviceInfo.docWidth > FLOAT_ASIDE && $sidebarStore.float) { + $sidebarStore.float = false + $sidebarStore.variant = hiddenAside ? SidebarVariant.MINI : SidebarVariant.EXPANDED } const checkOnHide = (): void => { if ($deviceInfo.navigator.visible && $deviceInfo.navigator.float) $deviceInfo.navigator.visible = false } let oldNavVisible: boolean = $deviceInfo.navigator.visible - let oldASideVisible: boolean = $deviceInfo.aside.visible - $: if (oldNavVisible !== $deviceInfo.navigator.visible || oldASideVisible !== $deviceInfo.aside.visible) { - if ($deviceInfo.isMobile && $deviceInfo.isPortrait && $deviceInfo.navigator.float) { - if ($deviceInfo.navigator.visible && $deviceInfo.aside.visible) { + let oldASideVisible: boolean = $sidebarStore.variant !== SidebarVariant.MINI + $: if ( + oldNavVisible !== $deviceInfo.navigator.visible || + oldASideVisible !== ($sidebarStore.variant !== SidebarVariant.MINI) + ) { + if (mobileAdaptive && $deviceInfo.navigator.float) { + if ($deviceInfo.navigator.visible && $sidebarStore.variant !== SidebarVariant.MINI) { if (oldNavVisible) $deviceInfo.navigator.visible = false - else $deviceInfo.aside.visible = false + else $sidebarStore.variant = SidebarVariant.MINI } } oldNavVisible = $deviceInfo.navigator.visible - oldASideVisible = $deviceInfo.aside.visible + oldASideVisible = $sidebarStore.variant !== SidebarVariant.MINI } $: if ( - $deviceInfo.aside.float && - $deviceInfo.aside.visible && - $sidebarStore.variant === SidebarVariant.MINI && + $sidebarStore.float && + $sidebarStore.variant !== SidebarVariant.MINI && + $sidebarStore.widget === undefined && $sidebarStore.widgetsState.size > 0 ) { - $sidebarStore.variant = SidebarVariant.EXPANDED $sidebarStore.widget = Array.from($sidebarStore.widgetsState.keys())[0] } + location.subscribe(() => { + if (mobileAdaptive && $sidebarStore.variant !== SidebarVariant.MINI) $sidebarStore.variant = SidebarVariant.MINI + }) $: $deviceInfo.navigator.direction = $deviceInfo.isMobile && $deviceInfo.isPortrait ? 'horizontal' : 'vertical' let appsMini: boolean $: appsMini = @@ -976,9 +974,9 @@
{#if currentApplication && currentApplication.component} @@ -1022,7 +1020,7 @@ {/if}
- {#if $sidebarStore.variant === SidebarVariant.EXPANDED && !$deviceInfo.aside.float} + {#if $sidebarStore.variant === SidebarVariant.EXPANDED && !$sidebarStore.float} {/if} diff --git a/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte b/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte index 93fd02c9d0..d862eb2072 100644 --- a/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte +++ b/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte @@ -61,7 +61,7 @@ }) -