Skip to content

fix(ios): skip an empty image name instead of looking it up #1230

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

Open
rsoaresdev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ios): skip an empty image name instead of looking it up #1230

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion ios/Shared/RCTAlertAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ class RCTAlertAction {
self.title = "";
}

if let image = details["image"] as? NSString {
// The new architecture sends an unset image as an empty string, and
// UIImage(named: "") logs "Invalid asset name supplied" each time the menu is built.
if let image = details["image"] as? NSString, image.length > 0 {
if #available(iOS 13.0, *) {
self.image = UIImage(systemName: image as String)
if let imageColor = details["imageColor"] {
Expand Down
4 changes: 3 additions & 1 deletion ios/Shared/RCTMenuItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ class RCTMenuAction {
self.identifier = UIAction.Identifier(rawValue: identifier as String);
}

if let image = details["image"] as? NSString {
// The new architecture sends an unset image as an empty string, and
// UIImage(named: "") logs "Invalid asset name supplied" each time the menu is built.
if let image = details["image"] as? NSString, image.length > 0 {
self.image = UIImage(systemName: image as String);
if self.image === nil {
self.image = UIImage(named: image as String)
Expand Down