diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json index 3810ff1e45886..247e408b772ff 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json +++ b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json @@ -2,31 +2,25 @@ "name": "@superset-ui/legacy-plugin-chart-sankey-loop", "version": "0.18.25", "description": "Superset Legacy Chart - Sankey Diagram with Loops", - "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-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", @@ -34,6 +28,10 @@ }, "peerDependencies": { "@superset-ui/chart-controls": "*", - "@superset-ui/core": "*" + "@superset-ui/core": "*", + "react": "^16.13.1" + }, + "publishConfig": { + "access": "public" } } diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.js b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.js deleted file mode 100644 index 034f97588c239..0000000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.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 './SankeyLoop'; - -export default reactify(Component); diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx new file mode 100644 index 0000000000000..4f72433ac9eaa --- /dev/null +++ b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/ReactSankeyLoop.jsx @@ -0,0 +1,72 @@ +/** + * 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 './SankeyLoop'; + +const ReactComponent = reactify(Component); + +const Sankey = ({ className, ...otherProps }) => ( +
+ +
+); + +export default styled(Sankey)` + ${({ theme }) => ` + .superset-legacy-chart-sankey-loop .node rect { + cursor: move; + fill-opacity: ${theme.opacity.heavy}; + shape-rendering: crispEdges; + } + + .superset-legacy-chart-sankey-loop .node text { + pointer-events: none; + text-shadow: 0 1px 0 ${theme.colors.grayscale.light5}; + } + + .superset-legacy-chart-sankey-loop .link { + fill: none; + stroke: ${theme.colors.grayscale.dark2}; + stroke-opacity: ${theme.opacity.light}; + } + + .superset-legacy-chart-sankey-loop .link:hover { + stroke-opacity: ${theme.opacity.mediumHeavy}; + } + + .superset-legacy-chart-sankey-loop .link path { + opacity: ${theme.opacity.mediumLight}; + stroke-opacity: 0; + } + + .superset-legacy-chart-sankey-loop .link:hover path { + opacity: ${theme.opacity.heavy}; + } + + .superset-legacy-chart-sankey-loop .link text { + fill: ${theme.colors.grayscale.base}; + font-size: ${theme.gridUnit * 3}px; + } + + .superset-legacy-chart-sankey-loop .link:hover text { + opacity: 1; + } + `} +`; diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.css b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.css deleted file mode 100644 index 0cd18e91021ef..0000000000000 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.css +++ /dev/null @@ -1,57 +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-sankey-loop .node rect { - cursor: move; - fill-opacity: 0.9; - shape-rendering: crispEdges; -} - -.superset-legacy-chart-sankey-loop .node text { - pointer-events: none; - text-shadow: 0 1px 0 #fff; -} - -.superset-legacy-chart-sankey-loop .link { - fill: none; - stroke: #000; - stroke-opacity: 0.2; -} - -.superset-legacy-chart-sankey-loop .link:hover { - stroke-opacity: 0.5; -} - -.superset-legacy-chart-sankey-loop .link path { - opacity: 0.2; - stroke-opacity: 0; -} - -.superset-legacy-chart-sankey-loop .link:hover path { - opacity: 0.5; -} - -.superset-legacy-chart-sankey-loop .link text { - fill: #666; - font-size: 10px; -} - -.superset-legacy-chart-sankey-loop .link:hover text { - opacity: 1; -} diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js index 4d6f059fdeb10..33a3490159615 100644 --- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js +++ b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/src/SankeyLoop.js @@ -26,8 +26,6 @@ import { CategoricalColorNamespace, } from '@superset-ui/core'; -import './SankeyLoop.css'; - // a problem with 'd3-sankey-diagram' is that the sankey().extent() paramters, which // informs the layout of the bounding box of the sankey columns, does not account // for labels and paths which happen to be layedout outside that rectangle.