From 1954da2aa380ee66234655fe172b6e31e48c1977 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:26:46 +0300
Subject: [PATCH] Fix loading flicker

---
 rsconcept/frontend/src/components/wrap/DataLoader.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rsconcept/frontend/src/components/wrap/DataLoader.tsx b/rsconcept/frontend/src/components/wrap/DataLoader.tsx
index 3c96b6c1..365181f0 100644
--- a/rsconcept/frontend/src/components/wrap/DataLoader.tsx
+++ b/rsconcept/frontend/src/components/wrap/DataLoader.tsx
@@ -17,15 +17,15 @@ interface DataLoaderProps extends CProps.AnimatedDiv {
 
 function DataLoader({ id, isLoading, hasNoData, error, children, ...restProps }: DataLoaderProps) {
   return (
-    <AnimatePresence>
-      {isLoading ? <Loader key={`${id}-loader`} /> : null}
-      {error ? <InfoError key={`${id}-error`} error={error} /> : null}
+    <AnimatePresence mode='wait'>
       <AnimateFade id={id} key={`${id}-data`} removeContent={isLoading || !!error || hasNoData} {...restProps}>
         {children}
       </AnimateFade>
-      <AnimateFade id={id} key={`${id}-no-data`} removeContent={isLoading || !!error || !hasNoData} {...restProps}>
+      <AnimateFade key={`${id}-no-data`} removeContent={isLoading || !!error || !hasNoData} {...restProps}>
         Данные не загружены
       </AnimateFade>
+      {isLoading ? <Loader key={`${id}-loader`} /> : null}
+      {error ? <InfoError key={`${id}-error`} error={error} /> : null}
     </AnimatePresence>
   );
 }