Skip to content

Commit 02e1f23

Browse files
committed
chore(types-react): update react types v18
1 parent df3327b commit 02e1f23

File tree

5 files changed

+28
-47
lines changed

5 files changed

+28
-47
lines changed

packages/lumx-react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"@types/dom-view-transitions": "^1.0.5",
4444
"@types/jest": "^29.2.1",
4545
"@types/lodash": "^4.14.149",
46-
"@types/react": "^17.0.2",
47-
"@types/react-dom": "^17.0.2",
48-
"@types/react-is": "^17.0.2",
46+
"@types/react": "^18.3.16",
47+
"@types/react-dom": "^18.3.5",
48+
"@types/react-is": "^18.3.1",
4949
"autoprefixer": "^9.7.4",
5050
"babel-jest": "29.1.2",
5151
"babel-loader": "^8.0.6",

packages/lumx-react/src/components/post-block/PostBlock.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { ReactNode } from 'react';
22

33
import classNames from 'classnames';
4-
import isObject from 'lodash/isObject';
54

65
import { Orientation, Theme, Thumbnail, ThumbnailProps, ThumbnailVariant } from '@lumx/react';
76
import { GenericProps, HasTheme } from '@lumx/react/utils/type';
@@ -99,11 +98,11 @@ export const PostBlock = forwardRef<PostBlockProps, HTMLDivElement>((props, ref)
9998

10099
{meta && <span className={`${CLASSNAME}__meta`}>{meta}</span>}
101100

102-
{isObject(text) && text.__html ? (
101+
{typeof text === 'string' ? (
102+
<p className={`${CLASSNAME}__text`}>{text}</p>
103+
) : (
103104
// eslint-disable-next-line react/no-danger
104105
<p dangerouslySetInnerHTML={text} className={`${CLASSNAME}__text`} />
105-
) : (
106-
<p className={`${CLASSNAME}__text`}>{text}</p>
107106
)}
108107

109108
{attachments && <div className={`${CLASSNAME}__attachments`}>{attachments}</div>}

packages/lumx-react/src/utils/react/skipRender.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import { DOCUMENT } from '@lumx/react/constants';
2-
import type { Comp } from '@lumx/react/utils/type';
31
import React from 'react';
2+
import type { Comp } from '@lumx/react/utils/type';
43

54
/**
65
* HOC component wrapping a component to skip render if predicate return falsy
76
*/
87
export const skipRender = <P, T>(predicate: (props: P) => any, Component: Comp<P, T>) => {
9-
const Wrapper = React.forwardRef<T, P>((props, ref) => {
10-
if (!DOCUMENT) {
8+
const Wrapper = React.forwardRef<T, P>((props: any, ref) => {
9+
if (!predicate(props)) {
1110
// Can't render in SSR.
1211
return null;
1312
}

packages/site-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
},
5656
"devDependencies": {
5757
"@types/reach__router": "^1.3.6",
58-
"@types/react-helmet": "^6.1.0",
58+
"@types/react-helmet": "^6.1.11",
5959
"glob": "^7.1.6",
6060
"htmlparser2": "^3.10.1",
6161
"tsconfig-paths-webpack-plugin": "^3.3.0",

yarn.lock

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4003,9 +4003,9 @@ __metadata:
40034003
"@types/dom-view-transitions": ^1.0.5
40044004
"@types/jest": ^29.2.1
40054005
"@types/lodash": ^4.14.149
4006-
"@types/react": ^17.0.2
4007-
"@types/react-dom": ^17.0.2
4008-
"@types/react-is": ^17.0.2
4006+
"@types/react": ^18.3.16
4007+
"@types/react-dom": ^18.3.5
4008+
"@types/react-is": ^18.3.1
40094009
autoprefixer: ^9.7.4
40104010
babel-jest: 29.1.2
40114011
babel-loader: ^8.0.6
@@ -6740,16 +6740,7 @@ __metadata:
67406740
languageName: node
67416741
linkType: hard
67426742

6743-
"@types/react-dom@npm:^17.0.2":
6744-
version: 17.0.25
6745-
resolution: "@types/react-dom@npm:17.0.25"
6746-
dependencies:
6747-
"@types/react": ^17
6748-
checksum: d1e582682478e0848c8d54ea3e89d02047bac6d916266b85ce63731b06987575919653ea7159d98fda47ade3362b8c4d5796831549564b83088e7aa9ce8b60ed
6749-
languageName: node
6750-
linkType: hard
6751-
6752-
"@types/react-dom@npm:^18.0.0":
6743+
"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.3.5":
67536744
version: 18.3.5
67546745
resolution: "@types/react-dom@npm:18.3.5"
67556746
peerDependencies:
@@ -6758,32 +6749,31 @@ __metadata:
67586749
languageName: node
67596750
linkType: hard
67606751

6761-
"@types/react-helmet@npm:^6.1.0":
6762-
version: 6.1.0
6763-
resolution: "@types/react-helmet@npm:6.1.0"
6752+
"@types/react-helmet@npm:^6.1.11":
6753+
version: 6.1.11
6754+
resolution: "@types/react-helmet@npm:6.1.11"
67646755
dependencies:
67656756
"@types/react": "*"
6766-
checksum: 90a24a99e1a5f090575445139dd902b8915d4405f097818fdd31847e986a1e0dc8e0361a08366d285f9bbe9e0c013a4f06fc6b4da2d577a22b76086eefde4087
6757+
checksum: e329d8ad82c365fec7dd7d91c8b6d167faac30cef0d9f1e27d7e895172a0ebfa65829fb4acabbe79283b01cbbe5840a845caeb50148ceef6f3fad42b3c2c4bdc
67676758
languageName: node
67686759
linkType: hard
67696760

6770-
"@types/react-is@npm:^17.0.2":
6771-
version: 17.0.7
6772-
resolution: "@types/react-is@npm:17.0.7"
6761+
"@types/react-is@npm:^18.3.1":
6762+
version: 18.3.1
6763+
resolution: "@types/react-is@npm:18.3.1"
67736764
dependencies:
6774-
"@types/react": ^17
6775-
checksum: a8f11067795dbcf54a54d5fdc1977816be155fd04051e850f7c85dbbad83897f846dd3e474d56bd12a7055e0ae1825185f41c6f56342fd5cd31a08df3b3fbfff
6765+
"@types/react": ^18
6766+
checksum: ccb79d6e196a5232cde8ccb255ec97e062801a3dafeff3816130fb5ad6b9a87f7c0806ab35bc00890a229773228ef217d0390839b68c705d3add2f798b5fcf82
67766767
languageName: node
67776768
linkType: hard
67786769

6779-
"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^17, @types/react@npm:^17.0.2":
6780-
version: 17.0.73
6781-
resolution: "@types/react@npm:17.0.73"
6770+
"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18, @types/react@npm:^18.3.16":
6771+
version: 18.3.16
6772+
resolution: "@types/react@npm:18.3.16"
67826773
dependencies:
67836774
"@types/prop-types": "*"
6784-
"@types/scheduler": "*"
67856775
csstype: ^3.0.2
6786-
checksum: 08107645acdd734c8ddb4d26f1b43dfa0d75f7a8d268eaacb897337e103eaa620fe8c3c6972dab9860aaa47bbee1da587cf06b11bb4e655588e38485daf48a6c
6776+
checksum: 467c2a325870580b88b4e3bf439749b51b27cb13f52408653cb8c3e7e1b7eff86ada87e384b1aa4d34aa6027c187ca27df00bea77140fda524d726992f5b93ef
67876777
languageName: node
67886778
linkType: hard
67896779

@@ -6829,13 +6819,6 @@ __metadata:
68296819
languageName: node
68306820
linkType: hard
68316821

6832-
"@types/scheduler@npm:*":
6833-
version: 0.16.2
6834-
resolution: "@types/scheduler@npm:0.16.2"
6835-
checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc
6836-
languageName: node
6837-
linkType: hard
6838-
68396822
"@types/semver@npm:^7.3.4":
68406823
version: 7.5.0
68416824
resolution: "@types/semver@npm:7.5.0"
@@ -23251,7 +23234,7 @@ fsevents@~2.1.2:
2325123234
"@mdx-js/react": ^1.6.19
2325223235
"@reach/router": ^1.2.1
2325323236
"@types/reach__router": ^1.3.6
23254-
"@types/react-helmet": ^6.1.0
23237+
"@types/react-helmet": ^6.1.11
2325523238
classnames: ^2.3.2
2325623239
focus-visible: ^5.2.0
2325723240
gatsby: ^2.24.87

0 commit comments

Comments
 (0)