ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 04:50:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent simultaneous animation warning

Browse Source
This commit is contained in:
IRBorisov 2024-05-19 11:05:02 +03:00
parent 8464a97a0b
commit 04337648bb
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rsconcept/frontend/src/components/wrap/AnimateFade.tsx
View File

@ -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}

16
rsconcept/frontend/src/components/wrap/DataLoader.tsx
View File

@ -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>