Skip to content

Commit 32d740a

Browse files
committed
refactor: removed unnecessary checks
Removed redundant checks for undefined values Refs #254
1 parent eddf740 commit 32d740a

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

dist/src/hooks/useMMKV.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ export declare const create: CreateType;
2828
*/
2929
declare type CreateType = (storage: MMKVInstance) => {
3030
<T = undefined>(key: string): [
31-
value: T | null | undefined,
32-
setValue: (value: (T | null | undefined) | ((prevValue: T | null | undefined) => T | null | undefined)) => void
31+
value: T | undefined,
32+
setValue: (value: (T | undefined) | ((prevValue: T | undefined) => T | undefined)) => void
3333
];
3434
<T>(key: string, defaultValue: T): [
3535
value: T,
@@ -68,10 +68,10 @@ export declare const useMMKVStorage: UseMMKVStorageType;
6868
*/
6969
declare type UseMMKVStorageType = {
7070
<T = undefined>(key: string, storage: MMKVInstance): [
71-
value: T | null | undefined,
72-
setValue: (value: (T | null | undefined) | ((prevValue: T | null | undefined) => T | null | undefined)) => void
71+
value: T | undefined,
72+
setValue: (value: (T | undefined) | ((prevValue: T | undefined) => T | undefined)) => void
7373
];
74-
<T>(key: string, storage: MMKVInstance, defaultValue: T): [
74+
<T>(key: string, storage: MMKVInstance, defaultValue: T | undefined): [
7575
value: T,
7676
setValue: (value: T | ((prevValue: T) => T)) => void
7777
];

dist/src/hooks/useMMKV.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/hooks/useMMKV.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ export var create = function (storage) {
6262
return function (key, defaultValue) {
6363
if (!key || typeof key !== 'string' || !storage)
6464
throw new Error('Key and Storage are required parameters.');
65-
if (defaultValue === undefined) {
66-
return useMMKVStorage(key, storage);
67-
}
68-
else {
69-
return useMMKVStorage(key, storage, defaultValue);
70-
}
65+
return useMMKVStorage(key, storage, defaultValue);
7166
};
7267
};
7368
/**
@@ -171,7 +166,10 @@ export var useMMKVStorage = function (key, storage, defaultValue) {
171166
return [2 /*return*/];
172167
});
173168
}); }, [key, storage, valueType]);
174-
return [value !== null && value !== void 0 ? value : (defaultValue === undefined ? null : defaultValue), setNewValue];
169+
return [
170+
valueType === 'boolean' || valueType === 'number' ? value : value || defaultValue,
171+
setNewValue
172+
];
175173
};
176174
function usePrevious(value) {
177175
var ref = useRef(value);

src/hooks/useMMKV.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ export const create: CreateType =
2929
<T = undefined>(key: string, defaultValue?: T) => {
3030
if (!key || typeof key !== 'string' || !storage)
3131
throw new Error('Key and Storage are required parameters.');
32-
if (defaultValue === undefined) {
33-
return useMMKVStorage<T>(key, storage);
34-
} else {
35-
return useMMKVStorage<T>(key, storage, defaultValue);
36-
}
32+
33+
return useMMKVStorage<T>(key, storage, defaultValue);
3734
};
3835

3936
/**
@@ -43,10 +40,8 @@ export const create: CreateType =
4340
*/
4441
type CreateType = (storage: MMKVInstance) => {
4542
<T = undefined>(key: string): [
46-
value: T | null | undefined,
47-
setValue: (
48-
value: (T | null | undefined) | ((prevValue: T | null | undefined) => T | null | undefined)
49-
) => void
43+
value: T | undefined,
44+
setValue: (value: (T | undefined) | ((prevValue: T | undefined) => T | undefined)) => void
5045
];
5146
<T>(key: string, defaultValue: T): [
5247
value: T,
@@ -173,7 +168,10 @@ export const useMMKVStorage: UseMMKVStorageType = <T = undefined>(
173168
[key, storage, valueType]
174169
);
175170

176-
return [value ?? (defaultValue === undefined ? null : defaultValue), setNewValue];
171+
return [
172+
valueType === 'boolean' || valueType === 'number' ? value : value || defaultValue,
173+
setNewValue
174+
];
177175
};
178176

179177
function usePrevious(value: any) {
@@ -192,12 +190,10 @@ function usePrevious(value: any) {
192190
*/
193191
type UseMMKVStorageType = {
194192
<T = undefined>(key: string, storage: MMKVInstance): [
195-
value: T | null | undefined,
196-
setValue: (
197-
value: (T | null | undefined) | ((prevValue: T | null | undefined) => T | null | undefined)
198-
) => void
193+
value: T | undefined,
194+
setValue: (value: (T | undefined) | ((prevValue: T | undefined) => T | undefined)) => void
199195
];
200-
<T>(key: string, storage: MMKVInstance, defaultValue: T): [
196+
<T>(key: string, storage: MMKVInstance, defaultValue: T | undefined): [
201197
value: T,
202198
setValue: (value: T | ((prevValue: T) => T)) => void
203199
];

0 commit comments

Comments
 (0)