fix(AsyncSelect): reset all cached state in clearCache()

clearCache() previously only cleared fetchedQueries, leaving
initialOptionsRef populated and allValuesLoaded sticky. After
calling clearCache(), a subsequent search + clear would restore
stale options from initialOptionsRef and the next no-search fetch
could short-circuit on allValuesLoaded.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

.github/workflows/superset-extensions-cli.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: steps.check.outputs.superset-extensions-cli
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           file: ./coverage.xml
           flags: superset-extensions-cli

.github/workflows/superset-frontend.yml

@@ -128,7 +128,7 @@ jobs:
         run: npx nyc merge coverage/ merged-output/coverage-summary.json
 
       - name: Upload Code Coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: javascript
           use_oidc: true

.github/workflows/superset-python-integrationtest.yml

@@ -70,7 +70,7 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,mysql
           verbose: true
@@ -164,7 +164,7 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,postgres
           verbose: true
@@ -219,7 +219,7 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,sqlite
           verbose: true

.github/workflows/superset-python-presto-hive.yml

@@ -79,7 +79,7 @@ jobs:
         run: |
           ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,presto
           verbose: true
@@ -150,7 +150,7 @@ jobs:
           pip install -e .[hive]
           ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,hive
           verbose: true

.github/workflows/superset-python-unittest.yml

@@ -56,7 +56,7 @@ jobs:
           pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
           pytest --durations-min=0.5 --cov=superset/semantic_layers/ ./tests/unit_tests/semantic_layers/ --cache-clear --cov-fail-under=100
       - name: Upload code coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,unit
           verbose: true

docs/package.json

@@ -72,7 +72,7 @@
     "@superset-ui/core": "^0.20.4",
     "@swc/core": "^1.15.33",
     "antd": "^6.4.3",
-    "baseline-browser-mapping": "^2.10.31",
+    "baseline-browser-mapping": "^2.10.30",
     "caniuse-lite": "^1.0.30001793",
     "docusaurus-plugin-openapi-docs": "^5.0.2",
     "docusaurus-theme-openapi-docs": "^5.0.2",
@@ -109,7 +109,7 @@
     "globals": "^17.6.0",
     "prettier": "^3.8.3",
     "typescript": "~6.0.3",
-    "typescript-eslint": "^8.59.4",
+    "typescript-eslint": "^8.59.3",
     "webpack": "^5.106.2"
   },
   "browserslist": {

docs/yarn.lock

@@ -4828,100 +4828,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.59.4", "@typescript-eslint/eslint-plugin@^8.59.3":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.4.tgz#c67bfee32caae9cb587dce1ac59c3bf43b659707"
-  integrity sha512-PegsU+XfyJJNjd4+u/k6f9yTyp0lEXXiPopUNobZcIAUJFGICFLN+sP0Rb3JehVmiij1Ph0dFGYqODoRo/2+6A==
+"@typescript-eslint/eslint-plugin@8.59.3", "@typescript-eslint/eslint-plugin@^8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.3.tgz#5d6da7e7b236b46452fa00d3904bb6f59615bfde"
+  integrity sha512-PwFvSKsXGShKGW6n5bZOhGHEcCZXM8HofLK9fNsEwZXzFRjoY+XT1Vsf1zgyXdwTr0ZYz1/2tkZ0DBTT9jZjhw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/type-utils" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.59.3"
+    "@typescript-eslint/type-utils" "8.59.3"
+    "@typescript-eslint/utils" "8.59.3"
+    "@typescript-eslint/visitor-keys" "8.59.3"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.59.4", "@typescript-eslint/parser@^8.59.3":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.4.tgz#77d99e3b27663e7a22cf12c3fb769db509e5e93c"
-  integrity sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==
+"@typescript-eslint/parser@8.59.3", "@typescript-eslint/parser@^8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.3.tgz#f46cbc70ae0a25119ef94eac9ecd46714788e1a1"
+  integrity sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.59.3"
+    "@typescript-eslint/types" "8.59.3"
+    "@typescript-eslint/typescript-estree" "8.59.3"
+    "@typescript-eslint/visitor-keys" "8.59.3"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.4.tgz#5830535a0e7a3ae806e2669964f47a74c4bc6b0e"
-  integrity sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==
+"@typescript-eslint/project-service@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.3.tgz#1be5ae152aad987a156c9a1a9b4256e75cfbbe0c"
+  integrity sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.59.4"
-    "@typescript-eslint/types" "^8.59.4"
+    "@typescript-eslint/tsconfig-utils" "^8.59.3"
+    "@typescript-eslint/types" "^8.59.3"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz#507d1258c758147dac1adee9517a205a8ac1e046"
-  integrity sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==
+"@typescript-eslint/scope-manager@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.3.tgz#91a60f66803fe9dae0696fbab2451f5723f119d2"
+  integrity sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/types" "8.59.3"
+    "@typescript-eslint/visitor-keys" "8.59.3"
 
-"@typescript-eslint/tsconfig-utils@8.59.4", "@typescript-eslint/tsconfig-utils@^8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz#218ba229d96dde35212e3a76a7d0a6bc831398be"
-  integrity sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==
+"@typescript-eslint/tsconfig-utils@8.59.3", "@typescript-eslint/tsconfig-utils@^8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.3.tgz#88ca9036b42ccdd1e630cfdafd2e042c2ca6a835"
+  integrity sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==
 
-"@typescript-eslint/type-utils@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.4.tgz#359fc53ba39a1f1860fddda40ebe5bfe0d87faed"
-  integrity sha512-uonTuPAAKr9XaBGqJ3LjYTh72zy5DyGesljO9gtmk/eFW0W1fRHjnwVYKB35Lm8d5Q5CluEW3gPHjTvZTmgrfA==
+"@typescript-eslint/type-utils@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.3.tgz#421fb2448bdfeb301d134a01cd02503f67fd8192"
+  integrity sha512-g71d8QD8UaiHGvrJwyIS1hCX5r63w6Jll+4VEYhEAHXTDIqX1JgxhTAbEHtKntL9kuc4jRo7/GWw5xfCepSccQ==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
+    "@typescript-eslint/types" "8.59.3"
+    "@typescript-eslint/typescript-estree" "8.59.3"
+    "@typescript-eslint/utils" "8.59.3"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.59.4", "@typescript-eslint/types@^8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.4.tgz#c29d5c21bfbaa8347ddc677d3ac1fcd2db0f848e"
-  integrity sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==
+"@typescript-eslint/types@8.59.3", "@typescript-eslint/types@^8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.3.tgz#b7ca539c5e302fdde9a7cadb73caed107ef8f2cd"
+  integrity sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==
 
-"@typescript-eslint/typescript-estree@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz#d005e5e1fb425526f39685594bed34a04ad755ea"
-  integrity sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==
+"@typescript-eslint/typescript-estree@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.3.tgz#e6bb1408e00b47e431427a40268db4e86cb121ab"
+  integrity sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==
   dependencies:
-    "@typescript-eslint/project-service" "8.59.4"
-    "@typescript-eslint/tsconfig-utils" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/project-service" "8.59.3"
+    "@typescript-eslint/tsconfig-utils" "8.59.3"
+    "@typescript-eslint/types" "8.59.3"
+    "@typescript-eslint/visitor-keys" "8.59.3"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.4.tgz#8ccd2b08aecc72c7efc0d7ac6695631d199d256e"
-  integrity sha512-cYXeNAUsG4lJo5dbc1FcKm+JwIWrj1/UpTORsC6tGMjEZ81DYcvIr9/ueikhMa/Y/gDQYGp+YX9/xQrXje5BJw==
+"@typescript-eslint/utils@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.3.tgz#f693f979deb4dc3994de03ff8b23976d625c36c5"
+  integrity sha512-JAvT14goBzRzzzZyqq3P9BLArIxTtQURUtFgQ/V7FO+eU+Gg6ES+5ymOPP1wRxXcxAYeivCk4uS3jCKWI1K8Zg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.59.3"
+    "@typescript-eslint/types" "8.59.3"
+    "@typescript-eslint/typescript-estree" "8.59.3"
 
-"@typescript-eslint/visitor-keys@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz#1ac23b747b011f5cbdb449da97769f6c5f3a9355"
-  integrity sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==
+"@typescript-eslint/visitor-keys@8.59.3":
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.3.tgz#820843b1b5ca4290009cf189382abcf6fe00dfa6"
+  integrity sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/types" "8.59.3"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.0.0":
@@ -5584,10 +5584,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-baseline-browser-mapping@^2.10.31, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
-  version "2.10.31"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
-  integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
+baseline-browser-mapping@^2.10.30, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
+  version "2.10.30"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz#58915c74388b05f3b3504026194ea9fa98f6e6b6"
+  integrity sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==
 
 batch@0.6.1:
   version "0.6.1"
@@ -14407,15 +14407,15 @@ types-ramda@^0.30.1:
   dependencies:
     ts-toolbelt "^9.6.0"
 
-typescript-eslint@^8.59.4:
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.4.tgz#834e3b53f4d1a764a985ceb8592c4a95d6a8da7c"
-  integrity sha512-Rw6+44QNFaXtgHSjPy+Kw8hrJniMYzR85E9yLmOLcfZ91/rz+JXQbDTCmc6ccxMPY6K6PgAq26f0JCBfR7LIPQ==
+typescript-eslint@^8.59.3:
+  version "8.59.3"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.3.tgz#4a41d9007faa539a66292189e2795eeb0b9fca29"
+  integrity sha512-KgusgyDgG4LI8Ih/sWaCtZ06tckLAS5CvT5A4D1Q7bYVoAAyzwiZvE4BmwDHkhRVkvhRBepKeASoFzQetha7Fg==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.59.4"
-    "@typescript-eslint/parser" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
+    "@typescript-eslint/eslint-plugin" "8.59.3"
+    "@typescript-eslint/parser" "8.59.3"
+    "@typescript-eslint/typescript-estree" "8.59.3"
+    "@typescript-eslint/utils" "8.59.3"
 
 typescript@~6.0.3:
   version "6.0.3"

superset-frontend/package-lock.json

@@ -109,7 +109,7 @@
         "json-bigint": "^1.0.0",
         "json-stringify-pretty-compact": "^2.0.0",
         "lodash": "^4.18.1",
-        "mapbox-gl": "^3.24.0",
+        "mapbox-gl": "^3.23.1",
         "markdown-to-jsx": "^9.8.0",
         "match-sorter": "^8.3.0",
         "memoize-one": "^5.2.1",
@@ -120,13 +120,13 @@
         "pretty-ms": "^9.3.0",
         "query-string": "9.3.1",
         "re-resizable": "^6.11.2",
-        "react": "^18.3.0",
+        "react": "^18.2.0",
         "react-arborist": "^3.6.1",
         "react-checkbox-tree": "^1.8.0",
         "react-diff-viewer-continued": "^4.2.2",
         "react-dnd": "^11.1.3",
         "react-dnd-html5-backend": "^11.1.3",
-        "react-dom": "^18.3.0",
+        "react-dom": "^18.2.0",
         "react-google-recaptcha": "^3.1.0",
         "react-intersection-observer": "^10.0.3",
         "react-json-tree": "^0.20.0",
@@ -208,9 +208,9 @@
         "@types/js-levenshtein": "^1.1.3",
         "@types/json-bigint": "^1.0.4",
         "@types/mousetrap": "^1.6.15",
-        "@types/node": "^25.9.1",
-        "@types/react": "^18.3.0",
-        "@types/react-dom": "^18.3.0",
+        "@types/node": "^25.8.0",
+        "@types/react": "^18.2.0",
+        "@types/react-dom": "^18.2.0",
         "@types/react-loadable": "^5.5.11",
         "@types/react-redux": "^7.1.10",
         "@types/react-resizable": "^3.0.8",
@@ -223,7 +223,7 @@
         "@types/tinycolor2": "^1.4.3",
         "@types/unzipper": "^0.10.11",
         "@typescript-eslint/eslint-plugin": "^8.59.3",
-        "@typescript-eslint/parser": "^8.59.4",
+        "@typescript-eslint/parser": "^8.59.3",
         "babel-jest": "^30.4.1",
         "babel-loader": "^10.1.1",
         "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -274,7 +274,6 @@
         "prettier": "3.8.3",
         "prettier-plugin-packagejson": "^3.0.2",
         "process": "^0.11.10",
-        "react-dnd-test-backend": "^11.1.3",
         "react-refresh": "^0.18.0",
         "react-resizable": "^3.1.3",
         "redux-mock-store": "^1.5.4",
@@ -285,9 +284,9 @@
         "style-loader": "^4.0.0",
         "swc-loader": "^0.2.7",
         "terser-webpack-plugin": "^5.6.0",
-        "ts-jest": "^29.4.10",
+        "ts-jest": "^29.4.9",
         "tscw-config": "^1.1.2",
-        "tsx": "^4.22.3",
+        "tsx": "^4.22.0",
         "typescript": "5.4.5",
         "unzipper": "^0.12.3",
         "vm-browserify": "^1.1.2",
@@ -13640,9 +13639,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz",
-      "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==",
+      "version": "25.8.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz",
+      "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": ">=7.24.0 <7.24.7"
@@ -14354,16 +14353,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.4.tgz",
-      "integrity": "sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
+      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.59.4",
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/typescript-estree": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -14379,14 +14378,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.4.tgz",
-      "integrity": "sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.3.tgz",
+      "integrity": "sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.59.4",
-        "@typescript-eslint/types": "^8.59.4",
+        "@typescript-eslint/tsconfig-utils": "^8.59.3",
+        "@typescript-eslint/types": "^8.59.3",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -14401,14 +14400,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz",
-      "integrity": "sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.3.tgz",
+      "integrity": "sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4"
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -14419,9 +14418,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz",
-      "integrity": "sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.3.tgz",
+      "integrity": "sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14436,9 +14435,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.4.tgz",
-      "integrity": "sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.3.tgz",
+      "integrity": "sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14450,16 +14449,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz",
-      "integrity": "sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.3.tgz",
+      "integrity": "sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.59.4",
-        "@typescript-eslint/tsconfig-utils": "8.59.4",
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4",
+        "@typescript-eslint/project-service": "8.59.3",
+        "@typescript-eslint/tsconfig-utils": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -14478,13 +14477,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz",
-      "integrity": "sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.3.tgz",
+      "integrity": "sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.59.4",
+        "@typescript-eslint/types": "8.59.3",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -25495,6 +25494,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/grid-index": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
+      "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==",
+      "license": "ISC"
+    },
     "node_modules/h3-js": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-4.2.1.tgz",
