Browse Source

fix(nc-gui): return if expanded form is active for Enter & Escape on date picker

pull/4482/head
Wing-Kam Wong 2 years ago
parent
commit
21c0be04a2
  1. 8
      packages/nc-gui/components/cell/DatePicker.vue

8
packages/nc-gui/components/cell/DatePicker.vue

@ -76,6 +76,10 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
switch (e.key) { switch (e.key) {
case 'Enter': case 'Enter':
e.stopPropagation() e.stopPropagation()
// if expanded form is active skip resetting the active cell
if (document.querySelector('.nc-drawer-expanded-form.active')) {
return
}
if (!open.value) { if (!open.value) {
// open date picker // open date picker
open.value = true open.value = true
@ -89,6 +93,10 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
} }
break break
case 'Escape': case 'Escape':
// if expanded form is active skip resetting the active cell
if (document.querySelector('.nc-drawer-expanded-form.active')) {
return
}
if (open.value) { if (open.value) {
e.stopPropagation() e.stopPropagation()
open.value = false open.value = false

Loading…
Cancel
Save