fix: fix findDOMNode deprecation issue under React 18.3.1 (#2403)

dream-num · Jun 3, 2024 · 41d21c3 · 41d21c3
1 parent 296f399
commit 41d21c3
Show file tree

Hide file tree

Showing 29 changed files with 933 additions and 775 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -26,7 +26,7 @@
         "@univerjs/engine-render": "workspace:*",
         "@univerjs/facade": "workspace:*",
         "@univerjs/find-replace": "workspace:*",
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/rpc": "workspace:*",
         "@univerjs/sheets": "workspace:*",
         "@univerjs/sheets-conditional-formatting": "workspace:*",
@@ -53,14 +53,14 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "monaco-editor": "0.49.0",
-        "react": "18.2.0",
-        "react-dom": "18.2.0",
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
         "react-mosaic-component": "^6.1.0",
         "rxjs": "^7.8.1"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
-        "@types/react-dom": "^18.2.25",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
         "@univerjs/shared": "workspace:*",
         "esbuild": "^0.21.4",
         "esbuild-plugin-clean": "^1.0.1",

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
         "@release-it/conventional-changelog": "^8.0.1",
         "@storybook/react": "8.1.5",
         "@types/node": "^20.12.12",
-        "@types/react": "^18.3.2",
+        "@types/react": "^18.3.3",
         "@univerjs/design": "workspace:*",
         "@univerjs/shared": "workspace:*",
         "@vitejs/plugin-react": "^4.3.0",
@@ -68,8 +68,8 @@
         "eslint-plugin-react-refresh": "^0.4.7",
         "husky": "^9.0.11",
         "lint-staged": "^15.2.5",
-        "react": "18.2.0",
-        "react-dom": "18.2.0",
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
         "release-it": "^17.3.0",
         "serve": "^14.2.3",
         "turbo": "^1.13.3",

diff --git a/packages/design/package.json b/packages/design/package.json
@@ -75,37 +75,37 @@
     },
     "dependencies": {
         "@rc-component/color-picker": "^1.5.3",
-        "@rc-component/trigger": "^1.18.3",
+        "@rc-component/trigger": "^2.2.0",
         "@types/react-mentions": "^4.1.13",
-        "@univerjs/icons": "^0.1.55",
-        "rc-dialog": "^9.4.0",
+        "@univerjs/icons": "^0.1.56",
+        "rc-dialog": "^9.5.0",
         "rc-dropdown": "^4.2.0",
-        "rc-input": "^1.4.5",
-        "rc-input-number": "^9.0.0",
-        "rc-menu": "^9.13.0",
+        "rc-input": "^1.5.1",
+        "rc-input-number": "^9.1.0",
+        "rc-menu": "^9.14.0",
         "rc-picker": "^4.5.0",
         "rc-segmented": "^2.3.0",
-        "rc-select": "^14.13.3",
-        "rc-textarea": "^1.6.3",
+        "rc-select": "^14.14.0",
+        "rc-textarea": "^1.7.0",
         "rc-tooltip": "^6.2.0",
-        "rc-util": "^5.39.3",
+        "rc-util": "^5.41.0",
         "react-draggable": "^4.4.6",
         "react-grid-layout": "^1.4.4",
         "react-mentions": "^4.4.10",
         "react-transition-group": "^4.4.5"
     },
     "devDependencies": {
         "@testing-library/react": "^14.2.2",
-        "@types/react": "^18.2.79",
-        "@types/react-dom": "^18.2.25",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.0",
         "@types/react-grid-layout": "^1.3.5",
         "@types/react-transition-group": "^4.4.10",
         "@univerjs/shared": "workspace:*",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.11",
         "less": "^4.2.0",
-        "react": "18.2.0",
-        "react-dom": "18.2.0",
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",
         "vitest": "^1.6.0"

diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json
@@ -81,7 +81,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",
@@ -98,7 +98,7 @@
         "clsx": "^2.1.1",
         "less": "^4.2.0",
         "ot-json1": "^1.0.2",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
@@ -78,7 +78,7 @@
         "rxjs": ">=7.0.0"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
+        "@types/react": "^18.3.3",
         "@univerjs/core": "workspace:*",
         "@univerjs/design": "workspace:*",
         "@univerjs/docs": "workspace:*",
@@ -87,7 +87,7 @@
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "0.15.2",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
@@ -72,7 +72,7 @@
         "react": "^16.9.0 || ^17.0.0 || ^18.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",
@@ -84,7 +84,7 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/drawing/package.json b/packages/drawing/package.json
@@ -66,7 +66,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "ot-json1": "^1.0.2"
     },
     "devDependencies": {
@@ -76,7 +76,7 @@
         "@wendellhu/redi": "0.15.2",
         "less": "^4.2.0",
         "ot-json1": "^1.0.2",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
@@ -77,10 +77,10 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
+        "@types/react": "^18.3.3",
         "@univerjs/core": "workspace:*",
         "@univerjs/design": "workspace:*",
         "@univerjs/engine-formula": "workspace:*",
@@ -89,7 +89,7 @@
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "0.15.2",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
@@ -83,7 +83,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/protocol": "^0.1.34",
         "@univerjs/sheets-conditional-formatting": "workspace:*",
         "lodash.get": "^4.4.2",
@@ -107,7 +107,7 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx
@@ -41,11 +41,12 @@ export const ColorPicker = (props: IColorPickerProps) => {
 
     return Icon && (!disable
         ? (
-            <Dropdown overlay={(
-                <div className={`${styles.cfColorPicker} `}>
-                    <OriginColorPicker color={color} onChange={onChange} />
-                </div>
-            )}
+            <Dropdown
+                overlay={(
+                    <div className={`${styles.cfColorPicker} `}>
+                        <OriginColorPicker color={color} onChange={onChange} />
+                    </div>
+                )}
             >
                 <span className={`${styles.cfColorPickerIcon} ${className}`}>
                     <Icon extend={{ colorChannel1: colorKit.isValid ? color : 'rgb(var(--primary-color))' }} />

diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/iconSet.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/iconSet.tsx
@@ -232,7 +232,6 @@ const IconSetRuleEdit = (props: {
                                     {icon ? <img src={icon} className={styles.icon} /> : <SlashSingle className={styles.icon} />}
                                     <MoreDownSingle />
                                 </div>
-
                             </Dropdown>
 
                         </div>

diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json
@@ -77,7 +77,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/protocol": "^0.1.34"
     },
     "devDependencies": {
@@ -95,7 +95,7 @@
         "clsx": "^2.1.1",
         "dayjs": "^1.11.11",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json
@@ -81,7 +81,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",
@@ -97,7 +97,7 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
@@ -75,7 +75,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "rc-virtual-list": "^3.11.5"
     },
     "devDependencies": {
@@ -91,7 +91,7 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
@@ -77,10 +77,10 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
+        "@types/react": "^18.3.3",
         "@univerjs/core": "workspace:*",
         "@univerjs/design": "workspace:*",
         "@univerjs/docs": "workspace:*",
@@ -94,7 +94,7 @@
         "@vitejs/plugin-react": "^4.2.1",
         "@wendellhu/redi": "0.15.2",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
@@ -79,7 +79,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/sheets-hyper-link": "workspace:*"
     },
     "devDependencies": {

diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.json
@@ -80,10 +80,10 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55"
+        "@univerjs/icons": "^0.1.56"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
+        "@types/react": "^18.3.3",
         "@univerjs/core": "workspace:*",
         "@univerjs/design": "workspace:*",
         "@univerjs/engine-formula": "workspace:*",
@@ -95,7 +95,7 @@
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "0.15.2",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-thread-comment/package.json b/packages/sheets-thread-comment/package.json
@@ -72,7 +72,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/thread-comment": "workspace:*",
         "@univerjs/thread-comment-ui": "workspace:*"
     },
@@ -86,7 +86,7 @@
         "@univerjs/ui": "workspace:*",
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
@@ -83,11 +83,11 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/icons": "^0.1.55",
+        "@univerjs/icons": "^0.1.56",
         "@univerjs/protocol": "^0.1.34"
     },
     "devDependencies": {
-        "@types/react": "^18.2.79",
+        "@types/react": "^18.3.3",
         "@univerjs/core": "workspace:*",
         "@univerjs/design": "workspace:*",
         "@univerjs/docs": "workspace:*",
@@ -100,7 +100,7 @@
         "@wendellhu/redi": "0.15.2",
         "clsx": "^2.1.1",
         "less": "^4.2.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "rxjs": "^7.8.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.12",

diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
@@ -164,9 +164,11 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {
             visible={visible}
             onVisibleChange={onVisibleChange}
         >
-            <SheetBarButton>
-                <ConvertSingle />
-            </SheetBarButton>
+            <div>
+                <SheetBarButton>
+                    <ConvertSingle />
+                </SheetBarButton>
+            </div>
         </Dropdown>
     );
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -232,7 +232,6 @@ const IconSetRuleEdit = (props: { @@
                                         {icon ? <img src={icon} className={styles.icon} /> : <SlashSingle className={styles.icon} />}
                                         <MoreDownSingle />
                                     </div>
                                 </Dropdown>
                             </div>
@@ Expand Down @@