Merge branch 'main' of github.com:matrix-org/matrix-rich-text-editor …

…into langleyd/auto_replace_emoji

.github/workflows/ios.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-
+    
     - name: Install xcresultparser
       run: brew install a7ex/homebrew-formulae/xcresultparser
 
@@ -69,7 +69,7 @@ jobs:
         flags: unittests-ios, unittests
         # https://github.com/codecov/codecov-action/issues/557#issuecomment-1216749652
         token: ${{ secrets.CODECOV_TOKEN }}
-
+      
     - name: UI test coverage
       working-directory: platforms/ios/example
       run: exec ./ios-ui-test-coverage.sh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# [2.37.5] - 2024-06-20
+- [Rust] Fixed a crash that happened when entering a new line after setting through html a blockquote containing a single line.
+- [Common] Updated dependencies.
+
 # [2.37.4] - 2024-06-20
 - [Android] Make `CustomMentionSpan` public.
 - [Rust] Escape text passed to `ComposerModel::set_link_with_text` and `insert_mention*` methods.

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.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [features]

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.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [package.metadata.wasm-pack.profile.profiling]

bindings/wysiwyg-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.37.4",
+  "version": "2.37.5",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
   "license": "Apache-2.0",

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.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [features]

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.37.4
+VERSION_NAME=2.37.5
 
 POM_NAME=Matrix WYSIWYG
 POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.

platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj

@@ -45,6 +45,7 @@
 		A6F4D0CF29AE0C1500087A3E /* Users.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F4D0CE29AE0C1500087A3E /* Users.swift */; };
 		A6F4D0D129AE0C3200087A3E /* Rooms.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F4D0D029AE0C3200087A3E /* Rooms.swift */; };
 		A6F4D0D329AE0C5100087A3E /* Commands.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F4D0D229AE0C5100087A3E /* Commands.swift */; };
+		A75C6AD22C3E989D0096D3A4 /* WysiwygUITests+Keyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A75C6AD12C3E989D0096D3A4 /* WysiwygUITests+Keyboard.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,6 +98,7 @@
 		A6F4D0CE29AE0C1500087A3E /* Users.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Users.swift; sourceTree = "<group>"; };
 		A6F4D0D029AE0C3200087A3E /* Rooms.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rooms.swift; sourceTree = "<group>"; };
 		A6F4D0D229AE0C5100087A3E /* Commands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Commands.swift; sourceTree = "<group>"; };
+		A75C6AD12C3E989D0096D3A4 /* WysiwygUITests+Keyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WysiwygUITests+Keyboard.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -178,6 +180,7 @@
 				A64AB145296C759A00F08494 /* WysiwygUITests+Quotes.swift */,
 				A661FDA629B0ACB400E799A6 /* WysiwygUITests+Suggestions.swift */,
 				A64AB13D296C732500F08494 /* WysiwygUITests+Typing.swift */,
+				A75C6AD12C3E989D0096D3A4 /* WysiwygUITests+Keyboard.swift */,
 			);
 			path = WysiwygUITests;
 			sourceTree = "<group>";
@@ -280,6 +283,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = A6472CD12886CF840021A0E8 /* Build configuration list for PBXNativeTarget "WysiwygUITests" */;
 			buildPhases = (
+				A75C6AD32C3ECA450096D3A4 /* Force software keyboard on simulator */,
 				A6472CBD2886CF840021A0E8 /* Sources */,
 				A6472CBE2886CF840021A0E8 /* Frameworks */,
 				A6472CBF2886CF840021A0E8 /* Resources */,
@@ -392,6 +396,24 @@
 			shellPath = /bin/sh;
 			shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftformat >/dev/null; then\n    swiftformat $PROJECT_DIR\n    swiftformat ../lib/WysiwygComposer\nelse\n    echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
 		};
+		A75C6AD32C3ECA450096D3A4 /* Force software keyboard on simulator */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Force software keyboard on simulator";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "external_kb_connected=false\n\nosascript -e 'quit app \"Simulator\"'\n\nSIMUS_KEYBOARD=$(/usr/libexec/PlistBuddy -c \"Print :DevicePreferences\" ~/Library/Preferences/com.apple.iphonesimulator.plist | perl -lne 'print $1 if /^    (\\S*) =/')\n\necho \"$SIMUS_KEYBOARD\" | while read -r a; do /usr/libexec/PlistBuddy -c \"Set :DevicePreferences:$a:ConnectHardwareKeyboard $external_kb_connected\" ~/Library/Preferences/com.apple.iphonesimulator.plist || /usr/libexec/PlistBuddy -c  \"Add :DevicePreferences:$a:ConnectHardwareKeyboard bool $external_kb_connected\" ~/Library/Preferences/com.apple.iphonesimulator.plist; done\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -432,6 +454,7 @@
 				A6BB18D729F9191C00EB6366 /* WysiwygUITests+Autocorrection.swift in Sources */,
 				A6472CC62886CF840021A0E8 /* WysiwygUITests.swift in Sources */,
 				A64AB140296C73CE00F08494 /* WysiwygUITests+Links.swift in Sources */,
+				A75C6AD22C3E989D0096D3A4 /* WysiwygUITests+Keyboard.swift in Sources */,
 				A661FDA729B0ACB400E799A6 /* WysiwygUITests+Suggestions.swift in Sources */,
 				A68E7141291D40710023CC04 /* WysiwygSharedConstants.swift in Sources */,
 				A64AB144296C747C00F08494 /* WysiwygUITests+Format.swift in Sources */,