Merge branch 'develop' into fix/3035-theme

prconcepcion · prconcepcion · commit a4f08fb5c813 · 2024-02-20T06:17:02.000+08:00
diff --git a/languages/stackable-ultimate-gutenberg-blocks.pot b/languages/stackable-ultimate-gutenberg-blocks.pot
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "stackable",
-	"version": "3.12.10",
+	"version": "3.12.11",
 	"private": true,
 	"description": "Blocks for everyone",
 	"author": "Benjamin Intal of Gambit",
diff --git a/plugin.php b/plugin.php
@@ -6,7 +6,7 @@
  * Author: Gambit Technologies, Inc
  * Author URI: http://gambit.ph
  * Text Domain: stackable-ultimate-gutenberg-blocks
- * Version: 3.12.10
+ * Version: 3.12.11
  *
  * @package Stackable
  */
@@ -24,7 +24,7 @@
 
 defined( 'STACKABLE_SHOW_PRO_NOTICES' ) || define( 'STACKABLE_SHOW_PRO_NOTICES', true );
 defined( 'STACKABLE_BUILD' ) || define( 'STACKABLE_BUILD', 'free' );
-defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.12.10' );
+defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.12.11' );
 defined( 'STACKABLE_FILE' ) || define( 'STACKABLE_FILE', __FILE__ );
 defined( 'STACKABLE_I18N' ) || define( 'STACKABLE_I18N', 'stackable-ultimate-gutenberg-blocks' ); // Plugin slug.
 defined( 'STACKABLE_DESIGN_LIBRARY_URL' ) || define( 'STACKABLE_DESIGN_LIBRARY_URL', 'https://storage.googleapis.com/stackable-plugin-assets' ); // Design Library CDN URL
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: blocks, gutenberg, gutenberg blocks, page builder, WordPress blocks
 Requires at least: 6.1
 Tested up to: 6.4.3
 Requires PHP: 7.3
-Stable tag: 3.12.10
+Stable tag: 3.12.11
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -294,6 +294,17 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.
 
 == Changelog ==
 
+= 3.12.11 =
+* New: You can now use YouTube shorts and unlisted Vimeo videos in the Video Popup block
+* Fixed: Ordered Icon List block numerals no longer wrap to the next line
+* Fixed: Native list block behaviors no longer create Stackable Icon List Item blocks
+* Fixed: Clicking WooCommerce add to cart button no longer changes the Tabs block to the first tab
+* Fixed: No longer need to have v2 compatibility enabled for the random order option to work in the Posts block
+* Fixed: Carousel block default icon color can now be changed correctly
+* Fixed: Pasting a bullet list no longer converts it to a Stackable Icon List block
+* Fixed: Frontend scripts now will not initialize more than once
+* Fixed: Updated .pot file to allow manual JS strings translations
+
 = 3.12.10 =
 * Fixed: (Hotfix update) Some themes can add bullets or numbers on the Icon List block
 
