This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new f8adfc8 use new @superset-ui/style package for theming (#9605)
f8adfc8 is described below
commit f8adfc8fbfb7b97dd1205bfd2bb7c2582f76dfc4
Author: David Aaron Suddjian <1858430+suddj...@users.noreply.github.com>
AuthorDate: Wed Apr 22 13:13:40 2020 -0700
use new @superset-ui/style package for theming (#9605)
* use new @superset-ui/style package for theming
* fix tests to reference theme
* try adding a wait
---
.../cypress/integration/dashboard/filter.js | 2 +
superset-frontend/package-lock.json | 183 +++++++++++----------
superset-frontend/package.json | 2 +-
.../components/ListView/ListView_spec.jsx | 17 +-
.../src/components/ListView/Filters.tsx | 2 +-
superset-frontend/src/components/SearchInput.tsx | 6 +-
superset-frontend/src/components/StyledSelect.tsx | 2 +-
superset-frontend/src/welcome/App.jsx | 2 +-
.../styled-components/superset-theme.ts | 44 -----
9 files changed, 119 insertions(+), 141 deletions(-)
diff --git
a/superset-frontend/cypress-base/cypress/integration/dashboard/filter.js
b/superset-frontend/cypress-base/cypress/integration/dashboard/filter.js
index b1920fb..77cf0fb 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/filter.js
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/filter.js
@@ -53,6 +53,8 @@ export default () =>
});
it('should apply filter', () => {
+ cy.wait(10);
+
cy.get('.Select-placeholder')
.contains('Select [region]')
.click()
diff --git a/superset-frontend/package-lock.json
b/superset-frontend/package-lock.json
index 0834b75..afffab3 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -8590,6 +8590,15 @@
"resolved":
"https://registry.npmjs.org/@superset-ui/query/-/query-0.12.8.tgz";,
"integrity":
"sha512-ZqYhyMM6DccApQFzsMZ49yC/n3c1d+PBiWdHnNZl7JpYmQT1WpwP/RiSvafO8mQjbObpc2gwFwk90VTlnZZbUg=="
},
+ "@superset-ui/style": {
+ "version": "0.12.21",
+ "resolved":
"https://registry.npmjs.org/@superset-ui/style/-/style-0.12.21.tgz";,
+ "integrity":
"sha512-HS5eBUQ7hMFXvf6sJ/JelZUANlxguB1kDQ5waugSFdrYQ3402lwPWZo5nmgeZhYVefL8hq3CkumJe/sfDLWa7w==",
+ "requires": {
+ "@emotion/core": "^10.0.28",
+ "@emotion/styled": "^10.0.27"
+ }
+ },
"@superset-ui/time-format": {
"version": "0.12.10",
"resolved":
"https://registry.npmjs.org/@superset-ui/time-format/-/time-format-0.12.10.tgz";,
@@ -11822,7 +11831,7 @@
},
"chownr": {
"version": "1.1.1",
- "resolved":
"https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
@@ -11857,7 +11866,7 @@
},
"debug": {
"version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
@@ -11888,7 +11897,7 @@
},
"fs-minipass": {
"version": "1.2.5",
- "resolved":
"https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
"dev": true,
"optional": true,
@@ -11922,7 +11931,7 @@
},
"glob": {
"version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
@@ -11954,7 +11963,7 @@
},
"ignore-walk": {
"version": "3.0.1",
- "resolved":
"https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
@@ -11975,7 +11984,7 @@
},
"inherits": {
"version": "2.0.3",
- "resolved":
"https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";,
+ "resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
@@ -12016,14 +12025,14 @@
},
"minimist": {
"version": "0.0.8",
- "resolved":
"https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "resolved": false,
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
- "resolved":
"https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
"dev": true,
"optional": true,
@@ -12034,7 +12043,7 @@
},
"minizlib": {
"version": "1.2.1",
- "resolved":
"https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
"dev": true,
"optional": true,
@@ -12044,7 +12053,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved":
"https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";,
+ "resolved": false,
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"optional": true,
@@ -12054,14 +12063,14 @@
},
"ms": {
"version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.3.0",
- "resolved":
"https://registry.npmjs.org/needle/-/needle-2.3.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
@@ -12073,7 +12082,7 @@
},
"node-pre-gyp": {
"version": "0.12.0",
- "resolved":
"https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
@@ -12092,7 +12101,7 @@
},
"nopt": {
"version": "4.0.1",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
@@ -12103,14 +12112,14 @@
},
"npm-bundled": {
"version": "1.0.6",
- "resolved":
"https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz";,
+ "resolved": false,
"integrity":
"sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
- "resolved":
"https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
@@ -12190,7 +12199,7 @@
},
"process-nextick-args": {
"version": "2.0.0",
- "resolved":
"https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
@@ -12219,7 +12228,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved":
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";,
+ "resolved": false,
"integrity":
"sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
@@ -12235,7 +12244,7 @@
},
"rimraf": {
"version": "2.6.3",
- "resolved":
"https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
@@ -12266,7 +12275,7 @@
},
"semver": {
"version": "5.7.0",
- "resolved":
"https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
@@ -12326,7 +12335,7 @@
},
"tar": {
"version": "4.4.8",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz";,
+ "resolved": false,
"integrity":
"sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
"dev": true,
"optional": true,
@@ -12366,7 +12375,7 @@
},
"yallist": {
"version": "3.0.3",
- "resolved":
"https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
"dev": true,
"optional": true
@@ -16783,28 +16792,28 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "resolved":
"https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";,
+ "resolved": false,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
- "resolved":
"https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -16815,14 +16824,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";,
+ "resolved": false,
"integrity":
"sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -16833,42 +16842,42 @@
},
"chownr": {
"version": "1.1.1",
- "resolved":
"https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
- "resolved":
"https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";,
+ "resolved": false,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
- "resolved":
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
- "resolved":
"https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";,
+ "resolved": false,
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "4.1.1",
- "resolved":
"https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
@@ -16878,28 +16887,28 @@
},
"deep-extend": {
"version": "0.6.0",
- "resolved":
"https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
- "resolved":
"https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";,
+ "resolved": false,
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.5",
- "resolved":
"https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
"dev": true,
"optional": true,
@@ -16909,14 +16918,14 @@
},
"fs.realpath": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
- "resolved":
"https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";,
+ "resolved": false,
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
@@ -16933,7 +16942,7 @@
},
"glob": {
"version": "7.1.3",
- "resolved":
"https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
@@ -16948,14 +16957,14 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved":
"https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
- "resolved":
"https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";,
+ "resolved": false,
"integrity":
"sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
@@ -16965,7 +16974,7 @@
},
"ignore-walk": {
"version": "3.0.1",
- "resolved":
"https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
@@ -16975,7 +16984,7 @@
},
"inflight": {
"version": "1.0.6",
- "resolved":
"https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";,
+ "resolved": false,
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
@@ -16986,21 +16995,21 @@
},
"inherits": {
"version": "2.0.3",
- "resolved":
"https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";,
+ "resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
@@ -17010,14 +17019,14 @@
},
"isarray": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
- "resolved":
"https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";,
+ "resolved": false,
"integrity":
"sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
@@ -17027,14 +17036,14 @@
},
"minimist": {
"version": "0.0.8",
- "resolved":
"https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "resolved": false,
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
- "resolved":
"https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
"dev": true,
"optional": true,
@@ -17045,7 +17054,7 @@
},
"minizlib": {
"version": "1.2.1",
- "resolved":
"https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
"dev": true,
"optional": true,
@@ -17055,7 +17064,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved":
"https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";,
+ "resolved": false,
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"optional": true,
@@ -17065,14 +17074,14 @@
},
"ms": {
"version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.3.0",
- "resolved":
"https://registry.npmjs.org/needle/-/needle-2.3.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
@@ -17084,7 +17093,7 @@
},
"node-pre-gyp": {
"version": "0.12.0",
- "resolved":
"https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
@@ -17103,7 +17112,7 @@
},
"nopt": {
"version": "4.0.1",
- "resolved":
"https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
@@ -17114,14 +17123,14 @@
},
"npm-bundled": {
"version": "1.0.6",
- "resolved":
"https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz";,
+ "resolved": false,
"integrity":
"sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
- "resolved":
"https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
@@ -17132,7 +17141,7 @@
},
"npmlog": {
"version": "4.1.2",
- "resolved":
"https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";,
+ "resolved": false,
"integrity":
"sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
@@ -17145,21 +17154,21 @@
},
"number-is-nan": {
"version": "1.0.1",
- "resolved":
"https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
- "resolved":
"https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";,
+ "resolved": false,
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
- "resolved":
"https://registry.npmjs.org/once/-/once-1.4.0.tgz";,
+ "resolved": false,
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
@@ -17169,21 +17178,21 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
- "resolved":
"https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
@@ -17194,21 +17203,21 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved":
"https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.0",
- "resolved":
"https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";,
+ "resolved": false,
"integrity":
"sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
@@ -17230,7 +17239,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved":
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";,
+ "resolved": false,
"integrity":
"sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
@@ -17246,7 +17255,7 @@
},
"rimraf": {
"version": "2.6.3",
- "resolved":
"https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
@@ -17256,49 +17265,49 @@
},
"safe-buffer": {
"version": "5.1.2",
- "resolved":
"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";,
+ "resolved": false,
"integrity":
"sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
- "resolved":
"https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";,
+ "resolved": false,
"integrity":
"sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";,
+ "resolved": false,
"integrity":
"sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.0",
- "resolved":
"https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
- "resolved":
"https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
- "resolved":
"https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
@@ -17310,7 +17319,7 @@
},
"string_decoder": {
"version": "1.1.1",
- "resolved":
"https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
@@ -17320,7 +17329,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved":
"https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
@@ -17330,14 +17339,14 @@
},
"strip-json-comments": {
"version": "2.0.1",
- "resolved":
"https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";,
+ "resolved": false,
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"tar": {
"version": "4.4.8",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz";,
+ "resolved": false,
"integrity":
"sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
"dev": true,
"optional": true,
@@ -17353,14 +17362,14 @@
},
"util-deprecate": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
- "resolved":
"https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
@@ -17370,14 +17379,14 @@
},
"wrappy": {
"version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";,
+ "resolved": false,
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
- "resolved":
"https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";,
+ "resolved": false,
"integrity":
"sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
"dev": true,
"optional": true
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 137e766..b475844 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -56,7 +56,6 @@
"@babel/runtime-corejs3": "^7.8.4",
"@data-ui/sparkline": "^0.0.54",
"@emotion/core": "^10.0.28",
- "@emotion/styled": "^10.0.27",
"@superset-ui/chart": "^0.12.11",
"@superset-ui/chart-composition": "^0.12.8",
"@superset-ui/color": "^0.12.8",
@@ -92,6 +91,7 @@
"@superset-ui/plugin-chart-table": "^0.11.15",
"@superset-ui/preset-chart-xy": "^0.11.15",
"@superset-ui/query": "^0.12.8",
+ "@superset-ui/style": "^0.12.21",
"@superset-ui/time-format": "^0.12.10",
"@superset-ui/translation": "^0.12.8",
"@superset-ui/validator": "^0.12.13",
diff --git
a/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx
b/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx
index 61aca5f..3630f93 100644
--- a/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx
+++ b/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx
@@ -26,6 +26,8 @@ import ListView from 'src/components/ListView/ListView';
import ListViewFilters from 'src/components/ListView/Filters';
import ListViewPagination from 'src/components/ListView/Pagination';
import { areArraysShallowEqual } from 'src/reduxUtils';
+import { ThemeProvider } from 'emotion-theming';
+import { supersetTheme } from '@superset-ui/style';
const mockedProps = {
title: 'Data Table',
@@ -63,7 +65,10 @@ const mockedProps = {
};
describe('ListView', () => {
- const wrapper = mount(<ListView {...mockedProps} />);
+ const wrapper = mount(<ListView {...mockedProps} />, {
+ wrappingComponent: ThemeProvider,
+ wrappingComponentProps: { theme: supersetTheme },
+ });
afterEach(() => {
mockedProps.fetchData.mockClear();
@@ -281,7 +286,10 @@ Array [
filters: [...mockedProps.filters, { id: 'some_column' }],
};
try {
- shallow(<ListView {...props} />);
+ shallow(<ListView {...props} />, {
+ wrappingComponent: ThemeProvider,
+ wrappingComponentProps: { theme: supersetTheme },
+ });
} catch (e) {
expect(e).toMatchInlineSnapshot(
`[ListViewError: Invalid filter config, some_column is not present in
columns]`,
@@ -319,7 +327,10 @@ describe('ListView with new UI filters', () => {
],
};
- const wrapper = mount(<ListView {...newFiltersProps} />);
+ const wrapper = mount(<ListView {...newFiltersProps} />, {
+ wrappingComponent: ThemeProvider,
+ wrappingComponentProps: { theme: supersetTheme },
+ });
afterEach(() => {
mockedProps.fetchData.mockClear();
diff --git a/superset-frontend/src/components/ListView/Filters.tsx
b/superset-frontend/src/components/ListView/Filters.tsx
index 25b2c5b..6d9ba59 100644
--- a/superset-frontend/src/components/ListView/Filters.tsx
+++ b/superset-frontend/src/components/ListView/Filters.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import React, { useState } from 'react';
-import styled from '@emotion/styled';
+import styled from '@superset-ui/style';
import { withTheme } from 'emotion-theming';
import StyledSelect, { AsyncStyledSelect } from 'src/components/StyledSelect';
diff --git a/superset-frontend/src/components/SearchInput.tsx
b/superset-frontend/src/components/SearchInput.tsx
index dc4e744..2a4b8f1 100644
--- a/superset-frontend/src/components/SearchInput.tsx
+++ b/superset-frontend/src/components/SearchInput.tsx
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-import styled from '@emotion/styled';
+import styled from '@superset-ui/style';
export default styled.input`
- background-color: #fff;
+ background-color: ${({ theme }) => theme.colors.secondary.light5};
background-image: none;
- border: 1px solid #ccc;
+ border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
border-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
padding: 4px 8px;
diff --git a/superset-frontend/src/components/StyledSelect.tsx
b/superset-frontend/src/components/StyledSelect.tsx
index 79d9151..0573fd6 100644
--- a/superset-frontend/src/components/StyledSelect.tsx
+++ b/superset-frontend/src/components/StyledSelect.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import styled from '@emotion/styled';
+import styled from '@superset-ui/style';
// @ts-ignore
import Select, { Async } from 'react-select';
diff --git a/superset-frontend/src/welcome/App.jsx
b/superset-frontend/src/welcome/App.jsx
index 696f7b2..fcdfd79 100644
--- a/superset-frontend/src/welcome/App.jsx
+++ b/superset-frontend/src/welcome/App.jsx
@@ -25,7 +25,7 @@ import { BrowserRouter as Router, Switch, Route } from
'react-router-dom';
import { ThemeProvider } from 'emotion-theming';
import { initFeatureFlags } from 'src/featureFlags';
-import { supersetTheme } from 'stylesheets/styled-components/superset-theme';
+import { supersetTheme } from '@superset-ui/style';
import Menu from 'src/components/Menu/Menu';
import DashboardList from 'src/views/dashboardList/DashboardList';
import ChartList from 'src/views/chartList/ChartList';
diff --git a/superset-frontend/stylesheets/styled-components/superset-theme.ts
b/superset-frontend/stylesheets/styled-components/superset-theme.ts
deleted file mode 100644
index aadb575..0000000
--- a/superset-frontend/stylesheets/styled-components/superset-theme.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import styled, { CreateStyled } from '@emotion/styled';
-
-const defaultTheme = {
- borderRadius: '4px',
- colors: {
- primary: {
- base: '#20A7C9',
- },
- secondary: {
- base: '#444E7C',
- dark1: '#363E63',
- dark2: '#282E4A',
- dark3: '#1B1F31',
- light1: '#8E94B0',
- light2: '#B4B8CA',
- light3: '#D9DBE4',
- light4: '#ECEEF2',
- light5: '#F5F5F8',
- },
- },
- gridUnit: '4px',
-};
-
-export default styled as CreateStyled<typeof defaultTheme>;
-
-export const supersetTheme = defaultTheme;
