Skip to content

Commit fa2d75e

Browse files
committed
Forms: Fix loading state to show spinner immediately
Prevents empty state flash by showing loading spinner when data hasn't resolved yet. Related: #45339
1 parent 845fb3a commit fa2d75e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: changed
3+
4+
Forms: improve loading state to show spinner immediately when data hasn't loaded.

projects/packages/forms/src/dashboard/hooks/use-inbox-data.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default function useInboxData(): UseInboxDataReturn {
7070

7171
const {
7272
records: rawRecords,
73-
isResolving: isLoadingRecordsData,
73+
hasResolved,
7474
totalItems,
7575
totalPages,
7676
} = useEntityRecords( 'postType', 'feedback', currentQuery );
@@ -116,13 +116,18 @@ export default function useInboxData(): UseInboxDataReturn {
116116
}
117117
);
118118

119+
const isLoadingData =
120+
( ! rawRecords?.length && ! hasResolved ) ||
121+
isLoadingInboxData ||
122+
isLoadingSpamData ||
123+
isLoadingTrashData;
124+
119125
return {
120126
totalItemsInbox,
121127
totalItemsSpam,
122128
totalItemsTrash,
123129
records,
124-
isLoadingData:
125-
isLoadingRecordsData || isLoadingInboxData || isLoadingSpamData || isLoadingTrashData,
130+
isLoadingData,
126131
totalItems,
127132
totalPages,
128133
selectedResponsesCount,

0 commit comments

Comments
 (0)