OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix types and console.log

pull/28217/head
Florian Duros 2022-12-05 17:40:33 +01:00
parent be3a66b0e6
commit f5efa85882
No known key found for this signature in database
GPG Key ID: 9700AA5870258A0B
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/views/rooms/wysiwyg_composer/hooks/useSelection.ts
View File

@ -18,8 +18,10 @@ import { useCallback, useEffect, useRef } from "react";
import useFocus from "../../../../../hooks/useFocus";
type SubSelection = Pick<Selection, 'anchorNode' | 'anchorOffset' | 'focusNode' | 'focusOffset'>;
export function useSelection() {
const selectionRef = useRef({
const selectionRef = useRef<SubSelection>({
anchorNode: null,
anchorOffset: 0,
focusNode: null,
@ -30,6 +32,8 @@ export function useSelection() {
useEffect(() => {
function onSelectionChange() {
const selection = document.getSelection();
if (selection) {
selectionRef.current = {
anchorNode: selection.anchorNode,
anchorOffset: selection.anchorOffset,
@ -37,6 +41,7 @@ export function useSelection() {
focusOffset: selection.focusOffset,
};
}
}
if (isFocused) {
document.addEventListener('selectionchange', onSelectionChange);
@ -47,10 +52,14 @@ export function useSelection() {
const selectPreviousSelection = useCallback(() => {
const range = new Range();
range.setStart(selectionRef.current.anchorNode, selectionRef.current.anchorOffset);
range.setEnd(selectionRef.current.focusNode, selectionRef.current.focusOffset);
document.getSelection().removeAllRanges();
document.getSelection().addRange(range);
const selection = selectionRef.current;
if (selection.anchorNode && selection.focusNode) {
range.setStart(selection.anchorNode, selectionRef.current.anchorOffset);
range.setEnd(selection.focusNode, selectionRef.current.focusOffset);
document.getSelection()?.removeAllRanges();
document.getSelection()?.addRange(range);
}
}, [selectionRef]);
return { ...focusProps, selectPreviousSelection };

1
test/components/views/rooms/wysiwyg_composer/SendWysiwygComposer-test.tsx
View File

@ -177,7 +177,6 @@ describe('SendWysiwygComposer', () => {
it('Should not has placeholder', async () => {
// When
console.log('here');
customRender(jest.fn(), jest.fn(), false, isRichTextEnabled);
await waitFor(() => expect(screen.getByRole('textbox')).toHaveAttribute('contentEditable', "true"));