Skip to content

Commit

Permalink
feat(NcAppSidebar): Allow to set open state to prevent focus trap i…
Browse files Browse the repository at this point in the history
…ssues on mobile

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux committed May 13, 2024
1 parent a780d1d commit cf4f2bf
Showing 1 changed file with 102 additions and 7 deletions.
109 changes: 102 additions & 7 deletions src/components/NcAppSidebar/NcAppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ This component provides a way to include the standardised sidebar.
The standard properties like name, subname, starred, etc. allow to automatically
include a standard-header like it's used by the files app.

To conditionally show the sidebar either use `v-if` on the sidebar component,
or use the `open` property of the component to controll the state.
Using `v-show` directly will result in usability issues due to internal focus trap handling.

### Standard usage

```vue
Expand Down Expand Up @@ -366,6 +370,74 @@ A working alternative would be using an icon together with an `aria-label`:
}
</script>
```

### Conditionally show the sidebar

If the sidebar should be shown conditionally (e.g. using a button)
and the users are expected to open and close the sidebar multiple times,
then using `v-if` might result in bad performance.
So instead use the `open` property:

```vue
<template>
<!-- This is in most cases NcContent -->
<div class="content-wrapper">
<!-- The main content - In most cases NcAppContent -->
<div>
<NcButton @click.prevent="showSidebar = !showSidebar">
Toggle sidebar
</NcButton>
</div>
<!-- The sidebar -->
<NcAppSidebar
:open.sync="showSidebar"
name="cat-picture.jpg"
subname="last edited 3 weeks ago">
<NcAppSidebarTab name="Settings" id="settings-tab">
<template #icon>
<Cog :size="20" />
</template>
Single tab content
</NcAppSidebarTab>
</NcAppSidebar>
</div>
</template>
<script>
import Cog from 'vue-material-design-icons/Cog'
export default {
components: {
Cog,
},
data() {
return {
showSidebar: true,
}
},
}
</script>
<style scoped>
/* This styles just mock NcContent and NcAppContent */
.content-wrapper {
position: relative;
/* Just to prevent jumping when the sidebar is hidden */
min-height: 360px;
}
.main-content {
position: absolute;
height: 100%;
width: 100%;
}
/* Fix styles on this style guide page */
@media only screen and (max-width: 512px) {
:deep(aside) {
width: calc(100vw - 64px) !important;
}
}
</style>
```
</docs>

<template>
Expand All @@ -375,7 +447,8 @@ A working alternative would be using an icon together with an `aria-label`:
@after-enter="onAfterEnter"
@before-leave="onBeforeLeave"
@after-leave="onAfterLeave">
<aside id="app-sidebar-vue"
<aside v-show="open"
id="app-sidebar-vue"
ref="sidebar"
class="app-sidebar"
:aria-labelledby="`app-sidebar-vue-${uid}__header`"
Expand Down Expand Up @@ -525,7 +598,6 @@ import NcButton from '../NcButton/index.js'
import NcEmptyContent from '../NcEmptyContent/index.js'
import Focus from '../../directives/Focus/index.js'
import Linkify from '../../directives/Linkify/index.js'
import Tooltip from '../../directives/Tooltip/index.js'
import { useIsSmallMobile } from '../../composables/useIsMobile/index.js'
import GenRandomId from '../../utils/GenRandomId.js'
import { getTrapStack } from '../../utils/focusTrap.js'
Expand Down Expand Up @@ -558,7 +630,6 @@ export default {
focus: Focus,
linkify: Linkify,
ClickOutside,
Tooltip,
},
props: {
Expand Down Expand Up @@ -667,6 +738,16 @@ export default {
type: String,
default: '',
},
/**
* Allow to conditionally show the sidebar
* You can also use `v-if` on the sidebar, but using the open prop allow to keep
* the sidebar inside the DOM for performance if it is opened and closed multple times.
*/
open: {
type: Boolean,
default: true,
},
},
emits: [
Expand All @@ -676,10 +757,11 @@ export default {
'opening',
'opened',
'figure-click',
'update:starred',
'update:nameEditable',
'update:name',
'update:active',
'update:name',
'update:nameEditable',
'update:open',
'update:starred',
'submit-name',
'dismiss-editing',
],
Expand Down Expand Up @@ -722,6 +804,10 @@ export default {
isMobile() {
this.toggleFocusTrap()
},
open() {
this.toggleFocusTrap()
},
},
created() {
Expand Down Expand Up @@ -786,7 +872,7 @@ export default {
* Activate focus trap if it is currently needed, otherwise deactivate
*/
toggleFocusTrap() {
if (this.isMobile) {
if (this.open && this.isMobile) {
this.initFocusTrap()
this.focusTrap.activate()
} else {
Expand All @@ -811,8 +897,14 @@ export default {
* The sidebar is opening and the transition is in progress
*
* @type {HTMLElement}
* @deprecated Listen to `update:open` instead
*/
this.$emit('opening', element)
/**
* Current open state emitted after the transitions are finished
* @type {boolean}
*/
this.$emit('update:open', true)
},
onAfterEnter(element) {
/**
Expand All @@ -827,8 +919,10 @@ export default {
* The sidebar is closing and the transition is in progress
*
* @type {HTMLElement}
* @deprecated Listen to `update:open` instead
*/
this.$emit('closing', element)
this.$emit('update:open', false)
},
onAfterLeave(element) {
/**
Expand All @@ -855,6 +949,7 @@ export default {
* @type {Event}
*/
this.$emit('close', e)
this.$emit('update:open', false)
},
/**
Expand Down

0 comments on commit cf4f2bf

Please sign in to comment.