From 94b87ac1d42c32ba612793a3c4235924d1f629a8 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 3 Apr 2024 17:29:27 +0200 Subject: [PATCH 1/2] Fix inline code font size in composer --- ios/Podfile.lock | 6 +++--- package-lock.json | 8 ++++---- package.json | 2 +- src/hooks/useMarkdownStyle.ts | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 24ef0704be25..202adbe6db8a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1363,7 +1363,7 @@ PODS: - RNGoogleSignin (10.0.1): - GoogleSignIn (~> 7.0) - React-Core - - RNLiveMarkdown (0.1.35): + - RNLiveMarkdown (0.1.36): - glog - RCT-Folly (= 2022.05.16.00) - React-Core @@ -1904,7 +1904,7 @@ SPEC CHECKSUMS: RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 - RNLiveMarkdown: aaf5afb231515d8ddfdef5f2928581e8ff606ad4 + RNLiveMarkdown: e6312e556c522dd178728b28e132b16354789cb8 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 rnmapbox-maps: fcf7f1cbdc8bd7569c267d07284e8a5c7bee06ed RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa @@ -1925,4 +1925,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a431c146e1501391834a2f299a74093bac53b530 -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.3 diff --git a/package-lock.json b/package-lock.json index e50cff0dbf27..e8b893b69e39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "MIT", "dependencies": { "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "0.1.35", + "@expensify/react-native-live-markdown": "0.1.36", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2", @@ -3097,9 +3097,9 @@ } }, "node_modules/@expensify/react-native-live-markdown": { - "version": "0.1.35", - "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.35.tgz", - "integrity": "sha512-W0FFIiU/sT+AwIrIOUHiNAHYjODAkEdYsf75tfBbkA6v2byHPxUlbzaJrZEQc0HgbvtAfTf9iQQqGWjNqe4pog==", + "version": "0.1.36", + "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.36.tgz", + "integrity": "sha512-dJ8V873DW7wP+OFU50XEIgR/cavfmVKXIUI4bN/oI3SbGiGVXrOVcBbg6THx0HrclupVxg/qsHxaDAXsYLV/iA==", "engines": { "node": ">= 18.0.0" }, diff --git a/package.json b/package.json index d600f2dfc1bf..57efcd15b4c4 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "0.1.35", + "@expensify/react-native-live-markdown": "0.1.36", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2", diff --git a/src/hooks/useMarkdownStyle.ts b/src/hooks/useMarkdownStyle.ts index e753218e8406..72e2734a4744 100644 --- a/src/hooks/useMarkdownStyle.ts +++ b/src/hooks/useMarkdownStyle.ts @@ -26,11 +26,13 @@ function useMarkdownStyle(): MarkdownStyle { }, code: { fontFamily: FontUtils.fontFamily.platform.MONOSPACE, + fontSize: 13, // TODO: should be 15 if inside h1, see StyleUtils.getCodeFontSize color: theme.text, backgroundColor: 'transparent', }, pre: { fontFamily: FontUtils.fontFamily.platform.MONOSPACE, + fontSize: 13, color: theme.text, backgroundColor: 'transparent', }, From 17e1f6ef33ba4175c2546241927529bc7f164db0 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 3 Apr 2024 21:43:37 +0200 Subject: [PATCH 2/2] Update Podfile.lock --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 202adbe6db8a..333842e5b36a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1925,4 +1925,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a431c146e1501391834a2f299a74093bac53b530 -COCOAPODS: 1.14.3 +COCOAPODS: 1.13.0