PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064

Browse source
This commit is contained in:
Michael Telatynski 2021-09-16 11:46:00 +01:00
commit 1e04dfa11d
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/LegacyCommunityPreview.tsx
View file

@ -28,7 +28,6 @@ import { linkifyElement } from "../../HtmlUtils";
import defaultDispatcher from "../../dispatcher/dispatcher";
import { Action } from "../../dispatcher/actions";
import { UserTab } from "../views/dialogs/UserSettingsDialog";
import MainSplit from './MainSplit';
interface IProps {
groupId: string;
@ -49,11 +48,11 @@ const LegacyCommunityPreview = ({ groupId }: IProps) => {
if (!groupSummary) {
return <main className="mx_SpaceRoomView">
<MainSplit>
<div className="mx_MainSplit">
<div className="mx_SpaceRoomView_preview">
<Spinner />
</div>
</MainSplit>
</div>
</main>;
}
@ -70,7 +69,7 @@ const LegacyCommunityPreview = ({ groupId }: IProps) => {
return <main className="mx_SpaceRoomView">
<ErrorBoundary>
<MainSplit>
<div className="mx_MainSplit">
<div className="mx_SpaceRoomView_preview">
<GroupAvatar
groupId={groupId}
@ -108,7 +107,7 @@ const LegacyCommunityPreview = ({ groupId }: IProps) => {
}
</div>
</div>
</MainSplit>
</div>
</ErrorBoundary>
</main>;
};

2
src/components/structures/MainSplit.tsx
View file

@ -24,7 +24,7 @@ import { Direction } from "re-resizable/lib/resizer";
interface IProps {
resizeNotifier: ResizeNotifier;
collapsedRhs?: boolean;
panel: JSX.Element;
panel?: JSX.Element;
}
@replaceableComponent("structures.MainSplit")