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.

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

change font size for code block in H1 #30876

Conversation

yakupafsin
Copy link
Contributor

@yakupafsin yakupafsin commented Nov 3, 2023

@s77rt

Details

Created a new function to check if there is an ancestor node with the name 'h1' and applied on CodeRenderer.js to change code block font-size if it is inside h1 tag.

Fixed Issues

$ #30203
PROPOSAL: #30203 (comment)

Tests

  1. Open the app
  2. Open any report
  3. Send a normal message and observe its font size
  4. Send a heading message (add # in beginning)
  5. Verify that the font size of the heading message is bigger than that of the normal message
  6. Send a normal single backtick code block e.g. Hello and observe its font size
  7. Send a heading single backtick code block eg: # Hello
  8. Verify that the font size of the heading message is bigger than that of the normal message
  • Verify that no errors appear in the JS console

Offline tests

Not connectivity related.

QA Steps

  1. Open the app
  2. Open any report
  3. Send a normal message and observe its font size
  4. Send a heading message (add # in beginning)
  5. Verify that the font size of the heading message is bigger than that of the normal message
  6. Send a normal single backtick code block e.g. Hello and observe its font size
  7. Send a heading single backtick code block eg: # Hello
  8. Verify that the font size of the heading message is bigger than that of the normal message
  • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

android-Native

Android: mWeb Chrome

android-mWeb

iOS: Native

ios-native

iOS: mWeb Safari

ios-mWeb

MacOS: Chrome / Safari
3dcfd030-8871-4fd6-871e-f5170f9a26a4.mp4
MacOS: Desktop

MacOS-Desktop

@yakupafsin yakupafsin requested a review from a team as a code owner November 3, 2023 20:42
@melvin-bot melvin-bot bot requested review from s77rt and removed request for a team November 3, 2023 20:42
Copy link

melvin-bot bot commented Nov 3, 2023

@s77rt 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]

Copy link
Contributor

github-actions bot commented Nov 3, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@yakupafsin
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@yakupafsin yakupafsin changed the title 30203 change font size for code block on bold change font size for code block on bold Nov 3, 2023
@s77rt
Copy link
Contributor

s77rt commented Nov 6, 2023

Please update the test steps to the following:

  1. Open the app
  2. Open any report
  3. Send a normal message and observe its font size
  4. Send a heading message (add # in beginning)
  5. Verify that the font size of the heading message is bigger than that of the normal message
  6. Send a normal single backtick code block e.g. Hello and observe its font size
  7. Send a heading single backtick code block eg: # Hello
  8. Verify that the font size of the heading message is bigger than that of the normal message

src/styles/StyleUtils.ts Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Nov 6, 2023

Please run npm run prettier

src/components/HTMLEngineProvider/htmlEngineUtils.js Outdated Show resolved Hide resolved
src/styles/StyleUtils.ts Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Nov 6, 2023

Please update the tests and the qa tests as mentioned above. Also please complete the screenshots for the rest of the platforms

@s77rt
Copy link
Contributor

s77rt commented Nov 6, 2023

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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(themeColors.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 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
Android: mWeb Chrome mweb-chrome
iOS: Native ios
iOS: mWeb Safari mweb-safari
MacOS: Chrome / Safari web
MacOS: Desktop desktop

@s77rt
Copy link
Contributor

s77rt commented Nov 7, 2023

@yakupafsin Thank you!

PS: Next time please tag me after making such changes because there is no notification for those actions (change title, change description, etc.)

@melvin-bot melvin-bot bot requested a review from roryabraham November 7, 2023 12:48
@yakupafsin
Copy link
Contributor Author

@s77rt sorry, I've totally forgotten about it. Thank you for your time. And sorry for the hassle :). It was my first PR with Expensify. I'll try to do it more professionally next time.

@roryabraham roryabraham changed the title change font size for code block on bold change font size for code block in H1 Nov 7, 2023
roryabraham
roryabraham previously approved these changes Nov 7, 2023
@roryabraham
Copy link
Contributor

roryabraham commented Nov 7, 2023

@yakupafsin I will not be able to merge this PR since it contains unsigned commits. Please retroactively sign all the commits for this PR so that I can merge it

@roryabraham
Copy link
Contributor

You've also got lint errors it seems

@yakupafsin
Copy link
Contributor Author

@roryabraham because last 2 commits are co-authered woth @s77rt I guess that's why it looks unsigned. We need to undo that 2 commit and re-commit them.

@yakupafsin yakupafsin force-pushed the 30203-change-font-size-for-code-block-on-bold branch from aa882a4 to da842ee Compare November 7, 2023 17:14
@yakupafsin
Copy link
Contributor Author

@roryabraham I've removed that 2 commits and pushed 2 new commits. I guess all will be signed now.

@yakupafsin
Copy link
Contributor Author

@roryabraham I've double-checked but couldn't find any lint errors.

Mentioned that fontSize controlled by getCodeFontSize function in `StyleUtils.js`

Signed-off-by: Yakup Afsin <[email protected]>
Signed-off-by: Yakup Afsin <[email protected]>
@yakupafsin yakupafsin force-pushed the 30203-change-font-size-for-code-block-on-bold branch from 7abef85 to 2f4fe78 Compare November 8, 2023 00:33
@yakupafsin
Copy link
Contributor Author

Hi @roryabraham, I've signed all the commits. Because I've changed my device I forgot change my gitconfig file. Sorry about that. But I've signed them now.

roryabraham
roryabraham previously approved these changes Nov 8, 2023
@roryabraham
Copy link
Contributor

@yakupafsin looks like we've got some lint errors here: https://github.com/Expensify/App/actions/runs/6792085078/job/18467959217?pr=30876

Also, NAB but if you don't mind I think we could generalize HTMLEngineUtils.isInsideH1 to be something like isChildOfNode:

/**
 * Check if there is an ancestor node for which the predicate returns true.
 *
 * @param {TNode} tnode
 * @param {Function} predicate
 * @returns {Boolean}
 */
function isChildOfNode(tnode, predicate) {
    let currentNode = tnode.parent;
    while (currentNode) {
        if (predicate(currentNode)) {
            return true;
        }
        currentNode = currentNode.parent;
    }
    return false;
}

/**
 * Check if node is a child of a comment tag.
 *
 * @param {TNode} tnode
 * @returns {Boolean}
 */
function isChildOfComment(tnode) {
    return isChildOfNode(tnode, (node) => isCommentTag(node.domNode.name));
}

/**
 * Check if node is a child of an h1 tag.
 *
 * @param {TNode} tnode
 * @returns {Boolean}
 */
function isChildOfH1(tnode) {
    return isChildOfNode(tnode, (node) => node.domNode.name.toLowerCase() === 'h1');
}

@yakupafsin
Copy link
Contributor Author

@roryabraham I was planning to do something like this, but I decided not to touch someone else's code 😅. But yes, that looks better. Let me change it.

@yakupafsin
Copy link
Contributor Author

Hi @roryabraham, I've found the lint error. And also applied the changes on htmlEngineUtils.js

@roryabraham
Copy link
Contributor

roryabraham commented Nov 8, 2023

@yakupafsin please run npm run lint or npm run lint-changed (which is generally faster) to find and address the lint errors.

@yakupafsin
Copy link
Contributor Author

@roryabraham now it's ready to merge I guess :)

@roryabraham roryabraham merged commit fac5b04 into Expensify:main Nov 8, 2023
@OSBotify
Copy link
Contributor

OSBotify commented Nov 8, 2023

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.97-7 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.98-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.98-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants