Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions classes/Visualizer/Render/Sidebar/ChartJS.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ protected function _renderGeneralSettings() {
echo '<tr>';
echo '<td class="viz-section-table-column">';
echo '<select name="fontName" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
foreach ( self::$_fontFamilies as $font => $label ) {
echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>';
echo $label;
Expand All @@ -222,7 +222,7 @@ protected function _renderGeneralSettings() {
echo '</td>';
echo '<td class="viz-section-table-column">';
echo '<select name="fontSize" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
for ( $i = 7; $i <= 20; $i++ ) {
echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>';
}
Expand Down Expand Up @@ -263,7 +263,7 @@ protected function _renderGeneralSettings() {
echo '<tr>';
echo '<td class="viz-section-table-column">';
echo '<select name="legend[labels][fontName]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
foreach ( self::$_fontFamilies as $font => $label ) {
echo '<option value="', $font, '"', selected( $font, $this->legend['labels']['fontName'], false ), '>';
echo $label;
Expand All @@ -273,7 +273,7 @@ protected function _renderGeneralSettings() {
echo '</td>';
echo '<td class="viz-section-table-column">';
echo '<select name="legend[labels][fontSize]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
for ( $i = 7; $i <= 20; $i++ ) {
echo '<option value="', $i, '"', selected( $i, $this->legend['labels']['fontSize'], false ), '>', $i, '</option>';
}
Expand Down
4 changes: 2 additions & 2 deletions classes/Visualizer/Render/Sidebar/Google.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ protected function _renderGeneralSettings() {
echo '<tr>';
echo '<td class="viz-section-table-column">';
echo '<select name="fontName" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
foreach ( self::$_fontFamilies as $font => $label ) {
echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>';
echo $label;
Expand All @@ -197,7 +197,7 @@ protected function _renderGeneralSettings() {
echo '</td>';
echo '<td class="viz-section-table-column">';
echo '<select name="fontSize" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
for ( $i = 7; $i <= 20; $i++ ) {
echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>';
}
Expand Down
8 changes: 4 additions & 4 deletions classes/Visualizer/Render/Sidebar/Type/ChartJS/Linear.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ protected function _renderHorizontalAxisGeneralSettings() {
echo '<tr>';
echo '<td class="viz-section-table-column">';
echo '<select name="xAxes[scaleLabel][fontFamily]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
foreach ( self::$_fontFamilies as $font => $label ) {
echo '<option value="', $font, '"', selected( $font, $this->xAxes['scaleLabel']['fontFamily'], false ), '>';
echo $label;
Expand All @@ -171,7 +171,7 @@ protected function _renderHorizontalAxisGeneralSettings() {
echo '</td>';
echo '<td class="viz-section-table-column">';
echo '<select name="xAxes[scaleLabel][fontSize]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
for ( $i = 7; $i <= 20; $i++ ) {
echo '<option value="', $i, '"', selected( $i, $this->xAxes['scaleLabel']['fontSize'], false ), '>', $i, '</option>';
}
Expand Down Expand Up @@ -265,7 +265,7 @@ protected function _renderVerticalAxisGeneralSettings() {
echo '<tr>';
echo '<td class="viz-section-table-column">';
echo '<select name="yAxes[scaleLabel][fontFamily]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
foreach ( self::$_fontFamilies as $font => $label ) {
echo '<option value="', $font, '"', selected( $font, $this->yAxes['scaleLabel']['fontFamily'], false ), '>';
echo $label;
Expand All @@ -275,7 +275,7 @@ protected function _renderVerticalAxisGeneralSettings() {
echo '</td>';
echo '<td class="viz-section-table-column">';
echo '<select name="yAxes[scaleLabel][fontSize]" class="control-select">';
echo '<option></option>';
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
for ( $i = 7; $i <= 20; $i++ ) {
echo '<option value="', $i, '"', selected( $i, $this->yAxes['scaleLabel']['fontSize'], false ), '>', $i, '</option>';
}
Expand Down
16 changes: 16 additions & 0 deletions tests/e2e/specs/admin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,22 @@ test.describe( 'Chart Library', () => {
await expect( page.getByText(backendName) ).toBeVisible();
await expect( page.locator('g').filter({ hasText: 'Test Chart Name' }).locator('rect') ).toBeVisible();
} );

test( 'font settings show Default label for empty option', async ( { admin, page } ) => {
await admin.visitAdminPage( 'admin.php?page=visualizer&vaction=addnew' );
await page.waitForURL( '**/admin.php?page=visualizer&vaction=addnew' );
await expect( page.getByRole('button', { name: 'Classic Builder Step-by-step' }) ).toBeVisible({ timeout: 5000 });
await page.getByRole('button', { name: 'Classic Builder Step-by-step' }).click();
await page.waitForSelector('h1:text("Visualizer")');

await selectChartAdmin( page.frameLocator('iframe'), CHART_JS_LABELS.pie );
await page.frameLocator('iframe').getByRole('link', { name: 'Settings' }).click();
await page.frameLocator('iframe').getByRole('button', { name: 'General Settings' }).click();
await page.frameLocator('iframe').getByText('Font Styles', { exact: true }).click();

await expect( page.frameLocator('iframe').locator('select[name="fontName"] option').first() ).toHaveText( 'Default' );
await expect( page.frameLocator('iframe').locator('select[name="fontSize"] option').first() ).toHaveText( 'Default' );
} );
} );

test.describe( 'Support', () => {
Expand Down
Loading