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

[Mobile] Disable Page Template picker if Modal Layout Picker is enabled #24061

Merged
merged 7 commits into from
Jul 24, 2020

Conversation

antonis
Copy link
Member

@antonis antonis commented Jul 20, 2020

Fixes: wordpress-mobile/gutenberg-mobile#2419

Related PRs:

Description

Adds a capability to hide the editor layout picker when the Modal Layout Picker(MLP) is enabled.
For detailed description of this PR please check wordpress-mobile/WordPress-Android#12482

Notes

This has been updated with the Consolidation of the Gutenberg initialProps handling

How has this been tested?

This feature can be tested by using the build from wordpress-mobile/WordPress-Android#12482

Screenshots

MLP Enabled MLP Disabled
device-2020-07-22-180349 device-2020-07-22-175155

Types of changes

New feature

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.

@github-actions
Copy link

github-actions bot commented Jul 20, 2020

Size Change: +346 B (0%)

Total Size: 1.15 MB

Filename Size Change
build/api-fetch/index.min.js 3.43 kB -1 B
build/block-editor/index.min.js 125 kB -99 B (0%)
build/block-library/editor-rtl.css 7.63 kB +22 B (0%)
build/block-library/editor.css 7.63 kB +22 B (0%)
build/block-library/index.min.js 132 kB +379 B (0%)
build/block-library/style-rtl.css 7.83 kB +8 B (0%)
build/block-library/style.css 7.83 kB +9 B (0%)
build/components/index.min.js 200 kB +2 B (0%)
build/core-data/index.min.js 11.5 kB +1 B
build/data/index.min.js 8.45 kB -2 B (0%)
build/editor/index.min.js 45.3 kB -2 B (0%)
build/list-reusable-blocks/index.min.js 3.12 kB -4 B (0%)
build/media-utils/index.min.js 5.33 kB +7 B (0%)
build/nux/index.min.js 3.4 kB +3 B (0%)
build/rich-text/index.min.js 13.9 kB +1 B
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.min.js 1.14 kB 0 B
build/annotations/index.min.js 3.67 kB 0 B
build/autop/index.min.js 2.82 kB 0 B
build/blob/index.min.js 620 B 0 B
build/block-directory/index.min.js 7.63 kB 0 B
build/block-directory/style-rtl.css 953 B 0 B
build/block-directory/style.css 952 B 0 B
build/block-editor/style-rtl.css 10.8 kB 0 B
build/block-editor/style.css 10.8 kB 0 B
build/block-library/theme-rtl.css 728 B 0 B
build/block-library/theme.css 729 B 0 B
build/block-serialization-default-parser/index.min.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.min.js 3.1 kB 0 B
build/blocks/index.min.js 48.3 kB 0 B
build/components/style-rtl.css 15.7 kB 0 B
build/components/style.css 15.6 kB 0 B
build/compose/index.min.js 9.68 kB 0 B
build/data-controls/index.min.js 1.29 kB 0 B
build/date/index.min.js 5.38 kB 0 B
build/deprecated/index.min.js 772 B 0 B
build/dom-ready/index.min.js 568 B 0 B
build/dom/index.min.js 3.23 kB 0 B
build/edit-navigation/index.min.js 10.8 kB 0 B
build/edit-navigation/style-rtl.css 1.08 kB 0 B
build/edit-navigation/style.css 1.08 kB 0 B
build/edit-post/index.min.js 304 kB 0 B
build/edit-post/style-rtl.css 5.61 kB 0 B
build/edit-post/style.css 5.61 kB 0 B
build/edit-site/index.min.js 16.9 kB 0 B
build/edit-site/style-rtl.css 3.06 kB 0 B
build/edit-site/style.css 3.06 kB 0 B
build/edit-widgets/index.min.js 9.37 kB 0 B
build/edit-widgets/style-rtl.css 2.45 kB 0 B
build/edit-widgets/style.css 2.45 kB 0 B
build/editor/editor-styles-rtl.css 537 B 0 B
build/editor/editor-styles.css 539 B 0 B
build/editor/style-rtl.css 3.78 kB 0 B
build/editor/style.css 3.78 kB 0 B
build/element/index.min.js 4.65 kB 0 B
build/escape-html/index.min.js 733 B 0 B
build/format-library/index.min.js 7.72 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.min.js 2.13 kB 0 B
build/html-entities/index.min.js 621 B 0 B
build/i18n/index.min.js 3.56 kB 0 B
build/is-shallow-equal/index.min.js 711 B 0 B
build/keyboard-shortcuts/index.min.js 2.51 kB 0 B
build/keycodes/index.min.js 1.94 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/notices/index.min.js 1.79 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.min.js 2.56 kB 0 B
build/primitives/index.min.js 1.4 kB 0 B
build/priority-queue/index.min.js 789 B 0 B
build/redux-routine/index.min.js 2.85 kB 0 B
build/server-side-render/index.min.js 2.71 kB 0 B
build/shortcode/index.min.js 1.7 kB 0 B
build/token-list/index.min.js 1.27 kB 0 B
build/url/index.min.js 4.06 kB 0 B
build/viewport/index.min.js 1.85 kB 0 B
build/warning/index.min.js 1.14 kB 0 B
build/wordcount/index.min.js 1.17 kB 0 B

