Skip to content

Integrate gutenberg-mobile release v1.119.1 #23304

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.

Sign up for GitHub

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

Merged
geriux merged 5 commits into from
Jun 4, 2024
Merged

Integrate gutenberg-mobile release v1.119.1 #23304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
423e1e4
Release script: Update gutenberg-mobile ref 1.119.1
Jun 4, 2024
7f3b750
Fix Unsupported block editor condition
Jun 4, 2024
9cc9f4f
Update Gutenbeg ref
Jun 4, 2024
e63ebea
GutenbergViewController - Simplify isJetpackSSOEnabled condition
Jun 4, 2024
1c816bb
Update Gutenberg ref
Jun 4, 2024
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
2 changes: 1 addition & 1 deletion Gutenberg/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#
# LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install
ref:
tag: v1.119.0
tag: v1.119.1
github_org: wordpress-mobile
repo_name: gutenberg-mobile
8 changes: 4 additions & 4 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ PODS:
- Gifu (3.3.1)
- Gravatar (1.0.1)
- Gridicons (1.2.0)
- Gutenberg (1.119.0)
- Gutenberg (1.119.1)
- JTAppleCalendar (8.0.5)
- Kanvas (1.4.9):
- CropViewController
Expand Down Expand Up @@ -107,7 +107,7 @@ DEPENDENCIES:
- Gifu (= 3.3.1)
- Gravatar (= 1.0.1)
- Gridicons (~> 1.2)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.119.0.podspec`)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.119.1.podspec`)
- JTAppleCalendar (~> 8.0.5)
- Kanvas (~> 1.4.4)
- MediaEditor (>= 1.2.2, ~> 1.2)
Expand Down Expand Up @@ -177,7 +177,7 @@ EXTERNAL SOURCES:
:git: https://github.com/wordpress-mobile/FSInteractiveMap.git
:tag: 0.2.0
Gutenberg:
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.119.0.podspec
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.119.1.podspec

CHECKOUT OPTIONS:
FSInteractiveMap:
Expand All @@ -197,7 +197,7 @@ SPEC CHECKSUMS:
Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842
Gravatar: 51437de6811c1d8d6f60c52985f2ca00a85cfc8e
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
Gutenberg: 7bc61c0ca4178a6e2de627222ece7b885c32be37
Gutenberg: f892e662861e9f3fd0516d1e8535d6535c108815
JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
Expand Down
9 changes: 6 additions & 3 deletions WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,7 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
.videoPressV5Support:
post.blog.supports(.videoPressV5),
.unsupportedBlockEditor: isUnsupportedBlockEditorEnabled,
.canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false,
.canEnableUnsupportedBlockEditor: (post.blog.jetpack?.isConnected ?? false) && !isJetpackSSOEnabled,
.isAudioBlockMediaUploadEnabled: !isFreeWPCom,
// Only enable reusable block in WP.com sites until the issue
// (https://github.com/wordpress-mobile/gutenberg-mobile/issues/3457) in self-hosted sites is fixed
Expand All @@ -1214,13 +1214,16 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
]
}

private var isJetpackSSOEnabled: Bool {
let blog = post.blog
return (blog.jetpack?.isConnected ?? false) && (blog.settings?.jetpackSSOEnabled ?? false)
}

private var isUnsupportedBlockEditorEnabled: Bool {
// The Unsupported Block Editor is disabled for all self-hosted non-jetpack sites.
// This is because they can have their web editor to be set to classic and then the fallback will not work.

let blog = post.blog
let isJetpackSSOEnabled = (blog.jetpack?.isConnected ?? false) && (blog.settings?.jetpackSSOEnabled ?? false)

return blog.isHostedAtWPcom || isJetpackSSOEnabled
}
}
Expand Down