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.

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

[Gutenberg] Disable Story block #22449

Merged
merged 7 commits into from
Jan 26, 2024
Merged

[Gutenberg] Disable Story block #22449

Show file tree
Hide file tree
Changes from 4 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-alpha2
commit: 674dc6550184c3b60cbb392091f7e9166ab06cad
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 @@ -26,7 +26,7 @@ PODS:
- FSInteractiveMap (0.1.0)
- Gifu (3.3.1)
- Gridicons (1.2.0)
- Gutenberg (1.110.0)
- Gutenberg (1.111.1)
- JTAppleCalendar (8.0.5)
- Kanvas (1.4.9):
- CropViewController
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-alpha2.podspec`)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec`)
- JTAppleCalendar (~> 8.0.5)
- Kanvas (~> 1.4.4)
- MediaEditor (>= 1.2.2, ~> 1.2)
Expand Down Expand Up @@ -174,7 +174,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-alpha2.podspec
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec
WordPressShared:
:commit: 47c5cbfc781b6aa7f577fbc413236c739e4332b4
:git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
Expand All @@ -199,7 +199,7 @@ SPEC CHECKSUMS:
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
Gutenberg: b16b910a18641f40a8fa328bf593bc78931d561e
Gutenberg: f7ac0640a3a9da1670882d4d727b81f5837b6832
JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
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