Skip to content

Commit

Permalink
Merge pull request #548 from margelo/@chrispader/use-onyx-remove-read…
Browse files Browse the repository at this point in the history
…only-return-type
  • Loading branch information
mountiny committed May 13, 2024
2 parents 67b901c + 6497f80 commit 9d5ee10
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions lib/useOnyx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import Onyx from './Onyx';
type UseOnyxValue<TKey extends OnyxKey> = string extends TKey
? unknown
: TKey extends CollectionKeyBase
? Readonly<NonNull<OnyxCollection<KeyValueMapping[TKey]>>>
: Readonly<NonNull<OnyxEntry<KeyValueMapping[TKey]>>>;
? NonNull<OnyxCollection<KeyValueMapping[TKey]>>
: NonNull<OnyxEntry<KeyValueMapping[TKey]>>;

type BaseUseOnyxOptions = {
/**
Expand Down Expand Up @@ -55,11 +55,7 @@ type UseOnyxOptions<TKey extends OnyxKey, TReturnValue> = BaseUseOnyxOptions & U

type FetchStatus = 'loading' | 'loaded';

type CachedValue<TKey extends OnyxKey, TValue> = IsEqual<TValue, UseOnyxValue<TKey>> extends true
? TValue
: TKey extends CollectionKeyBase
? Readonly<NonNullable<OnyxCollection<TValue>>>
: Readonly<TValue>;
type CachedValue<TKey extends OnyxKey, TValue> = IsEqual<TValue, UseOnyxValue<TKey>> extends true ? TValue : TKey extends CollectionKeyBase ? NonNullable<OnyxCollection<TValue>> : TValue;

type ResultMetadata = {
status: FetchStatus;
Expand Down

0 comments on commit 9d5ee10

Please sign in to comment.