refactor(lodash): isEmpty (#2442)

* refactor(lodash): isEmpty reusing objectHasKeys strategy from the helper IFW-736 * refactor(lodash): remove isEmpty from server * chore(TS): clearer type * feedback: don't use objectHasKeys for array * fix implementation * refactor(example): remove lodash * fix(numeric): correct reimplementation of !isEmpty * chore(size): update expectation somewhat bigger for now, but in the long run it'll shrink
algolia · Jun 27, 2019 · a402d29 · a402d29
1 parent 527b879
commit a402d29
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/examples/react-native/src/Rating.js b/examples/react-native/src/Rating.js
@@ -17,7 +17,6 @@ import {
   connectMenu,
 } from 'react-instantsearch/connectors';
 import Stats from './components/Stats';
-import { isEmpty } from 'lodash';
 
 const searchClient = algoliasearch(
   'latency',
@@ -151,7 +150,8 @@ class Rating extends Component {
     const { refine, min, max, count, createURL } = this.props;
     const items = [];
     for (let i = max; i >= min; i--) {
-      const hasCount = !isEmpty(count.filter(item => Number(item.value) === i));
+      const hasCount =
+        count.filter(item => Number(item.value) === i).length > 0;
       const lastSelectableItem = count.reduce(
         (acc, item) =>
           item.value < acc.value || (!acc.value && hasCount) ? item : acc,

diff --git a/packages/react-instantsearch-core/src/connectors/connectGeoSearch.js b/packages/react-instantsearch-core/src/connectors/connectGeoSearch.js
@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash';
+import { objectHasKeys } from '../core/utils';
 import createConnector from '../core/createConnector';
 import {
   getResults,
@@ -73,7 +73,7 @@ const getCurrentRefinement = (props, searchState, context) => {
     {}
   );
 
-  if (isEmpty(refinement)) {
+  if (!objectHasKeys(refinement)) {
     return;
   }
 

diff --git a/packages/react-instantsearch-core/src/connectors/connectNumericMenu.js b/packages/react-instantsearch-core/src/connectors/connectNumericMenu.js
@@ -1,4 +1,3 @@
-import { isEmpty } from 'lodash';
 import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import { find } from '../core/utils';
@@ -157,7 +156,7 @@ export default createConnector({
     if (!items.some(item => item.value === '')) {
       items.push({
         value: '',
-        isRefined: isEmpty(refinedItem),
+        isRefined: refinedItem === undefined,
         noRefinement: !stats,
         label: 'All',
       });

diff --git a/packages/react-instantsearch-core/src/core/utils.ts b/packages/react-instantsearch-core/src/core/utils.ts
@@ -1,5 +1,3 @@
-import { isEmpty } from 'lodash';
-
 // From https://github.com/reactjs/react-redux/blob/master/src/utils/shallowEqual.js
 export const shallowEqual = (objA, objB) => {
   if (objA === objB) {
@@ -43,7 +41,7 @@ export const removeEmptyKey = (obj: object) => {
       return;
     }
 
-    if (isEmpty(value)) {
+    if (!objectHasKeys(value)) {
       delete obj[key];
     } else {
       removeEmptyKey(value);
@@ -86,6 +84,10 @@ export function find<T = any>(
   return undefined;
 }
 
+export function objectHasKeys(object: object | undefined) {
+  return object && Object.keys(object).length > 0;
+}
+
 // https://github.com/babel/babel/blob/3aaafae053fa75febb3aa45d45b6f00646e30ba4/packages/babel-helpers/src/helpers.js#L604-L620
 export function omit(source: { [key: string]: any }, excluded: string[]) {
   if (source === null || source === undefined) {

diff --git a/packages/react-instantsearch-dom/src/core/createInstantSearchServer.js b/packages/react-instantsearch-dom/src/core/createInstantSearchServer.js
@@ -1,4 +1,3 @@
-import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
 import { renderToString } from 'react-dom/server';
 import PropTypes from 'prop-types';
@@ -116,7 +115,7 @@ const createInstantSearchServer = () => {
 
     const helper = algoliasearchHelper(client, sharedParameters.index);
 
-    if (isEmpty(derivedParameters)) {
+    if (Object.keys(derivedParameters).length === 0) {
       return singleIndexSearch(helper, sharedParameters);
     }