Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/css/server.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@
@use 'forced-colors.scss';

// If you include .css, it will be imported as url
@use '../../node_modules/@nextcloud/dialogs/dist/style.css' as *;
@use '../../node_modules/@nextcloud/password-confirmation/dist/style.css' as *;
6 changes: 5 additions & 1 deletion core/src/tests/components/AppMenu/AppMenu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import type { INavigationEntry } from '../../../types/navigation.d.ts'

import { mount } from '@vue/test-utils'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest'

// Hoisted so mocks exist before the SFC's imports run.
const initialState = vi.hoisted(() => ({
Expand Down Expand Up @@ -644,6 +644,10 @@ describe('core: AppMenu navigation actions', () => {
})

it('focuses the first submenu entry on open and navigates it with arrow keys', async () => {
// jsdom has no layout, so focus-trap finds nothing tabbable and focuses the
// popover itself. Give elements a box so it picks the first entry like a browser.
const rects = vi.spyOn(Element.prototype, 'getClientRects').mockReturnValue([new DOMRect(0, 0, 1, 1)] as unknown as DOMRectList)
onTestFinished(() => rects.mockRestore())
initialState.loadState.mockImplementation(stateWith(fakeApps(), fakeActions(6)))
const wrapper = mount(AppMenu, { attachTo: document.body })
await openPopover(wrapper)
Expand Down
2 changes: 0 additions & 2 deletions core/src/views/PublicPageUserMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
import AccountMenuEntry from '../components/AccountMenu/AccountMenuEntry.vue'

import '@nextcloud/dialogs/style.css'

const avatarDescription = t('core', 'User menu')

const displayName = ref(getGuestUser().displayName)
Expand Down
Loading
Loading