Skip to content

[Gutenberg] Disable Story block #22449

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
fluiddot merged 7 commits into from
Jan 26, 2024
Merged

[Gutenberg] Disable Story block #22449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fc9592
Disable Story block
fluiddot Jan 23, 2024
2c08d38
Update Gutenberg Mobile reference
fluiddot Jan 23, 2024
e09875e
Remove initial prop to control Story block
fluiddot Jan 23, 2024
4cd2baf
Update Gutenberg Mobile reference
fluiddot Jan 25, 2024
a754b74
Update Gutenberg Mobile reference with tag
fluiddot Jan 26, 2024
872483c
Merge branch 'trunk' into gutenberg/disable-story-block
fluiddot Jan 26, 2024
cfafeb9
Merge branch 'trunk' into gutenberg/disable-story-block
fluiddot Jan 26, 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.111.0
tag: v1.112.0-alpha3
github_org: wordpress-mobile
repo_name: gutenberg-mobile
16 changes: 8 additions & 8 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PODS:
- FSInteractiveMap (0.1.0)
- Gifu (3.3.1)
- Gridicons (1.2.0)
- Gutenberg (1.111.0)
- Gutenberg (1.111.1)
- JTAppleCalendar (8.0.5)
- Kanvas (1.4.9):
- CropViewController
Expand Down Expand Up @@ -58,7 +58,7 @@ PODS:
- Sodium (0.9.1)
- Starscream (3.0.6)
- SVProgressHUD (2.2.5)
- SwiftLint (0.54.0)
- SwiftLint (0.53.0)
- UIDeviceIdentifier (2.3.0)
- WordPress-Aztec-iOS (1.19.9)
- WordPress-Editor-iOS (1.19.9):
Expand Down Expand Up @@ -106,7 +106,7 @@ DEPENDENCIES:
- FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
- Gifu (= 3.3.1)
- Gridicons (~> 1.2)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.111.0.podspec`)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec`)
- JTAppleCalendar (~> 8.0.5)
- Kanvas (~> 1.4.4)
- MediaEditor (>= 1.2.2, ~> 1.2)
Expand All @@ -130,7 +130,6 @@ SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPressAuthenticator
- WordPressKit
- WordPressShared
trunk:
- Alamofire
- AlamofireImage
Expand Down Expand Up @@ -159,6 +158,7 @@ SPEC REPOS:
- UIDeviceIdentifier
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressShared
- WordPressUI
- wpxmlrpc
- ZendeskCommonUISDK
Expand All @@ -175,7 +175,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.111.0.podspec
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec

CHECKOUT OPTIONS:
FSInteractiveMap:
Expand All @@ -194,7 +194,7 @@ SPEC CHECKSUMS:
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
Gutenberg: c222e0a909a508ecb1cc130278c17c0193cb64fc
Gutenberg: 69f7bd049f723c9574bbbc7019ecaf8bb6bb477f
JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
Expand All @@ -208,13 +208,13 @@ SPEC CHECKSUMS:
Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44
UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef
WordPressAuthenticator: e3c18f1b63222742a565fea3faf1a55a144ce8c4
WordPressKit: 57712035a44595cf49b0c9f0ad5b8b899a8cbe6a
WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b
WordPressShared: f99faa127509b666d2f8b931989a900e2fd9d10d
WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5
Expand Down
2 changes: 0 additions & 2 deletions WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
.unsupportedBlockEditor: false,
.canEnableUnsupportedBlockEditor: false,
.isAudioBlockMediaUploadEnabled: !isFreeWPCom,
.mediaFilesCollectionBlock: false,
.reusableBlock: false,
.shouldUseFastImage: !post.blog.isPrivate(),
.facebookEmbed: false,
Expand All @@ -1252,7 +1251,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
.unsupportedBlockEditor: isUnsupportedBlockEditorEnabled,
.canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false,
.isAudioBlockMediaUploadEnabled: !isFreeWPCom,
.mediaFilesCollectionBlock: post.blog.supports(.stories) && !UIDevice.isPad(),
// 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
.reusableBlock: isWPComSite,
Expand Down