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

Contact Info Block: changes for adaptation into a mobile block #17123

Merged
merged 13 commits into from
Oct 14, 2020
Merged

Contact Info Block: changes for adaptation into a mobile block #17123

merged 13 commits into from
Oct 14, 2020

Conversation

illusaen
Copy link
Contributor

@illusaen illusaen commented Sep 10, 2020

WIP Design

Fixes #2166

Changes proposed in this Pull Request:

  • Selecting contact info block instead of Email block on insert.
  • Changing font size on child blocks to default 16px.
  • Upping line height on child blocks with 4px padding.
  • Using Rich Text placeholder colors for dark and light modes.
  • Pulled Link address to Google Maps toggle into block settings on Address child block.
  • Changing keyboard type for Email to email keyboard, Phone to phone keypad.
  • Restricted available blocks to insert when in contact info block to: phone, address, email, separator, heading, and spacer.

Jetpack product discussion

Currently changing behaviours for contact-info for both web and native:

  • Select contact info block on insert instead of email.
  • Restricting choices to above choices when inserting child blocks.

Waiting on further dev input to decide on whether to keep web changes or not.

Does this pull request change what data or activity we track or use?

N/A

Testing instructions:

  1. Insert contact info block. Ensure that the block itself is selected instead of any of the children blocks.
  2. Ensure that placeholder text for child blocks are correct color.
  3. Type in text into email field. Ensure that text is correct color.
  4. Repeat for child blocks phone and address.
  5. Select address block.
  6. Select the settings on address block. Ensure that Link to Google maps toggle works and settings block looks correct.
  7. Switch to dark mode.
  8. Repeat steps 2-6 look correct in dark mode.

Proposed changelog entry for your changes:

  • Changing contact info block behaviour and design to match other blocks.

Screenshots

iosandroid
Simulator Screen Shot - iPhone 11 - 2020-09-14 at 15 02 27
Screenshot_1600113740
Screenshot_1600113788
NOTE: Still working on odd font mismatches between RichText/Contact info blocks and how they seem to differ between light/dark modes and iOS/Android despite having the same settings.

…t-info. Moving google map setting to address block setting.
…ess fragments to use map instead of listing each entry.
…lesFromColorScheme to placeholderTextColor for dark mode. Using Rich Text placeholder text color.
@jetpackbot
Copy link

jetpackbot commented Sep 10, 2020

Scheduled Jetpack release: November 3, 2020.
Scheduled code freeze: October 27, 2020

E2E results is available here (for debugging purposes): https://jetpack-e2e-dashboard.herokuapp.com/pr-17123

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Generated by 🚫 dangerJS against 39c0de6

@jeherve jeherve added [Block] Contact Info [Status] In Progress [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it [Focus] Blocks Issues related to the block editor, aka Gutenberg, and its extensions developed in Jetpack labels Sep 10, 2020
@jeherve jeherve changed the title Contact info Contact Info Block: changes for adaptation into a mobile block Sep 10, 2020
@etoledom etoledom self-requested a review September 10, 2020 12:10
Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this PR @illusaen, it looks pretty good so far! 🎉

I'd ask you if you could add screenshots with the before-after comparison for @iamthomasbishop to have a look at the changes 🙏
I saw the conversation in the issue ticket but it's good to have a comparison on the PR itself too as documentation :)

About the changes on web, I agree with @iamthomasbishop that we shouldn't change web behaviour. At least no without their review and approval. I think this would be beyond this particular mobile project so we could create an issue for web devs about this when this PR is merged, to get their thoughts about it. How does it sound to you?

I also left a code comment about the keyboard type not working for me. Could you check that out?
Thanks!

extensions/blocks/contact-info/address/edit.native.js Outdated Show resolved Hide resolved
extensions/blocks/contact-info/phone/edit.native.js Outdated Show resolved Hide resolved
…er on contact-info/address/edit in order to remove repeated code.
…for text and text-decoration for light and dark modes. Removing unused code.
Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Selecting contact info block instead of Email block on insert.
✅ Changing font size on child blocks to default 16px.
✅ Upping line height on child blocks with 2px padding. (I think it's 4px in code? Looks good to me though)
✅ Using Rich Text placeholder colors for dark and light modes.
✅ Pulled Link address to Google Maps toggle into block settings on Address child block.
✅ Changing keyboard type for Email to email keyboard, Phone to phone keypad.
✅ Restricted available blocks to insert when in contact info block to: phone, address, email, separator, heading, and spacer.

Everything looks great to me, nice job @illusaen ! 🎉

I left a small suggestion as code comments.
Other than that, there are a couple of lint issues from CI, it would be nice to fix them before merging.
Otherwise I'm happy to :shipit: !

Anything else to add @iamthomasbishop about the listed fixes?

extensions/blocks/contact-info/style.native.scss Outdated Show resolved Hide resolved
@illusaen
Copy link
Contributor Author

In discussion with @etoledom and @hypest, will split the font weight issue from this main contact info PR in order to keep the PR from hanging longer. @iamthomasbishop, does everything else look alright? Please also take a look at PR #2616 for corresponding Appium UI Tests.

@etoledom etoledom self-requested a review September 30, 2020 10:30
@iamthomasbishop
Copy link

@illusaen As far as I can tell from the screenshots above, everything looks pretty solid from a visual standpoint. Provided @etoledom has reviewed the tech side, I think we can move forward and make visual refinements if/where necessary. Nice work!

@etoledom etoledom added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] In Progress labels Oct 5, 2020
@jeherve jeherve added this to the 9.1 milestone Oct 5, 2020
@maxme maxme self-requested a review October 9, 2020 10:30
maxme
maxme previously approved these changes Oct 9, 2020
Copy link

@maxme maxme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job @illusaen - feature looks good to me!

@iamthomasbishop here is a test apk if you want to test it.

screenshot-2020-10-09_12 29 28 003

etoledom
etoledom previously approved these changes Oct 9, 2020
Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving based on the tests performed here

Great job @illusaen !

extensions/blocks/contact-info/editor.native.scss Outdated Show resolved Hide resolved
extensions/blocks/contact-info/edit.native.js Outdated Show resolved Hide resolved
extensions/blocks/contact-info/style.native.scss Outdated Show resolved Hide resolved
extensions/blocks/contact-info/style.native.scss Outdated Show resolved Hide resolved
@jeherve jeherve added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Oct 9, 2020
Co-authored-by: Jeremy Herve <jeremy@tagada.hu>
@etoledom etoledom dismissed stale reviews from maxme and themself via 65a7f2e October 13, 2020 16:02
@etoledom
Copy link
Contributor

Thank you @jeherve for your review!
I have updated the branch with the requested changes.

Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested after the latest changes and everything seems to work as expected 👍

@jeherve jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Oct 14, 2020
@jeherve jeherve merged commit ff65621 into Automattic:master Oct 14, 2020
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Oct 14, 2020
@jeherve
Copy link
Member

jeherve commented Oct 14, 2020

r215211-wpcom

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Contact Info [Focus] Blocks Issues related to the block editor, aka Gutenberg, and its extensions developed in Jetpack Touches WP.com Files [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Contact Info Jetpack enabled in Production
7 participants