aleman 1.4.1 → 1.4.2

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.09.07, v1.4.2
+
+feature:
+- 1a1899e aleman: menu: item-click: no data-menu find on element
+
 2025.09.06, v1.4.1
 
 feature:

package/menu/addons/item-click.js

@@ -7,9 +7,8 @@ export const createItemClick = (name) => ({
 });
 
 const listener = ({event, options}) => {
-    const menuItemElement = document.elementFromPoint(event.clientX, event.clientY);
-    const {menuPath} = menuItemElement.dataset;
     const {menu} = options;
+    const menuPath = getMenuPath(event);
     const fn = jessy(menuPath, menu);
     
     setTimeout(fn);
@@ -21,3 +20,14 @@ const listener = ({event, options}) => {
         showSubmenu: false,
     };
 };
+
+function getMenuPath(event) {
+    let menuItemElement = document.elementFromPoint(event.clientX, event.clientY);
+    const {menuPath} = menuItemElement.dataset;
+    
+    if (!menuPath)
+        menuItemElement = menuItemElement.querySelector('[data-menu-path]');
+    
+    return menuItemElement.dataset.menuPath;
+}
+

package/menu/rules/build-menu/index.js

@@ -1,7 +1,7 @@
 import {template} from 'putout';
-import {checkDataName} from '../check-data-name.js';
 import {
     appendAttributeValue,
+    hasDataName,
     setAttributeValue,
 } from '../jsx-operator.js';
 
@@ -68,7 +68,7 @@ export const traverse = ({options, push}) => ({
             icon = false,
         } = options;
         
-        if (!checkDataName(path, name))
+        if (!hasDataName(path, name))
             return;
         
         if (path.node.children.length)

package/menu/rules/hide-submenu/fixture/no-menu.js

@@ -0,0 +1,16 @@
+<ul data-name="hello" className="menu menu-hidden">
+    <li data-menu-path="Upload" data-name="menu-item" className="menu-item icon icon-view">
+        <label data-menu-path="Upload">Upload</label>
+    </li>
+    <li data-menu-path="New" data-name="menu-item" className="menu-item icon icon-edit menu-item-selected menu-submenu-show">
+        <label data-menu-path="New">New</label>
+        <ul data-name="menu" className="menu menu-hidden">
+            <li data-menu-path="New.File" data-name="menu-item" className="menu-item icon icon-view">
+                <label data-menu-path="New.File">File</label>
+            </li>
+            <li data-menu-path="New.Directory" data-name="menu-item" className="menu-item icon icon-edit">
+                <label data-menu-path="New.Directory">Directory</label>
+            </li>
+        </ul>
+    </li>
+</ul>;

package/menu/rules/hide-submenu/index.js

@@ -1,8 +1,8 @@
-import {checkDataName} from '../check-data-name.js';
 import {
-    checkTagName,
-    containsClass,
-    removeClass,
+    hasTagName,
+    containsClassName,
+    removeClassName,
+    hasDataName,
 } from '../jsx-operator.js';
 
 const CLASS = 'menu-submenu-show';
@@ -10,7 +10,7 @@ const CLASS = 'menu-submenu-show';
 export const report = () => `Hide submenu`;
 
 export const fix = (path) => {
-    removeClass(path, CLASS);
+    removeClassName(path, CLASS);
 };
 
 export const traverse = ({push, options}) => ({
@@ -21,13 +21,13 @@ export const traverse = ({push, options}) => ({
         if (showSubmenu)
             return;
         
-        if (!checkTagName(path, 'li'))
+        if (!hasTagName(path, 'li'))
             return;
         
-        if (!checkDataName(parentPath, name))
+        if (!hasDataName(parentPath, name))
             return false;
         
-        if (containsClass(path, CLASS))
+        if (containsClassName(path, CLASS))
             push(path);
     },
 });

package/menu/rules/jsx-operator.js

@@ -52,9 +52,6 @@ export function appendAttributeValue(path, name, value) {
     const node = path.node || path;
     const attributeNode = getAttributeNode(node, name);
     
-    if (!attributeNode)
-        return;
-    
     if (attributeNode.value.value.includes(value))
         return;
     
@@ -62,9 +59,6 @@ export function appendAttributeValue(path, name, value) {
 }
 
 export function setAttributeValue(node, name, value) {
-    if (!node)
-        return;
-    
     node = node.node || node;
     
     const attributeNode = getAttributeNode(node, name);
@@ -73,33 +67,36 @@ export function setAttributeValue(node, name, value) {
         setLiteralValue(attributeNode.value, value);
 }
 
-export function addClass(path, name) {
+export function addClassName(path, name) {
     appendAttributeValue(path, 'className', name);
 }
 
-export function removeClass(path, name) {
+export function removeClassName(path, name) {
     removeAttributeValue(path, 'className', name);
 }
 
-export function containsClass(path, className) {
+export function containsClassName(path, className) {
     const classNameValue = getAttributeValue(path, 'className');
     return classNameValue.includes(className);
 }
 
-export const checkTagName = (path, name) => path.node.openingElement.name.name === name;
+export const hasTagName = (path, name) => path.node.openingElement.name.name === name;
 
 export function removeAttributeValue(path, name, attributeValue) {
     if (!path)
         return;
     
-    const node = path.node || path;
+    const {node} = path;
     const classAttribute = getAttributeNode(node, name);
     
-    if (!classAttribute)
-        return;
-    
     const {value} = classAttribute.value;
     
     if (value.includes(attributeValue))
         setLiteralValue(classAttribute.value, value.replace(RegExp(`\\s?${attributeValue}`), ''));
 }
+
+export function hasDataName(path, value = 'menu') {
+    const attribute = getAttributeValue(path, 'data-name');
+    
+    return attribute === value;
+}

package/menu/rules/menu/index.js

@@ -1,8 +1,8 @@
-import {checkDataName} from '../check-data-name.js';
 import {
-    addClass,
-    containsClass,
-    removeClass,
+    addClassName,
+    containsClassName,
+    hasDataName,
+    removeClassName,
 } from '../jsx-operator.js';
 
 export const report = ({command}) => {
@@ -13,21 +13,21 @@ export const report = ({command}) => {
 
 export const fix = ({path, command}) => {
     if (command === 'show') {
-        removeClass(path, 'menu-hidden');
+        removeClassName(path, 'menu-hidden');
         return;
     }
     
-    addClass(path, 'menu-hidden');
+    addClassName(path, 'menu-hidden');
 };
 
 export const traverse = ({push, options}) => ({
     JSXElement(path) {
         const {name, command} = options;
         
-        if (!checkDataName(path, name))
+        if (!hasDataName(path, name))
             return false;
         
-        const shown = !containsClass(path, 'menu-hidden');
+        const shown = !containsClassName(path, 'menu-hidden');
         
         if (command === 'show' && !shown || command === 'hide' && shown)
             push({

package/menu/rules/select/index.js

@@ -1,8 +1,8 @@
 import {operator, types} from 'putout';
-import {checkDataName} from '../check-data-name.js';
 import {
     appendAttributeValue,
     getAttributePath,
+    hasDataName,
     removeAttributeValue,
 } from '../jsx-operator.js';
 
@@ -43,7 +43,7 @@ export const traverse = ({options, push}) => ({
         if (!isJSXElement(parentParentPath))
             return;
         
-        if (!checkDataName(parentParentPath, name))
+        if (!hasDataName(parentParentPath, name))
             return;
         
         const children = parentParentPath.get('children').filter(isJSXElement);

package/menu/rules/set-position/index.js

@@ -1,8 +1,8 @@
 import {types} from 'putout';
-import {checkDataName} from '../check-data-name.js';
 import {
     getAttributePath,
     getAttributeValue,
+    hasDataName,
     setAttributeValue,
 } from '../jsx-operator.js';
 
@@ -33,7 +33,7 @@ export const traverse = ({options, push}) => ({
         const {name = 'menu', position = {}} = options;
         const {x = 0, y = 20} = position;
         
-        if (!checkDataName(path, name))
+        if (!hasDataName(path, name))
             return;
         
         const styleAttributeValue = getAttributeValue(path, 'style');

package/menu/rules/submenu/index.js

@@ -1,8 +1,8 @@
 import {operator, types} from 'putout';
-import {checkDataName} from '../check-data-name.js';
 import {
     getAttributePath,
     getAttributeValue,
+    hasDataName,
     removeAttributeValue,
 } from '../jsx-operator.js';
 
@@ -48,7 +48,7 @@ export const traverse = ({options, push}) => ({
         
         const openingElementPath = path.parentPath.parentPath.get('openingElement');
         
-        if (!checkDataName(openingElementPath))
+        if (!hasDataName(openingElementPath))
             return;
         
         const children = path.parentPath

package/menu/rules/unselect-all/index.js

@@ -1,5 +1,5 @@
 import {operator, types} from 'putout';
-import {checkDataName} from '../check-data-name.js';
+import {hasDataName} from '../jsx-operator.js';
 
 const {isJSXElement} = types;
 const {setLiteralValue} = operator;
@@ -28,7 +28,7 @@ export const traverse = ({push, options}) => ({
         
         const openingElementPath = path.parentPath.parentPath.get('openingElement');
         
-        if (!checkDataName(openingElementPath, name))
+        if (!hasDataName(openingElementPath, name))
             return;
         
         const children = path.parentPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aleman",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout-based framework for web",

package/menu/rules/check-data-name.js

@@ -1,7 +0,0 @@
-import {getAttributeValue} from './jsx-operator.js';
-
-export function checkDataName(path, value = 'menu') {
-    const attribute = getAttributeValue(path, 'data-name');
-    
-    return attribute === value;
-}