diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index ebf21d7e4f60d..5cd9a1ccf9133 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -261,7 +261,7 @@
         "transform-loader": "^0.2.4",
         "ts-jest": "^26.4.2",
         "ts-loader": "^9.2.5",
-        "typescript": "^4.1.6",
+        "typescript": "^4.5.4",
         "webpack": "^5.52.1",
         "webpack-bundle-analyzer": "^4.4.2",
         "webpack-cli": "^4.8.0",
@@ -21502,10 +21502,6 @@
       "resolved": "plugins/legacy-plugin-chart-sunburst",
       "link": true
     },
-    "node_modules/@superset-ui/legacy-plugin-chart-time-table": {
-      "resolved": "plugins/legacy-plugin-chart-time-table",
-      "link": true
-    },
     "node_modules/@superset-ui/legacy-plugin-chart-treemap": {
       "resolved": "plugins/legacy-plugin-chart-treemap",
       "link": true
@@ -55339,9 +55335,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -60186,12 +60182,32 @@
         "chromatic": "^5.4.0",
         "fork-ts-checker-webpack-plugin": "^5.0.7",
         "ts-loader": "^7.0.4",
-        "typescript": "^3.8.3"
+        "typescript": "^4.5.4"
       },
       "peerDependencies": {
         "@encodable/color": "=1.1.1"
       }
     },
+    "packages/superset-ui-demo/node_modules/@superset-ui/legacy-plugin-chart-time-table": {
+      "version": "0.18.25",
+      "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-time-table/-/legacy-plugin-chart-time-table-0.18.25.tgz",
+      "integrity": "sha512-rRHtheYnBdumo5lRupXOdetB2/DIw9ayZ7KPWJP0JpdC9qR6i1OLKMvGNO67b+d6JIklNh538eHF3iP8E1Oo+Q==",
+      "dependencies": {
+        "@data-ui/sparkline": "^0.0.84",
+        "@superset-ui/chart-controls": "0.18.25",
+        "@superset-ui/core": "0.18.25",
+        "@types/d3-scale": "^2.0.2",
+        "d3-scale": "^3.2.1",
+        "moment": "^2.26.0",
+        "mustache": "^4.0.1",
+        "prop-types": "^15.7.2",
+        "reactable-arc": "^0.15.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.3.1"
+      }
+    },
     "packages/superset-ui-demo/node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -60242,6 +60258,34 @@
         "node": ">=8"
       }
     },
+    "packages/superset-ui-demo/node_modules/d3-array": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+      "dependencies": {
+        "internmap": "^1.0.0"
+      }
+    },
+    "packages/superset-ui-demo/node_modules/d3-scale": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+      "dependencies": {
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
+      }
+    },
+    "packages/superset-ui-demo/node_modules/d3-time": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+      "dependencies": {
+        "d3-array": "2"
+      }
+    },
     "packages/superset-ui-demo/node_modules/deepmerge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
@@ -60362,6 +60406,14 @@
         "node": ">=8.6"
       }
     },
+    "packages/superset-ui-demo/node_modules/mustache": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "bin": {
+        "mustache": "bin/mustache"
+      }
+    },
     "packages/superset-ui-demo/node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -60497,19 +60549,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "packages/superset-ui-demo/node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "packages/superset-ui-demo/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -60858,6 +60897,7 @@
     "plugins/legacy-plugin-chart-time-table": {
       "name": "@superset-ui/legacy-plugin-chart-time-table",
       "version": "0.0.1",
+      "extraneous": true,
       "dependencies": {
         "@data-ui/sparkline": "^0.0.84",
         "@superset-ui/chart-controls": "0.18.25",
@@ -60870,42 +60910,6 @@
         "reactable-arc": "^0.15.0"
       }
     },
-    "plugins/legacy-plugin-chart-time-table/node_modules/d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-      "dependencies": {
-        "internmap": "^1.0.0"
-      }
-    },
-    "plugins/legacy-plugin-chart-time-table/node_modules/d3-scale": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
-      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
-      "dependencies": {
-        "d3-array": "^2.3.0",
-        "d3-format": "1 - 2",
-        "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "^2.1.1",
-        "d3-time-format": "2 - 3"
-      }
-    },
-    "plugins/legacy-plugin-chart-time-table/node_modules/d3-time": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
-      "dependencies": {
-        "d3-array": "2"
-      }
-    },
-    "plugins/legacy-plugin-chart-time-table/node_modules/mustache": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
-      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-      "bin": {
-        "mustache": "bin/mustache"
-      }
-    },
     "plugins/legacy-plugin-chart-treemap": {
       "name": "@superset-ui/legacy-plugin-chart-treemap",
       "version": "0.18.25",
@@ -77553,9 +77557,25 @@
         "react-resizable": "^3.0.4",
         "storybook-addon-jsx": "^7.3.14",
         "ts-loader": "^7.0.4",
-        "typescript": "^3.8.3"
+        "typescript": "^4.5.4"
       },
       "dependencies": {
+        "@superset-ui/legacy-plugin-chart-time-table": {
+          "version": "0.18.25",
+          "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-time-table/-/legacy-plugin-chart-time-table-0.18.25.tgz",
+          "integrity": "sha512-rRHtheYnBdumo5lRupXOdetB2/DIw9ayZ7KPWJP0JpdC9qR6i1OLKMvGNO67b+d6JIklNh538eHF3iP8E1Oo+Q==",
+          "requires": {
+            "@data-ui/sparkline": "^0.0.84",
+            "@superset-ui/chart-controls": "0.18.25",
+            "@superset-ui/core": "0.18.25",
+            "@types/d3-scale": "^2.0.2",
+            "d3-scale": "^3.2.1",
+            "moment": "^2.26.0",
+            "mustache": "^4.0.1",
+            "prop-types": "^15.7.2",
+            "reactable-arc": "^0.15.0"
+          }
+        },
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -77592,6 +77612,34 @@
             "yaml": "^1.7.2"
           }
         },
