aleman 1.1.24 → 1.1.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,39 +13,14 @@ export const addListeners = ({namedAddons, options, readState, writeState}) => {
13
13
  for (const addon of namedAddons) {
14
14
  const element = queryElement(addon);
15
15
  const events = maybeEvents(addon);
16
- const {
17
- key,
18
- listener,
19
- preventDefault,
20
- filter,
21
- } = addon;
22
16
 
23
17
  for (const event of events) {
24
- element.addEventListener(event, (event) => {
25
- if (preventDefault)
26
- event.preventDefault();
27
-
28
- if (key && event.key !== key)
29
- return;
30
-
31
- const state = readState();
32
- const is = filter?.({
33
- event,
34
- state,
35
- options,
36
- });
37
-
38
- if (filter && !is)
39
- return false;
40
-
41
- const newState = listener({
42
- event,
43
- state,
44
- options,
45
- });
46
-
47
- writeState(newState);
48
- });
18
+ element.addEventListener(event, createListener({
19
+ addon,
20
+ options,
21
+ readState,
22
+ writeState,
23
+ }));
49
24
  }
50
25
  }
51
26
  };
@@ -74,31 +49,48 @@ export const splitAddons = (addons) => {
74
49
  export const addGlobalListeners = ({globalAddons, options, readState, writeState}) => {
75
50
  for (const addon of globalAddons) {
76
51
  const events = maybeEvents(addon);
77
- const {
78
- key,
79
- listener,
80
- preventDefault,
81
- } = addon;
82
52
 
83
53
  for (const event of events) {
84
- document.addEventListener(event, (event) => {
85
- if (preventDefault)
86
- event.preventDefault();
87
-
88
- if (key && event.key !== key)
89
- return;
90
-
91
- const state = readState();
92
-
93
- const newState = listener({
94
- event,
95
- state,
96
- options,
97
- });
98
-
99
- writeState(newState);
100
- });
54
+ document.addEventListener(event, createListener({
55
+ addon,
56
+ options,
57
+ readState,
58
+ writeState,
59
+ }));
101
60
  }
102
61
  }
103
62
  };
104
63
 
64
+ const createListener = ({options, addon, readState, writeState}) => (event) => {
65
+ const {
66
+ key,
67
+ listener,
68
+ preventDefault,
69
+ filter,
70
+ } = addon;
71
+
72
+ if (preventDefault)
73
+ event.preventDefault();
74
+
75
+ if (key && event.key !== key)
76
+ return;
77
+
78
+ const state = readState();
79
+
80
+ const is = filter?.({
81
+ event,
82
+ state,
83
+ options,
84
+ });
85
+
86
+ if (filter && !is)
87
+ return false;
88
+
89
+ const newState = listener({
90
+ event,
91
+ state,
92
+ options,
93
+ });
94
+
95
+ writeState(newState);
96
+ };
@@ -5,14 +5,19 @@ export const events = [
5
5
  export const preventDefault = true;
6
6
 
7
7
  export const filter = ({event, state, options}) => {
8
- return options.beforeShow?.({
8
+ const {beforeShow} = options;
9
+
10
+ if (!beforeShow)
11
+ return true;
12
+
13
+ return beforeShow?.({
9
14
  ...state,
10
- x: state.position.left,
11
- y: state.position.top,
15
+ x: event.clientX,
16
+ y: event.clientY - 14,
12
17
  });
13
18
  };
14
19
 
15
- export const listener = ({event, state, options}) => {
20
+ export const listener = ({event}) => {
16
21
  return {
17
22
  command: 'show',
18
23
  position: {
package/menu/addons/f9.js CHANGED
@@ -1,6 +1,11 @@
1
1
  export const key = 'F9';
2
2
 
3
3
  export const filter = ({state, options}) => {
4
+ const {beforeShow} = options;
5
+
6
+ if (!beforeShow)
7
+ return true;
8
+
4
9
  return options.beforeShow?.({
5
10
  ...state,
6
11
  x: state.position.left,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aleman",
3
- "version": "1.1.24",
3
+ "version": "1.1.26",
4
4
  "type": "module",
5
5
  "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
6
6
  "description": "🐊Putout-based framework for web",