Skip to content

FIX: Load form editor styles in iframe canvas #655

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.

Sign up for GitHub

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

Open
ObitoTM wants to merge 1 commit into
base: release/3.6.2
Choose a base branch
from
Open

FIX: Load form editor styles in iframe canvas #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 31 additions & 12 deletions includes/admin/editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class Editor {

public function __construct() {
add_action( 'enqueue_block_editor_assets', array( $this, 'admin_assets' ) );
add_action( 'enqueue_block_assets', array( $this, 'enqueue_editor_canvas_assets' ) );
}

/**
Expand Down Expand Up @@ -453,18 +454,7 @@ public function enqueue_assets() {
true
);

wp_enqueue_style(
self::EDITOR_HANDLE,
Plugin::instance()->plugin_url( 'assets/build/editor/form.builder.css' ),
array(
'media',
'l10n',
'buttons',
'wp-edit-blocks',
'wp-editor',
),
$script_asset['version']
);
$this->enqueue_editor_style( $script_asset['version'] );

$conditions_settings = ( new Action_Condition_Manager() )->get_settings();
$exclude_events = array(
Expand Down Expand Up @@ -561,4 +551,33 @@ public function enqueue_form_assets() {
do_action( 'jet-form-builder/other-editor-assets/after', $this, $handle );
}

public function enqueue_editor_canvas_assets() {
if ( ! is_admin() || ! jet_form_builder()->post_type->is_form_editor ) {
return;
}

$script_asset = require jet_form_builder()->plugin_dir( 'assets/build/editor/form.builder.asset.php' );

if ( true === $script_asset ) {
return;
}

$this->enqueue_editor_style( $script_asset['version'] );
}

private function enqueue_editor_style( $version ) {
wp_enqueue_style(
self::EDITOR_HANDLE,
Plugin::instance()->plugin_url( 'assets/build/editor/form.builder.css' ),
array(
'media',
'l10n',
'buttons',
'wp-edit-blocks',
'wp-editor',
),
$version
);
}

}
39 changes: 33 additions & 6 deletions modules/blocks-v2/text-field/block-asset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ public function init_hooks() {
'jet-form-builder/editor-assets/before',
array( $this, 'enqueue_editor_assets' )
);
add_action(
'enqueue_block_assets',
array( $this, 'enqueue_editor_canvas_styles' )
);
add_action(
'wp_enqueue_scripts',
array( $this, 'register_frontend_assets' )
Expand Down Expand Up @@ -100,12 +104,7 @@ public function enqueue_editor_assets() {
$asset['version'],
true
);
wp_enqueue_style(
$blocks_v2->get_handle( 'text-field-editor' ),
$blocks_v2->get_url( 'text-field/assets/build/editor.css' ),
array(),
$asset['version']
);
$this->enqueue_editor_style( $asset['version'] );

$block_render = new Block_Render( new Block_Type() );

Expand All @@ -122,4 +121,32 @@ public function enqueue_editor_assets() {
public function enqueue_required_assets() {
wp_enqueue_script( Base_Module_Handle_It::HANDLE_PREFIX . 'blocks-v2-text-field' );
}

public function enqueue_editor_canvas_styles() {
if ( ! is_admin() || ! jet_form_builder()->post_type->is_form_editor ) {
return;
}

/** @var Module $blocks_v2 */
$blocks_v2 = jet_form_builder()->module( 'blocks-v2' );
$asset = require $blocks_v2->get_dir( 'text-field/assets/build/editor.asset.php' );

if ( true === $asset ) {
return;
}

$this->enqueue_editor_style( $asset['version'] );
}

private function enqueue_editor_style( $version ) {
/** @var Module $blocks_v2 */
$blocks_v2 = jet_form_builder()->module( 'blocks-v2' );

wp_enqueue_style(
$blocks_v2->get_handle( 'text-field-editor' ),
$blocks_v2->get_url( 'text-field/assets/build/editor.css' ),
array(),
$version
);
}
}
48 changes: 34 additions & 14 deletions modules/wysiwyg/module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ public function condition(): bool {
public function init_hooks() {
add_filter( 'jet-form-builder/blocks/items', array( $this, 'add_blocks_types' ) );
add_action( 'jet-form-builder/editor-assets/before', array( $this, 'enqueue_admin_assets' ) );
add_action( 'enqueue_block_assets', array( $this, 'enqueue_editor_canvas_styles' ) );
add_action( 'wp_enqueue_scripts', array( $this, 'register_frontend_scripts' ) );
add_action( 'jet_plugins/frontend/register_scripts', array( $this, 'register_frontend_scripts' ) );
}

public function remove_hooks() {
remove_filter( 'jet-form-builder/blocks/items', array( $this, 'add_blocks_types' ) );
remove_action( 'jet-form-builder/editor-assets/before', array( $this, 'enqueue_admin_assets' ) );
remove_action( 'enqueue_block_assets', array( $this, 'enqueue_editor_canvas_styles' ) );
remove_action( 'wp_enqueue_scripts', array( $this, 'register_frontend_scripts' ) );
remove_action( 'jet_plugins/frontend/register_scripts', array( $this, 'register_frontend_scripts' ) );
}
Expand All @@ -67,21 +69,21 @@ public function enqueue_admin_assets() {
true
);

wp_enqueue_style(
$this->get_handle( 'lightgray-skin' ),
includes_url( 'js/tinymce/skins/lightgray/skin.min.css' ),
array(),
$script_asset['version']
);
$this->enqueue_editor_styles( $script_asset['version'] );
}

wp_enqueue_style(
$this->get_handle(),
$this->get_url( 'assets/build/wysiwyg.css' ),
array(
'editor-buttons',
),
$script_asset['version']
);
public function enqueue_editor_canvas_styles() {
if ( ! is_admin() || ! jet_form_builder()->post_type->is_form_editor ) {
return;
}

$script_asset = require $this->get_dir( 'assets/build/editor.asset.php' );

if ( true === $script_asset ) {
return;
}

$this->enqueue_editor_styles( $script_asset['version'] );
}

public function register_frontend_scripts() {
Expand Down Expand Up @@ -110,4 +112,22 @@ public function register_frontend_scripts() {
$script_asset['version']
);
}

private function enqueue_editor_styles( $version ) {
wp_enqueue_style(
$this->get_handle( 'lightgray-skin' ),
includes_url( 'js/tinymce/skins/lightgray/skin.min.css' ),
array(),
$version
);

wp_enqueue_style(
$this->get_handle(),
$this->get_url( 'assets/build/wysiwyg.css' ),
array(
'editor-buttons',
),
$version
);
}
}