Merge pull request #7 from rn-bridge/update_listener

Update listeners

Author: sriharshamadamanchi

README.md

@@ -129,18 +129,11 @@ Response:
 Supported options:
 | Key | Platform | Required | Description |
 | --- | --- | --- | --- |
-| `id`               | Both | Yes | A required, app-specific string that you employ to identify the
-shortcut. |
+| `id`               | Both | Yes | A required, app-specific string that you employ to identify the shortcut. |
 | `title`            | Both | Yes | The required, user-visible title for the Home Screen shortcut. |
-| `longLabel`        | Android | No | An extended phrase that describes the shortcut's purpose. If
-there's enough space, the launcher displays this value instead of title. When possible, limit this
-long description to 25 characters. |
-| `subtitle`         | iOS | No | The user-visible subtitle for the Home Screen dynamic quick
-action. |
-| `iconName`         | Both | No | The icon for the Home Screen shortcut. Icon name should be the
-name of your iOS asset or Android drawable.
-Refer [iOS](https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs) [Android](https://developer.android.com/studio/write/resource-manager)
-resource addition. |
+| `longLabel`        | Android | No | An extended phrase that describes the shortcut's purpose. If there's enough space, the launcher displays this value instead of title. When possible, limit this long description to 25 characters. |
+| `subtitle`         | iOS | No | The user-visible subtitle for the Home Screen dynamic quick action. |
+| `iconName`         | Both | No | The icon for the Home Screen shortcut. Icon name should be the name of your iOS asset or Android drawable. Refer [iOS](https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs) & [Android](https://developer.android.com/studio/write/resource-manager) resource addition. |
 
 ### updateShortcut
 
@@ -166,15 +159,9 @@ Supported options:
 | --- | --- | --- | --- |
 | `id`               | Both | Yes | The shortcut id which you want to update. |
 | `title`            | Both | Yes | The required, user-visible title for the Home Screen shortcut. |
-| `longLabel`        | Android | No | An extended phrase that describes the shortcut's purpose. If
-there's enough space, the launcher displays this value instead of title. When possible, limit this
-long description to 25 characters. |
-| `subtitle`         | iOS | No | The user-visible subtitle for the Home Screen dynamic quick
-action. |
-| `iconName`         | Both | No | The icon for the Home Screen shortcut. Icon name should be the
-name of your iOS asset or Android drawable.
-Refer [iOS](https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs) [Android](https://developer.android.com/studio/write/resource-manager)
-resource addition. |
+| `longLabel`        | Android | No | An extended phrase that describes the shortcut's purpose. If there's enough space, the launcher displays this value instead of title. When possible, limit this long description to 25 characters. |
+| `subtitle`         | iOS | No | The user-visible subtitle for the Home Screen dynamic quick action. |
+| `iconName`         | Both | No | The icon for the Home Screen shortcut. Icon name should be the name of your iOS asset or Android drawable. Refer [iOS](https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs) & [Android](https://developer.android.com/studio/write/resource-manager) resource addition. |
 
 ### removeShortcut
 

android/src/newarch/com/rnbridge/shortcuts/RNShortcutsModule.kt

@@ -10,7 +10,6 @@ import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.facebook.react.bridge.ActivityEventListener
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
@@ -148,7 +147,9 @@ class RNShortcutsModule(reactContext: ReactApplicationContext) :
     }
 
     private fun sendEvent(id: String) {
-        emitOnShortcutUsed(id)
+        context
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("onShortcutUsed", id)
     }
 
     override fun onActivityResult(a: Activity?, b: Int, c: Int, d: Intent?) {}

example/ios/Podfile.lock

@@ -1210,7 +1210,7 @@ PODS:
     - React-jsiexecutor
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
-  - react-native-shortcuts (0.6.0):
+  - react-native-shortcuts (0.7.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1772,7 +1772,7 @@ SPEC CHECKSUMS:
   React-logger: e7eeebaed32b88dcc29b10901aa8c5822dc397c4
   React-Mapbuffer: 73dd1210c4ecf0dfb4e2d4e06f2a13f824a801a9
   React-microtasksnativemodule: d03753688e2abf135edcd4160ab3ce7526da8b0d
-  react-native-shortcuts: ea96a65e84666646e20acbc74a11e13ae5b6fc7f
+  react-native-shortcuts: a39f3dda191feaadecbb1d3d333961da8b395db1
   React-nativeconfig: cb207ebba7cafce30657c7ad9f1587a8f32e4564
   React-NativeModulesApple: 8411d548b1ad9d2b3e597beb9348e715c8020e0c
   React-perflogger: c4c3b7c18f8a50cdbe2bcdd2f15705ba029a5a02

ios/RNShortcuts.h

@@ -9,7 +9,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RNShortcuts : NativeShortcutsSpecBase <NativeShortcutsSpec>
+@interface RNShortcuts : RCTEventEmitter <NativeShortcutsSpec>
 #else
 @interface RNShortcuts : RCTEventEmitter <RCTBridgeModule>
 #endif

ios/RNShortcuts.mm

@@ -106,11 +106,7 @@ - (void)updateShortcut:(JS::NativeShortcuts::ShortcutParamsType &)params resolve
 + (void)handleShortcutItem:(nonnull UIApplicationShortcutItem *)shortcutItem {
     RNShortcutsImpl.shortcutItemType = shortcutItem.type;
     if (sharedInstance) {
-        #ifdef RCT_NEW_ARCH_ENABLED
-            [sharedInstance emitOnShortcutUsed: shortcutItem.type];
-        #else
-            [sharedInstance sendEventWithName:@"onShortcutUsed" body:shortcutItem.type];
-        #endif
+        [sharedInstance sendEventWithName:@"onShortcutUsed" body:shortcutItem.type];
     }
 }
 

lib/commonjs/index.js

@@ -1,5 +1,4 @@
 import { type TurboModule } from 'react-native';
-import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
 export interface ShortcutResponseType {
     id: string;
     title: string;
@@ -18,7 +17,8 @@ export interface Spec extends TurboModule {
     isShortcutExists(id: string): Promise<boolean>;
     isShortcutSupported(): Promise<boolean>;
     getInitialShortcutId(): Promise<string>;
-    readonly onShortcutUsed: EventEmitter<string>;
+    addListener: (eventType: string) => void;
+    removeListeners: (count: number) => void;
 }
 declare const _default: Spec;
 export default _default;