Skip to content

Fix React state mutation bug causing textbox issues in search panel #776

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

Merged
danmarshall merged 4 commits into from
Oct 17, 2025
Merged

Fix React state mutation bug causing textbox issues in search panel #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18d27b2
Initial plan
Copilot Oct 16, 2025
9a31e17
Fix React bug when editing textbox in search panel
Copilot Oct 16, 2025
c510600
Fix state mutation in addExpression and deleteExpression methods
Copilot Oct 16, 2025
e088c05
npm audit fix
danmarshall Oct 16, 2025
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
56 changes: 40 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 21 additions & 14 deletions packages/sanddance-explorer/src/dialogs/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,53 +190,60 @@ function _Search(_props: Props) {

addExpression(groupIndex: number) {
const groups: InputSearchExpressionGroup[] = [...this.state.groups];
const group = groups[groupIndex];
const maxKey = group.expressions.reduce((max, p) => p.key > max ? p.key : max, group.expressions[0].key);
const group = { ...groups[groupIndex] };
const expressions = [...group.expressions];
const maxKey = expressions.reduce((max, p) => p.key > max ? p.key : max, expressions[0].key);
const newEx = this.newExpression(maxKey + 1, '&&');
group.expressions.push(newEx);
if (group.expressions.length === 2) {
expressions.push(newEx);
if (expressions.length === 2) {
newEx.unlocked = true;
} else {
group.expressions.forEach(ex => ex.unlocked = false);
newEx.clause = group.expressions[1].clause;
expressions.forEach(ex => ex.unlocked = false);
newEx.clause = expressions[1].clause;
}
group.expressions = expressions;
groups[groupIndex] = group;
this.setState({ groups });
}

updateExpression(partialEx: Partial<InputSearchExpression>, groupIndex: number, index: number) {
const groups: InputSearchExpressionGroup[] = [...this.state.groups];
const group = groups[groupIndex];
const ex = SandDance.VegaMorphCharts.util.clone(group.expressions[index]);
if (ex.name !== partialEx.name) {
const group = { ...groups[groupIndex] };
const expressions = [...group.expressions];
const currentEx = expressions[index];
if (currentEx.name !== partialEx.name) {
//choose an appropriate operator when switching data type
const oldColumn = getColumnWithName(ex.name, this.state.sortedColumns);
const oldColumn = getColumnWithName(currentEx.name, this.state.sortedColumns);
const newColumn = getColumnWithName(partialEx.name, this.state.sortedColumns);
const oldType = oldColumn && oldColumn.type;
const newType = newColumn && newColumn.type;
if (oldType !== newType) {
const newOperators = getValidOperators(newColumn).map(validOperator => validOperator[0]);
//see if old operator is compatible
if (newOperators.indexOf(ex.operator) < 0) {
if (newOperators.indexOf(currentEx.operator) < 0) {
//not compatible, so choose "equal"
partialEx.operator = '==';
}
}
}
Object.assign(ex, partialEx);
const ex = { ...currentEx, ...partialEx };
clearExpressionValidation(ex);
group.expressions[index] = ex;
expressions[index] = ex;
group.expressions = expressions;
groups[groupIndex] = group;
this.setState({ groups });
}

deleteExpression(groupIndex: number, index: number) {
const groups: InputSearchExpressionGroup[] = [...this.state.groups];
const group = groups[groupIndex];
const group = { ...groups[groupIndex] };
const expressions: InputSearchExpression[] = [...group.expressions];
expressions.splice(index, 1);
if (expressions.length === 2) {
expressions[1].unlocked = true;
}
group.expressions = expressions;
groups[groupIndex] = group;
this.setState({ groups });
}

Expand Down