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

Initial Spaces [MSC1772] support #5508

Closed
wants to merge 108 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
fd202d0
Create Labs flag for Matrix Spaces (feature_spaces)
t3chguy Nov 27, 2020
715cbbe
Break out generic Room name and topic components which self maintain
t3chguy Dec 3, 2020
7e40af1
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Dec 9, 2020
12f125a
Merge branch 't3chguy/fix/15905' of github.com:matrix-org/matrix-reac…
t3chguy Dec 9, 2020
124393c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Dec 17, 2020
8ee88a8
Fix RoomName and RoomTopic HOCs edge case when room prop changes
t3chguy Dec 18, 2020
355c19c
Fix room-list algorithm behaviour on space-rooms and improve edge-cas…
t3chguy Dec 18, 2020
db35595
Ignore space-rooms as breadcrumbs
t3chguy Dec 18, 2020
3c16d4a
Use new Room::canInvite method to prevent duplicating code
t3chguy Dec 18, 2020
4484e16
Wire up RoomView prop `justCreated` for being able to distinguish pos…
t3chguy Dec 18, 2020
4fd1795
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Dec 27, 2020
28db650
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Dec 29, 2020
842cf87
Extend ContextMenu with wrapperClassName prop
t3chguy Dec 29, 2020
ef524e9
Fix RoomAvatar typescript props definition
t3chguy Dec 29, 2020
ee69d71
Avatar don't check Spaces for DM-ness
t3chguy Dec 29, 2020
110745f
Permalinks expose serverCandidates for re-use
t3chguy Dec 29, 2020
7454858
Room List algorithm - sanely handle space invites
t3chguy Dec 30, 2020
7f41735
Add useStateArray hook
t3chguy Jan 5, 2021
5703854
Extend permalink utility for calculating room vias
t3chguy Jan 5, 2021
55689e2
Add setHasDiff utility
t3chguy Jan 5, 2021
41ac8da
RoomListStore pass filtered lists to ListNotificationStates
t3chguy Jan 5, 2021
13a283e
Fix invite.svg alignment issue
t3chguy Jan 6, 2021
c16a7cf
Iterate UserMenu styling, padding, and add an Avatar to it
t3chguy Jan 6, 2021
7eb27eb
Create space variants of some right panel cards and decorate them wit…
t3chguy Jan 6, 2021
2c0d831
stash work so far
t3chguy Jan 8, 2021
cf30345
WIP of space tree
bwindels Jan 12, 2021
d388663
allow selecting sub spaces
bwindels Jan 12, 2021
a912a21
fix react error
bwindels Jan 18, 2021
f63c986
adjust left panel css to allow variable width space panel
bwindels Jan 18, 2021
f94f99e
make space panel variable width
bwindels Jan 18, 2021
f5e8220
fix left panel collapsing with new space panel
bwindels Jan 18, 2021
33ab984
fix types
bwindels Jan 18, 2021
2e20921
fix lint
bwindels Jan 18, 2021
d144c6f
i18n
bwindels Jan 18, 2021
634e5aa
Delint
t3chguy Jan 20, 2021
56f9bd2
Fix initial space.parent events
t3chguy Jan 20, 2021
5f06a5f
Fix space settings dialog closing on leave and i18n
t3chguy Jan 20, 2021
1a325e2
Fix AddExistingToSpaceDialog [Object object] bug
t3chguy Jan 20, 2021
24d9c93
Iterate SpaceStore to handle more edge cases
t3chguy Jan 20, 2021
dc0fe60
Fix naive test
t3chguy Jan 20, 2021
8be1c27
iterate SpaceStore to fix canonical parent implementation
t3chguy Jan 20, 2021
0c6f9ab
Iterate space & room view to consolidate handling code
t3chguy Jan 20, 2021
b87ac93
Fix back button on User Info from a Space Member List
t3chguy Jan 20, 2021
62f52c2
stash UserMenu with mindset that all its changes will be dropped shortly
t3chguy Jan 20, 2021
036538c
WIP
bwindels Jan 20, 2021
c1b42d7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Jan 20, 2021
899bf4b
Fix SpaceSettingsDialog avatar uploading
t3chguy Jan 21, 2021
50c4a27
Fix stylistic issues with SpaceRoomView
t3chguy Jan 21, 2021
2b15ed6
Change history visibility for rooms in spaces
t3chguy Jan 21, 2021
4312645
i18n
t3chguy Jan 21, 2021
962ef03
add chevron to collapse/expand space
bwindels Jan 22, 2021
c3ba2fa
Fix race condition for detecting whether new space is public or not
t3chguy Jan 25, 2021
095341f
Initial functioning SpaceRoomDirectory sans editing
t3chguy Jan 25, 2021
064483e
Stash other changes
t3chguy Jan 25, 2021
8af33aa
Show auto_join rooms in the Space landing
t3chguy Jan 25, 2021
de24c61
put collapsed state in react state rather than classList
bwindels Jan 26, 2021
deb3a86
make typescript happy
bwindels Jan 26, 2021
99c71f6
Iterate work on Space Room Directory and Space Landing
t3chguy Jan 26, 2021
5c85705
Merge pull request #5562 from matrix-org/bwindels/spacepanel-collapse
t3chguy Jan 26, 2021
83bf1e8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Jan 26, 2021
cbb63fc
i18n and fix test
t3chguy Jan 26, 2021
8dd1c79
delint
t3chguy Jan 26, 2021
82a9b19
delint s'more
t3chguy Jan 26, 2021
dc29083
delint s'more ^2
t3chguy Jan 26, 2021
bc77269
Merge branch 'spaces_feature' of github.com:matrix-org/matrix-react-s…
t3chguy Jan 26, 2021
e838c78
Fix handling of empty (leaf) spaces
t3chguy Jan 26, 2021
42d4fe4
Fix alignment of avatars in the Add existing spaces/rooms dropdown
t3chguy Jan 27, 2021
1d43656
14px font size for spaces
bwindels Jan 27, 2021
1c47bd7
expand/collapse space panel
bwindels Jan 27, 2021
dd73c0a
empty line
bwindels Jan 27, 2021
27ec707
Merge pull request #5577 from matrix-org/bwindels/spaces_collapse_panel
t3chguy Jan 28, 2021
646a915
Merge branch 'spaces_feature' of github.com:matrix-org/matrix-react-s…
t3chguy Jan 28, 2021
4b1f5b3
Fix Members count not working with a single member
t3chguy Jan 28, 2021
0408316
Fix Space Store invite grouping
t3chguy Jan 28, 2021
bfe712a
Fix old community panel being too wide
t3chguy Jan 28, 2021
6f9c068
Fix minor styling issues
t3chguy Jan 28, 2021
085d5d9
Allow using alias for name in space hierarchy
t3chguy Jan 28, 2021
71840c4
Iterate SpacePanel, fix tooltips and give consistent expanded states
t3chguy Jan 29, 2021
fdeb6ef
Apply hacks.
t3chguy Jan 29, 2021
a2f73e0
Iterate Space invite ux
t3chguy Jan 29, 2021
462c245
Bodge positioning of Notification badges in space panel
t3chguy Jan 29, 2021
ae062a6
Fix styling of feint outline buttons esp for Dark
t3chguy Jan 29, 2021
e22bf7f
Fix createRoom automatic world_readable for space children
t3chguy Jan 29, 2021
b5ef6a8
dump unused code
t3chguy Jan 29, 2021
5a4d984
Bodge room directory to auto-join path to room if not already joined
t3chguy Jan 29, 2021
90083e7
Add spinner and fallback text to space home space nav api
t3chguy Jan 29, 2021
40c54bb
i18n
t3chguy Jan 29, 2021
c9baf8e
delint
t3chguy Jan 29, 2021
98f5334
Fix space panel automatic changing of active space
t3chguy Jan 29, 2021
68b5ae9
disable some comments
t3chguy Jan 29, 2021
2d3e750
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Jan 29, 2021
06ebe35
Improve Add Existing to space dialog
t3chguy Jan 29, 2021
fd2f068
Refresh spacenav when you add a new room
t3chguy Jan 29, 2021
f7a69e7
i18n
t3chguy Jan 29, 2021
cf4ce58
fix typo
t3chguy Jan 29, 2021
751c05d
Update add.svg to match Figma
t3chguy Feb 3, 2021
1d4c154
Revert most User Menu changes
t3chguy Feb 3, 2021
4b48c44
Initial work on Space Panel context menus
t3chguy Feb 3, 2021
5ccf1fa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Feb 3, 2021
2b8cb32
Update some colours, icons and copy
t3chguy Feb 5, 2021
9110423
Fix default avatar colours being generated wrong in space room directory
t3chguy Feb 8, 2021
3a74bd3
Sort space children as per the MSC
t3chguy Feb 8, 2021
ebba925
Don't show un-joined spaces in the hierarchy
t3chguy Feb 8, 2021
e0dca6c
Wire up Space Room Directory admin mode
t3chguy Feb 9, 2021
5ffc110
delint
t3chguy Feb 9, 2021
112e282
Iterate space room directory
t3chguy Feb 10, 2021
54f4c0e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Feb 18, 2021
ad5d8b0
i18n
t3chguy Feb 18, 2021
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
8 changes: 8 additions & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
@import "./structures/_RoomView.scss";
@import "./structures/_ScrollPanel.scss";
@import "./structures/_SearchBox.scss";
@import "./structures/_SpacePanel.scss";
@import "./structures/_SpaceRoomDirectory.scss";
@import "./structures/_SpaceRoomView.scss";
@import "./structures/_TabbedView.scss";
@import "./structures/_ToastContainer.scss";
@import "./structures/_UploadBar.scss";
Expand Down Expand Up @@ -56,6 +59,7 @@
@import "./views/context_menus/_MessageContextMenu.scss";
@import "./views/context_menus/_StatusMessageContextMenu.scss";
@import "./views/context_menus/_TagTileContextMenu.scss";
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
@import "./views/dialogs/_AddressPickerDialog.scss";
@import "./views/dialogs/_Analytics.scss";
@import "./views/dialogs/_BugReportDialog.scss";
Expand Down Expand Up @@ -89,6 +93,7 @@
@import "./views/dialogs/_SettingsDialog.scss";
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_SlashCommandHelpDialog.scss";
@import "./views/dialogs/_SpaceSettingsDialog.scss";
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
@import "./views/dialogs/_TermsDialog.scss";
@import "./views/dialogs/_UploadConfirmDialog.scss";
Expand Down Expand Up @@ -232,6 +237,9 @@
@import "./views/settings/tabs/user/_PreferencesUserSettingsTab.scss";
@import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
@import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
@import "./views/spaces/_SpaceBasicSettings.scss";
@import "./views/spaces/_SpaceCreateMenu.scss";
@import "./views/spaces/_SpacePublicShare.scss";
@import "./views/terms/_InlineTermsAgreement.scss";
@import "./views/toasts/_AnalyticsToast.scss";
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
Expand Down
22 changes: 5 additions & 17 deletions res/css/structures/_LeftPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
*/

