Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Converting selected text to MD link when pasting a URL #8242

Merged
merged 9 commits into from
May 9, 2022
Merged

Converting selected text to MD link when pasting a URL #8242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9791cf
Converting selected text to MD link when pasting a URL
Sinharitik589 Apr 6, 2022
711622a
Merge branch 'develop' into issue_#21634
Sinharitik589 Apr 6, 2022
71b88df
Merge branch 'matrix-org:develop' into issue_#21634
Sinharitik589 Apr 6, 2022
1a86201
Merge branch 'issue_#21634' of https://github.com/Sinharitik589/matri…
Sinharitik589 Apr 6, 2022
ed013f4
Update src/editor/operations.ts
Sinharitik589 Apr 8, 2022
7c20ed7
Merge branch 'develop' into issue_#21634
Sinharitik589 Apr 8, 2022
a4c3b05
Merge branch 'issue_#21634' of https://github.com/Sinharitik589/matri…
Sinharitik589 Apr 8, 2022
7750b6a
Converting selected text to MD link when pasting a URL
Sinharitik589 Apr 8, 2022
c442aa2
Merge branch 'develop' into issue_#21634
t3chguy May 6, 2022
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
11 changes: 9 additions & 2 deletions src/components/views/rooms/BasicMessageComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import { logger } from "matrix-js-sdk/src/logger";
import EditorModel from '../../../editor/model';
import HistoryManager from '../../../editor/history';
import { Caret, setSelection } from '../../../editor/caret';
import { formatRange, replaceRangeAndMoveCaret, toggleInlineFormat } from '../../../editor/operations';
import { formatRange, formatRangeAsLink, replaceRangeAndMoveCaret, toggleInlineFormat }
from '../../../editor/operations';
import { getCaretOffsetAndText, getRangeForSelection } from '../../../editor/dom';
import Autocomplete, { generateCompletionDomId } from '../rooms/Autocomplete';
import { getAutoCompleteCreator, Type } from '../../../editor/parts';
Expand All @@ -45,6 +46,7 @@ import { ICompletion } from "../../../autocomplete/Autocompleter";
import { getKeyBindingsManager } from '../../../KeyBindingsManager';
import { ALTERNATE_KEY_NAME, KeyBindingAction } from '../../../accessibility/KeyboardShortcuts';
import { _t } from "../../../languageHandler";
import { linkify } from '../../../linkify-matrix';

// matches emoticons which follow the start of a line or whitespace
const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s|:^$');
Expand Down Expand Up @@ -348,9 +350,14 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
const text = event.clipboardData.getData("text/plain");
parts = parsePlainTextMessage(text, partCreator, { shouldEscape: false });
}
const textToInsert = event.clipboardData.getData("text/plain");
this.modifiedFlag = true;
const range = getRangeForSelection(this.editorRef.current, model, document.getSelection());
replaceRangeAndMoveCaret(range, parts);
if (textToInsert && linkify.test(textToInsert)) {
formatRangeAsLink(range, textToInsert);
} else {
replaceRangeAndMoveCaret(range, parts);
}
};

private onInput = (event: Partial<InputEvent>): void => {
Expand Down
4 changes: 2 additions & 2 deletions src/editor/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export function formatRangeAsCode(range: Range): void {
replaceRangeAndExpandSelection(range, parts);
}

export function formatRangeAsLink(range: Range) {
export function formatRangeAsLink(range: Range, text?: string) {
const { model } = range;
const { partCreator } = model;
const linkRegex = /\[(.*?)\]\(.*?\)/g;
Expand All @@ -229,7 +229,7 @@ export function formatRangeAsLink(range: Range) {
replaceRangeAndAutoAdjustCaret(range, newParts, true, prefixLength, suffixLength);
} else {
// We set offset to -1 here so that the caret lands between the brackets
replaceRangeAndMoveCaret(range, [partCreator.plain("[" + range.text + "]" + "()")], -1);
replaceRangeAndMoveCaret(range, [partCreator.plain("[" + range.text + "]" + "(" + (text ?? "") + ")")], -1);
}
}

Expand Down