Skip to content

chore(deps-dev): bump @types/react from 18.3.20 to 19.1.2 #533

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 16, 2025
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
2 changes: 1 addition & 1 deletion docs/examples/case.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function useControl<T>(valuePropName: string, defaultValue: T): [T, any] {

const LabelItem: React.FC<{
title: React.ReactNode;
children: React.ReactElement;
children: React.ReactElement<any>;
[prop: string]: any;
}> = ({ title, children, ...rest }) => {
const { type } = children;
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ export default () => {
const [scale, setScale] = React.useState('1');
const [targetVisible, setTargetVisible] = React.useState(true);

const rootRef = React.useRef<HTMLDivElement>();
const popHolderRef = React.useRef<HTMLDivElement>();
const scrollRef = React.useRef<HTMLDivElement>();
const rootRef = React.useRef<HTMLDivElement>(null);
const popHolderRef = React.useRef<HTMLDivElement>(null);
const scrollRef = React.useRef<HTMLDivElement>(null);

React.useEffect(() => {
scrollRef.current.scrollLeft = window.innerWidth;
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/inside.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const popupPlacement = 'bottomLeft';
export default () => {
const [popupHeight, setPopupHeight] = React.useState(60);

const containerRef = React.useRef<HTMLDivElement>();
const containerRef = React.useRef<HTMLDivElement>(null);

React.useEffect(() => {
containerRef.current.scrollLeft = document.defaultView.innerWidth;
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/large-popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const builtinPlacements = {
};

export default () => {
const containerRef = React.useRef<HTMLDivElement>();
const containerRef = React.useRef<HTMLDivElement>(null);

React.useEffect(() => {
console.clear();
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/nested.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const OuterContent = ({ getContainer }) => {
};

const Test = () => {
const containerRef = React.useRef();
const outerDivRef = React.useRef();
const containerRef = React.useRef<HTMLDivElement>(null);
const outerDivRef = React.useRef<HTMLDivElement>(null);

const innerTrigger = (
<div style={popupBorderStyle}>
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/visible-fallback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const builtinPlacements: Record<string, AlignType> = {
export default () => {
const [enoughTop, setEnoughTop] = React.useState(true);

const triggerRef = React.useRef<TriggerRef>();
const triggerRef = React.useRef<TriggerRef>(null);

React.useEffect(() => {
triggerRef.current?.forceAlign();
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@
"coverage": "rc-test --coverage",
"now-build": "npm run build"
},
"dependencies": {
"@rc-component/motion": "^1.1.4",
"@rc-component/portal": "^2.0.0",
"@rc-component/resize-observer": "^1.0.0",
"@rc-component/util": "^1.2.1",
"classnames": "^2.3.2"
},
"devDependencies": {
"@rc-component/father-plugin": "^2.0.0",
"@rc-component/np": "^1.0.3",
Expand All @@ -48,7 +55,7 @@
"@types/classnames": "^2.2.10",
"@types/jest": "^29.5.2",
"@types/node": "^22.0.2",
"@types/react": "^18.0.0",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2",
"@umijs/fabric": "^4.0.1",
"cross-env": "^7.0.1",
Expand All @@ -58,20 +65,13 @@
"less": "^4.2.0",
"prettier": "^3.3.3",
"rc-test": "^7.0.13",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"regenerator-runtime": "^0.14.0",
"typescript": "^5.1.6"
},
"dependencies": {
"@rc-component/motion": "^1.1.4",
"@rc-component/portal": "^2.0.0",
"@rc-component/resize-observer": "^1.0.0",
"@rc-component/util": "^1.2.1",
"classnames": "^2.3.2"
},
"peerDependencies": {
"react": ">=16.9.0",
"react-dom": ">=16.9.0"
"react": ">=18.0.0",
"react-dom": ">=18.0.0"
}
}
}
2 changes: 1 addition & 1 deletion src/Popup/Arrow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Arrow(props: ArrowProps) {
const { className, content } = arrow || {};
const { x = 0, y = 0 } = arrowPos;

const arrowRef = React.useRef<HTMLDivElement>();
const arrowRef = React.useRef<HTMLDivElement>(null);

// Skip if no align
if (!align || !align.points) {
Expand Down
2 changes: 1 addition & 1 deletion src/Popup/PopupContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface PopupContentProps {
}

const PopupContent = React.memo(
({ children }: PopupContentProps) => children as React.ReactElement,
({ children }: PopupContentProps) => children as React.ReactElement<any>,
(_, next) => next.cache,
);

Expand Down
13 changes: 7 additions & 6 deletions src/TriggerWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { TriggerProps } from '.';

export interface TriggerWrapperProps {
getTriggerDOMNode?: TriggerProps['getTriggerDOMNode'];
children: React.ReactElement;
children: React.ReactElement<any>;
}

const TriggerWrapper = React.forwardRef<HTMLElement, TriggerWrapperProps>(
Expand All @@ -20,18 +20,19 @@ const TriggerWrapper = React.forwardRef<HTMLElement, TriggerWrapperProps>(

// When use `getTriggerDOMNode`, we should do additional work to get the real dom
const setRef = React.useCallback(
(node) => {
(node: React.ReactInstance) => {
fillRef(ref, getTriggerDOMNode ? getTriggerDOMNode(node) : node);
},
[getTriggerDOMNode],
);

const mergedRef = useComposeRef(setRef, getNodeRef(children));
const mergedRef = useComposeRef<React.ReactInstance>(
setRef,
getNodeRef(children),
);

return canUseRef
? React.cloneElement(children, {
ref: mergedRef,
})
? React.cloneElement<any>(children, { ref: mergedRef })
: children;
},
);
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useAlign.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default function useAlign(
scaleY: 1,
align: builtinPlacements[placement] || {},
});
const alignCountRef = React.useRef(0);
const alignCountRef = React.useRef<number>(0);

const scrollerList = React.useMemo(() => {
if (!popupEle) {
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useWinClick.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export default function useWinClick(
inPopupOrChild: (target: EventTarget) => boolean,
triggerOpen: (open: boolean) => void,
) {
const openRef = React.useRef(open);
const openRef = React.useRef<boolean>(open);
openRef.current = open;

const popupPointerDownRef = React.useRef(false);
const popupPointerDownRef = React.useRef<boolean>(false);

// Click to hide is special action since click popup element should not hide
React.useEffect(() => {
Expand Down
6 changes: 3 additions & 3 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export interface TriggerRef {
// New version will not wrap popup with `rc-trigger-popup-content` when multiple children

export interface TriggerProps {
children: React.ReactElement;
children: React.ReactElement<any>;
action?: ActionType | ActionType[];
showAction?: ActionType[];
hideAction?: ActionType[];
Expand Down Expand Up @@ -248,7 +248,7 @@ export function generateTrigger(
});

// ========================== Children ==========================
const child = React.Children.only(children) as React.ReactElement;
const child = React.Children.only(children);
const originChildProps = child?.props || {};
const cloneProps: typeof originChildProps = {};

Expand Down Expand Up @@ -311,7 +311,7 @@ export function generateTrigger(
});

// Trigger for delay
const delayRef = React.useRef<any>();
const delayRef = React.useRef<ReturnType<typeof setTimeout>>(null);

const clearDelay = () => {
clearTimeout(delayRef.current);
Expand Down
2 changes: 1 addition & 1 deletion src/mock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { generateTrigger } from './index';
interface MockPortalProps {
open?: boolean;
autoDestroy?: boolean;
children: React.ReactElement;
children: React.ReactElement<any>;
getContainer?: () => HTMLElement;
}

Expand Down
3 changes: 1 addition & 2 deletions tests/basic.test.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable max-classes-per-file */

import { act, cleanup, fireEvent, render } from '@testing-library/react';
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
import React, { StrictMode, createRef } from 'react';
Expand Down Expand Up @@ -697,7 +696,7 @@ describe('Trigger.Basic', () => {
let effectCalled = false;

function Demo() {
const popupRef = React.useRef();
const popupRef = React.useRef(null);

React.useLayoutEffect(() => {
effectCalled = true;
Expand Down
Loading