Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/plenty-moose-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/web-elements": patch
---

feat: x-input and x-textarea support bindselection event, the returned type structure is `{ selectionStart: number; selectionEnd: number }`.
31 changes: 31 additions & 0 deletions packages/web-platform/web-elements/src/XInput/XInputEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,37 @@ export class XInputEvents
}
};

@registerEventEnableStatusChangeHandler('selection')
#handleEnableSelectionEvent(status: boolean) {
if (status) {
this.#getInputElement().addEventListener(
'select',
this.#selectEvent,
{
passive: true,
},
);
} else {
this.#getInputElement().removeEventListener(
'select',
this.#selectEvent,
);
}
}

#selectEvent = () => {
const input = this.#getInputElement();
this.#dom.dispatchEvent(
new CustomEvent('selection', {
...commonComponentEventSetting,
detail: {
selectionStart: input.selectionStart,
selectionEnd: input.selectionEnd,
},
}),
);
};

#blockHtmlEvent = (event: InputEvent) => {
if (
event.target === this.#getInputElement()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,37 @@ export class XTextareaEvents
}
};

@registerEventEnableStatusChangeHandler('selection')
#handleEnableSelectionEvent(status: boolean) {
if (status) {
this.#getTextareaElement().addEventListener(
'select',
this.#selectEvent,
{
passive: true,
},
);
} else {
this.#getTextareaElement().removeEventListener(
'select',
this.#selectEvent,
);
}
}

#selectEvent = () => {
const input = this.#getTextareaElement();
this.#dom.dispatchEvent(
new CustomEvent('selection', {
...commonComponentEventSetting,
detail: {
selectionStart: input.selectionStart,
selectionEnd: input.selectionEnd,
},
}),
);
};

#blockHtmlEvent = (event: FocusEvent | InputEvent) => {
if (
event.target === this.#getTextareaElement()
Expand Down
32 changes: 32 additions & 0 deletions packages/web-platform/web-tests/tests/react.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
document.querySelector('lynx-view')!.remove();
});
await wait(50);
expect(message).toContain('fin');

Check failure on line 625 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / playwright-linux / check

[webkit] › tests/react.spec.ts:613:5 › reactlynx3 tests › apis › api-dispose

3) [webkit] › tests/react.spec.ts:613:5 › reactlynx3 tests › apis › api-dispose ────────────────── Error: expect(received).toContain(expected) // indexOf Expected value: "fin" Received array: [] 623 | }); 624 | await wait(50); > 625 | expect(message).toContain('fin'); | ^ 626 | expect(page.workers().length).toStrictEqual(1); 627 | }); 628 | at /home/runner/_work/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:625:23
expect(page.workers().length).toStrictEqual(1);
});

Expand Down Expand Up @@ -1209,9 +1209,9 @@
await wait(100);
const target = page.locator('#target');
await target.click();
await expect(await target.getAttribute('style')).toContain('green');

Check failure on line 1212 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / playwright-linux-all-on-ui / check

[webkit] › tests/react.spec.ts:1207:5 › reactlynx3 tests › configs › config-mode-dev-with-all-in-one

2) [webkit] › tests/react.spec.ts:1207:5 › reactlynx3 tests › configs › config-mode-dev-with-all-in-one Error: expect(received).toContain(expected) // indexOf Expected substring: "green" Received string: "height:100px;width:100px;background:pink;" 1210 | const target = page.locator('#target'); 1211 | await target.click(); > 1212 | await expect(await target.getAttribute('style')).toContain('green'); | ^ 1213 | await target.click(); 1214 | await expect(await target.getAttribute('style')).toContain('pink'); 1215 | }); at /home/runner/_work/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:1212:56
await target.click();
await expect(await target.getAttribute('style')).toContain('pink');

Check failure on line 1214 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / playwright-linux / check

[webkit] › tests/react.spec.ts:1207:5 › reactlynx3 tests › configs › config-mode-dev-with-all-in-one

4) [webkit] › tests/react.spec.ts:1207:5 › reactlynx3 tests › configs › config-mode-dev-with-all-in-one Error: expect(received).toContain(expected) // indexOf Expected substring: "pink" Received string: "height:100px;width:100px;background:green;" 1212 | await expect(await target.getAttribute('style')).toContain('green'); 1213 | await target.click(); > 1214 | await expect(await target.getAttribute('style')).toContain('pink'); | ^ 1215 | }); 1216 | 1217 | test( at /home/runner/_work/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:1214:56
});

