From 8d4fe54ee718cffc781025cb62f0d74de5656975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Fri, 5 Jan 2024 14:15:58 +0100
Subject: [PATCH] Version 2.24.0

---
 CHANGELOG.md                            | 12 ++++++++++++
 Cargo.lock                              |  6 +++---
 bindings/wysiwyg-ffi/Cargo.toml         |  2 +-
 bindings/wysiwyg-wasm/Cargo.toml        |  2 +-
 bindings/wysiwyg-wasm/package-lock.json |  4 ++--
 bindings/wysiwyg-wasm/package.json      |  2 +-
 crates/wysiwyg/Cargo.toml               |  2 +-
 platforms/android/gradle.properties     |  2 +-
 platforms/web/package.json              |  2 +-
 9 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58960b8a6..1563dedd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+# [2.24.0] - 2024-01-05
+
+### Added
+- [Android] Add support for handling rich content from the keyboard (images, gifs, stickers, etc.).
+
+### Fixed
+- [Common] Fix deletion of several selected paragraphs, especially those with no content.
+- [Android] Fix incorrect detection of NBSP chars as extra characters while parsing HTML.
+- [Android] Destroy (as in free its memory) the current `ComposerModel` when it panics, before we replace it with a new instance.
+- [Android] When updating the selection, make sure it's inside the bounds of the existing text.
+- [Android] When creating the `SpannableString` while parsing the HTML, make sure every span is inside the bounds of its text.
+
 # [2.23.0] - 2023-12-26
 
 ### Changed
diff --git a/Cargo.lock b/Cargo.lock
index b39527998..0a7b042e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1551,7 +1551,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi-wysiwyg-composer"
-version = "2.23.0"
+version = "2.24.0"
 dependencies = [
  "matrix_mentions",
  "uniffi",
@@ -2020,7 +2020,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg"
-version = "2.23.0"
+version = "2.24.0"
 dependencies = [
  "cfg-if",
  "email_address",
@@ -2044,7 +2044,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg-wasm"
-version = "2.23.0"
+version = "2.24.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
index c7b29c916..4aaf89735 100644
--- a/bindings/wysiwyg-ffi/Cargo.toml
+++ b/bindings/wysiwyg-ffi/Cargo.toml
@@ -7,7 +7,7 @@ description = "Swift and Kotlin bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "uniffi-wysiwyg-composer"
-version = "2.23.0"
+version = "2.24.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
index 0348344b2..814e6020c 100644
--- a/bindings/wysiwyg-wasm/Cargo.toml
+++ b/bindings/wysiwyg-wasm/Cargo.toml
@@ -7,7 +7,7 @@ description = "WASM bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg-wasm"
-version = "2.23.0"
+version = "2.24.0"
 rust-version = { workspace = true }
 
 [package.metadata.wasm-pack.profile.profiling]
diff --git a/bindings/wysiwyg-wasm/package-lock.json b/bindings/wysiwyg-wasm/package-lock.json
index 2eb0333b9..0b7583442 100644
--- a/bindings/wysiwyg-wasm/package-lock.json
+++ b/bindings/wysiwyg-wasm/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.23.0",
+  "version": "2.24.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wysiwyg-wasm",
-      "version": "2.23.0",
+      "version": "2.24.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "jest": "^28.1.0",
diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json
index df977dfea..f90e59afd 100644
--- a/bindings/wysiwyg-wasm/package.json
+++ b/bindings/wysiwyg-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.23.0",
+  "version": "2.24.0",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
   "license": "Apache-2.0",
diff --git a/crates/wysiwyg/Cargo.toml b/crates/wysiwyg/Cargo.toml
index c6046a531..0a571a53a 100644
--- a/crates/wysiwyg/Cargo.toml
+++ b/crates/wysiwyg/Cargo.toml
@@ -7,7 +7,7 @@ description = "Model code to power a rich text editor for Matrix"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg"
-version = "2.23.0"
+version = "2.24.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
index 9a97baa97..8fc561ded 100644
--- a/platforms/android/gradle.properties
+++ b/platforms/android/gradle.properties
@@ -27,7 +27,7 @@ RELEASE_SIGNING_ENABLED=true
 
 GROUP=io.element.android
 # POM_ARTIFACT_ID is configured in each module's gradle.properties
-VERSION_NAME=2.23.0
+VERSION_NAME=2.24.0
 
 POM_NAME=Matrix WYSIWYG
 POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.
diff --git a/platforms/web/package.json b/platforms/web/package.json
index fb83bc2ca..0437eded9 100644
--- a/platforms/web/package.json
+++ b/platforms/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-wysiwyg",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "type": "module",
     "description": "Wysiwyg composer for matrix.org using React",
     "author": "matrix.org",