Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Highlight the second item in in the omnibar search results #4611

Merged
merged 6 commits into from
Jun 17, 2021
Merged

Highlight the second item in in the omnibar search results #4611

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c142dcb
Update Initial active item index
akash-codemonk May 21, 2021
edf994b
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/h…
akash-codemonk May 25, 2021
89922bf
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/h…
akash-codemonk Jun 14, 2021
0a15d1b
Check for query and recent entities length
akash-codemonk Jun 14, 2021
7dfce76
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/h…
akash-codemonk Jun 17, 2021
581d1bd
Resolve comment
akash-codemonk Jun 17, 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
Next Next commit
Update Initial active item index
  • Loading branch information
@akash-codemonk
akash-codemonk committed May 21, 2021
commit c142dcb204b4de7728883fbdea262393e9226773
10 changes: 7 additions & 3 deletions app/client/src/components/editorComponents/GlobalSearch/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ const getSectionTitle = (title: string, icon: any) => ({
icon,
});

const INITIAL_ACTIVE_ITEM_INDEX = 2;

function GlobalSearch() {
const modalOpen = useSelector(isModalOpenSelector);
const defaultDocs = useDefaultDocumentationResults(modalOpen);
Expand All @@ -118,7 +120,9 @@ function GlobalSearch() {
setDocumentationSearchResultsInState(res);
}, []);

const [activeItemIndex, setActiveItemIndexInState] = useState(1);
const [activeItemIndex, setActiveItemIndexInState] = useState(
INITIAL_ACTIVE_ITEM_INDEX,
);
const setActiveItemIndex = useCallback((index) => {
scrollPositionRef.current = 0;
setActiveItemIndexInState(index);
Expand Down Expand Up @@ -166,12 +170,12 @@ function GlobalSearch() {
setQuery(resetSearchQuery);
} else {
dispatch(setGlobalSearchQuery(""));
if (!query) setActiveItemIndex(1);
if (!query) setActiveItemIndex(INITIAL_ACTIVE_ITEM_INDEX);
}
}, [modalOpen]);

useEffect(() => {
setActiveItemIndex(1);
setActiveItemIndex(INITIAL_ACTIVE_ITEM_INDEX);
}, [query]);

const filteredWidgets = useMemo(() => {
Expand Down