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

Use classNames function for appTileBodyClass on AppTile.tsx #10939

Merged
florianduros merged 2 commits into from
May 19, 2023
Merged

Use classNames function for appTileBodyClass on AppTile.tsx #10939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9768886
Use classNames function for appTileBodyClass on AppTile.tsx
luixxiul May 14, 2023
cefac0d
Merge branch 'develop' into AppTileBody
luixxiul May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/components/views/elements/AppTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,11 @@ export default class AppTile extends React.Component<IProps, IState> {
const iframeFeatures =
"microphone; camera; encrypted-media; autoplay; display-capture; clipboard-write; " + "clipboard-read;";

const appTileBodyClass = "mx_AppTileBody" + (this.props.miniMode ? "_mini " : " ");
const appTileBodyClass = classNames({
mx_AppTileBody: !this.props.miniMode,
Copy link
Copy Markdown
Contributor

@florianduros florianduros May 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mx_AppTileBody is always is present in the previous version

Copy link
Copy Markdown
Contributor Author

@luixxiul luixxiul May 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because "mx_AppTileBody" + (this.props.miniMode ? "_mini " outputs "mx_AppTileBody_mini " on miniMode.

If miniMode is not enabled, mx_AppTileBody (mind the last white space character) is output.

Here is the how the class name is output on develop.element.io:

1

1

Copy link
Copy Markdown
Contributor

@florianduros florianduros May 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right

mx_AppTileBody_mini: this.props.miniMode,
mx_AppTile_loading: this.state.loading,
});
const appTileBodyStyles: CSSProperties = {};
if (this.props.pointerEvents) {
appTileBodyStyles.pointerEvents = this.props.pointerEvents;
Expand Down Expand Up @@ -626,10 +630,7 @@ export default class AppTile extends React.Component<IProps, IState> {
);
} else if (this.state.initialising || !this.state.isUserProfileReady) {
appTileBody = (
<div
className={appTileBodyClass + (this.state.loading ? "mx_AppTile_loading" : "")}
style={appTileBodyStyles}
>
<div className={appTileBodyClass} style={appTileBodyStyles}>
{loadingElement}
</div>
);
Expand All @@ -642,10 +643,7 @@ export default class AppTile extends React.Component<IProps, IState> {
);
} else {
appTileBody = (
<div
className={appTileBodyClass + (this.state.loading ? "mx_AppTile_loading" : "")}
style={appTileBodyStyles}
>
<div className={appTileBodyClass} style={appTileBodyStyles}>
{this.state.loading && loadingElement}
<iframe
title={widgetTitle}
Expand Down