Skip to content

Commit 4c9aa82

Browse files
committed
fix(r18): ts in and out modify
1 parent 4d29a65 commit 4c9aa82

File tree

171 files changed

+880
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+880
-735
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"lodash.clamp": "^4.0.3",
1717
"lodash.shuffle": "^4.2.0",
1818
"lorem-ipsum": "^2.0.4",
19-
"react": "^18.0.0",
20-
"react-dom": "^18.0.0",
19+
"react": "^18.1.0",
20+
"react-dom": "^18.1.0",
2121
"react-feather": "^2.0.9",
2222
"react-use-gesture": "^9.1.3",
2323
"react-use-measure": "^2.1.1",

demo/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client'
33
import './index.css'
44
import App from './App'
55

6-
ReactDOM.createRoot(document.getElementById('root')).render(
6+
ReactDOM.createRoot(document.getElementById('root')!).render(
77
<React.StrictMode>
88
<App />
99
</React.StrictMode>

demo/src/sandboxes/animating-auto/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/card/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/cards-stack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/chain/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/css-keyframes/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/css-variables/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
],
2323
"bic": false,
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/draggable-list/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
],
2626
"devDependencies": {
2727
"@types/lodash-es": "^4.17.4",
28-
"@types/react": "^17.0.2",
29-
"@types/react-dom": "^17.0.1",
28+
"@types/react": "^18.0.8",
29+
"@types/react-dom": "^18.0.3",
3030
"typescript": "^4.2.3"
3131
}
3232
}

demo/src/sandboxes/exit-before-enter/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/flip-card/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/goo-blobs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/image-fade/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/list-reordering/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
],
2525
"devDependencies": {
2626
"@types/lodash.shuffle": "4.2.6",
27-
"@types/react": "^17.0.2",
28-
"@types/react-dom": "^17.0.1",
27+
"@types/react": "^18.0.8",
28+
"@types/react-dom": "^18.0.3",
2929
"typescript": "^4.2.3"
3030
}
3131
}

demo/src/sandboxes/masonry/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
],
2626
"devDependencies": {
2727
"@types/lodash.shuffle": "4.2.6",
28-
"@types/react": "^17.0.2",
29-
"@types/react-dom": "^17.0.1",
28+
"@types/react": "^18.0.8",
29+
"@types/react-dom": "^18.0.3",
3030
"typescript": "^4.2.3"
3131
}
3232
}

demo/src/sandboxes/multistage-transition/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/notification-hub/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"not op_mini all"
2525
],
2626
"devDependencies": {
27-
"@types/react": "^17.0.2",
28-
"@types/react-dom": "^17.0.1",
27+
"@types/react": "^18.0.8",
28+
"@types/react-dom": "^18.0.3",
2929
"typescript": "^4.2.3"
3030
}
3131
}

demo/src/sandboxes/parallax-sticky/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/parallax-vert/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/parallax/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/rocket-decay/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"vec-la": "1.5.0"
1515
},
1616
"devDependencies": {
17-
"@types/react": "^17.0.2",
18-
"@types/react-dom": "^17.0.1",
17+
"@types/react": "^18.0.8",
18+
"@types/react-dom": "^18.0.3",
1919
"typescript": "^4.2.3"
2020
},
2121
"scripts": {

demo/src/sandboxes/simple-transition/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/slide/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"not op_mini all"
2323
],
2424
"devDependencies": {
25-
"@types/react": "^17.0.2",
26-
"@types/react-dom": "^17.0.1",
25+
"@types/react": "^18.0.8",
26+
"@types/react-dom": "^18.0.3",
2727
"typescript": "^4.2.3"
2828
}
2929
}

demo/src/sandboxes/svg-filter/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/trail/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"not op_mini all"
2222
],
2323
"devDependencies": {
24-
"@types/react": "^17.0.2",
25-
"@types/react-dom": "^17.0.1",
24+
"@types/react": "^18.0.8",
25+
"@types/react-dom": "^18.0.3",
2626
"typescript": "^4.2.3"
2727
}
2828
}

demo/src/sandboxes/tree/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"not op_mini all"
2424
],
2525
"devDependencies": {
26-
"@types/react": "^17.0.2",
27-
"@types/react-dom": "^17.0.1",
26+
"@types/react": "^18.0.8",
27+
"@types/react-dom": "^18.0.3",
2828
"@types/styled-components": "^5.1.9",
2929
"typescript": "^4.2.3"
3030
}

