Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Removes the CSS files from the Rose plugin #19473

Merged
merged 1 commit into from
Apr 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions superset-frontend/plugins/legacy-plugin-chart-rose/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,37 @@
"name": "@superset-ui/legacy-plugin-chart-rose",
"version": "0.18.25",
"description": "Superset Legacy Chart - Nightingale Rose Diagram",
"sideEffects": [
"*.css"
],
"main": "lib/index.js",
"module": "esm/index.js",
"files": [
"esm",
"lib"
],
"repository": {
"type": "git",
"url": "git+https://github.com/apache-superset/superset-ui.git"
},
"keywords": [
"superset"
],
"author": "Superset",
"license": "Apache-2.0",
"homepage": "https://github.com/apache-superset/superset-ui#readme",
"bugs": {
"url": "https://github.com/apache-superset/superset-ui/issues"
},
"homepage": "https://github.com/apache-superset/superset-ui#readme",
"publishConfig": {
"access": "public"
"repository": {
"type": "git",
"url": "git+https://github.com/apache-superset/superset-ui.git"
},
"license": "Apache-2.0",
"author": "Superset",
"main": "lib/index.js",
"module": "esm/index.js",
"files": [
"esm",
"lib"
],
"dependencies": {
"d3": "^3.5.17",
"nvd3-fork": "^2.0.5",
"prop-types": "^15.6.2"
},
"peerDependencies": {
"@emotion/react": "^11.4.1",
"@superset-ui/chart-controls": "*",
"@superset-ui/core": "*",
"react": "^16.13.1"
},
"publishConfig": {
"access": "public"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/**
* 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, css } from '@superset-ui/core';
import { Global } from '@emotion/react';
import Component from './Rose';

const ReactComponent = reactify(Component);

const Rose = ({ className, ...otherProps }) => (
<div className={className}>
<Global
styles={theme => css`
.tooltip {
line-height: 1;
padding: ${theme.gridUnit * 3}px;
background: ${theme.colors.grayscale.dark2};
color: ${theme.colors.grayscale.light5};
border-radius: 4px;
pointer-events: none;
z-index: 1000;
font-size: ${theme.typography.sizes.s}px;
}
`}
/>
<ReactComponent {...otherProps} />
</div>
);

export default styled(Rose)`
${({ theme }) => `
.superset-legacy-chart-rose path {
transition: fill-opacity 180ms linear;
stroke: ${theme.colors.grayscale.light5};
stroke-width: 1px;
stroke-opacity: 1;
fill-opacity: 0.75;
}

.superset-legacy-chart-rose text {
font-weight: ${theme.typography.weights.normal};
font-size: ${theme.typography.sizes.s}px;
font-family: ${theme.typography.families.sansSerif};
pointer-events: none;
}

.superset-legacy-chart-rose .clickable path {
cursor: pointer;
}

.superset-legacy-chart-rose .hover path {
fill-opacity: 1;
}

.nv-legend .nv-series {
cursor: pointer;
}
`}
`;
43 changes: 0 additions & 43 deletions superset-frontend/plugins/legacy-plugin-chart-rose/src/Rose.css

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
getNumberFormatter,
CategoricalColorNamespace,
} from '@superset-ui/core';
import './Rose.css';

const propTypes = {
// Data is an object hashed by numeric value, perhaps timestamp
Expand Down Expand Up @@ -137,6 +136,7 @@ function Rose(element, props) {
legendWrap.datum(legendData(datum)).call(legend);

tooltip.headerFormatter(timeFormat).valueFormatter(format);
tooltip.classes('tooltip');

// Compute max radius, which the largest value will occupy
const roseHeight = height - legend.height();
Expand Down