@bhsd/codemirror-mediawiki 2.6.0 → 2.6.2

package/mw/textSelection.ts

@@ -17,37 +17,40 @@ export const textSelection = {
 		return getInstance(this).view.state.doc.toString();
 	},
 	setContents(this: JQuery<HTMLTextAreaElement>, content: string): JQuery<HTMLTextAreaElement> {
-		getInstance(this).setContent(content);
+		const cm = getInstance(this),
+			{view: {scrollDOM}} = cm,
+			{scrollTop} = scrollDOM;
+		cm.setContent(content);
+		scrollDOM.scrollTop = scrollTop;
 		return this;
 	},
 	getSelection(this: JQuery<HTMLTextAreaElement>): string {
-		const {view: {state}} = getInstance(this);
-		return state.sliceDoc(state.selection.main.from, state.selection.main.to);
+		const {view: {state}} = getInstance(this),
+			{selection: {main: {from, to}}} = state;
+		return state.sliceDoc(from, to);
 	},
 	setSelection(
 		this: JQuery<HTMLTextAreaElement>,
-		{start, end}: {start: number, end?: number},
+		{start, end = start}: {start: number, end?: number},
 	): JQuery<HTMLTextAreaElement> {
-		const {view} = getInstance(this);
-		view.dispatch({
-			selection: {anchor: start, head: end ?? start},
+		getInstance(this).view.dispatch({
+			selection: {anchor: start, head: end},
 		});
-		view.focus();
 		return this;
 	},
 	replaceSelection(this: JQuery<HTMLTextAreaElement>, value: string): JQuery<HTMLTextAreaElement> {
-		const {view} = getInstance(this),
-			{state: {selection: {main: {from, to}}}} = view;
-		view.dispatch({selection: {anchor: from, head: to}});
+		const {view} = getInstance(this);
+		view.dispatch({selection: view.state.selection.asSingle()});
 		view.dispatch(view.state.replaceSelection(value));
 		return this;
 	},
 	getCaretPosition(this: JQuery<HTMLTextAreaElement>, option?: {startAndEnd?: boolean}): [number, number] | number {
-		const {view: {state: {selection: {main}}}} = getInstance(this);
-		return option?.startAndEnd ? [main.from, main.to] : main.head;
+		const {view: {state: {selection: {main: {from, to, head}}}}} = getInstance(this);
+		return option?.startAndEnd ? [from, to] : head;
 	},
 	scrollToCaretPosition(this: JQuery<HTMLTextAreaElement>): JQuery<HTMLTextAreaElement> {
-		getInstance(this).view.dispatch({scrollIntoView: true});
+		const cm = getInstance(this);
+		cm.scrollTo();
 		return this;
 	},
 };

package/package.json

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