aleman 1.1.20 → 1.1.22

package/menu/addons/context-menu.js

@@ -13,8 +13,8 @@ export const listener = ({event, state, options}) => {
     return {
         command: 'show',
         position: {
-            left: event.clientX,
-            top: event.clientY - 14,
+            x: event.clientX,
+            y: event.clientY - 14,
         },
     };
 };

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/rules/menu/index.js

@@ -1,8 +1,6 @@
-import {operator, types} from 'putout';
+import {operator} from 'putout';
 import {checkDataName} from '../check-data-name.js';
 
-const {isJSXElement} = types;
-
 const {setLiteralValue} = operator;
 
 export const report = ({command}) => {
@@ -51,4 +49,3 @@ export const traverse = ({push, options}) => ({
         }
     },
 });
-

package/menu/rules/select/index.js

@@ -71,4 +71,3 @@ function unselect(path) {
             setLiteralValue(value, value.value.replace(' menu-item-selected', ''));
     }
 }
-

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

@@ -11,8 +11,8 @@ const {setLiteralValue} = operator;
 
 export const report = () => `Set position`;
 
-export const fix = ({path, attr, left, top}) => {
-    const style = `left: ${left}px; top: ${top}px;`;
+export const fix = ({path, attr, x, y}) => {
+    const style = `left: ${x}px; top: ${y}px;`;
     
     if (attr) {
         setLiteralValue(attr.value, style);
@@ -30,7 +30,7 @@ export const fix = ({path, attr, left, top}) => {
 export const traverse = ({options, push}) => ({
     JSXOpeningElement(path) {
         const {name = 'menu', position = {}} = options;
-        const {left = 0, top = 20} = position;
+        const {x = 0, y = 20} = position;
         
         if (!checkDataName(path.parentPath, name))
             return;
@@ -39,24 +39,24 @@ export const traverse = ({options, push}) => ({
             if (attr.name.name !== 'style')
                 continue;
             
-            const [x, y] = parsePosition(attr.value.value);
+            const [x1, y1] = parsePosition(attr.value.value);
             
-            if (x === left && y === top)
+            if (x === x1 && y === y1)
                 return;
             
             push({
                 path,
                 attr,
-                left,
-                top,
+                x,
+                y,
             });
             return;
         }
         
         push({
             path,
-            left,
-            top,
+            x,
+            y,
         });
     },
 });

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

@@ -15,7 +15,7 @@ export const fix = ({path}) => {
 
 export const traverse = ({push, options}) => ({
     JSXOpeningElement(path) {
-        const {index} = options;
+        const {index, name} = options;
         
         if (index !== -1)
             return;

package/menu/state.js

@@ -9,8 +9,8 @@ export const initState = ({menu, name = 'menu'}) => {
         index: -1,
         count,
         position: {
-            left: 0,
-            top: 20,
+            x: 0,
+            y: 20,
         },
     };
 };

package/package.json

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