Skip to content

Product Form: Fix issue showing share sheet from the bar button item on iPad #9797

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
merged 1 commit into from
May 23, 2023
Merged

Product Form: Fix issue showing share sheet from the bar button item on iPad #9797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
presentationStyle.createExitForm(viewController: self)
}()

private lazy var shareBarButtonItem = UIBarButtonItem(barButtonSystemItem: .action,
target: self,
action: #selector(shareProduct))

private let presentationStyle: ProductFormPresentationStyle
private let navigationRightBarButtonItemsSubject = PassthroughSubject<[UIBarButtonItem], Never>()
private var navigationRightBarButtonItems: AnyPublisher<[UIBarButtonItem], Never> {
Expand Down Expand Up @@ -281,7 +285,7 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:

if viewModel.canShareProduct() {
actionSheet.addDefaultActionWithTitle(ActionSheetStrings.share) { [weak self] _ in
self?.displayShareProduct(source: .moreMenu)
self?.displayShareProduct(from: sender, analyticSource: .moreMenu)
}
}

Expand Down Expand Up @@ -470,7 +474,7 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
}

@objc private func shareProduct() {
displayShareProduct(source: .productForm)
displayShareProduct(from: shareBarButtonItem, analyticSource: .productForm)
}

func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
Expand Down Expand Up @@ -861,14 +865,14 @@ private extension ProductFormViewController {
WebviewHelper.launch(url, with: self)
}

func displayShareProduct(source: WooAnalyticsEvent.ProductForm.ShareProductSource) {
ServiceLocator.analytics.track(event: .ProductForm.productDetailShareButtonTapped(source: source))
func displayShareProduct(from sourceView: UIBarButtonItem, analyticSource: WooAnalyticsEvent.ProductForm.ShareProductSource) {
ServiceLocator.analytics.track(event: .ProductForm.productDetailShareButtonTapped(source: analyticSource))

guard let url = URL(string: product.permalink) else {
return
}

SharingHelper.shareURL(url: url, title: product.name, from: view, in: self)
SharingHelper.shareURL(url: url, title: product.name, from: sourceView, in: self)
}

func duplicateProduct() {
Expand Down Expand Up @@ -1009,7 +1013,7 @@ private extension ProductFormViewController {
case .more:
return createMoreOptionsBarButtonItem()
case .share:
return createShareBarButtonItem()
return shareBarButtonItem
}
}

Expand Down Expand Up @@ -1055,12 +1059,6 @@ private extension ProductFormViewController {
moreButton.accessibilityIdentifier = "edit-product-more-options-button"
return moreButton
}

func createShareBarButtonItem() -> UIBarButtonItem {
UIBarButtonItem(barButtonSystemItem: .action,
target: self,
action: #selector(shareProduct))
}
}

// MARK: - Keyboard management
Expand Down