Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

approach to remove duplicate string characters from prev x-tick

This commit is contained in:
Robert Elliott 2018-10-23 14:25:43 +02:00
parent 29f68a9ce8
commit d152686a65
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/woocommerce-admin/client/components/chart/utils.js
View File

@ -357,6 +357,20 @@ export const getDateSpaces = ( data, uniqueDates, width, xLineScale ) =>
};
} );
export const compareStrings = ( s1, s2, params, splitChar ) => {
splitChar = typeof splitChar === 'undefined' ? ' ' : splitChar;
let string1 = new Array();
let string2 = new Array();
string1 = s1.split( splitChar );
string2 = s2.split( splitChar );
const diff = new Array();
const long = s1.length > s2.length ? string1 : string2;
for ( let x = 0; x < long.length; x++ ) {
string1[ x ] !== string2[ x ] && diff.push( string2[ x ] );
}
return diff;
};
export const drawAxis = ( node, params ) => {
const xScale = params.type === 'line' ? params.xLineScale : params.xScale;
@ -387,12 +401,18 @@ export const drawAxis = ( node, params ) => {
d3AxisBottom( xScale )
.tickValues( ticks )
.tickFormat( ( d, i ) => {
const monthDate = d instanceof Date ? d : new Date( d );
let monthDate = d instanceof Date ? d : new Date( d );
let prevMonth = i !== 0 ? ticks[ i - 1 ] : ticks[ i ];
prevMonth = prevMonth instanceof Date ? prevMonth : new Date( prevMonth );
return i === 0 || params.x2Format( monthDate ) !== params.x2Format( prevMonth )
? params.x2Format( monthDate )
: '';
monthDate =
i !== 0
? compareStrings(
params.x2Format( prevMonth ),
params.x2Format( monthDate ),
params
).join( ' ' )
: params.x2Format( monthDate );
return i === 0 || monthDate !== params.x2Format( prevMonth ) ? monthDate : '';
} )
)
.call( g => g.select( '.domain' ).remove() );