From 984d6051ab29c356e2b55abd812726775a414af6 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 30 Jun 2020 16:52:56 -0700 Subject: [PATCH] Rename emptyValue to blankValue (#2336) --- packages/insomnia-app/app/ui/components/base/editable.js | 8 ++++---- packages/insomnia-app/app/ui/components/base/highlight.js | 5 +++-- .../app/ui/components/sidebar/sidebar-request-row.js | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/insomnia-app/app/ui/components/base/editable.js b/packages/insomnia-app/app/ui/components/base/editable.js index 9d9e5a087..f7851a39c 100644 --- a/packages/insomnia-app/app/ui/components/base/editable.js +++ b/packages/insomnia-app/app/ui/components/base/editable.js @@ -70,7 +70,7 @@ class Editable extends PureComponent { const { value, fallbackValue, - emptyValue, + blankValue, singleClick, onEditStart, // eslint-disable-line no-unused-vars className, @@ -101,14 +101,14 @@ class Editable extends PureComponent { title: singleClick ? 'Click to edit' : 'Double click to edit', onClick: this._handleSingleClickEditStart, onDoubleClick: this._handleEditStart, - emptyValue, + blankValue, ...extra, }; if (renderReadView) { return renderReadView(initialValue, readViewProps); } else { - return {initialValue || emptyValue}; + return {initialValue || blankValue}; } } } @@ -120,7 +120,7 @@ Editable.propTypes = { // Optional fallbackValue: PropTypes.string, - emptyValue: PropTypes.string, + blankValue: PropTypes.string, renderReadView: PropTypes.func, singleClick: PropTypes.bool, onEditStart: PropTypes.func, diff --git a/packages/insomnia-app/app/ui/components/base/highlight.js b/packages/insomnia-app/app/ui/components/base/highlight.js index 24b4c813f..260785cd2 100644 --- a/packages/insomnia-app/app/ui/components/base/highlight.js +++ b/packages/insomnia-app/app/ui/components/base/highlight.js @@ -7,18 +7,19 @@ import { fuzzyMatch } from '../../../common/misc'; type Props = {| search: string, text: string, + blankValue?: String, |}; @autobind class Highlight extends React.PureComponent { render() { - const { search, text, emptyValue, ...otherProps } = this.props; + const { search, text, blankValue, ...otherProps } = this.props; // Match loose here to make sure our highlighting always works const result = fuzzyMatch(search, text, { splitSpace: true, loose: true }); if (!result) { - return {text || emptyValue || ''}; + return {text || blankValue || ''}; } return ( diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js index f3cc00d34..b6dbfd148 100644 --- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js +++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js @@ -191,7 +191,7 @@ class SidebarRequestRow extends PureComponent {