diff --git a/desktop/flipper-ui-core/package.json b/desktop/flipper-ui-core/package.json index 5af1a0a08..0c534b564 100644 --- a/desktop/flipper-ui-core/package.json +++ b/desktop/flipper-ui-core/package.json @@ -15,7 +15,7 @@ "@emotion/react": "^11.6.0", "@emotion/styled": "^11.6.0", "@tanishiking/aho-corasick": "^0.0.1", - "antd": "4.16.8", + "antd": "4.18.0", "cbuffer": "^2.2.0", "console-feed": "^3.2.2", "deep-equal": "^2.0.5", diff --git a/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap b/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap index 1fdfafd28..ab9776ec6 100644 --- a/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap +++ b/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap @@ -40,6 +40,7 @@ exports[`ShareSheetPendingDialog is rendered with status update 1`] = `
-
`); }); diff --git a/desktop/patches/antd+4.16.8.patch b/desktop/patches/antd+4.18.0.patch similarity index 92% rename from desktop/patches/antd+4.16.8.patch rename to desktop/patches/antd+4.18.0.patch index 2db7e1cd6..654c4667f 100644 --- a/desktop/patches/antd+4.16.8.patch +++ b/desktop/patches/antd+4.18.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/antd/es/button/button.js b/node_modules/antd/es/button/button.js -index 28a12c7..13f7382 100644 +index 7202fce..c70b419 100644 --- a/node_modules/antd/es/button/button.js +++ b/node_modules/antd/es/button/button.js -@@ -193,6 +193,8 @@ var InternalButton = function InternalButton(props, ref) { +@@ -187,6 +187,8 @@ var InternalButton = function InternalButton(props, ref) { }, [loadingOrDelay]); React.useEffect(fixTwoCNChar, [buttonRef]); @@ -11,7 +11,7 @@ index 28a12c7..13f7382 100644 var handleClick = function handleClick(e) { var _a; -@@ -204,7 +206,13 @@ var InternalButton = function InternalButton(props, ref) { +@@ -198,7 +200,13 @@ var InternalButton = function InternalButton(props, ref) { return; } diff --git a/desktop/patches/rc-tabs+11.9.1.patch b/desktop/patches/rc-tabs+11.10.5.patch similarity index 78% rename from desktop/patches/rc-tabs+11.9.1.patch rename to desktop/patches/rc-tabs+11.10.5.patch index 6a71270a1..a82943632 100644 --- a/desktop/patches/rc-tabs+11.9.1.patch +++ b/desktop/patches/rc-tabs+11.10.5.patch @@ -1,17 +1,19 @@ diff --git a/node_modules/rc-tabs/es/TabNavList/TabNode.js b/node_modules/rc-tabs/es/TabNavList/TabNode.js -index 092d6cc..0f4ea8c 100644 +index eca033e..7a818d8 100644 --- a/node_modules/rc-tabs/es/TabNavList/TabNode.js +++ b/node_modules/rc-tabs/es/TabNavList/TabNode.js -@@ -37,10 +37,19 @@ function TabNode(_ref, ref) { - } - +@@ -27,13 +27,21 @@ function TabNode(_ref, ref) { + return onRemove; + }, []); var removable = editable && closable !== false && !disabled; + var scope = React.useContext(global.FlipperTrackingScopeContext); function onInternalClick(e) { - if (disabled) return; + if (disabled) { + return; + } + - onClick(e); -+ + global.flipperTrackInteraction( + 'Tabs', + 'onTabClick', diff --git a/desktop/plugins/public/reactdevtools/index.tsx b/desktop/plugins/public/reactdevtools/index.tsx index 3fad67d77..5372663e6 100644 --- a/desktop/plugins/public/reactdevtools/index.tsx +++ b/desktop/plugins/public/reactdevtools/index.tsx @@ -419,7 +419,7 @@ function DevToolsInstanceToolbar() {