From f73af63764d38f84c9d4c2934597ba565a092221 Mon Sep 17 00:00:00 2001
From: "qingyi.xjh" <qingyi.xjh@antgroup.com>
Date: Thu, 16 Mar 2023 16:26:54 +0800
Subject: [PATCH] chore: use @types/react18

---
 package.json                                   |  4 ++--
 .../src/browser/comments-item.view.tsx         |  2 +-
 packages/editor/src/browser/editor.view.tsx    |  3 ++-
 .../src/browser/tabbar/tabbar.service.ts       |  2 +-
 yarn.lock                                      | 18 +++++++++---------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index aed6cf616e8..0a5de5c8e5c 100644
--- a/package.json
+++ b/package.json
@@ -146,8 +146,8 @@
     "tools/cli-engine"
   ],
   "resolutions": {
-    "@types/react": "^16.9.23",
-    "@types/react-dom": "^16.9.17",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "classnames": "2.3.1"
   },
   "packageManager": "yarn@3.2.4"
diff --git a/packages/comments/src/browser/comments-item.view.tsx b/packages/comments/src/browser/comments-item.view.tsx
index 7ef49b9fe0d..adb858c8a87 100644
--- a/packages/comments/src/browser/comments-item.view.tsx
+++ b/packages/comments/src/browser/comments-item.view.tsx
@@ -136,7 +136,7 @@ const ReplyItem: React.FC<{
               {timestamp && <Timestamp timestamp={timestamp} />}
               {typeof label === 'string' ? <span className={styles.comment_item_label}>{label}</span> : label}
               {' : '}
-              <span className={styles.comment_item_body}>{body}</span>
+              <span className={styles.comment_item_body}>{typeof body === 'string' ? body : body.value}</span>
               {reply.reactions && reply.reactions.length > 0 && (
                 <CommentReactionSwitcher className={styles.reply_item_title} thread={thread} comment={reply} />
               )}
diff --git a/packages/editor/src/browser/editor.view.tsx b/packages/editor/src/browser/editor.view.tsx
index 7df76d11119..8f9bed0f1a2 100644
--- a/packages/editor/src/browser/editor.view.tsx
+++ b/packages/editor/src/browser/editor.view.tsx
@@ -309,7 +309,8 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
         >
           {EmptyEditorViewConfig && ReactIs.isValidElementType(EmptyEditorViewConfig.component) ? (
             <ErrorBoundary>
-              {React.createElement(EmptyEditorViewConfig.component, EmptyEditorViewConfig.initialProps)}
+              {EmptyEditorViewConfig.component &&
+                React.createElement(EmptyEditorViewConfig.component, EmptyEditorViewConfig.initialProps)}
             </ErrorBoundary>
           ) : null}
         </div>
diff --git a/packages/main-layout/src/browser/tabbar/tabbar.service.ts b/packages/main-layout/src/browser/tabbar/tabbar.service.ts
index d75784b6db5..bd3b50428cc 100644
--- a/packages/main-layout/src/browser/tabbar/tabbar.service.ts
+++ b/packages/main-layout/src/browser/tabbar/tabbar.service.ts
@@ -56,7 +56,7 @@ const CONTAINER_NAME_MAP = {
 
 @Injectable({ multiple: true })
 export class TabbarService extends WithEventBus {
-  @observable currentContainerId: string;
+  @observable.ref currentContainerId = '';
 
   previousContainerId = '';
 
diff --git a/yarn.lock b/yarn.lock
index 331f18d3de3..719cbd7a81a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4405,12 +4405,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^16.9.17":
-  version: 16.9.17
-  resolution: "@types/react-dom@npm:16.9.17"
+"@types/react-dom@npm:^18.0.0":
+  version: 18.0.11
+  resolution: "@types/react-dom@npm:18.0.11"
   dependencies:
-    "@types/react": ^16
-  checksum: c9246eb4d35993463608de61111f2bdae5afbd22556c8b9918081516b67eafd1a9ef141c3ed459dd4c753dd7ea037b6a375a856e677c2586396c23732772831d
+    "@types/react": "*"
+  checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4
   languageName: node
   linkType: hard
 
@@ -4432,14 +4432,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^16.9.23":
-  version: 16.14.35
-  resolution: "@types/react@npm:16.14.35"
+"@types/react@npm:^18.0.0":
+  version: 18.0.28
+  resolution: "@types/react@npm:18.0.28"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: ed9c551a7d50d073a5fb0295c1d939536c66c3286d42b6c94c20749464492ed95a408e6d3694bf49df0012da69e22202065c8c2fac0406356972a7fcb4960dd3
+  checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7
   languageName: node
   linkType: hard