Skip to content

Commit

Permalink
removing autocomplete scrollbar
Browse files Browse the repository at this point in the history
  • Loading branch information
wjohnsto committed Jun 2, 2023
1 parent cde8b66 commit 14a4840
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 59 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"next": "^12.2.5",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-custom-scrollbars": "^4.2.1",
"react-dom": "^17.0.2",
"react-icons": "^4.1.0",
"react-markdown": "^5.0.3",
Expand Down
116 changes: 58 additions & 58 deletions src/components/SearchBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Autocomplete } from '@material-ui/lab';
import clsx from 'clsx';
import Image from 'next/image';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Scrollbars } from 'react-custom-scrollbars';
// import { Scrollbars } from 'react-custom-scrollbars';
import scrollIntoView from 'scroll-into-view-if-needed';
import { useDebouncedCallback } from 'use-debounce';

Expand Down Expand Up @@ -361,63 +361,63 @@ export default function SearchBar({ textFilter, updateTextFilter, openLinkedSamp
]
);

const ScrollBarThumb = useCallback(
(props) => <div {...props} className={classes.scrollBarThumb} />,
[classes.scrollBarThumb]
);
const ScrollBarTrack = useCallback(
(props) => <div {...props} className={classes.scrollBarTrack} />,
[classes.scrollBarTrack]
);
// const ScrollBarThumb = useCallback(
// (props) => <div {...props} className={classes.scrollBarThumb} />,
// [classes.scrollBarThumb]
// );
// const ScrollBarTrack = useCallback(
// (props) => <div {...props} className={classes.scrollBarTrack} />,
// [classes.scrollBarTrack]
// );

const AutocompletePaper = useCallback(
({ children, ...rest }) => (
<Paper {...rest} className={classes.dropdown} elevation={0}>
<Scrollbars
universal={true}
autoHide
autoHeight
autoHeightMax="50vh"
renderThumbVertical={ScrollBarThumb}
renderTrackVertical={ScrollBarTrack}>
{children}
</Scrollbars>
{suggestionsOpen && !loading && !!options.length && (
<Grid container className={classes.footer}>
<Grid item xs={6}>
<Typography component={'div'} variant="body2" className={classes.executeTime}>
Search time: {data?.executeTime} secs
</Typography>
</Grid>
<Grid item xs={6}>
<Grid container justify="flex-end" alignItems="center" wrap="nowrap">
Powered by Redis
<Image
width={28}
height={23}
src="/redisearch.svg"
alt="redisearch"
className={classes.redisearch}
/>
</Grid>
</Grid>
</Grid>
)}
</Paper>
),
[
classes.dropdown,
classes.footer,
classes.executeTime,
classes.redisearch,
ScrollBarThumb,
ScrollBarTrack,
suggestionsOpen,
loading,
options.length,
data?.executeTime
]
);
// const AutocompletePaper = useCallback(
// ({ children, ...rest }) => (
// <Paper {...rest} className={classes.dropdown} elevation={0}>
// <Scrollbars
// universal={true}
// autoHide
// autoHeight
// autoHeightMax="50vh"
// renderThumbVertical={ScrollBarThumb}
// renderTrackVertical={ScrollBarTrack}>
// {children}
// </Scrollbars>
// {suggestionsOpen && !loading && !!options.length && (
// <Grid container className={classes.footer}>
// <Grid item xs={6}>
// <Typography component={'div'} variant="body2" className={classes.executeTime}>
// Search time: {data?.executeTime} secs
// </Typography>
// </Grid>
// <Grid item xs={6}>
// <Grid container justify="flex-end" alignItems="center" wrap="nowrap">
// Powered by Redis
// <Image
// width={28}
// height={23}
// src="/redisearch.svg"
// alt="redisearch"
// className={classes.redisearch}
// />
// </Grid>
// </Grid>
// </Grid>
// )}
// </Paper>
// ),
// [
// classes.dropdown,
// classes.footer,
// classes.executeTime,
// classes.redisearch,
// ScrollBarThumb,
// ScrollBarTrack,
// suggestionsOpen,
// loading,
// options.length,
// data?.executeTime
// ]
// );

const AutocompletePopper = useCallback(
({ children, ...rest }) => (
Expand Down Expand Up @@ -464,7 +464,7 @@ export default function SearchBar({ textFilter, updateTextFilter, openLinkedSamp
loading={loading}
filterOptions={(options) => options}
renderInput={renderInput}
PaperComponent={AutocompletePaper}
// PaperComponent={AutocompletePaper}
PopperComponent={AutocompletePopper}
/>
<Grid className={classes.logoRedis}>
Expand Down

0 comments on commit 14a4840

Please sign in to comment.