@@ -32877,13 +32882,13 @@
       "license": "MIT"
     },
     "node_modules/mapbox-gl": {
-      "version": "3.24.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.24.0.tgz",
-      "integrity": "sha512-R+FdFUB3DnoE5FYASV7lGSiRyMkSblcZ2UEy7b2pt7s5ZbCxFIUPXd0E6iAFd8OdvdA2VtbvZZVylzAZNaurjA==",
+      "version": "3.23.1",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.23.1.tgz",
+      "integrity": "sha512-J5M32GunL5KcxvV3ZyLJdr7xtcQ3afAO3VjitLW0v2UVfHjXhq9NO4tkTpn4Dknqwq/pXZG7j1WBfmddLCA26w==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "workspaces": [
         "src/style-spec",
-        "plugins/mapbox-gl-pmtiles-provider",
+        "packages/pmtiles-provider",
         "test/build/vite",
         "test/build/webpack",
         "test/build/typings"
@@ -32903,6 +32908,7 @@
         "earcut": "^3.0.1",
         "geojson-vt": "^4.0.2",
         "gl-matrix": "^3.4.4",
+        "grid-index": "^1.1.0",
         "kdbush": "^4.0.2",
         "martinez-polygon-clipping": "^0.8.1",
         "murmurhash-js": "^1.0.0",
@@ -40497,16 +40503,6 @@
         "dnd-core": "^11.1.3"
       }
     },
-    "node_modules/react-dnd-test-backend": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/react-dnd-test-backend/-/react-dnd-test-backend-11.1.3.tgz",
-      "integrity": "sha512-5qFm+NI2GdWIUfiYun0A8Gv0xjbq0NGOPS+f6z3x/3nTuliApjmqcM1lfTgePoz1FDG47ZofF58N8y96If62+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dnd-core": "^11.1.3"
-      }
-    },
     "node_modules/react-docgen": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-7.1.1.tgz",
@@ -42589,9 +42585,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
-      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -45232,9 +45228,9 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.4.10",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.10.tgz",
-      "integrity": "sha512-vMTlTTtvz5aKZgzOoc7DQ5TzAL2fCzl8JnG1+ZpwjQa/g0xLlwE44yQ+1Cao9ZP1xVv9y5g34IFXEiqGOGFBUA==",
+      "version": "29.4.9",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.9.tgz",
+      "integrity": "sha512-LTb9496gYPMCqjeDLdPrKuXtncudeV1yRZnF4Wo5l3SFi0RYEnYRNgMrFIdg+FHvfzjCyQk1cLncWVqiSX+EvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -45244,7 +45240,7 @@
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.8.0",
+        "semver": "^7.7.4",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
@@ -45445,9 +45441,9 @@
       "license": "0BSD"
     },
     "node_modules/tsx": {
-      "version": "4.22.3",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.3.tgz",
-      "integrity": "sha512-mdoNxBC/cSQObGGVQ5Bpn5i+yv7j68gk3Nfm3wFjcJg3Z0Mix9jzAFfP12prmm5eVGmDKtp0yyArrs0Q+8gZHg==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.0.tgz",
+      "integrity": "sha512-8ccZMPD69s1AbKXx0C5ddTNZfNjwV04iIKgjZmKfKxMynEtSYcK0Lh7iQFh53fI5Yu4pb9usgAiqyPmEONaALg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -48919,7 +48915,7 @@
       "dependencies": {
         "chalk": "^5.6.2",
         "lodash-es": "^4.18.1",
-        "yeoman-generator": "^8.2.2",
+        "yeoman-generator": "^8.1.2",
         "yosay": "^3.0.0"
       },
       "devDependencies": {
@@ -49323,8 +49319,8 @@
         "jed": "^1.1.1",
         "lodash": "^4.18.1",
         "nanoid": "^5.0.9",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "react-loadable": "^5.5.0",
         "tinycolor2": "*"
       }
@@ -49350,9 +49346,9 @@
         "ace-builds": "^1.4.14",
         "brace": "^0.11.1",
         "memoize-one": "^5.1.1",
-        "react": "^18.3.0",
+        "react": "^18.2.0",
         "react-ace": "^10.1.0",
-        "react-dom": "^18.3.0"
+        "react-dom": "^18.2.0"
       }
     },
     "packages/superset-ui-core": {
@@ -49412,7 +49408,7 @@
         "@types/d3-time-format": "^4.0.3",
         "@types/jquery": "^4.0.0",
         "@types/lodash": "^4.17.24",
-        "@types/node": "^25.9.1",
+        "@types/node": "^25.8.0",
         "@types/prop-types": "^15.7.15",
         "@types/react-syntax-highlighter": "^15.5.13",
         "@types/react-table": "^7.7.20",
@@ -49436,8 +49432,8 @@
         "@types/tinycolor2": "*",
         "antd": "^5.26.0",
         "nanoid": "^5.0.9",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "react-loadable": "^5.5.0",
         "tinycolor2": "*"
       }
@@ -49617,7 +49613,7 @@
         "@emotion/react": "^11.4.1",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-calendar/node_modules/d3-array": {
@@ -49678,7 +49674,7 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-country-map/node_modules/d3-array": {
@@ -49706,7 +49702,7 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-horizon/node_modules/d3-array": {
@@ -49740,7 +49736,7 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-parallel-coordinates": {
@@ -49755,7 +49751,7 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-partition": {
@@ -49773,8 +49769,8 @@
         "@superset-ui/core": "*",
         "@testing-library/jest-dom": "*",
         "@testing-library/react": "^14.0.0",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-rose": {
@@ -49791,7 +49787,7 @@
         "@emotion/react": "^11.4.1",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-world-map": {
@@ -49809,7 +49805,7 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-plugin-chart-world-map/node_modules/d3-array": {
@@ -49896,7 +49892,7 @@
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
         "dayjs": "^1.11.19",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/legacy-preset-chart-nvd3/node_modules/dompurify": {
@@ -49933,8 +49929,8 @@
         "@testing-library/react": "^14.0.0",
         "@testing-library/user-event": "*",
         "@types/react": "*",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-ag-grid-table/node_modules/d3-array": {
@@ -49978,8 +49974,8 @@
         "geostyler-wfs-parser": "^3.0.1",
         "ol": "^10.8.0",
         "polished": "*",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-echarts": {
@@ -50001,7 +49997,7 @@
         "dayjs": "^1.11.19",
         "echarts": "*",
         "memoize-one": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/plugin-chart-echarts/node_modules/acorn": {
@@ -50059,9 +50055,9 @@
         "dayjs": "^1.11.19",
         "handlebars": "^4.7.8",
         "lodash": "^4.18.1",
-        "react": "^18.3.0",
+        "react": "^18.2.0",
         "react-ace": "^10.1.0",
-        "react-dom": "^18.3.0"
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-handlebars/node_modules/just-handlebars-helpers": {
@@ -50092,8 +50088,8 @@
         "@superset-ui/core": "*",
         "lodash": "^4.18.1",
         "prop-types": "*",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-point-cluster-map": {
@@ -50102,7 +50098,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@math.gl/web-mercator": "^4.1.0",
-        "mapbox-gl": "^3.24.0",
+        "mapbox-gl": "^3.23.1",
         "maplibre-gl": "^5.24.0",
         "react-map-gl": "^8.1.0",
         "supercluster": "^8.0.1"