compressed-size-action

@antonis antonis changed the title MLP Android GlueCode Enable Modal Layout Picker capability on Android Jul 20, 2020
@antonis antonis changed the title Enable Modal Layout Picker capability on Android Disable Page Template picker if Modal Layout Picker is enabled Jul 20, 2020
@antonis antonis changed the title Disable Page Template picker if Modal Layout Picker is enabled [Mobile] Disable Page Template picker if Modal Layout Picker is enabled Jul 20, 2020
@antonis antonis added Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) [Type] Enhancement A suggestion for improvement. labels Jul 22, 2020
@antonis antonis requested review from mchowning and chipsnyder July 22, 2020 15:09
@antonis antonis marked this pull request as ready for review July 22, 2020 15:11
@antonis antonis self-assigned this Jul 22, 2020
@@ -52,5 +54,6 @@ data class GutenbergProps(
const val PROP_CAPABILITIES = "capabilities"
const val PROP_CAPABILITIES_MENTIONS = "mentions"
const val PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR = "unsupportedBlockEditor"
const val PROP_NAME_MODAL_LAYOUT_PICKER = "modalLayoutPicker"
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a big deal, but for the sake of consistency with the other "capabilities" props, what would you think about renaming this variable to "PROP_CAPABILITIES_MODAL_LAYOUT_PICKER"?

Copy link
Member Author

Choose a reason for hiding this comment

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

You are right @mchowning . I copy pasted the wrong naming from the old code.
Thank you for your feedback :)

Copy link
Contributor

@chipsnyder chipsnyder left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for making that naming change.

@@ -10,7 +10,8 @@ data class GutenbergProps(
val editorTheme: Bundle?,
val translations: Bundle,
val isDarkMode: Boolean,
val htmlModeEnabled: Boolean
val htmlModeEnabled: Boolean,
val isModalLayoutPickerEnabled: Boolean
Copy link
Member Author

Choose a reason for hiding this comment

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

I was thinking of adding a default value to the new parameter in order to be able to merge this early without breaking the WP-Android code. Something like the following:

data class GutenbergProps @JvmOverloads constructor(
    val enableMentions: Boolean,
    val enableUnsupportedBlockEditor: Boolean,
    val localeSlug: String,
    val postType: String,
    val editorTheme: Bundle?,
    val translations: Bundle,
    val isDarkMode: Boolean,
    val htmlModeEnabled: Boolean
    val htmlModeEnabled: Boolean,
    val isModalLayoutPickerEnabled: Boolean = false
) {

Wdyt @mchowning , @chipsnyder ?

Copy link
Contributor

Choose a reason for hiding this comment

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

That seems like a good plan to me.

@antonis antonis merged commit eb78b4e into master Jul 24, 2020
@antonis antonis deleted the mobile/issue/2419-MLPContainerAndroid branch July 24, 2020 10:25
@github-actions github-actions bot added this to the Gutenberg 8.7 milestone Jul 24, 2020
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) [Type] Enhancement A suggestion for improvement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants