Skip to content

Fix for race condition in resize operation #139

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/components/stories/04-testing/Testing.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, Story, Canvas, Props } from "@storybook/addon-docs";
import { StateDriven, AnchoredDefaultOrdering, SpaceDemoStacked1 } from "../Utils";
import { StateDriven, AnchoredDefaultOrdering, SpaceDemoStacked1, StateDrivenSize } from "../Utils";

<Meta title="Testing/State" />

Expand All @@ -19,4 +19,10 @@ import { StateDriven, AnchoredDefaultOrdering, SpaceDemoStacked1 } from "../Util
<Story name="Test stacked spaces">
<SpaceDemoStacked1 />
</Story>
</Canvas>

<Canvas>
<Story name="State driven size">
<StateDrivenSize />
</Story>
</Canvas>
10 changes: 10 additions & 0 deletions src/components/stories/Utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,16 @@ export const StateDriven: React.FC = () => {
);
};

export const StateDrivenSize = () => {
const [size, setSize] = React.useState<number | string | undefined>(250);
return (
<ViewPort>
<LeftResizable size={size} onResizeEnd={(s) => setSize(s)}></LeftResizable>
<Fill></Fill>
</ViewPort>
);
};

export const AnchoredDefaultOrdering = () => {
return (
<ViewPort as="main">
Expand Down
21 changes: 17 additions & 4 deletions src/core-resizing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,33 @@ export function createResize(store: ISpaceStore) {
e.preventDefault();

if (RESIZE_THROTTLE > 0) {
throttle((x, y) => window.requestAnimationFrame(() => resize(x, y)), RESIZE_THROTTLE)(lastX, lastY);
throttle(
(x, y) =>
window.requestAnimationFrame(() => {
if (space.resizing) {
resize(x, y);
}
}),
RESIZE_THROTTLE,
)(lastX, lastY);
} else {
window.requestAnimationFrame(() => resize(lastX, lastY));
window.requestAnimationFrame(() => {
if (space.resizing) {
resize(lastX, lastY);
}
});
}
};

const removeListener = () => {
space.resizing = false;

if (moved) {
resize(lastX, lastY);
}

window.removeEventListener(moveEvent, withPreventDefault as EventListener);
window.removeEventListener(endEvent, removeListener);

space.resizing = false;
space.updateParent();

const resizeEnd = onResizeEnd || space.onResizeEnd;
Expand Down