Skip to content

Commit 5226e25

Browse files
authored
Merge pull request #3120 from PiyushChandra17/piyush/refactor-editorAccessibility-reduxToolkit
refactor editorAccessibility reducers and actions using redux toolkit
2 parents 686e4f4 + b262745 commit 5226e25

File tree

3 files changed

+32
-43
lines changed

3 files changed

+32
-43
lines changed

client/constants.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ export const COLLAPSE_SIDEBAR = 'COLLAPSE_SIDEBAR';
5555
export const EXPAND_CONSOLE = 'EXPAND_CONSOLE';
5656
export const COLLAPSE_CONSOLE = 'COLLAPSE_CONSOLE';
5757

58-
export const UPDATE_LINT_MESSAGE = 'UPDATE_LINT_MESSAGE';
59-
export const CLEAR_LINT_MESSAGE = 'CLEAR_LINT_MESSAGE';
6058
export const TOGGLE_FORCE_DESKTOP = 'TOGGLE_FORCE_DESKTOP';
6159

6260
export const UPDATE_FILE_NAME = 'UPDATE_FILE_NAME';
Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
import * as ActionTypes from '../../../constants';
2-
3-
export function updateLintMessage(severity, line, message) {
4-
return {
5-
type: ActionTypes.UPDATE_LINT_MESSAGE,
6-
severity,
7-
line,
8-
message
9-
};
10-
}
11-
12-
export function clearLintMessage() {
13-
return {
14-
type: ActionTypes.CLEAR_LINT_MESSAGE
15-
};
16-
}
17-
18-
export function toggleForceDesktop() {
19-
return {
20-
type: ActionTypes.TOGGLE_FORCE_DESKTOP
21-
};
22-
}
1+
export {
2+
updateLintMessage,
3+
clearLintMessage,
4+
toggleForceDesktop
5+
} from '../reducers/editorAccessibility';
Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
1-
import * as ActionTypes from '../../../constants';
1+
import { createSlice } from '@reduxjs/toolkit';
22

33
const initialState = {
44
lintMessages: [],
55
forceDesktop: false
66
};
7+
78
let messageId = 0;
89

9-
const editorAccessibility = (state = initialState, action) => {
10-
switch (action.type) {
11-
case ActionTypes.UPDATE_LINT_MESSAGE:
10+
const editorAccessibilitySlice = createSlice({
11+
name: 'editorAccessibility',
12+
initialState,
13+
reducers: {
14+
updateLintMessage: (state, action) => {
1215
messageId += 1;
13-
return Object.assign({}, state, {
14-
lintMessages: state.lintMessages.concat({
15-
severity: action.severity,
16-
line: action.line,
17-
message: action.message,
18-
id: messageId
19-
})
16+
state.lintMessages.push({
17+
severity: action.payload.severity,
18+
line: action.payload.line,
19+
message: action.payload.message,
20+
id: messageId
2021
});
21-
case ActionTypes.CLEAR_LINT_MESSAGE:
22-
return Object.assign({}, state, { lintMessages: [] });
23-
case ActionTypes.TOGGLE_FORCE_DESKTOP:
24-
return Object.assign({}, state, { forceDesktop: !state.forceDesktop });
25-
default:
26-
return state;
22+
},
23+
clearLintMessage: (state) => {
24+
state.lintMessages = [];
25+
},
26+
toggleForceDesktop: (state) => {
27+
state.forceDesktop = !state.forceDesktop;
28+
}
2729
}
28-
};
30+
});
31+
32+
export const {
33+
updateLintMessage,
34+
clearLintMessage,
35+
toggleForceDesktop
36+
} = editorAccessibilitySlice.actions;
2937

30-
export default editorAccessibility;
38+
export default editorAccessibilitySlice.reducer;

0 commit comments

Comments
 (0)