Browse Source

mobile optimisations - for now, move views sidebar again to the right - WIP

pull/5114/head
Daniel Spaude 2 years ago
parent
commit
468dc83a82
No known key found for this signature in database
GPG Key ID: 654A3D1FA4F35FFE
  1. 21
      packages/nc-gui/components/smartsheet/sidebar/index.vue
  2. 2
      packages/nc-gui/components/tabs/Smartsheet.vue

21
packages/nc-gui/components/smartsheet/sidebar/index.vue

@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ViewType, ViewTypes } from 'nocodb-sdk' import type { ViewType, ViewTypes } from 'nocodb-sdk'
import type { Ref } from 'vue'
import { import {
ActiveViewInj, ActiveViewInj,
MetaInj, MetaInj,
@ -8,6 +9,7 @@ import {
ref, ref,
resolveComponent, resolveComponent,
useDialog, useDialog,
useGlobal,
useNuxtApp, useNuxtApp,
useRoute, useRoute,
useRouter, useRouter,
@ -21,6 +23,8 @@ const meta = inject(MetaInj, ref())
const activeView = inject(ActiveViewInj, ref()) const activeView = inject(ActiveViewInj, ref())
const { isMobileMode } = useGlobal()
const { activeTab } = useTabs() const { activeTab } = useTabs()
const { views, loadViews, isLoading } = useViews(meta) const { views, loadViews, isLoading } = useViews(meta)
@ -47,7 +51,8 @@ const { isOpen } = useSidebar('nc-right-sidebar')
const sidebarCollapsed = computed(() => !isOpen.value) const sidebarCollapsed = computed(() => !isOpen.value)
/** Sidebar ref */ /** Sidebar ref */
const sidebar = ref() const sidebar: Ref<Element | null> = ref(null)
const FOO: Ref<Element | null> = ref(null)
/** Watch route param and change active view based on `viewTitle` */ /** Watch route param and change active view based on `viewTitle` */
watch( watch(
@ -133,9 +138,22 @@ function onOpenModal({
close(1000) close(1000)
} }
} }
document.addEventListener('click', (event: MouseEvent) => {
// sidebar.value.
// const sidebarFoo = document.querySelector('.nc-right-sidebar')
const sidebarFoo = sidebar.value
alert(JSON.stringify(FOO.value))
// alert(JSON.stringify(sidebarFoo))
// if (isMobileMode.value && !sidebar.value?.contains(event.target as Node)) {
if (isMobileMode.value && !sidebarFoo?.contains(event.target as Node)) {
alert('FOO')
}
})
</script> </script>
<template> <template>
<div ref="FOO">
<a-layout-sider <a-layout-sider
ref="sidebar" ref="sidebar"
:collapsed="sidebarCollapsed" :collapsed="sidebarCollapsed"
@ -165,6 +183,7 @@ function onOpenModal({
</template> </template>
</div> </div>
</a-layout-sider> </a-layout-sider>
</div>
</template> </template>
<style scoped> <style scoped>

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

@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ColumnType, TableType } from 'nocodb-sdk' import type { ColumnType, TableType } from 'nocodb-sdk'
import { useGlobal } from '../../composables/useGlobal'
import { import {
ActiveViewInj, ActiveViewInj,
FieldsInj, FieldsInj,
@ -63,6 +64,7 @@ provide(
ReadonlyInj, ReadonlyInj,
computed(() => !isUIAllowed('xcDatatableEditable')), computed(() => !isUIAllowed('xcDatatableEditable')),
) )
</script> </script>
<template> <template>

Loading…
Cancel
Save