Merge pull request #2628 from pie-framework/feat/PD-5063-lodash

refactor(multiple-choice): replace lodash methods with native JavaScr…

Author: CarlaCostea

packages/multiple-choice/src/__tests__/choice-input-test.jsx

@@ -1,32 +1,30 @@
 import React from 'react';
-import _ from 'lodash';
 import { shallow, mount } from 'enzyme';
 import { ChoiceInput } from '../choice-input';
 import toJson from 'enzyme-to-json';
 
 describe('ChoiceInput', () => {
   let onChange, wrapper;
 
-  const mkWrapper = (opts = {}) => {
-    opts = _.extend(
-      {
-        checked: false,
-        disabled: false,
-        choiceMode: 'checkbox',
-        label: 'label',
-        displayKey: '1',
-        correctness: 'correct',
-        value: 'value',
-        classes: {
-          label: 'label',
-        },
-      },
-      opts,
-    );
-
-    return shallow(<ChoiceInput {...opts} onChange={onChange} />);
+ const mkWrapper = (opts = {}) => {
+  const defaultOpts = {
+    checked: false,
+    disabled: false,
+    choiceMode: 'checkbox',
+    label: 'label',
+    displayKey: '1',
+    correctness: 'correct',
+    value: 'value',
+    classes: {
+      label: 'label',
+    },
   };
 
+  const finalOpts = { ...defaultOpts, ...opts };
+
+  return shallow(<ChoiceInput {...finalOpts} onChange={onChange} />);
+};
+
   beforeEach(() => {
     onChange = jest.fn();
     wrapper = mkWrapper();

packages/multiple-choice/src/__tests__/multiple-choice-test.jsx

@@ -1,8 +1,7 @@
 import React from 'react';
-import _ from 'lodash';
 import { shallow } from 'enzyme';
 import { MultipleChoice, Choice } from '../multiple-choice';
-import {CorrectAnswerToggle} from '@pie-lib/pie-toolbox/correct-answer-toggle';
+import { CorrectAnswerToggle } from '@pie-lib/pie-toolbox/correct-answer-toggle';
 
 describe('Choice', () => {
   let wrapper,
@@ -67,17 +66,15 @@ describe('CorespringChoice', () => {
 
   let mkWrapper = (opts, clone = true) => {
     opts = clone
-      ? (opts = _.merge(
-          {
-            classes: {},
-            choices: [],
-            disabled: false,
-            keyMode: 'letters',
-            onChoiceChanged: jest.fn(),
-            mode: 'gather',
-          },
-          opts,
-        ))
+      ? {
+        classes: {},
+        choices: [],
+        disabled: false,
+        keyMode: 'letters',
+        onChoiceChanged: jest.fn(),
+        mode: 'gather',
+        ...opts
+      }
       : opts;
 
     return shallow(<MultipleChoice {...opts} />);

packages/multiple-choice/src/session-updater.js

@@ -1,14 +1,10 @@
-import concat from 'lodash/concat';
-import uniq from 'lodash/uniq';
-import without from 'lodash/without';
-
 export function updateSessionValue(session, choiceMode, data) {
   session.value = session.value || [];
   if (choiceMode === 'checkbox') {
     if (data.selected) {
-      session.value = uniq(concat(session.value, [data.value]));
+      session.value = Array.from(new Set([...session.value, data.value]));
     } else {
-      session.value = without(session.value, data.value);
+      session.value = session.value.filter(v => v !== data.value);
     }
   }