Remove support for Immutable-js

Author: anajavi

packages/react-jsx-highcharts/package-lock.json

@@ -76,8 +76,6 @@
     "eslint-plugin-react-hooks": "^2.0.1",
     "eslint-plugin-react-perf": "^3.2.1",
     "highcharts": "^7.2.0",
-    "immutable": "^4.0.0-0",
-    "immutable3": "npm:immutable@^3.8.1",
     "jest": "^24.9.0",
     "jest-enzyme": "^7.1.1",
     "lodash-webpack-plugin": "^0.11.5",
@@ -91,8 +89,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "immutable-is": "^3.7.6",
-    "is-immutable": "^1.0.1",
     "lodash-es": "^4.17.13",
     "uuid": "^3.3.3"
   },

packages/react-jsx-highcharts/package.json

@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import uuid from 'uuid/v4';
 import { isEqual } from 'lodash-es';
 import { attempt } from 'lodash-es';
-import isImmutable from 'is-immutable';
-import immutableEqual from 'immutable-is';
 import SeriesContext from '../SeriesContext';
 import { getNonEventHandlerProps, getEventsConfig } from '../../utils/events';
 import getModifiedProps from '../../utils/getModifiedProps';
@@ -80,10 +78,7 @@ const Series = memo(({
 
     let doRedraw = false;
     // Using setData is more performant than update
-    if (isImmutable(data) && immutableEqual(data, prevProps.data) === false) {
-      series.setData(data.toJS(), false);
-      doRedraw = true;
-    } else if (isEqual(data, prevProps.data) === false) {
+    if (isEqual(data, prevProps.data) === false) {
       series.setData(data, false);
       doRedraw = true;
     }
@@ -127,13 +122,12 @@ const getSeriesConfig = (props, axis, requiresAxis) => {
   const { id, data, ...rest } = props;
 
   const seriesId = typeof id === 'function' ? id() : id;
-  const seriesData = isImmutable(data) ? data.toJS() : data;
   const nonEventProps = getNonEventHandlerProps(rest);
   const events = getEventsConfig(rest);
 
   const config = {
     id: seriesId,
-    data: seriesData,
+    data,
     events,
     ...nonEventProps
   };

packages/react-jsx-highcharts/src/components/Series/Series.js

@@ -1,6 +1,4 @@
 import React from 'react';
-import { List as List4 } from 'immutable';
-import { List as List3 } from 'immutable3';
 import { Highcharts, createMockProvidedChart, createMockProvidedAxis, createMockSeries, uuidRegex } from '../../test-utils';
 import Series from '../../../src/components/Series/Series';
 import HighchartsContext from '../../../src/components/HighchartsContext';
@@ -115,20 +113,6 @@ describe('<Series />', () => {
       }), false);
     });
 
-    [List3, List4].forEach((List) => {
-      it('supports mounting with Immutable List data', () => {
-        const data = [1, 2, 3, 4, 5];
-        mount(
-          <ProvidedSeries id="mySeries" data={List(data)} />
-        );
-        expect(testContext.chartStubs.addSeries).toHaveBeenCalledWith(expect.objectContaining(
-          { id: 'mySeries', yAxis: 'myAxis', type: 'line', data, visible: true }
-        ), false);
-        // test immutable 3
-        testContext.chartStubs.addSeries.mockClear();
-      });
-    });
-
     it('throws Error when requiresAxis=true and mounted without axis', () => {
       testContext.propsFromProviders.axis = null;
 
@@ -178,36 +162,6 @@ describe('<Series />', () => {
       expect(testContext.seriesStubs.setVisible).not.toHaveBeenCalled();
       expect(testContext.needsRedraw).not.toHaveBeenCalled();
     });
-    [List3, List4].forEach((List) => {
-      it('should use the setData method on the correct series when the Immutable List changes', () => {
-        const wrapper = mount(
-          <ProvidedSeries
-            id="mySeries" data={List([1, 2, 3])} />
-        );
-        const newData = [1, 2, 3, 4, 5];
-        testContext.seriesStubs.update.mockReset();
-        wrapper.setProps({ data: List(newData) });
-        expect(testContext.seriesStubs.setData).toHaveBeenCalledWith(newData, false);
-        expect(testContext.seriesStubs.update).not.toHaveBeenCalled();
-        expect(testContext.seriesStubs.setVisible).not.toHaveBeenCalled();
-      });
-    });
-    [List3, List4].forEach((List) => {
-      it('should NOT use the setData method if the Immutable List hasn\'t changed', () => {
-        const wrapper = mount(
-          <ProvidedSeries
-            id="mySeries" data={List([1, 2, 3])} />
-        );
-        testContext.seriesStubs.update.mockReset();
-        testContext.needsRedraw.mockClear();
-
-        wrapper.setProps({ data: List([1, 2, 3]) });
-        expect(testContext.seriesStubs.setData).not.toHaveBeenCalled();
-        expect(testContext.seriesStubs.update).not.toHaveBeenCalled();
-        expect(testContext.seriesStubs.setVisible).not.toHaveBeenCalled();
-        expect(testContext.needsRedraw).not.toHaveBeenCalled();
-      });
-  });
 
     it('should use the setVisible method on the correct series when the visibility changes', () => {
       const wrapper = mount(

packages/react-jsx-highcharts/test/components/Series/Series.spec.js

@@ -37,12 +37,6 @@ const webpackConfig = {
       commonjs2: 'highcharts',
       amd: 'highcharts',
       root: 'Highcharts'
-    },
-    'immutable': {
-      commonjs: 'immutable',
-      commonjs2: 'immutable',
-      amd: 'immutable',
-      root: 'Immutable'
     }
   },
 

packages/react-jsx-highcharts/webpack.config.js

@@ -37,12 +37,6 @@ const webpackConfig = {
       commonjs2: 'highcharts',
       amd: 'highcharts',
       root: 'Highcharts'
-    },
-    'immutable': {
-      commonjs: 'immutable',
-      commonjs2: 'immutable',
-      amd: 'immutable',
-      root: 'Immutable'
     }
   },
 

packages/react-jsx-highmaps/webpack.config.js

@@ -37,12 +37,6 @@ const webpackConfig = {
       commonjs2: 'highcharts',
       amd: 'highcharts',
       root: 'Highcharts'
-    },
-    'immutable': {
-      commonjs: 'immutable',
-      commonjs2: 'immutable',
-      amd: 'immutable',
-      root: 'Immutable'
     }
   },