Skip to content

Commit 7c5d3c9

Browse files
author
Emre Güdür
committed
status title changes, react version upgrade
1 parent 5469fd4 commit 7c5d3c9

File tree

4 files changed

+35
-36
lines changed

4 files changed

+35
-36
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"jest": "21.2.1",
2929
"lorem-ipsum": "^1.0.4",
3030
"mini-css-extract-plugin": "^2.6.0",
31-
"react": "^17.0.2",
32-
"react-dom": "17.0.2",
31+
"react": "^18.2.0",
32+
"react-dom": "^18.2.0",
3333
"react-scripts": "^5.0.1",
34-
"react-test-renderer": "^17.0.2",
34+
"react-test-renderer": "^18.2.0",
3535
"rimraf": "^3.0.2",
3636
"rollup": "^2.75.6",
3737
"rollup-plugin-babel": "^4.4.0",
@@ -81,8 +81,8 @@
8181
"build:lib": "yarn run build && rollup -c && yarn run move:types"
8282
},
8383
"peerDependencies": {
84-
"react": "^17.0.2",
85-
"react-dom": "17.0.2"
84+
"react": "^18.2.0",
85+
"react-dom": "18.2.0"
8686
},
8787
"dependencies": {
8888
"classnames": "^2.2.5",
@@ -103,4 +103,4 @@
103103
"last 1 safari version"
104104
]
105105
}
106-
}
106+
}

src/Input/Input.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ const Input: React.FC<IInputProps> = ({
103103
onKeyDown={props.onKeyDown}
104104
onKeyPress={props.onKeyPress}
105105
onKeyUp={props.onKeyUp}
106-
>{props?.value ?? ""}</textarea>
106+
>
107+
{props.defaultValue ? props?.value ?? null : null}
108+
</textarea>
107109
)}
108110
{props.rightButtons && <div className='rce-input-buttons'>{props.rightButtons}</div>}
109111
</div>

src/MessageBox/MessageBox.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ const MessageBox: React.FC<MessageBoxType> = ({ focus = false, notch = true, sty
163163
)}
164164

165165
<div
166+
title={props.statusTitle}
166167
className={classNames(
167168
'rce-mbox-time',
168169
{ 'rce-mbox-time-block': thatAbsoluteTime },
@@ -172,8 +173,8 @@ const MessageBox: React.FC<MessageBoxType> = ({ focus = false, notch = true, sty
172173
>
173174
{props.copiableDate && props.date && (props.dateString || format(props.date))}
174175
{props.status && (
175-
<span className='rce-mbox-status' title={props.statusTitle}>
176-
{props.status === 'waiting' && <MdAccessTime />}
176+
<span className='rce-mbox-status'>
177+
{props.status === 'waiting' && <MdAccessTime />}
177178

178179
{props.status === 'sent' && <MdCheck />}
179180

yarn.lock

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9480,14 +9480,13 @@ react-dev-utils@^12.0.1:
94809480
strip-ansi "^6.0.1"
94819481
text-table "^0.2.0"
94829482

9483-
react-dom@17.0.2:
9484-
version "17.0.2"
9485-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
9486-
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
9483+
react-dom@^18.2.0:
9484+
version "18.2.0"
9485+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
9486+
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
94879487
dependencies:
94889488
loose-envify "^1.1.0"
9489-
object-assign "^4.1.1"
9490-
scheduler "^0.20.2"
9489+
scheduler "^0.23.0"
94919490

94929491
react-error-overlay@^6.0.11:
94939492
version "6.0.11"
@@ -9499,7 +9498,7 @@ react-icons@*, react-icons@^4.3.1:
94999498
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.7.1.tgz#0f4b25a5694e6972677cb189d2a72eabea7a8345"
95009499
integrity sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw==
95019500

9502-
"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0:
9501+
"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0:
95039502
version "18.2.0"
95049503
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
95059504
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
@@ -9509,7 +9508,7 @@ react-is@^16.13.1:
95099508
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
95109509
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
95119510

9512-
react-is@^17.0.1, react-is@^17.0.2:
9511+
react-is@^17.0.1:
95139512
version "17.0.2"
95149513
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
95159514
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -9574,7 +9573,7 @@ react-scripts@^5.0.1:
95749573
optionalDependencies:
95759574
fsevents "^2.3.2"
95769575

9577-
react-shallow-renderer@^16.13.1:
9576+
react-shallow-renderer@^16.15.0:
95789577
version "16.15.0"
95799578
resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457"
95809579
integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==
@@ -9592,23 +9591,21 @@ react-spinkit@^3.0.0:
95929591
object-assign "^4.1.0"
95939592
prop-types "^15.5.8"
95949593

9595-
react-test-renderer@^17.0.2:
9596-
version "17.0.2"
9597-
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c"
9598-
integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==
9594+
react-test-renderer@^18.2.0:
9595+
version "18.2.0"
9596+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e"
9597+
integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==
95999598
dependencies:
9600-
object-assign "^4.1.1"
9601-
react-is "^17.0.2"
9602-
react-shallow-renderer "^16.13.1"
9603-
scheduler "^0.20.2"
9599+
react-is "^18.2.0"
9600+
react-shallow-renderer "^16.15.0"
9601+
scheduler "^0.23.0"
96049602

9605-
react@^17.0.2:
9606-
version "17.0.2"
9607-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
9608-
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
9603+
react@^18.2.0:
9604+
version "18.2.0"
9605+
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
9606+
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
96099607
dependencies:
96109608
loose-envify "^1.1.0"
9611-
object-assign "^4.1.1"
96129609

96139610
read-cache@^1.0.0:
96149611
version "1.0.0"
@@ -10110,13 +10107,12 @@ saxes@^5.0.1:
1011010107
dependencies:
1011110108
xmlchars "^2.2.0"
1011210109

10113-
scheduler@^0.20.2:
10114-
version "0.20.2"
10115-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
10116-
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
10110+
scheduler@^0.23.0:
10111+
version "0.23.0"
10112+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
10113+
integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
1011710114
dependencies:
1011810115
loose-envify "^1.1.0"
10119-
object-assign "^4.1.1"
1012010116

1012110117
1012210118
version "2.7.0"

0 commit comments

Comments
 (0)