UI Loader: Fix flickering background on load (#1876)

src/components/common/UiLoader.scss

@@ -4,6 +4,10 @@
     height: calc(var(--vh, 1vh) * 100);
   }
 
+  > .wrapper {
+    height: 100%;
+  }
+
   .mask {
     position: fixed;
     top: 0;
@@ -62,31 +66,48 @@
 
       &::before {
         content: "";
-        display: block;
         position: absolute;
         top: 0;
         left: 0;
         bottom: 0;
         right: 0;
-        background: no-repeat center;
+        background-color: var(--theme-background-color);
+        background-position: center;
+        background-repeat: no-repeat;
         background-size: cover;
         z-index: -1;
         transform-origin: left center;
 
-        .theme-dark body.initial & {
+        .theme-light & {
-          background-color: #0f0f0f;
-          background-image: url('../../assets/chat-bg-dark.png');
-          background-position: top left;
-          background-size: 650px;
-          background-repeat: repeat;
-        }
-
-        .theme-light body.initial &,
-        body:not(.initial) & {
           background-image: url('../../assets/chat-bg.jpg');
+
+          @media (max-width: 600px) {
+            background-image: url("../../assets/chat-bg-mobile.jpg");
+          }
         }
       }
 
+      .theme-dark &:not(.custom-bg-image)::before {
+        background-image: url('../../assets/chat-bg-dark.png');
+        background-position: top left;
+        background-size: 650px;
+        background-repeat: repeat;
+      }
+
+      &.custom-bg-image::before {
+        background-image: var(--custom-background) !important;
+        filter: none;
+        transform: scale(1.1);
+      }
+
+      &.custom-bg-image.blurred::before {
+        filter: blur(12px);
+      }
+
+      &.custom-bg-color:not(.custom-bg-image)::before {
+        opacity: 0;
+      }
+
       html.theme-light body.animation-level-2 &.with-right-column::before {
         transform: scale(0.67);
       }
@@ -97,11 +118,6 @@
         }
       }
 
-      &.custom-bg-image::before {
-        margin: -1rem;
-        background-image: none !important;
-      }
-
       @media (max-width: 1275px) {
         flex: 3;
         border-right: none;

src/components/common/UiLoader.tsx

@@ -3,8 +3,11 @@ import { getActions, getGlobal, withGlobal } from '../../global';
 
 import { ApiMediaFormat } from '../../api/types';
 import { GlobalState } from '../../global/types';
+import { ThemeKey } from '../../types';
 
+import { DARK_THEME_BG_COLOR, LIGHT_THEME_BG_COLOR } from '../../config';
 import { getChatAvatarHash } from '../../global/helpers/chats'; // Direct import for better module splitting
+import { selectIsRightColumnShown, selectTheme } from '../../global/selectors';
 import useFlag from '../../hooks/useFlag';
 import useShowTransition from '../../hooks/useShowTransition';
 import { pause } from '../../util/schedulers';
@@ -13,13 +16,14 @@ import preloadFonts from '../../util/fonts';
 import * as mediaLoader from '../../util/mediaLoader';
 import { Bundles, loadModule } from '../../util/moduleLoader';
 import buildClassName from '../../util/buildClassName';
+import buildStyle from '../../util/buildStyle';
+import useCustomBackground from '../../hooks/useCustomBackground';
 
 import './UiLoader.scss';
 
 import telegramLogoPath from '../../assets/telegram-logo.svg';
 import reactionThumbsPath from '../../assets/reaction-thumbs.png';
 import monkeyPath from '../../assets/monkey.svg';
-import { selectIsRightColumnShown, selectTheme } from '../../global/selectors';
 
 type OwnProps = {
   page: 'main' | 'authCode' | 'authPassword' | 'authPhoneNumber' | 'authQrCode';
@@ -29,10 +33,12 @@ type OwnProps = {
 type StateProps =
   Pick<GlobalState, 'uiReadyState' | 'shouldSkipHistoryAnimations'>
   & {
-    hasCustomBackground?: boolean;
-    hasCustomBackgroundColor: boolean;
     isRightColumnShown?: boolean;
     leftColumnWidth?: number;
+    isBackgroundBlurred?: boolean;
+    theme: ThemeKey;
+    customBackground?: string;
+    backgroundColor?: string;
   };
 
 const MAX_PRELOAD_DELAY = 700;
@@ -79,11 +85,13 @@ const preloadTasks = {
 const UiLoader: FC<OwnProps & StateProps> = ({
   page,
   children,
-  hasCustomBackground,
-  hasCustomBackgroundColor,
   isRightColumnShown,
   shouldSkipHistoryAnimations,
   leftColumnWidth,
+  theme,
+  backgroundColor,
+  customBackground,
+  isBackgroundBlurred,
 }) => {
   const { setIsUiReady } = getActions();
 
@@ -92,6 +100,8 @@ const UiLoader: FC<OwnProps & StateProps> = ({
     shouldRender: shouldRenderMask, transitionClassNames,
   } = useShowTransition(!isReady, undefined, true);
 
+  const customBackgroundValue = useCustomBackground(theme, customBackground);
+
   useEffect(() => {
     let timeout: number | undefined;
 
@@ -126,6 +136,19 @@ const UiLoader: FC<OwnProps & StateProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const className = buildClassName(
+    'middle',
+    transitionClassNames,
+    customBackground && 'custom-bg-image',
+    backgroundColor && 'custom-bg-color',
+    customBackground && isBackgroundBlurred && 'blurred',
+    isRightColumnShown && 'with-right-column',
+  );
+  const inlineStyles = [
+    `--theme-background-color: ${backgroundColor || (theme === 'dark' ? DARK_THEME_BG_COLOR : LIGHT_THEME_BG_COLOR)}`,
+    customBackgroundValue && `--custom-background: ${customBackgroundValue}`,
+  ];
+
   return (
     <div id="UiLoader">
       {children}
@@ -138,12 +161,8 @@ const UiLoader: FC<OwnProps & StateProps> = ({
                 style={leftColumnWidth ? `width: ${leftColumnWidth}px` : undefined}
               />
               <div
-                className={buildClassName(
+                className={className}
-                  'middle',
+                style={buildStyle(...inlineStyles)}
-                  hasCustomBackground && 'custom-bg-image',
-                  hasCustomBackgroundColor && 'custom-bg-color',
-                  isRightColumnShown && 'with-right-column',
-                )}
               />
               {isRightColumnShown && <div className="right" />}
             </>
@@ -159,15 +178,19 @@ const UiLoader: FC<OwnProps & StateProps> = ({
 export default withGlobal<OwnProps>(
   (global): StateProps => {
     const theme = selectTheme(global);
-    const { background, backgroundColor } = global.settings.themes[theme] || {};
+    const {
+      isBlurred: isBackgroundBlurred, background: customBackground, backgroundColor,
+    } = global.settings.themes[theme] || {};
 
     return {
       shouldSkipHistoryAnimations: global.shouldSkipHistoryAnimations,
       uiReadyState: global.uiReadyState,
-      hasCustomBackground: Boolean(background),
-      hasCustomBackgroundColor: Boolean(backgroundColor),
       isRightColumnShown: selectIsRightColumnShown(global),
       leftColumnWidth: global.leftColumnWidth,
+      theme,
+      customBackground,
+      isBackgroundBlurred,
+      backgroundColor,
     };
   },
 )(UiLoader);

src/util/buildStyle.ts

@@ -0,0 +1,5 @@
+type Parts = (string | false | undefined)[];
+
+export default function buildStyle(...parts: Parts) {
+  return parts.filter(Boolean).join(';');
+}