[CP Stag] Fix inline code font size in composer #39516

tomekzaw · 2024-04-03T15:32:43Z

Details

This PR unifies the font size of codeblock and inline code between chat history and composer box by setting the correct font size in composer box (Live Markdown Preview feature).

cc @thienlnam

Android:

iOS:

Web:

Fixed Issues

$ #39458
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-03T15:32:48Z

@shubham1206agra Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

tomekzaw · 2024-04-03T15:35:20Z

src/hooks/useMarkdownStyle.ts

                color: theme.text,
                backgroundColor: 'transparent',
            },
            pre: {
                fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+                fontSize: 13,


I've copied 13 from here:

App/src/styles/index.ts

Lines 185 to 193 in 7177173

pre: {

...baseCodeTagStyles(theme),

paddingVertical: 8,

paddingHorizontal: 12,

fontSize: 13,

fontFamily: FontUtils.fontFamily.platform.MONOSPACE,

marginTop: 0,

marginBottom: 0,

},

Perhaps we should expose it as variables.preFontSize?

tomekzaw · 2024-04-03T15:38:29Z

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


Currently, react-native-live-markdown supports only one fixed value for font size for each individual Markdown syntax style. However, the actual font size depends on whether the inline code is inside h1 or not:

App/src/styles/utils/index.ts

Lines 595 to 600 in 7177173

/**

* Returns the font size for the HTML code tag renderer.

*/

function getCodeFontSize(isInsideH1: boolean) {

return isInsideH1 ? 15 : 13;

}

I suggest that we use 13 for now as we need more time to implement it properly on Live Markdown side.

Here's how it looks with 13:

@thienlnam What do you think? Can we skip this edge case as for now?

Yeah this seems fine to skip

github-actions · 2024-04-03T15:54:34Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/39516/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/39516/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/39516/NewExpensify.dmg	https://39516.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

shubham1206agra · 2024-04-04T16:09:53Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

shubham1206agra · 2024-04-04T16:10:47Z

@thienlnam Please review and merge here.

OSBotify · 2024-04-04T16:21:51Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…line-code-font-size Fix inline code font size in composer (cherry picked from commit 0967e60)

OSBotify · 2024-04-08T10:58:20Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.60-13 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

Fix inline code font size in composer

94b87ac

tomekzaw requested a review from a team as a code owner April 3, 2024 15:32

melvin-bot bot requested review from shubham1206agra and removed request for a team April 3, 2024 15:32

thienlnam assigned tomekzaw Apr 3, 2024

thienlnam self-requested a review April 3, 2024 15:33

thienlnam added the Ready To Build label Apr 3, 2024

tomekzaw commented Apr 3, 2024

View reviewed changes

Update Podfile.lock

17e1f6e

shubham1206agra approved these changes Apr 4, 2024

View reviewed changes

thienlnam approved these changes Apr 4, 2024

View reviewed changes

thienlnam merged commit 0967e60 into Expensify:main Apr 4, 2024
18 of 20 checks passed

thienlnam changed the title ~~Fix inline code font size in composer~~ [CP Stag] Fix inline code font size in composer Apr 4, 2024

OSBotify pushed a commit that referenced this pull request Apr 4, 2024

Merge pull request #39516 from software-mansion-labs/@tomekzaw/fix-in…

43d455b

…line-code-font-size Fix inline code font size in composer (cherry picked from commit 0967e60)

github-actions bot mentioned this pull request Apr 4, 2024

Deploy Checklist: New Expensify 2024-04-04 #39588

Closed

48 tasks

melvin-bot bot mentioned this pull request Apr 8, 2024

[HOLD for payment 2024-04-15] [$500] The inline code format isn't previewing correctly #39458

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Stag] Fix inline code font size in composer #39516

[CP Stag] Fix inline code font size in composer #39516

tomekzaw commented Apr 3, 2024 •

edited

Loading

melvin-bot bot commented Apr 3, 2024

tomekzaw Apr 3, 2024

tomekzaw Apr 3, 2024

tomekzaw Apr 4, 2024

thienlnam Apr 4, 2024

github-actions bot commented Apr 3, 2024

shubham1206agra commented Apr 4, 2024

shubham1206agra commented Apr 4, 2024

OSBotify commented Apr 4, 2024

OSBotify commented Apr 8, 2024

	pre: {
	...baseCodeTagStyles(theme),
	paddingVertical: 8,
	paddingHorizontal: 12,
	fontSize: 13,
	fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
	marginTop: 0,
	marginBottom: 0,
	},

	/**
	* Returns the font size for the HTML code tag renderer.
	*/
	function getCodeFontSize(isInsideH1: boolean) {
	return isInsideH1 ? 15 : 13;
	}

[CP Stag] Fix inline code font size in composer #39516

[CP Stag] Fix inline code font size in composer #39516

Conversation

tomekzaw commented Apr 3, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 3, 2024

tomekzaw Apr 3, 2024

Choose a reason for hiding this comment

tomekzaw Apr 3, 2024

Choose a reason for hiding this comment

tomekzaw Apr 4, 2024

Choose a reason for hiding this comment

thienlnam Apr 4, 2024

Choose a reason for hiding this comment

github-actions bot commented Apr 3, 2024

shubham1206agra commented Apr 4, 2024

Reviewer Checklist

Screenshots/Videos

shubham1206agra commented Apr 4, 2024

OSBotify commented Apr 4, 2024

OSBotify commented Apr 8, 2024

tomekzaw commented Apr 3, 2024 •

edited

Loading