Skip to content
Snippets Groups Projects
Commit 60208039 authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge remote-tracking branch 'origin/master' into feature/ivette/multiple-selections

# Conflicts:
#	Makefile
#	ivette/api/kernel/ast/index.ts
#	ivette/src/dome/src/renderer/table/arrays.ts
#	ivette/src/frama-c/states.ts
#	ivette/src/renderer/ASTview.tsx
#	src/plugins/server/kernel_ast.ml
parents 31882ffc 75b7205a
No related branches found
No related tags found
No related merge requests found
...@@ -519,7 +519,6 @@ type MultipleSelectActions = ...@@ -519,7 +519,6 @@ type MultipleSelectActions =
MultipleSelect | NthSelect MultipleSelect | NthSelect
| 'MULTIPLE_PREV' | 'MULTIPLE_NEXT' | 'MULTIPLE_CLEAR'; | 'MULTIPLE_PREV' | 'MULTIPLE_NEXT' | 'MULTIPLE_CLEAR';
export interface Selection { export interface Selection {
/** Current selection. May be one in [[history]] or [[multiple]]. */ /** Current selection. May be one in [[history]] or [[multiple]]. */
current?: Location; current?: Location;
...@@ -685,7 +684,7 @@ const GlobalSelection = new GlobalStates.State<Selection>({ ...@@ -685,7 +684,7 @@ const GlobalSelection = new GlobalStates.State<Selection>({
prevSelections: [], prevSelections: [],
nextSelections: [], nextSelections: [],
}, },
multiple: { index: 0, allSelections: [] } multiple: { index: 0, allSelections: [] },
}); });
/** /**
......
...@@ -30,7 +30,8 @@ const SelectionTable = () => { ...@@ -30,7 +30,8 @@ const SelectionTable = () => {
// Updates [[model]] with the current multiple selection. // Updates [[model]] with the current multiple selection.
React.useEffect(() => { React.useEffect(() => {
if (numblerOfSelections > 0) { if (numblerOfSelections > 0) {
const data: SelectionId[] = multiple.allSelections.map((d, i) => ({ ...d, id: i })); const data: SelectionId[] =
multiple.allSelections.map((d, i) => ({ ...d, id: i }));
model.replaceAllDataWith(data); model.replaceAllDataWith(data);
} else } else
model.clear(); model.clear();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment