aleman 1.1.19 → 1.1.21

package/menu/addons/index.js

@@ -5,8 +5,6 @@ import * as down from './down.js';
 import * as up from './up.js';
 import * as f9 from './f9.js';
 import * as enter from './enter.js';
-import * as mouseEnter from './mouse-enter.js';
-import * as itemClick from './item-click.js';
 
 export const addons = [
     contextMenu,
@@ -16,6 +14,4 @@ export const addons = [
     up,
     f9,
     enter,
-    mouseEnter,
-    itemClick,
 ];

package/menu/addons/item-click.js

@@ -1,7 +1,10 @@
-export const name = 'menu';
-export const events = ['click'];
+export const createItemClick = (name) => ({
+    name,
+    events: ['click'],
+    listener,
+});
 
-export const listener = ({event, options}) => {
+const listener = ({event, options}) => {
     const menuItemElement = document.elementFromPoint(event.clientX, event.clientY);
     const name = menuItemElement.textContent.trim();
     const {menu} = options;

package/menu/addons/mouse-enter.js

@@ -1,5 +1,7 @@
-export const name = 'menu';
-export const events = ['mouseenter'];
-export const listener = () => ({
-    index: -1,
+export const createMouseEnter = (name) => ({
+    name,
+    events: ['mouseenter'],
+    listener: () => ({
+        index: -1,
+    }),
 });

package/menu/hydrate-menu.js

@@ -2,6 +2,8 @@ import {rules} from './rules/index.js';
 import {hydrate} from '../aleman/index.js';
 import {initState} from './state.js';
 import {addons} from './addons/index.js';
+import {createMouseEnter} from './addons/mouse-enter.js';
+import {createItemClick} from './addons/item-click.js';
 
 const {assign} = Object;
 
@@ -14,7 +16,11 @@ export const hydrateMenu = (element, options, menu) => {
     const {run} = hydrate(element, {
         options,
         state,
-        addons,
+        addons: [
+            createMouseEnter(options.name),
+            createItemClick(options.name),
+            ...addons,
+        ],
         rules,
         stateName: `aleman-state-${options.name}`,
     });

package/menu/menu.js

@@ -46,7 +46,7 @@ function createHydrate(name) {
     const section = document.createElement('section');
     
     section.dataset.name = `aleman-hydrate-${name}`;
-    section.innerHTML = `<ul data-name="menu" class="menu menu-hidden"></ul>`;
+    section.innerHTML = `<ul data-name="${name}" class="menu menu-hidden"></ul>`;
     document.body.append(section);
     
     return section;

package/menu/rules/select/index.js

@@ -1,4 +1,5 @@
 import {operator, types} from 'putout';
+import {checkDataName} from '../check-data-name.js';
 
 const {isJSXElement} = types;
 const {setLiteralValue} = operator;
@@ -15,15 +16,15 @@ export const fix = ({path, prev, next}) => {
 
 export const traverse = ({options, push}) => ({
     JSXOpeningElement(path) {
+        const {name = 'menu', index = 1} = options;
+        
         if (path.node.name.name !== 'li')
             return;
         
-        const {index = 1} = options;
-        
         if (!isJSXElement(path.parentPath.parentPath))
             return;
         
-        if (!checkDataName(path.parentPath.parentPath))
+        if (!checkDataName(path.parentPath.parentPath, name))
             return;
         
         const children = path.parentPath
@@ -56,19 +57,6 @@ export const traverse = ({options, push}) => ({
     },
 });
 
-function checkDataName(path) {
-    const attributes = path.get('openingElement.attributes');
-    
-    for (const attr of attributes) {
-        const {name, value} = attr.node;
-        
-        if (name.name === 'data-name')
-            return value.value === 'menu';
-    }
-    
-    return false;
-}
-
 function unselect(path) {
     if (!path)
         return;
@@ -83,3 +71,4 @@ function unselect(path) {
             setLiteralValue(value, value.value.replace(' menu-item-selected', ''));
     }
 }
+

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

@@ -29,10 +29,10 @@ export const fix = ({path, attr, left, top}) => {
 
 export const traverse = ({options, push}) => ({
     JSXOpeningElement(path) {
-        const {position = {}} = options;
+        const {name = 'menu', position = {}} = options;
         const {left = 0, top = 20} = position;
         
-        if (!checkDataName(path.parentPath, 'menu'))
+        if (!checkDataName(path.parentPath, name))
             return;
         
         for (const attr of path.node.attributes) {

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

@@ -26,7 +26,7 @@ export const traverse = ({push, options}) => ({
         if (!isJSXElement(path.parentPath.parentPath))
             return;
         
-        if (!checkDataName(path.parentPath.parentPath))
+        if (!checkDataName(path.parentPath.parentPath, name))
             return;
         
         const children = path.parentPath

package/package.json

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