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.

Sign up for GitHub

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: handle state change with identical or missing currentWidgetId #181

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: handle state change with identical or missing currentWidgetId #181

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51ae87b
fix: handle state change with identical currentWidgetId
cbarber Mar 2, 2020
0f7704d
fix: handle state change with missing currentWidgetId
cbarber Mar 2, 2020
2dee0c6
Merge branch 'master' into cmb/fix-stuck-current-widget
May 20, 2021
e6bdd34
Merge branch 'master' into cmb/fix-stuck-current-widget
May 24, 2021
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
47 changes: 31 additions & 16 deletions app/javascript/components/widget-controller.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,27 @@ export class WidgetController extends React.Component {
};

nextWidget = () => {
this.setState(({ nextWidgetId }) =>
nextWidgetId
? {
currentWidgetId: nextWidgetId,
nextWidgetId: null,
prevWidgetId: null,
transitionTime: null,
}
: {},
);
this.setState(state => {
const { nextWidgetId } = state;
if (!nextWidgetId) {
// eslint-disable-next-line
console.error(
`FATAL: nextWidgetId is undefined for nextWidget call. state: ${state}`,
);
return {
currentWidgetId: null,
nextWidgetId: null,
prevWidgetId: null,
transitionTime: null,
};
}
return {
currentWidgetId: nextWidgetId,
nextWidgetId: null,
prevWidgetId: null,
transitionTime: null,
};
});
};

prevWidget = () => {
Expand All @@ -139,12 +150,16 @@ export class WidgetController extends React.Component {
};

switchToPage = id => {
this.setState({
currentWidgetId: id,
nextWidgetId: null,
prevWidgetId: null,
transitionTime: null,
});
this.setState(({ currentWidgetId }) =>
currentWidgetId !== id
? {
currentWidgetId: id,
nextWidgetId: null,
prevWidgetId: null,
Comment on lines +157 to +158
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these all calculated values?

transitionTime: null,
}
: {},
);
};

handleClicks = ({ target }) => {
Expand Down