smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: bump @testing-library/react 12.1.5 -> 16.0.0 (#8322)

Browse source
This commit is contained in:
David Luzar 2024-08-06 15:17:42 +02:00 • committed by GitHub
parent 3cf14c73a3
commit f19ce30dfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 1035 additions and 978 deletions
Download patch file Download diff file Expand all files Collapse all files

51
packages/excalidraw/components/App.tsx
View file

@ -2141,16 +2141,6 @@ class App extends React.Component<AppProps, AppState> {
let editingElement: AppState["editingElement"] | null = null;
if (actionResult.elements) {
actionResult.elements.forEach((element) => {
if (
this.state.editingElement?.id === element.id &&
this.state.editingElement !== element &&
isNonDeletedElement(element)
) {
editingElement = element;
}
});
this.scene.replaceAllElements(actionResult.elements);
didUpdate = true;
}
@ -2183,8 +2173,20 @@ class App extends React.Component<AppProps, AppState> {
gridSize = this.props.gridModeEnabled ? GRID_SIZE : null;
}
editingElement =
editingElement || actionResult.appState?.editingElement || null;
editingElement = actionResult.appState?.editingElement || null;
// make sure editingElement points to latest element reference
if (actionResult.elements && editingElement) {
actionResult.elements.forEach((element) => {
if (
editingElement?.id === element.id &&
editingElement !== element &&
isNonDeletedElement(element)
) {
editingElement = element;
}
});
}
if (editingElement?.isDeleted) {
editingElement = null;
@ -4479,15 +4481,22 @@ class App extends React.Component<AppProps, AppState> {
const elementIdToSelect = element.containerId
? element.containerId
: element.id;
this.setState((prevState) => ({
selectedElementIds: makeNextSelectedElementIds(
{
...prevState.selectedElementIds,
[elementIdToSelect]: true,
},
prevState,
),
}));
// needed to ensure state is updated before "finalize" action
// that's invoked on keyboard-submit as well
// TODO either move this into finalize as well, or handle all state
// updates in one place, skipping finalize action
flushSync(() => {
this.setState((prevState) => ({
selectedElementIds: makeNextSelectedElementIds(
{
...prevState.selectedElementIds,
[elementIdToSelect]: true,
},
prevState,
),
}));
});
}
if (isDeleted) {
fixBindingsAfterDeletion(this.scene.getNonDeletedElements(), [