From 7c5d3c96d18943847d42db18a92138b57e55b63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emre=20G=C3=BCd=C3=BCr?= Date: Wed, 3 May 2023 14:15:48 +0300 Subject: [PATCH] status title changes, react version upgrade --- package.json | 12 ++++----- src/Input/Input.tsx | 4 ++- src/MessageBox/MessageBox.tsx | 5 ++-- yarn.lock | 50 ++++++++++++++++------------------- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index b0c9af0..ad34672 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "jest": "21.2.1", "lorem-ipsum": "^1.0.4", "mini-css-extract-plugin": "^2.6.0", - "react": "^17.0.2", - "react-dom": "17.0.2", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-scripts": "^5.0.1", - "react-test-renderer": "^17.0.2", + "react-test-renderer": "^18.2.0", "rimraf": "^3.0.2", "rollup": "^2.75.6", "rollup-plugin-babel": "^4.4.0", @@ -81,8 +81,8 @@ "build:lib": "yarn run build && rollup -c && yarn run move:types" }, "peerDependencies": { - "react": "^17.0.2", - "react-dom": "17.0.2" + "react": "^18.2.0", + "react-dom": "18.2.0" }, "dependencies": { "classnames": "^2.2.5", @@ -103,4 +103,4 @@ "last 1 safari version" ] } -} \ No newline at end of file +} diff --git a/src/Input/Input.tsx b/src/Input/Input.tsx index 0b604a9..7895fb4 100644 --- a/src/Input/Input.tsx +++ b/src/Input/Input.tsx @@ -103,7 +103,9 @@ const Input: React.FC = ({ onKeyDown={props.onKeyDown} onKeyPress={props.onKeyPress} onKeyUp={props.onKeyUp} - >{props?.value ?? ""} + > + {props.defaultValue ? props?.value ?? null : null} + )} {props.rightButtons &&
{props.rightButtons}
} diff --git a/src/MessageBox/MessageBox.tsx b/src/MessageBox/MessageBox.tsx index e06dc17..e2925d0 100644 --- a/src/MessageBox/MessageBox.tsx +++ b/src/MessageBox/MessageBox.tsx @@ -163,6 +163,7 @@ const MessageBox: React.FC = ({ focus = false, notch = true, sty )}
= ({ focus = false, notch = true, sty > {props.copiableDate && props.date && (props.dateString || format(props.date))} {props.status && ( - - {props.status === 'waiting' && } + + {props.status === 'waiting' && } {props.status === 'sent' && } diff --git a/yarn.lock b/yarn.lock index 0fd57d6..4a5802e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9480,14 +9480,13 @@ react-dev-utils@^12.0.1: strip-ansi "^6.0.1" text-table "^0.2.0" -react-dom@17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" + scheduler "^0.23.0" react-error-overlay@^6.0.11: version "6.0.11" @@ -9499,7 +9498,7 @@ react-icons@*, react-icons@^4.3.1: resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.7.1.tgz#0f4b25a5694e6972677cb189d2a72eabea7a8345" integrity sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw== -"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0: +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== @@ -9509,7 +9508,7 @@ react-is@^16.13.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1, react-is@^17.0.2: +react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -9574,7 +9573,7 @@ react-scripts@^5.0.1: optionalDependencies: fsevents "^2.3.2" -react-shallow-renderer@^16.13.1: +react-shallow-renderer@^16.15.0: version "16.15.0" resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== @@ -9592,23 +9591,21 @@ react-spinkit@^3.0.0: object-assign "^4.1.0" prop-types "^15.5.8" -react-test-renderer@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c" - integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ== +react-test-renderer@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e" + integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA== dependencies: - object-assign "^4.1.1" - react-is "^17.0.2" - react-shallow-renderer "^16.13.1" - scheduler "^0.20.2" + react-is "^18.2.0" + react-shallow-renderer "^16.15.0" + scheduler "^0.23.0" -react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== +react@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" read-cache@^1.0.0: version "1.0.0" @@ -10110,13 +10107,12 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0: version "2.7.0"