Skip to content

Commit 474817d

Browse files
ecnaidarlayershifter
authored andcommitted
fix(Popup): ignore clicks when on prop is set to hover only (#3667)
1 parent 781a1ff commit 474817d

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

src/modules/Popup/Popup.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export default class Popup extends Component {
150150
disabled: false,
151151
eventsEnabled: true,
152152
offset: 0,
153-
on: 'hover',
153+
on: ['click', 'hover'],
154154
pinned: false,
155155
position: 'top left',
156156
}
@@ -204,6 +204,15 @@ export default class Popup extends Component {
204204
portalProps.closeOnPortalMouseLeave = true
205205
portalProps.mouseLeaveDelay = 300
206206
}
207+
if (_.includes(normalizedOn, 'hover')) {
208+
portalProps.openOnTriggerClick = false
209+
portalProps.closeOnTriggerClick = false
210+
portalProps.openOnTriggerMouseEnter = true
211+
portalProps.closeOnTriggerMouseLeave = true
212+
// Taken from SUI: https://git.io/vPmCm
213+
portalProps.mouseLeaveDelay = 70
214+
portalProps.mouseEnterDelay = 50
215+
}
207216
if (_.includes(normalizedOn, 'click')) {
208217
portalProps.openOnTriggerClick = true
209218
portalProps.closeOnTriggerClick = true
@@ -213,13 +222,6 @@ export default class Popup extends Component {
213222
portalProps.openOnTriggerFocus = true
214223
portalProps.closeOnTriggerBlur = true
215224
}
216-
if (_.includes(normalizedOn, 'hover')) {
217-
portalProps.openOnTriggerMouseEnter = true
218-
portalProps.closeOnTriggerMouseLeave = true
219-
// Taken from SUI: https://git.io/vPmCm
220-
portalProps.mouseLeaveDelay = 70
221-
portalProps.mouseEnterDelay = 50
222-
}
223225

224226
return portalProps
225227
}

0 commit comments

Comments
 (0)