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(chart-core): migrate chart core to TS #1816

Merged
merged 23 commits into from
Feb 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
10 changes: 0 additions & 10 deletions packages/dx-chart-core/.babelrc

This file was deleted.

16 changes: 0 additions & 16 deletions packages/dx-chart-core/.eslintrc.json

This file was deleted.

13 changes: 13 additions & 0 deletions packages/dx-chart-core/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
preset: 'ts-jest',
globals: {
'ts-jest': {
tsConfig: './tsconfig.json',
diagnostics: false,
},
},
moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
testMatch: [
'**/*.test.(ts|tsx)',
],
};
25 changes: 12 additions & 13 deletions packages/dx-chart-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,24 @@
"test:coverage": "jest --coverage",
"build": "rollup -c rollup.config.js",
"build:watch": "rollup -c rollup.config.js -w",
"lint": "eslint \"src/**\"",
"lint": "tslint -p tsconfig.lint.json",
"lint:fix": "yarn run lint -- --fix"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.3.1",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.0.0",
"@types/d3-array": "^1.2.5",
"@types/d3-scale": "^2.1.0",
"@types/d3-shape": "^1.3.0",
"core-js": "^2.6.3",
"eslint": "^5.13.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jest": "^22.2.2",
"jest": "^24.0.0",
"rollup": "^1.1.2",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-license": "^0.8.1"
"rollup-plugin-license": "^0.8.1",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^2.1.0",
"rollup-plugin-typescript2": "^0.19.2",
"ts-jest": "^23.10.5",
"tslint": "^5.12.1",
"tslint-config-airbnb": "^5.11.1",
"typescript": "^3.3.1"
},
"dependencies": {
"d3-array": "^2.0.3",
Expand Down
16 changes: 11 additions & 5 deletions packages/dx-chart-core/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import babel from 'rollup-plugin-babel';
import license from 'rollup-plugin-license';
import { default as typescriptRollup } from 'rollup-plugin-typescript2';
import replace from 'rollup-plugin-replace';
import typescript from 'typescript';
import { banner, external, globals } from '../../tools/rollup-utils';
import pkg from './package.json';

export default {
input: 'src/index.js',
input: 'src/index.ts',
output: [
{ file: pkg.main, format: 'umd', name: pkg.globalName, sourcemap: true, globals: globals() },
{ file: pkg.module, format: 'es', sourcemap: true },
],
external: external(__dirname),
plugins: [
babel({
runtimeHelpers: true,
exclude: 'node_modules/**',
typescriptRollup({
typescript,
useTsconfigDeclarationDir: true,
}),
replace({
'/** @class */': '/*#__PURE__*/',
delimiters: ['', ''],
}),
license({
banner,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from './computeds';

describe('Animation styles', () => {
const { head } = document; // eslint-disable-line no-undef
const { head } = document;

afterEach(() => {
const style = head.getElementsByTagName('style')[0];
Expand All @@ -19,7 +19,7 @@ describe('Animation styles', () => {
yScale.clamp = () => yScale;

it('should return style', () => {
expect(getAreaAnimationStyle({ yScale })).toEqual({
expect(getAreaAnimationStyle({ yScale } as any)).toEqual({
animation: 'animation_transform 1s',
transformOrigin: '0px 4px',
});
Expand All @@ -28,27 +28,28 @@ describe('Animation styles', () => {

describe('#getPieAnimationStyle', () => {
it('should return style', () => {
expect(getPieAnimationStyle({}, { index: 3 })).toEqual({
expect(getPieAnimationStyle({} as any, { index: 3 } as any)).toEqual({
animation: 'animation_pie 1s',
});
});
});

describe('#getScatterAnimationStyle', () => {
it('should return style', () => {
expect(getScatterAnimationStyle({})).toEqual({
expect(getScatterAnimationStyle({} as any)).toEqual({
animation: 'animation_scatter 1s',
});
});
});

describe('style element generation', () => {
it('should reuse single "style" element', () => {
getScatterAnimationStyle({}, null, 'test-point', 'test-series-name');
getScatterAnimationStyle({}, null, 'test-point', 'test-series-name');
getScatterAnimationStyle({} as any);
getScatterAnimationStyle({} as any);

expect(head.getElementsByTagName('style').length).toEqual(1);
expect(head.getElementsByTagName('style')[0].textContent).toEqual(
// tslint:disable-next-line: max-line-length
'\n@keyframes animation_scatter { 0% { opacity: 0; } 50% { opacity: 0; } 100% { opacity: 1 } }\n',
);
});
Expand All @@ -60,7 +61,7 @@ describe('#buildAnimatedStyleGetter', () => {
const getAnimationStyle = jest.fn().mockReturnValue({ animation: 'test' });

expect(buildAnimatedStyleGetter(
{ style: 'base' }, getAnimationStyle, 'test-scales', 'test-point',
{ style: 'base' }, getAnimationStyle, 'test-scales' as any, 'test-point' as any,
)).toEqual({
style: 'base',
animation: 'test',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import { Point, GetAnimationStyleFn, BuildAnimatedStyleGetter } from '../../types';

const ANIMATIONS = Symbol('animation');

const addKeyframe = (name, def) => {
const addKeyframe = (name: string, def: string): void => {
if (typeof document === 'undefined') {
return;
}
const head = document.getElementsByTagName('head')[0]; // eslint-disable-line no-undef
let style = Array.from(head.getElementsByTagName('style'))
.find(node => node.dataset[ANIMATIONS]);
const head = document.getElementsByTagName('head')[0];
let style: any = Array.from(head.getElementsByTagName('style'))
.find((node: any) => node.dataset[ANIMATIONS]);
if (!style) {
style = document.createElement('style'); // eslint-disable-line no-undef
style = document.createElement('style');
style.type = 'text/css';
style.dataset[ANIMATIONS] = true;
head.appendChild(style);
Expand Down Expand Up @@ -39,11 +41,11 @@ const getPieAnimationName = () => {

const getDefaultAreaAnimationOptions = () => '1s';

const getDefaultPieAnimationOptions = ({ index }) => `${0.7 + index * 0.1}s`;
const getDefaultPieAnimationOptions = ({ index }: Point) => `${0.7 + index * 0.1}s`;

export const getAreaAnimationStyle = (scales) => {
export const getAreaAnimationStyle: GetAnimationStyleFn = (scales) => {
const animationStyle = {
transformOrigin: `0px ${scales.yScale.copy().clamp(true)(0)}px`,
transformOrigin: `0px ${scales.yScale.copy().clamp!(true)(0)}px`,
};
const options = getDefaultAreaAnimationOptions();
return {
Expand All @@ -52,21 +54,21 @@ export const getAreaAnimationStyle = (scales) => {
};
};

export const getPieAnimationStyle = (scales, point) => {
const options = getDefaultPieAnimationOptions(point);
export const getPieAnimationStyle: GetAnimationStyleFn = (_, point) => {
const options = getDefaultPieAnimationOptions(point!);
return {
animation: `${getPieAnimationName()} ${options}`,
};
};

export const getScatterAnimationStyle = () => {
export const getScatterAnimationStyle: GetAnimationStyleFn = () => {
const options = getDefaultAreaAnimationOptions();
return {
animation: `${getScatterAnimationName()} ${options}`,
};
};

export const buildAnimatedStyleGetter = (
export const buildAnimatedStyleGetter: BuildAnimatedStyleGetter = (
style, getAnimationStyle, scales, point,
) => {
const animationStyle = getAnimationStyle(scales, point);
Expand Down
Loading