Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 0615d5b

Browse files
committed
don’t call actions from actions
1 parent 48d900c commit 0615d5b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

app/renderer/reducers/frameReducer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const closeFrame = (state, action) => {
5757
// This allow us to have closeTab button visible for sequential frames closing,
5858
// until onMouseLeave event happens.
5959
if (hoverState) {
60-
windowActions.setTabHoverState(nextFrame.get('key'), hoverState)
60+
state = frameStateUtil.setTabHoverState(state, nextFrame.get('key'), hoverState)
6161
}
6262
}
6363

js/state/frameStateUtil.js

+10
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,17 @@ const setPreviewFrameKey = (state, frameKey, immediate = false) => {
580580
return state.set('previewFrameKey', newPreviewFrameKey)
581581
}
582582

583+
const setTabHoverState = (state, frameKey, hoverState) => {
584+
const frameIndex = getFrameIndex(state, frameKey)
585+
if (frameIndex !== -1) {
586+
state = state.setIn(['frames', frameIndex, 'hoverState'], hoverState)
587+
state = setPreviewFrameKey(state, frameKey)
588+
}
589+
return state
590+
}
591+
583592
module.exports = {
593+
setTabHoverState,
584594
setPreviewFrameKey,
585595
getPreviewFrameKey,
586596
deleteTabInternalIndex,

js/stores/windowStore.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,7 @@ const doAction = (action) => {
378378
}
379379
case windowConstants.WINDOW_SET_TAB_HOVER_STATE:
380380
{
381-
const frameIndex = frameStateUtil.getFrameIndex(windowState, action.frameKey)
382-
if (frameIndex !== -1) {
383-
windowState = windowState.setIn(['frames', frameIndex, 'hoverState'], action.hoverState)
384-
windowState = frameStateUtil.setPreviewFrameKey(windowState, action.frameKey)
385-
}
381+
windowState = frameStateUtil.setTabHoverState(windowState, action.frameKey, action.hoverState)
386382
break
387383
}
388384
case windowConstants.WINDOW_TAB_MOVE:

0 commit comments

Comments
 (0)