demo/src/sandboxes/viewpager/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
],
2828
"devDependencies": {
2929
"@types/lodash-es": "^4.17.4",
30-
"@types/react": "^17.0.2",
31-
"@types/react-dom": "^17.0.1",
30+
"@types/react": "^18.0.8",
31+
"@types/react-dom": "^18.0.3",
3232
"typescript": "^4.2.3"
3333
}
3434
}

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"next-seo": "^5.1.0",
2020
"next-transpile-modules": "^9.0.0",
2121
"prism-react-renderer": "^1.3.1",
22-
"react": "^18.0.0",
23-
"react-dom": "^18.0.0",
22+
"react": "^18.1.0",
23+
"react-dom": "^18.1.0",
2424
"react-feather": "^2.0.9",
2525
"react-lazyload": "^3.2.0",
2626
"react-live": "^2.4.1",

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
"@types/lodash.clamp": "^4.0.6",
8282
"@types/lodash.shuffle": "^4.2.6",
8383
"@types/mdx-js__react": "^1.5.5",
84-
"@types/react": "^17.0.39",
85-
"@types/react-dom": "^17.0.11",
84+
"@types/react": "^18.0.8",
85+
"@types/react-dom": "^18.0.3",
8686
"@types/react-lazyload": "^3.1.1",
87-
"@types/react-native": "^0.66.15",
87+
"@types/react-native": "^0.67.6",
8888
"@types/styled-components": "^5.1.22",
8989
"@types/three": "^0.137.0",
9090
"@vitejs/plugin-react-refresh": "^1.3.6",
@@ -99,10 +99,10 @@
9999
"postinstall-postinstall": "^2.1.0",
100100
"prettier": "^2.5.1",
101101
"pretty-quick": "^3.1.3",
102-
"react": "^18.0.0",
103-
"react-dom": "^18.0.0",
104-
"react-konva": "^17.0.2-5",
105-
"react-native": "^0.66.4",
102+
"react": "^18.1.0",
103+
"react-dom": "^18.1.0",
104+
"react-konva": "^18.0.0-0",
105+
"react-native": "^0.68.1",
106106
"react-zdog": "^1.0.11",
107107
"spec.ts": "^1.1.3",
108108
"start-server-and-test": "^1.14.0",

packages/core/src/Interpolation.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,26 @@ import {
3232
* `Interpolation` as the `to` prop of a `useSpring` call will trigger an
3333
* animation toward the memoized value.
3434
*/
35-
export class Interpolation<In = any, Out = any> extends FrameValue<Out> {
35+
export class Interpolation<
36+
Input = any,
37+
Output = any
38+
> extends FrameValue<Output> {
3639
/** Useful for debugging. */
3740
key?: string
3841

3942
/** Equals false when in the frameloop */
4043
idle = true
4144

4245
/** The function that maps inputs values to output */
43-
readonly calc: InterpolatorFn<In, Out>
46+
readonly calc: InterpolatorFn<Input, Output>
4447

4548
/** The inputs which are currently animating */
4649
protected _active = new Set<FluidValue>()
4750

4851
constructor(
4952
/** The source of input values */
5053
readonly source: unknown,
51-
args: InterpolatorArgs<In, Out>
54+
args: InterpolatorArgs<Input, Output>
5255
) {
5356
super()
5457
this.calc = createInterpolator(...args)
@@ -74,7 +77,7 @@ export class Interpolation<In = any, Out = any> extends FrameValue<Out> {
7477
}
7578

7679
protected _get() {
77-
const inputs: Arrify<In> = is.arr(this.source)
80+
const inputs: Arrify<Input> = is.arr(this.source)
7881
? this.source.map(getFluidValue)
7982
: (toArray(getFluidValue(this.source)) as any)
8083

packages/core/src/interpolate.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ export type Interpolated<T extends ReadonlyArray<any>> = {
3333
*/
3434
export interface Interpolator {
3535
// Tuple of parent values
36-
<In extends ReadonlyArray<any>, Out>(
37-
parents: In,
38-
interpolator: (...args: Interpolated<In>) => Out
39-
): Interpolation<Out>
36+
<Input extends ReadonlyArray<any>, Output>(
37+
parents: Input,
38+
interpolator: (...args: Interpolated<Input>) => Output
39+
): Interpolation<Output>
4040

4141
// Single parent value
42-
<In, Out>(
43-
parent: FluidValue<In> | In,
44-
interpolator: InterpolatorFn<In, Out>
45-
): Interpolation<Out>
42+
<Input, Output>(
43+
parent: FluidValue<Input> | Input,
44+
interpolator: InterpolatorFn<Input, Output>
45+
): Interpolation<Output>
4646

4747
// Interpolation config
4848
<Out>(

0 commit comments

Comments
 (0)