Browse Source

mobile optimisations: work on auto-hide behavior of sidebar

pull/4898/head
Daniel Spaude 2 years ago
parent
commit
c0c4aa097d
No known key found for this signature in database
GPG Key ID: 654A3D1FA4F35FFE
  1. 6
      packages/nc-gui/components/tabs/Smartsheet.vue
  2. 4
      packages/nc-gui/pages/[projectType]/[projectId]/index.vue
  3. 37
      packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue

6
packages/nc-gui/components/tabs/Smartsheet.vue

@ -65,16 +65,10 @@ provide(
ReadonlyInj, ReadonlyInj,
computed(() => !isUIAllowed('xcDatatableEditable')), computed(() => !isUIAllowed('xcDatatableEditable')),
) )
const onDecode = () => {
console.log('QR Decode Event')
}
</script> </script>
<template> <template>
<div class="nc-container flex h-full"> <div class="nc-container flex h-full">
<!-- <qrcode-stream @decode="onDecode"></qrcode-stream> -->
<div class="flex flex-col h-full flex-1 min-w-0"> <div class="flex flex-col h-full flex-1 min-w-0">
<LazySmartsheetToolbar /> <LazySmartsheetToolbar />

4
packages/nc-gui/pages/[projectType]/[projectId]/index.vue

@ -572,8 +572,10 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
</a-dropdown> </a-dropdown>
<div <div
class="nc-sidebar-left-toggle-icon hover:after:(bg-primary bg-opacity-75) group nc-sidebar-add-row flex items-center px-2" class="hover:after:(bg-primary bg-opacity-75) group nc-sidebar-add-row flex items-center px-2"
:class="{ 'nc-sidebar-left-toggle-icon': !isMobileMode }"
> >
<!-- <div>OUTER INDEX - isOpen: {{ isOpen }}</div> -->
<MdiBackburger <MdiBackburger
v-e="['c:grid:toggle-navdraw']" v-e="['c:grid:toggle-navdraw']"
class="cursor-pointer transform transition-transform duration-500" class="cursor-pointer transform transition-transform duration-500"

37
packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue

@ -10,6 +10,8 @@ const { isLoading, isMobileMode } = useGlobal()
provide(TabMetaInj, activeTab) provide(TabMetaInj, activeTab)
const mainArea = ref<HTMLDivElement>()
const icon = (tab: TabItem) => { const icon = (tab: TabItem) => {
switch (tab.type) { switch (tab.type) {
case TabType.TABLE: case TabType.TABLE:
@ -26,6 +28,35 @@ const { isOpen, toggle } = useSidebar('nc-left-sidebar')
function onEdit(targetKey: number, action: 'add' | 'remove' | string) { function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
if (action === 'remove') closeTab(targetKey) if (action === 'remove') closeTab(targetKey)
} }
const hideSidebarOnClickOrTouchIfMobileMode = (event: Event) => {
if (isMobileMode.value && isOpen.value) {
// && !event.target?.matches('.show-sidebar-button')
// alert('now we will close the sidebar')
toggle(false)
}
// if (!event.target.matches('.show-sidebar-button')) {
// this.sidebarVisible = false
// }
// console.log('event.target', event.target)
// console.log('toggleSideBarButton.value', toggleSideBarButton.value)
// console.log('inside of hideSidebarOnClickOrTouchIfMobileMode')
// console.log('isOpen.value', isOpen.value)
// console.log('event.target !== toggleSideBarButton.value', event.target !== toggleSideBarButton.value)
// console.log('------------')
// debugger
// if (isMobileMode.value && isOpen.value && !event.target?.matchesSelector('.show-sidebar-button')) {
// if (isMobileMode.value && isOpen.value && event.target !== toggleSideBarButton.value) {
// toggle(false)
// }
}
onMounted(() => {
// if (isMobileMode.value) toggle(true)
mainArea.value?.addEventListener('click', hideSidebarOnClickOrTouchIfMobileMode)
})
</script> </script>
<template> <template>
@ -36,7 +67,8 @@ function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
v-if="!isOpen" v-if="!isOpen"
class="nc-sidebar-left-toggle-icon hover:after:(bg-primary bg-opacity-75) group nc-sidebar-add-row py-2 px-3" class="nc-sidebar-left-toggle-icon hover:after:(bg-primary bg-opacity-75) group nc-sidebar-add-row py-2 px-3"
> >
<MdiMenu <!-- <div>INNER INDEX - isOpen: {{ isOpen }}</div> -->
<MdiMenu
v-e="['c:grid:toggle-navdraw']" v-e="['c:grid:toggle-navdraw']"
class="cursor-pointer transform transition-transform duration-500 text-white" class="cursor-pointer transform transition-transform duration-500 text-white"
:class="{ 'rotate-180': !isOpen }" :class="{ 'rotate-180': !isOpen }"
@ -44,6 +76,7 @@ function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
/> />
</div> </div>
<a-tabs v-model:activeKey="activeTabIndex" class="nc-root-tabs" type="editable-card" @edit="onEdit"> <a-tabs v-model:activeKey="activeTabIndex" class="nc-root-tabs" type="editable-card" @edit="onEdit">
<a-tab-pane v-for="(tab, i) of tabs" :key="i"> <a-tab-pane v-for="(tab, i) of tabs" :key="i">
<template #tab> <template #tab>
@ -86,7 +119,7 @@ function onEdit(targetKey: number, action: 'add' | 'remove' | string) {
<LazyGeneralFullScreen v-if="!isMobileMode" class="nc-fullscreen-icon" /> <LazyGeneralFullScreen v-if="!isMobileMode" class="nc-fullscreen-icon" />
</div> </div>
<div class="w-full min-h-[300px] flex-auto"> <div ref="mainArea" class="w-full min-h-[300px] flex-auto">
<NuxtPage :page-key="`${$route.params.projectId}.${$route.name}`" /> <NuxtPage :page-key="`${$route.params.projectId}.${$route.name}`" />
</div> </div>
</div> </div>

Loading…
Cancel
Save