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

Commit

Permalink
Spotlight search labs (#7116)
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy authored Dec 10, 2021
1 parent c568338 commit 914b612
Show file tree
Hide file tree
Showing 12 changed files with 906 additions and 53 deletions.
1 change: 1 addition & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_SlashCommandHelpDialog.scss";
@import "./views/dialogs/_SpaceSettingsDialog.scss";
@import "./views/dialogs/_SpotlightDialog.scss";
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
@import "./views/dialogs/_TermsDialog.scss";
@import "./views/dialogs/_UntrustedDeviceDialog.scss";
Expand Down
1 change: 1 addition & 0 deletions res/css/views/avatars/_DecoratedRoomAvatar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ limitations under the License.
content: '';
width: 8px;
height: 8px;
right: 0;
position: absolute;
border-radius: 8px;
}
Expand Down
286 changes: 286 additions & 0 deletions res/css/views/dialogs/_SpotlightDialog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_SpotlightDialog_wrapper .mx_Dialog {
border-radius: 8px;
overflow-y: initial;
position: relative;
height: 60%;
padding: 0;
contain: unset; // needed for .mx_SpotlightDialog_keyboardPrompt to not be culled

.mx_SpotlightDialog_keyboardPrompt {
position: absolute;
padding: 8px;
border-radius: 8px;
background-color: $background;
top: -60px; // relative to the top of the modal
left: 50%;
transform: translateX(-50%);
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;

> span > div {
display: inline-block;
padding: 2px 4px;
margin: 0 4px;
border-radius: 6px;
background-color: $quinary-content;
vertical-align: middle;
color: $tertiary-content;
}
}
}

.mx_SpotlightDialog {
height: 100%;
display: flex;
flex-direction: column;

.mx_Dialog_header {
margin-bottom: 0;
}

.mx_SpotlightDialog_searchBox {
margin: 0;
border: none;
padding: 12px 16px;
border-bottom: 1px solid $system;

> input {
display: block;
box-sizing: border-box;
background-color: transparent;
width: 100%;
height: 32px;
padding: 0;
color: $tertiary-content;
font-weight: normal;
font-size: $font-15px;
line-height: $font-24px;
}
}

#mx_SpotlightDialog_content {
margin: 16px;
height: 100%;
overflow-y: auto;

.mx_SpotlightDialog_section {
> h4 {
font-weight: $font-semi-bold;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
margin-top: 0;
margin-bottom: 8px;
}

& + .mx_SpotlightDialog_section {
margin-top: 24px;
}
}

.mx_SpotlightDialog_recentlyViewed {
> div {
display: flex;
white-space: nowrap;
overflow-x: hidden;
}

.mx_AccessibleButton {
border-radius: 8px;
padding: 4px;
color: $primary-content;
font-size: $font-12px;
line-height: $font-15px;
display: inline-block;
width: 50px;
min-width: 50px;
box-sizing: border-box;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;

.mx_DecoratedRoomAvatar {
margin: 0 5px 4px; // maintain centering
}

& + .mx_AccessibleButton {
margin-left: 16px;
}

&:hover, &[aria-selected=true] {
background-color: $quinary-content;
}
}
}

.mx_SpotlightDialog_results,
.mx_SpotlightDialog_recentSearches,
.mx_SpotlightDialog_otherSearches {
.mx_AccessibleButton {
padding: 6px 4px;
border-radius: 8px;
font-size: $font-15px;
line-height: $font-24px;
color: $primary-content;
position: relative;
display: flex;
align-items: center;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

.mx_BaseAvatar {
margin-right: 8px;
display: inline-block;
height: 20px;
}

&:hover, &[aria-selected=true] {
background-color: $system;

.mx_SpotlightDialog_enterPrompt {
display: inline-block;
}
}
}
}

.mx_SpotlightDialog_otherSearches {
.mx_SpotlightDialog_startChat,
.mx_SpotlightDialog_explorePublicRooms {
padding-left: 32px;
position: relative;

&::before {
background-color: $secondary-content;
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
width: 20px;
height: 20px;
position: absolute;
left: 4px;
top: 50%;
transform: translateY(-50%);
}
}

.mx_SpotlightDialog_startChat::before {
mask-image: url('$(res)/img/element-icons/room/members.svg');
}

.mx_SpotlightDialog_explorePublicRooms::before {
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
}

.mx_SpotlightDialog_otherSearches_messageSearchText {
font-size: $font-15px;
line-height: $font-24px;
}

.mx_SpotlightDialog_otherSearches_messageSearchIcon {
display: inline-block;
margin-left: 8px;
width: 20px;
height: 20px;
background-color: $secondary-content;
vertical-align: text-bottom;
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
}
}

.mx_SpotlightDialog_result_details {
margin-left: 8px;
margin-right: 8px;
color: $tertiary-content;
font-size: $font-12px;
line-height: $font-15px;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
}

.mx_SpotlightDialog_recentSearches {
overflow-y: hidden;
height: calc(100% - 190px);

> h4 > .mx_AccessibleButton_kind_link {
padding: 0;
float: right;
font-weight: normal;
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
}
}

.mx_SpotlightDialog_enterPrompt {
padding: 2px 4px;
font-size: $font-12px;
line-height: $font-15px;
color: $tertiary-content;
border-radius: 6px;
background-color: $quinary-content;
margin: 0 4px 0 auto;
display: none;
}
}