+        "d3-array": {
+          "version": "2.12.1",
+          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+          "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+          "requires": {
+            "internmap": "^1.0.0"
+          }
+        },
+        "d3-scale": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+          "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+          "requires": {
+            "d3-array": "^2.3.0",
+            "d3-format": "1 - 2",
+            "d3-interpolate": "1.2.0 - 2",
+            "d3-time": "^2.1.1",
+            "d3-time-format": "2 - 3"
+          }
+        },
+        "d3-time": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+          "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+          "requires": {
+            "d3-array": "2"
+          }
+        },
         "deepmerge": {
           "version": "4.2.2",
           "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
@@ -77684,6 +77732,11 @@
             "picomatch": "^2.2.3"
           }
         },
+        "mustache": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+          "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="
+        },
         "parse-json": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -77778,12 +77831,6 @@
             }
           }
         },
-        "typescript": {
-          "version": "3.9.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-          "dev": true
-        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -78073,55 +78120,6 @@
         "prop-types": "^15.6.2"
       }
     },
-    "@superset-ui/legacy-plugin-chart-time-table": {
-      "version": "file:plugins/legacy-plugin-chart-time-table",
-      "requires": {
-        "@data-ui/sparkline": "^0.0.84",
-        "@superset-ui/chart-controls": "0.18.25",
-        "@superset-ui/core": "0.18.25",
-        "@types/d3-scale": "^2.0.2",
-        "d3-scale": "^3.2.1",
-        "moment": "^2.26.0",
-        "mustache": "^4.0.1",
-        "prop-types": "^15.7.2",
-        "reactable-arc": "^0.15.0"
-      },
-      "dependencies": {
-        "d3-array": {
-          "version": "2.12.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-          "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
-          "requires": {
-            "internmap": "^1.0.0"
-          }
-        },
-        "d3-scale": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
-          "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
-          "requires": {
-            "d3-array": "^2.3.0",
-            "d3-format": "1 - 2",
-            "d3-interpolate": "1.2.0 - 2",
-            "d3-time": "^2.1.1",
-            "d3-time-format": "2 - 3"
-          }
-        },
-        "d3-time": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-          "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
-          "requires": {
-            "d3-array": "2"
-          }
-        },
-        "mustache": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
-          "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="
-        }
-      }
-    },
     "@superset-ui/legacy-plugin-chart-treemap": {
       "version": "file:plugins/legacy-plugin-chart-treemap",
       "requires": {
@@ -104913,9 +104911,9 @@
       }
     },
     "typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
+      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="
     },
     "typical": {
       "version": "4.0.0",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index f14075b262ec3..926bead2735ea 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -321,7 +321,7 @@
     "transform-loader": "^0.2.4",
     "ts-jest": "^26.4.2",
     "ts-loader": "^9.2.5",
-    "typescript": "^4.1.6",
+    "typescript": "^4.5.4",
     "webpack": "^5.52.1",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-cli": "^4.8.0",
diff --git a/superset-frontend/packages/superset-ui-demo/package.json b/superset-frontend/packages/superset-ui-demo/package.json
index 90162756821ca..a8beec669c11e 100644
--- a/superset-frontend/packages/superset-ui-demo/package.json
+++ b/superset-frontend/packages/superset-ui-demo/package.json
@@ -87,7 +87,7 @@
     "chromatic": "^5.4.0",
     "fork-ts-checker-webpack-plugin": "^5.0.7",
     "ts-loader": "^7.0.4",
-    "typescript": "^3.8.3"
+    "typescript": "^4.5.4"
   },
   "peerDependencies": {
     "@encodable/color": "=1.1.1"
diff --git a/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx b/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx
index 8a6e1d165bf52..9c0817c2dbc60 100644
--- a/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx
+++ b/superset-frontend/src/components/ModalTrigger/ModalTrigger.stories.tsx
@@ -43,7 +43,7 @@ export default {
 };
 
 export const InteractiveModalTrigger = (args: IModalTriggerProps) => (
-  <ModalTrigger triggerNode={<span>Click me</span>} {...args} />
+  <ModalTrigger {...args} triggerNode={<span>Click me</span>} />
 );
 
 InteractiveModalTrigger.args = {