From c4baa826d516a60325386fad4c36fff1f9fdc7d0 Mon Sep 17 00:00:00 2001 From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com> Date: Wed, 6 Apr 2022 07:39:16 -0300 Subject: [PATCH] refactor: Removes the CSS files from the Country Map plugin (#19538) --- .../package.json | 6 +- .../src/CountryMap.js | 1 - .../src/ReactCountryMap.js | 22 ------ .../src/ReactCountryMap.jsx | 76 +++++++++++++++++++ 4 files changed, 78 insertions(+), 27 deletions(-) delete mode 100644 superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.js create mode 100644 superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json b/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json index 4df451823250e..1b4ee339e8359 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json +++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json @@ -2,9 +2,6 @@ "name": "@superset-ui/legacy-plugin-chart-country-map", "version": "0.18.25", "description": "Superset Legacy Chart - Country Map", - "sideEffects": [ - "*.css" - ], "main": "lib/index.js", "module": "esm/index.js", "files": [ @@ -34,6 +31,7 @@ }, "peerDependencies": { "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*" + "@superset-ui/core": "*", + "react": "^16.13.1" } } diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js index d363e8a5980b5..61ca6cc2fe76b 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js +++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.js @@ -26,7 +26,6 @@ import { CategoricalColorNamespace, } from '@superset-ui/core'; import countries, { countryOptions } from './countries'; -import './CountryMap.css'; const propTypes = { data: PropTypes.arrayOf( diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.js b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.js deleted file mode 100644 index 40fc6e8347178..0000000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.js +++ /dev/null @@ -1,22 +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 { reactify } from '@superset-ui/core'; -import Component from './CountryMap'; - -export default reactify(Component); diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx new file mode 100644 index 0000000000000..f6e532aa46daa --- /dev/null +++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/ReactCountryMap.jsx @@ -0,0 +1,76 @@ +/** + * 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 React from 'react'; +import { reactify, styled } from '@superset-ui/core'; +import Component from './CountryMap'; + +const ReactComponent = reactify(Component); + +const CountryMap = ({ className, ...otherProps }) => ( +
+ +
+); + +export default styled(CountryMap)` + ${({ theme }) => ` + .superset-legacy-chart-country-map svg { + background-color: ${theme.colors.grayscale.light5}; + } + + .superset-legacy-chart-country-map { + position: relative; + } + + .superset-legacy-chart-country-map .background { + fill: ${theme.colors.grayscale.light5}; + pointer-events: all; + } + + .superset-legacy-chart-country-map .map-layer { + fill: ${theme.colors.grayscale.light5}; + stroke: ${theme.colors.grayscale.light1}; + } + + .superset-legacy-chart-country-map .effect-layer { + pointer-events: none; + } + + .superset-legacy-chart-country-map .text-layer { + color: ${theme.colors.grayscale.dark1}; + text-anchor: middle; + pointer-events: none; + } + + .superset-legacy-chart-country-map text.result-text { + font-weight: ${theme.typography.weights.light}; + font-size: ${theme.typography.sizes.xl}px; + } + + .superset-legacy-chart-country-map text.big-text { + font-weight: ${theme.typography.weights.bold}; + font-size: ${theme.typography.sizes.l}px; + } + + .superset-legacy-chart-country-map path.region { + cursor: pointer; + stroke: ${theme.colors.grayscale.light2}; + } + `} +`;