From c565b9cb400d02ec7c31c7e592077832ba372d32 Mon Sep 17 00:00:00 2001
From: Jeff Stieler <jeff.m.stieler@gmail.com>
Date: Wed, 9 Jan 2019 14:23:49 -0700
Subject: [PATCH] =?UTF-8?q?Numeric=20filter:=20generate=20a=20true=20array?=
 =?UTF-8?q?=20value=20for=20=E2=80=9Cbetween=E2=80=9D=20rule=20instead=20o?=
 =?UTF-8?q?f=20a=20comma-delimited=20string.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/filters/advanced/number-filter.js      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js b/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js
index 379c94af77f..804074ed676 100644
--- a/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js
+++ b/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js
@@ -4,7 +4,7 @@
  */
 import { Component, Fragment } from '@wordpress/element';
 import { SelectControl, TextControl } from '@wordpress/components';
-import { get, find, partial } from 'lodash';
+import { get, find, partial, isArray } from 'lodash';
 import interpolateComponents from 'interpolate-components';
 import classnames from 'classnames';
 import { sprintf, __, _x } from '@wordpress/i18n';
@@ -32,7 +32,7 @@ class NumberFilter extends Component {
 	getScreenReaderText( filter, config ) {
 		const inputType = get( config, [ 'input', 'type' ], 'number' );
 		const rule = find( config.rules, { value: filter.rule } ) || {};
-		let [ rangeStart, rangeEnd ] = ( filter.value || '' ).split( ',' );
+		let [ rangeStart, rangeEnd ] = isArray( filter.value ) ? filter.value : [ filter.value ];
 
 		// Return nothing if we're missing input(s)
 		if (
@@ -114,7 +114,7 @@ class NumberFilter extends Component {
 			return this.getRangeInput();
 		}
 
-		const [ rangeStart, rangeEnd ] = ( filter.value || '' ).split( ',' );
+		const [ rangeStart, rangeEnd ] = isArray( filter.value ) ? filter.value : [ filter.value ];
 		if ( Boolean( rangeEnd ) ) {
 			// If there's a value for rangeEnd, we've just changed from "between"
 			// to "less than" or "more than" and need to transition the value
@@ -144,16 +144,14 @@ class NumberFilter extends Component {
 	getRangeInput() {
 		const { config, filter, onFilterChange } = this.props;
 		const inputType = get( config, [ 'input', 'type' ], 'number' );
-		const [ rangeStart, rangeEnd ] = ( filter.value || '' ).split( ',' );
+		const [ rangeStart, rangeEnd ] = isArray( filter.value ) ? filter.value : [ filter.value ];
 
 		const rangeStartOnChange = ( newRangeStart ) => {
-			const newValue = [ newRangeStart, rangeEnd ].join( ',' );
-			onFilterChange( filter.key, 'value', newValue );
+			onFilterChange( filter.key, 'value', [ newRangeStart, rangeEnd ] );
 		};
 
 		const rangeEndOnChange = ( newRangeEnd ) => {
-			const newValue = [ rangeStart, newRangeEnd ].join( ',' );
-			onFilterChange( filter.key, 'value', newValue );
+			onFilterChange( filter.key, 'value', [ rangeStart, newRangeEnd ] );
 		};
 
 		return interpolateComponents( {
@@ -161,7 +159,7 @@ class NumberFilter extends Component {
 			components: {
 				rangeStart: this.getFormControl( {
 					type: inputType,
-					value: rangeStart,
+					value: rangeStart || '',
 					label: sprintf(
 						/* eslint-disable-next-line max-len */
 						/* translators: Sentence fragment, "range start" refers to the first of two numeric values the field must be between. Screenshot for context: https://cloudup.com/cmv5CLyMPNQ */
@@ -172,7 +170,7 @@ class NumberFilter extends Component {
 				} ),
 				rangeEnd: this.getFormControl( {
 					type: inputType,
-					value: rangeEnd,
+					value: rangeEnd || '',
 					label: sprintf(
 						/* eslint-disable-next-line max-len */
 						/* translators: Sentence fragment, "range end" refers to the second of two numeric values the field must be between. Screenshot for context: https://cloudup.com/cmv5CLyMPNQ */