Skip to content

Commit

Permalink
Add ResizeObserver for legacy keypad (#679)
Browse files Browse the repository at this point in the history
* add resize observer

* quiet error

* changeset

* mock ResizeObserver for failing test
  • Loading branch information
handeyeco authored Aug 21, 2023
1 parent f6cb4db commit 5352d51
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .changeset/nine-guests-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@khanacademy/math-input": minor
---

Handle keypad resize better when it's positioned absolutely
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type State = {
// eslint-disable-next-line react/no-unsafe
class KeypadContainer extends React.Component<Props, State> {
_containerRef = React.createRef<HTMLDivElement>();
_containerResizeObserver: ResizeObserver | null = null;
_resizeTimeout: number | null | undefined;
hasMounted: boolean | undefined;

Expand All @@ -77,6 +78,14 @@ class KeypadContainer extends React.Component<Props, State> {
"orientationchange",
this._throttleResizeHandler,
);

this._containerResizeObserver = new ResizeObserver(
this._throttleResizeHandler,
);

if (this._containerRef.current) {
this._containerResizeObserver.observe(this._containerRef.current);
}
}

UNSAFE_componentWillReceiveProps(nextProps) {
Expand All @@ -99,6 +108,7 @@ class KeypadContainer extends React.Component<Props, State> {
"orientationchange",
this._throttleResizeHandler,
);
this._containerResizeObserver?.disconnect();
}

_throttleResizeHandler = () => {
Expand Down
7 changes: 7 additions & 0 deletions packages/perseus/src/__tests__/item-renderer.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ describe("item renderer", () => {
});

beforeEach(() => {
// Mock ResizeObserver used by the mobile keypad
window.ResizeObserver = jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
}));

jest.spyOn(Dependencies, "getDependencies").mockReturnValue(
testDependencies,
);
Expand Down

0 comments on commit 5352d51

Please sign in to comment.