refactor: clean up class switching

patw0929 · Mar 1, 2020 · 07a7035 · 07a7035
1 parent 7b02ab0
commit 07a7035
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/src/components/CountryList.js b/src/components/CountryList.js
@@ -1,3 +1,4 @@
+
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -23,16 +24,15 @@ export default class CountryList extends Component {
     const shouldUpdate = !utils.shallowEquals(this.props, nextProps);
 
     if (shouldUpdate && nextProps.showDropdown) {
-      this.listElement.setAttribute('class', 'country-list v-hide');
+      this.listElement.classList.add('v-hide');
       this.setDropdownPosition();
     }
 
     return shouldUpdate;
   }
 
   setDropdownPosition = () => {
-    utils.removeClass(this.listElement, 'hide');
-
+    this.listElement.classList.remove('hide')
     const inputTop = this.props.inputTop;
     const windowTop =
       window.pageYOffset !== undefined
@@ -60,7 +60,7 @@ export default class CountryList extends Component {
         : '';
 
     this.listElement.style.top = cssTop;
-    this.listElement.setAttribute('class', 'country-list');
+    this.listElement.classList.remove('v-hide')
   };
 
   appendListItem = (countries, isPreferred = false) => {

diff --git a/src/components/__tests__/utils.test.js b/src/components/__tests__/utils.test.js
@@ -156,17 +156,6 @@ describe('utils', () => {
     expect(element.classList.contains('efg')).toBeTruthy();
   });
 
-  it('removeClass', () => {
-    const DEFAULT_HTML = `<html><body>
-      <div class="abc cde">test</div>
-    </body></html>`;
-    const doc = jsdom.jsdom(DEFAULT_HTML);
-    const element = doc.querySelector('.abc');
-
-    utils.removeClass(element, 'abc');
-
-    expect(element.classList.contains('abc')).toBeFalsy();
-  });
 
   it('findIndex', () => {
     let array = [];

diff --git a/src/components/utils.js b/src/components/utils.js
@@ -188,16 +188,6 @@ export default {
     }
   },
 
-  removeClass(el, className) {
-    if (el.classList) {
-      el.classList.remove(className);
-    } else if (this.hasClass(el, className)) {
-      const reg = new RegExp(`(\\s|^)${className}(\\s|$)`);
-
-      el.className = el.className.replace(reg, ' ');
-    }
-  },
-
   findIndex(items, predicate) {
     let index = -1;