Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit aed5fcf

Browse files
authored
Update mx_AppLoading to improve maintainability (#10783)
* Nesting: mx_AppLoading * Conform class and animation name to the naming policy * Nesting for maintainability, preventing the rule from becoming an orphan * Rename the class: mx_AppLoading to mx_AppTile_loading
1 parent 631ac74 commit aed5fcf

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

res/css/views/rooms/_AppsDrawer.pcss

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ $MinWidth: 240px;
379379
}
380380
}
381381

382-
.mx_AppLoading {
382+
.mx_AppTile_loading {
383383
display: flex;
384384
flex-direction: column;
385385
justify-content: center;
@@ -391,24 +391,26 @@ $MinWidth: 240px;
391391
/* match bg of border so that the cut corners have the right fill */
392392
background-color: $widget-body-bg-color !important;
393393
border-radius: 8px;
394-
}
395394

396-
.mx_AppLoading .mx_Spinner {
397-
position: absolute;
398-
top: 0;
399-
bottom: 0;
400-
left: 0;
401-
right: 0;
402-
}
395+
iframe {
396+
display: none;
397+
}
403398

404-
.mx_AppLoading_spinner_fadeIn {
405-
animation-fill-mode: backwards;
406-
animation-duration: 200ms;
407-
animation-delay: 500ms;
408-
animation-name: mx_AppLoading_spinner_fadeIn_animation;
399+
/* const loadingElement */
400+
.mx_AppTile_loading_fadeInSpinner {
401+
animation-fill-mode: backwards;
402+
animation-duration: 200ms;
403+
animation-delay: 500ms;
404+
animation-name: mx_AppTile_loading_fadeInSpinnerAnimation;
405+
406+
.mx_Spinner {
407+
position: absolute;
408+
inset: 0;
409+
}
410+
}
409411
}
410412

411-
@keyframes mx_AppLoading_spinner_fadeIn_animation {
413+
@keyframes mx_AppTile_loading_fadeInSpinnerAnimation {
412414
from {
413415
opacity: 0;
414416
}
@@ -417,10 +419,6 @@ $MinWidth: 240px;
417419
}
418420
}
419421

420-
.mx_AppLoading iframe {
421-
display: none;
422-
}
423-
424422
.mx_AppsDrawer_resizing .mx_AppTile_persistedWrapper {
425423
z-index: 1;
426424
}

src/components/views/elements/AppTile.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ export default class AppTile extends React.Component<IProps, IState> {
573573
}
574574

575575
const loadingElement = (
576-
<div className="mx_AppLoading_spinner_fadeIn">
576+
<div className="mx_AppTile_loading_fadeInSpinner">
577577
<Spinner message={_t("Loading…")} />
578578
</div>
579579
);
@@ -603,7 +603,7 @@ export default class AppTile extends React.Component<IProps, IState> {
603603
} else if (this.state.initialising || !this.state.isUserProfileReady) {
604604
appTileBody = (
605605
<div
606-
className={appTileBodyClass + (this.state.loading ? "mx_AppLoading" : "")}
606+
className={appTileBodyClass + (this.state.loading ? "mx_AppTile_loading" : "")}
607607
style={appTileBodyStyles}
608608
>
609609
{loadingElement}
@@ -619,7 +619,7 @@ export default class AppTile extends React.Component<IProps, IState> {
619619
} else {
620620
appTileBody = (
621621
<div
622-
className={appTileBodyClass + (this.state.loading ? "mx_AppLoading" : "")}
622+
className={appTileBodyClass + (this.state.loading ? "mx_AppTile_loading" : "")}
623623
style={appTileBodyStyles}
624624
>
625625
{this.state.loading && loadingElement}

0 commit comments

Comments
 (0)