@@ -50111,8 +50107,8 @@
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-point-cluster-map/node_modules/react-map-gl": {
@@ -50165,8 +50161,8 @@
         "@testing-library/user-event": "*",
         "@types/react": "*",
         "match-sorter": "^8.2.0",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "plugins/plugin-chart-table/node_modules/d3-array": {
@@ -50205,7 +50201,7 @@
         "@superset-ui/core": "*",
         "@types/lodash": "*",
         "@types/react": "*",
-        "react": "^18.3.0"
+        "react": "^18.2.0"
       }
     },
     "plugins/plugin-chart-word-cloud/node_modules/@types/d3-scale": {
@@ -50274,8 +50270,8 @@
         "@superset-ui/core": "*",
         "dayjs": "^1.11.19",
         "mapbox-gl": ">=1.0.0",
-        "react": "^18.3.0",
-        "react-dom": "^18.3.0"
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       },
       "peerDependenciesMeta": {
         "mapbox-gl": {

superset-frontend/package.json

@@ -190,7 +190,7 @@
     "json-bigint": "^1.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
     "lodash": "^4.18.1",
-    "mapbox-gl": "^3.24.0",
+    "mapbox-gl": "^3.23.1",
     "markdown-to-jsx": "^9.8.0",
     "match-sorter": "^8.3.0",
     "memoize-one": "^5.2.1",
@@ -201,13 +201,13 @@
     "pretty-ms": "^9.3.0",
     "query-string": "9.3.1",
     "re-resizable": "^6.11.2",
-    "react": "^18.3.0",
+    "react": "^18.2.0",
     "react-arborist": "^3.6.1",
     "react-checkbox-tree": "^1.8.0",
     "react-diff-viewer-continued": "^4.2.2",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
-    "react-dom": "^18.3.0",
+    "react-dom": "^18.2.0",
     "react-google-recaptcha": "^3.1.0",
     "react-intersection-observer": "^10.0.3",
     "react-json-tree": "^0.20.0",
@@ -289,9 +289,9 @@
     "@types/js-levenshtein": "^1.1.3",
     "@types/json-bigint": "^1.0.4",
     "@types/mousetrap": "^1.6.15",
-    "@types/node": "^25.9.1",
-    "@types/react": "^18.3.0",
-    "@types/react-dom": "^18.3.0",
+    "@types/node": "^25.8.0",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
     "@types/react-loadable": "^5.5.11",
     "@types/react-redux": "^7.1.10",
     "@types/react-resizable": "^3.0.8",
@@ -304,7 +304,7 @@
     "@types/tinycolor2": "^1.4.3",
     "@types/unzipper": "^0.10.11",
     "@typescript-eslint/eslint-plugin": "^8.59.3",
-    "@typescript-eslint/parser": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.3",
     "babel-jest": "^30.4.1",
     "babel-loader": "^10.1.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -355,7 +355,6 @@
     "prettier": "3.8.3",
     "prettier-plugin-packagejson": "^3.0.2",
     "process": "^0.11.10",
-    "react-dnd-test-backend": "^11.1.3",
     "react-refresh": "^0.18.0",
     "react-resizable": "^3.1.3",
     "redux-mock-store": "^1.5.4",
@@ -366,9 +365,9 @@
     "style-loader": "^4.0.0",
     "swc-loader": "^0.2.7",
     "terser-webpack-plugin": "^5.6.0",
-    "ts-jest": "^29.4.10",
+    "ts-jest": "^29.4.9",
     "tscw-config": "^1.1.2",
-    "tsx": "^4.22.3",
+    "tsx": "^4.22.0",
     "typescript": "5.4.5",
     "unzipper": "^0.12.3",
     "vm-browserify": "^1.1.2",

superset-frontend/packages/generator-superset/package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "chalk": "^5.6.2",
     "lodash-es": "^4.18.1",
-    "yeoman-generator": "^8.2.2",
+    "yeoman-generator": "^8.1.2",
     "yosay": "^3.0.0"
   },
   "devDependencies": {

superset-frontend/packages/superset-core/package.json

@@ -97,8 +97,8 @@
     "@fontsource/ibm-plex-mono": "^5.2.7",
     "@fontsource/inter": "^5.2.6",
     "nanoid": "^5.0.9",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-loadable": "^5.5.0",
     "tinycolor2": "*",
     "lodash": "^4.18.1",

superset-frontend/packages/superset-core/src/utils/logging.test.ts

@@ -16,24 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-type LoggingModule = typeof import('./index');
-
-const loadLogging = (): LoggingModule['logging'] => {
-  let logging: LoggingModule['logging'] | undefined;
-  jest.isolateModules(() => {
-    ({ logging } = jest.requireActual<LoggingModule>(
-      '@apache-superset/core/utils',
-    ));
-  });
-  return logging!;
-};
-
 beforeEach(() => {
+  jest.resetModules();
   jest.resetAllMocks();
 });
 
 test('should pipe to `console` methods', () => {
-  const logging = loadLogging();
+  const { logging } = require('@apache-superset/core/utils');
 
   jest.spyOn(logging, 'debug').mockImplementation();
   jest.spyOn(logging, 'log').mockImplementation();
@@ -61,24 +50,20 @@ test('should pipe to `console` methods', () => {
 });
 
 test('should use noop functions when console unavailable', () => {
-  const originalConsole = window.console;
   Object.assign(window, { console: undefined });
-  try {
-    const logging = loadLogging();
+  const { logging } = require('@apache-superset/core/utils');
 
-    expect(() => {
-      logging.debug();
-      logging.log();
-      logging.info();
-      logging.warn('warn');
-      logging.error('error');
-      logging.trace();
-      logging.table([
-        [1, 2],
-        [3, 4],
-      ]);
-    }).not.toThrow();
-  } finally {
-    Object.assign(window, { console: originalConsole });
-  }
+  expect(() => {
+    logging.debug();
+    logging.log();
+    logging.info();
+    logging.warn('warn');
+    logging.error('error');
+    logging.trace();
+    logging.table([
+      [1, 2],
+      [3, 4],
+    ]);
+  }).not.toThrow();
+  Object.assign(window, { console });
 });

superset-frontend/packages/superset-ui-chart-controls/package.json

@@ -40,9 +40,9 @@
     "ace-builds": "^1.4.14",
     "brace": "^0.11.1",
     "memoize-one": "^5.1.1",
-    "react": "^18.3.0",
+    "react": "^18.2.0",
     "react-ace": "^10.1.0",
-    "react-dom": "^18.3.0"
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/packages/superset-ui-core/package.json

@@ -76,7 +76,7 @@
     "@types/d3-time-format": "^4.0.3",
     "@types/jquery": "^4.0.0",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.8.0",
     "@types/prop-types": "^15.7.15",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/react-table": "^7.7.20",
@@ -100,8 +100,8 @@
     "@types/tinycolor2": "*",
     "antd": "^5.26.0",
     "nanoid": "^5.0.9",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-loadable": "^5.5.0",
     "tinycolor2": "*"
   },

superset-frontend/packages/superset-ui-core/src/components/Avatar/index.tsx

@@ -17,23 +17,15 @@
  * under the License.
  */
 
-import { forwardRef } from 'react';
 import { Avatar as AntdAvatar } from 'antd';
 import type { AvatarProps, GroupProps as AvatarGroupProps } from './types';
 
-export const Avatar = forwardRef<HTMLSpanElement, AvatarProps>((props, ref) => (
-  <AntdAvatar ref={ref} {...props} />
-));
+export function Avatar(props: AvatarProps) {
+  return <AntdAvatar {...props} />;
+}
 
-// antd Avatar.Group is a plain function component without forwardRef; wrap in
-// a span so this component can be a Tooltip / Popover trigger and skip the
-// findDOMNode fallback.
-export const AvatarGroup = forwardRef<HTMLSpanElement, AvatarGroupProps>(
-  (props, ref) => (
-    <span ref={ref}>
-      <AntdAvatar.Group {...props} />
-    </span>
-  ),
-);
+export function AvatarGroup(props: AvatarGroupProps) {
+  return <AntdAvatar.Group {...props} />;
+}
 
 export type { AvatarProps, AvatarGroupProps };

superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Children, ReactElement, Fragment, forwardRef, Ref } from 'react';
+import { Children, ReactElement, Fragment } from 'react';
 import cx from 'classnames';
 import { Button as AntdButton } from 'antd';
 import { useTheme } from '@apache-superset/core/theme';
@@ -100,7 +100,7 @@ const BUTTON_STYLE_MAP: Record<
   link: { type: 'link' },
 };
 
-function ButtonInner(props: ButtonProps, ref: Ref<HTMLElement>) {
+export function Button(props: ButtonProps) {
   const {
     tooltip,
     placement,
@@ -160,7 +160,6 @@ function ButtonInner(props: ButtonProps, ref: Ref<HTMLElement>) {
 
   const button = (
     <AntdButton
-      ref={ref as Ref<HTMLButtonElement & HTMLAnchorElement>}
       href={disabled ? undefined : href}
       disabled={disabled}
       type={antdType}
@@ -236,6 +235,4 @@ function ButtonInner(props: ButtonProps, ref: Ref<HTMLElement>) {
   return button;
 }
 
-export const Button = forwardRef<HTMLElement, ButtonProps>(ButtonInner);
-
 export type { ButtonProps, OnClickHandler };

superset-frontend/packages/superset-ui-core/src/components/DropdownButton/index.tsx

@@ -75,10 +75,7 @@ export const DropdownButton = ({
         id={`${kebabCase(tooltip)}-tooltip`}
         title={tooltip}
       >
-        {/* antd Dropdown.Button is a plain function component without
-            forwardRef; wrap in a span so the Tooltip can attach a ref to a
-            real DOM node and skip the findDOMNode fallback. */}
-        <span>{button}</span>
+        {button}
       </Tooltip>
     );
   }

superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx

@@ -240,10 +240,7 @@ export function EditableTitle({
               t("You don't have the rights to alter this title.")
         }
       >
-        {/* Wrap in span so the Tooltip can attach a ref to a DOM element.
-            antd's Input.TextArea forwards a non-DOM imperative handle, which
-            triggers a React 18 findDOMNode deprecation warning. */}
-        <span>{titleComponent}</span>
+        {titleComponent}
       </Tooltip>
     );
   }

superset-frontend/packages/superset-ui-core/src/components/IconTooltip/index.tsx

@@ -16,54 +16,47 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { forwardRef } from 'react';
 import { Tooltip } from '../Tooltip';
 import { Button } from '../Button';
 import type { IconTooltipProps } from './types';
 
-export const IconTooltip = forwardRef<HTMLElement, IconTooltipProps>(
-  (
-    {
-      children = null,
-      className = '',
-      onClick = () => undefined,
-      placement = 'top',
-      style = {},
-      tooltip = null,
-      mouseEnterDelay = 0.3,
-      mouseLeaveDelay = 0.15,
-    },
-    ref,
-  ) => {
-    const iconTooltip = (
-      <Button
-        ref={ref}
-        onClick={onClick}
-        style={{
-          padding: 0,
-          ...style,
-        }}
-        buttonStyle="link"
-        className={`IconTooltip ${className}`}
+export const IconTooltip = ({
+  children = null,
+  className = '',
+  onClick = () => undefined,
+  placement = 'top',
+  style = {},
+  tooltip = null,
+  mouseEnterDelay = 0.3,
+  mouseLeaveDelay = 0.15,
+}: IconTooltipProps) => {
+  const iconTooltip = (
+    <Button
+      onClick={onClick}
+      style={{
+        padding: 0,
+        ...style,
+      }}
+      buttonStyle="link"
+      className={`IconTooltip ${className}`}
+    >
+      {children}
+    </Button>
+  );
+  if (tooltip) {
+    return (
+      <Tooltip
+        id="tooltip"
+        title={tooltip}
+        placement={placement}
+        mouseEnterDelay={mouseEnterDelay}
+        mouseLeaveDelay={mouseLeaveDelay}
       >
-        {children}
-      </Button>
+        {iconTooltip}
+      </Tooltip>
     );
-    if (tooltip) {
-      return (
-        <Tooltip
-          id="tooltip"
-          title={tooltip}
-          placement={placement}
-          mouseEnterDelay={mouseEnterDelay}
-          mouseLeaveDelay={mouseLeaveDelay}
-        >
-          {iconTooltip}
-        </Tooltip>
-      );
-    }
-    return iconTooltip;
-  },
-);
+  }
+  return iconTooltip;
+};
 
 export type { IconTooltipProps };

superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx

@@ -165,7 +165,7 @@ import {
   SlackOutlined,
   ApiOutlined,
 } from '@ant-design/icons';
-import { ForwardRefExoticComponent, RefAttributes, forwardRef } from 'react';
+import { FC } from 'react';
 import { IconType } from './types';
 import { BaseIconComponent } from './BaseIcon';
 
@@ -323,25 +323,19 @@ type AntdIconNames = keyof typeof AntdIcons;
 
 export const antdEnhancedIcons: Record<
   AntdIconNames,
-  ForwardRefExoticComponent<IconType & RefAttributes<HTMLSpanElement>>
+  FC<IconType>
 > = Object.keys(AntdIcons)
   .filter(key => !EXCLUDED_ICONS.some(excluded => key.includes(excluded)))
   .reduce(
     (acc, key) => {
-      acc[key as AntdIconNames] = forwardRef<HTMLSpanElement, IconType>(
-        (props, ref) => (
-          <BaseIconComponent
-            ref={ref}
-            component={AntdIcons[key as AntdIconNames]}
-            fileName={key}
-            {...props}
-          />
-        ),
+      acc[key as AntdIconNames] = (props: IconType) => (
+        <BaseIconComponent
+          component={AntdIcons[key as AntdIconNames]}
+          fileName={key}
+          {...props}
+        />
       );
       return acc;
     },
-    {} as Record<
-      AntdIconNames,
-      ForwardRefExoticComponent<IconType & RefAttributes<HTMLSpanElement>>
-    >,
+    {} as Record<AntdIconNames, FC<IconType>>,
   );

superset-frontend/packages/superset-ui-core/src/components/Icons/AsyncIcon.tsx

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { FC, SVGProps, forwardRef, useEffect, useRef, useState } from 'react';
+import { FC, SVGProps, useEffect, useRef, useState } from 'react';
 import TransparentIcon from './svgs/transparent.svg';
 import { IconType } from './types';
 import { BaseIconComponent } from './BaseIcon';
 
-const AsyncIcon = forwardRef<HTMLSpanElement, IconType>((props, ref) => {
+const AsyncIcon = (props: IconType) => {
   const [, setLoaded] = useState(false);
   const ImportedSVG = useRef<FC<SVGProps<SVGSVGElement>>>();
   const { fileName, customIcons, iconSize, iconColor, viewBox, ...restProps } =
@@ -46,7 +46,6 @@ const AsyncIcon = forwardRef<HTMLSpanElement, IconType>((props, ref) => {
 
   return (
     <BaseIconComponent
-      ref={ref}
       component={ImportedSVG.current || TransparentIcon}
       fileName={fileName}
       customIcons={customIcons}
@@ -56,6 +55,6 @@ const AsyncIcon = forwardRef<HTMLSpanElement, IconType>((props, ref) => {
       {...restProps}
     />
   );
-});
+};
 
 export default AsyncIcon;

superset-frontend/packages/superset-ui-core/src/components/Icons/BaseIcon.tsx

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { forwardRef, type ComponentType } from 'react';
 import { css, useTheme, getFontSize } from '@apache-superset/core/theme';
 import { AntdIconType, BaseIconProps, CustomIconType, IconType } from './types';
 
@@ -36,78 +35,65 @@ const genAriaLabel = (fileName: string) => {
   return name.toLowerCase();
 };
 
-export const BaseIconComponent = forwardRef<
-  HTMLSpanElement | SVGSVGElement,
+export const BaseIconComponent: React.FC<
   BaseIconProps & Omit<IconType, 'component'>
->(
-  (
-    {
-      component: Component,
-      iconColor,
-      iconSize,
-      viewBox,
-      customIcons,
-      fileName,
-      ...rest
-    },
-    ref,
-  ) => {
-    const theme = useTheme();
-    const whatRole = rest?.onClick ? 'button' : 'img';
-    const ariaLabel = genAriaLabel(fileName || '');
-    const style = {
-      color: iconColor,
-      fontSize: iconSize
-        ? `${getFontSize(theme, iconSize)}px`
-        : `${theme.fontSize}px`,
-      cursor: rest?.onClick ? 'pointer' : undefined,
-    };
+> = ({
+  component: Component,
+  iconColor,
+  iconSize,
+  viewBox,
+  customIcons,
+  fileName,
+  ...rest
+}) => {
+  const theme = useTheme();
+  const whatRole = rest?.onClick ? 'button' : 'img';
+  const ariaLabel = genAriaLabel(fileName || '');
+  const style = {
+    color: iconColor,
+    fontSize: iconSize
+      ? `${getFontSize(theme, iconSize)}px`
+      : `${theme.fontSize}px`,
+    cursor: rest?.onClick ? 'pointer' : undefined,
+  };
 
-    const AntdComponent = Component as ComponentType<
-      Record<string, unknown> & {
-        ref?: React.Ref<HTMLSpanElement | SVGSVGElement>;
-      }
-    >;
-    return customIcons ? (
-      <span
-        ref={ref as React.Ref<HTMLSpanElement>}
-        role={whatRole}
-        aria-label={ariaLabel}
-        data-test={ariaLabel}
-        css={[
-          css`
-            display: inline-flex;
-            align-items: center;
-            line-height: 0;
-            vertical-align: middle;
-          `,
-        ]}
-      >
-        <Component
-          viewBox={viewBox || '0 0 24 24'}
-          style={style}
-          width={
-            iconSize
-              ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
-              : `${theme.fontSize}px`
-          }
-          height={
-            iconSize
-              ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
-              : `${theme.fontSize}px`
-          }
-          {...(rest as CustomIconType)}
-        />
-      </span>
-    ) : (
-      <AntdComponent
-        ref={ref}
-        role={whatRole}
+  return customIcons ? (
+    <span
+      role={whatRole}
+      aria-label={ariaLabel}
+      data-test={ariaLabel}
+      css={[
+        css`
+          display: inline-flex;
+          align-items: center;
+          line-height: 0;
+          vertical-align: middle;
+        `,
+      ]}
+    >
+      <Component
+        viewBox={viewBox || '0 0 24 24'}
         style={style}
-        aria-label={ariaLabel}
-        data-test={ariaLabel}
-        {...(rest as AntdIconType)}
+        width={
+          iconSize
+            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
+            : `${theme.fontSize}px`
+        }
+        height={
+          iconSize
+            ? `${getFontSize(theme, iconSize) || theme.fontSize}px`
+            : `${theme.fontSize}px`
+        }
+        {...(rest as CustomIconType)}
       />
-    );
-  },
-);
+    </span>
+  ) : (
+    <Component
+      role={whatRole}
+      style={style}
+      aria-label={ariaLabel}
+      data-test={ariaLabel}
+      {...(rest as AntdIconType)}
+    />
+  );
+};

superset-frontend/packages/superset-ui-core/src/components/Icons/index.tsx

@@ -17,16 +17,12 @@
  * under the License.
  */
 
-import { ForwardRefExoticComponent, RefAttributes, forwardRef } from 'react';
+import { FC } from 'react';
 import { antdEnhancedIcons } from './AntdEnhanced';
 import AsyncIcon from './AsyncIcon';
 
 import type { IconType } from './types';
 
-type IconComponent = ForwardRefExoticComponent<
-  IconType & RefAttributes<HTMLSpanElement>
->;
-
 /**
  * Filename is going to be inferred from the icon name.
  * i.e. BigNumberChartTile => assets/images/icons/big_number_chart_tile
@@ -62,17 +58,15 @@ const customIcons = [
   'Undo',
 ] as const;
 
-type CustomIconType = Record<(typeof customIcons)[number], IconComponent>;
+type CustomIconType = Record<(typeof customIcons)[number], FC<IconType>>;
 
 const iconOverrides: CustomIconType = {} as CustomIconType;
 customIcons.forEach(customIcon => {
   const fileName = customIcon
     .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
     .toLowerCase();
-  iconOverrides[customIcon] = forwardRef<HTMLSpanElement, IconType>(
-    (props, ref) => (
-      <AsyncIcon ref={ref} customIcons fileName={fileName} {...props} />
-    ),
+  iconOverrides[customIcon] = (props: IconType) => (
+    <AsyncIcon customIcons fileName={fileName} {...props} />
   );
 });
 
@@ -80,7 +74,7 @@ export type IconNameType =
   | keyof typeof antdEnhancedIcons
   | keyof typeof iconOverrides;
 
-type IconComponentType = Record<IconNameType, IconComponent>;
+type IconComponentType = Record<IconNameType, FC<IconType>>;
 
 export const Icons: IconComponentType = {
   ...antdEnhancedIcons,

superset-frontend/packages/superset-ui-core/src/components/Label/index.tsx

@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { forwardRef } from 'react';
 import { Tag } from '@superset-ui/core/components/Tag';
 import { css } from '@emotion/react';
 import { useTheme, getColorVariants } from '@apache-superset/core/theme';
@@ -24,7 +23,7 @@ import { DatasetTypeLabel } from './reusable/DatasetTypeLabel';
 import { PublishedLabel } from './reusable/PublishedLabel';
 import type { LabelProps } from './types';
 
-export const Label = forwardRef<HTMLSpanElement, LabelProps>((props, ref) => {
+export function Label(props: LabelProps) {
   const theme = useTheme();
   // Use Ant Design's motion duration instead of deprecated transitionTiming
   const {
@@ -72,7 +71,6 @@ export const Label = forwardRef<HTMLSpanElement, LabelProps>((props, ref) => {
 
   return (
     <Tag
-      ref={ref}
       onClick={onClick}
       role={onClick ? 'button' : undefined}
       style={style}
@@ -83,6 +81,6 @@ export const Label = forwardRef<HTMLSpanElement, LabelProps>((props, ref) => {
       {children}
     </Tag>
   );
-});
+}
 export { DatasetTypeLabel, PublishedLabel };
 export type { LabelType } from './types';

superset-frontend/packages/superset-ui-core/src/components/Modal/Modal.tsx

@@ -357,9 +357,6 @@ const CustomModal = ({
             disabled={!draggable || dragDisabled}
             bounds={bounds}
             onStart={(event, uiData) => onDragStart(event, uiData)}
-            // Pass nodeRef so react-draggable does not fall back to
-            // ReactDOM.findDOMNode (deprecated in React 18+ Strict Mode).
-            nodeRef={draggableRef}
             {...draggableConfig}
           >
             {resizable ? (

superset-frontend/packages/superset-ui-core/src/components/Popover/index.tsx

@@ -16,15 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { forwardRef } from 'react';
 import { Popover as AntdPopover } from 'antd';
 import { PopoverProps as AntdPopoverProps } from 'antd/es/popover';
-import type { TooltipRef } from 'antd/es/tooltip';
 
 export interface PopoverProps extends AntdPopoverProps {
   forceRender?: boolean;
 }
 
-export const Popover = forwardRef<TooltipRef, PopoverProps>((props, ref) => (
-  <AntdPopover ref={ref} {...props} />
-));
+export const Popover = (props: PopoverProps) => <AntdPopover {...props} />;

superset-frontend/packages/superset-ui-core/src/components/RefreshLabel/index.tsx

@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { MouseEventHandler } from 'react';
+import { MouseEventHandler, forwardRef } from 'react';
 import { SupersetTheme } from '@apache-superset/core/theme';
 import { Icons } from '@superset-ui/core/components/Icons';
+import type { IconType } from '@superset-ui/core/components/Icons/types';
 import { Tooltip } from '../Tooltip';
 
 export interface RefreshLabelProps {
@@ -31,19 +32,25 @@ const RefreshLabel = ({
   onClick,
   tooltipContent,
   disabled,
-}: RefreshLabelProps) => (
-  <Tooltip title={tooltipContent}>
-    <Icons.SyncOutlined
-      iconSize="l"
-      role="button"
-      onClick={disabled ? undefined : onClick}
-      css={(theme: SupersetTheme) => ({
-        cursor: 'pointer',
-        color: theme.colorIcon,
-        '&:hover': { color: theme.colorPrimary },
-      })}
-    />
-  </Tooltip>
-);
+}: RefreshLabelProps) => {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const IconWithoutRef = forwardRef((props: IconType, ref: any) => (
+    <Icons.SyncOutlined iconSize="l" {...props} />
+  ));
+
+  return (
+    <Tooltip title={tooltipContent}>
+      <IconWithoutRef
+        role="button"
+        onClick={disabled ? undefined : onClick}
+        css={(theme: SupersetTheme) => ({
+          cursor: 'pointer',
+          color: theme.colorIcon,
+          '&:hover': { color: theme.colorPrimary },
+        })}
+      />
+    </Tooltip>
+  );
+};
 
 export default RefreshLabel;

superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.test.tsx

@@ -897,6 +897,477 @@ test('fires onChange when pasting a selection', async () => {
   await waitFor(() => expect(onChange).toHaveBeenCalledTimes(1));
 });
 
+test('replaces cached options with search results instead of merging', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const searchData = [{ label: 'Search Match', value: 100 }];
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      return { data: page0Data, totalCount: 100 };
+    }
+    return { data: searchData, totalCount: 1 };
+  });
+
+  render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  let options = await findAllSelectOptions();
+  expect(options).toHaveLength(10);
+
+  await type('search');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
+
+  options = await findAllSelectOptions();
+  expect(options).toHaveLength(1);
+  expect(options[0]).toHaveTextContent('Search Match');
+});
+
+test('shows all options when filterOption is false', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Base ${i}`,
+    value: i,
+  }));
+  const searchData = Array.from({ length: 5 }, (_, i) => ({
+    label: `Server ${i}`,
+    value: 100 + i,
+  }));
+  const loadOptions = jest.fn(async (search: string) =>
+    search === ''
+      ? { data: page0Data, totalCount: 100 }
+      : { data: searchData, totalCount: 5 },
+  );
+
+  render(
+    <AsyncSelect
+      {...defaultProps}
+      options={loadOptions}
+      filterOption={false}
+    />,
+  );
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  await type('zzz_no_match');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
+
+  const options = await findAllSelectOptions();
+  expect(options).toHaveLength(5);
+  expect(options[0]).toHaveTextContent('Server 0');
+});
+
+test('preserves new option entry across search fetch when allowNewOptions is on', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      return { data: page0Data, totalCount: 100 };
+    }
+    return { data: [], totalCount: 0 };
+  });
+
+  render(
+    <AsyncSelect {...defaultProps} options={loadOptions} allowNewOptions />,
+  );
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  await type('newval');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
+
+  const options = await findAllSelectOptions();
+  expect(options).toHaveLength(1);
+  expect(options[0]).toHaveTextContent('newval');
+  // Stale page-0 options must not bleed through.
+  expect(screen.queryByText('Option 0')).not.toBeInTheDocument();
+});
+
+test('restores base options when search is cleared', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const searchData = [{ label: 'Search Match', value: 100 }];
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      return { data: page0Data, totalCount: 100 };
+    }
+    return { data: searchData, totalCount: 1 };
+  });
+
+  render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  await type('search');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(2));
+  let options = await findAllSelectOptions();
+  expect(options).toHaveLength(1);
+  expect(options[0]).toHaveTextContent('Search Match');
+
+  // type() clears the input before typing, so passing '' clears the search.
+  await type('');
+  await waitFor(async () => {
+    options = await findAllSelectOptions();
+    expect(options).toHaveLength(10);
+  });
+  expect(options[0]).toHaveTextContent('Option 0');
+  expect(screen.queryByText('Search Match')).not.toBeInTheDocument();
+});
+
+test('replaces results when switching between two searches', async () => {
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      return { data: page0Data, totalCount: 100 };
+    }
+    return {
+      data: [{ label: `Match-${search}`, value: `v-${search}` }],
+      totalCount: 1,
+    };
+  });
+
+  render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledTimes(1));
+
+  await type('alpha');
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-alpha');
+  });
+
+  await type('beta');
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-beta');
+  });
+  expect(screen.queryByText('Match-alpha')).not.toBeInTheDocument();
+});
+
+test('refetches a dropped search response when the same search is repeated', async () => {
+  type OptionRow = { label: string; value: string | number };
+  type PageResponse = { data: OptionRow[]; totalCount: number };
+  // Resolves the in-flight loadOptions promise of the calling test.
+  let resolveAlpha: ((value: PageResponse) => void) | null = null;
+  const page0Data: OptionRow[] = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const alphaData: OptionRow[] = [{ label: 'Match-alpha', value: 'va' }];
+  const betaData: OptionRow[] = [{ label: 'Match-beta', value: 'vb' }];
+
+  const loadOptions = jest.fn((search: string) => {
+    if (search === '') {
+      return Promise.resolve<PageResponse>({
+        data: page0Data,
+        totalCount: 100,
+      });
+    }
+    if (search === 'alpha') {
+      // First call: hold the promise so it resolves only after beta returns.
+      // Second call (after beta): resolve immediately so the cache MUST allow
+      // a refetch.
+      if (!resolveAlpha) {
+        return new Promise<PageResponse>(resolve => {
+          resolveAlpha = resolve;
+        });
+      }
+      return Promise.resolve<PageResponse>({ data: alphaData, totalCount: 1 });
+    }
+    return Promise.resolve<PageResponse>({ data: betaData, totalCount: 1 });
+  });
+
+  render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledWith('', 0, 10));
+
+  await type('alpha');
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledWith('alpha', 0, 10));
+  // alpha's promise is held; switch to beta which resolves first.
+  await type('beta');
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-beta');
+  });
+
+  // Release the stale alpha response. It must be dropped — its key must not
+  // be cached, or returning to "alpha" later would short-circuit the fetch.
+  resolveAlpha!({ data: alphaData, totalCount: 1 });
+  await waitFor(async () => {
+    // Beta is still showing because alpha's response was dropped.
+    const options = await findAllSelectOptions();
+    expect(options[0]).toHaveTextContent('Match-beta');
+  });
+
+  // Returning to "alpha" must re-trigger the fetch (cache wasn't poisoned).
+  const callsBeforeAlphaReturn = loadOptions.mock.calls.filter(
+    args => args[0] === 'alpha',
+  ).length;
+  await type('alpha');
+  await waitFor(() => {
+    const callsAfter = loadOptions.mock.calls.filter(
+      args => args[0] === 'alpha',
+    ).length;
+    expect(callsAfter).toBeGreaterThan(callsBeforeAlphaReturn);
+  });
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options[0]).toHaveTextContent('Match-alpha');
+  });
+});
+
+test('keeps loading indicator while a newer request is in flight after a stale response is dropped', async () => {
+  // Regression for the P2 race: the `.finally` block that clears isLoading
+  // must not fire when a stale (dropped) response resolves while a newer
+  // request is still in flight. Otherwise the spinner disappears mid-search
+  // and the undebounced scroll-pagination handler can fire against stale
+  // totalCount before page 0 of the active search lands.
+  type OptionRow = { label: string; value: string | number };
+  type PageResponse = { data: OptionRow[]; totalCount: number };
+  // Initialized to no-op so the finally block can always call them, even if
+  // an assertion in the try throws before the corresponding mock ran.
+  let resolveAlpha: (value: PageResponse) => void = () => {};
+  let resolveBeta: (value: PageResponse) => void = () => {};
+  const page0Data: OptionRow[] = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const alphaData: OptionRow[] = [{ label: 'Match-alpha', value: 'va' }];
+  const betaData: OptionRow[] = [{ label: 'Match-beta', value: 'vb' }];
+
+  const loadOptions = jest.fn((search: string) => {
+    if (search === '') {
+      return Promise.resolve<PageResponse>({
+        data: page0Data,
+        totalCount: 100,
+      });
+    }
+    if (search === 'alpha') {
+      return new Promise<PageResponse>(resolve => {
+        resolveAlpha = resolve;
+      });
+    }
+    return new Promise<PageResponse>(resolve => {
+      resolveBeta = resolve;
+    });
+  });
+
+  const isSpinnerVisible = () =>
+    Boolean(document.querySelector('.ant-select-arrow .ant-spin'));
+
+  try {
+    render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+    await open();
+    await waitFor(() => expect(loadOptions).toHaveBeenCalledWith('', 0, 10));
+
+    // Type 'alpha' — alpha fetch is held, loading should be true.
+    await type('alpha');
+    await waitFor(() =>
+      expect(loadOptions).toHaveBeenCalledWith('alpha', 0, 10),
+    );
+    await waitFor(() => expect(isSpinnerVisible()).toBe(true));
+
+    // Type 'beta' — beta fetch is also held; both are in flight.
+    await type('beta');
+    await waitFor(() =>
+      expect(loadOptions).toHaveBeenCalledWith('beta', 0, 10),
+    );
+    expect(isSpinnerVisible()).toBe(true);
+
+    // Release the stale alpha response. It is dropped at the early-return
+    // (search !== inputValueRef.current), but the in-flight counter is still
+    // non-zero because beta is pending — spinner must stay visible.
+    resolveAlpha({ data: alphaData, totalCount: 1 });
+    // Yield a microtask so alpha's .then/.finally runs, then re-assert.
+    await Promise.resolve();
+    expect(isSpinnerVisible()).toBe(true);
+
+    // Release beta. Now the in-flight counter drops to 0 and the spinner
+    // clears.
+    resolveBeta({ data: betaData, totalCount: 1 });
+    await waitFor(() => expect(isSpinnerVisible()).toBe(false));
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-beta');
+  } finally {
+    // Defensive: never leave a held promise that could hang a parallel worker
+    // if an assertion above threw. Promise resolve is idempotent.
+    resolveAlpha({ data: alphaData, totalCount: 1 });
+    resolveBeta({ data: betaData, totalCount: 1 });
+  }
+});
+
+test('re-shows search results when the same search term is repeated after a clear', async () => {
+  // Regression: a prior fix cached search responses' totalCount in
+  // fetchedQueries. After restore-on-clear had replaced selectOptions with
+  // the base list, re-typing a previously-resolved term would hit the cache
+  // short-circuit and leave selectOptions stale (empty / base-only).
+  const page0Data = Array.from({ length: 10 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  const alphaData = [{ label: 'Match-alpha', value: 'va' }];
+  const loadOptions = jest.fn(async (search: string) => {
+    if (search === '') {
+      // totalCount > data.length so allValuesLoaded stays false and the
+      // search path is not bypassed by the "all loaded" short-circuit.
+      return { data: page0Data, totalCount: 100 };
+    }
+    return { data: alphaData, totalCount: 1 };
+  });
+
+  render(<AsyncSelect {...defaultProps} options={loadOptions} />);
+  await open();
+  await waitFor(() => expect(loadOptions).toHaveBeenCalledWith('', 0, 10));
+
+  await type('alpha');
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-alpha');
+  });
+
+  await type('');
+  await waitFor(() =>
+    expect(screen.queryByText('Match-alpha')).not.toBeInTheDocument(),
+  );
+
+  const callsBefore = loadOptions.mock.calls.filter(
+    args => args[0] === 'alpha',
+  ).length;
+  await type('alpha');
+  await waitFor(() => {
+    const callsAfter = loadOptions.mock.calls.filter(
+      args => args[0] === 'alpha',
+    ).length;
+    expect(callsAfter).toBeGreaterThan(callsBefore);
+  });
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Match-alpha');
+  });
+});
+
+test('appends page>1 results during an active search and discards them when search changes', async () => {
+  // Covers the production branch `else { mergeData(data) }` in fetchPage that
+  // fires when search is non-empty AND page > 0 — i.e. user scrolled within
+  // a multi-page search result. Switching to a new search must replace, not
+  // retain, the prior search's accumulated pages.
+  type OptionRow = { label: string; value: string | number };
+  const pageSize = 5;
+  const aliceData: OptionRow[] = Array.from({ length: 5 }, (_, i) => ({
+    label: `Alice-${i}`,
+    value: `a${i}`,
+  }));
+  const alicePage1: OptionRow[] = Array.from({ length: 3 }, (_, i) => ({
+    label: `Alice-${i + 5}`,
+    value: `a${i + 5}`,
+  }));
+  const bobData: OptionRow[] = [{ label: 'Bob-0', value: 'b0' }];
+
+  const loadOptions = jest.fn(
+    async (search: string, page: number): Promise<{
+      data: OptionRow[];
+      totalCount: number;
+    }> => {
+      if (search === '') {
+        return { data: [], totalCount: 100 };
+      }
+      if (search === 'alice') {
+        if (page === 0) return { data: aliceData, totalCount: 8 };
+        return { data: alicePage1, totalCount: 8 };
+      }
+      return { data: bobData, totalCount: 1 };
+    },
+  );
+
+  render(
+    <AsyncSelect
+      {...defaultProps}
+      pageSize={pageSize}
+      options={loadOptions}
+    />,
+  );
+  await open();
+
+  await type('alice');
+  await waitFor(() =>
+    expect(loadOptions).toHaveBeenCalledWith('alice', 0, pageSize),
+  );
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(5);
+  });
+  // Wait for loading to finish so handlePagination's `!isLoading` gate is
+  // open before we fire scroll.
+  await waitFor(() =>
+    expect(document.querySelector('.ant-select-arrow .ant-spin')).toBeNull(),
+  );
+
+  // Trigger pagination by dispatching a scroll event on the virtual-list
+  // scroll container. jsdom returns 0 for layout properties by default, so
+  // override the relevant ones before firing scroll. rc-virtual-list reads
+  // scrollTop via e.currentTarget in its onFallbackScroll handler, which
+  // then forwards to onPopupScroll (handlePagination here).
+  const holder = document.querySelector(
+    '.rc-virtual-list-holder',
+  ) as HTMLElement | null;
+  if (!holder) throw new Error('virtual-list holder not rendered');
+  Object.defineProperty(holder, 'scrollHeight', {
+    configurable: true,
+    get: () => 1000,
+  });
+  Object.defineProperty(holder, 'offsetHeight', {
+    configurable: true,
+    get: () => 200,
+  });
+  Object.defineProperty(holder, 'clientHeight', {
+    configurable: true,
+    get: () => 200,
+  });
+  Object.defineProperty(holder, 'scrollTop', {
+    configurable: true,
+    get: () => 900,
+    set: () => {},
+  });
+  fireEvent.scroll(holder);
+
+  await waitFor(() =>
+    expect(loadOptions).toHaveBeenCalledWith('alice', 1, pageSize),
+  );
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    // Page 0 (5) + page 1 (3) merged
+    expect(options).toHaveLength(8);
+  });
+
+  // Switching to a new search must replace the accumulated pages, not retain
+  // them.
+  await type('bob');
+  await waitFor(() =>
+    expect(loadOptions).toHaveBeenCalledWith('bob', 0, pageSize),
+  );
+  await waitFor(async () => {
+    const options = await findAllSelectOptions();
+    expect(options).toHaveLength(1);
+    expect(options[0]).toHaveTextContent('Bob-0');
+  });
+  expect(screen.queryByText('Alice-0')).not.toBeInTheDocument();
+  expect(screen.queryByText('Alice-7')).not.toBeInTheDocument();
+});
+
 test('does not duplicate options when using numeric values', async () => {
   render(
     <AsyncSelect

superset-frontend/packages/superset-ui-core/src/components/Select/AsyncSelect.tsx

@@ -160,6 +160,13 @@ const AsyncSelect = forwardRef(
     const [allValuesLoaded, setAllValuesLoaded] = useState(false);
     const selectValueRef = useRef(selectValue);
     const fetchedQueries = useRef(new Map<string, number>());
+    const initialOptionsRef = useRef<SelectOptionsType>(EMPTY_OPTIONS);
+    const inputValueRef = useRef('');
+    // Counts fetches whose `.finally` has not yet run. Loading is cleared only
+    // when this drops to 0, so a stale response (which returns early without
+    // updating selectOptions) cannot flip the spinner off while a newer
+    // request is still pending.
+    const inFlightFetchesRef = useRef(0);
     const mappedMode = isSingleMode ? undefined : 'multiple';
     const allowFetch = !fetchOnlyOnSearch || inputValue;
     const [maxTagCount, setMaxTagCount] = useState(
@@ -183,6 +190,10 @@ const AsyncSelect = forwardRef(
       selectValueRef.current = selectValue;
     }, [selectValue]);
 
+    useEffect(() => {
+      inputValueRef.current = inputValue;
+    }, [inputValue]);
+
     const sortSelectedFirst = useCallback(
       (a: AntdLabeledValue, b: AntdLabeledValue) =>
         sortSelectedFirstHelper(a, b, selectValueRef.current),
@@ -333,22 +344,75 @@ const AsyncSelect = forwardRef(
         setIsLoading(true);
 
         const fetchOptions = options as SelectOptionsPagePromise;
+        inFlightFetchesRef.current += 1;
         fetchOptions(search, page, pageSize)
           .then(({ data, totalCount }: SelectOptionsTypePage) => {
-            const mergedData = mergeData(data);
-            fetchedQueries.current.set(key, totalCount);
-            setTotalCount(totalCount);
-            if (
-              !fetchOnlyOnSearch &&
-              search === '' &&
-              mergedData.length >= totalCount
-            ) {
-              setAllValuesLoaded(true);
+            // Drop responses whose search arg no longer matches the user's
+            // current input — otherwise a slow base fetch can land after a
+            // search fetch (or a stale debounced search after a clear) and
+            // re-pollute the dropdown via mergeData / search-replace. Search
+            // responses are never cached in fetchedQueries: the cache stores
+            // only totalCount, so a cache hit would short-circuit the fetch
+            // and leave selectOptions stale (e.g. after restore-on-clear).
+            // Re-issuing the search is cheap and correct.
+            const matchesCurrentSearch = inputValueRef.current === search;
+            if (search && !matchesCurrentSearch) {
+              return;
+            }
+            if (!search) {
+              // Accumulate base pages in a ref independent of selectOptions
+              // (during an active search, selectOptions holds search results
+              // and is not a safe accumulator). The accumulator is kept up
+              // to date even when this response landed during a search, so
+              // restore-on-clear has a complete snapshot.
+              const dataValues = new Set(data.map(opt => opt.value));
+              const accumulated = initialOptionsRef.current
+                .filter(opt => !dataValues.has(opt.value))
+                .concat(data)
+                .sort(sortComparatorForNoSearch);
+              initialOptionsRef.current = accumulated;
+              if (!fetchOnlyOnSearch && accumulated.length >= totalCount) {
+                setAllValuesLoaded(true);
+              }
+              fetchedQueries.current.set(key, totalCount);
+              if (matchesCurrentSearch) {
+                // No active search — push to live selectOptions and update
+                // totalCount. When matchesCurrentSearch is false, the user
+                // is mid-search; leave the search's totalCount in place so
+                // pagination math stays correct.
+                mergeData(data);
+                setTotalCount(totalCount);
+              }
+            } else if (page === 0) {
+              // Replace cached options with server results; preserve
+              // optimistic isNewOption entries inserted by handleOnSearch
+              // so allowNewOptions users can still click the value they
+              // typed when the server returns no match.
+              setSelectOptions(prevOptions => {
+                const dataValues = new Set(data.map(opt => opt.value));
+                const preservedNew = prevOptions.filter(
+                  opt => opt.isNewOption && !dataValues.has(opt.value),
+                );
+                return preservedNew
+                  .concat(data)
+                  .sort(sortComparatorForNoSearch);
+              });
+              setTotalCount(totalCount);
+            } else {
+              // page > 0 during an active search — append normally.
+              mergeData(data);
+              setTotalCount(totalCount);
             }
           })
           .catch(internalOnError)
           .finally(() => {
-            setIsLoading(false);
+            inFlightFetchesRef.current = Math.max(
+              0,
+              inFlightFetchesRef.current - 1,
+            );
+            if (inFlightFetchesRef.current === 0) {
+              setIsLoading(false);
+            }
           });
       },
       [
@@ -358,6 +422,7 @@ const AsyncSelect = forwardRef(
         internalOnError,
         options,
         pageSize,
+        sortComparatorForNoSearch,
       ],
     );
 
@@ -500,6 +565,7 @@ const AsyncSelect = forwardRef(
       fetchedQueries.current.clear();
       setAllValuesLoaded(false);
       setSelectOptions(EMPTY_OPTIONS);
+      initialOptionsRef.current = EMPTY_OPTIONS;
     }, [options]);
 
     useEffect(() => {
@@ -514,16 +580,36 @@ const AsyncSelect = forwardRef(
       [debouncedFetchPage],
     );
 
+    const previousInputValue = usePrevious(inputValue, '');
     useEffect(() => {
       if (loadingEnabled && allowFetch) {
         // trigger fetch every time inputValue changes
         if (inputValue) {
           debouncedFetchPage(inputValue, 0);
         } else {
+          // Cancel any pending debounced search fetch so it can't fire after
+          // we've already restored the base list.
+          debouncedFetchPage.cancel();
+          // On returning to empty input after a search, restore the cached
+          // base options so the dropdown shows the original page-0 list
+          // instead of the stale search results.
+          if (previousInputValue && initialOptionsRef.current.length > 0) {
+            setSelectOptions(
+              [...initialOptionsRef.current].sort(sortComparatorForNoSearch),
+            );
+          }
           fetchPage('', 0);
         }
       }
-    }, [loadingEnabled, fetchPage, allowFetch, inputValue, debouncedFetchPage]);
+    }, [
+      loadingEnabled,
+      fetchPage,
+      allowFetch,
+      inputValue,
+      previousInputValue,
+      debouncedFetchPage,
+      sortComparatorForNoSearch,
+    ]);
 
     useEffect(() => {
       if (loading !== undefined && loading !== isLoading) {
@@ -531,7 +617,11 @@ const AsyncSelect = forwardRef(
       }
     }, [isLoading, loading]);
 
-    const clearCache = () => fetchedQueries.current.clear();
+    const clearCache = () => {
+      fetchedQueries.current.clear();
+      initialOptionsRef.current = EMPTY_OPTIONS;
+      setAllValuesLoaded(false);
+    };
 
     useImperativeHandle(
       ref,

superset-frontend/packages/superset-ui-core/src/components/Select/utils.tsx

@@ -211,6 +211,10 @@ export const handleFilterOptionHelper = (
     return filterOption(search, option);
   }
 
+  if (filterOption === false) {
+    return true;
+  }
+
   if (filterOption) {
     const searchValue = search.trim().toLowerCase();
     if (optionFilterProps?.length) {

superset-frontend/packages/superset-ui-core/src/components/Tooltip/index.tsx

@@ -16,22 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { forwardRef } from 'react';
 import { Tooltip as AntdTooltip } from 'antd';
-import type { TooltipRef } from 'antd/es/tooltip';
 
 import type { TooltipProps, TooltipPlacement } from './types';
 
-export const Tooltip = forwardRef<TooltipRef, TooltipProps>(
-  ({ overlayStyle, ...props }, ref) => (
-    <AntdTooltip
-      ref={ref}
-      styles={{
-        body: { overflow: 'hidden', textOverflow: 'ellipsis' },
-        root: overlayStyle ?? {},
-      }}
-      {...props}
-    />
-  ),
+export const Tooltip = ({ overlayStyle, ...props }: TooltipProps) => (
+  <AntdTooltip
+    styles={{
+      body: { overflow: 'hidden', textOverflow: 'ellipsis' },
+      root: overlayStyle ?? {},
+    }}
+    {...props}
+  />
 );
 export type { TooltipProps, TooltipPlacement };

superset-frontend/packages/superset-ui-core/src/connection/callApi/parseResponse.ts

@@ -63,8 +63,7 @@ export default async function parseResponse<T extends ParseMethod = 'json'>(
           (value?.isGreaterThan?.(Number.MAX_SAFE_INTEGER) ||
             value?.isLessThan?.(Number.MIN_SAFE_INTEGER))
         ) {
-          // toFixed() avoids scientific notation, which BigInt() rejects.
-          return BigInt(value.toFixed());
+          return BigInt(value);
         }
         // // `json-bigint` could not handle floats well, see sidorares/json-bigint#62
         // // TODO: clean up after json-bigint>1.0.1 is released

superset-frontend/packages/superset-ui-core/test/connection/callApi/parseResponse.test.ts

@@ -183,26 +183,6 @@ describe('parseResponse()', () => {
     expect(responseBigNumber.json.constructor).toEqual('constructor');
   });
 
-  test('handles big numbers in scientific notation when `parseMethod=json-bigint`', async () => {
-    const mockScientificUrl = '/mock/get/scientific';
-    const mockScientificPayload =
-      '{ "big_double": 4.799703045723905e+32, "negative_big": -4.799703045723905e+32, "small": 1 }';
-    fetchMock.get(mockScientificUrl, mockScientificPayload);
-
-    const responseBigNumber = await parseResponse(
-      callApi({ url: mockScientificUrl, method: 'GET' }),
-      'json-bigint',
-    );
-
-    expect(`${responseBigNumber.json.big_double}`).toEqual(
-      '479970304572390500000000000000000',
-    );
-    expect(`${responseBigNumber.json.negative_big}`).toEqual(
-      '-479970304572390500000000000000000',
-    );
-    expect(responseBigNumber.json.small).toEqual(1);
-  });
-
   test('rejects if request.ok=false', async () => {
     expect.assertions(3);
     const mockNotOkayUrl = '/mock/notokay/url';

superset-frontend/plugins/legacy-plugin-chart-calendar/package.json

@@ -33,7 +33,7 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/legacy-plugin-chart-country-map/package.json

@@ -34,6 +34,6 @@
     "@apache-superset/core": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   }
 }

superset-frontend/plugins/legacy-plugin-chart-horizon/package.json

@@ -31,7 +31,7 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/legacy-plugin-chart-paired-t-test/package.json

@@ -31,7 +31,7 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json

@@ -36,6 +36,6 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   }
 }

superset-frontend/plugins/legacy-plugin-chart-partition/package.json

@@ -33,8 +33,8 @@
     "@apache-superset/core": "*",
     "@testing-library/jest-dom": "*",
     "@testing-library/react": "^14.0.0",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/legacy-plugin-chart-rose/package.json

@@ -32,7 +32,7 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/legacy-plugin-chart-world-map/package.json

@@ -39,6 +39,6 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@apache-superset/core": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   }
 }

superset-frontend/plugins/legacy-preset-chart-nvd3/package.json

@@ -43,6 +43,6 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "dayjs": "^1.11.19",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   }
 }

superset-frontend/plugins/plugin-chart-ag-grid-table/package.json

@@ -44,8 +44,8 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "*",
     "@types/react": "*",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/plugin-chart-cartodiagram/package.json

@@ -47,7 +47,7 @@
     "geostyler-wfs-parser": "^3.0.1",
     "ol": "^10.8.0",
     "polished": "*",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }

superset-frontend/plugins/plugin-chart-echarts/package.json

@@ -38,7 +38,7 @@
     "dayjs": "^1.11.19",
     "echarts": "*",
     "memoize-one": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/plugin-chart-handlebars/package.json

@@ -39,9 +39,9 @@
     "handlebars": "^4.7.8",
     "lodash": "^4.18.1",
     "dayjs": "^1.11.19",
-    "react": "^18.3.0",
+    "react": "^18.2.0",
     "react-ace": "^10.1.0",
-    "react-dom": "^18.3.0"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

superset-frontend/plugins/plugin-chart-pivot-table/package.json

@@ -33,8 +33,8 @@
     "@superset-ui/core": "*",
     "lodash": "^4.18.1",
     "prop-types": "*",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@babel/types": "^7.29.0",

superset-frontend/plugins/plugin-chart-point-cluster-map/package.json

@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@math.gl/web-mercator": "^4.1.0",
-    "mapbox-gl": "^3.24.0",
+    "mapbox-gl": "^3.23.1",
     "maplibre-gl": "^5.24.0",
     "react-map-gl": "^8.1.0",
     "supercluster": "^8.0.1"
@@ -36,8 +36,8 @@
     "@apache-superset/core": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/plugin-chart-table/package.json

@@ -45,8 +45,8 @@
     "@testing-library/user-event": "*",
     "@types/react": "*",
     "match-sorter": "^8.2.0",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"

superset-frontend/plugins/plugin-chart-word-cloud/package.json

@@ -39,7 +39,7 @@
     "@superset-ui/core": "*",
     "@types/lodash": "*",
     "@types/react": "*",
-    "react": "^18.3.0"
+    "react": "^18.2.0"
   },
   "devDependencies": {
     "@types/d3-cloud": "^1.2.9"

superset-frontend/plugins/preset-chart-deckgl/package.json

@@ -67,8 +67,8 @@
     "@superset-ui/core": "*",
     "dayjs": "^1.11.19",
     "mapbox-gl": ">=1.0.0",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "peerDependenciesMeta": {
     "mapbox-gl": {

superset-frontend/spec/helpers/shim.tsx

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { AriaAttributes, Ref } from 'react';
+import { AriaAttributes } from 'react';
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 import jQuery from 'jquery';
@@ -98,39 +98,31 @@ jest.mock('rehype-raw', () => () => jest.fn());
 // Tests should override this when needed
 jest.mock('@superset-ui/core/components/Icons/AsyncIcon', () => ({
   __esModule: true,
-  // eslint-disable-next-line global-require
-  default: require('react').forwardRef(
-    (
-      {
-        fileName,
-        role,
-        'aria-label': ariaLabel,
-        onClick,
-        ...rest
-      }: {
-        fileName: string;
-        role?: string;
-        'aria-label'?: AriaAttributes['aria-label'];
-        onClick?: () => void;
-      },
-      ref: Ref<HTMLSpanElement>,
-    ) => {
-      // Simple mock that provides the essential attributes for testing
-      const label =
-        ariaLabel || fileName?.replace(/_/g, '-').toLowerCase() || '';
-      return (
-        // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-        <span
-          ref={ref}
-          role={role || (onClick ? 'button' : 'img')}
-          aria-label={label}
-          data-test={label}
-          onClick={onClick}
-          {...rest}
-        />
-      );
-    },
-  ),
+  default: ({
+    fileName,
+    role,
+    'aria-label': ariaLabel,
+    onClick,
+    ...rest
+  }: {
+    fileName: string;
+    role?: string;
+    'aria-label'?: AriaAttributes['aria-label'];
+    onClick?: () => void;
+  }) => {
+    // Simple mock that provides the essential attributes for testing
+    const label = ariaLabel || fileName?.replace(/_/g, '-').toLowerCase() || '';
+    return (
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+      <span
+        role={role || (onClick ? 'button' : 'img')}
+        aria-label={label}
+        data-test={label}
+        onClick={onClick}
+        {...rest}
+      />
+    );
+  },
   StyledIcon: ({
     component: Component,
     role,

superset-frontend/spec/helpers/testing-library.tsx

@@ -37,7 +37,6 @@ import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
-import { TestBackend } from 'react-dnd-test-backend';
 import reducerIndex from 'spec/helpers/reducerIndex';
 import { QueryParamProvider } from 'use-query-params';
 import { ReactRouter5Adapter } from 'use-query-params/adapters/react-router-5';
@@ -47,11 +46,7 @@ import userEvent from '@testing-library/user-event';
 
 type Options = Omit<RenderOptions, 'queries'> & {
   useRedux?: boolean;
-  // `true` -> HTML5Backend (default; matches browser).
-  // `'test'` -> TestBackend, drive drags programmatically via
-  // `react-dnd-test-backend` `getInstance()` — avoids the jsdom
-  // HTML5-drag-event / preventDefault / zero-rect gaps.
-  useDnd?: boolean | 'test';
+  useDnd?: boolean;
   useQueryParams?: boolean;
   useRouter?: boolean;
   useTheme?: boolean;
@@ -102,9 +97,8 @@ export function createWrapper(options?: Options) {
     }
 
     if (useDnd) {
-      const backend = useDnd === 'test' ? TestBackend : HTML5Backend;
       // @ts-expect-error react-dnd types not updated for React 18
-      result = <DndProvider backend={backend}>{result}</DndProvider>;
+      result = <DndProvider backend={HTML5Backend}>{result}</DndProvider>;
     }
 
     if (useRedux || store) {

superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { act } from 'react';
+import { act } from 'react-dom/test-utils';
 import { QueryState } from '@superset-ui/core';
 import fetchMock from 'fetch-mock';
 import configureStore from 'redux-mock-store';

superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx

@@ -189,19 +189,15 @@ const SqlEditorLeftBar = ({ queryEditorId }: SqlEditorLeftBarProps) => {
         placement="bottomLeft"
         trigger="click"
       >
-        {/* Wrap in a span so the Popover can attach a ref without relying
-            on findDOMNode (deprecated in React 18+). */}
-        <span>
-          <DatabaseSelector
-            key={`db-selector-${db ? db.id : 'no-db'}:${catalog ?? 'no-catalog'}:${
-              schema ?? 'no-schema'
-            }`}
-            {...dbSelectorProps}
-            emptyState={<EmptyState />}
-            sqlLabMode
-            onOpenModal={openSelectorModal}
-          />
-        </span>
+        <DatabaseSelector
+          key={`db-selector-${db ? db.id : 'no-db'}:${catalog ?? 'no-catalog'}:${
+            schema ?? 'no-schema'
+          }`}
+          {...dbSelectorProps}
+          emptyState={<EmptyState />}
+          sqlLabMode
+          onOpenModal={openSelectorModal}
+        />
       </Popover>
       <StyledDivider />
       <TableExploreTree queryEditorId={activeQEId} />

superset-frontend/src/components/CopyToClipboard/index.tsx

@@ -98,10 +98,7 @@ class CopyToClip extends Component<CopyToClipboardProps> {
             trigger={['hover']}
             arrow={{ pointAtCenter: true }}
           >
-            {/* Wrap in a span so antd Tooltip has a real DOM ref target;
-                avoids findDOMNode fallback when copyNode is a function
-                component without forwardRef. */}
-            <span>{this.getDecoratedCopyNode()}</span>
+            {this.getDecoratedCopyNode()}
           </Tooltip>
         ) : (
           this.getDecoratedCopyNode()

superset-frontend/src/components/GenericLink/index.tsx

@@ -17,20 +17,21 @@
  * under the License.
  */
 
-import { forwardRef, PropsWithoutRef, Ref, RefAttributes } from 'react';
+import { PropsWithoutRef, RefAttributes } from 'react';
 import { Link, LinkProps } from 'react-router-dom';
 import { isUrlExternal, parseUrl } from 'src/utils/urlUtils';
 
-type GenericLinkProps<S> = PropsWithoutRef<LinkProps<S>> &
-  RefAttributes<HTMLAnchorElement>;
-
-const GenericLinkInner = <S,>(
-  { to, component, replace, innerRef, children, ...rest }: GenericLinkProps<S>,
-  ref: Ref<HTMLAnchorElement>,
-) => {
+export const GenericLink = <S,>({
+  to,
+  component,
+  replace,
+  innerRef,
+  children,
+  ...rest
+}: PropsWithoutRef<LinkProps<S>> & RefAttributes<HTMLAnchorElement>) => {
   if (typeof to === 'string' && isUrlExternal(to)) {
     return (
-      <a ref={ref} data-test="external-link" href={parseUrl(to)} {...rest}>
+      <a data-test="external-link" href={parseUrl(to)} {...rest}>
         {children}
       </a>
     );
@@ -41,14 +42,10 @@ const GenericLinkInner = <S,>(
       to={to}
       component={component}
       replace={replace}
-      innerRef={innerRef ?? ref}
+      innerRef={innerRef}
       {...rest}
     >
       {children}
     </Link>
   );
 };
-
-export const GenericLink = forwardRef(GenericLinkInner) as <S>(
-  props: GenericLinkProps<S> & { ref?: Ref<HTMLAnchorElement> },
-) => ReturnType<typeof GenericLinkInner>;

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/getControlItemsMap.tsx

@@ -193,57 +193,52 @@ export default function getControlItemsMap({
               t('Populate "Default value" to enable this control')
             }
           >
-            {/* Wrap in span so antd Tooltip can attach a ref without
-                relying on findDOMNode (deprecated in React 18+). */}
-            <span>
-              <StyledRowFormItem
-                expanded={expanded}
-                key={controlItem.name}
-                name={['filters', filterId, 'controlValues', controlItem.name]}
-                initialValue={initialValue}
-                valuePropName="checked"
-                colon={false}
+            <StyledRowFormItem
+              expanded={expanded}
+              key={controlItem.name}
+              name={['filters', filterId, 'controlValues', controlItem.name]}
+              initialValue={initialValue}
+              valuePropName="checked"
+              colon={false}
+            >
+              <Checkbox
+                disabled={controlItem.config.affectsDataMask && disabled}
+                onChange={checked => {
+                  if (controlItem.config.requiredFirst) {
+                    setNativeFilterFieldValues(form, filterId, {
+                      requiredFirst: {
+                        ...formFilter?.requiredFirst,
+                        [controlItem.name]: checked,
+                      },
+                    });
+                  }
+                  if (controlItem.config.resetConfig) {
+                    setNativeFilterFieldValues(form, filterId, {
+                      defaultDataMask: null,
+                    });
+                  }
+                  formChanged();
+                  forceUpdate();
+                }}
               >
-                <Checkbox
-                  disabled={controlItem.config.affectsDataMask && disabled}
-                  onChange={checked => {
-                    if (controlItem.config.requiredFirst) {
-                      setNativeFilterFieldValues(form, filterId, {
-                        requiredFirst: {
-                          ...formFilter?.requiredFirst,
-                          [controlItem.name]: checked,
-                        },
-                      });
-                    }
-                    if (controlItem.config.resetConfig) {
-                      setNativeFilterFieldValues(form, filterId, {
-                        defaultDataMask: null,
-                      });
-                    }
-                    formChanged();
-                    forceUpdate();
-                  }}
-                >
-                  <>
-                    {typeof controlItem.config.label === 'function'
-                      ? (controlItem.config.label as Function)()
-                      : controlItem.config.label}
-                    &nbsp;
-                    {controlItem.config.description && (
-                      <InfoTooltip
-                        placement="top"
-                        tooltip={
-                          typeof controlItem.config.description === 'function'
-                            ? (controlItem.config.description as Function)()
-                            : (controlItem.config
-                                .description as React.ReactNode)
-                        }
-                      />
-                    )}
-                  </>
-                </Checkbox>
-              </StyledRowFormItem>
-            </span>
+                <>
+                  {typeof controlItem.config.label === 'function'
+                    ? (controlItem.config.label as Function)()
+                    : controlItem.config.label}
+                  &nbsp;
+                  {controlItem.config.description && (
+                    <InfoTooltip
+                      placement="top"
+                      tooltip={
+                        typeof controlItem.config.description === 'function'
+                          ? (controlItem.config.description as Function)()
+                          : (controlItem.config.description as React.ReactNode)
+                      }
+                    />
+                  )}
+                </>
+              </Checkbox>
+            </StyledRowFormItem>
           </Tooltip>
         </>
       );

superset-frontend/src/explore/components/controls/CollectionControl/index.tsx

@@ -188,9 +188,7 @@ function CollectionControl({
   // Two items can collide when keyAccessor returns falsy and the index
   // fallback is used — breaking dnd-kit reordering and React reconciliation.
   // Assign a stable nanoid per item ref when no key is available.
-  const generatedIdsRef = useRef<WeakMap<CollectionItem, string>>(
-    new WeakMap(),
-  );
+  const generatedIdsRef = useRef<WeakMap<CollectionItem, string>>(new WeakMap());
   const itemIds = useMemo(
     () =>
       value.map(item => {

superset-frontend/src/explore/components/controls/ColorBreakpointsControl/ColorBreakpointPopoverTrigger.tsx

@@ -54,9 +54,7 @@ const ColorBreakpointsPopoverTrigger = ({
       onOpenChange={setVisibility}
       destroyOnHidden
     >
-      {/* Wrap in span so the Popover can attach a ref without relying
-          on findDOMNode (deprecated in React 18+). */}
-      <span>{props.children}</span>
+      {props.children}
     </ControlPopover>
   );
 };

superset-frontend/src/explore/components/controls/ContourControl/ContourPopoverTrigger.tsx

@@ -52,9 +52,7 @@ const ContourPopoverTrigger = ({
       onOpenChange={setVisibility}
       destroyOnHidden
     >
-      {/* Wrap in span so the Popover can attach a ref without relying
-          on findDOMNode (deprecated in React 18+). */}
-      <span>{props.children}</span>
+      {props.children}
     </ControlPopover>
   );
 };

superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx

@@ -369,21 +369,16 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
       overlayClassName="time-range-popover"
     >
       <Tooltip placement="top" title={tooltipTitle}>
-        {/* Wrap in a span so the Popover gets a stable DOM ref target;
-            DateLabel forwards its ref to an inner span used for measuring
-            text truncation, which would otherwise become the popover's
-            positioning anchor in React 18. */}
-        <span data-test={DateFilterTestKey.PopoverOverlay}>
-          <DateLabel
-            name={name}
-            aria-labelledby={`filter-name-${props.name}`}
-            aria-describedby={`date-label-${props.name}`}
-            label={actualTimeRange}
-            isActive={show}
-            isPlaceholder={actualTimeRange === NO_TIME_RANGE}
-            ref={labelRef}
-          />
-        </span>
+        <DateLabel
+          name={name}
+          aria-labelledby={`filter-name-${props.name}`}
+          aria-describedby={`date-label-${props.name}`}
+          label={actualTimeRange}
+          isActive={show}
+          isPlaceholder={actualTimeRange === NO_TIME_RANGE}
+          data-test={DateFilterTestKey.PopoverOverlay}
+          ref={labelRef}
+        />
       </Tooltip>
     </ControlPopover>
   );

superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx

@@ -201,9 +201,7 @@ const ColumnSelectPopoverTriggerInner = ({
         title={popoverTitle}
         destroyOnHidden
       >
-        {/* Wrap in span so the Popover can attach a ref without relying
-            on findDOMNode (deprecated in React 18+). */}
-        <span>{children}</span>
+        {children}
       </ControlPopover>
     </>
   );

superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnMetricSelect.test.tsx

@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { act } from 'react';
-import { getInstance as getTestBackend } from 'react-dnd-test-backend';
 import {
   fireEvent,
   render,
@@ -213,9 +211,7 @@ test('can drop only selected metrics', () => {
 test('can drag and reorder items', async () => {
   const values = ['column_a', 'metric_a', 'column_b'];
   render(<DndColumnMetricSelect {...defaultProps} value={values} multi />, {
-    // TestBackend bypasses the HTML5 drag-event pipeline (which jsdom
-    // doesn't fully implement) and lets us drive drags via simulate* calls.
-    useDnd: 'test',
+    useDnd: true,
     useRedux: true,
   });
 
@@ -228,24 +224,10 @@ test('can drag and reorder items', async () => {
   expect(within(firstItem).getByText('column_a')).toBeVisible();
   expect(within(lastItem).getByText('Column B')).toBeVisible();
 
-  const sourceId = firstItem
-    .querySelector('[data-drag-source-id]')!
-    .getAttribute('data-drag-source-id')!;
-  const targetId = lastItem
-    .querySelector('[data-drop-target-id]')!
-    .getAttribute('data-drop-target-id')!;
-  const backend = getTestBackend()!;
-  act(() => {
-    backend.simulateBeginDrag([sourceId]);
-    // Pass a clientOffset past the hover midpoint so OptionWrapper.hover /
-    // OptionControls.hover fire the reorder instead of bailing on the
-    // jsdom zero-rect.
-    backend.simulateHover([targetId], {
-      clientOffset: { x: 0, y: 100 },
-    } as any);
-    backend.simulateDrop();
-    backend.simulateEndDrag();
-  });
+  fireEvent.dragStart(firstItem);
+  fireEvent.dragEnter(lastItem);
+  fireEvent.dragOver(lastItem);
+  fireEvent.drop(lastItem);
 
   expect(container).toBeInTheDocument();
 });

superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.test.tsx

@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { act } from 'react';
-import { getInstance as getTestBackend } from 'react-dnd-test-backend';
 import {
   fireEvent,
   render,
@@ -316,9 +314,7 @@ test('update adhoc metric name when column label in dataset changes', () => {
 test('can drag metrics', async () => {
   const metricValues = ['metric_a', 'metric_b', adhocMetricB];
   render(<DndMetricSelect {...defaultProps} value={metricValues} multi />, {
-    // TestBackend bypasses the HTML5 drag-event pipeline (which jsdom
-    // doesn't fully implement) and lets us drive drags via simulate* calls.
-    useDnd: 'test',
+    useDnd: true,
     useRedux: true,
   });
 
@@ -336,23 +332,10 @@ test('can drag metrics', async () => {
   fireEvent.mouseOver(within(firstMetric).getByText('metric_a'));
   expect(await screen.findByText('Metric name')).toBeInTheDocument();
 
-  const sourceId = firstMetric
-    .querySelector('[data-drag-source-id]')!
-    .getAttribute('data-drag-source-id')!;
-  const targetId = lastMetric
-    .querySelector('[data-drop-target-id]')!
-    .getAttribute('data-drop-target-id')!;
-  const backend = getTestBackend()!;
-  act(() => {
-    backend.simulateBeginDrag([sourceId]);
-    // Pass a clientOffset past the hover midpoint so OptionControls.hover
-    // fires onMoveLabel instead of bailing on the jsdom zero-rect.
-    backend.simulateHover([targetId], {
-      clientOffset: { x: 0, y: 100 },
-    } as any);
-    backend.simulateDrop();
-    backend.simulateEndDrag();
-  });
+  fireEvent.dragStart(firstMetric);
+  fireEvent.dragEnter(lastMetric);
+  fireEvent.dragOver(lastMetric);
+  fireEvent.drop(lastMetric);
 
   expect(within(firstMetric).getByText('SUM(Column B)')).toBeVisible();
   expect(within(lastMetric).getByText('metric_a')).toBeVisible();

superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx

@@ -67,24 +67,18 @@ export default function OptionWrapper(
   const ref = useRef<HTMLDivElement>(null);
   const labelRef = useRef<HTMLDivElement>(null);
 
-  const [{ isDragging, dragSourceId }, drag] = useDrag({
+  const [{ isDragging }, drag] = useDrag({
     item: {
       type,
       dragIndex: index,
     },
     collect: (monitor: DragSourceMonitor) => ({
       isDragging: monitor.isDragging(),
-      // Exposed via `data-drag-source-id` so tests using react-dnd-test-backend
-      // can drive drags programmatically without DOM-event simulation.
-      dragSourceId: monitor.getHandlerId(),
     }),
   });
 
-  const [{ dropTargetId }, drop] = useDrop({
+  const [, drop] = useDrop({
     accept: type,
-    collect: (monitor: DropTargetMonitor) => ({
-      dropTargetId: monitor.getHandlerId(),
-    }),
 
     hover: (item: OptionItemInterface, monitor: DropTargetMonitor) => {
       if (!ref.current) {
@@ -188,12 +182,7 @@ export default function OptionWrapper(
   drag(drop(ref));
 
   return (
-    <DragContainer
-      ref={ref}
-      data-drag-source-id={dragSourceId ?? undefined}
-      data-drop-target-id={dropTargetId ?? undefined}
-      {...rest}
-    >
+    <DragContainer ref={ref} {...rest}>
       <Option
         index={index}
         clickClose={clickClose}

superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger/index.tsx

@@ -112,9 +112,7 @@ class AdhocFilterPopoverTrigger extends PureComponent<
         onOpenChange={togglePopover}
         destroyOnHidden
       >
-        {/* Wrap in span so the Popover can attach a ref without relying
-            on findDOMNode (deprecated in React 18+). */}
-        <span>{this.props.children}</span>
+        {this.props.children}
       </ControlPopover>
     );
   }

superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx

@@ -274,9 +274,7 @@ class AdhocMetricPopoverTrigger extends PureComponent<
           title={popoverTitle}
           destroyOnHidden
         >
-          {/* Wrap in span so the Popover can attach a ref without relying
-              on findDOMNode (deprecated in React 18+). */}
-          <span>{this.props.children}</span>
+          {this.props.children}
         </ControlPopover>
       </>
     );

superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.tsx

@@ -32,6 +32,13 @@ import MetricDefinitionValue from './MetricDefinitionValue';
 import AdhocMetric from './AdhocMetric';
 import AdhocMetricPopoverTrigger from './AdhocMetricPopoverTrigger';
 
+const defaultProps = {
+  onChange: () => {},
+  clearable: true,
+  savedMetrics: [],
+  columns: [],
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getOptionsForSavedMetrics(
   savedMetrics: any,
@@ -115,11 +122,11 @@ export interface MetricsControlProps {
 }
 
 const MetricsControl = ({
-  onChange = () => {},
+  onChange,
   multi,
   value: propsValue,
-  columns = [],
-  savedMetrics = [],
+  columns,
+  savedMetrics,
   datasource,
   ...props
 }: MetricsControlProps) => {
@@ -344,4 +351,6 @@ const MetricsControl = ({
   );
 };
 
+MetricsControl.defaultProps = defaultProps;
+
 export default MetricsControl;

superset-frontend/src/explore/components/controls/OptionControls/index.tsx

@@ -275,11 +275,8 @@ export const OptionControlLabel = ({
   const ref = useRef<HTMLDivElement>(null);
   const labelRef = useRef<HTMLDivElement>(null);
   const hasMetricName = savedMetric?.metric_name;
-  const [{ dropTargetId }, drop] = useDrop({
+  const [, drop] = useDrop({
     accept: type,
-    collect: (monitor: DropTargetMonitor) => ({
-      dropTargetId: monitor.getHandlerId(),
-    }),
     drop() {
       if (!multi) {
         return;
@@ -331,7 +328,7 @@ export const OptionControlLabel = ({
       item.dragIndex = hoverIndex;
     },
   });
-  const [{ isDragging, dragSourceId }, drag] = useDrag({
+  const [{ isDragging }, drag] = useDrag({
     item: {
       type,
       dragIndex: index,
@@ -339,9 +336,6 @@ export const OptionControlLabel = ({
     },
     collect: monitor => ({
       isDragging: monitor.isDragging(),
-      // Exposed via `data-drag-source-id` so tests using react-dnd-test-backend
-      // can drive drags programmatically without DOM-event simulation.
-      dragSourceId: monitor.getHandlerId(),
     }),
   });
 
@@ -430,13 +424,5 @@ export const OptionControlLabel = ({
   );
 
   drag(drop(ref));
-  return (
-    <DragContainer
-      ref={ref}
-      data-drag-source-id={dragSourceId ?? undefined}
-      data-drop-target-id={dropTargetId ?? undefined}
-    >
-      {getOptionControlContent()}
-    </DragContainer>
-  );
+  return <DragContainer ref={ref}>{getOptionControlContent()}</DragContainer>;
 };

superset-frontend/src/features/home/ChartTable.test.tsx

@@ -24,7 +24,7 @@ import {
 } from 'spec/helpers/testing-library';
 import { VizType } from '@superset-ui/core';
 import fetchMock from 'fetch-mock';
-import { act } from 'react';
+import { act } from 'react-dom/test-utils';
 import handleResourceExport from 'src/utils/export';
 import { LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import ChartTable from './ChartTable';

superset-frontend/src/theme/tests/ThemeController.test.ts

@@ -111,15 +111,12 @@ const createController = (
     ...options,
   });
 
-// Shared console spies — re-installed in beforeEach so each test starts
-// with a fresh call count and a clean implementation.
-let consoleSpy: jest.SpyInstance;
-let consoleErrorSpy: jest.SpyInstance;
+// Shared console spies
+const consoleSpy = jest.spyOn(console, 'warn').mockImplementation();
+const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
 
 beforeEach(() => {
   jest.clearAllMocks();
-  consoleSpy = jest.spyOn(console, 'warn').mockImplementation();
-  consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
 
   // Setup DOM environment
   Object.defineProperty(window, 'localStorage', {

superset-websocket/package-lock.json

@@ -23,10 +23,10 @@
         "@types/jest": "^29.5.14",
         "@types/jsonwebtoken": "^9.0.10",
         "@types/lodash": "^4.17.24",
-        "@types/node": "^25.9.1",
+        "@types/node": "^25.8.0",
         "@types/ws": "^8.18.1",
         "@typescript-eslint/eslint-plugin": "^8.59.3",
-        "@typescript-eslint/parser": "^8.59.4",
+        "@typescript-eslint/parser": "^8.59.3",
         "eslint": "^10.4.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-lodash": "^8.0.0",
@@ -1798,9 +1798,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz",
-      "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==",
+      "version": "25.8.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz",
+      "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1883,16 +1883,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.4.tgz",
-      "integrity": "sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
+      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.59.4",
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/typescript-estree": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1907,175 +1907,6 @@
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.4.tgz",
-      "integrity": "sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.59.4",
-        "@typescript-eslint/types": "^8.59.4",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz",
-      "integrity": "sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz",
-      "integrity": "sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.4.tgz",
-      "integrity": "sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz",
-      "integrity": "sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.59.4",
-        "@typescript-eslint/tsconfig-utils": "8.59.4",
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4",
-        "debug": "^4.4.3",
-        "minimatch": "^10.2.2",
-        "semver": "^7.7.3",
-        "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz",
-      "integrity": "sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.59.4",
-        "eslint-visitor-keys": "^5.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^20.19.0 || ^22.13.0 || >=24"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "10.2.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.5"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@typescript-eslint/project-service": {
       "version": "8.59.3",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.3.tgz",
@@ -6391,31 +6222,6 @@
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
-      "version": "8.59.3",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
-      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.59.3",
-        "@typescript-eslint/types": "8.59.3",
-        "@typescript-eslint/typescript-estree": "8.59.3",
-        "@typescript-eslint/visitor-keys": "8.59.3",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -8088,9 +7894,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "25.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz",
-      "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==",
+      "version": "25.8.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz",
+      "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==",
       "dev": true,
       "requires": {
         "undici-types": ">=7.24.0 <7.24.7"
@@ -8156,109 +7962,16 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "8.59.4",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.4.tgz",
-      "integrity": "sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
+      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "8.59.4",
-        "@typescript-eslint/types": "8.59.4",
-        "@typescript-eslint/typescript-estree": "8.59.4",
-        "@typescript-eslint/visitor-keys": "8.59.4",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
         "debug": "^4.4.3"
-      },
-      "dependencies": {
-        "@typescript-eslint/project-service": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.4.tgz",
-          "integrity": "sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/tsconfig-utils": "^8.59.4",
-            "@typescript-eslint/types": "^8.59.4",
-            "debug": "^4.4.3"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz",
-          "integrity": "sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "8.59.4",
-            "@typescript-eslint/visitor-keys": "8.59.4"
-          }
-        },
-        "@typescript-eslint/tsconfig-utils": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz",
-          "integrity": "sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==",
-          "dev": true,
-          "requires": {}
-        },
-        "@typescript-eslint/types": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.4.tgz",
-          "integrity": "sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz",
-          "integrity": "sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/project-service": "8.59.4",
-            "@typescript-eslint/tsconfig-utils": "8.59.4",
-            "@typescript-eslint/types": "8.59.4",
-            "@typescript-eslint/visitor-keys": "8.59.4",
-            "debug": "^4.4.3",
-            "minimatch": "^10.2.2",
-            "semver": "^7.7.3",
-            "tinyglobby": "^0.2.15",
-            "ts-api-utils": "^2.5.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "8.59.4",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz",
-          "integrity": "sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "8.59.4",
-            "eslint-visitor-keys": "^5.0.0"
-          }
-        },
-        "balanced-match": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-          "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-          "dev": true
-        },
-        "brace-expansion": {
-          "version": "5.0.6",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-          "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^4.0.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-          "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "10.2.5",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-          "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^5.0.5"
-          }
-        }
       }
     },
     "@typescript-eslint/project-service": {
@@ -11340,21 +11053,6 @@
         "@typescript-eslint/parser": "8.59.3",
         "@typescript-eslint/typescript-estree": "8.59.3",
         "@typescript-eslint/utils": "8.59.3"
-      },
-      "dependencies": {
-        "@typescript-eslint/parser": {
-          "version": "8.59.3",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
-          "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/scope-manager": "8.59.3",
-            "@typescript-eslint/types": "8.59.3",
-            "@typescript-eslint/typescript-estree": "8.59.3",
-            "@typescript-eslint/visitor-keys": "8.59.3",
-            "debug": "^4.4.3"
-          }
-        }
       }
     },
     "uglify-js": {

superset-websocket/package.json

@@ -31,10 +31,10 @@
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.8.0",
     "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^8.59.3",
-    "@typescript-eslint/parser": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.3",
     "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-lodash": "^8.0.0",

superset/db_engine_specs/lint_metadata.py

@@ -454,7 +454,7 @@ def print_report(reports: list[MetadataReport], verbose: bool = False) -> None:
     print("=" * 60)
 
     all_fields = {**REQUIRED_FIELDS, **RECOMMENDED_FIELDS, **OPTIONAL_FIELDS}
-    field_counts: dict[str, int] = dict.fromkeys(all_fields, 0)
+    field_counts: dict[str, int] = {f: 0 for f in all_fields}
 
     for r in reports:
         for field in r.present_fields:

superset/reports/notifications/email.py

@@ -59,7 +59,7 @@ ALLOWED_TAGS = {
     "ul",
 }.union(TABLE_TAGS)
 
-ALLOWED_TABLE_ATTRIBUTES = dict.fromkeys(TABLE_TAGS, TABLE_ATTRIBUTES)
+ALLOWED_TABLE_ATTRIBUTES = {tag: TABLE_ATTRIBUTES for tag in TABLE_TAGS}
 ALLOWED_ATTRIBUTES = {
     "a": {"href", "title"},
     "abbr": {"title"},

superset/reports/notifications/slack_mixin.py

@@ -94,7 +94,7 @@ class SlackMixin:
         # need to truncate the data
         for i in range(len(df) - 1):
             truncated_df = df[: i + 1].fillna("")
-            truncated_row = pd.Series(dict.fromkeys(df.columns, "..."))
+            truncated_row = pd.Series({k: "..." for k in df.columns})
             truncated_df = pd.concat(
                 [truncated_df, truncated_row.to_frame().T], ignore_index=True
             )
@@ -104,7 +104,7 @@ class SlackMixin:
             if len(message) > MAXIMUM_MESSAGE_SIZE:
                 # Decrement i and build a message that is under the limit
                 truncated_df = df[:i].fillna("")
-                truncated_row = pd.Series(dict.fromkeys(df.columns, "..."))
+                truncated_row = pd.Series({k: "..." for k in df.columns})
                 truncated_df = pd.concat(
                     [truncated_df, truncated_row.to_frame().T], ignore_index=True
                 )

tests/unit_tests/sql/parse_tests.py

@@ -1164,32 +1164,6 @@ def test_has_mutation(engine: str, sql: str, expected: bool) -> None:
     assert SQLScript(sql, engine).has_mutation() == expected
 
 
-@pytest.mark.parametrize(
-    "sql",
-    [
-        "SELECT last(my_value_column, my_time_column) FROM my_table",
-        "SELECT first(my_value_column, my_time_column) FROM my_table",
-        "SELECT time_bucket('1 hour', my_time_column) AS bucket FROM my_table",
-    ],
-)
-def test_postgres_parses_timescaledb_hyperfunctions(sql: str) -> None:
-    """
-    Regression for #32028: TimescaleDB extends Postgres with hyperfunctions
-    (``last``, ``first``, ``time_bucket``, etc.) that take more arguments
-    than vanilla Postgres equivalents. SQL Lab tolerates them (it routes
-    raw SQL straight to the engine), but the dashboard chart path runs the
-    SQL through ``SQLScript`` for inspection. A strict per-function arity
-    check in sqlglot was rejecting these queries with ``The number of
-    provided arguments (2) is greater than the maximum number of supported
-    arguments (1)``, which broke dashboards built on TimescaleDB datasets.
-
-    These tests pin that the parse path tolerates Postgres-dialect SQL
-    using TimescaleDB hyperfunction signatures. If a future sqlglot
-    upgrade reintroduces the strict arity check, this fails immediately.
-    """
-    SQLScript(sql, "postgresql")  # Must not raise.
-
-
 def test_get_settings() -> None:
     """
     Test `get_settings` in some edge cases.