From f3a7c715eae70882dcd6c2fa6ffcd784a5d98b74 Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Tue, 23 Nov 2021 14:27:12 +0300 Subject: [PATCH] feat(core-app): CB-1459 add new icon for the big spinner --- .../core-app/public/icons/spinner-primary.svg | 17 +++++++++-------- .../core-app/public/icons/spinner-small.svg | 9 +++++++++ .../packages/core-app/public/icons/spinner.svg | 17 +++++++++-------- .../packages/core-blocks/src/Loader/Loader.tsx | 9 ++++++++- 4 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 webapp/packages/core-app/public/icons/spinner-small.svg diff --git a/webapp/packages/core-app/public/icons/spinner-primary.svg b/webapp/packages/core-app/public/icons/spinner-primary.svg index d0f6b78f45..e407692eb8 100644 --- a/webapp/packages/core-app/public/icons/spinner-primary.svg +++ b/webapp/packages/core-app/public/icons/spinner-primary.svg @@ -1,9 +1,10 @@ - - - - - - - - + + + + + + + + + diff --git a/webapp/packages/core-app/public/icons/spinner-small.svg b/webapp/packages/core-app/public/icons/spinner-small.svg new file mode 100644 index 0000000000..d0f6b78f45 --- /dev/null +++ b/webapp/packages/core-app/public/icons/spinner-small.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/webapp/packages/core-app/public/icons/spinner.svg b/webapp/packages/core-app/public/icons/spinner.svg index 10f26d8719..d238e505be 100644 --- a/webapp/packages/core-app/public/icons/spinner.svg +++ b/webapp/packages/core-app/public/icons/spinner.svg @@ -1,9 +1,10 @@ - - - - - - - - + + + + + + + + + diff --git a/webapp/packages/core-blocks/src/Loader/Loader.tsx b/webapp/packages/core-blocks/src/Loader/Loader.tsx index ebb5185437..6280a22148 100644 --- a/webapp/packages/core-blocks/src/Loader/Loader.tsx +++ b/webapp/packages/core-blocks/src/Loader/Loader.tsx @@ -60,6 +60,7 @@ interface Props { const spinnerType = { primary: '/icons/spinner-primary.svg', secondary: '/icons/spinner.svg', + small: '/icons/spinner-small.svg', }; export const Loader = observer(function Loader({ @@ -122,7 +123,7 @@ export const Loader = observer(function Loader({ style = useStyles(loaderStyles, style, overlay && overlayStyles); const [isVisible, setVisible] = useState(loading); - const spinnerURL = (secondary || overlay) ? spinnerType.secondary : spinnerType.primary; + const refLoaderDisplayed = { state: false }; useEffect(() => { @@ -186,6 +187,12 @@ export const Loader = observer(function Loader({ refLoaderDisplayed.state = true; + let spinnerURL = (secondary || overlay) ? spinnerType.secondary : spinnerType.primary; + + if (small) { + spinnerURL = spinnerType.small; + } + return styled(style)( {overlay && children}