@testing-library/user-event 14.4.0 → 14.4.3
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.
- package/dist/cjs/clipboard/copy.js +6 -15
- package/dist/cjs/clipboard/cut.js +6 -15
- package/dist/cjs/clipboard/paste.js +6 -14
- package/dist/cjs/convenience/click.js +1 -4
- package/dist/cjs/convenience/hover.js +2 -12
- package/dist/cjs/document/UI.js +94 -0
- package/dist/cjs/document/copySelection.js +37 -0
- package/dist/cjs/document/getValueOrTextContent.js +27 -0
- package/dist/cjs/document/index.js +13 -68
- package/dist/cjs/document/interceptor.js +87 -4
- package/dist/cjs/document/prepareDocument.js +67 -0
- package/dist/cjs/document/trackValue.js +65 -0
- package/dist/cjs/event/behavior/click.js +8 -12
- package/dist/cjs/event/behavior/cut.js +5 -11
- package/dist/cjs/event/behavior/keydown.js +43 -43
- package/dist/cjs/event/behavior/keypress.js +9 -10
- package/dist/cjs/event/behavior/keyup.js +6 -7
- package/dist/cjs/event/behavior/paste.js +7 -12
- package/dist/cjs/event/createEvent.js +37 -28
- package/dist/cjs/event/dispatchEvent.js +21 -2
- package/dist/cjs/event/focus.js +44 -0
- package/dist/cjs/event/index.js +24 -17
- package/dist/cjs/{utils/edit → event}/input.js +50 -47
- package/dist/cjs/{utils/edit/walkRadio.js → event/radio.js} +13 -7
- package/dist/cjs/event/selection/getInputRange.js +20 -0
- package/dist/cjs/event/selection/getTargetTypeAndSelection.js +40 -0
- package/dist/cjs/event/selection/index.js +26 -0
- package/dist/cjs/event/selection/modifySelection.js +30 -0
- package/dist/cjs/event/selection/modifySelectionPerMouse.js +49 -0
- package/dist/cjs/event/selection/moveSelection.js +47 -0
- package/dist/cjs/{utils/focus → event/selection}/resolveCaretPosition.js +11 -19
- package/dist/cjs/event/selection/selectAll.js +47 -0
- package/dist/cjs/event/selection/setSelection.js +30 -0
- package/dist/cjs/event/selection/setSelectionPerMouse.js +90 -0
- package/dist/cjs/event/selection/setSelectionRange.js +40 -0
- package/dist/cjs/event/selection/updateSelectionOnFocus.js +45 -0
- package/dist/cjs/keyboard/index.js +13 -23
- package/dist/cjs/keyboard/parseKeyDef.js +8 -13
- package/dist/cjs/options.js +0 -28
- package/dist/cjs/pointer/index.js +28 -34
- package/dist/cjs/pointer/parseKeyDef.js +1 -9
- package/dist/cjs/setup/directApi.js +6 -6
- package/dist/cjs/setup/index.js +0 -2
- package/dist/cjs/setup/setup.js +69 -38
- package/dist/cjs/system/index.js +4 -2
- package/dist/cjs/system/keyboard.js +32 -32
- package/dist/cjs/system/pointer/buttons.js +3 -1
- package/dist/cjs/system/pointer/device.js +3 -1
- package/dist/cjs/system/pointer/index.js +82 -79
- package/dist/cjs/system/pointer/mouse.js +97 -81
- package/dist/cjs/system/pointer/pointer.js +45 -46
- package/dist/cjs/system/pointer/shared.js +10 -0
- package/dist/cjs/utility/clear.js +10 -11
- package/dist/cjs/utility/selectOptions.js +17 -19
- package/dist/cjs/utility/type.js +6 -15
- package/dist/cjs/utility/upload.js +9 -15
- package/dist/cjs/utils/dataTransfer/Clipboard.js +11 -21
- package/dist/cjs/utils/dataTransfer/DataTransfer.js +22 -19
- package/dist/cjs/utils/edit/isEditable.js +6 -10
- package/dist/cjs/utils/edit/maxLength.js +6 -16
- package/dist/cjs/utils/edit/setFiles.js +4 -2
- package/dist/cjs/utils/edit/{buildTimeValue.js → timeValue.js} +6 -0
- package/dist/cjs/utils/focus/cursor.js +2 -17
- package/dist/cjs/utils/focus/getActiveElement.js +3 -2
- package/dist/cjs/utils/focus/selection.js +1 -266
- package/dist/cjs/utils/index.js +7 -32
- package/dist/cjs/utils/keyDef/readNextDescriptor.js +5 -3
- package/dist/cjs/utils/misc/isDisabled.js +2 -1
- package/dist/cjs/utils/misc/isVisible.js +1 -1
- package/dist/cjs/utils/misc/level.js +4 -6
- package/dist/cjs/utils/pointer/cssPointerEvents.js +26 -32
- package/dist/esm/clipboard/copy.js +6 -15
- package/dist/esm/clipboard/cut.js +6 -15
- package/dist/esm/clipboard/paste.js +6 -14
- package/dist/esm/convenience/click.js +1 -4
- package/dist/esm/convenience/hover.js +2 -12
- package/dist/esm/document/UI.js +79 -0
- package/dist/esm/document/copySelection.js +33 -0
- package/dist/esm/document/getValueOrTextContent.js +23 -0
- package/dist/esm/document/index.js +4 -66
- package/dist/esm/document/interceptor.js +85 -5
- package/dist/esm/document/prepareDocument.js +63 -0
- package/dist/esm/document/trackValue.js +59 -0
- package/dist/esm/event/behavior/click.js +8 -12
- package/dist/esm/event/behavior/cut.js +5 -11
- package/dist/esm/event/behavior/keydown.js +36 -36
- package/dist/esm/event/behavior/keypress.js +9 -10
- package/dist/esm/event/behavior/keyup.js +6 -7
- package/dist/esm/event/behavior/paste.js +7 -12
- package/dist/esm/event/createEvent.js +37 -28
- package/dist/esm/event/dispatchEvent.js +20 -3
- package/dist/esm/event/focus.js +39 -0
- package/dist/esm/event/index.js +14 -19
- package/dist/esm/{utils/edit → event}/input.js +37 -34
- package/dist/esm/{utils/edit/walkRadio.js → event/radio.js} +13 -7
- package/dist/esm/event/selection/getInputRange.js +16 -0
- package/dist/esm/event/selection/getTargetTypeAndSelection.js +36 -0
- package/dist/esm/event/selection/index.js +9 -0
- package/dist/esm/event/selection/modifySelection.js +26 -0
- package/dist/esm/event/selection/modifySelectionPerMouse.js +45 -0
- package/dist/esm/event/selection/moveSelection.js +43 -0
- package/dist/esm/{utils/focus → event/selection}/resolveCaretPosition.js +11 -19
- package/dist/esm/event/selection/selectAll.js +42 -0
- package/dist/esm/event/selection/setSelection.js +26 -0
- package/dist/esm/event/selection/setSelectionPerMouse.js +86 -0
- package/dist/esm/event/selection/setSelectionRange.js +36 -0
- package/dist/esm/event/selection/updateSelectionOnFocus.js +41 -0
- package/dist/esm/keyboard/index.js +13 -23
- package/dist/esm/keyboard/parseKeyDef.js +8 -13
- package/dist/esm/options.js +1 -26
- package/dist/esm/pointer/index.js +28 -34
- package/dist/esm/pointer/parseKeyDef.js +1 -9
- package/dist/esm/setup/directApi.js +6 -6
- package/dist/esm/setup/index.js +0 -1
- package/dist/esm/setup/setup.js +63 -33
- package/dist/esm/system/index.js +4 -2
- package/dist/esm/system/keyboard.js +32 -32
- package/dist/esm/system/pointer/buttons.js +3 -1
- package/dist/esm/system/pointer/device.js +3 -1
- package/dist/esm/system/pointer/index.js +83 -79
- package/dist/esm/system/pointer/mouse.js +95 -79
- package/dist/esm/system/pointer/pointer.js +44 -45
- package/dist/esm/system/pointer/shared.js +6 -0
- package/dist/esm/utility/clear.js +10 -11
- package/dist/esm/utility/selectOptions.js +17 -19
- package/dist/esm/utility/type.js +6 -15
- package/dist/esm/utility/upload.js +9 -15
- package/dist/esm/utils/dataTransfer/Clipboard.js +11 -21
- package/dist/esm/utils/dataTransfer/DataTransfer.js +22 -19
- package/dist/esm/utils/edit/isEditable.js +4 -8
- package/dist/esm/utils/edit/maxLength.js +5 -16
- package/dist/esm/utils/edit/setFiles.js +4 -2
- package/dist/esm/utils/edit/{buildTimeValue.js → timeValue.js} +6 -1
- package/dist/esm/utils/focus/cursor.js +2 -17
- package/dist/esm/utils/focus/getActiveElement.js +3 -2
- package/dist/esm/utils/focus/selection.js +3 -260
- package/dist/esm/utils/index.js +4 -11
- package/dist/esm/utils/keyDef/readNextDescriptor.js +5 -3
- package/dist/esm/utils/misc/isDisabled.js +2 -1
- package/dist/esm/utils/misc/isVisible.js +1 -1
- package/dist/esm/utils/misc/level.js +4 -6
- package/dist/esm/utils/pointer/cssPointerEvents.js +26 -32
- package/dist/types/clipboard/copy.d.ts +1 -1
- package/dist/types/clipboard/cut.d.ts +1 -1
- package/dist/types/clipboard/paste.d.ts +1 -1
- package/dist/types/convenience/click.d.ts +1 -1
- package/dist/types/convenience/hover.d.ts +1 -1
- package/dist/types/document/UI.d.ts +42 -0
- package/dist/types/{utils/focus → document}/copySelection.d.ts +0 -0
- package/dist/types/document/getValueOrTextContent.d.ts +1 -0
- package/dist/types/document/index.d.ts +5 -10
- package/dist/types/document/interceptor.d.ts +3 -0
- package/dist/types/document/prepareDocument.d.ts +8 -0
- package/dist/types/document/trackValue.d.ts +17 -0
- package/dist/types/event/behavior/registry.d.ts +2 -2
- package/dist/types/event/dispatchEvent.d.ts +5 -2
- package/dist/types/event/focus.d.ts +5 -0
- package/dist/types/event/index.d.ts +6 -4
- package/dist/types/event/input.d.ts +2 -0
- package/dist/types/event/radio.d.ts +4 -0
- package/dist/types/event/selection/getInputRange.d.ts +5 -0
- package/dist/types/event/selection/getTargetTypeAndSelection.d.ts +10 -0
- package/dist/types/event/selection/index.d.ts +15 -0
- package/dist/types/event/selection/modifySelection.d.ts +8 -0
- package/dist/types/event/selection/modifySelectionPerMouse.d.ts +7 -0
- package/dist/types/event/selection/moveSelection.d.ts +4 -0
- package/dist/types/{utils/focus → event/selection}/resolveCaretPosition.d.ts +0 -0
- package/dist/types/{utils/focus → event/selection}/selectAll.d.ts +0 -0
- package/dist/types/event/selection/setSelection.d.ts +10 -0
- package/dist/types/event/selection/setSelectionPerMouse.d.ts +8 -0
- package/dist/types/event/selection/setSelectionRange.d.ts +6 -0
- package/dist/types/event/selection/updateSelectionOnFocus.d.ts +5 -0
- package/dist/types/keyboard/index.d.ts +2 -2
- package/dist/types/options.d.ts +0 -8
- package/dist/types/pointer/index.d.ts +3 -3
- package/dist/types/setup/directApi.d.ts +1 -1
- package/dist/types/setup/index.d.ts +2 -15
- package/dist/types/setup/setup.d.ts +25 -7
- package/dist/types/system/keyboard.d.ts +3 -3
- package/dist/types/system/pointer/buttons.d.ts +1 -1
- package/dist/types/system/pointer/index.d.ts +7 -25
- package/dist/types/system/pointer/mouse.d.ts +5 -5
- package/dist/types/system/pointer/pointer.d.ts +7 -7
- package/dist/types/system/pointer/shared.d.ts +20 -0
- package/dist/types/utility/clear.d.ts +1 -1
- package/dist/types/utility/selectOptions.d.ts +1 -1
- package/dist/types/utility/type.d.ts +3 -3
- package/dist/types/utility/upload.d.ts +1 -1
- package/dist/types/utils/click/isClickableInput.d.ts +2 -2
- package/dist/types/utils/edit/isEditable.d.ts +5 -6
- package/dist/types/utils/edit/maxLength.d.ts +14 -1
- package/dist/types/utils/edit/{isValidDateOrTimeValue.d.ts → timeValue.d.ts} +1 -0
- package/dist/types/utils/focus/selection.d.ts +4 -69
- package/dist/types/utils/index.d.ts +2 -9
- package/dist/types/utils/misc/level.d.ts +4 -13
- package/dist/types/utils/misc/wait.d.ts +2 -2
- package/dist/types/utils/pointer/cssPointerEvents.d.ts +4 -4
- package/package.json +29 -4
- package/dist/cjs/document/selection.js +0 -107
- package/dist/cjs/document/setRangeText.js +0 -21
- package/dist/cjs/document/value.js +0 -125
- package/dist/cjs/setup/config.js +0 -7
- package/dist/cjs/utils/edit/getValue.js +0 -35
- package/dist/cjs/utils/edit/isValidDateOrTimeValue.js +0 -11
- package/dist/cjs/utils/focus/blur.js +0 -16
- package/dist/cjs/utils/focus/copySelection.js +0 -46
- package/dist/cjs/utils/focus/focus.js +0 -26
- package/dist/cjs/utils/focus/selectAll.js +0 -54
- package/dist/cjs/utils/misc/eventWrapper.js +0 -15
- package/dist/esm/document/selection.js +0 -99
- package/dist/esm/document/setRangeText.js +0 -17
- package/dist/esm/document/value.js +0 -115
- package/dist/esm/setup/config.js +0 -3
- package/dist/esm/utils/edit/getValue.js +0 -31
- package/dist/esm/utils/edit/isValidDateOrTimeValue.js +0 -7
- package/dist/esm/utils/focus/blur.js +0 -12
- package/dist/esm/utils/focus/copySelection.js +0 -42
- package/dist/esm/utils/focus/focus.js +0 -22
- package/dist/esm/utils/focus/selectAll.js +0 -49
- package/dist/esm/utils/misc/eventWrapper.js +0 -11
- package/dist/types/document/selection.d.ts +0 -29
- package/dist/types/document/setRangeText.d.ts +0 -1
- package/dist/types/document/value.d.ts +0 -26
- package/dist/types/setup/config.d.ts +0 -6
- package/dist/types/utils/edit/buildTimeValue.d.ts +0 -1
- package/dist/types/utils/edit/getValue.d.ts +0 -1
- package/dist/types/utils/edit/input.d.ts +0 -2
- package/dist/types/utils/edit/walkRadio.d.ts +0 -4
- package/dist/types/utils/focus/blur.d.ts +0 -2
- package/dist/types/utils/focus/focus.d.ts +0 -5
- package/dist/types/utils/misc/eventWrapper.d.ts +0 -1
package/dist/esm/setup/setup.js
CHANGED
|
@@ -1,28 +1,50 @@
|
|
|
1
|
-
import { prepareDocument } from '../document/
|
|
2
|
-
import {
|
|
3
|
-
import { defaultOptionsSetup, defaultOptionsDirect } from '../options.js';
|
|
1
|
+
import { prepareDocument } from '../document/prepareDocument.js';
|
|
2
|
+
import { dispatchEvent, dispatchUIEvent } from '../event/dispatchEvent.js';
|
|
4
3
|
import '../utils/click/isClickableInput.js';
|
|
5
4
|
import { attachClipboardStubToView } from '../utils/dataTransfer/Clipboard.js';
|
|
6
|
-
import '../utils/edit/maxLength.js';
|
|
7
5
|
import '../utils/edit/isEditable.js';
|
|
8
|
-
import '
|
|
6
|
+
import '../utils/edit/maxLength.js';
|
|
9
7
|
import '@testing-library/dom/dist/helpers.js';
|
|
10
8
|
import '../utils/keyDef/readNextDescriptor.js';
|
|
11
9
|
import { getDocumentFromNode } from '../utils/misc/getDocumentFromNode.js';
|
|
12
10
|
import { setLevelRef, ApiLevel } from '../utils/misc/level.js';
|
|
13
11
|
import { wait } from '../utils/misc/wait.js';
|
|
12
|
+
import { PointerEventsCheckLevel } from '../options.js';
|
|
13
|
+
import '@testing-library/dom';
|
|
14
|
+
import { defaultKeyMap } from '../keyboard/keyMap.js';
|
|
15
|
+
import { defaultKeyMap as defaultKeyMap$1 } from '../pointer/keyMap.js';
|
|
14
16
|
import { System } from '../system/index.js';
|
|
15
|
-
import { Config } from './config.js';
|
|
16
17
|
import * as api from './api.js';
|
|
17
18
|
import { wrapAsync } from './wrapAsync.js';
|
|
18
19
|
|
|
20
|
+
/**
|
|
21
|
+
* Default options applied when API is called per `userEvent.anyApi()`
|
|
22
|
+
*/ const defaultOptionsDirect = {
|
|
23
|
+
applyAccept: true,
|
|
24
|
+
autoModify: true,
|
|
25
|
+
delay: 0,
|
|
26
|
+
document: globalThis.document,
|
|
27
|
+
keyboardMap: defaultKeyMap,
|
|
28
|
+
pointerMap: defaultKeyMap$1,
|
|
29
|
+
pointerEventsCheck: PointerEventsCheckLevel.EachApiCall,
|
|
30
|
+
skipAutoClose: false,
|
|
31
|
+
skipClick: false,
|
|
32
|
+
skipHover: false,
|
|
33
|
+
writeToClipboard: false,
|
|
34
|
+
advanceTimers: ()=>Promise.resolve()
|
|
35
|
+
};
|
|
36
|
+
/**
|
|
37
|
+
* Default options applied when API is called per `userEvent().anyApi()`
|
|
38
|
+
*/ const defaultOptionsSetup = {
|
|
39
|
+
...defaultOptionsDirect,
|
|
40
|
+
writeToClipboard: true
|
|
41
|
+
};
|
|
19
42
|
function createConfig(options = {}, defaults = defaultOptionsSetup, node) {
|
|
20
43
|
const document = getDocument(options, node, defaults);
|
|
21
44
|
return {
|
|
22
45
|
...defaults,
|
|
23
46
|
...options,
|
|
24
|
-
document
|
|
25
|
-
system: options.system ?? new System()
|
|
47
|
+
document
|
|
26
48
|
};
|
|
27
49
|
}
|
|
28
50
|
/**
|
|
@@ -31,36 +53,36 @@ function createConfig(options = {}, defaults = defaultOptionsSetup, node) {
|
|
|
31
53
|
*/ function setupMain(options = {}) {
|
|
32
54
|
const config = createConfig(options);
|
|
33
55
|
prepareDocument(config.document);
|
|
34
|
-
|
|
56
|
+
var _defaultView;
|
|
57
|
+
const view = (_defaultView = config.document.defaultView) !== null && _defaultView !== void 0 ? _defaultView : /* istanbul ignore next */ globalThis.window;
|
|
35
58
|
attachClipboardStubToView(view);
|
|
36
|
-
return
|
|
59
|
+
return createInstance(config).api;
|
|
37
60
|
}
|
|
38
61
|
/**
|
|
39
62
|
* Setup in direct call per `userEvent.anyApi()`
|
|
40
63
|
*/ function setupDirect({ keyboardState , pointerState , ...options } = {}, node) {
|
|
41
|
-
const config = createConfig(
|
|
42
|
-
...options,
|
|
43
|
-
system: pointerState ?? keyboardState
|
|
44
|
-
}, defaultOptionsDirect, node);
|
|
64
|
+
const config = createConfig(options, defaultOptionsDirect, node);
|
|
45
65
|
prepareDocument(config.document);
|
|
66
|
+
var ref;
|
|
67
|
+
const system = (ref = pointerState !== null && pointerState !== void 0 ? pointerState : keyboardState) !== null && ref !== void 0 ? ref : new System();
|
|
46
68
|
return {
|
|
47
|
-
config,
|
|
48
|
-
|
|
69
|
+
api: createInstance(config, system).api,
|
|
70
|
+
system
|
|
49
71
|
};
|
|
50
72
|
}
|
|
51
73
|
/**
|
|
52
74
|
* Create a set of callbacks with different default settings but the same state.
|
|
53
75
|
*/ function setupSub(options) {
|
|
54
|
-
return
|
|
55
|
-
...this
|
|
76
|
+
return createInstance({
|
|
77
|
+
...this.config,
|
|
56
78
|
...options
|
|
57
|
-
});
|
|
79
|
+
}, this.system).api;
|
|
58
80
|
}
|
|
59
81
|
function wrapAndBindImpl(instance, impl) {
|
|
60
82
|
function method(...args) {
|
|
61
|
-
setLevelRef(instance
|
|
83
|
+
setLevelRef(instance, ApiLevel.Call);
|
|
62
84
|
return wrapAsync(()=>impl.apply(instance, args).then(async (ret)=>{
|
|
63
|
-
await wait(instance
|
|
85
|
+
await wait(instance.config);
|
|
64
86
|
return ret;
|
|
65
87
|
}));
|
|
66
88
|
}
|
|
@@ -69,22 +91,30 @@ function wrapAndBindImpl(instance, impl) {
|
|
|
69
91
|
});
|
|
70
92
|
return method;
|
|
71
93
|
}
|
|
72
|
-
function
|
|
73
|
-
const instance = {
|
|
74
|
-
|
|
75
|
-
|
|
94
|
+
function createInstance(config, system = new System()) {
|
|
95
|
+
const instance = {};
|
|
96
|
+
Object.assign(instance, {
|
|
97
|
+
config,
|
|
98
|
+
dispatchEvent: dispatchEvent.bind(instance),
|
|
99
|
+
dispatchUIEvent: dispatchUIEvent.bind(instance),
|
|
100
|
+
system,
|
|
101
|
+
levelRefs: {},
|
|
76
102
|
...api
|
|
77
|
-
};
|
|
103
|
+
});
|
|
78
104
|
return {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
105
|
+
instance,
|
|
106
|
+
api: {
|
|
107
|
+
...Object.fromEntries(Object.entries(api).map(([name, api])=>[
|
|
108
|
+
name,
|
|
109
|
+
wrapAndBindImpl(instance, api),
|
|
110
|
+
])),
|
|
111
|
+
setup: setupSub.bind(instance)
|
|
112
|
+
}
|
|
84
113
|
};
|
|
85
114
|
}
|
|
86
115
|
function getDocument(options, node, defaults) {
|
|
87
|
-
|
|
116
|
+
var _document, ref;
|
|
117
|
+
return (ref = (_document = options.document) !== null && _document !== void 0 ? _document : node && getDocumentFromNode(node)) !== null && ref !== void 0 ? ref : defaults.document;
|
|
88
118
|
}
|
|
89
119
|
|
|
90
|
-
export { createConfig, setupDirect, setupMain, setupSub };
|
|
120
|
+
export { createConfig, createInstance, setupDirect, setupMain, setupSub };
|
package/dist/esm/system/index.js
CHANGED
|
@@ -4,8 +4,6 @@ import { PointerHost } from './pointer/index.js';
|
|
|
4
4
|
/**
|
|
5
5
|
* @internal Do not create/alter this by yourself as this type might be subject to changes.
|
|
6
6
|
*/ class System {
|
|
7
|
-
keyboard = new KeyboardHost(this);
|
|
8
|
-
pointer = new PointerHost(this);
|
|
9
7
|
getUIEventModifiers() {
|
|
10
8
|
return {
|
|
11
9
|
altKey: this.keyboard.modifiers.Alt,
|
|
@@ -22,6 +20,10 @@ import { PointerHost } from './pointer/index.js';
|
|
|
22
20
|
modifierSymbolLock: this.keyboard.modifiers.SymbolLock
|
|
23
21
|
};
|
|
24
22
|
}
|
|
23
|
+
constructor(){
|
|
24
|
+
this.keyboard = new KeyboardHost(this);
|
|
25
|
+
this.pointer = new PointerHost(this);
|
|
26
|
+
}
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
export { System };
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import { dispatchUIEvent } from '../event/index.js';
|
|
2
1
|
import '../utils/click/isClickableInput.js';
|
|
3
2
|
import '../utils/dataTransfer/Clipboard.js';
|
|
4
|
-
import '../utils/edit/maxLength.js';
|
|
5
3
|
import '../utils/edit/isEditable.js';
|
|
6
|
-
import '
|
|
4
|
+
import '../utils/edit/maxLength.js';
|
|
7
5
|
import { getActiveElementOrBody } from '../utils/focus/getActiveElement.js';
|
|
8
6
|
import '@testing-library/dom/dist/helpers.js';
|
|
9
7
|
import '../utils/keyDef/readNextDescriptor.js';
|
|
10
8
|
import '../utils/misc/level.js';
|
|
11
9
|
import '../options.js';
|
|
12
10
|
|
|
11
|
+
var _pressed, _code, _code1;
|
|
13
12
|
var DOM_KEY_LOCATION;
|
|
14
13
|
(function(DOM_KEY_LOCATION) {
|
|
15
14
|
DOM_KEY_LOCATION[DOM_KEY_LOCATION["STANDARD"] = 0] = "STANDARD";
|
|
@@ -40,46 +39,26 @@ function isModifierLock(key) {
|
|
|
40
39
|
return modifierLocks.includes(key);
|
|
41
40
|
}
|
|
42
41
|
class KeyboardHost {
|
|
43
|
-
constructor(system){
|
|
44
|
-
this.system = system;
|
|
45
|
-
}
|
|
46
|
-
modifiers = {
|
|
47
|
-
Alt: false,
|
|
48
|
-
AltGraph: false,
|
|
49
|
-
CapsLock: false,
|
|
50
|
-
Control: false,
|
|
51
|
-
Fn: false,
|
|
52
|
-
FnLock: false,
|
|
53
|
-
Meta: false,
|
|
54
|
-
NumLock: false,
|
|
55
|
-
ScrollLock: false,
|
|
56
|
-
Shift: false,
|
|
57
|
-
Symbol: false,
|
|
58
|
-
SymbolLock: false
|
|
59
|
-
};
|
|
60
|
-
pressed = {};
|
|
61
|
-
carryChar = '';
|
|
62
|
-
lastKeydownTarget = undefined;
|
|
63
|
-
modifierLockStart = {};
|
|
64
42
|
isKeyPressed(keyDef) {
|
|
65
43
|
return !!this.pressed[String(keyDef.code)];
|
|
66
44
|
}
|
|
67
45
|
getPressedKeys() {
|
|
68
46
|
return Object.values(this.pressed).map((p)=>p.keyDef);
|
|
69
47
|
}
|
|
70
|
-
/** Press a key */ async keydown(
|
|
48
|
+
/** Press a key */ async keydown(instance, keyDef) {
|
|
71
49
|
const key = String(keyDef.key);
|
|
72
50
|
const code = String(keyDef.code);
|
|
73
|
-
const target = getActiveElementOrBody(config.document);
|
|
51
|
+
const target = getActiveElementOrBody(instance.config.document);
|
|
74
52
|
this.setKeydownTarget(target);
|
|
75
|
-
|
|
53
|
+
var ref;
|
|
54
|
+
(ref = (_pressed = this.pressed)[_code = code]) !== null && ref !== void 0 ? ref : _pressed[_code] = {
|
|
76
55
|
keyDef,
|
|
77
56
|
unpreventedDefault: false
|
|
78
57
|
};
|
|
79
58
|
if (isModifierKey(key)) {
|
|
80
59
|
this.modifiers[key] = true;
|
|
81
60
|
}
|
|
82
|
-
const unprevented = dispatchUIEvent(
|
|
61
|
+
const unprevented = instance.dispatchUIEvent(target, 'keydown', {
|
|
83
62
|
key,
|
|
84
63
|
code
|
|
85
64
|
});
|
|
@@ -87,16 +66,16 @@ class KeyboardHost {
|
|
|
87
66
|
this.modifiers[key] = true;
|
|
88
67
|
this.modifierLockStart[key] = true;
|
|
89
68
|
}
|
|
90
|
-
this.pressed[code].unpreventedDefault
|
|
69
|
+
(_code1 = this.pressed[code]).unpreventedDefault || (_code1.unpreventedDefault = unprevented);
|
|
91
70
|
if (unprevented && this.hasKeyPress(key)) {
|
|
92
|
-
dispatchUIEvent(
|
|
71
|
+
instance.dispatchUIEvent(getActiveElementOrBody(instance.config.document), 'keypress', {
|
|
93
72
|
key,
|
|
94
73
|
code,
|
|
95
74
|
charCode: keyDef.key === 'Enter' ? 13 : String(keyDef.key).charCodeAt(0)
|
|
96
75
|
});
|
|
97
76
|
}
|
|
98
77
|
}
|
|
99
|
-
/** Release a key */ async keyup(
|
|
78
|
+
/** Release a key */ async keyup(instance, keyDef) {
|
|
100
79
|
const key = String(keyDef.key);
|
|
101
80
|
const code = String(keyDef.code);
|
|
102
81
|
const unprevented = this.pressed[code].unpreventedDefault;
|
|
@@ -105,7 +84,7 @@ class KeyboardHost {
|
|
|
105
84
|
if (isModifierKey(key) && !Object.values(this.pressed).find((p)=>p.keyDef.key === key)) {
|
|
106
85
|
this.modifiers[key] = false;
|
|
107
86
|
}
|
|
108
|
-
dispatchUIEvent(
|
|
87
|
+
instance.dispatchUIEvent(getActiveElementOrBody(instance.config.document), 'keyup', {
|
|
109
88
|
key,
|
|
110
89
|
code
|
|
111
90
|
}, !unprevented);
|
|
@@ -126,6 +105,27 @@ class KeyboardHost {
|
|
|
126
105
|
hasKeyPress(key) {
|
|
127
106
|
return (key.length === 1 || key === 'Enter') && !this.modifiers.Control && !this.modifiers.Alt;
|
|
128
107
|
}
|
|
108
|
+
constructor(system){
|
|
109
|
+
this.modifiers = {
|
|
110
|
+
Alt: false,
|
|
111
|
+
AltGraph: false,
|
|
112
|
+
CapsLock: false,
|
|
113
|
+
Control: false,
|
|
114
|
+
Fn: false,
|
|
115
|
+
FnLock: false,
|
|
116
|
+
Meta: false,
|
|
117
|
+
NumLock: false,
|
|
118
|
+
ScrollLock: false,
|
|
119
|
+
Shift: false,
|
|
120
|
+
Symbol: false,
|
|
121
|
+
SymbolLock: false
|
|
122
|
+
};
|
|
123
|
+
this.pressed = {};
|
|
124
|
+
this.carryChar = '';
|
|
125
|
+
this.lastKeydownTarget = undefined;
|
|
126
|
+
this.modifierLockStart = {};
|
|
127
|
+
this.system = system;
|
|
128
|
+
}
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
export { DOM_KEY_LOCATION, KeyboardHost };
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
class Buttons {
|
|
2
|
-
pressed = {};
|
|
3
2
|
getButtons() {
|
|
4
3
|
let v = 0;
|
|
5
4
|
for (const button of Object.keys(this.pressed)){
|
|
@@ -31,6 +30,9 @@ class Buttons {
|
|
|
31
30
|
}
|
|
32
31
|
return undefined;
|
|
33
32
|
}
|
|
33
|
+
constructor(){
|
|
34
|
+
this.pressed = {};
|
|
35
|
+
}
|
|
34
36
|
}
|
|
35
37
|
const MouseButton = {
|
|
36
38
|
primary: 0,
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
class Device {
|
|
2
|
-
pressedKeys = new Set();
|
|
3
2
|
get countPressed() {
|
|
4
3
|
return this.pressedKeys.size;
|
|
5
4
|
}
|
|
@@ -12,6 +11,9 @@ class Device {
|
|
|
12
11
|
removePressed(keyDef) {
|
|
13
12
|
return this.pressedKeys.delete(keyDef.name);
|
|
14
13
|
}
|
|
14
|
+
constructor(){
|
|
15
|
+
this.pressedKeys = new Set();
|
|
16
|
+
}
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
export { Device };
|
|
@@ -3,60 +3,14 @@ import { Device } from './device.js';
|
|
|
3
3
|
import { Mouse } from './mouse.js';
|
|
4
4
|
import { Pointer } from './pointer.js';
|
|
5
5
|
|
|
6
|
+
var _registry, _k;
|
|
6
7
|
class PointerHost {
|
|
7
|
-
constructor(system){
|
|
8
|
-
this.system = system;
|
|
9
|
-
this.buttons = new Buttons();
|
|
10
|
-
this.mouse = new Mouse();
|
|
11
|
-
}
|
|
12
|
-
devices = new class {
|
|
13
|
-
registry = {};
|
|
14
|
-
get(k) {
|
|
15
|
-
this.registry[k] ??= new Device();
|
|
16
|
-
return this.registry[k];
|
|
17
|
-
}
|
|
18
|
-
}();
|
|
19
|
-
pointers = new class {
|
|
20
|
-
registry = {
|
|
21
|
-
mouse: new Pointer({
|
|
22
|
-
pointerId: 1,
|
|
23
|
-
pointerType: 'mouse',
|
|
24
|
-
isPrimary: true
|
|
25
|
-
})
|
|
26
|
-
};
|
|
27
|
-
nextId = 2;
|
|
28
|
-
new(pointerName, keyDef) {
|
|
29
|
-
const isPrimary = keyDef.pointerType !== 'touch' || !Object.values(this.registry).some((p)=>p.pointerType === 'touch' && !p.isCancelled);
|
|
30
|
-
if (!isPrimary) {
|
|
31
|
-
Object.values(this.registry).forEach((p)=>{
|
|
32
|
-
if (p.pointerType === keyDef.pointerType && !p.isCancelled) {
|
|
33
|
-
p.isMultitouch = true;
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
this.registry[pointerName] = new Pointer({
|
|
38
|
-
pointerId: this.nextId++,
|
|
39
|
-
pointerType: keyDef.pointerType,
|
|
40
|
-
isPrimary
|
|
41
|
-
});
|
|
42
|
-
return this.registry[pointerName];
|
|
43
|
-
}
|
|
44
|
-
get(pointerName) {
|
|
45
|
-
if (!this.has(pointerName)) {
|
|
46
|
-
throw new Error(`Trying to access pointer "${pointerName}" which does not exist.`);
|
|
47
|
-
}
|
|
48
|
-
return this.registry[pointerName];
|
|
49
|
-
}
|
|
50
|
-
has(pointerName) {
|
|
51
|
-
return pointerName in this.registry;
|
|
52
|
-
}
|
|
53
|
-
}();
|
|
54
8
|
isKeyPressed(keyDef) {
|
|
55
9
|
return this.devices.get(keyDef.pointerType).isPressed(keyDef);
|
|
56
10
|
}
|
|
57
|
-
async press(
|
|
11
|
+
async press(instance, keyDef, position) {
|
|
58
12
|
const pointerName = this.getPointerName(keyDef);
|
|
59
|
-
const pointer = keyDef.pointerType === 'touch' ? this.pointers.new(pointerName, keyDef).init(
|
|
13
|
+
const pointer = keyDef.pointerType === 'touch' ? this.pointers.new(pointerName, keyDef).init(instance, position) : this.pointers.get(pointerName);
|
|
60
14
|
// TODO: deprecate the following implicit setting of position
|
|
61
15
|
pointer.position = position;
|
|
62
16
|
if (pointer.pointerType !== 'touch') {
|
|
@@ -64,27 +18,27 @@ class PointerHost {
|
|
|
64
18
|
}
|
|
65
19
|
this.devices.get(keyDef.pointerType).addPressed(keyDef);
|
|
66
20
|
this.buttons.down(keyDef);
|
|
67
|
-
pointer.down(
|
|
21
|
+
pointer.down(instance, keyDef);
|
|
68
22
|
if (pointer.pointerType !== 'touch' && !pointer.isPrevented) {
|
|
69
|
-
this.mouse.down(
|
|
23
|
+
this.mouse.down(instance, keyDef, pointer);
|
|
70
24
|
}
|
|
71
25
|
}
|
|
72
|
-
async move(
|
|
26
|
+
async move(instance, pointerName, position) {
|
|
73
27
|
const pointer = this.pointers.get(pointerName);
|
|
74
28
|
// In (some?) browsers this order of events can be observed.
|
|
75
29
|
// This interweaving of events is probably unnecessary.
|
|
76
30
|
// While the order of mouse (or pointer) events is defined per spec,
|
|
77
31
|
// the order in which they interweave/follow on a user interaction depends on the implementation.
|
|
78
|
-
const pointermove = pointer.move(
|
|
79
|
-
const mousemove = pointer.pointerType === 'touch' || pointer.isPrevented && pointer.isDown ? undefined : this.mouse.move(
|
|
80
|
-
pointermove
|
|
81
|
-
mousemove
|
|
82
|
-
pointermove
|
|
83
|
-
mousemove
|
|
84
|
-
pointermove
|
|
85
|
-
mousemove
|
|
32
|
+
const pointermove = pointer.move(instance, position);
|
|
33
|
+
const mousemove = pointer.pointerType === 'touch' || pointer.isPrevented && pointer.isDown ? undefined : this.mouse.move(instance, position);
|
|
34
|
+
pointermove === null || pointermove === void 0 ? void 0 : pointermove.leave();
|
|
35
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.leave();
|
|
36
|
+
pointermove === null || pointermove === void 0 ? void 0 : pointermove.enter();
|
|
37
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.enter();
|
|
38
|
+
pointermove === null || pointermove === void 0 ? void 0 : pointermove.move();
|
|
39
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.move();
|
|
86
40
|
}
|
|
87
|
-
async release(
|
|
41
|
+
async release(instance, keyDef, position) {
|
|
88
42
|
const device = this.devices.get(keyDef.pointerType);
|
|
89
43
|
device.removePressed(keyDef);
|
|
90
44
|
this.buttons.up(keyDef);
|
|
@@ -95,25 +49,25 @@ class PointerHost {
|
|
|
95
49
|
this.mouse.position = position;
|
|
96
50
|
}
|
|
97
51
|
if (device.countPressed === 0) {
|
|
98
|
-
pointer.up(
|
|
52
|
+
pointer.up(instance, keyDef);
|
|
99
53
|
}
|
|
100
54
|
if (pointer.pointerType === 'touch') {
|
|
101
|
-
pointer.release(
|
|
55
|
+
pointer.release(instance);
|
|
102
56
|
}
|
|
103
57
|
if (!pointer.isPrevented) {
|
|
104
58
|
if (pointer.pointerType === 'touch' && !pointer.isMultitouch) {
|
|
105
|
-
const mousemove = this.mouse.move(
|
|
106
|
-
mousemove
|
|
107
|
-
mousemove
|
|
108
|
-
mousemove
|
|
109
|
-
this.mouse.down(
|
|
59
|
+
const mousemove = this.mouse.move(instance, pointer.position);
|
|
60
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.leave();
|
|
61
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.enter();
|
|
62
|
+
mousemove === null || mousemove === void 0 ? void 0 : mousemove.move();
|
|
63
|
+
this.mouse.down(instance, keyDef, pointer);
|
|
110
64
|
}
|
|
111
65
|
if (!pointer.isMultitouch) {
|
|
112
|
-
const mousemove1 = this.mouse.move(
|
|
113
|
-
mousemove1
|
|
114
|
-
mousemove1
|
|
115
|
-
mousemove1
|
|
116
|
-
this.mouse.up(
|
|
66
|
+
const mousemove1 = this.mouse.move(instance, pointer.position);
|
|
67
|
+
mousemove1 === null || mousemove1 === void 0 ? void 0 : mousemove1.leave();
|
|
68
|
+
mousemove1 === null || mousemove1 === void 0 ? void 0 : mousemove1.enter();
|
|
69
|
+
mousemove1 === null || mousemove1 === void 0 ? void 0 : mousemove1.move();
|
|
70
|
+
this.mouse.up(instance, keyDef, pointer);
|
|
117
71
|
}
|
|
118
72
|
}
|
|
119
73
|
}
|
|
@@ -126,16 +80,66 @@ class PointerHost {
|
|
|
126
80
|
resetClickCount() {
|
|
127
81
|
this.mouse.resetClickCount();
|
|
128
82
|
}
|
|
129
|
-
getMouseTarget(
|
|
130
|
-
|
|
83
|
+
getMouseTarget(instance) {
|
|
84
|
+
var _target;
|
|
85
|
+
return (_target = this.mouse.position.target) !== null && _target !== void 0 ? _target : instance.config.document.body;
|
|
131
86
|
}
|
|
132
87
|
setMousePosition(position) {
|
|
133
88
|
this.mouse.position = position;
|
|
134
89
|
this.pointers.get('mouse').position = position;
|
|
135
90
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
91
|
+
constructor(system){
|
|
92
|
+
this.devices = new class {
|
|
93
|
+
get(k) {
|
|
94
|
+
var ref;
|
|
95
|
+
(ref = (_registry = this.registry)[_k = k]) !== null && ref !== void 0 ? ref : _registry[_k] = new Device();
|
|
96
|
+
return this.registry[k];
|
|
97
|
+
}
|
|
98
|
+
constructor(){
|
|
99
|
+
this.registry = {};
|
|
100
|
+
}
|
|
101
|
+
}();
|
|
102
|
+
this.pointers = new class {
|
|
103
|
+
new(pointerName, keyDef) {
|
|
104
|
+
const isPrimary = keyDef.pointerType !== 'touch' || !Object.values(this.registry).some((p)=>p.pointerType === 'touch' && !p.isCancelled);
|
|
105
|
+
if (!isPrimary) {
|
|
106
|
+
Object.values(this.registry).forEach((p)=>{
|
|
107
|
+
if (p.pointerType === keyDef.pointerType && !p.isCancelled) {
|
|
108
|
+
p.isMultitouch = true;
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
this.registry[pointerName] = new Pointer({
|
|
113
|
+
pointerId: this.nextId++,
|
|
114
|
+
pointerType: keyDef.pointerType,
|
|
115
|
+
isPrimary
|
|
116
|
+
});
|
|
117
|
+
return this.registry[pointerName];
|
|
118
|
+
}
|
|
119
|
+
get(pointerName) {
|
|
120
|
+
if (!this.has(pointerName)) {
|
|
121
|
+
throw new Error(`Trying to access pointer "${pointerName}" which does not exist.`);
|
|
122
|
+
}
|
|
123
|
+
return this.registry[pointerName];
|
|
124
|
+
}
|
|
125
|
+
has(pointerName) {
|
|
126
|
+
return pointerName in this.registry;
|
|
127
|
+
}
|
|
128
|
+
constructor(){
|
|
129
|
+
this.registry = {
|
|
130
|
+
mouse: new Pointer({
|
|
131
|
+
pointerId: 1,
|
|
132
|
+
pointerType: 'mouse',
|
|
133
|
+
isPrimary: true
|
|
134
|
+
})
|
|
135
|
+
};
|
|
136
|
+
this.nextId = 2;
|
|
137
|
+
}
|
|
138
|
+
}();
|
|
139
|
+
this.system = system;
|
|
140
|
+
this.buttons = new Buttons();
|
|
141
|
+
this.mouse = new Mouse();
|
|
142
|
+
}
|
|
139
143
|
}
|
|
140
144
|
|
|
141
|
-
export { PointerHost
|
|
145
|
+
export { PointerHost };
|