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 Partition plugin #19521

Merged
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,25 @@
"name": "@superset-ui/legacy-plugin-chart-partition",
"version": "0.18.25",
"description": "Superset Legacy Chart - Partition",
"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",
"d3-hierarchy": "^1.1.8",
Expand All @@ -35,7 +29,10 @@
"peerDependencies": {
"@superset-ui/chart-controls": "*",
"@superset-ui/core": "*",
"react": "^16.13.1",
"enzyme": "*"
"enzyme": "*",
"react": "^16.13.1"
},
"publishConfig": {
"access": "public"
}
}

This file was deleted.

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

// Compute dx, dy, x, y for each node and
// return an array of nodes in breadth-first order
Expand Down Expand Up @@ -274,7 +273,7 @@ function Icicle(element, props) {
'<tr>' +
'<td>' +
'<div ' +
`style='border: 2px solid ${atNode ? 'black' : 'transparent'};` +
`style='border: 2px solid ${atNode ? 'white' : 'transparent'};` +
Copy link
Member

@geido geido Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michael-s-molina should we use the available white from the theme vars?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! I removed the condition and used the transparent border to always show the partition's colors. Previously, when the user was hovering over a partition, the leaf was white. Now the leaf obeys the color of the partition. I think it's more intuitive.

`background-color: ${n.color};'` +
'></div>' +
'</td>' +
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/**
* 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 './Partition';

const ReactComponent = reactify(Component);

const Partition = ({ className, ...otherProps }) => (
<div className={className}>
<ReactComponent {...otherProps} />
</div>
);

export default styled(Partition)`
${({ theme }) => `
.superset-legacy-chart-partition {
position: relative;
}

.superset-legacy-chart-partition .chart {
display: block;
margin: auto;
font-size: ${theme.typography.sizes.s}px;
}

.superset-legacy-chart-partition rect {
stroke: ${theme.colors.grayscale.light2};
fill: ${theme.colors.grayscale.light1};
fill-opacity: ${theme.opacity.heavy};
transition: fill-opacity 180ms linear;
cursor: pointer;
}

.superset-legacy-chart-partition rect:hover {
fill-opacity: 1;
}

.superset-legacy-chart-partition g text {
font-weight: ${theme.typography.weights.bold};
fill: ${theme.colors.grayscale.dark1};
}

.superset-legacy-chart-partition g:hover text {
fill: ${theme.colors.grayscale.dark2};
}

.superset-legacy-chart-partition .partition-tooltip {
position: absolute;
top: 0;
left: 0;
opacity: 0;
padding: ${theme.gridUnit}px;
pointer-events: none;
background-color: ${theme.colors.grayscale.dark2};
border-radius: ${theme.gridUnit}px;
}

.partition-tooltip td {
padding-left: ${theme.gridUnit}px;
font-size: ${theme.typography.sizes.s}px;
color: ${theme.colors.grayscale.light5};
}
`}
`;