Skip to content

Commit 3dbb218

Browse files
zombieJzombieJ
committed
chore: merge conflict
2 parents 902ac19 + 4dd80c8 commit 3dbb218

17 files changed

+227
-179
lines changed

‎docs/examples/case.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function useControl<T>(valuePropName: string, defaultValue: T): [T, any] {
5858

5959
const LabelItem: React.FC<{
6060
title: React.ReactNode;
61-
children: React.ReactElement;
61+
children: React.ReactElement<any>;
6262
[prop: string]: any;
6363
}> = ({ title, children, ...rest }) => {
6464
const { type } = children;

‎docs/examples/container.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ export default () => {
6464
const [scale, setScale] = React.useState('1');
6565
const [targetVisible, setTargetVisible] = React.useState(true);
6666

67-
const rootRef = React.useRef<HTMLDivElement>();
68-
const popHolderRef = React.useRef<HTMLDivElement>();
69-
const scrollRef = React.useRef<HTMLDivElement>();
67+
const rootRef = React.useRef<HTMLDivElement>(null);
68+
const popHolderRef = React.useRef<HTMLDivElement>(null);
69+
const scrollRef = React.useRef<HTMLDivElement>(null);
7070

7171
React.useEffect(() => {
7272
scrollRef.current.scrollLeft = window.innerWidth;

‎docs/examples/inside.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const popupPlacement = 'bottomLeft';
100100
export default () => {
101101
const [popupHeight, setPopupHeight] = React.useState(60);
102102

103-
const containerRef = React.useRef<HTMLDivElement>();
103+
const containerRef = React.useRef<HTMLDivElement>(null);
104104

105105
React.useEffect(() => {
106106
containerRef.current.scrollLeft = document.defaultView.innerWidth;

‎docs/examples/large-popup.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const builtinPlacements = {
2424
};
2525

2626
export default () => {
27-
const containerRef = React.useRef<HTMLDivElement>();
27+
const containerRef = React.useRef<HTMLDivElement>(null);
2828

2929
React.useEffect(() => {
3030
console.clear();

‎docs/examples/nested.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ const OuterContent = ({ getContainer }) => {
5454
};
5555

5656
const Test = () => {
57-
const containerRef = React.useRef();
58-
const outerDivRef = React.useRef();
57+
const containerRef = React.useRef<HTMLDivElement>(null);
58+
const outerDivRef = React.useRef<HTMLDivElement>(null);
5959

6060
const innerTrigger = (
6161
<div style={popupBorderStyle}>

‎docs/examples/simple.tsx‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-console:0 */
22

3-
import Trigger, { ActionType } from '@rc-component/trigger';
3+
import Trigger, { type ActionType } from '@rc-component/trigger';
44
import React from 'react';
55
import '../../assets/index.less';
66

@@ -43,29 +43,26 @@ function getPopupContainer(trigger) {
4343
return trigger.parentNode;
4444
}
4545

46-
const InnerTarget = (props) => (
47-
<div
48-
style={{
49-
margin: 20,
50-
display: 'inline-block',
51-
background: 'rgba(255, 0, 0, 0.05)',
52-
}}
53-
tabIndex={0}
54-
role="button"
55-
{...props}
56-
>
57-
<p>This is a example of trigger usage.</p>
58-
<p>You can adjust the value above</p>
59-
<p>which will also change the behaviour of popup.</p>
60-
</div>
46+
const InnerTarget = React.forwardRef(
47+
(props: any, ref: React.Ref<HTMLElement>) => (
48+
<div
49+
style={{
50+
margin: 20,
51+
display: 'inline-block',
52+
background: 'rgba(255, 0, 0, 0.05)',
53+
}}
54+
tabIndex={0}
55+
role="button"
56+
{...props}
57+
ref={ref}
58+
>
59+
<p>This is a example of trigger usage.</p>
60+
<p>You can adjust the value above</p>
61+
<p>which will also change the behavior of popup.</p>
62+
</div>
63+
),
6164
);
6265

63-
const RefTarget = React.forwardRef((props, ref) => {
64-
React.useImperativeHandle(ref, () => ({}));
65-
66-
return <InnerTarget {...props} />;
67-
});
68-
6966
interface TestState {
7067
mask: boolean;
7168
maskClosable: boolean;
@@ -88,7 +85,7 @@ interface TestState {
8885

8986
class Test extends React.Component<any, TestState> {
9087
state: TestState = {
91-
mask: true,
88+
mask: false,
9289
maskClosable: true,
9390
placement: 'bottom',
9491
trigger: {
@@ -377,7 +374,7 @@ class Test extends React.Component<any, TestState> {
377374
motionName: state.transitionName,
378375
}}
379376
>
380-
<RefTarget />
377+
<InnerTarget />
381378
</Trigger>
382379
</div>
383380
</div>

‎docs/examples/visible-fallback.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const builtinPlacements: Record<string, AlignType> = {
2828
export default () => {
2929
const [enoughTop, setEnoughTop] = React.useState(true);
3030

31-
const triggerRef = React.useRef<TriggerRef>();
31+
const triggerRef = React.useRef<TriggerRef>(null);
3232

3333
React.useEffect(() => {
3434
triggerRef.current?.forceAlign();

‎package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rc-component/trigger",
3-
"version": "3.2.0",
3+
"version": "3.4.1",
44
"description": "base abstract trigger component for react",
55
"engines": {
66
"node": ">=8.x"
@@ -40,16 +40,23 @@
4040
"coverage": "rc-test --coverage",
4141
"now-build": "npm run build"
4242
},
43+
"dependencies": {
44+
"@rc-component/motion": "^1.1.4",
45+
"@rc-component/portal": "^2.0.0",
46+
"@rc-component/resize-observer": "^1.0.0",
47+
"@rc-component/util": "^1.2.1",
48+
"classnames": "^2.3.2"
49+
},
4350
"devDependencies": {
4451
"@rc-component/father-plugin": "^2.0.0",
4552
"@rc-component/np": "^1.0.3",
4653
"@testing-library/jest-dom": "^6.1.4",
4754
"@testing-library/react": "^16.0.0",
4855
"@types/classnames": "^2.2.10",
4956
"@types/jest": "^29.5.2",
50-
"@types/node": "^22.0.2",
51-
"@types/react": "^18.0.0",
52-
"@types/react-dom": "^18.0.0",
57+
"@types/node": "^24.0.3",
58+
"@types/react": "^19.1.2",
59+
"@types/react-dom": "^19.1.2",
5360
"@umijs/fabric": "^4.0.1",
5461
"cross-env": "^7.0.1",
5562
"dumi": "^2.1.0",
@@ -58,20 +65,13 @@
5865
"less": "^4.2.0",
5966
"prettier": "^3.3.3",
6067
"rc-test": "^7.0.13",
61-
"react": "^18.0.0",
62-
"react-dom": "^18.0.0",
68+
"react": "^19.1.0",
69+
"react-dom": "^19.1.0",
6370
"regenerator-runtime": "^0.14.0",
6471
"typescript": "~5.1.6"
6572
},
66-
"dependencies": {
67-
"@rc-component/motion": "^1.1.4",
68-
"@rc-component/portal": "^2.0.0",
69-
"@rc-component/resize-observer": "^1.0.0",
70-
"@rc-component/util": "^1.2.1",
71-
"classnames": "^2.3.2"
72-
},
7373
"peerDependencies": {
74-
"react": ">=16.9.0",
75-
"react-dom": ">=16.9.0"
74+
"react": ">=18.0.0",
75+
"react-dom": ">=18.0.0"
7676
}
77-
}
77+
}

‎src/Popup/Arrow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function Arrow(props: ArrowProps) {
1515
const { className, content } = arrow || {};
1616
const { x = 0, y = 0 } = arrowPos;
1717

18-
const arrowRef = React.useRef<HTMLDivElement>();
18+
const arrowRef = React.useRef<HTMLDivElement>(null);
1919

2020
// Skip if no align
2121
if (!align || !align.points) {

‎src/Popup/PopupContent.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface PopupContentProps {
66
}
77

88
const PopupContent = React.memo(
9-
({ children }: PopupContentProps) => children as React.ReactElement,
9+
({ children }: PopupContentProps) => children as React.ReactElement<any>,
1010
(_, next) => next.cache,
1111
);
1212

0 commit comments

Comments
 (0)