diff --git a/plugins/woocommerce-admin/packages/components/src/chart/d3chart/utils/tooltip.js b/plugins/woocommerce-admin/packages/components/src/chart/d3chart/utils/tooltip.js index 9401b1ec191..9ee257748f7 100644 --- a/plugins/woocommerce-admin/packages/components/src/chart/d3chart/utils/tooltip.js +++ b/plugins/woocommerce-admin/packages/components/src/chart/d3chart/utils/tooltip.js @@ -45,10 +45,10 @@ class ChartTooltip { return Math.max( this.margin, elementCoords.left + - elementCoords.width * ( 1 - elementWidthRatio ) - - tooltipSize.width - - this.margin - - leftMargin + elementCoords.width * ( 1 - elementWidthRatio ) - + tooltipSize.width - + this.margin - + leftMargin ); } diff --git a/plugins/woocommerce-admin/packages/currency/src/index.js b/plugins/woocommerce-admin/packages/currency/src/index.js index fef1f4fc10b..ef2e0381378 100644 --- a/plugins/woocommerce-admin/packages/currency/src/index.js +++ b/plugins/woocommerce-admin/packages/currency/src/index.js @@ -29,21 +29,31 @@ export default class Currency { this.symbol = config.symbol.toString(); this.symbolPosition = config.symbolPosition.toString(); this.decimalSeparator = config.decimalSeparator.toString(); - this.priceFormat = config.priceFormat ? config.priceFormat.toString() : this.getPriceFormat( config ); + this.priceFormat = this.getPriceFormat( config ); this.thousandSeparator = config.thousandSeparator.toString(); const precisionNumber = parseInt( config.precision, 10 ); this.precision = precisionNumber; } + stripTags( str ) { + const tmp = document.createElement( 'DIV' ); + tmp.innerHTML = str; + return tmp.textContent || tmp.innerText || ''; + } + /** * Get the default price format from a currency. * - * @param {Object} currency Currency configuration. + * @param {Object} config Currency configuration. * @return {String} Price format. */ - getPriceFormat( currency ) { - switch ( currency.symbolPosition ) { + getPriceFormat( config ) { + if ( config.priceFormat ) { + return this.stripTags( config.priceFormat.toString() ); + } + + switch ( config.symbolPosition ) { case 'left': return '%1$s%2$s'; case 'right':