Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
97ad278
Update reference to Gutenberg
SiobhyB Sep 8, 2021
6994e1f
Empty commit to retrigger checks.
SiobhyB Sep 9, 2021
3f20ecd
Update reference to Gutenberg
SiobhyB Sep 19, 2021
774b8f5
Merge branch 'develop' into fix/android-ube-text-selection
SiobhyB Sep 19, 2021
297fa0f
Update RELEASE-NOTES
SiobhyB Sep 20, 2021
35903c7
Update Gutenberg reference
SiobhyB Sep 20, 2021
80c72e9
Merge branch 'develop' into fix/android-ube-text-selection
SiobhyB Sep 20, 2021
1010343
Refactor jetpack editor setup
fluiddot Sep 22, 2021
659c578
Add register jetpack embed variations
fluiddot Sep 22, 2021
ad6e101
Update Gutenberg ref
fluiddot Sep 22, 2021
91b2360
Update Gutenberg ref
fluiddot Sep 22, 2021
68791c9
Use capabilities from root props in registerJetpackBlocks
fluiddot Sep 23, 2021
7a4cd98
Update Jetpack blocks unit test
fluiddot Sep 23, 2021
3e90cd2
Remove unused import
fluiddot Sep 23, 2021
1c70106
Update Gutenberg ref
fluiddot Sep 23, 2021
3a27228
Update Jetpack ref
fluiddot Sep 23, 2021
1fcb5d8
Update Jetpack ref
fluiddot Sep 27, 2021
d8c5b3d
Update gutenberg ref
dcalhoun Sep 27, 2021
07019f2
Merge branch 'develop' into embed-block-jetpack-variants
fluiddot Sep 27, 2021
ac8409f
Update Jetpack ref
fluiddot Sep 27, 2021
f6f0300
Register Jetpack embed variations by capabilities
fluiddot Sep 27, 2021
5251571
Update Gutenberg ref
fluiddot Sep 27, 2021
b0e85b8
Update Gutenberg ref
fluiddot Sep 28, 2021
ea24895
Update bundle
fluiddot Sep 28, 2021
5d68177
Update Jetpack ref
fluiddot Sep 28, 2021
428728e
Add embed variations to jetpack setup unit test
fluiddot Sep 28, 2021
1b69ad9
Update jetpack setup unit test
fluiddot Sep 28, 2021
6455b21
Update Jetpack ref
fluiddot Sep 28, 2021
e397997
Update reference to Gutenberg
SiobhyB Sep 28, 2021
141baff
Update reference to Gutenberg
SiobhyB Sep 29, 2021
423dea5
Merge branch 'fix/android-ube-text-selection' of https://github.com/w…
SiobhyB Sep 29, 2021
1cd54ba
Merge branch 'develop' into fix/android-ube-text-selection
SiobhyB Sep 29, 2021
ed8cd01
Update reference to Gutenberg
SiobhyB Sep 29, 2021
2e7fc08
Update Jetpack ref
fluiddot Sep 29, 2021
1e1ab21
Point to Android API 30 upgrade GB hash
hypest Sep 29, 2021
7cad013
Update Gutenberg ref
fluiddot Sep 29, 2021
617eb11
Update Gutenberg ref
fluiddot Oct 1, 2021
f0e0eb3
Update Gutenberg ref with merge commit
fluiddot Oct 1, 2021
7852a4a
Merge pull request #4064 from wordpress-mobile/fix/unreflected-change…
fluiddot Oct 1, 2021
274492b
Update Jetpack ref
fluiddot Oct 4, 2021
ec72204
Update Gutenberg ref
fluiddot Oct 4, 2021
18ee9a3
Merge branch 'develop' into embed-block-jetpack-variants
fluiddot Oct 4, 2021
4f1562b
Update Gutenberg ref
Oct 4, 2021
8860118
Update Gutenberg ref
fluiddot Oct 4, 2021
50789c7
Update Gutenberg ref
fluiddot Oct 4, 2021
ce78765
Update release notes
fluiddot Oct 4, 2021
a859569
Update Gutenberg reference
SiobhyB Oct 4, 2021
42db858
Merge branch 'develop' into fix/android-ube-text-selection
SiobhyB Oct 4, 2021
e7f6aac
Update Gutenberg ref
fluiddot Oct 5, 2021
388af4c
Update gutenberg ref
dcalhoun Oct 5, 2021
f330471
Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…
dcalhoun Oct 5, 2021
d3a18fe
Merge pull request #4035 from wordpress-mobile/chore/remove-block-ins…
dcalhoun Oct 5, 2021
63c539b
Merge branch 'develop' into merge_release_1.63.0_to_develop
twstokes Oct 6, 2021
5a3bf48
Update Gutenberg ref with merge commit
fluiddot Oct 6, 2021
f348f8f
Merge branch 'develop' into fix/embed-block-preview-cut-off
fluiddot Oct 6, 2021
47ae358
Merge pull request #4072 from wordpress-mobile/fix/embed-block-previe…
fluiddot Oct 6, 2021
4883537
Point to the merged-to-trunk commit on Gutenberg
hypest Oct 6, 2021
9add726
Merge branch 'develop' into upgrade-android-api-30
hypest Oct 6, 2021
e9ce304
Merge pull request #4049 from wordpress-mobile/upgrade-android-api-30
hypest Oct 6, 2021
1511ae1
Update Jetpack ref with merge commit
fluiddot Oct 6, 2021
3c23b9b
Update Gutenberg ref with merge commit
fluiddot Oct 6, 2021
bb6458f
Update bundle
fluiddot Oct 6, 2021
32c9abd
Merge branch 'develop' into embed-block-jetpack-variants
fluiddot Oct 6, 2021
80f5124
Merge pull request #4008 from wordpress-mobile/embed-block-jetpack-va…
fluiddot Oct 6, 2021
39a6138
Update Gutenberg ref
twstokes Oct 6, 2021
5419d19
Merge remote-tracking branch 'origin/develop' into merge_release_1.63…
twstokes Oct 6, 2021
95c2228
Update Jetpack ref
twstokes Oct 6, 2021
1b7d85b
Update release notes
fluiddot Oct 6, 2021
af2c2f3
Merge pull request #4078 from wordpress-mobile/merge_release_1.63.0_t…
twstokes Oct 6, 2021
880e8c5
Merge branch 'develop' into embed-block-jetpack-variants-release-notes
fluiddot Oct 7, 2021
dd0377a
Update release notes
fluiddot Oct 7, 2021
acd2240
Merge pull request #4082 from wordpress-mobile/embed-block-jetpack-va…
fluiddot Oct 7, 2021
8ea227d
Update release notes
fluiddot Oct 7, 2021
7909858
Merge pull request #4089 from wordpress-mobile/fix/changelog-1.62.1
fluiddot Oct 7, 2021
7e89b28
Update Gutenberg reference
SiobhyB Oct 8, 2021
8147ff6
Merge branch 'develop' into fix/android-ube-text-selection
SiobhyB Oct 8, 2021
8cd9cc5
Remove redundant lines from README
SiobhyB Oct 8, 2021
1fb5189
Update Gutenberg ref
fluiddot Oct 8, 2021
36963a2
Update release notes
fluiddot Oct 8, 2021
4648fb1
Update Gutenberg ref
fluiddot Oct 8, 2021
fa42e7a
Update Gutenberg reference
SiobhyB Oct 8, 2021
91cd7cb
Merge pull request #3937 from wordpress-mobile/fix/android-ube-text-s…
SiobhyB Oct 8, 2021
8c9a96c
Update gutenberg ref
dcalhoun Oct 12, 2021
775f8f8
Update release notes
dcalhoun Oct 12, 2021
432d7c2
Update gutenberg ref
dcalhoun Oct 12, 2021
5b7e0c0
Update release notes
dcalhoun Oct 12, 2021
be00d4b
Update gutenberg ref
dcalhoun Oct 12, 2021
c503a0c
Merge pull request #4105 from wordpress-mobile/bug/help-section-overflow
dcalhoun Oct 12, 2021
44c664a
Update Gutenberg ref
dcalhoun Oct 12, 2021
1c83b41
Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…
dcalhoun Oct 12, 2021
3f19075
Merge pull request #4106 from wordpress-mobile/bug/android-bottom-she…
dcalhoun Oct 13, 2021
3277053
Update Gutenberg ref with merge commit
fluiddot Oct 13, 2021
932d023
Merge branch 'develop' into fix/embed-block-set-empty-url
fluiddot Oct 13, 2021
5c8bb98
Merge pull request #4094 from wordpress-mobile/fix/embed-block-set-em…
fluiddot Oct 13, 2021
11d1ce3
Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…
dcalhoun Oct 13, 2021
06aa54e
Update Gutenberg ref
dcalhoun Oct 13, 2021
9d49121
Remove duplicative release notes
dcalhoun Oct 13, 2021
2334852
Empty commit
dcalhoun Oct 13, 2021
f49e4e5
Updated gutenberg ref.
jd-alexander Oct 13, 2021
2cd1e51
Updated RELEASE-NOTES.
jd-alexander Oct 13, 2021
4b4e08e
Merge pull request #4113 from wordpress-mobile/merge_release_1.63.1_t…
dcalhoun Oct 13, 2021
f7a8871
Updated gutenberg ref to merge commit.
jd-alexander Oct 13, 2021
8199b1e
Merge branch 'develop' into issue-3280/embed-block-paste-url
jd-alexander Oct 13, 2021
c56146d
Merge pull request #4048 from wordpress-mobile/issue-3280/embed-block…
jd-alexander Oct 13, 2021
54d1390
Update release notes
fluiddot Oct 14, 2021
2f54f93
Merge pull request #4119 from wordpress-mobile/fix/release-notes-pr-4048
fluiddot Oct 14, 2021
a93754a
Merge with develop
Oct 14, 2021
77b8dfb
Update Gutenberg ref
Oct 14, 2021
2b082ec
Fix jetpack reference
Oct 14, 2021
ea0a266
Merge pull request #4071 from wordpress-mobile/feature/block-styles-f…
Oct 14, 2021
1d01987
Release script: Update gb mobile version to 1.64.0
Oct 14, 2021
972efc6
Release script: Update gutenberg ref
Oct 14, 2021
90b65e7
Release script: Update bundle for: 1.64.0
Oct 14, 2021
e2952a6
Restore strings
Oct 14, 2021
97be929
Update release notes
Oct 14, 2021
878029c
Update Gutenberg ref
Oct 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Unreleased
---

