From cb8285b0cd84bc05530194732e30b408b193fbc3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 28 Mar 2024 22:14:38 +0100
Subject: [PATCH] Mark version 6.26.1

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1f7cb6..17325cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 6.26.1 (2024-03-28)
+
+### Bug fixes
+
+Fix the editor getting stuck in composition when Safari fails to fire a compositionend event for a dead key composition.
+
+Fix an issue where, with IME systems that kept the cursor at the start of the composed text, the editor misidentified the target node and disrupted composition.
+
+Fix a bug where in a line-wrapped editor, with some content, the initial scroll position would be off from the top of the document.
+
 ## 6.26.0 (2024-03-14)
 
 ### Bug fixes
diff --git a/package.json b/package.json
index e38f669..0fe5209 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.26.0",
+  "version": "6.26.1",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",