* BS > Modal block added for creating popups - ADDED

* Most blocks now show better previews - ADDED * Parent and allowedBlocks params added to some blocks to remove them from main list when they can only be nested - CHANGED * Some blocks such as Navbar will now auto add child element dummy data on insert for faster building - ADDED * Some blocks such as tabs were not working in editor with certain AyeCode UI setting - FIXED
AyeCode · Jun 6, 2024 · c01530f · c01530f
1 parent 9f26ac1
commit c01530f
Show file tree

Hide file tree

Showing 30 changed files with 5,736 additions and 4,958 deletions.
diff --git a/assets/css/block-editor.css b/assets/css/block-editor.css
diff --git a/assets/css/block-editor.scss b/assets/css/block-editor.scss
@@ -3,6 +3,16 @@
 	transform: translate(-50%, 0%);
 }
 
+.modal {
+	@at-root .modal:has(.wp-block-blockstrap-blockstrap-widget-modal.is-selected),
+	.modal:has(.wp-block-blockstrap-blockstrap-widget-modal.has-child-selected) {
+		display: block;
+		position: relative;
+		opacity: 1 !important;
+	}
+}
+
+
 /* show responsive menu if selected */
 @media ( max-width: 840px ) {
 	.wp-block-blockstrap-blockstrap-widget-navbar {
@@ -21,4 +31,3 @@
 		background: #f8f9fa !important;
 	}
 }
