aleman 1.1.23 → 1.1.25

package/aleman/add-listeners.js

@@ -13,30 +13,14 @@ export const addListeners = ({namedAddons, options, readState, writeState}) => {
     for (const addon of namedAddons) {
         const element = queryElement(addon);
         const events = maybeEvents(addon);
-        const {
-            key,
-            listener,
-            preventDefault,
-        } = addon;
         
         for (const event of events) {
-            element.addEventListener(event, (event) => {
-                if (preventDefault)
-                    event.preventDefault();
-                
-                if (key && event.key !== key)
-                    return;
-                
-                const state = readState();
-                
-                const newState = listener({
-                    event,
-                    state,
-                    options,
-                });
-                
-                writeState(newState);
-            });
+            element.addEventListener(event, createListener({
+                addon,
+                options,
+                readState,
+                writeState,
+            }));
         }
     }
 };
@@ -65,30 +49,48 @@ export const splitAddons = (addons) => {
 export const addGlobalListeners = ({globalAddons, options, readState, writeState}) => {
     for (const addon of globalAddons) {
         const events = maybeEvents(addon);
-        const {
-            key,
-            listener,
-            preventDefault,
-        } = addon;
         
         for (const event of events) {
-            document.addEventListener(event, (event) => {
-                if (preventDefault)
-                    event.preventDefault();
-                
-                if (key && event.key !== key)
-                    return;
-                
-                const state = readState();
-                
-                const newState = listener({
-                    event,
-                    state,
-                    options,
-                });
-                
-                writeState(newState);
-            });
+            document.addEventListener(event, createListener({
+                addon,
+                options,
+                readState,
+                writeState,
+            }));
         }
     }
 };
+
+const createListener = ({options, addon, readState, writeState}) => (event) => {
+    const {
+        key,
+        listener,
+        preventDefault,
+        filter,
+    } = addon;
+    
+    if (preventDefault)
+        event.preventDefault();
+    
+    if (key && event.key !== key)
+        return;
+    
+    const state = readState();
+    
+    const is = filter?.({
+        event,
+        state,
+        options,
+    });
+    
+    if (filter && !is)
+        return false;
+    
+    const newState = listener({
+        event,
+        state,
+        options,
+    });
+    
+    writeState(newState);
+};

package/menu/addons/context-menu.js

@@ -4,12 +4,20 @@ export const events = [
 
 export const preventDefault = true;
 
-export const listener = ({event, state, options}) => {
-    options.beforeShow?.({
+export const filter = ({event, state, options}) => {
+    const {beforeShow} = options;
+    
+    if (!beforeShow)
+        return true;
+    
+    return beforeShow?.({
         ...state,
         x: state.position.left,
         y: state.position.top,
     });
+};
+
+export const listener = ({event, state, options}) => {
     return {
         command: 'show',
         position: {

package/menu/addons/f9.js

@@ -1,11 +1,19 @@
 export const key = 'F9';
 
-export const listener = ({options, state}) => {
-    options.beforeShow?.({
+export const filter = ({state, options}) => {
+    const {beforeShow} = options;
+    
+    if (!beforeShow)
+        return true;
+    
+    return options.beforeShow?.({
         ...state,
         x: state.position.left,
         y: state.position.top,
     });
+};
+
+export const listener = ({options, state}) => {
     return {
         command: 'show',
         position: {

package/package.json

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