1.64.0
------
* [*] [Unsupported Block Editor] Fix text selection bug for Android [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3937]
* [*] Embed block: Fix inline preview cut-off when editing URL [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4072]
* [**] Embed block: Include Jetpack embed variants [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4008]
* [*] Embed block: Fix URL not editable after dismissing the edit URL bottom sheet with empty value [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4094]
* [**] Embed block: Detect when an embeddable URL is pasted into an empty paragraph. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4048]
* [**] Pullquote block - Added support for text and background color customization [https://github.com/WordPress/gutenberg/pull/34451]
* [**] Preformatted block - Added support for text and background color customization [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4071]

1.63.1
------
* [*] Fixed missing modal backdrop for Android help section [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4106]
Expand All @@ -19,7 +29,7 @@ Unreleased
1.62.1
------
* [**] Image block: fix height and border regression. [https://github.com/WordPress/gutenberg/pull/34957]
* [**] Column block: fix width attribute flout cutoff. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3921]
* [**] Column block: fix width float attribute cut off. [https://github.com/WordPress/gutenberg/pull/35061]

1.62.0
------
Expand Down
2 changes: 2 additions & 0 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
<string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
<string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
<string name="gutenberg_native_copy_file_url" tools:ignore="UnusedResources">Copy file URL</string>
<string name="gutenberg_native_create_embed" tools:ignore="UnusedResources">Create embed</string>
<string name="gutenberg_native_create_link" tools:ignore="UnusedResources">Create link</string>
<string name="gutenberg_native_crosspost" tools:ignore="UnusedResources">Crosspost</string>
<string name="gutenberg_native_current_placeholder_text_is" tools:ignore="UnusedResources">Current placeholder text is</string>
<!-- translators: accessibility text. Inform about current unit value. %s: Current unit value. -->
Expand Down
1,928 changes: 968 additions & 960 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions bundle/ios/GutenbergNativeTranslations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ private func dummy() {
_ = NSLocalizedString("Copied block", comment: "")
_ = NSLocalizedString("Copy block", comment: "")
_ = NSLocalizedString("Copy file URL", comment: "")
_ = NSLocalizedString("Create embed", comment: "")
_ = NSLocalizedString("Create link", comment: "")
_ = NSLocalizedString("Crosspost", comment: "")
_ = NSLocalizedString("Current placeholder text is", comment: "")
_ = NSLocalizedString("Current unit is %s", comment: "translators: accessibility text. Inform about current unit value. %s: Current unit value.")
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 566 files
2 changes: 1 addition & 1 deletion jetpack
Submodule jetpack updated 870 files
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gutenberg-mobile",
"version": "1.63.1",
"version": "1.64.0",
"private": true,
"config": {
"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
Expand Down
19 changes: 15 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,31 @@ import {
* Internal dependencies
*/
import correctTextFontWeight from './text-font-weight-correct';
import setupJetpackEditor from './jetpack-editor-setup';
import {
registerJetpackBlocks,
registerJetpackEmbedVariations,
setupJetpackEditor,
} from './jetpack-editor-setup';
import setupBlockExperiments from './block-experiments-setup';
import initialHtml from './initial-html';

addAction( 'native.pre-render', 'gutenberg-mobile', () => {
addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => {
require( './strings-overrides' );
correctTextFontWeight();
} );

addAction( 'native.render', 'gutenberg-mobile', ( props ) => {
setupJetpackEditor(
props.jetpackState || { blogId: 1, isJetpackActive: true }
);

// Jetpack Embed variations use WP hooks that are attached to
// block type registration, so it’s required to add them before
// the core blocks are registered.
registerJetpackEmbedVariations( props );
} );

addAction( 'native.render', 'gutenberg-mobile', ( props ) => {
const capabilities = props.capabilities ?? {};
registerJetpackBlocks( props );
setupBlockExperiments( capabilities );
} );

Expand Down
96 changes: 68 additions & 28 deletions src/jetpack-editor-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@
* Internal dependencies
*/
import { JETPACK_DATA_PATH } from '../jetpack/projects/plugins/jetpack/extensions/shared/get-jetpack-data';
import isActive from '../jetpack/projects/plugins/jetpack/extensions/shared/is-active';
import {
reactivateFacebookEmbedBlockVariation,
reactivateInstagramEmbedBlockVariation,
registerLoomVariation,
registerSmartframeVariation,
} from '../jetpack/projects/plugins/jetpack/extensions/extended-blocks/core-embed';

/**
* WordPress dependencies
*/
import { dispatch, select } from '@wordpress/data';
import { dispatch } from '@wordpress/data';
import { store as editPostStore } from '@wordpress/edit-post';

// When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json
const supportedJetpackBlocks = {
Expand Down Expand Up @@ -37,39 +46,70 @@ const setJetpackData = ( {
return jetpackEditorInitialState;
};

export default ( jetpackState ) => {
const hideBlockByCapability = ( capability, blockName ) => {
if ( capability !== true ) {
dispatch( editPostStore ).hideBlockTypes( [ blockName ] );
} else {
dispatch( editPostStore ).showBlockTypes( [ blockName ] );
}
};

export function setupJetpackEditor( jetpackState ) {
if ( ! jetpackState.isJetpackActive ) {
return;
}

const jetpackData = setJetpackData( jetpackState );
return setJetpackData( jetpackState );
}

const toggleBlock = ( capability, blockName ) => {
if ( capability !== true ) {
dispatch( 'core/edit-post' ).hideBlockTypes( [ blockName ] );
} else {
dispatch( 'core/edit-post' ).showBlockTypes( [ blockName ] );
}
};

// Note on the use of setTimeout() here:
// We observed the settings may not be ready exactly when the native.render hooks get run but rather
// right after that execution cycle (because state hasn't changed yet). Hence, we're only checking for
// the actual settings to be loaded by using setTimeout without a delay parameter. This ensures the
// settings are loaded onto the store and we can use the core/block-editor selector by the time we do
// the actual check.

// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
setTimeout( () => {
const capabilities = select( 'core/block-editor' ).getSettings(
'capabilities'
);
export function registerJetpackBlocks( { capabilities } ) {
if ( ! isActive() ) {
return;
}

toggleBlock( capabilities.mediaFilesCollectionBlock, 'jetpack/story' );
toggleBlock( capabilities.contactInfoBlock, 'jetpack/contact-info' );
} );
hideBlockByCapability(
capabilities.mediaFilesCollectionBlock,
'jetpack/story'
);
hideBlockByCapability(
capabilities.contactInfoBlock,
'jetpack/contact-info'
);

// Register Jetpack blocks
require( '../jetpack/projects/plugins/jetpack/extensions/editor' );
}

return jetpackData;
};
export function registerJetpackEmbedVariations( { capabilities } ) {
if ( ! isActive() ) {
return;
}

// Register Jetpack Embed variations
[
{
// Facebook embed
capability: capabilities.facebookEmbed,
registerFunc: reactivateFacebookEmbedBlockVariation,
},
{
// Instagram embed
capability: capabilities.instagramEmbed,
registerFunc: reactivateInstagramEmbedBlockVariation,
},
{
// Loom embed
capability: capabilities.loomEmbed,
registerFunc: registerLoomVariation,
},
{
// Smartframe embed
capability: capabilities.smartframeEmbed,
registerFunc: registerSmartframeVariation,
},
].forEach( ( { capability, registerFunc } ) => {
if ( capability === true ) {
registerFunc();
}
} );
}
Loading