From 886a8cc1a130342e3a1418b351ef0eaf1fe70ee1 Mon Sep 17 00:00:00 2001 From: Sriram Varun Kumar Date: Wed, 8 Apr 2026 19:07:58 +0530 Subject: [PATCH] Mobile: Fixes #13134: Fix Android markdown editor text replacement (characters disappearing during typing) (#15007) --- package.json | 3 ++ packages/editor/package.json | 14 +++--- yarn.lock | 92 +++++++++++++++++++++++------------- 3 files changed, 68 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 81aae2cdc6..a737718b85 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,9 @@ }, "packageManager": "yarn@4.9.2", "resolutions": { + "@codemirror/state": "6.6.0", + "@codemirror/view": "6.41.0", + "@codemirror/language": "6.12.3", "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch", "eslint": "patch:eslint@8.57.1#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch", "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch", diff --git a/packages/editor/package.json b/packages/editor/package.json index 306c62edc2..d262b01f00 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -28,17 +28,17 @@ "typescript": "5.8.3" }, "dependencies": { - "@codemirror/autocomplete": "6.20.0", - "@codemirror/commands": "6.10.1", + "@codemirror/autocomplete": "6.20.1", + "@codemirror/commands": "6.10.3", "@codemirror/lang-html": "6.4.11", "@codemirror/lang-markdown": "6.5.0", - "@codemirror/language": "6.10.4", + "@codemirror/language": "6.12.3", "@codemirror/language-data": "6.3.1", "@codemirror/legacy-modes": "6.5.2", - "@codemirror/lint": "6.9.2", - "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.4", - "@codemirror/view": "6.35.0", + "@codemirror/lint": "6.9.5", + "@codemirror/search": "6.6.0", + "@codemirror/state": "6.6.0", + "@codemirror/view": "6.41.0", "@joplin/fork-uslug": "^2.0.0", "@lezer/common": "1.5.0", "@lezer/highlight": "1.2.3", diff --git a/yarn.lock b/yarn.lock index 92135508d7..a3bc65e11a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6929,7 +6929,19 @@ __metadata: languageName: node linkType: hard -"@codemirror/autocomplete@npm:6.20.0, @codemirror/autocomplete@npm:^6.0.0, @codemirror/autocomplete@npm:^6.3.2, @codemirror/autocomplete@npm:^6.7.1": +"@codemirror/autocomplete@npm:6.20.1": + version: 6.20.1 + resolution: "@codemirror/autocomplete@npm:6.20.1" + dependencies: + "@codemirror/language": "npm:^6.0.0" + "@codemirror/state": "npm:^6.0.0" + "@codemirror/view": "npm:^6.17.0" + "@lezer/common": "npm:^1.0.0" + checksum: 10/e57d78bb468d615a1448170370fce4ac04268527ef27dd464fac25b5b8d6d21b997f4dc8744d1d3782c568da32c78c9bbf59c425b248baae2f4f8454ce4b0eea + languageName: node + linkType: hard + +"@codemirror/autocomplete@npm:^6.0.0, @codemirror/autocomplete@npm:^6.3.2, @codemirror/autocomplete@npm:^6.7.1": version: 6.20.0 resolution: "@codemirror/autocomplete@npm:6.20.0" dependencies: @@ -6941,15 +6953,15 @@ __metadata: languageName: node linkType: hard -"@codemirror/commands@npm:6.10.1": - version: 6.10.1 - resolution: "@codemirror/commands@npm:6.10.1" +"@codemirror/commands@npm:6.10.3": + version: 6.10.3 + resolution: "@codemirror/commands@npm:6.10.3" dependencies: "@codemirror/language": "npm:^6.0.0" - "@codemirror/state": "npm:^6.4.0" + "@codemirror/state": "npm:^6.6.0" "@codemirror/view": "npm:^6.27.0" "@lezer/common": "npm:^1.1.0" - checksum: 10/9e305263dc457635fa1c7e5b47756958be5367e38f5bb07a3abfd5966591e2eafd57ea0c5c738b28bb3ab5de64c07a5302ebd49b129ff7e48b225841f66e647f + checksum: 10/2740c95cc7165c445cce530f1ad2677e0a80af11b2dd94a20729a198c2342783c04fbfda1364be9ab9cee3042a6906bb11619821dfc7bae154436c82d37e1b24 languageName: node linkType: hard @@ -7217,17 +7229,17 @@ __metadata: languageName: node linkType: hard -"@codemirror/language@npm:6.10.4, @codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.3.0, @codemirror/language@npm:^6.4.0, @codemirror/language@npm:^6.6.0, @codemirror/language@npm:^6.8.0": - version: 6.10.4 - resolution: "@codemirror/language@npm:6.10.4" +"@codemirror/language@npm:6.12.3": + version: 6.12.3 + resolution: "@codemirror/language@npm:6.12.3" dependencies: "@codemirror/state": "npm:^6.0.0" "@codemirror/view": "npm:^6.23.0" - "@lezer/common": "npm:^1.1.0" + "@lezer/common": "npm:^1.5.0" "@lezer/highlight": "npm:^1.0.0" "@lezer/lr": "npm:^1.0.0" style-mod: "npm:^4.0.0" - checksum: 10/73b7404adc54ae7881b082ef10a678442b2f9d5a6d7077039ae86897beee7ca3dd748614e0360e5de4795a71d7c20b03ac967a20878c3b3266dc3ade560b4856 + checksum: 10/d33f2736138e549e1db268b6539c13bd082c3f96e24384a492db939942ca11ac1da546ef7553e6ea4ee13dcaa6593f64f42b5e5a413d00eba3e996ffe50fe8e7 languageName: node linkType: hard @@ -7240,7 +7252,18 @@ __metadata: languageName: node linkType: hard -"@codemirror/lint@npm:6.9.2, @codemirror/lint@npm:^6.0.0": +"@codemirror/lint@npm:6.9.5": + version: 6.9.5 + resolution: "@codemirror/lint@npm:6.9.5" + dependencies: + "@codemirror/state": "npm:^6.0.0" + "@codemirror/view": "npm:^6.35.0" + crelt: "npm:^1.0.5" + checksum: 10/f859b4c82ebc476d1986d2a674f8be0614c14fe65f456b4cd9267b7b103701633af7eba765c072ad60857a28752670c74eb53c434118c975bb45ce078fce058d + languageName: node + linkType: hard + +"@codemirror/lint@npm:^6.0.0": version: 6.9.2 resolution: "@codemirror/lint@npm:6.9.2" dependencies: @@ -7251,34 +7274,35 @@ __metadata: languageName: node linkType: hard -"@codemirror/search@npm:6.5.8": - version: 6.5.8 - resolution: "@codemirror/search@npm:6.5.8" +"@codemirror/search@npm:6.6.0": + version: 6.6.0 + resolution: "@codemirror/search@npm:6.6.0" dependencies: "@codemirror/state": "npm:^6.0.0" - "@codemirror/view": "npm:^6.0.0" + "@codemirror/view": "npm:^6.37.0" crelt: "npm:^1.0.5" - checksum: 10/1389fa4e05da72b621ae10ff00d4ef0d23b08a3a7ac48f6e0b867429da7b80036bd7a6feef1a54f5b4c4af9fc4277f754a313a858fbfc12ccdfa48e9bf300cef + checksum: 10/2947341cf06bde4a682250c245007f70854b7660f7aa29cec2c5cd177fa70deacaadf37c4aa323f669379d32f9912cb958448c93da3dc90b8af5c466ea1cddaf languageName: node linkType: hard -"@codemirror/state@npm:6.5.4, @codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.4.0": - version: 6.5.4 - resolution: "@codemirror/state@npm:6.5.4" +"@codemirror/state@npm:6.6.0": + version: 6.6.0 + resolution: "@codemirror/state@npm:6.6.0" dependencies: "@marijn/find-cluster-break": "npm:^1.0.0" - checksum: 10/0e1b073282f2ba246692ad0238def660d201a886fcdb8de28360db8d7c9ec34fe904b9187709d70ede4fe4e7cf9a2e1700d26fccf22ce8d8bca68e6cdf456b08 + checksum: 10/5d624f3c8832b287d76ebb5f57c01327641875c12c58ada2a97f958dc4df8c3bb0a1ad08ed370300a4a929ee8d5c7f14a397449a0d075ac3129d60d85f077441 languageName: node linkType: hard -"@codemirror/view@npm:6.35.0, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.27.0, @codemirror/view@npm:^6.35.0": - version: 6.35.0 - resolution: "@codemirror/view@npm:6.35.0" +"@codemirror/view@npm:6.41.0": + version: 6.41.0 + resolution: "@codemirror/view@npm:6.41.0" dependencies: - "@codemirror/state": "npm:^6.4.0" + "@codemirror/state": "npm:^6.6.0" + crelt: "npm:^1.0.6" style-mod: "npm:^4.1.0" w3c-keyname: "npm:^2.2.4" - checksum: 10/edf9cb81cf2c5d80cc852f924d2d86299bf30aa009cf36afb370a8e2b4b0d03ceeda2de9a809c06aa8c06fcf1c8ba0d857c3d5292813808742446435d2ed533c + checksum: 10/8251e981b7ee95891b0957855154a2e2eb07fed1e122e4d8a1bff6629faa4fc820285e821436b16ee087538323afaa6e942b8455d9e60485f09ad1587e1a7ced languageName: node linkType: hard @@ -10938,17 +10962,17 @@ __metadata: version: 0.0.0-use.local resolution: "@joplin/editor@workspace:packages/editor" dependencies: - "@codemirror/autocomplete": "npm:6.20.0" - "@codemirror/commands": "npm:6.10.1" + "@codemirror/autocomplete": "npm:6.20.1" + "@codemirror/commands": "npm:6.10.3" "@codemirror/lang-html": "npm:6.4.11" "@codemirror/lang-markdown": "npm:6.5.0" - "@codemirror/language": "npm:6.10.4" + "@codemirror/language": "npm:6.12.3" "@codemirror/language-data": "npm:6.3.1" "@codemirror/legacy-modes": "npm:6.5.2" - "@codemirror/lint": "npm:6.9.2" - "@codemirror/search": "npm:6.5.8" - "@codemirror/state": "npm:6.5.4" - "@codemirror/view": "npm:6.35.0" + "@codemirror/lint": "npm:6.9.5" + "@codemirror/search": "npm:6.6.0" + "@codemirror/state": "npm:6.6.0" + "@codemirror/view": "npm:6.41.0" "@joplin/fork-uslug": "npm:^2.0.0" "@joplin/lib": "npm:~3.6" "@joplin/utils": "npm:~3.6" @@ -24139,7 +24163,7 @@ __metadata: languageName: node linkType: hard -"crelt@npm:^1.0.0": +"crelt@npm:^1.0.0, crelt@npm:^1.0.6": version: 1.0.6 resolution: "crelt@npm:1.0.6" checksum: 10/5ed326ca6bd243b1dba6b943f665b21c2c04be03271824bc48f20dba324b0f8233e221f8c67312526d24af2b1243c023dc05a41bd8bd05d1a479fd2c72fb39c3