Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jQuery Datepicker from Form Block #2180

Merged
merged 14 commits into from
Nov 30, 2021
1 change: 0 additions & 1 deletion .dev/config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const scripts = [
'coblocks-accordion-polyfill',
'coblocks-animation',
'coblocks-checkbox-required',
'coblocks-datepicker',
'coblocks-events',
'coblocks-fromEntries',
'coblocks-google-maps',
Expand Down
3 changes: 1 addition & 2 deletions .dev/performance/tests/config/setup-performance-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ import {
*
* @type {string|undefined}
*/
const PUPPETEER_TIMEOUT = process.env.PUPPETEER_TIMEOUT;

// The Jest timeout is increased because these tests are a bit slow
jest.setTimeout( PUPPETEER_TIMEOUT || 100000 );
jest.setTimeout( 1000000 );

async function setupBrowser() {
await clearLocalStorage();
Expand Down
9 changes: 1 addition & 8 deletions .dev/performance/tests/config/setup-test-framework.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ import {
trashAllPosts,
} from '@wordpress/e2e-test-utils';

/**
* Timeout, in seconds, that the test should be allowed to run.
*
* @type {string|undefined}
*/
const PUPPETEER_TIMEOUT = process.env.PUPPETEER_TIMEOUT;

/**
* CPU slowdown factor, as a numeric multiplier.
*
Expand Down Expand Up @@ -65,7 +58,7 @@ const OBSERVED_CONSOLE_MESSAGE_TYPES = {
const pageEvents = [];

// The Jest timeout is increased because these tests are a bit slow
jest.setTimeout( PUPPETEER_TIMEOUT || 100000 );
jest.setTimeout( 1000000 );

async function setupBrowser() {
await clearLocalStorage();
Expand Down
15 changes: 1 addition & 14 deletions .dev/tests/phpunit/includes/test-coblocks-form.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,25 +325,12 @@ public function test_render_field_textarea() {

}

/**
* Test the datepicker script is enqueued
*/
public function test_field_date_scripts() {

$this->coblocks_form->render_field_date( [], '' );

global $wp_scripts;

$this->assertArrayHasKey( 'coblocks-datepicker', $wp_scripts->registered );

}

/**
* Test the date field markup is as expected
*/
public function test_render_field_date() {

$this->expectOutputRegex( '/<input type="text" id="date-2" name="field-date-2\[value\]" class="coblocks-field coblocks-field--date" \/>/' );
$this->expectOutputRegex( '/<input type="date" id="date" name="field-date\[value\]" class="coblocks-field coblocks-field--date" \/>/' );

echo $this->coblocks_form->render_field_date( [], '' );

Expand Down
2 changes: 0 additions & 2 deletions .dev/tests/phpunit/test-class-coblocks.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ public function test_final_build_assets_exist() {
'dist/coblocks-1.js',
'dist/js/coblocks-accordion-polyfill.js',
'dist/js/coblocks-checkbox-required.js',
'dist/js/coblocks-datepicker.js',
'dist/js/coblocks-fromEntries.js',
'dist/js/coblocks-google-maps.js',
'dist/js/coblocks-google-recaptcha.js',
Expand All @@ -197,7 +196,6 @@ public function test_final_build_assets_exist() {
'dist/js/vendors/slick.js',
'src/js/coblocks-accordion-polyfill.js',
'src/js/coblocks-checkbox-required.js',
'src/js/coblocks-datepicker.js',
'src/js/coblocks-fromEntries.js',
'src/js/coblocks-google-maps.js',
'src/js/coblocks-google-recaptcha.js',
Expand Down
12 changes: 1 addition & 11 deletions includes/class-coblocks-form.php
Original file line number Diff line number Diff line change
Expand Up @@ -410,16 +410,6 @@ public function render_field_date( $atts ) {

static $date_count = 1;

wp_enqueue_script(
'coblocks-datepicker',
CoBlocks()->asset_source( 'js' ) . 'coblocks-datepicker.js',
array( 'jquery', 'jquery-ui-datepicker' ),
COBLOCKS_VERSION,
true
);

wp_localize_jquery_ui_datepicker();

$label = isset( $atts['label'] ) ? $atts['label'] : __( 'Date', 'coblocks' );
$label_slug = $date_count > 1 ? sanitize_title( $label . '-' . $date_count ) : sanitize_title( $label );
$required_attr = ( isset( $atts['required'] ) && $atts['required'] ) ? 'required' : '';
Expand All @@ -430,7 +420,7 @@ public function render_field_date( $atts ) {

?>

<input type="text" id="<?php echo esc_attr( $label_slug ); ?>" name="field-<?php echo esc_attr( $label_slug ); ?>[value]" class="coblocks-field coblocks-field--date" <?php echo esc_attr( $required_attr ); ?> />
<input type="date" id="<?php echo esc_attr( $label_slug ); ?>" name="field-<?php echo esc_attr( $label_slug ); ?>[value]" class="coblocks-field coblocks-field--date" <?php echo esc_attr( $required_attr ); ?> />

<?php

Expand Down
8 changes: 4 additions & 4 deletions src/blocks/form/fields/date/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ function CoBlocksFieldDate( props ) {
return (
<>
<CoBlocksField
type="text"
customTextColor={ customTextColor }
isSelected={ isSelected }
label={ label }
name={ name }
required={ required }
setAttributes={ setAttributes }
isSelected={ isSelected }
textColor={ textColor }
customTextColor={ customTextColor }
name={ name }
type="date"
/>
</>
);
Expand Down
9 changes: 0 additions & 9 deletions src/js/coblocks-datepicker.js

This file was deleted.

1 change: 0 additions & 1 deletion src/styles/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
@import "style/has-margin";
@import "style/shadow";
@import "style/tooltips";
@import "style/datepicker";

// @import "../components/**/style.scss";
@import "../components/background/styles/style.scss";
Expand Down
156 changes: 0 additions & 156 deletions src/styles/style/datepicker.scss

This file was deleted.