Skip to content

Commit 4b1e188

Browse files
committed
refactor(NcAppNavigationToggle): move to NcAppNavigation to prevent public export
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 5c72dbd commit 4b1e188

3 files changed

Lines changed: 5 additions & 23 deletions

File tree

src/components/NcAppNavigation/NcAppNavigation.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
142142
import { createFocusTrap } from 'focus-trap'
143143
import { inject, onMounted, onUnmounted, ref, useTemplateRef, warn, watch } from 'vue'
144144
import NcAppNavigationList from '../NcAppNavigationList/index.js'
145-
import NcAppNavigationToggle from '../NcAppNavigationToggle/index.ts'
145+
import NcAppNavigationToggle from './NcAppNavigationToggle.vue'
146146
import { useIsMobile } from '../../composables/useIsMobile/index.ts'
147147
import { getTrapStack } from '../../utils/focusTrap.ts'
148148

src/components/NcAppNavigationToggle/NcAppNavigationToggle.vue renamed to src/components/NcAppNavigation/NcAppNavigationToggle.vue

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
- SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
5-
<!--
6-
- This component is only used for the NcAppNavigation component and not exported otherwise.
7-
-->
85

96
<script setup lang="ts">
7+
import { mdiMenu, mdiMenuOpen } from '@mdi/js'
108
import { computed } from 'vue'
11-
import MenuIcon from 'vue-material-design-icons/Menu.vue'
12-
import MenuOpenIcon from 'vue-material-design-icons/MenuOpen.vue'
139
import NcButton from '../NcButton/index.ts'
10+
import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
1411
import { t } from '../../l10n.ts'
1512
1613
/**
@@ -21,14 +18,6 @@ import { t } from '../../l10n.ts'
2118
const open = defineModel<boolean>('open', { required: true })
2219
2320
const title = computed(() => open.value ? t('Close navigation') : t('Open navigation'))
24-
25-
/**
26-
* Once the toggle has been clicked, emits the toggle status
27-
* so parent components can gauge the status of the navigation button
28-
*/
29-
function toggleNavigation(): void {
30-
open.value = !open.value
31-
}
3221
</script>
3322

3423
<template>
@@ -39,10 +28,9 @@ function toggleNavigation(): void {
3928
:aria-label="title"
4029
:title
4130
variant="tertiary"
42-
@click="toggleNavigation">
31+
@click="open = !open">
4332
<template #icon>
44-
<MenuOpenIcon v-if="open" :size="20" />
45-
<MenuIcon v-else :size="20" />
33+
<NcIconSvgWrapper :path="open ? mdiMenuOpen : mdiMenu" />
4634
</template>
4735
</NcButton>
4836
</div>

src/components/NcAppNavigationToggle/index.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)