chore(chart-forced-directed): use emotion style (apache#643)

zhaoyongjie · Nov 17, 2021 · 7d047a0 · 7d047a0
1 parent ff4000e
commit 7d047a0
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json b/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/package.json
@@ -28,12 +28,14 @@
     "access": "public"
   },
   "dependencies": {
-    "d3": "^3.5.17",
-    "prop-types": "^15.6.2"
+    "d3": "^3.5.17"
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.14.0",
     "@superset-ui/chart-controls": "^0.14.0",
-    "@superset-ui/translation": "^0.14.0"
+    "@superset-ui/style": "^0.14.3",
+    "@superset-ui/translation": "^0.14.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.13.1"
   }
 }
diff --git a/..._superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/ForceDirected.css b/..._superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/ForceDirected.css
diff --git a/...y_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/ForceDirected.js b/...y_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/ForceDirected.js
@@ -19,7 +19,6 @@
 /* eslint-disable react/sort-prop-types, func-names, no-param-reassign */
 import d3 from 'd3';
 import PropTypes from 'prop-types';
-import './ForceDirected.css';
 
 const propTypes = {
   data: PropTypes.arrayOf(

diff --git a/...-force-directed/src/ReactForceDirected.js → ...force-directed/src/ReactForceDirected.jsx b/...-force-directed/src/ReactForceDirected.js → ...force-directed/src/ReactForceDirected.jsx
@@ -16,7 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { reactify } from '@superset-ui/chart';
+import styled from '@superset-ui/style';
+import PropTypes from 'prop-types';
 import Component from './ForceDirected';
 
-export default reactify(Component);
+const ReactComponent = reactify(Component);
+
+const ForceDirected = ({ className, ...otherProps }) => {
+  return (
+    <div className={className}>
+      <ReactComponent {...otherProps} />
+    </div>
+  );
+};
+
+ForceDirected.propTypes = {
+  className: PropTypes.string.isRequired,
+};
+
+export default styled(ForceDirected)`
+  .superset-legacy-chart-force-directed {
+    path.link {
+      fill: none;
+      stroke: #000;
+      stroke-width: 1.5px;
+    }
+    circle {
+      fill: #ccc;
+      stroke: #000;
+      stroke-width: 1.5px;
+      stroke-opacity: 1;
+      opacity: 0.75;
+    }
+    text {
+      fill: #000;
+      font: 10px sans-serif;
+      pointer-events: none;
+    }
+  }
+`;
diff --git a/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/index.js b/...temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/index.js
@@ -33,7 +33,7 @@ const metadata = new ChartMetadata({
 export default class ForceDirectedChartPlugin extends ChartPlugin {
   constructor() {
     super({
-      loadChart: () => import('./ReactForceDirected.js'),
+      loadChart: () => import('./ReactForceDirected'),
       metadata,
       transformProps,
       controlPanel,

diff --git a/...nd/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json b/...nd/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/package.json
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "@superset-ui/chart": "^0.14.0",
-    "@superset-ui/chart-controls": "^0.14.0",
+    "@superset-ui/chart-controls": "^0.14.3",
     "@superset-ui/number-format": "^0.14.0",
     "@superset-ui/translation": "^0.14.0"
   }