-
diff --git a/blocks/blocks.js b/blocks/blocks.js
@@ -38,6 +38,7 @@ registerBlockType( 'blockstrap/blockstrap-widget-accordion-item', { title: 'BS >
 registerBlockType( 'blockstrap/blockstrap-widget-contact', { title: 'BS > Contact Form' } );
 registerBlockType( 'blockstrap/blockstrap-widget-rating', { title: 'BS > Rating' } );
 registerBlockType( 'blockstrap/blockstrap-widget-scroll-top', { title: 'BS > Scroll Top' } );
+registerBlockType( 'blockstrap/blockstrap-widget-modal', { title: 'BS > Modal' } );
 */
 
 

diff --git a/blocks/class-blockstrap-widget-accordion-item.php b/blocks/class-blockstrap-widget-accordion-item.php
@@ -21,6 +21,7 @@ public function __construct() {
 				'anchor'          => false,
 				'customClassName' => false,
 			),
+			'parent'		   => array('blockstrap/blockstrap-widget-accordion'),
 			'block-output'     => array(
 				array(
 					'element'   => 'div',
@@ -44,7 +45,7 @@ public function __construct() {
 					array(
 						'element'              => 'div',
 						'if_className'         => 'props.attributes.state === "closed" ? "accordion-collapse collapse" : "accordion-collapse collapse show"',
-						'if_x'                 => '( typeof parentBlocks !== "undefined" && parentBlocks[parentBlocks.length - 1].attributes.anchor ) ? props.setAttributes({parent_anchor: parentBlocks[parentBlocks.length - 1].attributes.anchor}) : ""', // required
+						'if_x'                 => '( typeof parentBlocks !== "undefined" && parentBlocks[parentBlocks.length - 1]?.attributes?.length && parentBlocks[parentBlocks.length - 1].attributes.anchor ) ? props.setAttributes({parent_anchor: parentBlocks[parentBlocks.length - 1].attributes.anchor}) : ""', // required
 						'if_id'                => '"collapse-"+props.attributes.anchor',
 						'if_"aria-labelledby"' => '"heading-"+props.attributes.anchor',
 						'if_"data-bs-parent"'  => 'props.attributes.parent_anchor ? "#"+props.attributes.parent_anchor : ""',

diff --git a/blocks/class-blockstrap-widget-accordion.php b/blocks/class-blockstrap-widget-accordion.php
@@ -11,7 +11,8 @@ class BlockStrap_Widget_Accordion extends WP_Super_Duper
      */
     public function __construct()
     {
-        $aui_settings = is_admin() ? get_option('ayecode-ui-settings') : [];
+		$aui_settings = is_admin() ? get_option( 'ayecode-ui-settings', array()) : array();
+		$aui_settings = apply_filters( 'ayecode-ui-settings', $aui_settings, array(), array() );
         $bs5          = ! empty($aui_settings['bs_ver']) && '5' === $aui_settings['bs_ver'] ? 'bs-' : '';
 
         $options = [
@@ -25,6 +26,7 @@ public function __construct()
             'block-category'   => 'layout',
             'block-keywords'   => "['accordion','list','content']",
             'block-supports'   => ['customClassName' => false],
+			'allowed-blocks'   => array('blockstrap/blockstrap-widget-accordion-item'),
             'block-output'     => [
                 [
                     'element'          => 'innerBlocksProps',

diff --git a/blocks/class-blockstrap-widget-breadcrumb.php b/blocks/class-blockstrap-widget-breadcrumb.php
@@ -33,9 +33,7 @@ className: '',
 				'description' => esc_html__( 'A bootstrap breadcrumb output.', 'blockstrap-page-builder-blocks' ),
 			),
 			'example'            => array(
-				'attributes' => array(
-					'after_text' => 'Earth',
-				),
+				'viewportWidth' => 300
 			),
 			'no_wrap'            => true,
 			'block_group_tabs'   => array(

diff --git a/blocks/class-blockstrap-widget-button.php b/blocks/class-blockstrap-widget-button.php
@@ -33,9 +33,7 @@ className: '',
 				'description' => esc_html__( 'A bootstrap button, badge or iconbox.', 'blockstrap-page-builder-blocks' ),
 			),
 			'example'           => array(
-				'attributes' => array(
-					'after_text' => 'Earth',
-				),
+				'viewportWidth' => 200
 			),
 			'no_wrap'           => true,
 			'block_group_tabs'  => array(
@@ -132,7 +130,7 @@ public function set_arguments() {
 			'type'            => 'text',
 			'title'           => __( 'Custom URL', 'blockstrap-page-builder-blocks' ),
 			'desc'            => __( 'Add custom link URL', 'blockstrap-page-builder-blocks' ),
-			'placeholder'     => __( 'https://example.com', 'blockstrap-page-builder-blocks' ),
+			'placeholder'     => __( 'https://example.com or #contact-form', 'blockstrap-page-builder-blocks' ),
 			'default'         => '',
 			'desc_tip'        => true,
 			'group'           => __( 'Link', 'blockstrap-page-builder-blocks' ),
@@ -141,7 +139,7 @@ public function set_arguments() {
 
 		$arguments['lightbox_notice'] = array(
 			'type'            => 'notice',
-			'desc'            => __( 'Enter the BS > Contact form ID prefixed by a `#` eg: #contact-form', 'blockstrap-page-builder-blocks' ),
+			'desc'            => __( 'Enter the BS > Contact or BS > Modal form ID prefixed by a `#` eg: #contact-form', 'blockstrap-page-builder-blocks' ),
 			'status'          => 'info',
 			'group'           => __( 'Link', 'blockstrap-page-builder-blocks' ),
 			'element_require' => '[%type%]=="lightbox"',

diff --git a/blocks/class-blockstrap-widget-container.php b/blocks/class-blockstrap-widget-container.php
@@ -65,9 +65,15 @@ public function __construct() {
 				'description' => esc_html__( 'A container for content', 'blockstrap-page-builder-blocks' ),
 			),
 			'example'          => array(
-				'attributes' => array(
-					'after_text' => 'Earth',
-				),
+				'viewportWidth' => 300,
+				'innerBlocks'   => array(
+					array(
+						'name'	=> 'core/paragraph',
+						'attributes'	=>	array(
+							'content'	=> esc_html__( 'A container for content', 'blockstrap-page-builder-blocks' ),
+						)
+					)
+				)
 			),
 			'no_wrap'          => true,
 			'block_group_tabs' => array(

diff --git a/blocks/class-blockstrap-widget-gallery.php b/blocks/class-blockstrap-widget-gallery.php
@@ -30,11 +30,7 @@ public function __construct() {
 				'classname'   => 'bs-image',
 				'description' => esc_html__( 'An image gallery.', 'blockstrap-page-builder-blocks' ),
 			),
-			'example'           => array(
-				'attributes' => array(
-					'after_text' => 'Earth',
-				),
-			),
+			'example'           => false,
 			'no_wrap'           => true,
 			'block_group_tabs'  => array(
 				'content'  => array(

diff --git a/blocks/class-blockstrap-widget-icon-box.php b/blocks/class-blockstrap-widget-icon-box.php
@@ -34,8 +34,12 @@ className: '',
 			),
 			'example'           => array(
 				'attributes' => array(
-					'after_text' => 'Earth',
+					'icon_class' => 'fas fa-ship',
+					'icon_type' => 'iconbox-translucent',
+					'iconbox_size' => 'medium',
+					'icon_color' => 'success',
 				),
+				'viewportWidth' => 300
 			),
 			'no_wrap'           => true,
 			'block_group_tabs'  => array(