Skip to content

Gutenberg related changes to land after 16.2 App cut #15312

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
ceyhun merged 7 commits into from
Nov 17, 2020
Merged

Gutenberg related changes to land after 16.2 App cut #15312

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
47b1490
Implement File Block
etoledom Oct 19, 2020
b8ae89b
Hound!
etoledom Oct 20, 2020
6f803e3
Update gutenberg ref
etoledom Nov 12, 2020
0d2386b
Merge remote-tracking branch 'origin/develop' into gutenberg/file-block
etoledom Nov 12, 2020
39a3f53
Update gutenberg ref
etoledom Nov 13, 2020
ba2c9d5
Merge pull request #15122 from wordpress-mobile/gutenberg/file-block
etoledom Nov 13, 2020
ff99b38
Merge branch 'develop' into gutenberg/after_1.41.0
ceyhun Nov 17, 2020
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 Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ target 'WordPress' do
## Gutenberg (React Native)
## =====================
##
gutenberg :tag => 'v1.41.1'
gutenberg :tag => 'v1.42.0-alpha2'

## Third party libraries
## =====================
Expand Down
166 changes: 83 additions & 83 deletions Podfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ class GutenbergMediaInserterHelper: NSObject {
break
}
switch media.mediaType {
case .image:
gutenberg.mediaUploadUpdate(id: mediaUploadID, state: .succeeded, progress: 1, url: url, serverID: mediaServerID)
case .video:
EditorMediaUtility.fetchRemoteVideoURL(for: media, in: post) { [weak self] (result) in
guard let strongSelf = self else {
Expand All @@ -265,7 +263,7 @@ class GutenbergMediaInserterHelper: NSObject {
}
}
default:
break
gutenberg.mediaUploadUpdate(id: mediaUploadID, state: .succeeded, progress: 1, url: url, serverID: mediaServerID)
}
case .failed(let error):
if error.code == NSURLErrorCancelled {
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
multipleSelection: allowMultipleSelection,
callback: callback)
case .filesApp:
filesAppMediaPicker.presentPicker(origin: self, filters: filter, multipleSelection: allowMultipleSelection, callback: callback)
filesAppMediaPicker.presentPicker(origin: self, filters: filter, allowedTypesOnBlog: post.blog.allowedTypeIdentifiers, multipleSelection: allowMultipleSelection, callback: callback)
default: break
}
}
Expand Down
9 changes: 6 additions & 3 deletions WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ class GutenbergFilesAppMediaSource: NSObject {
self.gutenberg = gutenberg
}

func presentPicker(origin: UIViewController, filters: [Gutenberg.MediaType], multipleSelection: Bool, callback: @escaping MediaPickerDidPickMediaCallback) {
let uttypeFilters = filters.compactMap { $0.typeIdentifier }
func presentPicker(origin: UIViewController, filters: [Gutenberg.MediaType], allowedTypesOnBlog: [String], multipleSelection: Bool, callback: @escaping MediaPickerDidPickMediaCallback) {

let uttypeFilters = filters.contains(.other) ? allowedTypesOnBlog : filters.compactMap { $0.typeIdentifier }

mediaPickerCallback = callback
let docPicker = UIDocumentPickerViewController(documentTypes: uttypeFilters, in: .import)
docPicker.delegate = self
docPicker.allowsMultipleSelection = multipleSelection

origin.present(docPicker, animated: true)
}
}
Expand Down Expand Up @@ -48,7 +51,7 @@ extension GutenbergFilesAppMediaSource: UIDocumentPickerDelegate {
return nil
}
let mediaUploadID = media.gutenbergUploadID
return MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString)
return MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString, title: url.lastPathComponent)
})

callback(mediaInfo)
Expand Down
4 changes: 2 additions & 2 deletions WordPress/WordPress.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5742,7 +5742,7 @@
path = GutenbergWeb;
sourceTree = "<group>";
};
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
29B97314FDCFA39411CA2CEA = {
isa = PBXGroup;
children = (
98D31BBF239720E4009CFF43 /* MainInterface.storyboard */,
Expand Down Expand Up @@ -11407,7 +11407,7 @@
bg,
sk,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
mainGroup = 29B97314FDCFA39411CA2CEA;
productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down