Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add inline images preview to the Live Markdown Input on the web #49250

Merged
merged 11 commits into from
Sep 30, 2024
+25 −9
Merged

Add inline images preview to the Live Markdown Input on the web #49250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8f2d39c
Bump react-native-live-markdown version to 0.1.151
Skalakid Sep 16, 2024
df02ed9
Change inline image styles
Skalakid Sep 16, 2024
9e348f1
Change image loading indicator styles
Skalakid Sep 16, 2024
739716e
Fix lint error
Skalakid Sep 16, 2024
5ca74c5
Merge branch 'main' into @Skalakid/inline-images-feature
Skalakid Sep 17, 2024
01b478c
Bump react-native-live-markdown version to 0.1.153
Skalakid Sep 17, 2024
0fea3d8
Bump react-native-live-markdown version to 0.1.155
Skalakid Sep 18, 2024
11ff05b
Merge branch 'main' into @Skalakid/inline-images-feature
Skalakid Sep 20, 2024
032c075
Bump react-native-live-markdown version to 0.1.157
Skalakid Sep 20, 2024
a4807f2
Merge branch 'main' into @Skalakid/inline-images-feature
Skalakid Sep 25, 2024
e910ba3
Bump react-native-live-markdown version to 0.1.159
Skalakid Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,7 +2360,7 @@ PODS:
- RNGoogleSignin (10.0.1):
- GoogleSignIn (~> 7.0)
- React-Core
- RNLiveMarkdown (0.1.143):
- RNLiveMarkdown (0.1.159):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -2380,9 +2380,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNLiveMarkdown/common (= 0.1.143)
- RNLiveMarkdown/common (= 0.1.159)
- Yoga
- RNLiveMarkdown/common (0.1.143):
- RNLiveMarkdown/common (0.1.159):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3229,7 +3229,7 @@ SPEC CHECKSUMS:
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 8781e2529230a1bc3ea8d75e5c3cd071b6c6aed7
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
RNLiveMarkdown: e44918843c2638692348f39eafc275698baf0444
RNLiveMarkdown: 2d97e3f4952c642cdd31bc05555e44dc5edcdba1
RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4
RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"dependencies": {
"@dotlottie/react-player": "^1.6.3",
"@expensify/react-native-live-markdown": "0.1.143",
"@expensify/react-native-live-markdown": "0.1.159",
"@expo/metro-runtime": "~3.2.3",
"@firebase/app": "^0.10.10",
"@firebase/performance": "^0.6.8",
Expand Down
13 changes: 13 additions & 0 deletions src/hooks/useMarkdownStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ function useMarkdownStyle(message: string | null = null, excludeStyles: Array<ke
color: theme.mentionText,
backgroundColor: theme.mentionBG,
},
inlineImage: {
minWidth: variables.inlineImagePreviewMinSize,
minHeight: variables.inlineImagePreviewMinSize,
maxWidth: variables.inlineImagePreviewMaxSize,
maxHeight: variables.inlineImagePreviewMaxSize,
borderRadius: variables.componentBorderRadius,
marginTop: 4,
},
loadingIndicator: {
primaryColor: theme.spinner,
secondaryColor: `${theme.spinner}33`,
},
loadingIndicatorContainer: {},
};

if (excludeStyles.length) {
Expand Down
3 changes: 3 additions & 0 deletions src/styles/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ export default {

searchTypeColumnWidth: 52,

inlineImagePreviewMinSize: 64,
inlineImagePreviewMaxSize: 148,

composerTooltipShiftHorizontal: 10,
composerTooltipShiftVertical: -10,
gbrTooltipShiftHorizontal: -20,
Expand Down
Loading