@bhsd/codemirror-mediawiki 2.7.5 → 2.7.7

package/mw/textSelection.ts

@@ -1,5 +1,4 @@
-import type {SelectionRange} from '@codemirror/state';
-import type {CodeMirror} from './base';
+import {CodeMirror} from './base';
 
 export const instances = new WeakMap<HTMLTextAreaElement, CodeMirror>();
 
@@ -65,30 +64,32 @@ export const textSelection = {
 	}: EncapsulateOptions): JQuery<HTMLTextAreaElement> {
 		const {view} = getInstance(this),
 			{state} = view;
-		const handleOwnline = (from: number, to: number, text: string): string => {
-			/* eslint-disable no-param-reassign */
-			if (from > 0 && !/[\n\r]/u.test(state.sliceDoc(from - 1, from))) {
-				text = `\n${text}`;
-				pre += '\n';
-			}
-			if (!/[\n\r]/u.test(state.sliceDoc(to, to + 1))) {
-				text += '\n';
-				post += '\n';
+		const handleOwnline = (from: number, to: number, text: string): [string, number, number] => {
+			let start = 0,
+				end = 0;
+			if (ownline) {
+				if (from > 0 && !/[\n\r]/u.test(state.sliceDoc(from - 1, from))) {
+					text = `\n${text}`; // eslint-disable-line no-param-reassign
+					start = 1;
+				}
+				if (!/[\n\r]/u.test(state.sliceDoc(to, to + 1))) {
+					text += '\n'; // eslint-disable-line no-param-reassign
+					end = 1;
+				}
 			}
-			return text;
-			/* eslint-enable no-param-reassign */
+			return [text, start, end];
 		};
 		if (ownline && replace && !pre && !post && selectionStart === undefined && /^\s*=.*=\s*$/u.test(peri)) {
 			// 单独处理改变标题层级
 			const {selection: {main: {from, to}}} = state,
-				insertText = handleOwnline(from, to, peri);
+				[insertText] = handleOwnline(from, to, peri);
 			view.dispatch({
 				changes: {from, to, insert: insertText},
 				selection: {anchor: from + insertText.length},
 			});
 			return this;
 		}
-		view.dispatch(state.changeByRange(({from, to}) => {
+		CodeMirror.replaceSelections(view, (_, {from, to}) => {
 			if (selectionStart !== undefined) {
 				/* eslint-disable no-param-reassign */
 				from = selectionStart;
@@ -96,21 +97,17 @@ export const textSelection = {
 				/* eslint-enable no-param-reassign */
 			}
 			const isSample = selectPeri && from === to,
-				selText = replace || from === to ? peri : state.sliceDoc(from, to);
-			let insertText = splitlines
-				? selText.split('\n').map(line => `${pre}${line}${post}`).join('\n')
-				: `${pre}${selText}${post}`;
-			if (ownline) {
-				insertText = handleOwnline(from, to, insertText);
-			}
-			const head = from + insertText.length;
-			return {
-				changes: {from, to, insert: insertText},
-				range: (isSample
-					? {anchor: from + pre.length, head: head - post.length}
-					: {anchor: head, head}) as SelectionRange,
-			};
-		}));
+				selText = replace || from === to ? peri : state.sliceDoc(from, to),
+				[insertText, start, end] = handleOwnline(
+					from,
+					to,
+					splitlines
+						? selText.split('\n').map(line => `${pre}${line}${post}`).join('\n')
+						: `${pre}${selText}${post}`,
+				),
+				head = from + insertText.length;
+			return isSample ? [insertText, from + pre.length + start, head - post.length - end] : [insertText, head];
+		});
 		return this;
 	},
 	getCaretPosition(this: JQuery<HTMLTextAreaElement>, option?: {startAndEnd?: boolean}): [number, number] | number {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.7.5",
+	"version": "2.7.7",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",