Skip to content

Commit 6fb8923

Browse files
committed
chore: rename hook
1 parent a277771 commit 6fb8923

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

packages/sqi-hooks/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ export * from './useIsomorphicLayoutEffect';
33
export * from './useMergeProps';
44
export * from './useMergeState';
55
export * from './usePrevious';
6-
export * from './useResizeObserver';
6+
export * from './useResizeObserverRect';

packages/sqi-hooks/src/useResizeObserver.ts renamed to packages/sqi-hooks/src/useResizeObserverRect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface ObserverSizeInfo {
1212

1313
const SafeResizeObserver = window.ResizeObserver || ResizeObserverPolyfill;
1414

15-
export function useResizeObserver(
15+
export function useResizeObserverRect(
1616
container?: HTMLElement | null,
1717
callback?: (sizeInfo: ObserverSizeInfo, target: ResizeObserverEntry) => void,
1818
enabled = true,
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { cloneElement, forwardRef, isValidElement, useImperativeHandle, useRef, useState } from 'react';
22
import { throttle } from '@sqi-ui/utils';
3-
import { useResizeObserver, type ObserverSizeInfo } from '@sqi-ui/hooks';
3+
import { useResizeObserverRect, type ObserverSizeInfo } from '@sqi-ui/hooks';
44
import { toArray } from '../_util/toArray';
55
import { getDOM, getReactNodeRef, getRefDom } from '../_util/dom';
66
import { useComposeRef } from '../_util/ref';
77

8-
export interface ResizeObserverProps {
8+
export interface ResizeObserverRectProps {
99
onResize?: (sizeInfo: ObserverSizeInfo, target: ResizeObserverEntry) => void;
1010
children?: React.ReactElement;
1111
/**
@@ -19,7 +19,7 @@ export interface ResizeObserverProps {
1919
throttleMs?: number;
2020
}
2121

22-
const ResizeObserverComponent = forwardRef<HTMLElement, ResizeObserverProps>((props, ref) => {
22+
const ResizeObserverRect = forwardRef<HTMLElement, ResizeObserverRectProps>((props, ref) => {
2323
const { children, disabled, throttleMs = 100, onResize } = props;
2424

2525
const isElement = isValidElement(children);
@@ -30,31 +30,31 @@ const ResizeObserverComponent = forwardRef<HTMLElement, ResizeObserverProps>((pr
3030
const [elementState, setElementState] = useState<HTMLElement | null>(null);
3131

3232
const mergedRef = useComposeRef<HTMLElement>(originRef, elementRef, (node) => {
33-
// elementRef 在初次挂载时 useResizeObserver 无法获取到值,使用 state
33+
// elementRef 在初次挂载时 useResizeObserverRect 无法获取到值,使用 state
3434
setElementState(getDOM(node) as HTMLElement);
3535
});
3636

3737
if (process.env.NODE_ENV !== 'production' && !isElement) {
3838
if (childNodes.length > 1) {
3939
console.error(
40-
'[@sqi-ui/web]: Find more than one child node with `children` in ResizeObserverComponent. Please ensure only one child node',
40+
'[@sqi-ui/web]: Find more than one child node with `children` in ResizeObserverRect. Please ensure only one child node',
4141
);
4242
} else if (childNodes.length === 0) {
43-
console.error('[@sqi-ui/web]: `children` of ResizeObserverComponent is empty. Nothing is in observe.');
43+
console.error('[@sqi-ui/web]: `children` of ResizeObserverRect is empty. Nothing is in observe.');
4444
} else {
45-
console.error('[@sqi-ui/web]: The `children` of ResizeObserverComponent is invalid. Nothing is in observe.');
45+
console.error('[@sqi-ui/web]: The `children` of ResizeObserverRect is invalid. Nothing is in observe.');
4646
}
4747
}
4848

4949
useImperativeHandle(ref, () => getRefDom(elementRef) as HTMLElement);
5050

5151
const throttleResize = onResize ? throttle(onResize, throttleMs) : undefined;
5252

53-
useResizeObserver(elementState, throttleResize, !disabled);
53+
useResizeObserverRect(elementState, throttleResize, !disabled);
5454

5555
return isElement ? cloneElement(children as any, { ref: mergedRef }) : children;
5656
});
5757

58-
ResizeObserverComponent.displayName = 'ResizeObserverComponent';
58+
ResizeObserverRect.displayName = 'ResizeObserverRect';
5959

60-
export default ResizeObserverComponent;
60+
export default ResizeObserverRect;

packages/sqi-web/src/_common/__tests__/__snapshots__/resize-observer.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`ResizeObserverComponent > should render single child element correctly 1`] = `
3+
exports[`ResizeObserverRect > should render single child element correctly 1`] = `
44
<div
55
data-testid="child-element"
66
>
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { describe, it, expect, vi } from 'vitest';
22
import { render } from '@testing-library/react';
33
import * as React from 'react';
4-
import ResizeObserverComponent from '../ResizeObserver';
4+
import ResizeObserverRect from '../ResizeObserverRect';
55

6-
describe('ResizeObserverComponent', () => {
6+
describe('ResizeObserverRect', () => {
77
it('should render single child element correctly', () => {
88
const { container } = render(
9-
<ResizeObserverComponent>
9+
<ResizeObserverRect>
1010
<div data-testid="child-element">Content</div>
11-
</ResizeObserverComponent>,
11+
</ResizeObserverRect>,
1212
);
1313

1414
expect(container.firstChild).toBeInTheDocument();
@@ -20,33 +20,33 @@ describe('ResizeObserverComponent', () => {
2020

2121
const { container } = render(
2222
// @ts-expect-error
23-
<ResizeObserverComponent>Test</ResizeObserverComponent>,
23+
<ResizeObserverRect>Test</ResizeObserverRect>,
2424
);
2525

2626
expect(container.firstChild).instanceOf(Text);
27-
expect(errorSpy).toBeCalledWith(expect.stringContaining('The `children` of ResizeObserverComponent is invalid'));
27+
expect(errorSpy).toBeCalledWith(expect.stringContaining('The `children` of ResizeObserverRect is invalid'));
2828
});
2929

3030
it('should console error with multiple children', () => {
3131
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => null);
3232

3333
render(
3434
// @ts-expect-error
35-
<ResizeObserverComponent>
35+
<ResizeObserverRect>
3636
<div>1</div>
3737
<div>2</div>
38-
</ResizeObserverComponent>,
38+
</ResizeObserverRect>,
3939
);
4040

4141
expect(errorSpy).toBeCalledWith(
42-
expect.stringContaining('Find more than one child node with `children` in ResizeObserverComponent'),
42+
expect.stringContaining('Find more than one child node with `children` in ResizeObserverRect'),
4343
);
4444
});
4545

4646
it('should console error with empty children', () => {
4747
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => null);
48-
render(<ResizeObserverComponent></ResizeObserverComponent>);
48+
render(<ResizeObserverRect></ResizeObserverRect>);
4949

50-
expect(errorSpy).toBeCalledWith(expect.stringContaining('`children` of ResizeObserverComponent is empty'));
50+
expect(errorSpy).toBeCalledWith(expect.stringContaining('`children` of ResizeObserverRect is empty'));
5151
});
5252
});

packages/sqi-web/src/_common/demos/resize-observer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Checkbox } from '@sqi-ui/web';
3-
import ResizeObserver, { type ResizeObserverProps } from '../ResizeObserver';
3+
import ResizeObserver, { type ResizeObserverProps } from '../ResizeObserverRect';
44

55
export default function App() {
66
const [times, setTimes] = React.useState(0);

packages/sqi-web/src/trigger/Trigger.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import React, {
1212
import clsx from 'clsx';
1313
import { useIsomorphicLayoutEffect, useMergeProps, useMergeState } from '@sqi-ui/hooks';
1414

15-
import ResizeObserverComponent from '../_common/ResizeObserver';
15+
import ResizeObserverRect from '../_common/ResizeObserverRect';
1616
import Portal from '../_common/Portal';
1717
import CSSMotion, { type CSSMotionInstance } from '../_common/CSSMotion';
1818
import { getReactNodeRef } from '../_util/dom';
@@ -223,11 +223,11 @@ const Trigger = forwardRef<HTMLElement, TriggerProps>((baseProps, ref) => {
223223

224224
return (
225225
<>
226-
<ResizeObserverComponent ref={referenceRef} onResize={() => asyncUpdatePosition()}>
226+
<ResizeObserverRect ref={referenceRef} onResize={() => asyncUpdatePosition()}>
227227
{cloneElement(children as any, {
228228
...genTriggerProps(children),
229229
})}
230-
</ResizeObserverComponent>
230+
</ResizeObserverRect>
231231

232232
{renderPopper()}
233233
</>

0 commit comments

Comments
 (0)