Skip to content

Commit 9db5790

Browse files
authored
Version 2.38.4 (#65)
* Update version to 2.38.4 using command `./update_version.sh 2.38.4` * Run `make web` * Changelog for 2.38.4 * Make `placeholder` optional and default to `null`. Also document this parameter.
1 parent 10e6916 commit 9db5790

File tree

9 files changed

+20
-12
lines changed

9 files changed

+20
-12
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
# [2.38.4]
4+
- [Android] Add placeholder to RichTextEditor API #63
5+
- [Android] Migrate to maven central portal #62
6+
- [Android] Update dependencies #60 #56
7+
- [iOS] Update dependencies #8
8+
- [Rust] Update dependencies #4
9+
310
# [2.38.3]
411
- [Android] Update API to be able to check links. #53
512
- [Android] Update dependencies. #13

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/wysiwyg-ffi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Swift and Kotlin bindings for wysiwyg-rust"
77
keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
88
license-file = { workspace = true }
99
name = "uniffi-wysiwyg-composer"
10-
version = "2.38.3"
10+
version = "2.38.4"
1111
rust-version = { workspace = true }
1212

1313
[features]

bindings/wysiwyg-wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "WASM bindings for wysiwyg-rust"
77
keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
88
license-file = { workspace = true }
99
name = "wysiwyg-wasm"
10-
version = "2.38.3"
10+
version = "2.38.4"
1111
rust-version = { workspace = true }
1212

1313
[package.metadata.wasm-pack.profile.profiling]

bindings/wysiwyg-wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vector-im/matrix-wysiwyg-wasm",
3-
"version": "2.38.3",
3+
"version": "2.38.4",
44
"homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
55
"description": "WASM bindings for wysiwyg-rust",
66
"license": "SEE LICENSE IN README.md",

crates/wysiwyg/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Model code to power a rich text editor for Matrix"
77
keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
88
license-file = { workspace = true }
99
name = "wysiwyg"
10-
version = "2.38.3"
10+
version = "2.38.4"
1111
rust-version = { workspace = true }
1212

1313
[features]

platforms/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ android.enableBuildConfigAsBytecode=true
2323
# Maven publishing
2424
# ===================
2525
MAVEN_GROUP=io.element.android
26-
MAVEN_VERSION_NAME=2.38.3
26+
MAVEN_VERSION_NAME=2.38.4

platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import timber.log.Timber
5353
*
5454
* @param modifier The modifier for the layout
5555
* @param state The state holder for this composable. See [rememberRichTextEditorState].
56+
* @param placeholder The placeholder text to show when the editor is empty.
5657
* @param registerStateUpdates If true, register the state for updates.
5758
* @param style The styles to use for any customisable elements
5859
* @param inputType The input type for the editor. Defaults to [RichTextEditorDefaults.inputType].
@@ -66,7 +67,7 @@ import timber.log.Timber
6667
fun RichTextEditor(
6768
modifier: Modifier = Modifier,
6869
state: RichTextEditorState = rememberRichTextEditorState(),
69-
placeholder: String,
70+
placeholder: String? = null,
7071
registerStateUpdates: Boolean = true,
7172
style: RichTextEditorStyle = RichTextEditorDefaults.style(),
7273
inputType: Int = RichTextEditorDefaults.inputType,
@@ -105,7 +106,7 @@ fun RichTextEditor(
105106
@Composable
106107
private fun RealEditor(
107108
state: RichTextEditorState,
108-
placeholder: String,
109+
placeholder: String?,
109110
registerStateUpdates: Boolean,
110111
modifier: Modifier = Modifier,
111112
style: RichTextEditorStyle,
@@ -249,7 +250,7 @@ private fun RealEditor(
249250
@Composable
250251
private fun PreviewEditor(
251252
state: RichTextEditorState,
252-
placeholder: String,
253+
placeholder: String?,
253254
modifier: Modifier = Modifier,
254255
style: RichTextEditorStyle,
255256
) {

platforms/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vector-im/matrix-wysiwyg",
3-
"version": "2.38.3",
3+
"version": "2.38.4",
44
"type": "module",
55
"description": "Wysiwyg composer for Element Web using React",
66
"author": "New Vector Ltd.",

0 commit comments

Comments
 (0)