test(
Expand Down Expand Up @@ -2237,6 +2237,21 @@
expect(selectionEnd).toBe(true);
},
);
test(
'basic-element-x-input-bindselection',
async ({ page }, { title }) => {
await goto(page, title);
await wait(200);
await page.evaluate(() => {
const inputDom = document.querySelector('lynx-view')?.shadowRoot
?.querySelector('x-input')?.shadowRoot?.querySelector('input');
inputDom?.focus();
inputDom?.setSelectionRange(2, 5);
});
const result = await page.locator('.result').first().innerText();
expect(result).toBe('2-5');

Check failure on line 2252 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / playwright-linux-all-on-ui / check

[webkit] › tests/react.spec.ts:2240:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindselection

3) [webkit] › tests/react.spec.ts:2240:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindselection Error: expect(received).toBe(expected) // Object.is equality Expected: "2-5" Received: "" 2250 | }); 2251 | const result = await page.locator('.result').first().innerText(); > 2252 | expect(result).toBe('2-5'); | ^ 2253 | }, 2254 | ); 2255 | }); at /home/runner/_work/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:2252:26
},
);
});
test.describe('x-overlay-ng', () => {
test('basic-element-x-overlay-ng-demo', async ({ page }, { title }) => {
Expand Down Expand Up @@ -3535,6 +3550,23 @@
expect(selectionEnd).toBe(true);
},
);
test(
'basic-element-x-textarea-bindselection',
async ({ page }, { title }) => {
await goto(page, title);
await wait(200);
await page.evaluate(() => {
const textareaDom = document.querySelector('lynx-view')?.shadowRoot
?.querySelector('x-textarea')?.shadowRoot?.querySelector(
'textarea',
);
textareaDom?.focus();
textareaDom?.setSelectionRange(2, 5);
});
const result = await page.locator('.result').first().innerText();
expect(result).toBe('2-5');

Check failure on line 3567 in packages/web-platform/web-tests/tests/react.spec.ts

View workflow job for this annotation

GitHub Actions / playwright-linux / check

[chromium] › tests/react.spec.ts:3553:7 › reactlynx3 tests › elements › x-textarea › basic-element-x-textarea-bindselection

5) [chromium] › tests/react.spec.ts:3553:7 › reactlynx3 tests › elements › x-textarea › basic-element-x-textarea-bindselection Error: expect(received).toBe(expected) // Object.is equality Expected: "2-5" Received: "" 3565 | }); 3566 | const result = await page.locator('.result').first().innerText(); > 3567 | expect(result).toBe('2-5'); | ^ 3568 | }, 3569 | ); 3570 | }); at /home/runner/_work/lynx-stack/lynx-stack/packages/web-platform/web-tests/tests/react.spec.ts:3567:26
},
);
});
test.describe('x-audio-tt', () => {
test('basic-element-x-audio-tt-play', async ({ page }, { title }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright 2023 The Lynx Authors. All rights reserved.
// Licensed under the Apache License Version 2.0 that can be found in the
// LICENSE file in the root directory of this source tree.
import { root, useState } from '@lynx-js/react';

function App() {
const value = 'bindselection';
const [result, setResult] = useState();

const onSelection = ({ detail: { selectionStart, selectionEnd } }) => {
setResult(`${selectionStart}-${selectionEnd}`);
};

return (
<view>
<x-input
bindselection={onSelection}
value={value}
style='border: 1px solid;width: 80vw;height:40px'
/>
<view class='result'>
<text>{result}</text>
</view>
</view>
);
}

root.render(<App></App>);
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright 2023 The Lynx Authors. All rights reserved.
// Licensed under the Apache License Version 2.0 that can be found in the
// LICENSE file in the root directory of this source tree.
import { root, useState } from '@lynx-js/react';

function App() {
const value = 'bindselection';
const [result, setResult] = useState();

const onSelection = ({ detail: { selectionStart, selectionEnd } }) => {
setResult(`${selectionStart}-${selectionEnd}`);
};

return (
<view>
<x-textarea
bindselection={onSelection}
value={value}
style='border: 1px solid;width: 80vw;height:40px'
/>
<view class='result'>
<text>{result}</text>
</view>
</view>
);
}

root.render(<App></App>);
Loading