Skip to content

[pull] master from DefinitelyTyped:master #1043

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.

Sign up for GitHub

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
pull merged 2 commits into from
Apr 11, 2025
Merged

[pull] master from DefinitelyTyped:master #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf7ece6
[react] Add `unstable_Activity` (#72454)
eps1lon Apr 11, 2025
aed3e97
🤖 Merge PR #72430 fix(nodegit): replace deprecated type names by @lli…
llimllib Apr 11, 2025
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
6 changes: 6 additions & 0 deletions types/nodegit/nodegit-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,9 @@ Git.Clone("repo_url", "local_path", cloneOptions).then(repoClone => {
// Use Repo
repoClone.cleanup();
});

// Test the Reference.TYPE enum values
Git.Reference.TYPE.INVALID; // $ExpectType TYPE.INVALID
Git.Reference.TYPE.DIRECT; // $ExpectType TYPE.DIRECT
Git.Reference.TYPE.SYMBOLIC; // $ExpectType TYPE.SYMBOLIC
Git.Reference.TYPE.ALL; // $ExpectType TYPE.ALL
4 changes: 4 additions & 0 deletions types/nodegit/reference.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import { Repository } from "./repository";
export namespace Reference {
const enum TYPE {
INVALID = 0,
DIRECT = 1,
/** @deprecated Use {@link DIRECT} instead. */
OID = 1,
SYMBOLIC = 2,
ALL = 3,
/** @deprecated Use {@link ALL} instead. */
LISTALL = 3,
}

Expand Down
15 changes: 15 additions & 0 deletions types/react/experimental.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,19 @@ declare module "." {
export interface FragmentProps {
ref?: Ref<FragmentInstance> | undefined;
}

// @enableActivity
export interface ActivityProps {
/**
* @default "visible"
*/
mode?:
| "hidden"
| "visible"
| undefined;
children: ReactNode;
}

/** */
export const unstable_Activity: ExoticComponent<ActivityProps>;
}
17 changes: 17 additions & 0 deletions types/react/test/experimental.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,20 @@ function fragmentRefTest() {
<div />
</React.Fragment>;
}

// @enableActivity
function activityTest() {
const Activity = React.unstable_Activity;

<Activity children="peekaboo" />;
<Activity children="peekaboo" mode={undefined} />;
<Activity children="peekaboo" mode="visible" />;
<Activity children="peekaboo" mode="hidden" />;
// @ts-expect-error -- Forgot children
<Activity />;
<Activity
children="peekaboo"
// @ts-expect-error -- Unknown mode
mode="not-a-mode"
/>;
}
15 changes: 15 additions & 0 deletions types/react/ts5.0/experimental.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,19 @@ declare module "." {
export interface FragmentProps {
ref?: Ref<FragmentInstance> | undefined;
}

// @enableActivity
export interface ActivityProps {
/**
* @default "visible"
*/
mode?:
| "hidden"
| "visible"
| undefined;
children: ReactNode;
}

/** */
export const unstable_Activity: ExoticComponent<ActivityProps>;
}
17 changes: 17 additions & 0 deletions types/react/ts5.0/test/experimental.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,20 @@ function fragmentRefTest() {
<div />
</React.Fragment>;
}

// @enableActivity
function activityTest() {
const Activity = React.unstable_Activity;

<Activity children="peekaboo" />;
<Activity children="peekaboo" mode={undefined} />;
<Activity children="peekaboo" mode="visible" />;
<Activity children="peekaboo" mode="hidden" />;
// @ts-expect-error -- Forgot children
<Activity />;
<Activity
children="peekaboo"
// @ts-expect-error -- Unknown mode
mode="not-a-mode"
/>;
}