aloha-vue 1.0.147 → 1.0.148

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.147",
+  "version": "1.0.148",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

package/src/AMenu/AMenu.js

@@ -189,15 +189,17 @@ export default {
 
     return {
       attributesBlockerClick,
+      dataKeyById,
+      dataProParent,
+      dataProParentList,
       idsSearchVisible,
       isButtonToggleVisible,
       isMenuOpen,
       isSearchActive,
-      dataKeyById,
-      dataProParent,
-      dataProParentList,
       modelSearch,
       panelParentsOpen,
+      toggleMenu,
+      togglePanel,
       updateModelSearch,
     };
   },

package/src/AMenu/AMenuPanelLink.js

@@ -10,13 +10,16 @@ import AIcon from "../AIcon/AIcon";
 
 import AFiltersAPI from "../compositionAPI/AFiltersAPI";
 
-import AKeysCode from "../const/AKeysCode";
-import AKeyLabel from "../ui/const/AKeyLabel";
 import AKeyId from "../ui/const/AKeyId";
+import AKeyLabel from "../ui/const/AKeyLabel";
+import AKeyParent from "../ui/const/AKeyParent";
+import AKeysCode from "../const/AKeysCode";
+import {
+  setFocusToFirstLinkInPanel
+} from "./utils/utils";
 import {
   get,
 } from "lodash-es";
-import AKeyParent from "../ui/const/AKeyParent";
 
 
 export default {
@@ -116,14 +119,7 @@ export default {
 
     const openSubMenu = () => {
       togglePanel({ parentId: id.value, isLinkInSearchPanel: isLinkInSearchPanel.value });
-      const PANEL_ID = `#a_menu_panel_${ id.value || "" }`;
-      const PANEL_LINKS_SELECTOR = `${ PANEL_ID } a`;
-      setTimeout(() => {
-        const EL_LINK = document.querySelector(PANEL_LINKS_SELECTOR);
-        if (EL_LINK) {
-          EL_LINK.focus();
-        }
-      });
+      setFocusToFirstLinkInPanel(id.value);
     };
 
     const onKeydown = $event => {

package/src/AMenu/compositionAPI/AMenuPanelsAPI.js

@@ -33,8 +33,10 @@ export default function AMenuPanelsAPI(props, {
     return panelParentsOpenLocal;
   };
 
-  const togglePanel = ({ parentId, isLinkInSearchPanel }) => {
-    if (isLinkInSearchPanel) {
+  const togglePanel = ({ parentIds, parentId, isLinkInSearchPanel }) => {
+    if (parentIds) {
+      panelParentsOpen.value = parentIds;
+    } else if (isLinkInSearchPanel) {
       const PANEL_PARENTS_OPEN = [];
       panelParentsOpen.value = openPanelFromSearch({ parentId, panelParentsOpenLocal: PANEL_PARENTS_OPEN });
     } else {

package/src/AMenu/utils/utils.js

@@ -0,0 +1,10 @@
+export function setFocusToFirstLinkInPanel(panelId = "") {
+  const PANEL_ID = `#a_menu_panel_${ panelId }`;
+  const PANEL_LINKS_SELECTOR = `${ PANEL_ID } a`;
+  setTimeout(() => {
+    const EL_LINK = document.querySelector(PANEL_LINKS_SELECTOR);
+    if (EL_LINK) {
+      EL_LINK.focus();
+    }
+  });
+}