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.

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

fix: use mousemove to focus suggestion #619

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/dry-phones-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-mentions": minor
---

Focus suggestions on mouse move instead of mouse enter
5 changes: 5 additions & 0 deletions .changeset/twelve-drinks-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-mentions": patch
---

forward refs for wrapped style components
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-mentions",
"version": "4.4.7",
"version": "4.5.8",
"description": "React mentions input",
"main": "dist/react-mentions.cjs.js",
"module": "dist/react-mentions.esm.js",
Expand Down
4 changes: 2 additions & 2 deletions src/MentionsInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ class MentionsInput extends React.Component {
customSuggestionsContainer ={this.props.customSuggestionsContainer}
onSelect={this.addMention}
onMouseDown={this.handleSuggestionsMouseDown}
onMouseEnter={this.handleSuggestionsMouseEnter}
onMouseMove={this.handleSuggestionsMouseMove}
isLoading={this.isLoading()}
isOpened={this.isOpened()}
ignoreAccents={this.props.ignoreAccents}
Expand Down Expand Up @@ -678,7 +678,7 @@ class MentionsInput extends React.Component {
this._suggestionsMouseDown = true
}

handleSuggestionsMouseEnter = (focusIndex) => {
handleSuggestionsMouseMove = (focusIndex) => {
this.setState({
focusIndex,
scrollFocusedIntoView: false,
Expand Down
4 changes: 2 additions & 2 deletions src/Suggestion.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ function Suggestion({
ignoreAccents,
index,
onClick,
onMouseEnter,
onMouseMove,
query,
renderSuggestion,
suggestion,
style,
className,
classNames,
}) {
const rest = { onClick, onMouseEnter }
const rest = { onClick, onMouseMove }

const renderContent = () => {
let display = getDisplay()
Expand Down
10 changes: 5 additions & 5 deletions src/SuggestionsOverlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SuggestionsOverlay({
style,
customSuggestionsContainer,
onMouseDown,
onMouseEnter,
onMouseMove,
}) {
const [ulElement, setUlElement] = useState()

Expand Down Expand Up @@ -85,7 +85,7 @@ function SuggestionsOverlay({
suggestion={result}
focused={isFocused}
onClick={() => select(result, queryInfo)}
onMouseEnter={() => handleMouseEnter(index)}
onMouseMove={() => handleMouseMove(index)}
/>
)
}
Expand All @@ -98,9 +98,9 @@ function SuggestionsOverlay({
return <LoadingIndicator style={style('loadingIndicator')} />
}

const handleMouseEnter = (index, ev) => {
if (onMouseEnter) {
onMouseEnter(index)
const handleMouseMove = (index, ev) => {
if (onMouseMove) {
onMouseMove(index)
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/utils/defaultStyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ import useStyles from 'substyle'

function createDefaultStyle(defaultStyle, getModifiers) {
const enhance = (ComponentToWrap) => {
const DefaultStyleEnhancer = ({
const DefaultStyleEnhancer = React.forwardRef(({
style,
className,
classNames,
...rest
}) => {
}, forwardedRef) => {
const modifiers = getModifiers ? getModifiers(rest) : undefined
const styles = useStyles(
defaultStyle,
{ style, className, classNames },
modifiers
)

return <ComponentToWrap {...rest} style={styles} />
}
return <ComponentToWrap {...rest} ref={forwardedRef} style={styles} />
})
const displayName =
ComponentToWrap.displayName || ComponentToWrap.name || 'Component'
DefaultStyleEnhancer.displayName = `defaultStyle(${displayName})`
Expand Down
2,843 changes: 1,472 additions & 1,371 deletions yarn.lock

Large diffs are not rendered by default.