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

[RNMobile][Monorepo] Merge gutenberg-mobile and gutenberg master #23248

Conversation

ceyhun
Copy link
Member

@ceyhun ceyhun commented Jun 17, 2020

Please ignore review requests

Description

This is part of a migration effort of gutenberg-mobile to gutenberg repository with git history. More related PRs here: #18508

This PR updates Monorepo branch with latest changes from gutenberg-mobile/develop and gutenberg/master

How has this been tested?

  • npm run native start:reset
  • npm run native test
  • npm run native bundle:android
  • npm run native bundle:ios
  • npm run native android
  • npm run native ios
  • npm run lint
  • npm run test-unit:native
  • Check android and ios apps running in simulators for any errors

Screenshots

Types of changes

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR.

ocean90 and others added 30 commits June 6, 2020 12:22
* Docs: Fix links for dynamic blocks page

* Update docs/designers-developers/developers/tutorials/block-tutorial/creating-dynamic-blocks.md

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
* Update createBlockCompleter for eslint rules

* Update packages/block-editor/src/autocompleters/block.js

:+1:

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
* Fix for JSDoc warnings

* Fix for JSDoc warnings

* Apply suggestions from code review

Thanks!

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

* Update packages/block-editor/src/components/block-toolbar/utils.js

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
* Create Block: Revert changes to the list of categories in the prompt
Related issue: #22848
It ensures that blocks will continue to work with WordPress 5.4.x.
We should be able to use the new set of categories once WordPress 5.5 is out.

* Create Block: Add inline comments explaining how CSS imports in JS work
* Add code examples section

* Fix end tag

* Apply suggestions from code review

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

* One tab in

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
* Scripts: Remove legacy env scripts and packages.

* Scripts: Leave deprecation message for `env`.

* Update link.

* Update changelog.
* Add missing @param docs

* Apply suggestions from code review

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
* Add missing @param docs

* Apply suggestions from code review

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>

Co-authored-by: Dominik Schilling <dominikschilling+git@gmail.com>
…lock id. (#22881)

* Update the block management to store the installing status per block id.

* Fix unit tests.

* Update the layout to match other selectors.

* Switch to useSelect hook.

* Add unit tests for installing selector.
…Menus page (#22885)

* Fix prop passing

* Disable down arrow key behavior
* Add rich image editing option to experiments page

* Fix comment

* Use sentence case for description

* Update docs
Co-authored-by: Andrew Duthie <andrew@andrewduthie.com>
Co-authored-by: Marcus Kazmierczak <marcus@mkaz.com>
* Fix matrix popover style.

* Fix for replace flow.

* Fix alignment toolbars.

* Update snapshots.
# Conflicts:
#	bundle/android/App.js
#	bundle/android/App.js.map
#	bundle/android/raw/i18ncache_data_de.json
#	bundle/android/raw/i18ncache_data_ro.json
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	bundle/ios/assets/i18n-cache/data/de.json
#	bundle/ios/assets/i18n-cache/data/ro.json
#	gutenberg
#	ios/Podfile.lock
torounit and others added 26 commits June 18, 2020 07:09
…mentaryAreaToggle. (#22967)

* Block Library: Fix React does not recognize isSelected prop in ComplementaryAreaToggle.

* remove isSelected from props
* Inserter: Fix handling of child blocks

When a block C specifies `parent: [ P ]`, it means that C may only be
added to P. It does NOT mean that P may *only* contain C. (Which is what
`<InnerBlocks allowedBlocks={ [ C ] }>` means.)

This fixes the Inserter so that the correct blocks are shown when
inserting into a block that is referenced by `parent`. It does so by
leaning on `getInserterItems()` which does the right thing.

* Inserter: Make ChildBlocks have a similar API to InserterPanel

* E2E Tests: Add Child Blocks tests and test plugin

* Inserter: Clarify inline comment
…pletion

[Android] Seamless media upload completion
* Retire the lighter variables.

* Change the dark colors to be dynamic.

* Revert the HSL.

* Fix focus for inserter.
since the bridge code got two folders inside the gutenberg/packages
folder.
Also added a check to insure that this kind of mistake gets caught
quickly in the future since otherwise it only reveals itself at runtime.
@hypest
Copy link
Contributor

hypest commented Jun 22, 2020

Looks like Travis might be backed up atm and takes too long to start the jobs. The good news is that the PR build on top of this one had CI be green so, will admin-merge this one anyway. Besides, it's targeting the feature branch so it's "safe".

Will merge by "preserving merge commits".

@hypest hypest merged commit 9131d96 into feat/import-gutenberg-mobile-no-squash Jun 22, 2020
@hypest hypest deleted the rnmobile/monorepo-merge-master-and-gbmobile-develop branch June 22, 2020 19:20
@Tug Tug mentioned this pull request Jun 22, 2020
6 tasks
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.