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

Merge mobile development branch into master (v2) #14503

Merged
merged 45 commits into from
Mar 21, 2019
Merged

Conversation

Tug
Copy link
Contributor

@Tug Tug commented Mar 18, 2019

Description

This PR merges the rnmobile/develop branch back into master.
Context: #14075
Prior work: #14375

How has this been tested?

Follow instructions in gb-mobile PR: wordpress-mobile/gutenberg-mobile#759

noisysocks and others added 30 commits February 18, 2019 12:44
* RichText: only ignore input types that insert HTML

* Mark RichTextInputEvent as unstable

* Use Set
…eters returned onChange, and we forgot to update the PostTitle component (#13967)
Upload media progress bar is missing while media is uploading new
* Trigger onFocusStatusChange from PostTitle

* Fix lint issue

* Update post title shadow mechanism

Also open inner ref so that focus state can be updated when focus is made programmatically

* Update props

* Update onRef as ref

* Update title padding&margin
* Changed upload media icon color

* Changed media placeholder background color
* Fix unexpected token in native code

* Dummy commit to trigger Travis

* Include the rnmobile release branch to Travis builds
* Mobile: Replaced Links UI with bottom-sheet component

* Mobile links UI: Removed commented code.

* Mobile: Fix lint issues

* Mobile Links UI: Remove autofocus on Android.
This hides an issue where the modal sometimes will be under the keyboard on Android.
* Remove title vertical paddings for Android

* Revert "Remove title vertical paddings for Android"

This reverts commit 09f0d35.

* Import padding variables
* Don't allow placeholder to moves once we tap on it (#14066)

* Use platform based SCSS vars for block minHeight (#14070)
* Make richText height changes contained to the rich text block.

* Remove commented out code.

* Remove aztec height from state.

* Allow minHeight to be optional.

* Remove minHeight from postTitle.

* Remove minHeight on heading block.
* Fixes pasting in heading blocks.

* Fixed an issue with a missing constant.

* Removes some code that was added back as part of a merge conflict.

* Re-adds some code removed by mistake.
* RNMobile: Adding original versin of keyboard-avoiding-view (to be modified)

* Modified keyboard-avoiding-view to work well with bottom-sheets.
* Mobile Links UI: Avoid creating link with empty url field

* Mobile Links UI: Using URL Keyboard type for url field

* Fix lint issues
…is android (#14301)

* Avoid to reset html to empty string if block is heading on android platform

* Send empty tag flag from heading block to RichText
* Set minHeight based on fontSize or style.

* Only use the styles to set the min-height.
* Fix placeholder position of block appender

* Remove unused import

* Change import position

* Remove unused import in css file

* Remove extra container view

* Update travis.yml from master branch to fix CI issues
@Tug Tug added the Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) label Mar 19, 2019
Tug and others added 4 commits March 19, 2019 16:01
* added hook blocks.onRemoveBlockCheckUpload called in componentWillUnmount to make sure to cancel upload if block is deleted

* removed unused import

* moving bridge-specific code to Image component - if the filter exists and returns true, the upload cancellation will be requested

* using hook actions instead of filters
Copy link
Contributor

@koke koke left a comment

Choose a reason for hiding this comment

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

Tested on WPiOS and looks good to me

@Tug Tug merged commit 8260725 into master Mar 21, 2019
@Tug Tug deleted the rnmobile/develop-merge branch March 21, 2019 15:48
@oandregal oandregal restored the rnmobile/develop-merge branch March 21, 2019 16:14
@oandregal oandregal deleted the rnmobile/develop-merge branch March 21, 2019 16:14
@Tug Tug restored the rnmobile/develop-merge branch March 25, 2019 16:22
@Tug Tug deleted the rnmobile/develop-merge branch March 25, 2019 16:23
@youknowriad youknowriad added this to the 5.4 (Gutenberg) milestone Mar 29, 2019
@@ -0,0 +1,22 @@
// Block Creation Components
Copy link
Member

Choose a reason for hiding this comment

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

Can you help me understand why this file exists separate from index.js? Is it necessary that it does? Or did it just help simplify the migration? I'm concerned about the maintenance overhead in how new exported components need to be added to two files. And typically it's only made apparent after the fact (I'm encountering this in #21467).

Could we have a file of "common" imports? I mean, ideally all the components are made available in either environment, but I suppose it may unavoidable we'd need to exclude / include some as specific to one or the other.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change)
Projects
None yet
Development

Successfully merging this pull request may close these issues.