Skip to content

Fix missing subtitles on iOS #620

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
Naturalclar merged 2 commits into from
Jan 9, 2024
Merged

Fix missing subtitles on iOS #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eafa077
fix: Display subtitle on actions in iOS 15+
jessety Oct 29, 2023
d578daf
chore: Update example lockfile
jessety Oct 29, 2023
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: 2 additions & 2 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ PODS:
- React-jsinspector (0.72.4)
- React-logger (0.72.4):
- glog
- react-native-menu (0.8.0):
- react-native-menu (0.9.1):
- React
- React-NativeModulesApple (0.72.4):
- React-callinvoker
Expand Down Expand Up @@ -666,7 +666,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: bc8a9ad812a2c88b3a41c08b5f4b3ed32d6d4766
React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
react-native-menu: 5b9b82dabcc779cebde15d292ccbcba4469ff311
react-native-menu: 9728f90160c36b9a75481fc76e05354b99d54c59
React-NativeModulesApple: 759309419da76ef4c9f331968b840022ee2aa5b1
React-perflogger: 496a1a3dc6737f964107cb3ddae7f9e265ddda58
React-RCTActionSheet: 02904b932b50e680f4e26e7a686b33ebf7ef3c00
Expand Down
7 changes: 6 additions & 1 deletion ios/RCTMenuItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ class RCTMenuAction {
return UIMenu(title: title, image: image, children: subMenuActions)
}
}
return UIAction(title: title, image: image, identifier: identifier, discoverabilityTitle: subtitle, attributes: attributes, state: state, handler: handler)

if #available(iOS 15, *) {
return UIAction(title: title, subtitle: subtitle, image: image, identifier: identifier, attributes: attributes, state: state, handler: handler)
} else {
return UIAction(title: title, image: image, identifier: identifier, discoverabilityTitle: subtitle, attributes: attributes, state: state, handler: handler)
}
}
}