Skip to content

Commit 3f7fb1e

Browse files
CopilotHardeepAsrani
Copilot
and
HardeepAsrani
authored
fix: label default font options in classic editor settings
Agent-Logs-Url: https://github.com/Codeinwp/visualizer/sessions/430cefd8-53f0-427b-9bfb-ed1692347b7e Co-authored-by: HardeepAsrani <2649903+HardeepAsrani@users.noreply.github.com>
1 parent 10b8a79 commit 3f7fb1e

4 files changed

Lines changed: 26 additions & 10 deletions

File tree

‎classes/Visualizer/Render/Sidebar/ChartJS.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ protected function _renderGeneralSettings() {
212212
echo '<tr>';
213213
echo '<td class="viz-section-table-column">';
214214
echo '<select name="fontName" class="control-select">';
215-
echo '<option></option>';
215+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
216216
foreach ( self::$_fontFamilies as $font => $label ) {
217217
echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>';
218218
echo $label;
@@ -222,7 +222,7 @@ protected function _renderGeneralSettings() {
222222
echo '</td>';
223223
echo '<td class="viz-section-table-column">';
224224
echo '<select name="fontSize" class="control-select">';
225-
echo '<option></option>';
225+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
226226
for ( $i = 7; $i <= 20; $i++ ) {
227227
echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>';
228228
}
@@ -263,7 +263,7 @@ protected function _renderGeneralSettings() {
263263
echo '<tr>';
264264
echo '<td class="viz-section-table-column">';
265265
echo '<select name="legend[labels][fontName]" class="control-select">';
266-
echo '<option></option>';
266+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
267267
foreach ( self::$_fontFamilies as $font => $label ) {
268268
echo '<option value="', $font, '"', selected( $font, $this->legend['labels']['fontName'], false ), '>';
269269
echo $label;
@@ -273,7 +273,7 @@ protected function _renderGeneralSettings() {
273273
echo '</td>';
274274
echo '<td class="viz-section-table-column">';
275275
echo '<select name="legend[labels][fontSize]" class="control-select">';
276-
echo '<option></option>';
276+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
277277
for ( $i = 7; $i <= 20; $i++ ) {
278278
echo '<option value="', $i, '"', selected( $i, $this->legend['labels']['fontSize'], false ), '>', $i, '</option>';
279279
}

‎classes/Visualizer/Render/Sidebar/Google.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function _renderGeneralSettings() {
187187
echo '<tr>';
188188
echo '<td class="viz-section-table-column">';
189189
echo '<select name="fontName" class="control-select">';
190-
echo '<option></option>';
190+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
191191
foreach ( self::$_fontFamilies as $font => $label ) {
192192
echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>';
193193
echo $label;
@@ -197,7 +197,7 @@ protected function _renderGeneralSettings() {
197197
echo '</td>';
198198
echo '<td class="viz-section-table-column">';
199199
echo '<select name="fontSize" class="control-select">';
200-
echo '<option></option>';
200+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
201201
for ( $i = 7; $i <= 20; $i++ ) {
202202
echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>';
203203
}

‎classes/Visualizer/Render/Sidebar/Type/ChartJS/Linear.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ protected function _renderHorizontalAxisGeneralSettings() {
161161
echo '<tr>';
162162
echo '<td class="viz-section-table-column">';
163163
echo '<select name="xAxes[scaleLabel][fontFamily]" class="control-select">';
164-
echo '<option></option>';
164+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
165165
foreach ( self::$_fontFamilies as $font => $label ) {
166166
echo '<option value="', $font, '"', selected( $font, $this->xAxes['scaleLabel']['fontFamily'], false ), '>';
167167
echo $label;
@@ -171,7 +171,7 @@ protected function _renderHorizontalAxisGeneralSettings() {
171171
echo '</td>';
172172
echo '<td class="viz-section-table-column">';
173173
echo '<select name="xAxes[scaleLabel][fontSize]" class="control-select">';
174-
echo '<option></option>';
174+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
175175
for ( $i = 7; $i <= 20; $i++ ) {
176176
echo '<option value="', $i, '"', selected( $i, $this->xAxes['scaleLabel']['fontSize'], false ), '>', $i, '</option>';
177177
}
@@ -265,7 +265,7 @@ protected function _renderVerticalAxisGeneralSettings() {
265265
echo '<tr>';
266266
echo '<td class="viz-section-table-column">';
267267
echo '<select name="yAxes[scaleLabel][fontFamily]" class="control-select">';
268-
echo '<option></option>';
268+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
269269
foreach ( self::$_fontFamilies as $font => $label ) {
270270
echo '<option value="', $font, '"', selected( $font, $this->yAxes['scaleLabel']['fontFamily'], false ), '>';
271271
echo $label;
@@ -275,7 +275,7 @@ protected function _renderVerticalAxisGeneralSettings() {
275275
echo '</td>';
276276
echo '<td class="viz-section-table-column">';
277277
echo '<select name="yAxes[scaleLabel][fontSize]" class="control-select">';
278-
echo '<option></option>';
278+
echo '<option value="">', esc_html__( 'Default', 'visualizer' ), '</option>';
279279
for ( $i = 7; $i <= 20; $i++ ) {
280280
echo '<option value="', $i, '"', selected( $i, $this->yAxes['scaleLabel']['fontSize'], false ), '>', $i, '</option>';
281281
}

‎tests/e2e/specs/admin.spec.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,22 @@ test.describe( 'Chart Library', () => {
211211
await expect( page.getByText(backendName) ).toBeVisible();
212212
await expect( page.locator('g').filter({ hasText: 'Test Chart Name' }).locator('rect') ).toBeVisible();
213213
} );
214+
215+
test( 'font settings show Default label for empty option', async ( { admin, page } ) => {
216+
await admin.visitAdminPage( 'admin.php?page=visualizer&vaction=addnew' );
217+
await page.waitForURL( '**/admin.php?page=visualizer&vaction=addnew' );
218+
await expect( page.getByRole('button', { name: 'Classic Builder Step-by-step' }) ).toBeVisible({ timeout: 5000 });
219+
await page.getByRole('button', { name: 'Classic Builder Step-by-step' }).click();
220+
await page.waitForSelector('h1:text("Visualizer")');
221+
222+
await selectChartAdmin( page.frameLocator('iframe'), CHART_JS_LABELS.pie );
223+
await page.frameLocator('iframe').getByRole('link', { name: 'Settings' }).click();
224+
await page.frameLocator('iframe').getByRole('button', { name: 'General Settings' }).click();
225+
await page.frameLocator('iframe').getByText('Font Styles', { exact: true }).click();
226+
227+
await expect( page.frameLocator('iframe').locator('select[name="fontName"] option').first() ).toHaveText( 'Default' );
228+
await expect( page.frameLocator('iframe').locator('select[name="fontSize"] option').first() ).toHaveText( 'Default' );
229+
} );
214230
} );
215231

216232
test.describe( 'Support', () => {

0 commit comments

Comments
 (0)