Move function to common utilities

learningequality · Feb 24, 2023 · 577f9a5 · 577f9a5
1 parent 7434f74
commit 577f9a5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/lib/tabs/KTabsPanel.vue b/lib/tabs/KTabsPanel.vue
@@ -18,7 +18,8 @@
 
 <script>
 
-  import { getTabElementId, getTabPanelElementId, getFirstFocusableChild } from './utils';
+  import { getFirstFocusableChild } from '../utils/focusManagement';
+  import { getTabElementId, getTabPanelElementId } from './utils';
 
   /**
    * A part of a tabbed interface that displays

diff --git a/lib/tabs/utils.js b/lib/tabs/utils.js
@@ -19,20 +19,3 @@ export function getTabElementId(tabInterfaceId, tabId) {
 export function getTabPanelElementId(tabInterfaceId, tabId) {
   return getTabElementId(tabInterfaceId, tabId) + '-panel';
 }
-
-/**
- * @param {HTMLElement} parent A parent element
- * @returns {HTMLElement, null} The first focusable child of the parent
- *                              element or `null` when none is found
- */
-export function getFirstFocusableChild(parent) {
-  if (!parent) {
-    console.error(`[getFirstFocusableChild] 'parent' parameter is required`);
-    return null;
-  }
-  // https://gomakethings.com/how-to-get-the-first-and-last-focusable-elements-in-the-dom/
-  const focusableElements = parent.querySelectorAll(
-    'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
-  );
-  return focusableElements.length > 0 ? focusableElements[0] : null;
-}
diff --git a/lib/utils/focusManagement.js b/lib/utils/focusManagement.js
@@ -0,0 +1,16 @@
+/**
+ * @param {HTMLElement} parent A parent element
+ * @returns {HTMLElement, null} The first focusable child of the parent
+ *                              element or `null` when none is found
+ */
+export function getFirstFocusableChild(parent) {
+  if (!parent) {
+    console.error(`[getFirstFocusableChild] 'parent' parameter is required`);
+    return null;
+  }
+  // https://gomakethings.com/how-to-get-the-first-and-last-focusable-elements-in-the-dom/
+  const focusableElements = parent.querySelectorAll(
+    'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
+  );
+  return focusableElements.length > 0 ? focusableElements[0] : null;
+}