From dbb354ad107cbd8c10fee718437f8adabcfdeaeb Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Sun, 19 Nov 2023 02:43:57 -0800
Subject: [PATCH 01/17] Mobile: Fixes #9328: Fix new note/to-do buttons not
 visible on app startup in some cases (#9329)

---
 .../app-mobile/components/screens/Notes.tsx   | 27 +++++++++++++++----
 packages/app-mobile/root.tsx                  |  1 +
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/app-mobile/components/screens/Notes.tsx b/packages/app-mobile/components/screens/Notes.tsx
index 0844f677b..dff462b71 100644
--- a/packages/app-mobile/components/screens/Notes.tsx
+++ b/packages/app-mobile/components/screens/Notes.tsx
@@ -16,6 +16,7 @@ const DialogBox = require('react-native-dialogbox').default;
 const { BaseScreenComponent } = require('../base-screen');
 const { BackButtonService } = require('../../services/back-button.js');
 import { AppState } from '../../utils/types';
+const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js');
 
 class NotesScreenComponent extends BaseScreenComponent<any> {
 
@@ -223,17 +224,32 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 		let buttonFolderId = this.props.selectedFolderId !== Folder.conflictFolderId() ? this.props.selectedFolderId : null;
 		if (!buttonFolderId) buttonFolderId = this.props.activeFolderId;
 
-		const addFolderNoteButtons = !!buttonFolderId;
+		const isAllNotes =
+			this.props.notesParentType === 'SmartFilter'
+			&& this.props.selectedSmartFilterId === ALL_NOTES_FILTER_ID;
+
+		// Usually, when showing all notes, activeFolderId/selectedFolderId is set to the last
+		// active folder.
+		// If the app starts showing all notes, activeFolderId/selectedFolderId are
+		// empty or null. As such, we need a special case to show the buttons:
+		const addFolderNoteButtons = !!buttonFolderId || isAllNotes;
 		const thisComp = this;
 
 		const makeActionButtonComp = () => {
+			const getTargetFolderId = async () => {
+				if (!buttonFolderId && isAllNotes) {
+					return (await Folder.defaultFolder()).id;
+				}
+				return buttonFolderId;
+			};
 			if (addFolderNoteButtons && this.props.folders.length > 0) {
 				const buttons = [];
 				buttons.push({
 					label: _('New to-do'),
-					onPress: () => {
+					onPress: async () => {
+						const folderId = await getTargetFolderId();
 						const isTodo = true;
-						void this.newNoteNavigate(buttonFolderId, isTodo);
+						void this.newNoteNavigate(folderId, isTodo);
 					},
 					color: '#9b59b6',
 					icon: 'checkbox-outline',
@@ -241,9 +257,10 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 
 				buttons.push({
 					label: _('New note'),
-					onPress: () => {
+					onPress: async () => {
+						const folderId = await getTargetFolderId();
 						const isTodo = false;
-						void this.newNoteNavigate(buttonFolderId, isTodo);
+						void this.newNoteNavigate(folderId, isTodo);
 					},
 					color: '#9b59b6',
 					icon: 'document',
diff --git a/packages/app-mobile/root.tsx b/packages/app-mobile/root.tsx
index 5eb8944a2..39cf3d5df 100644
--- a/packages/app-mobile/root.tsx
+++ b/packages/app-mobile/root.tsx
@@ -317,6 +317,7 @@ const appReducer = (state = appDefaultState, action: any) => {
 
 				if ('smartFilterId' in action) {
 					newState.smartFilterId = action.smartFilterId;
+					newState.selectedSmartFilterId = action.smartFilterId;
 					newState.notesParentType = 'SmartFilter';
 				}
 

From 24ed5bda636ffa16dafcc6deb49fac895b6a8389 Mon Sep 17 00:00:00 2001
From: pedr <pedrlz.frn@gmail.com>
Date: Fri, 24 Nov 2023 10:48:41 -0300
Subject: [PATCH 02/17] Mobile: #9361: Fix to-dos options toggle don't toggle a
 rerender in  (#9364)

---
 packages/app-mobile/components/screens/Notes.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app-mobile/components/screens/Notes.tsx b/packages/app-mobile/components/screens/Notes.tsx
index dff462b71..2b7c16628 100644
--- a/packages/app-mobile/components/screens/Notes.tsx
+++ b/packages/app-mobile/components/screens/Notes.tsx
@@ -109,7 +109,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 	}
 
 	public async componentDidUpdate(prevProps: any) {
-		if (prevProps.notesOrder !== this.props.notesOrder || prevProps.selectedFolderId !== this.props.selectedFolderId || prevProps.selectedTagId !== this.props.selectedTagId || prevProps.selectedSmartFilterId !== this.props.selectedSmartFilterId || prevProps.notesParentType !== this.props.notesParentType) {
+		if (prevProps.notesOrder !== this.props.notesOrder || prevProps.selectedFolderId !== this.props.selectedFolderId || prevProps.selectedTagId !== this.props.selectedTagId || prevProps.selectedSmartFilterId !== this.props.selectedSmartFilterId || prevProps.notesParentType !== this.props.notesParentType || prevProps.uncompletedTodosOnTop !== this.props.uncompletedTodosOnTop || prevProps.showCompletedTodos !== this.props.showCompletedTodos) {
 			await this.refreshNotes(this.props);
 		}
 	}

From fec8c6131c5372dc8601e1ab7fd623c5878bef9d Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sun, 26 Nov 2023 12:37:45 +0100
Subject: [PATCH 03/17] Mobile: Fixes #9376: Sidebar is not dismissed when
 creating a note

---
 packages/app-mobile/components/ActionButton.tsx | 17 +++++++++++------
 .../components/NoteEditor/SearchPanel.tsx       |  4 +---
 packages/app-mobile/components/screens/Note.tsx |  2 +-
 .../app-mobile/components/screens/Notes.tsx     |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/app-mobile/components/ActionButton.tsx b/packages/app-mobile/components/ActionButton.tsx
index e8bcc2d79..0fdb0161c 100644
--- a/packages/app-mobile/components/ActionButton.tsx
+++ b/packages/app-mobile/components/ActionButton.tsx
@@ -1,10 +1,12 @@
 const React = require('react');
 import { useState, useCallback, useMemo } from 'react';
-
-const Icon = require('react-native-vector-icons/Ionicons').default;
 import { FAB, Portal } from 'react-native-paper';
 import { _ } from '@joplin/lib/locale';
+import { Dispatch } from 'redux';
+const Icon = require('react-native-vector-icons/Ionicons').default;
 
+// eslint-disable-next-line no-undef -- Don't know why it says React is undefined when it's defined above
+type FABGroupProps = React.ComponentProps<typeof FAB.Group>;
 
 type OnButtonPress = ()=> void;
 interface ButtonSpec {
@@ -19,6 +21,7 @@ interface ActionButtonProps {
 
 	// If not given, an "add" button will be used.
 	mainButton?: ButtonSpec;
+	dispatch: Dispatch;
 }
 
 const defaultOnPress = () => {};
@@ -36,10 +39,12 @@ const useIcon = (iconName: string) => {
 
 const ActionButton = (props: ActionButtonProps) => {
 	const [open, setOpen] = useState(false);
-	const onMenuToggled = useCallback(
-		(state: { open: boolean }) => setOpen(state.open)
-		, [setOpen]);
-
+	const onMenuToggled: FABGroupProps['onStateChange'] = useCallback(state => {
+		props.dispatch({
+			type: 'SIDE_MENU_CLOSE',
+		});
+		setOpen(state.open);
+	}, [setOpen, props.dispatch]);
 
 	const actions = useMemo(() => (props.buttons ?? []).map(button => {
 		return {
diff --git a/packages/app-mobile/components/NoteEditor/SearchPanel.tsx b/packages/app-mobile/components/NoteEditor/SearchPanel.tsx
index e912da924..8f665b629 100644
--- a/packages/app-mobile/components/NoteEditor/SearchPanel.tsx
+++ b/packages/app-mobile/components/NoteEditor/SearchPanel.tsx
@@ -40,9 +40,7 @@ interface ActionButtonProps {
 	onPress: Callback;
 }
 
-const ActionButton = (
-	props: ActionButtonProps,
-) => {
+const ActionButton = (props: ActionButtonProps) => {
 	return (
 		<CustomButton
 			themeId={props.themeId}
diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx
index 0cf6903a7..ca7d705c2 100644
--- a/packages/app-mobile/components/screens/Note.tsx
+++ b/packages/app-mobile/components/screens/Note.tsx
@@ -1422,7 +1422,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 
 			if (this.state.mode === 'edit') return null;
 
-			return <ActionButton mainButton={editButton} />;
+			return <ActionButton mainButton={editButton} dispatch={this.props.dispatch} />;
 		};
 
 		// Save button is not really needed anymore with the improved save logic
diff --git a/packages/app-mobile/components/screens/Notes.tsx b/packages/app-mobile/components/screens/Notes.tsx
index 2b7c16628..db09a474b 100644
--- a/packages/app-mobile/components/screens/Notes.tsx
+++ b/packages/app-mobile/components/screens/Notes.tsx
@@ -265,7 +265,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 					color: '#9b59b6',
 					icon: 'document',
 				});
-				return <ActionButton buttons={buttons}/>;
+				return <ActionButton buttons={buttons} dispatch={this.props.dispatch}/>;
 			}
 			return null;
 		};

From 67070ed3d58f736a5e9bba7f35f88b7606ba5383 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sun, 26 Nov 2023 12:38:28 +0100
Subject: [PATCH 04/17] Desktop release v2.13.7

---
 packages/app-desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
index a64fe9fb3..e516b769d 100644
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.13.6",
+  "version": "2.13.7",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

From e0795748a979c15b04f2a4867328544984dbd726 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:40:59 +0100
Subject: [PATCH 05/17] Android 2.13.8

---
 packages/app-mobile/android/app/build.gradle | 4 ++--
 readme/about/changelog/android.md            | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index 7d7a2544d..bdcd92fac 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097727
-		versionName "2.13.7"
+		versionCode 2097728
+		versionName "2.13.8"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/readme/about/changelog/android.md b/readme/about/changelog/android.md
index fff48a998..296106c3d 100644
--- a/readme/about/changelog/android.md
+++ b/readme/about/changelog/android.md
@@ -1,5 +1,11 @@
 # Joplin Android Changelog
 
+## [android-v2.13.8](https://github.com/laurent22/joplin/releases/tag/android-v2.13.8) (Pre-release) - 2023-11-26T12:37:00Z
+
+- Fixed: Fix to-dos options toggle don't toggle a rerender (#9364) (#9361 by [@pedr](https://github.com/pedr))
+- Fixed: Fix new note/to-do buttons not visible on app startup in some cases (#9329) (#9328 by Henry Heino)
+- Fixed: Sidebar is not dismissed when creating a note (#9376)
+
 ## [android-v2.13.7](https://github.com/laurent22/joplin/releases/tag/android-v2.13.7) (Pre-release) - 2023-11-16T13:17:53Z
 
 - Improved: Add more space between settings title and description (#9270) (#9258 by Henry Heino)

From 62e317db05fc02745b43b279612aca8020ecaf23 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:49:00 +0100
Subject: [PATCH 06/17] lock file

---
 packages/app-mobile/ios/Podfile.lock | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/app-mobile/ios/Podfile.lock b/packages/app-mobile/ios/Podfile.lock
index 5a81cda19..cbb23df71 100644
--- a/packages/app-mobile/ios/Podfile.lock
+++ b/packages/app-mobile/ios/Podfile.lock
@@ -359,9 +359,9 @@ PODS:
     - React-Core
   - react-native-rsa-native (2.0.5):
     - React
-  - react-native-saf-x (2.13.2):
+  - react-native-saf-x (2.13.3):
     - React-Core
-  - react-native-safe-area-context (4.7.3):
+  - react-native-safe-area-context (4.7.4):
     - React-Core
   - react-native-slider (4.4.3):
     - React-Core
@@ -479,7 +479,8 @@ PODS:
     - React
   - RNShare (9.4.1):
     - React-Core
-  - RNVectorIcons (10.0.0):
+  - RNVectorIcons (10.0.1):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNZipArchive (6.1.0):
     - React-Core
@@ -786,8 +787,8 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 681f7607418b97c084ba2d0999b153b103040d8a
   react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
   react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
-  react-native-saf-x: a93121b21f9d5ec84d5e7fc99fdeebfbf232920a
-  react-native-safe-area-context: 238cd8b619e05cb904ccad97ef42e84d1b5ae6ec
+  react-native-saf-x: 0f7531c9f8bdbb62bbd55ceb7433de7bb756cd73
+  react-native-safe-area-context: 2cd91d532de12acdb0a9cbc8d43ac72a8e4c897c
   react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
@@ -817,7 +818,7 @@ SPEC CHECKSUMS:
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
   RNShare: 32e97adc8d8c97d4a26bcdd3c45516882184f8b6
-  RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
+  RNVectorIcons: ace237de89f1574ef3c963ae9d5da3bd6fbeb02a
   RNZipArchive: ef9451b849c45a29509bf44e65b788829ab07801
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

From 02982464a61c700f7c2c297aa062bd0e32d1075b Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:55:26 +0100
Subject: [PATCH 07/17] iOS 12.13.8

---
 .../ios/Joplin.xcodeproj/project.pbxproj         | 16 ++++++++--------
 readme/about/changelog/ios.md                    |  6 ++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
index a7443b5c8..4b2749f1f 100644
--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -523,13 +523,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 104;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.7;
+				MARKETING_VERSION = 12.13.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -552,12 +552,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 104;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.7;
+				MARKETING_VERSION = 12.13.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -704,14 +704,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 104;
+				CURRENT_PROJECT_VERSION = 105;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.7;
+				MARKETING_VERSION = 12.13.8;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -735,14 +735,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 104;
+				CURRENT_PROJECT_VERSION = 105;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.7;
+				MARKETING_VERSION = 12.13.8;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/readme/about/changelog/ios.md b/readme/about/changelog/ios.md
index 536a1c2ed..7fd00a8d8 100644
--- a/readme/about/changelog/ios.md
+++ b/readme/about/changelog/ios.md
@@ -1,5 +1,11 @@
 # Joplin iOS Changelog
 
+## [ios-v12.13.8](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.8) - 2023-11-26T12:54:44Z
+
+- Fixed: Fix to-dos options toggle don't toggle a rerender (#9364) (#9361 by [@pedr](https://github.com/pedr))
+- Fixed: Fix new note/to-do buttons not visible on app startup in some cases (#9329) (#9328 by Henry Heino)
+- Fixed: Sidebar is not dismissed when creating a note (#9376)
+
 ## [ios-v12.13.7](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.7) - 2023-11-16T13:37:03Z
 
 - Improved: Add more space between settings title and description (#9270) (#9258 by Henry Heino)

From f0a1b417944b06c4b77ba404a089ca0ea7c0a3a8 Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Mon, 27 Nov 2023 11:14:04 -0800
Subject: [PATCH 08/17] Mobile: Resolves #9377: Don't attach empty drawings
 when a user exits without saving (#9386)

---
 .../ImageEditor/js-draw/createJsDrawEditor.ts |  4 --
 .../app-mobile/components/screens/Note.tsx    | 66 +++++++++++++------
 2 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.ts b/packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.ts
index e96851f21..530cdcb17 100644
--- a/packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.ts
+++ b/packages/app-mobile/components/NoteEditor/ImageEditor/js-draw/createJsDrawEditor.ts
@@ -156,10 +156,6 @@ export const createJsDrawEditor = (
 			// Load from a template if no initial data
 			if (svgData === '') {
 				await applyTemplateToEditor(editor, templateData);
-
-				// The editor expects to be saved initially (without
-				// unsaved changes). Save now.
-				saveNow();
 			} else {
 				await editor.loadFromSVG(svgData);
 			}
diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx
index ca7d705c2..61061a4be 100644
--- a/packages/app-mobile/components/screens/Note.tsx
+++ b/packages/app-mobile/components/screens/Note.tsx
@@ -749,7 +749,11 @@ class NoteScreenComponent extends BaseScreenComponent {
 			if (this.useEditorBeta()) {
 				// The beta editor needs to be explicitly informed of changes
 				// to the note's body
-				this.editorRef.current.insertText(newText);
+				if (this.editorRef.current) {
+					this.editorRef.current.insertText(newText);
+				} else {
+					logger.error(`Tried to attach resource ${resource.id} to the note when the editor is not visible!`);
+				}
 			}
 		} else {
 			newNote.body += `\n${resourceTag}`;
@@ -814,31 +818,34 @@ class NoteScreenComponent extends BaseScreenComponent {
 		}, 'image');
 	}
 
-	private drawPicture_onPress = async () => {
-		// Create a new empty drawing and attach it now.
-		const resource = await this.attachNewDrawing('');
-		await this.editDrawing(resource);
-	};
-
 	private async updateDrawing(svgData: string) {
 		let resource: ResourceEntity|null = this.state.imageEditorResource;
 
 		if (!resource) {
-			throw new Error('No resource is loaded in the editor');
+			resource = await this.attachNewDrawing(svgData);
+
+			// Set resouce and file path to allow
+			// 1. subsequent saves to update the resource
+			// 2. the editor to load from the resource's filepath (can happen
+			//    if the webview is reloaded).
+			this.setState({
+				imageEditorResourceFilepath: Resource.fullPath(resource),
+				imageEditorResource: resource,
+			});
+		} else {
+			logger.info('Saving drawing to resource', resource.id);
+
+			const tempFilePath = join(Setting.value('tempDir'), uuid.createNano());
+			await shim.fsDriver().writeFile(tempFilePath, svgData, 'utf8');
+
+			resource = await Resource.updateResourceBlobContent(
+				resource.id,
+				tempFilePath,
+			);
+			await shim.fsDriver().remove(tempFilePath);
+
+			await this.refreshResource(resource);
 		}
-
-		logger.info('Saving drawing to resource', resource.id);
-
-		const tempFilePath = join(Setting.value('tempDir'), uuid.createNano());
-		await shim.fsDriver().writeFile(tempFilePath, svgData, 'utf8');
-
-		resource = await Resource.updateResourceBlobContent(
-			resource.id,
-			tempFilePath,
-		);
-		await shim.fsDriver().remove(tempFilePath);
-
-		await this.refreshResource(resource);
 	}
 
 	private onSaveDrawing = async (svgData: string) => {
@@ -849,6 +856,23 @@ class NoteScreenComponent extends BaseScreenComponent {
 		this.setState({ showImageEditor: false });
 	};
 
+	private drawPicture_onPress = async () => {
+		if (this.state.mode === 'edit') {
+			// Create a new empty drawing and attach it now, before the image editor is opened.
+			// With the present structure of Note.tsx, the we can't use this.editorRef while
+			// the image editor is open, and thus can't attach drawings at the cursor locaiton.
+			const resource = await this.attachNewDrawing('');
+			await this.editDrawing(resource);
+		} else {
+			logger.info('Showing image editor...');
+			this.setState({
+				showImageEditor: true,
+				imageEditorResourceFilepath: null,
+				imageEditorResource: null,
+			});
+		}
+	};
+
 	private async editDrawing(item: BaseItem) {
 		const filePath = Resource.fullPath(item);
 		this.setState({

From b1c8cb5632055c98385cf3d02d4584097eac4848 Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Wed, 29 Nov 2023 06:17:29 -0800
Subject: [PATCH 09/17] Mobile: Fixes #9374: Fix tooltips don't disappear on
 some devices (upgrade to js-draw 1.13.2) (#9401)

---
 packages/app-mobile/package.json |  4 ++--
 yarn.lock                        | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/app-mobile/package.json b/packages/app-mobile/package.json
index 50db4ed62..7204050d7 100644
--- a/packages/app-mobile/package.json
+++ b/packages/app-mobile/package.json
@@ -88,7 +88,7 @@
     "@babel/preset-env": "7.20.2",
     "@babel/runtime": "7.20.0",
     "@joplin/tools": "~2.13",
-    "@js-draw/material-icons": "1.11.2",
+    "@js-draw/material-icons": "1.13.2",
     "@lezer/highlight": "1.1.4",
     "@testing-library/jest-native": "5.4.3",
     "@testing-library/react-native": "12.3.1",
@@ -106,7 +106,7 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jetifier": "2.0.0",
-    "js-draw": "1.11.2",
+    "js-draw": "1.13.2",
     "jsdom": "22.1.0",
     "metro-react-native-babel-preset": "0.73.9",
     "nodemon": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 70bb3256b..4f0b0c2b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6293,7 +6293,7 @@ __metadata:
     "@joplin/renderer": ~2.13
     "@joplin/tools": ~2.13
     "@joplin/utils": ~2.13
-    "@js-draw/material-icons": 1.11.2
+    "@js-draw/material-icons": 1.13.2
     "@lezer/highlight": 1.1.4
     "@react-native-community/clipboard": 1.5.1
     "@react-native-community/datetimepicker": 7.6.1
@@ -6323,7 +6323,7 @@ __metadata:
     jest: 29.7.0
     jest-environment-jsdom: 29.7.0
     jetifier: 2.0.0
-    js-draw: 1.11.2
+    js-draw: 1.13.2
     jsc-android: 241213.1.0
     jsdom: 22.1.0
     lodash: 4.17.21
@@ -6990,12 +6990,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@js-draw/material-icons@npm:1.11.2":
-  version: 1.11.2
-  resolution: "@js-draw/material-icons@npm:1.11.2"
+"@js-draw/material-icons@npm:1.13.2":
+  version: 1.13.2
+  resolution: "@js-draw/material-icons@npm:1.13.2"
   peerDependencies:
     js-draw: ^1.0.1
-  checksum: 6a6bbdf936d3a97fab43321d807672f157b12201290a98bd3fd33a7e53966647ed9c5a8aba5dfd6d743bfc37ab9ddff14cbb7fc3f4ffb8b79ff7617a7e886160
+  checksum: a442d10926b9218b959a2c5d441998c009d72be9b1c3c48a35501be74a27f107963e1c02dfa6c5c075d474de164a8d4571d0cb00a79645205c988f89a8ae5ea8
   languageName: node
   linkType: hard
 
@@ -26295,13 +26295,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-draw@npm:1.11.2":
-  version: 1.11.2
-  resolution: "js-draw@npm:1.11.2"
+"js-draw@npm:1.13.2":
+  version: 1.13.2
+  resolution: "js-draw@npm:1.13.2"
   dependencies:
     "@js-draw/math": ^1.11.1
     "@melloware/coloris": 0.22.0
-  checksum: 59669bbe37f4c980f8532b96ec7a80880966beca3a82973fa0681c3988d8ed12745d5c1b27645853806087664c14fa49530fc8815a471346f03b3ef7c4366ea9
+  checksum: 22dc85634f5717c015f31d0e6daabe8eb189930dc102a96b1a49f548e9b208d302e014822ed04b82931a5ba2bacd3a33d9407d8d0a329966595e83e118075fa7
   languageName: node
   linkType: hard
 

From 7f9bc1e15c42548a7329df56174c8a7322ff828b Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Thu, 30 Nov 2023 18:56:17 +0100
Subject: [PATCH 10/17] Android 2.13.9

---
 packages/app-mobile/android/app/build.gradle | 4 ++--
 readme/about/changelog/android.md            | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index bdcd92fac..4f7acb58e 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097728
-		versionName "2.13.8"
+		versionCode 2097729
+		versionName "2.13.9"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/readme/about/changelog/android.md b/readme/about/changelog/android.md
index 296106c3d..26ad58607 100644
--- a/readme/about/changelog/android.md
+++ b/readme/about/changelog/android.md
@@ -1,5 +1,10 @@
 # Joplin Android Changelog
 
+## [android-v2.13.9](https://github.com/laurent22/joplin/releases/tag/android-v2.13.9) (Pre-release) - 2023-11-30T17:55:54Z
+
+- Improved: Don't attach empty drawings when a user exits without saving (#9386) (#9377 by Henry Heino)
+- Fixed: Fix tooltips don't disappear on some devices (upgrade to js-draw 1.13.2) (#9401) (#9374 by Henry Heino)
+
 ## [android-v2.13.8](https://github.com/laurent22/joplin/releases/tag/android-v2.13.8) (Pre-release) - 2023-11-26T12:37:00Z
 
 - Fixed: Fix to-dos options toggle don't toggle a rerender (#9364) (#9361 by [@pedr](https://github.com/pedr))

From 56438ea6449bbb9bdae7c9e17de15aa3e4610da2 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Thu, 30 Nov 2023 18:56:49 +0100
Subject: [PATCH 11/17] iOS 12.13.9

---
 .../ios/Joplin.xcodeproj/project.pbxproj         | 16 ++++++++--------
 readme/about/changelog/ios.md                    |  5 +++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
index 4b2749f1f..5351771cc 100644
--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -523,13 +523,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.8;
+				MARKETING_VERSION = 12.13.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -552,12 +552,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.8;
+				MARKETING_VERSION = 12.13.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -704,14 +704,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.8;
+				MARKETING_VERSION = 12.13.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -735,14 +735,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.8;
+				MARKETING_VERSION = 12.13.9;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/readme/about/changelog/ios.md b/readme/about/changelog/ios.md
index 7fd00a8d8..cb0fcdcf4 100644
--- a/readme/about/changelog/ios.md
+++ b/readme/about/changelog/ios.md
@@ -1,5 +1,10 @@
 # Joplin iOS Changelog
 
+## [ios-v12.13.9](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.9) - 2023-11-30T17:56:37Z
+
+- Improved: Don't attach empty drawings when a user exits without saving (#9386) (#9377 by Henry Heino)
+- Fixed: Fix tooltips don't disappear on some devices (upgrade to js-draw 1.13.2) (#9401) (#9374 by Henry Heino)
+
 ## [ios-v12.13.8](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.8) - 2023-11-26T12:54:44Z
 
 - Fixed: Fix to-dos options toggle don't toggle a rerender (#9364) (#9361 by [@pedr](https://github.com/pedr))

From 7c24a2f4bead520b5782cdc08635c104eedffa81 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Thu, 30 Nov 2023 19:10:02 +0100
Subject: [PATCH 12/17] Releasing sub-packages

---
 packages/fork-htmlparser2/package.json    |  2 +-
 packages/fork-sax/package.json            |  2 +-
 packages/fork-uslug/package.json          |  2 +-
 packages/htmlpack/package.json            |  4 ++--
 packages/lib/package.json                 | 18 +++++++++---------
 packages/plugin-repo-cli/package.json     |  8 ++++----
 packages/react-native-saf-x/package.json  |  2 +-
 packages/renderer/package.json            |  8 ++++----
 packages/tools/package.json               | 10 +++++-----
 packages/turndown-plugin-gfm/package.json |  2 +-
 packages/turndown/package.json            |  2 +-
 packages/utils/package.json               |  2 +-
 12 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json
index fa011131b..6f5993216 100644
--- a/packages/fork-htmlparser2/package.json
+++ b/packages/fork-htmlparser2/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joplin/fork-htmlparser2",
   "description": "Fast & forgiving HTML/XML/RSS parser",
-  "version": "4.1.49",
+  "version": "4.1.50",
   "author": "Felix Boehm <me@feedic.com>",
   "publishConfig": {
     "access": "public"
diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json
index d39e691b2..a60f8a5ad 100644
--- a/packages/fork-sax/package.json
+++ b/packages/fork-sax/package.json
@@ -2,7 +2,7 @@
   "name": "@joplin/fork-sax",
   "description": "An evented streaming XML parser in JavaScript",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
-  "version": "1.2.53",
+  "version": "1.2.54",
   "main": "lib/sax.js",
   "publishConfig": {
     "access": "public"
diff --git a/packages/fork-uslug/package.json b/packages/fork-uslug/package.json
index 942e49086..3861b7b52 100644
--- a/packages/fork-uslug/package.json
+++ b/packages/fork-uslug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/fork-uslug",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "A permissive slug generator that works with unicode.",
   "author": "Jeremy Selier <jerem.selier@gmail.com>",
   "publishConfig": {
diff --git a/packages/htmlpack/package.json b/packages/htmlpack/package.json
index 380091859..6b6668244 100644
--- a/packages/htmlpack/package.json
+++ b/packages/htmlpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/htmlpack",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "Pack an HTML file and all its linked resources into a single HTML file",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -14,7 +14,7 @@
   "author": "Laurent Cozic",
   "license": "MIT",
   "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.49",
+    "@joplin/fork-htmlparser2": "^4.1.50",
     "css": "3.0.0",
     "datauri": "4.1.0",
     "fs-extra": "11.1.1",
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 9f39f8669..60d2fcaa3 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/lib",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "Joplin Core library",
   "author": "Laurent Cozic",
   "homepage": "",
@@ -31,14 +31,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.296.0",
     "@aws-sdk/s3-request-presigner": "3.296.0",
-    "@joplin/fork-htmlparser2": "^4.1.49",
-    "@joplin/fork-sax": "^1.2.53",
-    "@joplin/fork-uslug": "^1.0.14",
-    "@joplin/htmlpack": "^2.13.3",
-    "@joplin/renderer": "^2.13.3",
-    "@joplin/turndown": "^4.0.71",
-    "@joplin/turndown-plugin-gfm": "^1.0.53",
-    "@joplin/utils": "^2.13.3",
+    "@joplin/fork-htmlparser2": "^4.1.50",
+    "@joplin/fork-sax": "^1.2.54",
+    "@joplin/fork-uslug": "^1.0.15",
+    "@joplin/htmlpack": "^2.13.4",
+    "@joplin/renderer": "^2.13.4",
+    "@joplin/turndown": "^4.0.72",
+    "@joplin/turndown-plugin-gfm": "^1.0.54",
+    "@joplin/utils": "^2.13.4",
     "@types/nanoid": "3.0.0",
     "async-mutex": "0.4.0",
     "base-64": "1.0.0",
diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json
index 176a5f24b..2fcc0093b 100644
--- a/packages/plugin-repo-cli/package.json
+++ b/packages/plugin-repo-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/plugin-repo-cli",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "",
   "main": "index.js",
   "bin": "./dist/index.js",
@@ -18,9 +18,9 @@
   "author": "",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "^2.13.3",
-    "@joplin/tools": "^2.13.3",
-    "@joplin/utils": "^2.13.3",
+    "@joplin/lib": "^2.13.4",
+    "@joplin/tools": "^2.13.4",
+    "@joplin/utils": "^2.13.4",
     "fs-extra": "11.1.1",
     "gh-release-assets": "2.0.1",
     "node-fetch": "2.6.7",
diff --git a/packages/react-native-saf-x/package.json b/packages/react-native-saf-x/package.json
index 8cce98af1..147023447 100644
--- a/packages/react-native-saf-x/package.json
+++ b/packages/react-native-saf-x/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/react-native-saf-x",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "a module to help work with scoped storages on android easily",
   "main": "src/index",
   "react-native": "src/index",
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index 329236fe0..d9c7c9446 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/renderer",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "The Joplin note renderer, used the mobile and desktop application",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
   "main": "index.js",
@@ -28,9 +28,9 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.49",
-    "@joplin/fork-uslug": "^1.0.14",
-    "@joplin/utils": "^2.13.3",
+    "@joplin/fork-htmlparser2": "^4.1.50",
+    "@joplin/fork-uslug": "^1.0.15",
+    "@joplin/utils": "^2.13.4",
     "font-awesome-filetypes": "2.1.0",
     "fs-extra": "11.1.1",
     "highlight.js": "11.8.0",
diff --git a/packages/tools/package.json b/packages/tools/package.json
index 98c4ddb48..81f5a979d 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/tools",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "Various tools for Joplin",
   "main": "index.js",
   "author": "Laurent Cozic",
@@ -20,9 +20,9 @@
   },
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "^2.13.3",
-    "@joplin/renderer": "^2.13.3",
-    "@joplin/utils": "^2.13.3",
+    "@joplin/lib": "^2.13.4",
+    "@joplin/renderer": "^2.13.4",
+    "@joplin/utils": "^2.13.4",
     "compare-versions": "6.1.0",
     "dayjs": "1.11.10",
     "execa": "4.1.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@docusaurus/plugin-sitemap": "2.4.3",
-    "@joplin/fork-htmlparser2": "^4.1.49",
+    "@joplin/fork-htmlparser2": "^4.1.50",
     "@rmp135/sql-ts": "1.18.0",
     "@types/fs-extra": "11.0.3",
     "@types/jest": "29.5.5",
diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json
index 2612172b8..1e6ba80da 100644
--- a/packages/turndown-plugin-gfm/package.json
+++ b/packages/turndown-plugin-gfm/package.json
@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.53",
+  "version": "1.0.54",
   "author": "Dom Christie",
   "main": "lib/turndown-plugin-gfm.cjs.js",
   "devDependencies": {
diff --git a/packages/turndown/package.json b/packages/turndown/package.json
index 476e924cc..96d1637fd 100644
--- a/packages/turndown/package.json
+++ b/packages/turndown/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@joplin/turndown",
   "description": "A library that converts HTML to Markdown",
-  "version": "4.0.71",
+  "version": "4.0.72",
   "author": "Dom Christie",
   "main": "lib/turndown.cjs.js",
   "publishConfig": {
diff --git a/packages/utils/package.json b/packages/utils/package.json
index c50ef8df3..0be2782f9 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/utils",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "Utilities for Joplin",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils",
   "exports": {

From c18c31ab7f58aa13730db1c919d3c716ac71a89f Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Thu, 30 Nov 2023 19:10:57 +0100
Subject: [PATCH 13/17] Lock file

---
 yarn.lock | 58 +++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4f0b0c2b0..362ef1a4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6437,7 +6437,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-htmlparser2@^4.1.49, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
+"@joplin/fork-htmlparser2@^4.1.50, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2"
   dependencies:
@@ -6458,7 +6458,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-sax@^1.2.53, @joplin/fork-sax@workspace:packages/fork-sax":
+"@joplin/fork-sax@^1.2.54, @joplin/fork-sax@workspace:packages/fork-sax":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-sax@workspace:packages/fork-sax"
   dependencies:
@@ -6467,7 +6467,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-uslug@^1.0.14, @joplin/fork-uslug@workspace:packages/fork-uslug":
+"@joplin/fork-uslug@^1.0.15, @joplin/fork-uslug@workspace:packages/fork-uslug":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-uslug@workspace:packages/fork-uslug"
   dependencies:
@@ -6477,11 +6477,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/htmlpack@^2.13.3, @joplin/htmlpack@workspace:packages/htmlpack":
+"@joplin/htmlpack@^2.13.4, @joplin/htmlpack@workspace:packages/htmlpack":
   version: 0.0.0-use.local
   resolution: "@joplin/htmlpack@workspace:packages/htmlpack"
   dependencies:
-    "@joplin/fork-htmlparser2": ^4.1.49
+    "@joplin/fork-htmlparser2": ^4.1.50
     "@types/fs-extra": 11.0.3
     css: 3.0.0
     datauri: 4.1.0
@@ -6490,20 +6490,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/lib@^2.13.3, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.13":
+"@joplin/lib@^2.13.4, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.13":
   version: 0.0.0-use.local
   resolution: "@joplin/lib@workspace:packages/lib"
   dependencies:
     "@aws-sdk/client-s3": 3.296.0
     "@aws-sdk/s3-request-presigner": 3.296.0
-    "@joplin/fork-htmlparser2": ^4.1.49
-    "@joplin/fork-sax": ^1.2.53
-    "@joplin/fork-uslug": ^1.0.14
-    "@joplin/htmlpack": ^2.13.3
-    "@joplin/renderer": ^2.13.3
-    "@joplin/turndown": ^4.0.71
-    "@joplin/turndown-plugin-gfm": ^1.0.53
-    "@joplin/utils": ^2.13.3
+    "@joplin/fork-htmlparser2": ^4.1.50
+    "@joplin/fork-sax": ^1.2.54
+    "@joplin/fork-uslug": ^1.0.15
+    "@joplin/htmlpack": ^2.13.4
+    "@joplin/renderer": ^2.13.4
+    "@joplin/turndown": ^4.0.72
+    "@joplin/turndown-plugin-gfm": ^1.0.54
+    "@joplin/utils": ^2.13.4
     "@types/fs-extra": 11.0.3
     "@types/jest": 29.5.5
     "@types/js-yaml": 4.0.8
@@ -6607,9 +6607,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli"
   dependencies:
-    "@joplin/lib": ^2.13.3
-    "@joplin/tools": ^2.13.3
-    "@joplin/utils": ^2.13.3
+    "@joplin/lib": ^2.13.4
+    "@joplin/tools": ^2.13.4
+    "@joplin/utils": ^2.13.4
     "@types/fs-extra": 11.0.3
     "@types/jest": 29.5.5
     "@types/node": 18.18.7
@@ -6658,13 +6658,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/renderer@^2.13.3, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.13":
+"@joplin/renderer@^2.13.4, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.13":
   version: 0.0.0-use.local
   resolution: "@joplin/renderer@workspace:packages/renderer"
   dependencies:
-    "@joplin/fork-htmlparser2": ^4.1.49
-    "@joplin/fork-uslug": ^1.0.14
-    "@joplin/utils": ^2.13.3
+    "@joplin/fork-htmlparser2": ^4.1.50
+    "@joplin/fork-uslug": ^1.0.15
+    "@joplin/utils": ^2.13.4
     "@types/jest": 29.5.5
     "@types/markdown-it": 13.0.5
     "@types/node": 18.18.7
@@ -6761,15 +6761,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/tools@^2.13.3, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.13":
+"@joplin/tools@^2.13.4, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.13":
   version: 0.0.0-use.local
   resolution: "@joplin/tools@workspace:packages/tools"
   dependencies:
     "@docusaurus/plugin-sitemap": 2.4.3
-    "@joplin/fork-htmlparser2": ^4.1.49
-    "@joplin/lib": ^2.13.3
-    "@joplin/renderer": ^2.13.3
-    "@joplin/utils": ^2.13.3
+    "@joplin/fork-htmlparser2": ^4.1.50
+    "@joplin/lib": ^2.13.4
+    "@joplin/renderer": ^2.13.4
+    "@joplin/utils": ^2.13.4
     "@rmp135/sql-ts": 1.18.0
     "@types/fs-extra": 11.0.3
     "@types/jest": 29.5.5
@@ -6809,7 +6809,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/turndown-plugin-gfm@^1.0.53, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
+"@joplin/turndown-plugin-gfm@^1.0.54, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
   version: 0.0.0-use.local
   resolution: "@joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm"
   dependencies:
@@ -6821,7 +6821,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/turndown@^4.0.71, @joplin/turndown@workspace:packages/turndown":
+"@joplin/turndown@^4.0.72, @joplin/turndown@workspace:packages/turndown":
   version: 0.0.0-use.local
   resolution: "@joplin/turndown@workspace:packages/turndown"
   dependencies:
@@ -6838,7 +6838,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/utils@^2.13.3, @joplin/utils@workspace:packages/utils, @joplin/utils@~2.13":
+"@joplin/utils@^2.13.4, @joplin/utils@workspace:packages/utils, @joplin/utils@~2.13":
   version: 0.0.0-use.local
   resolution: "@joplin/utils@workspace:packages/utils"
   dependencies:

From 9bad668cc59fc7c3e394002dd366bcab26a609ee Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Thu, 30 Nov 2023 19:12:07 +0100
Subject: [PATCH 14/17] CLI v2.13.2

---
 packages/app-cli/package.json | 2 +-
 readme/about/changelog/cli.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json
index c8d8b9335..72ccefefa 100644
--- a/packages/app-cli/package.json
+++ b/packages/app-cli/package.json
@@ -35,7 +35,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.13.1",
+  "version": "2.13.2",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
diff --git a/readme/about/changelog/cli.md b/readme/about/changelog/cli.md
index 9f72761be..856718c7a 100644
--- a/readme/about/changelog/cli.md
+++ b/readme/about/changelog/cli.md
@@ -1,5 +1,11 @@
 # Joplin Terminal App Changelog
 
+## [cli-v2.13.2](https://github.com/laurent22/joplin/releases/tag/cli-v2.13.2) - 2023-11-30T18:11:38Z
+
+- Improved: Updated packages mermaid (v10.5.1), sass (v1.69.5)
+- Fixed: Import of inter-linked md files has incorrect notebook structure (#9269) (#9151 by [@pedr](https://github.com/pedr))
+- Fixed: Work around WebDAV sync issues over ipv6 (#9286) (#8788 by Henry Heino)
+
 ## [cli-v2.13.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.13.1) - 2023-11-09T20:08:17Z
 
 - Improved: Allow modifying a resource metadata only when synchronising (#9114)

From 0638d711d75938924f02b8c2cbf855aea34b1715 Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Fri, 1 Dec 2023 02:11:14 -0800
Subject: [PATCH 15/17] Mobile: Resolves #9427: Drawing: Revert recent changes
 to input system (#9426)

---
 packages/app-mobile/package.json |  4 ++--
 yarn.lock                        | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/app-mobile/package.json b/packages/app-mobile/package.json
index 7204050d7..93dfdab2b 100644
--- a/packages/app-mobile/package.json
+++ b/packages/app-mobile/package.json
@@ -88,7 +88,7 @@
     "@babel/preset-env": "7.20.2",
     "@babel/runtime": "7.20.0",
     "@joplin/tools": "~2.13",
-    "@js-draw/material-icons": "1.13.2",
+    "@js-draw/material-icons": "1.14.0",
     "@lezer/highlight": "1.1.4",
     "@testing-library/jest-native": "5.4.3",
     "@testing-library/react-native": "12.3.1",
@@ -106,7 +106,7 @@
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jetifier": "2.0.0",
-    "js-draw": "1.13.2",
+    "js-draw": "1.14.0",
     "jsdom": "22.1.0",
     "metro-react-native-babel-preset": "0.73.9",
     "nodemon": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 362ef1a4a..78d879903 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6293,7 +6293,7 @@ __metadata:
     "@joplin/renderer": ~2.13
     "@joplin/tools": ~2.13
     "@joplin/utils": ~2.13
-    "@js-draw/material-icons": 1.13.2
+    "@js-draw/material-icons": 1.14.0
     "@lezer/highlight": 1.1.4
     "@react-native-community/clipboard": 1.5.1
     "@react-native-community/datetimepicker": 7.6.1
@@ -6323,7 +6323,7 @@ __metadata:
     jest: 29.7.0
     jest-environment-jsdom: 29.7.0
     jetifier: 2.0.0
-    js-draw: 1.13.2
+    js-draw: 1.14.0
     jsc-android: 241213.1.0
     jsdom: 22.1.0
     lodash: 4.17.21
@@ -6990,12 +6990,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@js-draw/material-icons@npm:1.13.2":
-  version: 1.13.2
-  resolution: "@js-draw/material-icons@npm:1.13.2"
+"@js-draw/material-icons@npm:1.14.0":
+  version: 1.14.0
+  resolution: "@js-draw/material-icons@npm:1.14.0"
   peerDependencies:
     js-draw: ^1.0.1
-  checksum: a442d10926b9218b959a2c5d441998c009d72be9b1c3c48a35501be74a27f107963e1c02dfa6c5c075d474de164a8d4571d0cb00a79645205c988f89a8ae5ea8
+  checksum: 6e67ee6399b9b4f9e5891952e71a978acd69c0d386fe80c957ad884ab8e9f4f954aa0d9dd1b08e78f314b0b8f3807989a482ed4a153457a8bba67f5989dd7a0c
   languageName: node
   linkType: hard
 
@@ -26295,13 +26295,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-draw@npm:1.13.2":
-  version: 1.13.2
-  resolution: "js-draw@npm:1.13.2"
+"js-draw@npm:1.14.0":
+  version: 1.14.0
+  resolution: "js-draw@npm:1.14.0"
   dependencies:
     "@js-draw/math": ^1.11.1
     "@melloware/coloris": 0.22.0
-  checksum: 22dc85634f5717c015f31d0e6daabe8eb189930dc102a96b1a49f548e9b208d302e014822ed04b82931a5ba2bacd3a33d9407d8d0a329966595e83e118075fa7
+  checksum: 0e2bbf318a8ebc645ed83f8cf0ef1f43a49d85b5f83e0be1616ec200d37817070a002bda54ef21df72d74a37597aa61e61e94559b27fbe4de8fcdb70effa04d4
   languageName: node
   linkType: hard
 

From 39c8fc812d69ed6837329ac637bfe5caf27e5b7e Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:07:42 +0100
Subject: [PATCH 16/17] Android 2.13.10

---
 packages/app-mobile/android/app/build.gradle | 4 ++--
 readme/about/changelog/android.md            | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index 4f7acb58e..92ae73874 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097729
-		versionName "2.13.9"
+		versionCode 2097730
+		versionName "2.13.10"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/readme/about/changelog/android.md b/readme/about/changelog/android.md
index 26ad58607..b79bbb26f 100644
--- a/readme/about/changelog/android.md
+++ b/readme/about/changelog/android.md
@@ -1,5 +1,9 @@
 # Joplin Android Changelog
 
+## [android-v2.13.10](https://github.com/laurent22/joplin/releases/tag/android-v2.13.10) (Pre-release) - 2023-12-01T11:16:17Z
+
+- Improved: Drawing: Revert recent changes to input system (#9426) (#9427 by Henry Heino)
+
 ## [android-v2.13.9](https://github.com/laurent22/joplin/releases/tag/android-v2.13.9) (Pre-release) - 2023-11-30T17:55:54Z
 
 - Improved: Don't attach empty drawings when a user exits without saving (#9386) (#9377 by Henry Heino)

From 0d0398312f588787ff9b5caff6f5fcd4dd888fc6 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:08:37 +0100
Subject: [PATCH 17/17] iOS 12.13.10

---
 .../ios/Joplin.xcodeproj/project.pbxproj         | 16 ++++++++--------
 readme/about/changelog/ios.md                    |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
index 5351771cc..bb830ef83 100644
--- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
+++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
@@ -523,13 +523,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 107;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.9;
+				MARKETING_VERSION = 12.13.10;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -552,12 +552,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 107;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.13.9;
+				MARKETING_VERSION = 12.13.10;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -704,14 +704,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 107;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.9;
+				MARKETING_VERSION = 12.13.10;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -735,14 +735,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 107;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.13.9;
+				MARKETING_VERSION = 12.13.10;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/readme/about/changelog/ios.md b/readme/about/changelog/ios.md
index cb0fcdcf4..4c2d7239f 100644
--- a/readme/about/changelog/ios.md
+++ b/readme/about/changelog/ios.md
@@ -1,5 +1,9 @@
 # Joplin iOS Changelog
 
+## [ios-v12.13.10](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.10) - 2023-12-01T12:07:57Z
+
+- Improved: Drawing: Revert recent changes to input system (#9426) (#9427 by Henry Heino)
+
 ## [ios-v12.13.9](https://github.com/laurent22/joplin/releases/tag/ios-v12.13.9) - 2023-11-30T17:56:37Z
 
 - Improved: Don't attach empty drawings when a user exits without saving (#9386) (#9377 by Henry Heino)