1. added focustrapAutoFocus 2. focustrapAutoFocus is props autoFocus …

…from the column
sankarseran · Feb 6, 2023 · 334afa8 · 334afa8
1 parent f54f71d
commit 334afa8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/components/datatable/ColumnFilter.vue b/components/datatable/ColumnFilter.vue
@@ -25,7 +25,7 @@
                     v-if="overlayVisible"
                     :ref="overlayRef"
                     :id="overlayId"
-                    v-focustrap="{ autoFocus: true }"
+                    v-focustrap="{ autoFocus: focustrapAutoFocus }"
                     :aria-modal="overlayVisible"
                     role="dialog"
                     :class="overlayClass"
@@ -145,6 +145,10 @@ export default {
             type: Boolean,
             default: true
         },
+        autoFocus: {
+            type: Boolean,
+            default: true
+        },
         showClearButton: {
             type: Boolean,
             default: true
@@ -199,7 +203,8 @@ export default {
         return {
             overlayVisible: false,
             defaultMatchMode: null,
-            defaultOperator: null
+            defaultOperator: null,
+            focustrapAutoFocus: this.autoFocus
         };
     },
     overlay: null,

diff --git a/components/datatable/HeaderCell.vue b/components/datatable/HeaderCell.vue
@@ -45,6 +45,7 @@
                 :showApplyButton="columnProp('showApplyButton')"
                 :showMatchModes="columnProp('showFilterMatchModes')"
                 :showAddButton="columnProp('showAddButton')"
+                :autoFocus="columnProp('autoFocus')"
                 :matchModeOptions="columnProp('filterMatchModeOptions')"
                 :maxConstraints="columnProp('maxConstraints')"
                 @operator-change="$emit('operator-change', $event)"

diff --git a/components/datatable/TableHeader.vue b/components/datatable/TableHeader.vue
@@ -65,6 +65,7 @@
                             :showApplyButton="columnProp(col, 'showApplyButton')"
                             :showMatchModes="columnProp(col, 'showFilterMatchModes')"
                             :showAddButton="columnProp(col, 'showAddButton')"
+                            :autoFocus="columnProp(col, 'autoFocus')"
                             :matchModeOptions="columnProp(col, 'filterMatchModeOptions')"
                             :maxConstraints="columnProp(col, 'maxConstraints')"
                             @operator-change="$emit('operator-change', $event)"