$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
$roomListCollapsedWidth: 68px;

.mx_LeftPanel {
background-color: $roomlist-bg-color;
Expand All @@ -37,18 +38,12 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
// GroupFilterPanel handles its own CSS
}

&:not(.mx_LeftPanel_hasGroupFilterPanel) {
.mx_LeftPanel_roomListContainer {
width: 100%;
}
}

// Note: The 'room list' in this context is actually everything that isn't the tag
// panel, such as the menu options, breadcrumbs, filtering, etc
.mx_LeftPanel_roomListContainer {
width: calc(100% - $groupFilterPanelWidth);
background-color: $roomlist-bg-color;

flex: 1 0 0;
min-width: 0;
// Create another flexbox (this time a column) for the room list components
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -168,17 +163,10 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
// These styles override the defaults for the minimized (66px) layout
&.mx_LeftPanel_minimized {
min-width: unset;

// We have to forcefully set the width to override the resizer's style attribute.
&.mx_LeftPanel_hasGroupFilterPanel {
width: calc(68px + $groupFilterPanelWidth) !important;
}
&:not(.mx_LeftPanel_hasGroupFilterPanel) {
width: 68px !important;
}
width: unset !important;

.mx_LeftPanel_roomListContainer {
width: 68px;
width: $roomListCollapsedWidth;

.mx_LeftPanel_userHeader {
flex-direction: row;
Expand Down
17 changes: 17 additions & 0 deletions res/css/structures/_RightPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,20 @@ limitations under the License.
mask-position: center;
}
}

.mx_RightPanel_scopeHeader {
margin: 24px;
text-align: center;
font-weight: $font-semi-bold;
font-size: $font-18px;
line-height: $font-22px;

.mx_BaseAvatar {
margin-right: 8px;
vertical-align: middle;
}

.mx_BaseAvatar_image {
border-radius: 8px;
}
}
Loading