@@ -68,6 +68,7 @@ import { ThreadsActivityCentre } from "./threads-activity-centre/";
6868import AccessibleButton from "../elements/AccessibleButton" ;
6969import { Landmark , LandmarkNavigation } from "../../../accessibility/LandmarkNavigation" ;
7070import { KeyboardShortcut } from "../settings/KeyboardShortcut" ;
71+ import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement" ;
7172
7273const useSpaces = ( ) : [ Room [ ] , MetaSpace [ ] , Room [ ] , SpaceKey ] => {
7374 const invites = useEventEmitterState < Room [ ] > ( SpaceStore . instance , UPDATE_INVITED_SPACES , ( ) => {
@@ -379,61 +380,72 @@ const SpacePanel: React.FC = () => {
379380 onDragEndHandler ( ) ;
380381 } }
381382 >
382- < nav
383- className = { classNames ( "mx_SpacePanel" , {
384- collapsed : isPanelCollapsed ,
385- newUi : newRoomListEnabled ,
386- } ) }
387- onKeyDown = { ( ev ) => {
388- const navAction = getKeyBindingsManager ( ) . getNavigationAction ( ev ) ;
389- if (
390- navAction === KeyBindingAction . NextLandmark ||
391- navAction === KeyBindingAction . PreviousLandmark
392- ) {
393- LandmarkNavigation . findAndFocusNextLandmark (
394- Landmark . ACTIVE_SPACE_BUTTON ,
395- navAction === KeyBindingAction . PreviousLandmark ,
396- ) ;
397- ev . stopPropagation ( ) ;
398- ev . preventDefault ( ) ;
399- return ;
400- }
401- onKeyDownHandler ( ev ) ;
402- } }
403- ref = { ref }
404- aria-label = { _t ( "common|spaces" ) }
383+ < ReleaseAnnouncement
384+ feature = "newNotificationSounds"
385+ header = { _t ( "settings|notifications|sounds_release_announcement|title" ) }
386+ description = { _t ( "settings|notifications|sounds_release_announcement|description" ) }
387+ closeLabel = { _t ( "action|ok" ) }
388+ displayArrow = { false }
389+ placement = "right-start"
405390 >
406- < UserMenu isPanelCollapsed = { isPanelCollapsed } >
407- < AccessibleButton
408- className = { classNames ( "mx_SpacePanel_toggleCollapse" , { expanded : ! isPanelCollapsed } ) }
409- onClick = { ( ) => setPanelCollapsed ( ! isPanelCollapsed ) }
410- title = { isPanelCollapsed ? _t ( "action|expand" ) : _t ( "action|collapse" ) }
411- caption = {
412- < KeyboardShortcut
413- value = { { ctrlOrCmdKey : true , shiftKey : true , key : "d" } }
414- className = "mx_SpacePanel_Tooltip_KeyboardShortcut"
415- />
391+ < nav
392+ className = { classNames ( "mx_SpacePanel" , {
393+ collapsed : isPanelCollapsed ,
394+ newUi : newRoomListEnabled ,
395+ } ) }
396+ onKeyDown = { ( ev ) => {
397+ const navAction = getKeyBindingsManager ( ) . getNavigationAction ( ev ) ;
398+ if (
399+ navAction === KeyBindingAction . NextLandmark ||
400+ navAction === KeyBindingAction . PreviousLandmark
401+ ) {
402+ LandmarkNavigation . findAndFocusNextLandmark (
403+ Landmark . ACTIVE_SPACE_BUTTON ,
404+ navAction === KeyBindingAction . PreviousLandmark ,
405+ ) ;
406+ ev . stopPropagation ( ) ;
407+ ev . preventDefault ( ) ;
408+ return ;
416409 }
417- />
418- </ UserMenu >
419- < Droppable droppableId = "top-level-spaces" >
420- { ( provided , snapshot ) => (
421- < InnerSpacePanel
422- { ...provided . droppableProps }
423- isPanelCollapsed = { isPanelCollapsed }
424- setPanelCollapsed = { setPanelCollapsed }
425- isDraggingOver = { snapshot . isDraggingOver }
426- innerRef = { provided . innerRef }
427- >
428- { provided . placeholder }
429- </ InnerSpacePanel >
430- ) }
431- </ Droppable >
432-
433- < ThreadsActivityCentre displayButtonLabel = { ! isPanelCollapsed } />
434-
435- < QuickSettingsButton isPanelCollapsed = { isPanelCollapsed } />
436- </ nav >
410+ onKeyDownHandler ( ev ) ;
411+ } }
412+ ref = { ref }
413+ aria-label = { _t ( "common|spaces" ) }
414+ >
415+ < UserMenu isPanelCollapsed = { isPanelCollapsed } >
416+ < AccessibleButton
417+ className = { classNames ( "mx_SpacePanel_toggleCollapse" , {
418+ expanded : ! isPanelCollapsed ,
419+ } ) }
420+ onClick = { ( ) => setPanelCollapsed ( ! isPanelCollapsed ) }
421+ title = { isPanelCollapsed ? _t ( "action|expand" ) : _t ( "action|collapse" ) }
422+ caption = {
423+ < KeyboardShortcut
424+ value = { { ctrlOrCmdKey : true , shiftKey : true , key : "d" } }
425+ className = "mx_SpacePanel_Tooltip_KeyboardShortcut"
426+ />
427+ }
428+ />
429+ </ UserMenu >
430+ < Droppable droppableId = "top-level-spaces" >
431+ { ( provided , snapshot ) => (
432+ < InnerSpacePanel
433+ { ...provided . droppableProps }
434+ isPanelCollapsed = { isPanelCollapsed }
435+ setPanelCollapsed = { setPanelCollapsed }
436+ isDraggingOver = { snapshot . isDraggingOver }
437+ innerRef = { provided . innerRef }
438+ >
439+ { provided . placeholder }
440+ </ InnerSpacePanel >
441+ ) }
442+ </ Droppable >
443+
444+ < ThreadsActivityCentre displayButtonLabel = { ! isPanelCollapsed } />
445+
446+ < QuickSettingsButton isPanelCollapsed = { isPanelCollapsed } />
447+ </ nav >
448+ </ ReleaseAnnouncement >
437449 </ DragDropContext >
438450 ) }
439451 </ RovingTabIndexProvider >
0 commit comments