diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 9ba4fe400cec..090abd8333ae 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "9f223077b9129eec016dc04a9b2cace12ae0ec8d4328c663514e0b3136cd004e", + "originHash" : "7d81e634b9eb1e6687a2272c8b7dd67ce235bd9f872454e1dc35502fb19df00b", "pins" : [ { "identity" : "alamofire", @@ -149,8 +149,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "06a322f5fe222c4991abca407b7392f76bcff9d8", - "version" : "0.9.0" + "revision" : "e40ca1827fbc07ca3d173ae219a5e7c251116964" } }, { @@ -295,6 +294,15 @@ "version" : "8.0.4" } }, + { + "identity" : "svgkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SVGKit/SVGKit", + "state" : { + "revision" : "58152b9f7c85eab239160b36ffdfd364aa43d666", + "version" : "3.0.0" + } + }, { "identity" : "svprogresshud", "kind" : "remoteSourceControl", diff --git a/Modules/Package.swift b/Modules/Package.swift index 56e09fb13add..f2aa284293ab 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -53,7 +53,7 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"), .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), // We can't use wordpress-rs branches nor commits here. Only tags work. - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.9.0"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "e40ca1827fbc07ca3d173ae219a5e7c251116964"), .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20251007"), .package( url: "https://github.com/Automattic/color-studio", diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift index e13eb38ce187..3bd3ffe259cc 100644 --- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift +++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift @@ -27,6 +27,7 @@ public enum FeatureFlag: Int, CaseIterable { case mediaQuotaView case intelligence case newSupport + case nativeBlockInserter /// Returns a boolean indicating if the feature is enabled. /// @@ -86,6 +87,8 @@ public enum FeatureFlag: Int, CaseIterable { return (languageCode ?? "en").hasPrefix("en") case .newSupport: return false + case .nativeBlockInserter: + return BuildConfiguration.current == .debug } } @@ -130,6 +133,7 @@ extension FeatureFlag { case .mediaQuotaView: "Media Quota" case .intelligence: "Intelligence" case .newSupport: "New Support" + case .nativeBlockInserter: "Native Block Inserter" } } } diff --git a/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPicker+GutenbergKit.swift b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPicker+GutenbergKit.swift new file mode 100644 index 000000000000..5afacbaa76ae --- /dev/null +++ b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPicker+GutenbergKit.swift @@ -0,0 +1,12 @@ +import UIKit +import GutenbergKit + +extension MediaPickerMenu.MediaFilter { + init?(_ filter: GutenbergKit.MediaPickerParameters.MediaFilter) { + switch filter { + case .images: self = .images + case .videos: self = .videos + case .all: return nil + } + } +} diff --git a/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerController.swift b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerController.swift new file mode 100644 index 000000000000..042bb6006f6f --- /dev/null +++ b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerController.swift @@ -0,0 +1,159 @@ +import UIKit +import GutenbergKit +import WordPressData + +/// A adapter for GutenbergKit that manages media picker sources the editor. +final class MediaPickerController: GutenbergKit.MediaPickerController { + private let blog: Blog + private let parameters: MediaPickerParameters + private var currentMediaPickerController: MediaPickerMenuController? + private var currentMediaPickerCompletion: (([MediaInfo]) -> Void)? + + init(blog: Blog, parameters: MediaPickerParameters) { + self.blog = blog + self.parameters = parameters + } + + var actions: [[MediaPickerAction]] { + // Create MediaPickerMenu with the configuration + let menu = MediaPickerMenu( + filter: convertFilter(parameters.filter), + isMultipleSelectionEnabled: parameters.isMultipleSelectionEnabled + ) + + // Create a controller to handle selections + let controller = MediaPickerMenuController() + controller.onSelection = { [weak self] selection in + guard let self else { return } + let mediaInfos = self.convertSelectionToMediaInfo(selection) + self.currentMediaPickerCompletion?(mediaInfos) + self.currentMediaPickerCompletion = nil + self.currentMediaPickerController = nil + } + + // Store the controller to keep it alive + currentMediaPickerController = controller + + // Define media sources with their identifiers + let sources: [(source: MediaPickerSource, id: MediaPickerID)] = [ + (.playground, .imagePlayground), + (.siteMedia(blog: blog), .siteMedia), + (.photos, .applePhotos), + (.freePhotos(blog: blog), .freePhotos), + (.freeGIFs(blog: blog), .freeGIFs) + ] + + // Create actions from enabled sources + let actionsWithGroups = sources.compactMap { source, id -> (action: MediaPickerAction, group: Int)? in + guard source.isEnabled else { return nil } + + let uiAction = createUIAction(for: source, menu: menu, controller: controller) + guard let uiAction else { return nil } + + let action = convertToMediaPickerAction(uiAction, id: id) + + // Group 0: playground, site media, files + // Group 1: free photos, free gifs + let group = (id == .freePhotos || id == .freeGIFs) ? 1 : 0 + + return (action, group) + } + + // Group actions + let firstGroup = actionsWithGroups.filter { $0.group == 0 }.map { $0.action } + let secondGroup = actionsWithGroups.filter { $0.group == 1 }.map { $0.action } + + return [firstGroup, secondGroup].filter { !$0.isEmpty } + } + + // MARK: - Private Methods + + private func convertFilter(_ filter: MediaPickerParameters.MediaFilter?) -> MediaPickerMenu.MediaFilter? { + guard let filter else { return nil } + switch filter { + case .images: return .images + case .videos: return .videos + case .all: return nil + } + } + + private func createUIAction(for source: MediaPickerSource, menu: MediaPickerMenu, controller: MediaPickerMenuController) -> UIAction? { + switch source { + case .playground: + return menu.makeImagePlaygroundAction(delegate: controller) + case .siteMedia: + return menu.makeSiteMediaAction(blog: blog, delegate: controller) + case .photos: + return menu.makePhotosAction(delegate: controller) + case .freePhotos: + return menu.makeStockPhotos(blog: blog, delegate: controller) + case .freeGIFs: + return menu.makeFreeGIFAction(blog: blog, delegate: controller) + default: + return nil + } + } + + private func convertToMediaPickerAction(_ uiAction: UIAction, id: MediaPickerID) -> MediaPickerAction { + MediaPickerAction( + id: id.rawValue, + title: uiAction.title, + image: uiAction.image ?? UIImage(), + perform: { [weak self] presentingViewController, completion in + guard let self else { + completion([]) + return + } + + // Store the completion handler for when selection is made + self.currentMediaPickerCompletion = completion + + // Perform the original action + uiAction.performWithSender(nil, target: nil) + } + ) + } + + private func convertSelectionToMediaInfo(_ selection: MediaPickerSelection) -> [MediaInfo] { + var mediaInfos: [MediaInfo] = [] + + for item in selection.items { + switch item { + case .media(let media): + var metadata: [String: String] = [:] + if let videopressGUID = media.videopressGUID { + metadata["videopressGUID"] = videopressGUID + } + let mediaInfo = MediaInfo( + id: media.mediaID?.int32Value, + url: media.remoteURL, + type: media.mediaTypeString, + caption: media.caption, + title: media.filename, + alt: media.alt, + metadata: metadata + ) + mediaInfos.append(mediaInfo) + + case .external(let asset): + let mediaInfo = MediaInfo( + id: nil, + url: asset.largeURL.absoluteString, + type: "image", + caption: asset.caption, + title: asset.name, + alt: nil, + metadata: [:] + ) + mediaInfos.append(mediaInfo) + + case .image, .pickerResult: + // These would need to be uploaded first + // For now, we skip them + break + } + } + + return mediaInfos + } +} diff --git a/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerMenuController.swift b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerMenuController.swift index b3541871521c..51d66452422e 100644 --- a/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerMenuController.swift +++ b/WordPress/Classes/ViewRelated/Media/MediaPicker/Helpers/MediaPickerMenuController.swift @@ -6,7 +6,7 @@ import WordPressData final class MediaPickerMenuController: NSObject { var onSelection: ((MediaPickerSelection) -> Void)? - fileprivate func didSelect(_ items: [MediaPickerItem], source: String) { + fileprivate func didSelect(_ items: [MediaPickerItem], source: MediaPickerID) { let selection = MediaPickerSelection(items: items, source: source) DispatchQueue.main.async { self.onSelection?(selection) @@ -18,7 +18,7 @@ extension MediaPickerMenuController: PHPickerViewControllerDelegate { public func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) { picker.presentingViewController?.dismiss(animated: true) if !results.isEmpty { - self.didSelect(results.map(MediaPickerItem.pickerResult), source: "apple_photos") + self.didSelect(results.map(MediaPickerItem.pickerResult), source: .applePhotos) } } } @@ -27,7 +27,7 @@ extension MediaPickerMenuController: ImagePickerControllerDelegate { func imagePicker(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) { picker.presentingViewController?.dismiss(animated: true) if let image = info[.originalImage] as? UIImage { - self.didSelect([.image(image)], source: "camera") + self.didSelect([.image(image)], source: .camera) } } } @@ -36,7 +36,7 @@ extension MediaPickerMenuController: SiteMediaPickerViewControllerDelegate { func siteMediaPickerViewController(_ viewController: SiteMediaPickerViewController, didFinishWithSelection selection: [Media]) { viewController.presentingViewController?.dismiss(animated: true) if !selection.isEmpty { - self.didSelect(selection.map(MediaPickerItem.media), source: "site_media") + self.didSelect(selection.map(MediaPickerItem.media), source: .siteMedia) } } } @@ -46,7 +46,7 @@ extension MediaPickerMenuController: ImagePlaygroundPickerDelegate { viewController.presentingViewController?.dismiss(animated: true) if let data = try? Data(contentsOf: imageURL), let image = UIImage(data: data) { - self.didSelect([.image(image)], source: "image_playground") + self.didSelect([.image(image)], source: .imagePlayground) } else { wpAssertionFailure("failed to read the image created by ImagePlayground") } @@ -57,7 +57,7 @@ extension MediaPickerMenuController: ExternalMediaPickerViewDelegate { func externalMediaPickerViewController(_ viewController: ExternalMediaPickerViewController, didFinishWithSelection selection: [ExternalMediaAsset]) { viewController.presentingViewController?.dismiss(animated: true) if !selection.isEmpty { - let source = viewController.source == .tenor ? "free_gifs" : "free_photos" + let source: MediaPickerID = viewController.source == .tenor ? .freeGIFs : .freePhotos self.didSelect(selection.map(MediaPickerItem.external), source: source) } } diff --git a/WordPress/Classes/ViewRelated/Media/MediaPicker/MediaPicker.swift b/WordPress/Classes/ViewRelated/Media/MediaPicker/MediaPicker.swift index cd5fb43356ab..a14709a39caa 100644 --- a/WordPress/Classes/ViewRelated/Media/MediaPicker/MediaPicker.swift +++ b/WordPress/Classes/ViewRelated/Media/MediaPicker/MediaPicker.swift @@ -101,7 +101,7 @@ enum MediaPickerSource { struct MediaPickerSelection { var items: [MediaPickerItem] - var source: String + var source: MediaPickerID } enum MediaPickerItem { diff --git a/WordPress/Classes/ViewRelated/Media/MediaPicker/Menu/MediaPickerMenu.swift b/WordPress/Classes/ViewRelated/Media/MediaPicker/Menu/MediaPickerMenu.swift index c4e2f8ddafdb..a6e8dad5a995 100644 --- a/WordPress/Classes/ViewRelated/Media/MediaPicker/Menu/MediaPickerMenu.swift +++ b/WordPress/Classes/ViewRelated/Media/MediaPicker/Menu/MediaPickerMenu.swift @@ -53,3 +53,12 @@ extension MediaPickerMenu.MediaFilter { } } } + +enum MediaPickerID: String { + case applePhotos = "apple_photos" + case camera = "camera" + case siteMedia = "site_media" + case imagePlayground = "image_playground" + case freeGIFs = "free_gifs" + case freePhotos = "free_photos" +} diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index fca8dff431f9..e1b4e4860bd6 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -1,6 +1,7 @@ import UIKit import WordPressUI import AsyncImageKit +import BuildSettingsKit import AutomatticTracks import GutenbergKit import SafariServices @@ -8,6 +9,7 @@ import WordPressData import WordPressShared import WebKit import CocoaLumberjackSwift +import Photos class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor { @@ -397,6 +399,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor .apply(settings) { $0.setEditorSettings($1) } .setTitle(post.postTitle ?? "") .setContent(post.content ?? "") + .setNativeInserterEnabled(FeatureFlag.nativeBlockInserter) .build() self.editorViewController.updateConfiguration(updatedConfiguration) @@ -569,6 +572,13 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate throw URLError(.unknown) } + /// Returns the available media picker sources for the given configuration + func getMediaPickerController(for viewController: GutenbergKit.EditorViewController, parameters: GutenbergKit.MediaPickerParameters) -> (any GutenbergKit.MediaPickerController)? { + MediaPickerController(blog: post.blog, parameters: parameters) + } + + // MARK: - Media Picker Helpers + func editor(_ viewController: GutenbergKit.EditorViewController, didRequestMediaFromSiteMediaLibrary config: OpenMediaLibraryAction) { let flags = mediaFilterFlags(using: config.allowedTypes ?? []) diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme index 8b7fb8b87607..148389f3fadf 100644 --- a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme +++ b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme @@ -122,6 +122,11 @@ value = "disable" isEnabled = "NO"> + +