@flighthq/textinput 0.3.0-next.906.07cea63 → 0.3.1-next.209.43ef1bc
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textInputManager.d.ts","sourceRoot":"","sources":["../src/textInputManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,iBAAiB,EAEjB,QAAQ,EACR,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAI7D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,MAAM,IAAI,CAWrG;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAKzD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKlF;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"textInputManager.d.ts","sourceRoot":"","sources":["../src/textInputManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,iBAAiB,EAEjB,QAAQ,EACR,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAI7D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,MAAM,IAAI,CAWrG;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAKzD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKlF;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAKT;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,QAAQ,EAChB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,MAAM,UAAQ,EACd,UAAU,SAAI,GACb,IAAI,CAYN;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAOlG;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAI1F;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,CAOhF"}
|
package/dist/textInputManager.js
CHANGED
|
@@ -35,7 +35,8 @@ export function dispatchTextInputKeyDown(manager, data, clipboardText, onCopy) {
|
|
|
35
35
|
const target = getTextInputFocusTarget(manager);
|
|
36
36
|
if (target === null)
|
|
37
37
|
return false;
|
|
38
|
-
|
|
38
|
+
const layout = getRichTextRuntime(target).textLayout ?? undefined;
|
|
39
|
+
return handleTextInputKeyboard(target, data, { clipboardText, layout, onCopy });
|
|
39
40
|
}
|
|
40
41
|
export function dispatchTextInputPointerDown(manager, target, x, y, extend = false, clickCount = 1) {
|
|
41
42
|
focusTextInput(manager, target);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textInputManager.js","sourceRoot":"","sources":["../src/textInputManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AASjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,iCAAiC,EACjC,uBAAuB,EACvB,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAC/B,IAAI,MAAM,KAAK,IAAI;QAAE,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAsB,EAAE,OAAyB;IACvF,MAAM,SAAS,GAAG,CAAC,IAAiC,EAAE,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjG,MAAM,WAAW,GAAG,CAAC,IAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAE7F,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1C,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAE9C,OAAO,GAAG,EAAE;QACV,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC7C,gBAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAyB,EAAE,IAAY;IACvE,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAAyB,EACzB,IAAiC,EACjC,aAAsB,EACtB,MAA+B;IAE/B,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAClC,OAAO,uBAAuB,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"textInputManager.js","sourceRoot":"","sources":["../src/textInputManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/textinput",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.1-next.209.43ef1bc",
|
|
4
|
+
"author": "Joshua Granick and other contributors",
|
|
5
|
+
"license": "MIT",
|
|
4
6
|
"repository": {
|
|
5
7
|
"type": "git",
|
|
6
8
|
"url": "https://github.com/flighthq/flight.git",
|
|
@@ -36,11 +38,11 @@
|
|
|
36
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
37
39
|
},
|
|
38
40
|
"dependencies": {
|
|
39
|
-
"@flighthq/node": "0.3.
|
|
40
|
-
"@flighthq/signals": "0.3.
|
|
41
|
-
"@flighthq/text": "0.3.
|
|
42
|
-
"@flighthq/textlayout": "0.3.
|
|
43
|
-
"@flighthq/types": "0.3.
|
|
41
|
+
"@flighthq/node": "0.3.1-next.209.43ef1bc",
|
|
42
|
+
"@flighthq/signals": "0.3.1-next.209.43ef1bc",
|
|
43
|
+
"@flighthq/text": "0.3.1-next.209.43ef1bc",
|
|
44
|
+
"@flighthq/textlayout": "0.3.1-next.209.43ef1bc",
|
|
45
|
+
"@flighthq/types": "0.3.1-next.209.43ef1bc"
|
|
44
46
|
},
|
|
45
47
|
"devDependencies": {
|
|
46
48
|
"typescript": "^5.3.0"
|
|
@@ -5,6 +5,7 @@ import { KeyCode } from '@flighthq/types/contract';
|
|
|
5
5
|
|
|
6
6
|
import { enableTextInput, getTextInputState } from './textInput';
|
|
7
7
|
import {
|
|
8
|
+
getTextInputCaretIndex,
|
|
8
9
|
getTextInputSelectionBeginIndex,
|
|
9
10
|
getTextInputSelectionEndIndex,
|
|
10
11
|
setTextInputSelection,
|
|
@@ -59,6 +60,49 @@ function createSingleLineLayout(): TextLayoutResult {
|
|
|
59
60
|
};
|
|
60
61
|
}
|
|
61
62
|
|
|
63
|
+
function createTwoLineLayout(): TextLayoutResult {
|
|
64
|
+
return {
|
|
65
|
+
groups: [
|
|
66
|
+
{
|
|
67
|
+
ascent: 10,
|
|
68
|
+
descent: 2,
|
|
69
|
+
endIndex: 3,
|
|
70
|
+
format: {},
|
|
71
|
+
height: 12,
|
|
72
|
+
leading: 0,
|
|
73
|
+
lineIndex: 0,
|
|
74
|
+
offsetX: 2,
|
|
75
|
+
offsetY: 2,
|
|
76
|
+
positions: [10, 10, 10],
|
|
77
|
+
startIndex: 0,
|
|
78
|
+
width: 30,
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
ascent: 10,
|
|
82
|
+
descent: 2,
|
|
83
|
+
endIndex: 7,
|
|
84
|
+
format: {},
|
|
85
|
+
height: 12,
|
|
86
|
+
leading: 0,
|
|
87
|
+
lineIndex: 1,
|
|
88
|
+
offsetX: 2,
|
|
89
|
+
offsetY: 14,
|
|
90
|
+
positions: [10, 10, 10, 10],
|
|
91
|
+
startIndex: 3,
|
|
92
|
+
width: 40,
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
lineAscents: [10, 10],
|
|
96
|
+
lineDescents: [2, 2],
|
|
97
|
+
lineHeights: [12, 12],
|
|
98
|
+
lineLeadings: [0, 0],
|
|
99
|
+
lineWidths: [30, 40],
|
|
100
|
+
numLines: 2,
|
|
101
|
+
textHeight: 24,
|
|
102
|
+
textWidth: 40,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
62
106
|
function setLayout(target: RichText, layout: TextLayoutResult): void {
|
|
63
107
|
(getRichTextRuntime(target) as RichTextRuntime).textLayout = layout;
|
|
64
108
|
}
|
|
@@ -155,6 +199,21 @@ describe('dispatchTextInputKeyDown', () => {
|
|
|
155
199
|
);
|
|
156
200
|
expect(copied).toEqual(['hello']);
|
|
157
201
|
});
|
|
202
|
+
|
|
203
|
+
it('uses the focused target layout for line-relative Home and End', () => {
|
|
204
|
+
const manager = createTextInputManager();
|
|
205
|
+
const target = createInput({ multiline: true, text: 'abcdefg' });
|
|
206
|
+
setLayout(target, createTwoLineLayout());
|
|
207
|
+
focusTextInput(manager, target);
|
|
208
|
+
|
|
209
|
+
setTextInputSelection(target, 6, 6);
|
|
210
|
+
dispatchTextInputKeyDown(manager, { ...keyData, key: 'Home', keyCode: KeyCode.HOME });
|
|
211
|
+
expect(getTextInputCaretIndex(target)).toBe(3);
|
|
212
|
+
|
|
213
|
+
setTextInputSelection(target, 1, 1);
|
|
214
|
+
dispatchTextInputKeyDown(manager, { ...keyData, key: 'End', keyCode: KeyCode.END });
|
|
215
|
+
expect(getTextInputCaretIndex(target)).toBe(3);
|
|
216
|
+
});
|
|
158
217
|
});
|
|
159
218
|
|
|
160
219
|
describe('dispatchTextInputPointerDown', () => {
|