Skip to content

Commit f981b88

Browse files
committed
style: format code and remove unused imports
1 parent e94d43d commit f981b88

6 files changed

Lines changed: 34 additions & 37 deletions

File tree

__mocks__/react-native.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { vi } from 'vitest';
22

3-
const createEventEmitterMock = () =>
4-
vi.fn(() => ({ remove: vi.fn() }));
3+
const createEventEmitterMock = () => vi.fn(() => ({ remove: vi.fn() }));
54

65
const mockRNOneSignal = {
76
initialize: vi.fn(),

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ of this software and associated documentation files (the "Software"), to deal
4242
import com.facebook.react.bridge.LifecycleEventListener;
4343
import com.facebook.react.bridge.Promise;
4444
import com.facebook.react.bridge.ReactApplicationContext;
45-
import com.facebook.react.bridge.ReactMethod;
4645
import com.facebook.react.bridge.ReadableArray;
4746
import com.facebook.react.bridge.ReadableMap;
4847
import com.facebook.react.bridge.WritableMap;
@@ -425,8 +424,7 @@ public void removePermissionObserver() {
425424
@Override
426425
public void onNotificationPermissionChange(boolean permission) {
427426
try {
428-
emitOnPermissionChanged(
429-
RNUtils.convertHashMapToWritableMap(RNUtils.convertPermissionToMap(permission)));
427+
emitOnPermissionChanged(RNUtils.convertHashMapToWritableMap(RNUtils.convertPermissionToMap(permission)));
430428
Logging.debug("Sending permission change event", null);
431429
} catch (JSONException e) {
432430
e.printStackTrace();
@@ -570,9 +568,8 @@ public void addPushSubscriptionObserver() {
570568
@Override
571569
public void onPushSubscriptionChange(PushSubscriptionChangedState pushSubscriptionChangedState) {
572570
try {
573-
emitOnSubscriptionChanged(
574-
RNUtils.convertHashMapToWritableMap(
575-
RNUtils.convertPushSubscriptionChangedStateToMap(pushSubscriptionChangedState)));
571+
emitOnSubscriptionChanged(RNUtils.convertHashMapToWritableMap(
572+
RNUtils.convertPushSubscriptionChangedStateToMap(pushSubscriptionChangedState)));
576573
Logging.debug("Sending subscription change event", null);
577574
} catch (JSONException e) {
578575
e.printStackTrace();
@@ -715,8 +712,7 @@ public void addUserStateObserver() {
715712
@Override
716713
public void onUserStateChange(UserChangedState state) {
717714
try {
718-
emitOnUserStateChanged(
719-
RNUtils.convertHashMapToWritableMap(RNUtils.convertUserChangedStateToMap(state)));
715+
emitOnUserStateChanged(RNUtils.convertHashMapToWritableMap(RNUtils.convertUserChangedStateToMap(state)));
720716
Logging.debug("Sending user state change event", null);
721717
} catch (JSONException e) {
722718
e.printStackTrace();

ios/RCTOneSignal/RCTOneSignalEventEmitter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ typedef NS_ENUM(NSInteger, OSNotificationEventTypes) {
3737

3838
#define OSEventString(enum) [OSNotificationEventTypesArray objectAtIndex:enum]
3939

40-
@interface RCTOneSignalEventEmitter : NativeOneSignalSpecBase <NativeOneSignalSpec>
40+
@interface RCTOneSignalEventEmitter
41+
: NativeOneSignalSpecBase <NativeOneSignalSpec>
4142

4243
+ (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body;
4344

src/NativeOneSignal.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ export interface Spec extends TurboModule {
1717
enterLiveActivity(
1818
activityId: string,
1919
token: string,
20-
callback: (result: Object) => void,
20+
callback: (result: object) => void,
2121
): void;
2222
exitLiveActivity(
2323
activityId: string,
24-
callback: (result: Object) => void,
24+
callback: (result: object) => void,
2525
): void;
2626
setPushToStartToken(activityType: string, token: string): void;
2727
removePushToStartToken(activityType: string): void;
28-
setupDefaultLiveActivity(options: Object | null): void;
28+
setupDefaultLiveActivity(options: object | null): void;
2929
startDefaultLiveActivity(
3030
activityId: string,
31-
attributes: Object,
32-
content: Object,
31+
attributes: object,
32+
content: object,
3333
): void;
3434

3535
// Push Subscription
@@ -46,7 +46,7 @@ export interface Spec extends TurboModule {
4646
getExternalId(): Promise<string | null>;
4747
setLanguage(language: string): void;
4848
addAlias(label: string, id: string): void;
49-
addAliases(aliases: Object): void;
49+
addAliases(aliases: object): void;
5050
removeAlias(label: string): void;
5151
removeAliases(labels: string[]): void;
5252
addEmail(email: string): void;
@@ -55,10 +55,10 @@ export interface Spec extends TurboModule {
5555
removeSms(smsNumber: string): void;
5656
addTag(key: string, value: string): void;
5757
removeTag(key: string): void;
58-
addTags(tags: Object): void;
58+
addTags(tags: object): void;
5959
removeTags(keys: string[]): void;
60-
getTags(): Promise<Object>;
61-
trackEvent(name: string, properties: Object): void;
60+
getTags(): Promise<object>;
61+
trackEvent(name: string, properties: object): void;
6262

6363
// Notifications
6464
hasNotificationPermission(): Promise<boolean>;
@@ -81,7 +81,7 @@ export interface Spec extends TurboModule {
8181
addInAppMessageClickListener(): void;
8282
addInAppMessagesLifecycleListener(): void;
8383
addTrigger(key: string, value: string): void;
84-
addTriggers(triggers: Object): void;
84+
addTriggers(triggers: object): void;
8585
removeTrigger(key: string): void;
8686
removeTriggers(keys: string[]): void;
8787
clearTriggers(): void;
@@ -99,16 +99,16 @@ export interface Spec extends TurboModule {
9999
addOutcomeWithValue(name: string, value: number): void;
100100

101101
// Events
102-
readonly onPermissionChanged: CodegenTypes.EventEmitter<Object>;
103-
readonly onSubscriptionChanged: CodegenTypes.EventEmitter<Object>;
104-
readonly onUserStateChanged: CodegenTypes.EventEmitter<Object>;
105-
readonly onNotificationWillDisplay: CodegenTypes.EventEmitter<Object>;
106-
readonly onNotificationClicked: CodegenTypes.EventEmitter<Object>;
107-
readonly onInAppMessageClicked: CodegenTypes.EventEmitter<Object>;
108-
readonly onInAppMessageWillDisplay: CodegenTypes.EventEmitter<Object>;
109-
readonly onInAppMessageDidDisplay: CodegenTypes.EventEmitter<Object>;
110-
readonly onInAppMessageWillDismiss: CodegenTypes.EventEmitter<Object>;
111-
readonly onInAppMessageDidDismiss: CodegenTypes.EventEmitter<Object>;
102+
readonly onPermissionChanged: CodegenTypes.EventEmitter<object>;
103+
readonly onSubscriptionChanged: CodegenTypes.EventEmitter<object>;
104+
readonly onUserStateChanged: CodegenTypes.EventEmitter<object>;
105+
readonly onNotificationWillDisplay: CodegenTypes.EventEmitter<object>;
106+
readonly onNotificationClicked: CodegenTypes.EventEmitter<object>;
107+
readonly onInAppMessageClicked: CodegenTypes.EventEmitter<object>;
108+
readonly onInAppMessageWillDisplay: CodegenTypes.EventEmitter<object>;
109+
readonly onInAppMessageDidDisplay: CodegenTypes.EventEmitter<object>;
110+
readonly onInAppMessageWillDismiss: CodegenTypes.EventEmitter<object>;
111+
readonly onInAppMessageDidDismiss: CodegenTypes.EventEmitter<object>;
112112
}
113113

114114
export default TurboModuleRegistry.getEnforcing<Spec>('OneSignal');

src/index.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,10 @@ describe('OneSignal', () => {
11701170
describe('addTrigger', () => {
11711171
test('should add trigger', () => {
11721172
OneSignal.InAppMessages.addTrigger('key', 'value');
1173-
expect(mockRNOneSignal.addTrigger).toHaveBeenCalledWith('key', 'value');
1173+
expect(mockRNOneSignal.addTrigger).toHaveBeenCalledWith(
1174+
'key',
1175+
'value',
1176+
);
11741177
});
11751178

11761179
test('should log error but still call native method if key is missing', () => {

src/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ import type {
3434
NotificationClickEvent,
3535
NotificationListeners,
3636
} from './types/notificationEvents';
37-
import type {
38-
PushSubscriptionChangedState,
39-
} from './types/subscription';
37+
import type { PushSubscriptionChangedState } from './types/subscription';
4038
import type { UserChangedState, UserState } from './types/user';
4139

4240
const RNOneSignal = NativeOneSignal;
@@ -140,7 +138,7 @@ export namespace OneSignal {
140138
export function enter(
141139
activityId: string,
142140
token: string,
143-
handler: (result: Object) => void = () => {},
141+
handler: (result: object) => void = () => {},
144142
) {
145143
if (!isNativeModuleLoaded(RNOneSignal)) return;
146144

@@ -158,7 +156,7 @@ export namespace OneSignal {
158156
**/
159157
export function exit(
160158
activityId: string,
161-
handler: (result: Object) => void = () => {},
159+
handler: (result: object) => void = () => {},
162160
) {
163161
if (!isNativeModuleLoaded(RNOneSignal)) return;
164162

0 commit comments

Comments
 (0)