From 04337648bbf81d98f27e3843891ee6661c2112ca Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 19 May 2024 11:05:02 +0300
Subject: [PATCH] Prevent simultaneous animation warning

---
 .../frontend/src/components/wrap/AnimateFade.tsx | 14 +-------------
 .../frontend/src/components/wrap/DataLoader.tsx  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/rsconcept/frontend/src/components/wrap/AnimateFade.tsx b/rsconcept/frontend/src/components/wrap/AnimateFade.tsx
index 76d428e9..bae27dd3 100644
--- a/rsconcept/frontend/src/components/wrap/AnimateFade.tsx
+++ b/rsconcept/frontend/src/components/wrap/AnimateFade.tsx
@@ -7,22 +7,10 @@ import { CProps } from '../props';
 interface AnimateFadeProps extends CProps.AnimatedDiv {
   noFadeIn?: boolean;
   noFadeOut?: boolean;
-  removeContent?: boolean;
   hideContent?: boolean;
 }
 
-function AnimateFade({
-  style,
-  noFadeIn,
-  noFadeOut,
-  children,
-  removeContent,
-  hideContent,
-  ...restProps
-}: AnimateFadeProps) {
-  if (removeContent) {
-    return null;
-  }
+function AnimateFade({ style, noFadeIn, noFadeOut, children, hideContent, ...restProps }: AnimateFadeProps) {
   return (
     <motion.div
       tabIndex={-1}
diff --git a/rsconcept/frontend/src/components/wrap/DataLoader.tsx b/rsconcept/frontend/src/components/wrap/DataLoader.tsx
index 365181f0..20db7834 100644
--- a/rsconcept/frontend/src/components/wrap/DataLoader.tsx
+++ b/rsconcept/frontend/src/components/wrap/DataLoader.tsx
@@ -18,12 +18,16 @@ interface DataLoaderProps extends CProps.AnimatedDiv {
 function DataLoader({ id, isLoading, hasNoData, error, children, ...restProps }: DataLoaderProps) {
   return (
     <AnimatePresence mode='wait'>
-      <AnimateFade id={id} key={`${id}-data`} removeContent={isLoading || !!error || hasNoData} {...restProps}>
-        {children}
-      </AnimateFade>
-      <AnimateFade key={`${id}-no-data`} removeContent={isLoading || !!error || !hasNoData} {...restProps}>
-        Данные не загружены
-      </AnimateFade>
+      {!isLoading && !error && !hasNoData ? (
+        <AnimateFade id={id} key={`${id}-data`} {...restProps}>
+          {children}
+        </AnimateFade>
+      ) : null}
+      {!isLoading && !error && hasNoData ? (
+        <AnimateFade key={`${id}-no-data`} {...restProps}>
+          Данные не загружены
+        </AnimateFade>
+      ) : null}
       {isLoading ? <Loader key={`${id}-loader`} /> : null}
       {error ? <InfoError key={`${id}-error`} error={error} /> : null}
     </AnimatePresence>