@varlet/ui 3.8.1 → 3.8.2

package/es/action-sheet/style/index.mjs

@@ -3,5 +3,5 @@ import '../../icon/icon.css'
 import '../../ripple/ripple.css'
 import '../../popup/popup.css'
 import '../actionSheet.css'
-import '../ActionItemSfc.css'
 import '../ActionSheetSfc.css'
+import '../ActionItemSfc.css'

package/es/index.bundle.mjs

@@ -280,7 +280,7 @@ import './tooltip/style/index.mjs'
 import './uploader/style/index.mjs'
 import './watermark/style/index.mjs'
 
-const version = '3.8.1'
+const version = '3.8.2'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/index.mjs

@@ -186,7 +186,7 @@ export * from './tooltip/index.mjs'
 export * from './uploader/index.mjs'
 export * from './watermark/index.mjs'
 
-const version = '3.8.1'
+const version = '3.8.2'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/menu-select/MenuSelect.mjs

@@ -285,8 +285,31 @@ const __sfc__ = defineComponent({
         return;
       }
       if (key === "ArrowDown" || key === "ArrowUp") {
-        focusChildElementByKey(menu.value.$el, menuOptionsRef.value, key);
+        focusChildElementByKey(
+          menu.value.$el,
+          menuOptionsRef.value,
+          key,
+          (activeElement, nextActiveElement, isActiveInReferenceElements) => {
+            if (isActiveInReferenceElements) {
+              return true;
+            }
+            return getActiveElementParent(activeElement) === getActiveElementParent(nextActiveElement);
+          }
+        );
+      }
+    }
+    function getActiveElementParent(activeElement) {
+      var _a, _b, _c;
+      if (activeElement.classList.contains("var-menu-option--children-trigger")) {
+        return (_a = activeElement.parentNode) == null ? void 0 : _a.parentNode;
+      }
+      if (activeElement.classList.contains("var-checkbox__action")) {
+        const optionElement = (_c = (_b = activeElement.parentNode) == null ? void 0 : _b.parentNode) == null ? void 0 : _c.parentNode;
+        if (optionElement) {
+          return getActiveElementParent(optionElement);
+        }
       }
+      return activeElement.parentNode;
     }
     function allowChildrenClose(option) {
       var _a;

package/es/utils/elements.mjs

@@ -171,37 +171,42 @@ function isDisplayNoneElement(element) {
   return false;
 }
 const focusableSelector = ["button", "input", "select", "textarea", "[tabindex]", "[href]"].map((s) => `${s}:not([disabled])`).join(", ");
-function focusChildElementByKey(hostElement, parentElement, key) {
-  var _a;
+function focusChildElementByKey(referenceElement, parentElement, key, beforeFocus) {
   const focusableElements = Array.from(parentElement.querySelectorAll(focusableSelector)).filter(
     (element) => !isDisplayNoneElement(element)
   );
   if (!focusableElements.length) {
     return;
   }
-  const isActiveHostElement = [hostElement, ...Array.from(hostElement.querySelectorAll(focusableSelector))].findIndex(
+  const isActiveInReferenceElements = [referenceElement, ...Array.from(referenceElement.querySelectorAll(focusableSelector))].findIndex(
     (el) => el === document.activeElement
   ) !== -1;
   const activeElementIndex = Array.from(focusableElements).findIndex((el) => el === document.activeElement);
   if (key === "ArrowDown") {
-    if (isActiveHostElement && activeElementIndex === -1 || activeElementIndex === focusableElements.length - 1) {
-      focusableElements[0].focus();
+    if (isActiveInReferenceElements && activeElementIndex === -1 || activeElementIndex === focusableElements.length - 1) {
+      focus(focusableElements[0]);
       return;
     }
     if (activeElementIndex !== -1 && activeElementIndex < focusableElements.length - 1) {
-      focusableElements[activeElementIndex + 1].focus();
+      focus(focusableElements[activeElementIndex + 1]);
       return;
     }
   }
   if (key === "ArrowUp") {
-    if (isActiveHostElement && activeElementIndex === -1 || activeElementIndex === 0) {
-      (_a = focusableElements[focusableElements.length - 1]) == null ? void 0 : _a.focus();
+    if (isActiveInReferenceElements && activeElementIndex === -1 || activeElementIndex === 0) {
+      focus(focusableElements[focusableElements.length - 1]);
       return;
     }
     if (activeElementIndex > 0) {
-      focusableElements[activeElementIndex - 1].focus();
+      focus(focusableElements[activeElementIndex - 1]);
     }
   }
+  function focus(nextActiveElement) {
+    if (beforeFocus && !beforeFocus(document.activeElement, nextActiveElement, isActiveInReferenceElements)) {
+      return;
+    }
+    nextActiveElement.focus();
+  }
 }
 export {
   focusChildElementByKey,