Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

common: do not render undefined items

Abdullah Attafeaa207f6852
diff --git a/packages/common/src/hooks/use-resolved-item.ts b/packages/common/src/hooks/use-resolved-item.ts
index 503819587..3f3453f74 100644
--- a/packages/common/src/hooks/use-resolved-item.ts
+++ b/packages/common/src/hooks/use-resolved-item.ts
@@ -39,7 +39,8 @@ export function useResolvedItem<TItemType extends ItemType>(
[index, items]
);
- if (result.status === "rejected" || !result.value) return null;
+ if (result.status === "rejected" || !result.value || !result.value.item)
+ return null;
if (type && result.value.item.type !== type) return null;
return result.value;
}
@@ -53,7 +54,8 @@ export function useUnresolvedItem<TItemType extends ItemType>(
const { index, items, type } = options;
const result = usePromise(() => items.item(index), [index, items]);
- if (result.status === "rejected" || !result.value) return null;
+ if (result.status === "rejected" || !result.value || !result.value.item)
+ return null;
if (type && result.value.item.type !== type) return null;
return result.value;
}
diff --git a/packages/core/src/utils/virtualized-grouping.ts b/packages/core/src/utils/virtualized-grouping.ts
index 8d25000d2..c9ec0819c 100644
--- a/packages/core/src/utils/virtualized-grouping.ts
+++ b/packages/core/src/utils/virtualized-grouping.ts
@@ -81,11 +81,11 @@ export class VirtualizedGrouping<T> {
};
}
- item(index: number): Promise<{ item: T; group?: GroupHeader }>;
+ item(index: number): Promise<{ item?: T; group?: GroupHeader }>;
item(
index: number,
operate: BatchOperator<T>
- ): Promise<{ item: T; group?: GroupHeader; data: unknown }>;
+ ): Promise<{ item?: T; group?: GroupHeader; data: unknown }>;
async item(index: number, operate?: BatchOperator<T>) {
const batchIndex = Math.floor(index / this.batchSize);
const { items, groups, data } =