diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue index bc207b8ccc..b43f1b24a0 100644 --- a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue +++ b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue @@ -53,8 +53,6 @@ const activeView = inject(ActiveViewInj, ref()) const isLocked = inject(IsLockedInj, ref(false)) -const { rightSidebarState } = storeToRefs(useSidebarStore()) - const isDefaultBase = computed(() => { const base = project.value?.bases?.find((b) => b.id === vModel.value.base_id) if (!base) return false @@ -193,12 +191,6 @@ function onStopEdit() { }, 250) } -watch(rightSidebarState, () => { - if (rightSidebarState.value === 'peekCloseEnd') { - isDropdownOpen.value = false - } -}) - function onRef(el: HTMLElement) { if (activeViewTitleOrId.value === vModel.value.id) { nextTick(() => { diff --git a/packages/nc-gui/components/dashboard/View.vue b/packages/nc-gui/components/dashboard/View.vue index 3de84866c6..cafb2c3af2 100644 --- a/packages/nc-gui/components/dashboard/View.vue +++ b/packages/nc-gui/components/dashboard/View.vue @@ -12,6 +12,7 @@ const { leftSidebarWidthPercent, leftSideBarSize: sideBarSize, leftSidebarState: sidebarState, + mobileNormalizedSidebarSize, } = storeToRefs(useSidebarStore()) const wrapperRef = ref() @@ -31,14 +32,6 @@ const { handleSidebarOpenOnMobileForNonViews } = useConfigStore() const contentSize = computed(() => 100 - sideBarSize.value.current) -const mobileNormalizedSidebarSize = computed(() => { - if (isMobileMode.value) { - return isLeftSidebarOpen.value ? 100 : 0 - } - - return currentSidebarSize.value -}) - const mobileNormalizedContentSize = computed(() => { if (isMobileMode.value) { return isLeftSidebarOpen.value ? 0 : 100 diff --git a/packages/nc-gui/components/smartsheet/Toolbar.vue b/packages/nc-gui/components/smartsheet/Toolbar.vue index 683f718a47..c5d1e194d3 100644 --- a/packages/nc-gui/components/smartsheet/Toolbar.vue +++ b/packages/nc-gui/components/smartsheet/Toolbar.vue @@ -58,7 +58,6 @@ const { allowCSVDownload } = useSharedView() :show-system-fields="false" /> - diff --git a/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue b/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue deleted file mode 100644 index a6e5aaa146..0000000000 --- a/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - diff --git a/packages/nc-gui/store/sidebar.ts b/packages/nc-gui/store/sidebar.ts index 393498cb33..0a40451f6a 100644 --- a/packages/nc-gui/store/sidebar.ts +++ b/packages/nc-gui/store/sidebar.ts @@ -4,41 +4,40 @@ import { MAX_WIDTH_FOR_MOBILE_MODE } from '~/lib' export const useSidebarStore = defineStore('sidebarStore', () => { const { width } = useWindowSize() const isViewPortMobile = () => width.value < MAX_WIDTH_FOR_MOBILE_MODE + const { isMobileMode } = useGlobal() const isLeftSidebarOpen = ref(!isViewPortMobile()) const isRightSidebarOpen = ref(true) const leftSidebarWidthPercent = ref(isViewPortMobile() ? 0 : 20) - const leftSidebarWidth = computed(() => (width.value * leftSidebarWidthPercent.value) / 100) - const leftSideBarSize = ref({ old: 20, current: leftSidebarWidthPercent.value, }) - const rightSidebarSize = ref({ - old: 17.5, - current: 17.5, - }) - const leftSidebarState = ref< 'openStart' | 'openEnd' | 'hiddenStart' | 'hiddenEnd' | 'peekOpenStart' | 'peekOpenEnd' | 'peekCloseOpen' | 'peekCloseEnd' >(isLeftSidebarOpen.value ? 'openEnd' : 'hiddenEnd') - const rightSidebarState = ref< - 'openStart' | 'openEnd' | 'hiddenStart' | 'hiddenEnd' | 'peekOpenStart' | 'peekOpenEnd' | 'peekCloseOpen' | 'peekCloseEnd' - >(isRightSidebarOpen.value ? 'openEnd' : 'hiddenEnd') + const mobileNormalizedSidebarSize = computed(() => { + if (isMobileMode.value) { + return isLeftSidebarOpen.value ? 100 : 0 + } + + return leftSideBarSize.value.current + }) + + const leftSidebarWidth = computed(() => (width.value * mobileNormalizedSidebarSize.value) / 100) return { isLeftSidebarOpen, isRightSidebarOpen, - rightSidebarSize, leftSidebarWidthPercent, leftSideBarSize, leftSidebarState, - rightSidebarState, leftSidebarWidth, + mobileNormalizedSidebarSize, } })