Skip to content
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
31 changes: 29 additions & 2 deletions __mocks__/@juggle/resize-observer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/* eslint-disable header/header */
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { ResizeObserver, ResizeObserverEntry } from '@juggle/resize-observer';

const callbackField = Symbol();

Expand Down Expand Up @@ -37,5 +36,33 @@ class MockResizeObserver implements ResizeObserver {
}
}

export { ResizeObserverEntry };
class MockResizeObserverEntry implements ResizeObserverEntry {
readonly borderBoxSize: ReadonlyArray<ResizeObserverSize>;
readonly contentBoxSize: ReadonlyArray<ResizeObserverSize>;
readonly devicePixelContentBoxSize: ReadonlyArray<ResizeObserverSize>;
readonly contentRect: DOMRectReadOnly;
readonly target: Element;

constructor(target: Element) {
this.target = target;
const size = { inlineSize: 0, blockSize: 0 };
this.borderBoxSize = [size];
this.contentBoxSize = [size];
this.devicePixelContentBoxSize = [size];
// Create a simple DOMRectReadOnly mock for JSDOM compatibility
this.contentRect = {
x: 0,
y: 0,
width: 0,
height: 0,
top: 0,
right: 0,
bottom: 0,
left: 0,
toJSON: () => ({}),
} as DOMRectReadOnly;
}
}

export { MockResizeObserver as ResizeObserver };
export { MockResizeObserverEntry as ResizeObserverEntry };
10 changes: 10 additions & 0 deletions build-tools/jest/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ if (typeof window !== 'undefined') {
require('@testing-library/jest-dom/extend-expect');
const { cleanup } = require('@testing-library/react');
afterEach(cleanup);

// Mock ResizeObserver for JSDOM environment
global.ResizeObserver = class ResizeObserver {
constructor(callback) {
this.callback = callback;
}
observe() {}
unobserve() {}
disconnect() {}
};
}
1 change: 0 additions & 1 deletion package-lock.json

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

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/sortable": "^7.0.2",
"@dnd-kit/utilities": "^3.2.1",
"@juggle/resize-observer": "^3.3.1",
"ace-builds": "^1.34.0",
"balanced-match": "^1.0.2",
"clsx": "^1.1.0",
Expand Down
3 changes: 1 addition & 2 deletions src/table/sticky-scrollbar/use-sticky-scrollbar.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { RefObject, useEffect, useState } from 'react';
import { ResizeObserver } from '@juggle/resize-observer';

import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';

Expand Down Expand Up @@ -85,7 +84,7 @@ export function useStickyScrollbar(

// Update scrollbar position wrapper or table size change.
useEffect(() => {
if (wrapperRef.current && tableRef.current) {
if (wrapperRef.current && tableRef.current && typeof ResizeObserver !== 'undefined') {
const observer = new ResizeObserver(() => {
if (scrollbarContentRef.current) {
updatePosition(
Expand Down
Loading