diff --git a/src/block/accordion/frontend-accordion.js b/src/block/accordion/frontend-accordion.js
@@ -121,14 +121,17 @@ class StackableAccordion {
 
 		const els = document.querySelectorAll( '.stk-block-accordion' )
 		els.forEach( el => {
-			el.contentEl = el.querySelector( '.stk-block-accordion__content' )
-			if ( ! isAnimationDisabled ) {
-				RO.observe( el )
+			if ( ! el._StackableHasInitAccordion ) {
+				el.contentEl = el.querySelector( '.stk-block-accordion__content' )
+				if ( ! isAnimationDisabled ) {
+					RO.observe( el )
+				}
+				MO.observe( el, {
+					attributeFilter: [ 'open' ],
+					attributeOldValue: true,
+				} )
+				el._StackableHasInitAccordion = true
 			}
-			MO.observe( el, {
-				attributeFilter: [ 'open' ],
-				attributeOldValue: true,
-			} )
 		} )
 
 		const addWrapperHack = el => {
diff --git a/src/block/carousel/frontend-carousel.js b/src/block/carousel/frontend-carousel.js
@@ -472,9 +472,12 @@ class StackableCarousel {
 	init = () => {
 		const els = document.querySelectorAll( '.stk-block-carousel' )
 		els.forEach( el => {
-			const carousel = new _StackableCarousel( el )
-			el.carousel = carousel
-			carousel.init()
+			if ( ! el._StackableHasInitCarousel ) {
+				const carousel = new _StackableCarousel( el )
+				el.carousel = carousel
+				carousel.init()
+				el._StackableHasInitCarousel = true
+			}
 		} )
 	}
 }
diff --git a/src/block/carousel/schema.js b/src/block/carousel/schema.js
@@ -17,8 +17,8 @@ import {
 import { AttributeObject } from '~stackable/util'
 import { version as VERSION } from 'stackable'
 
-export const defaultIconPrev = `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-left" class="svg-inline--fa fa-chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" width="32" height="32"><path fill="currentColor" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"></path></svg>`
-export const defaultIconNext = `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-right" class="svg-inline--fa fa-chevron-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" width="32" height="32"><path fill="currentColor" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"></path></svg>`
+export const defaultIconPrev = `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-left" class="svg-inline--fa fa-chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" width="32" height="32"><path d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"></path></svg>`
+export const defaultIconNext = `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chevron-right" class="svg-inline--fa fa-chevron-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" width="32" height="32"><path d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"></path></svg>`
 
 export const attributes = ( version = VERSION ) => {
 	const attrObject = new AttributeObject()
@@ -80,10 +80,14 @@ export const attributes = ( version = VERSION ) => {
 			},
 			arrowIconPrev: {
 				type: 'string',
+				source: 'html',
+				selector: '.stk-block-carousel__button__prev',
 				default: '',
 			},
 			arrowIconNext: {
 				type: 'string',
+				source: 'html',
+				selector: '.stk-block-carousel__button__next',
 				default: '',
 			},
 			arrowPosition: {
diff --git a/src/block/carousel/style.js b/src/block/carousel/style.js
@@ -102,7 +102,7 @@ const Styles = props => {
 				{ ...propsToPass }
 				selector=".stk-block-carousel__button"
 				hoverSelector=".stk-block-carousel__button:hover"
-				styleRule="color"
+				styleRule="fill"
 				attrName="arrowIconColor"
 				key="arrowIconColor"
 				hover="all"
diff --git a/src/block/expand/frontend-expand.js b/src/block/expand/frontend-expand.js
@@ -45,12 +45,18 @@ class StackableExpand {
 		}
 
 		els.forEach( el => {
-			el.addEventListener( 'click', onClick )
+			if ( ! el._StackableHasInitExpand ) {
+				el.addEventListener( 'click', onClick )
+				el._StackableHasInitExpand = true
+			}
 		} )
 
 		blocks.forEach( block => {
-			fixAriaAttributes( block )
-			addAriaAttributes( block )
+			if ( ! block._StackableHasInitExpandFix ) {
+				fixAriaAttributes( block )
+				addAriaAttributes( block )
+				block._StackableHasInitExpandFix = true
+			}
 		} )
 	}
 }
diff --git a/src/block/horizontal-scroller/frontend-horizontal-scroller.js b/src/block/horizontal-scroller/frontend-horizontal-scroller.js
@@ -11,6 +11,9 @@ class StackableHorizontalScroller {
 		let initialClientX = 0
 
 		els.forEach( el => {
+			if ( el._StackableHasInitHorizontalScroller ) {
+				return
+			}
 			// get all links, because we will need to disable them during drag
 			const children = el.querySelectorAll( '.stk-block-link, a' )
 
@@ -83,6 +86,8 @@ class StackableHorizontalScroller {
 			}
 
 			el.addEventListener( 'mousedown', mouseDownHandler )
+
+			el._StackableHasInitHorizontalScroller = true
 		} )
 	}
 }
diff --git a/src/block/icon-list-item/style.scss b/src/block/icon-list-item/style.scss
@@ -81,6 +81,7 @@
 			transform: rotate(var(--stk-icon-list-icon-rotation, 0deg));
 			opacity: var(--stk-icon-list-icon-opacity, 1);
 			vertical-align: middle;
+			white-space: nowrap;
 		}
 	}
 
diff --git a/src/block/notification/frontend-notification.js b/src/block/notification/frontend-notification.js
@@ -7,6 +7,9 @@ class StackableNotification {
 	init = () => {
 		const els = document.querySelectorAll( '.stk-block-notification.stk--is-dismissible' )
 		els.forEach( el => {
+			if ( el._StackableHasInitAccordion ) {
+				return
+			}
 			// Dismiss handler.
 			const uid = el.getAttribute( 'data-block-id' )
 			const itemName = `stckbl-notif-${ uid }`
@@ -21,6 +24,7 @@ class StackableNotification {
 				localStorage.setItem( itemName, 1 )
 				el.style.display = 'none'
 			} )
+			el._StackableHasInitAccordion = true
 		} )
 	}
 }
diff --git a/src/block/posts/index.php b/src/block/posts/index.php
@@ -609,3 +609,47 @@ public static function get_terms() {
 	new Stackable_Posts_Block();
 }
 
+if ( ! function_exists( 'stackable_add_custom_orderby_params' ) ) {
+	/**
+	 * The callback to add `rand` as an option for orderby param in REST API.
+	 * Hook to `rest_{$this->post_type}_collection_params` filter.
+	 *
+	 * @param array $query_params Accepted parameters.
+	 * @return array
+	 *
+	 * @see https://felipeelia.dev/wordpress-rest-api-enable-random-order-of-posts-list/
+	 * @see https://www.timrosswebdevelopment.com/wordpress-rest-api-post-order/
+	 */
+	function stackable_add_custom_orderby_params( $query_params ) {
+		if ( ! in_array( 'rand', $query_params['orderby']['enum'] ) ) {
+			$query_params['orderby']['enum'][] = 'rand';
+		}
+		if ( ! in_array( 'menu_order', $query_params['orderby']['enum'] ) ) {
+			$query_params['orderby']['enum'][] = 'menu_order';
+		}
+		return $query_params;
+	}
+}
+
+if ( ! function_exists( 'stackable_add_custom_orderby' ) ) {
+	/**
+	 * Add `rand` as an option for orderby param in REST API.
+	 * Hook to `rest_{$this->post_type}_collection_params` filter.
+	 *
+	 * @param array $query_params Accepted parameters.
+	 * @return array
+	 *
+	 * @see https://felipeelia.dev/wordpress-rest-api-enable-random-order-of-posts-list/
+	 * @see https://www.timrosswebdevelopment.com/wordpress-rest-api-post-order/
+	 */
+	function stackable_add_custom_orderby() {
+		$post_types = get_post_types( array( 'public' => true ) );
+		foreach ( $post_types as $post_type ) {
+			add_filter( 'rest_' . $post_type . '_collection_params', 'stackable_add_custom_orderby_params' );
+		}
+	}
+
+	add_action( 'rest_api_init', 'stackable_add_custom_orderby' );
+}
+
+
diff --git a/src/block/tabs/frontend-tabs.js b/src/block/tabs/frontend-tabs.js
@@ -112,7 +112,10 @@ class StackableTabs {
 	init = () => {
 		document.querySelectorAll( '.stk-block-tabs' )
 			.forEach( el => {
-				new _StackableTabs( el )
+				if ( ! el._StackableHasInitTabs ) {
+					new _StackableTabs( el )
+					el._StackableHasInitTabs = true
+				}
 			} )
 	}
 }
diff --git a/src/block/video-popup/frontend-video-popup.js b/src/block/video-popup/frontend-video-popup.js
@@ -23,6 +23,9 @@ const getVideoProviderFromURL = url => {
 	if ( ! id ) {
 		id = ( url.match( /youtu\.be\/([^\&\?\/]+)/i ) || [] )[ 1 ]
 	}
+	if ( ! id ) {
+		id = ( url.match( /youtube\.com\/shorts\/([^\&\?\/]+)/i ) || [] )[ 1 ]
+	}
 
 	if ( id ) {
 		return {
@@ -32,7 +35,18 @@ const getVideoProviderFromURL = url => {
 	}
 
 	// Check for Vimeo.
-	id = ( url.match( /vimeo\.com\/(\w*\/)*(\d+)/i ) || [] )[ 2 ]
+	const _id = ( url.match( /vimeo\.com\/(\d+)\/(\w+)/i ) || [] ) // https://vimeo.com/VIDEO_ID/PRIVACY_HASH
+	id = _id[ 1 ]
+	if ( _id[ 1 ] && _id[ 2 ] ) {
+		return {
+			type: 'vimeo-unlisted',
+			id: { video: _id[ 1 ], hash: _id[ 2 ] },
+		}
+	}
+
+	if ( ! id ) {
+		id = ( url.match( /vimeo\.com\/(\w*\/)*(\d+)/i ) || [] )[ 2 ] // https://vimeo.com/CATEGORY/IDENTIFIER/VIDEO_ID
+	}
 	if ( ! id ) {
 		id = ( url.match( /^\d+$/i ) || [] )[ 0 ]
 	}
@@ -69,6 +83,10 @@ class StackableVideoPopup {
 						args.ytNoCookie = true // Use youtube-nocookie.
 					} else if ( type === 'vimeo' ) {
 						args.vimeoSrc = id
+					} else if ( type === 'vimeo-unlisted' ) {
+						// Create custom iframe src for unlisted vimeo videos.
+						// https://developer.vimeo.com/api/oembed/videos#table-2
+						args.iframeSrc = `https://player.vimeo.com/video/${ id.video }?h=${ id.hash }&autoplay=1`
 					} else {
 						args.vidSrc = id
 						args.animationStart = () => {
diff --git a/src/components/font-family-control/google-fonts.json b/src/components/font-family-control/google-fonts.json
diff --git a/src/deprecated/v2/block/blog-posts/index.php b/src/deprecated/v2/block/blog-posts/index.php
diff --git a/src/util/index.js b/src/util/index.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "stackable",`
`3`		`- "version": "3.12.10",`
	`3`	`+ "version": "3.12.11",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Blocks for everyone",`
`6`	`6`	`"author": "Benjamin Intal of Gambit",`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ class StackableHorizontalScroller {`
`11`	`11`	`let initialClientX = 0`
`12`	`12`
`13`	`13`	`els.forEach( el => {`
	`14`	`+ if ( el._StackableHasInitHorizontalScroller ) {`
	`15`	`+ return`
	`16`	`+ }`
`14`	`17`	`// get all links, because we will need to disable them during drag`
`15`	`18`	`const children = el.querySelectorAll( '.stk-block-link, a' )`
`16`	`19`
`@@ -83,6 +86,8 @@ class StackableHorizontalScroller {`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`el.addEventListener( 'mousedown', mouseDownHandler )`
	`89`	`+`
	`90`	`+ el._StackableHasInitHorizontalScroller = true`
`86`	`91`	`} )`
`87`	`92`	`}`
`88`	`93`	`}`