Skip to content
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

Jump to bottom

Added objects explicitly to Trans children #1486

Merged
merged 1 commit into from
Apr 19, 2022
Merged

Added objects explicitly to Trans children #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"rollup-plugin-replace": "^2.1.0",
"rollup-plugin-terser": "^5.1.1",
"sinon": "^7.2.3",
"tslint": "^5.20.1",
"tslint": "^6.1.3",
"typescript": "4.6.2",
"yargs": "^13.3.0"
},
Expand Down
4 changes: 1 addition & 3 deletions ts4.1/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ export type TFuncReturn<
export interface TFunction<N extends Namespace = DefaultNamespace, TKPrefix = undefined> {
<
TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
// tslint:disable-next-line:no-null-undefined-union
TDefaultResult extends TFunctionResult | React.ReactNode = string,
TInterpolationMap extends object = StringMap
>(
Expand All @@ -237,7 +236,6 @@ export interface TFunction<N extends Namespace = DefaultNamespace, TKPrefix = un
): TFuncReturn<N, TKeys, TDefaultResult, TKPrefix>;
<
TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
// tslint:disable-next-line:no-null-undefined-union
TDefaultResult extends TFunctionResult | React.ReactNode = string,
TInterpolationMap extends object = StringMap
>(
Expand All @@ -253,7 +251,7 @@ export type TransProps<
TKPrefix = undefined,
E = React.HTMLProps<HTMLDivElement>
> = E & {
children?: React.ReactNode;
children?: React.ReactNode | Record<string, unknown>;
components?: readonly React.ReactNode[] | { readonly [tagName: string]: React.ReactNode };
count?: number;
context?: string;
Expand Down
1 change: 1 addition & 0 deletions tslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"extends": "dtslint/dtslint.json",
"rules": {
"array-type": [true, "array"],
"no-null-undefined-union": false,
"no-empty-interface": false,
"no-redundant-jsdoc": false,
"no-unnecessary-generics": false,
Expand Down