.mx_SpotlightDialog_footer {
font-size: $font-12px;
line-height: $font-15px;
color: $secondary-content;
padding: 16px 16px 20px;
display: flex;
border-top: 1px solid $quinary-content;

> span {
position: relative;
padding-left: 20px;
align-self: center;

&::before {
background-color: $secondary-content;
content: "";
mask-repeat: no-repeat;
mask-position: center;
mask-size: contain;
mask-image: url('$(res)/img/element-icons/room/room-summary.svg');
width: 16px;
height: 16px;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
}
}

.mx_AccessibleButton_kind_primary_outline {
padding: 4px 8px;
border-color: $secondary-content;
color: $secondary-content;
margin-left: auto;
}
}
}
2 changes: 1 addition & 1 deletion src/Rooms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export function roomContextDetailsText(room: Room): string {

const dmPartner = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
if (dmPartner) {
return room.getMember(dmPartner)?.rawDisplayName;
return dmPartner;
}

const [parent, ...otherParents] = SpaceStore.instance.getKnownParents(room.roomId);
Expand Down
46 changes: 18 additions & 28 deletions src/accessibility/RovingTabIndex.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ import { FocusHandler, Ref } from "./roving/types";
* https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets#Technique_1_Roving_tabindex
*/

const DOCUMENT_POSITION_PRECEDING = 2;

export interface IState {
activeRef: Ref;
refs: Ref[];
Expand All @@ -55,7 +53,7 @@ interface IContext {
dispatch: Dispatch<IAction>;
}

const RovingTabIndexContext = createContext<IContext>({
export const RovingTabIndexContext = createContext<IContext>({
state: {
activeRef: null,
refs: [], // list of refs in DOM order
Expand All @@ -80,37 +78,29 @@ interface IAction {
export const reducer = (state: IState, action: IAction) => {
switch (action.type) {
case Type.Register: {
let left = 0;
let right = state.refs.length - 1;
let index = state.refs.length; // by default append to the end

// do a binary search to find the right slot
while (left <= right) {
index = Math.floor((left + right) / 2);
const ref = state.refs[index];
if (!state.activeRef) {
// Our list of refs was empty, set activeRef to this first item
state.activeRef = action.payload.ref;
}

if (ref === action.payload.ref) {
return state; // already in refs, this should not happen
// Sadly due to the potential of DOM elements swapping order we can't do anything fancy like a binary insert
state.refs.push(action.payload.ref);
state.refs.sort((a, b) => {
if (a === b) {
return 0;
}

if (action.payload.ref.current.compareDocumentPosition(ref.current) & DOCUMENT_POSITION_PRECEDING) {
left = ++index;
const position = a.current.compareDocumentPosition(b.current);

if (position & Node.DOCUMENT_POSITION_FOLLOWING || position & Node.DOCUMENT_POSITION_CONTAINED_BY) {
return -1;
} else if (position & Node.DOCUMENT_POSITION_PRECEDING || position & Node.DOCUMENT_POSITION_CONTAINS) {
return 1;
} else {
right = index - 1;
return 0;
}
}

if (!state.activeRef) {
// Our list of refs was empty, set activeRef to this first item
state.activeRef = action.payload.ref;
}
});

// update the refs list
if (index < state.refs.length) {
state.refs.splice(index, 0, action.payload.ref);
} else {
state.refs.push(action.payload.ref);
}
return { ...state };
}

Expand Down
Loading

0 comments on commit 914b612

Please sign in to comment.