Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

refactor(lodash): isEmpty #2442

Merged
merged 10 commits into from
May 22, 2019
Merged

refactor(lodash): isEmpty #2442

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
559aa4f
refactor(lodash): isEmpty
Haroenv May 15, 2019
b38cfea
refactor(lodash): remove isEmpty from server
Haroenv May 17, 2019
7ac1b1c
chore(TS): clearer type
Haroenv May 17, 2019
0ac3d64
Merge branch 'v6' into lodash/isEmpty
Haroenv May 17, 2019
57ca8b2
feedback: don't use objectHasKeys for array
Haroenv May 20, 2019
935bf82
fix implementation
Haroenv May 20, 2019
6e341c0
Merge branch 'v6' into lodash/isEmpty
Haroenv May 22, 2019
7890a97
refactor(example): remove lodash
Haroenv May 22, 2019
384e9a1
fix(numeric): correct reimplementation of !isEmpty
Haroenv May 22, 2019
f89d321
chore(size): update expectation
Haroenv May 22, 2019
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
4 changes: 2 additions & 2 deletions packages/react-instantsearch-core/src/connectors/connectGeoSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isEmpty } from 'lodash';
import { objectHasKeys } from '../core/utils';
import createConnector from '../core/createConnector';
import {
getResults,
Expand Down Expand Up @@ -73,7 +73,7 @@ const getCurrentRefinement = (props, searchState, context) => {
{}
);

if (isEmpty(refinement)) {
if (!objectHasKeys(refinement)) {
return;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/react-instantsearch-core/src/connectors/connectNumericMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { isEmpty } from 'lodash';
import PropTypes from 'prop-types';
import createConnector from '../core/createConnector';
import { find } from '../core/utils';
Expand Down Expand Up @@ -157,7 +156,7 @@ export default createConnector({
if (!items.some(item => item.value === '')) {
items.push({
value: '',
isRefined: isEmpty(refinedItem),
isRefined: refinedItem && refinedItem.length > 0,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
isRefined: refinedItem && refinedItem.length > 0,
isRefined: refinedItem && refinedItem.length === 0,

noRefinement: !stats,
label: 'All',
});
Expand Down
8 changes: 5 additions & 3 deletions packages/react-instantsearch-core/src/core/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down Expand Up @@ -43,7 +41,7 @@ export const removeEmptyKey = (obj: object) => {
return;
}

if (isEmpty(value)) {
if (!objectHasKeys(value)) {
delete obj[key];
} else {
removeEmptyKey(value);
Expand Down Expand Up @@ -85,3 +83,7 @@ export function find<T = any>(
}
return undefined;
}

export function objectHasKeys(object: object | undefined) {
return object && Object.keys(object).length > 0;
}
3 changes: 1 addition & 2 deletions packages/react-instantsearch-dom/src/core/createInstantSearchServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { isEmpty } from 'lodash';
import React, { Component } from 'react';
import { renderToString } from 'react-dom/server';
import PropTypes from 'prop-types';
Expand Down Expand Up @@ -116,7 +115,7 @@ const createInstantSearchServer = algoliasearch => {

const helper = algoliasearchHelper(client, sharedParameters.index);

if (isEmpty(derivedParameters)) {
if (Object.keys(derivedParameters).length === 0) {
Haroenv marked this conversation as resolved.
Show resolved Hide resolved
return singleIndexSearch(helper, sharedParameters);
}

Expand Down