From 9ecbd533ebf32b6ee32f28a4f6ed1f7cbaa9c4c5 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 6 May 2020 11:54:40 -0700 Subject: [PATCH 01/19] chore(release): publish v0.13.7 --- packages/superset-ui-query/package.json | 2 +- plugins/legacy-plugin-chart-calendar/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/superset-ui-query/package.json b/packages/superset-ui-query/package.json index 8555e4ca78..e1cdb9ba13 100644 --- a/packages/superset-ui-query/package.json +++ b/packages/superset-ui-query/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/query", - "version": "0.13.6", + "version": "0.13.7", "description": "Superset UI query", "sideEffects": false, "main": "lib/index.js", diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json index c38dc27d6e..1d9f18fa39 100644 --- a/plugins/legacy-plugin-chart-calendar/package.json +++ b/plugins/legacy-plugin-chart-calendar/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-calendar", - "version": "0.13.6", + "version": "0.13.7", "description": "Superset Legacy Chart - Calendar Heatmap", "sideEffects": [ "*.css" From 93eec7dd8bce9be994438333eedc8c2a9fe673ee Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 6 May 2020 13:19:56 -0700 Subject: [PATCH 02/19] Revert "chore(release): publish v0.13.7" This reverts commit 3c9ce9ed4c46f9a52fd78bd9b43732803e93c0ac. --- packages/superset-ui-query/package.json | 2 +- plugins/legacy-plugin-chart-calendar/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/superset-ui-query/package.json b/packages/superset-ui-query/package.json index e1cdb9ba13..8555e4ca78 100644 --- a/packages/superset-ui-query/package.json +++ b/packages/superset-ui-query/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/query", - "version": "0.13.7", + "version": "0.13.6", "description": "Superset UI query", "sideEffects": false, "main": "lib/index.js", diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json index 1d9f18fa39..c38dc27d6e 100644 --- a/plugins/legacy-plugin-chart-calendar/package.json +++ b/plugins/legacy-plugin-chart-calendar/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-calendar", - "version": "0.13.7", + "version": "0.13.6", "description": "Superset Legacy Chart - Calendar Heatmap", "sideEffects": [ "*.css" From 26408b6f6cb3371505d8f0e0c7ac2cac7681c4a8 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 6 May 2020 13:20:03 -0700 Subject: [PATCH 03/19] Revert "chore(release): publish v0.13.6" This reverts commit 0e6e829beba0df62a717601b20fdd790ebf49714. --- packages/superset-ui-query/package.json | 2 +- plugins/legacy-plugin-chart-calendar/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/superset-ui-query/package.json b/packages/superset-ui-query/package.json index 8555e4ca78..b7e79b0372 100644 --- a/packages/superset-ui-query/package.json +++ b/packages/superset-ui-query/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/query", - "version": "0.13.6", + "version": "0.13.3", "description": "Superset UI query", "sideEffects": false, "main": "lib/index.js", diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json index c38dc27d6e..c042032dee 100644 --- a/plugins/legacy-plugin-chart-calendar/package.json +++ b/plugins/legacy-plugin-chart-calendar/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-calendar", - "version": "0.13.6", + "version": "0.13.3", "description": "Superset Legacy Chart - Calendar Heatmap", "sideEffects": [ "*.css" From 43c2169894d14417388e47c4998452767108ffc0 Mon Sep 17 00:00:00 2001 From: David Aaron Suddjian Date: Mon, 20 Apr 2020 14:19:37 -0700 Subject: [PATCH 04/19] feat: poc using style package in big-number --- .../BigNumber/BigNumberStories.tsx | 16 +- plugins/big-number/yarn.lock | 894 ++++++++++++++++++ .../package.json | 1 + .../src/BigNumber/BigNumber.css | 1 - .../src/BigNumber/BigNumber.tsx | 19 +- 5 files changed, 922 insertions(+), 9 deletions(-) create mode 100644 plugins/big-number/yarn.lock diff --git a/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx b/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx index f38362afba..90c19d889d 100644 --- a/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx +++ b/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx @@ -17,7 +17,9 @@ * under the License. */ import React from 'react'; +import { ThemeProvider } from 'emotion-theming'; import { SuperChart } from '@superset-ui/chart'; +import { supersetTheme } from '@superset-ui/style'; import { BigNumberChartPlugin } from '@superset-ui/legacy-preset-chart-big-number'; import testData from './data'; @@ -55,12 +57,18 @@ function withNulls(origData: object[], nullPosition: number = 3) { return data; } +const ThemedSuperChart = props => ( + + + +); + export default { title: 'Legacy Chart Plugins|legacy-preset-big-number/BigNumber', }; export const basicWithTrendline = () => ( - ( ); export const nullInTheMiddle = () => ( - ( ); export const fixedRange = () => ( - ( ); export const noFixedRange = () => ( - theme.colors.secondary.dark3}; + font-weight: 600; +`; + +// once more theme variables are available, put them here +const SubHeader = styled.div` + color: ${({ theme }) => theme.colors.secondary.dark3}; +`; + const defaultNumberFormatter = getNumberFormatter(); const CHART_MARGIN = { @@ -151,7 +162,7 @@ class BigNumberVis extends React.PureComponent { container.remove(); return ( -
{ }} > {text} -
+ ); } @@ -188,7 +199,7 @@ class BigNumberVis extends React.PureComponent { container.remove(); return ( -
{ }} > {text} -
+ ); } return null; From 0679e58560f93a1e3c456b574a0274b75d21cbaf Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 28 Apr 2020 23:01:23 -0700 Subject: [PATCH 05/19] ThemeProvider decorator --- packages/superset-ui-demo/.storybook/preview.js | 2 ++ packages/superset-ui-demo/.storybook/themeDecorator.js | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/superset-ui-demo/.storybook/themeDecorator.js diff --git a/packages/superset-ui-demo/.storybook/preview.js b/packages/superset-ui-demo/.storybook/preview.js index 4613f1f24b..1d238ed208 100644 --- a/packages/superset-ui-demo/.storybook/preview.js +++ b/packages/superset-ui-demo/.storybook/preview.js @@ -6,11 +6,13 @@ import sequentialD3 from '@superset-ui/color/esm/colorSchemes/sequential/d3'; import { configure } from '@superset-ui/translation'; import { getCategoricalSchemeRegistry, getSequentialSchemeRegistry } from '@superset-ui/color'; import { getTimeFormatterRegistry, smartDateFormatter } from '@superset-ui/time-format'; +import themeDecorator from "./themeDecorator" import 'bootstrap/dist/css/bootstrap.min.css'; import './storybook.css'; addDecorator(jsxDecorator); +addDecorator(themeDecorator); addParameters({ options: { diff --git a/packages/superset-ui-demo/.storybook/themeDecorator.js b/packages/superset-ui-demo/.storybook/themeDecorator.js new file mode 100644 index 0000000000..8b7cbc70b6 --- /dev/null +++ b/packages/superset-ui-demo/.storybook/themeDecorator.js @@ -0,0 +1,10 @@ +// themeDecorator.js +import React from "react" +import { ThemeProvider } from 'emotion-theming'; +import { supersetTheme } from '@superset-ui/style'; + +const ThemeDecorator = storyFn => ( + {storyFn()} +) + +export default ThemeDecorator \ No newline at end of file From a5c81afddd32435abb9e737d322bd51e2aaf6b0e Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 28 Apr 2020 23:04:37 -0700 Subject: [PATCH 06/19] removing other themeProvider stuff (no longer needed) --- .../BigNumber/BigNumberStories.tsx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx b/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx index 90c19d889d..f38362afba 100644 --- a/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx +++ b/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-big-number/BigNumber/BigNumberStories.tsx @@ -17,9 +17,7 @@ * under the License. */ import React from 'react'; -import { ThemeProvider } from 'emotion-theming'; import { SuperChart } from '@superset-ui/chart'; -import { supersetTheme } from '@superset-ui/style'; import { BigNumberChartPlugin } from '@superset-ui/legacy-preset-chart-big-number'; import testData from './data'; @@ -57,18 +55,12 @@ function withNulls(origData: object[], nullPosition: number = 3) { return data; } -const ThemedSuperChart = props => ( - - - -); - export default { title: 'Legacy Chart Plugins|legacy-preset-big-number/BigNumber', }; export const basicWithTrendline = () => ( - ( ); export const nullInTheMiddle = () => ( - ( ); export const fixedRange = () => ( - ( ); export const noFixedRange = () => ( - Date: Tue, 28 Apr 2020 23:06:34 -0700 Subject: [PATCH 07/19] just adding a note to the readme that this stuff works out of the box. --- packages/superset-ui-style/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/superset-ui-style/README.md b/packages/superset-ui-style/README.md index c8e5670e90..398c67d86e 100644 --- a/packages/superset-ui-style/README.md +++ b/packages/superset-ui-style/README.md @@ -27,3 +27,5 @@ class App extends React.Component { } } ``` + +Note: the `ThemeProvider` is already included in the project's `Storybook` (as a decorator) meaning you should be able to apply/view any new Emotion-based theme attributes and see them reflected in the storybook without any additional setup. \ No newline at end of file From 5fab468d5af16b2c065cc9520323d14ea3ffd118 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 18 May 2020 12:43:26 -0700 Subject: [PATCH 08/19] bumps n deps --- packages/superset-ui-query/package.json | 2 +- plugins/legacy-plugin-chart-calendar/package.json | 2 +- .../legacy-preset-chart-big-number/package.json | 2 +- plugins/plugin-chart-word-cloud/package.json | 1 + yarn.lock | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/superset-ui-query/package.json b/packages/superset-ui-query/package.json index b7e79b0372..8555e4ca78 100644 --- a/packages/superset-ui-query/package.json +++ b/packages/superset-ui-query/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/query", - "version": "0.13.3", + "version": "0.13.6", "description": "Superset UI query", "sideEffects": false, "main": "lib/index.js", diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json index c042032dee..c38dc27d6e 100644 --- a/plugins/legacy-plugin-chart-calendar/package.json +++ b/plugins/legacy-plugin-chart-calendar/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-calendar", - "version": "0.13.3", + "version": "0.13.6", "description": "Superset Legacy Chart - Calendar Heatmap", "sideEffects": [ "*.css" diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json index 22d39f122d..a6c139be8b 100644 --- a/plugins/legacy-preset-chart-big-number/package.json +++ b/plugins/legacy-preset-chart-big-number/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/style": "^0.12.21", + "@superset-ui/style": "^0.13.11", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", diff --git a/plugins/plugin-chart-word-cloud/package.json b/plugins/plugin-chart-word-cloud/package.json index b33c00af19..5f6bf71c8a 100644 --- a/plugins/plugin-chart-word-cloud/package.json +++ b/plugins/plugin-chart-word-cloud/package.json @@ -33,6 +33,7 @@ "@types/react": "^16.3.0", "d3-cloud": "^1.2.5", "d3-scale": "^3.0.1", + "@superset-ui/style": "^0.13.11", "encodable": "^0.3.3" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 8793f83e6b..1a7d6f798d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3251,6 +3251,16 @@ conventional-changelog-cli "^2.0.12" cz-conventional-changelog "^2.1.0" +"@superset-ui/legacy-plugin-chart-calendar@0.13.6": + version "0.13.6" + resolved "https://registry.yarnpkg.com/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.13.6.tgz#30c29582eb537a7ec3ba2730c07b66101985177b" + integrity sha512-Ziv7fVdXNYATziITy1sXjMMg6e3NTJymUFdzkqYPVYl2CMszuXKS7LM7xTbwrcJ6og0eKhofyiGznR0TEvUMlg== + dependencies: + d3-array "^2.0.3" + d3-selection "^1.4.0" + d3-tip "^0.9.1" + prop-types "^15.6.2" + "@superset-ui/legacy-plugin-chart-word-cloud@^0.11.15": version "0.11.15" resolved "https://registry.yarnpkg.com/@superset-ui/legacy-plugin-chart-word-cloud/-/legacy-plugin-chart-word-cloud-0.11.15.tgz#70a146aaf3cf1977c29086c069f0216325f092b2" @@ -3260,6 +3270,11 @@ d3-cloud "^1.2.1" prop-types "^15.6.2" +"@superset-ui/query@0.13.6": + version "0.13.6" + resolved "https://registry.yarnpkg.com/@superset-ui/query/-/query-0.13.6.tgz#e9c4cba4b7e5181491429e15d5badf97e307a036" + integrity sha512-wJvqXuzv9vJNxDPKNAaHzCCly7LF8UP9AQ1zdoA88QcfYJqCzNvbt3j8XSR4nABrvNVZHnsn67wQNG4HS/IPpQ== + "@svgr/babel-plugin-add-jsx-attribute@^4.2.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1" From 4ef5aa5c9b45cc62ca5c67596451c525179c5ab1 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 18 May 2020 12:44:12 -0700 Subject: [PATCH 09/19] BigNumber using theme bits... in theory --- .../src/BigNumber/BigNumber.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx index 0c808289ef..5726e95fa0 100644 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx +++ b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx @@ -31,13 +31,14 @@ import TimeFormatter from '@superset-ui/time-format/src/TimeFormatter'; import './BigNumber.css'; const Header = styled.div` - color: ${({ theme }) => theme.colors.secondary.dark3}; - font-weight: 600; + font-family: ${({ theme }) => theme.typography.families.sansSerif}; + font-weight: ${({ theme }) => theme.typography.weights.bold}; `; // once more theme variables are available, put them here const SubHeader = styled.div` - color: ${({ theme }) => theme.colors.secondary.dark3}; + font-family: ${({ theme }) => theme.typography.families.sansSerif}; + font-weight: ${({ theme }) => theme.typography.weights.bold}; `; const defaultNumberFormatter = getNumberFormatter(); From 3ae69ae64a877753420b60a0fb332f86654c987b Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 18 May 2020 12:44:30 -0700 Subject: [PATCH 10/19] wordCloud using theme bits --- plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx b/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx index f6a5284a62..f5c904df8b 100644 --- a/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx +++ b/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx @@ -1,6 +1,7 @@ import React from 'react'; import cloudLayout, { Word } from 'd3-cloud'; import { PlainObject } from 'encodable'; +import { supersetTheme } from '@superset-ui/style'; import { WordCloudEncoding, wordCloudEncoderFactory } from './Encoder'; export const ROTATION = { @@ -93,7 +94,9 @@ export default class WordCloud extends React.PureComponent< .padding(5) .rotate(ROTATION[rotation] || ROTATION.flat) .text(d => encoder.channels.text.getValueFromDatum(d)) - .font(d => encoder.channels.fontFamily.encodeDatum(d, 'Helvetica')) + .font(d => + encoder.channels.fontFamily.encodeDatum(d, supersetTheme.typography.families.sansSerif), + ) .fontWeight(d => encoder.channels.fontWeight.encodeDatum(d, 'normal')) .fontSize(d => encoder.channels.fontSize.encodeDatum(d, 0)) .on('end', this.setWords) From a78a0d55b0399bf550bb117fc90d32636fe9fa72 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 18 May 2020 13:29:17 -0700 Subject: [PATCH 11/19] bumping packages again --- .../legacy-preset-chart-big-number/package.json | 4 ++-- yarn.lock | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json index a6c139be8b..316c3a7af5 100644 --- a/plugins/legacy-preset-chart-big-number/package.json +++ b/plugins/legacy-preset-chart-big-number/package.json @@ -40,8 +40,8 @@ "@superset-ui/color": "^0.13.0", "@superset-ui/control-utils": "^0.13.0", "@superset-ui/core": "^0.13.0", - "@superset-ui/dimension": "^0.13.0", - "@superset-ui/number-format": "^0.13.0", + "@superset-ui/dimension": "^0.13.3", + "@superset-ui/number-format": "^0.13.14", "@superset-ui/time-format": "^0.13.0", "@superset-ui/translation": "^0.13.0", "react": "^15 || ^16" diff --git a/yarn.lock b/yarn.lock index 1a7d6f798d..8793f83e6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3251,16 +3251,6 @@ conventional-changelog-cli "^2.0.12" cz-conventional-changelog "^2.1.0" -"@superset-ui/legacy-plugin-chart-calendar@0.13.6": - version "0.13.6" - resolved "https://registry.yarnpkg.com/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.13.6.tgz#30c29582eb537a7ec3ba2730c07b66101985177b" - integrity sha512-Ziv7fVdXNYATziITy1sXjMMg6e3NTJymUFdzkqYPVYl2CMszuXKS7LM7xTbwrcJ6og0eKhofyiGznR0TEvUMlg== - dependencies: - d3-array "^2.0.3" - d3-selection "^1.4.0" - d3-tip "^0.9.1" - prop-types "^15.6.2" - "@superset-ui/legacy-plugin-chart-word-cloud@^0.11.15": version "0.11.15" resolved "https://registry.yarnpkg.com/@superset-ui/legacy-plugin-chart-word-cloud/-/legacy-plugin-chart-word-cloud-0.11.15.tgz#70a146aaf3cf1977c29086c069f0216325f092b2" @@ -3270,11 +3260,6 @@ d3-cloud "^1.2.1" prop-types "^15.6.2" -"@superset-ui/query@0.13.6": - version "0.13.6" - resolved "https://registry.yarnpkg.com/@superset-ui/query/-/query-0.13.6.tgz#e9c4cba4b7e5181491429e15d5badf97e307a036" - integrity sha512-wJvqXuzv9vJNxDPKNAaHzCCly7LF8UP9AQ1zdoA88QcfYJqCzNvbt3j8XSR4nABrvNVZHnsn67wQNG4HS/IPpQ== - "@svgr/babel-plugin-add-jsx-attribute@^4.2.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1" From 9d1b4e98ccf9b3a1583688f7fbacaf6918b6ffe3 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Mon, 18 May 2020 15:58:28 -0700 Subject: [PATCH 12/19] fixing dependencies --- .../src/BigNumber/BigNumber.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx index 5726e95fa0..b7542fe380 100644 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx +++ b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx @@ -23,10 +23,10 @@ import { getNumberFormatter } from '@superset-ui/number-format'; import { XYChart, AreaSeries, CrossHair, LinearGradient } from '@data-ui/xy-chart'; import { BRAND_COLOR } from '@superset-ui/color'; import { computeMaxFontSize } from '@superset-ui/dimension'; -import NumberFormatter from '@superset-ui/number-format/src/NumberFormatter'; +import { NumberFormatter } from '@superset-ui/number-format'; import styled from '@superset-ui/style'; import { smartDateVerboseFormatter } from '@superset-ui/time-format'; -import TimeFormatter from '@superset-ui/time-format/src/TimeFormatter'; +import { TimeFormatter } from '@superset-ui/time-format'; import './BigNumber.css'; From 4df80a44363294ec36033cb30ee01c7adb03a465 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 19 May 2020 23:42:45 -0700 Subject: [PATCH 13/19] moving style package to peer deps to fix some SUPER annoying errors --- plugins/legacy-preset-chart-big-number/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json index 316c3a7af5..f7e1cbd7a1 100644 --- a/plugins/legacy-preset-chart-big-number/package.json +++ b/plugins/legacy-preset-chart-big-number/package.json @@ -29,13 +29,14 @@ }, "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/style": "^0.13.11", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", + "emotion-theming": "^10.0.27", "shortid": "^2.2.14" }, "peerDependencies": { + "@superset-ui/style": "^0.13.11", "@superset-ui/chart": "^0.13.0", "@superset-ui/color": "^0.13.0", "@superset-ui/control-utils": "^0.13.0", From c2b7b4a9112b8cfc7187c20293723f59c36246f4 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 19 May 2020 23:43:08 -0700 Subject: [PATCH 14/19] nixing css style, to let Emotion do the talking --- .../legacy-preset-chart-big-number/src/BigNumber/BigNumber.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css index 8be19736ff..10918e2604 100644 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css +++ b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css @@ -17,8 +17,6 @@ * under the License. */ .superset-legacy-chart-big-number { - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, - Open Sans, Helvetica Neue, sans-serif; position: relative; display: flex; flex-direction: column; From da4c148cd790e09b657285b3c13aabe2a8876e78 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Tue, 19 May 2020 23:43:42 -0700 Subject: [PATCH 15/19] moving wordCloud to style pkg to peerDeps. --- plugins/plugin-chart-word-cloud/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugin-chart-word-cloud/package.json b/plugins/plugin-chart-word-cloud/package.json index 5f6bf71c8a..698d529bb7 100644 --- a/plugins/plugin-chart-word-cloud/package.json +++ b/plugins/plugin-chart-word-cloud/package.json @@ -33,7 +33,6 @@ "@types/react": "^16.3.0", "d3-cloud": "^1.2.5", "d3-scale": "^3.0.1", - "@superset-ui/style": "^0.13.11", "encodable": "^0.3.3" }, "peerDependencies": { @@ -41,6 +40,7 @@ "@superset-ui/color": "^0.13.0", "@superset-ui/query": "^0.13.0", "@superset-ui/translation": "^0.13.0", + "@superset-ui/style": "^0.13.11", "@superset-ui/validator": "^0.13.0", "react": "^16.3.0" } From 81ba264451d0fc8c635abc7ee5eee5297d461024 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 20 May 2020 15:09:52 -0700 Subject: [PATCH 16/19] Nixing CSS file, putting all the styles in one place at export --- .../src/BigNumber/BigNumber.css | 69 ----------------- .../src/BigNumber/BigNumber.tsx | 74 ++++++++++++++----- 2 files changed, 56 insertions(+), 87 deletions(-) delete mode 100644 plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css deleted file mode 100644 index 10918e2604..0000000000 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.css +++ /dev/null @@ -1,69 +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. - */ -.superset-legacy-chart-big-number { - position: relative; - display: flex; - flex-direction: column; - justify-content: center; -} - -.superset-legacy-chart-big-number.no-trendline .subheader-line { - padding-bottom: 0.3em; -} - -.superset-legacy-chart-big-number .text-container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; -} - -.superset-legacy-chart-big-number .text-container .alert { - font-size: 11px; - margin: -0.5em 0 0.4em; - line-height: 1; - padding: 2px 4px 3px; - border-radius: 3px; -} - -.superset-legacy-chart-big-number .header-line { - position: relative; - line-height: 1em; -} - -.superset-legacy-chart-big-number .header-line span { - position: absolute; - bottom: 0; -} - -.superset-legacy-chart-big-number .subheader-line { - line-height: 1em; - padding-bottom: 0; - font-weight: 200; -} - -.superset-legacy-chart-big-number.is-fallback-value .header-line, -.superset-legacy-chart-big-number.is-fallback-value .subheader-line { - opacity: 0.5; -} - -.superset-data-ui-tooltip { - z-index: 1000; - background: #000; -} diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx index b7542fe380..9319c16cc7 100644 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx +++ b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx @@ -28,19 +28,6 @@ import styled from '@superset-ui/style'; import { smartDateVerboseFormatter } from '@superset-ui/time-format'; import { TimeFormatter } from '@superset-ui/time-format'; -import './BigNumber.css'; - -const Header = styled.div` - font-family: ${({ theme }) => theme.typography.families.sansSerif}; - font-weight: ${({ theme }) => theme.typography.weights.bold}; -`; - -// once more theme variables are available, put them here -const SubHeader = styled.div` - font-family: ${({ theme }) => theme.typography.families.sansSerif}; - font-weight: ${({ theme }) => theme.typography.weights.bold}; -`; - const defaultNumberFormatter = getNumberFormatter(); const CHART_MARGIN = { @@ -163,7 +150,7 @@ class BigNumberVis extends React.PureComponent { container.remove(); return ( -
{ }} > {text} -
+ ); } @@ -200,7 +187,7 @@ class BigNumberVis extends React.PureComponent { container.remove(); return ( - { }} > {text} - + ); } return null; @@ -314,4 +301,55 @@ class BigNumberVis extends React.PureComponent { } } -export default BigNumberVis; +export default styled(BigNumberVis)` + font-family: ${({ theme }) => theme.typography.families.sansSerif}; + position: relative; + display: flex; + flex-direction: column; + justify-content: center; + + &.no-trendline .subheader-line { + padding-bottom: 0.3em; + } + + .text-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + .alert { + font-size: ${({ theme }) => theme.typography.sizes.s}; + margin: -0.5em 0 0.4em; + line-height: 1; + padding: 2px 4px 3px; + border-radius: 3px; + } + } + + .header-line { + font-weight: ${({ theme }) => theme.typography.weights.normal}; + position: relative; + line-height: 1em; + span { + position: absolute; + bottom: 0; + } + } + + .subheader-line { + font-weight: ${({ theme }) => theme.typography.weights.light}; + line-height: 1em; + padding-bottom: 0; + } + + &.is-fallback-value{ + .header-line, .subheader-line { + opacity: 0.5; + } + + .superset-data-ui-tooltip { + z-index: 1000; + background: #000; + } + +`; From 812fff1af90c98d8c010a8309312d02f5cad8362 Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 20 May 2020 15:21:27 -0700 Subject: [PATCH 17/19] condensing imports --- .../src/BigNumber/BigNumber.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx index 9319c16cc7..b474a84317 100644 --- a/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx +++ b/plugins/legacy-preset-chart-big-number/src/BigNumber/BigNumber.tsx @@ -19,14 +19,13 @@ import React from 'react'; import shortid from 'shortid'; import { t } from '@superset-ui/translation'; -import { getNumberFormatter } from '@superset-ui/number-format'; +import { getNumberFormatter, NumberFormatter } from '@superset-ui/number-format'; import { XYChart, AreaSeries, CrossHair, LinearGradient } from '@data-ui/xy-chart'; import { BRAND_COLOR } from '@superset-ui/color'; import { computeMaxFontSize } from '@superset-ui/dimension'; -import { NumberFormatter } from '@superset-ui/number-format'; + import styled from '@superset-ui/style'; -import { smartDateVerboseFormatter } from '@superset-ui/time-format'; -import { TimeFormatter } from '@superset-ui/time-format'; +import { smartDateVerboseFormatter, TimeFormatter } from '@superset-ui/time-format'; const defaultNumberFormatter = getNumberFormatter(); From 3a908f176d45aea16417127647697fa189abf6df Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 20 May 2020 15:29:28 -0700 Subject: [PATCH 18/19] nixing extraneous package --- plugins/legacy-preset-chart-big-number/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json index f7e1cbd7a1..b6ddeb393f 100644 --- a/plugins/legacy-preset-chart-big-number/package.json +++ b/plugins/legacy-preset-chart-big-number/package.json @@ -32,7 +32,6 @@ "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", - "emotion-theming": "^10.0.27", "shortid": "^2.2.14" }, "peerDependencies": { From 3625735bdf5a1bf58d3fdab9e754214134a373ce Mon Sep 17 00:00:00 2001 From: Evan Rusackas Date: Wed, 20 May 2020 15:34:32 -0700 Subject: [PATCH 19/19] getting emotion stuff out of word cloud for now (that's another PR!) --- plugins/plugin-chart-word-cloud/package.json | 1 - plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/plugin-chart-word-cloud/package.json b/plugins/plugin-chart-word-cloud/package.json index 698d529bb7..b33c00af19 100644 --- a/plugins/plugin-chart-word-cloud/package.json +++ b/plugins/plugin-chart-word-cloud/package.json @@ -40,7 +40,6 @@ "@superset-ui/color": "^0.13.0", "@superset-ui/query": "^0.13.0", "@superset-ui/translation": "^0.13.0", - "@superset-ui/style": "^0.13.11", "@superset-ui/validator": "^0.13.0", "react": "^16.3.0" } diff --git a/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx b/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx index f5c904df8b..f6a5284a62 100644 --- a/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx +++ b/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx @@ -1,7 +1,6 @@ import React from 'react'; import cloudLayout, { Word } from 'd3-cloud'; import { PlainObject } from 'encodable'; -import { supersetTheme } from '@superset-ui/style'; import { WordCloudEncoding, wordCloudEncoderFactory } from './Encoder'; export const ROTATION = { @@ -94,9 +93,7 @@ export default class WordCloud extends React.PureComponent< .padding(5) .rotate(ROTATION[rotation] || ROTATION.flat) .text(d => encoder.channels.text.getValueFromDatum(d)) - .font(d => - encoder.channels.fontFamily.encodeDatum(d, supersetTheme.typography.families.sansSerif), - ) + .font(d => encoder.channels.fontFamily.encodeDatum(d, 'Helvetica')) .fontWeight(d => encoder.channels.fontWeight.encodeDatum(d, 'normal')) .fontSize(d => encoder.channels.fontSize.encodeDatum(d, 0)) .on('end', this.setWords)