This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 813
Integrate searching public rooms and people into the new search experience #8707
Merged
Merged
Changes from 12 commits
Commits
Show all changes
88 commits
Select commit
Hold shift + click to select a range
1d3a2f6
Extract search result avatar into separate component
justjanne 34e3a9a
Create new hook to get profile info based for an mxid
justjanne 66e693e
Keep sorting for non-room results stable
justjanne 691caf3
Build generic new dropdown menu component
justjanne cc7342d
Build new network menu based on new network dropdown component
justjanne fd21e9e
Moved spotlight dialog into own subfolder
justjanne 6bfdf58
Extract hooks and subcomponents from SpotlightDialog
justjanne 315ce5a
Add wrapped hooks for public room, users and profile info results
justjanne 531f5c0
Added component for public room result details
justjanne 73c88da
Return public room results even without search query
justjanne 567e4f6
Implement searching for public rooms and users in new search experience
justjanne 1d8781c
Add copy/copied tooltip for invite link option in spotlight
justjanne d24efda
feat: clean up search hooks, remove unnecessary wrappers
justjanne 9dacc50
feat: use variables for css where possible
justjanne fa6d722
comment: explain rationale for hiding threepid avatar from screenreaders
justjanne d5a5621
feat: use variables for css where possible
justjanne 463217b
fix: correct bad automatic import
justjanne cbae360
fix: correct translation issue
justjanne d14bd3c
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne 8f4dd91
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne 5ef137c
fix: correct nullability issues
justjanne a99a4ab
feat: switch roomdirectory to use new network dropdown
justjanne 975214b
feat: remove old network dropdown
justjanne 2b2bb74
feat: replace old networkdropdown with new networkdropdown
justjanne c7a4242
feat: Rename generic dropdown menu
justjanne 4d81f68
feat: improve styling of GenericDropdownMenu
justjanne 4079af5
feat: improve styling of network dropdown
justjanne 76728ca
feat: clamp length of topic for public room results
justjanne a3ab9d3
feat: update translations
justjanne e33d045
fix: correct lint issues
justjanne ea9bdfe
fix: implement changes requested by design
justjanne 4d4d3f1
fix: update i18n
justjanne c68886e
Merge branch 'develop' into justjanne/feat/21354-search-directories
justjanne 6c5c79b
Merge branch 'develop' into justjanne/feat/21354-search-directories
justjanne 60dd35b
Merge branch 'develop' into justjanne/feat/21354-search-directories
justjanne 5897a0a
test: add unit test for useDebouncedSearch
justjanne cc98b3f
test: add unit test for useProfileInfo
justjanne 4558898
Merge branch 'develop' into justjanne/feat/21354-search-directories
justjanne cff9201
Merge branch 'develop' into justjanne/feat/21354-search-directories
justjanne 9d38a1d
feat: allow setting initial filter
justjanne d481930
fix: avoid unnecessary lookup
justjanne 3acde35
fix: solve potential bug
justjanne b6295f6
fix(test): correct typo in test name
justjanne 1fba8fe
test: expand test cases
justjanne cfd091c
test: create test cases for spotlight dialog
justjanne eb2aff8
fix(test): correct issues found by tests
justjanne 8db559a
fix: prevent the result of a slower request overriding the result of …
justjanne cb716a8
fix: implement spacing as requested by design
justjanne 29fa8b2
fix: don't show space results with filter enabled
justjanne 02a74c5
fix: clear people filter if query is empty
justjanne e7fa720
fix: avoid duplicate import
justjanne b2405b0
fix: correct eslint issue
justjanne 6a79651
feat: show suggestions for people filter with empty query
justjanne e7fc1ba
feat: extract member sort algorithm from InviteDialog
justjanne 33af6db
feat: sort people suggestions correctly
justjanne cf1e2c5
fix: improve comments
justjanne 4a8bd53
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne 8ea4a46
feat: make useDebouncedCallback more generic
justjanne a7b1559
test: add test for useLatestResult to prevent out-of-order results
justjanne c1f6b6d
test: add utility helper to enable labs features
justjanne 9374b6d
fix: prevent unnecessary duplicate requests
justjanne a177386
fix: correct overflow of result titles
justjanne 2748e82
test: initial cypress test
justjanne 5063a92
fix: make it easier for debounced callback to be used safely
justjanne ea85fd9
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne e1979ba
fix(test): correct bad import
justjanne e0a16f6
fix(test): use bundle for import instead
justjanne 6994470
Introduce test case for finding public rooms
justjanne fbb56f5
Fix issue where people filter could not be removed via keyboard
justjanne 41f4100
Correctly import visibility
justjanne b54e6ad
Correctly test name
justjanne a202e3c
Fix cypress test imports
justjanne bc1963f
Test known and unknown rooms and users
justjanne 2732442
Test navigating and activating results
justjanne cdd9507
Add Todo comments for tomorrow
justjanne 7da28f0
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne 765e67c
Test search result destinations as well
justjanne e587cb3
Implement changes requested by design: "Other Searches" heading
justjanne 2cb252b
Update i18n
justjanne 8c3ed24
Add additional tests
justjanne 4bdbd25
Make eslint happy
justjanne 63629a6
Test selecting/removing filters via keyboard as well
justjanne f008bc0
Rename keyboard navigation test
justjanne 5328bf1
Update spotlight test number
justjanne b9c69b7
Merge remote-tracking branch 'origin/develop' into justjanne/feat/213…
justjanne 1ec0e04
Implement loading indicator, requested by design
justjanne 54ea843
ci: empty commit to force CI to run again
justjanne 646ab8a
Fix issue that was responsible for flaky tests
justjanne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| Copyright 2022 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_NewDropdownMenu_button { | ||
| padding: 3px 4px 3px 8px; | ||
| border-radius: 4px; | ||
| line-height: 1.5; | ||
| user-select: none; | ||
| font-size: 12px; | ||
| color: #737D8C; | ||
justjanne marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| .mx_NewDropdownMenu_button:hover, | ||
| .mx_NewDropdownMenu_button[aria-expanded=true] { | ||
| background: $quinary-content; | ||
| } | ||
|
|
||
| .mx_NewDropdownMenu_button::before { | ||
| content: ""; | ||
| width: 18px; | ||
| height: 18px; | ||
| background: currentColor; | ||
| mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); | ||
| mask-size: 100%; | ||
| mask-repeat: no-repeat; | ||
| float: right; | ||
| } | ||
|
|
||
| .mx_ContextualMenu_wrapper.mx_NewDropdownMenu_header { | ||
| .mx_ContextualMenu { | ||
| position: initial; | ||
|
|
||
| span:first-of-type { | ||
| font-weight: $font-semi-bold; | ||
| font-size: inherit; | ||
| color: $primary-content; | ||
| } | ||
|
|
||
| font-size: $font-12px; | ||
| color: $secondary-content; | ||
| padding-top: 10px; | ||
| padding-bottom: 10px; | ||
|
|
||
| border: 1px solid $quinary-content; | ||
| box-shadow: 0px 1px 3px rgba(23, 25, 28, 0.05); | ||
| } | ||
|
|
||
| .mx_ContextualMenu_chevron_top { | ||
| left: auto; | ||
| right: 22px; | ||
| border-bottom-color: $quinary-content; | ||
|
|
||
| &::after { | ||
| content: ""; | ||
| border: inherit; | ||
| border-bottom-color: $menu-bg-color; | ||
| position: absolute; | ||
| top: 1px; | ||
| left: -8px; | ||
| } | ||
| } | ||
|
|
||
| .mx_NewDropdownMenu_divider { | ||
| display: block; | ||
| height: 0; | ||
| margin-left: 4px; | ||
| margin-right: 19px; | ||
| border-top: 1px solid #F4F6FA; | ||
| } | ||
|
|
||
| .mx_NewDropdownMenu_OptionHeader, .mx_NewDropdownMenu_OptionItem { | ||
| > span:not(:first-of-type):not(:last-of-type) { | ||
| flex-grow: 1; | ||
| } | ||
| } | ||
|
|
||
| .mx_NewDropdownMenu_OptionHeader { | ||
| display: flex; | ||
| flex-grow: 1; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| padding: 10px 20px 10px 30px; | ||
| position: relative; | ||
|
|
||
| > span:not(:first-of-type) { | ||
| margin-left: 4px; | ||
| color: $secondary-content; | ||
| } | ||
|
|
||
| > span:first-of-type { | ||
| font-size: $font-15px; | ||
| color: $primary-content; | ||
| } | ||
| } | ||
|
|
||
| .mx_NewDropdownMenu_OptionItem { | ||
| display: flex; | ||
| flex-grow: 1; | ||
| justify-content: space-between; | ||
| flex-direction: column; | ||
| padding: 10px 20px 10px 30px; | ||
| position: relative; | ||
|
|
||
| &:hover { | ||
| background-color: $event-selected-color; | ||
| } | ||
|
|
||
| &[aria-checked="true"] { | ||
| :first-child { | ||
| margin-left: -20px; | ||
| } | ||
|
|
||
| :first-child::before { | ||
| content: ""; | ||
| width: 12px; | ||
| height: 12px; | ||
| margin-right: 8px; | ||
| mask-image: url("$(res)/img/feather-customised/check.svg"); | ||
| mask-size: 100%; | ||
| mask-repeat: no-repeat; | ||
| background-color: $primary-content; | ||
| display: inline-block; | ||
| vertical-align: middle; | ||
| } | ||
| } | ||
|
|
||
| :last-child { | ||
| color: $secondary-content; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.