mirror of
https://github.com/Novaloop-AG/healthchat-web.git
synced 2026-11-02 12:07:34 +00:00
feat(spaces): move module items below home in panel
This commit is contained in:
@@ -294,7 +294,15 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
|
||||
|
||||
const moduleSpaceItems = useModuleSpacePanelItems(ModuleApi.instance.extras);
|
||||
|
||||
const metaSpacesSection = metaSpaces
|
||||
const homeSection = metaSpaces
|
||||
.filter((key) => key === MetaSpace.Home)
|
||||
.map((key) => {
|
||||
const Component = metaSpaceComponentMap[key];
|
||||
return <Component key={key} selected={activeSpace === key} isPanelCollapsed={isPanelCollapsed} />;
|
||||
});
|
||||
|
||||
const otherMetaSpacesSection = metaSpaces
|
||||
.filter((key) => key !== MetaSpace.Home)
|
||||
.filter((key) => !(key === MetaSpace.VideoRooms && !SettingsStore.getValue("feature_video_rooms")))
|
||||
.map((key) => {
|
||||
const Component = metaSpaceComponentMap[key];
|
||||
@@ -317,7 +325,29 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
|
||||
role="tree"
|
||||
aria-label={_t("common|spaces")}
|
||||
>
|
||||
{metaSpacesSection}
|
||||
{homeSection}
|
||||
{moduleSpaceItems.map((item) => (
|
||||
<li
|
||||
key={item.spaceKey}
|
||||
className={classNames("mx_SpaceItem", {
|
||||
collapsed: isPanelCollapsed,
|
||||
})}
|
||||
role="treeitem"
|
||||
aria-selected={false} // TODO
|
||||
>
|
||||
<SpaceButton
|
||||
{...item}
|
||||
isNarrow={isPanelCollapsed}
|
||||
size="32px"
|
||||
selected={activeSpace === item.spaceKey}
|
||||
onClick={() => {
|
||||
SpaceStore.instance.setActiveSpace(item.spaceKey);
|
||||
item.onSelected?.();
|
||||
}}
|
||||
/>
|
||||
</li>
|
||||
))}
|
||||
{otherMetaSpacesSection}
|
||||
{invites.map((s) => (
|
||||
<SpaceItem
|
||||
key={s.roomId}
|
||||
@@ -345,27 +375,6 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
|
||||
</Draggable>
|
||||
))}
|
||||
{children}
|
||||
{moduleSpaceItems.map((item) => (
|
||||
<li
|
||||
key={item.spaceKey}
|
||||
className={classNames("mx_SpaceItem", {
|
||||
collapsed: isPanelCollapsed,
|
||||
})}
|
||||
role="treeitem"
|
||||
aria-selected={false} // TODO
|
||||
>
|
||||
<SpaceButton
|
||||
{...item}
|
||||
isNarrow={isPanelCollapsed}
|
||||
size="32px"
|
||||
selected={activeSpace === item.spaceKey}
|
||||
onClick={() => {
|
||||
SpaceStore.instance.setActiveSpace(item.spaceKey);
|
||||
item.onSelected?.();
|
||||
}}
|
||||
/>
|
||||
</li>
|
||||
))}
|
||||
{shouldShowComponent(UIComponent.CreateSpaces) && (
|
||||
<CreateSpaceButton isPanelCollapsed={isPanelCollapsed} setPanelCollapsed={setPanelCollapsed} />
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user