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