Merge pull request #2391 from vektor-inc/develop

[ Change version ] 1.93.2.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,7 @@
 ## どういう変更をしたか？
 
 <!-- [ このプルリクで変更した事を記載してください ] -->
+<!-- [ プログラムの不具合修正の場合、再発防止の情報共有 & レビューしやすいように、簡単で良いので何が原因で不具合が発生し、対策としてどういう処理をしたのかを記載してください ] -->
 
 ### スクリーンショットまたは動画
 
@@ -18,11 +19,12 @@
 - [ ] 複数の意図の変更 （ 機能の不具合修正 + 別の機能追加など ） を含んでいないか？
 - [ ] Files changed (変更ファイル)の内容は目視で確認したか？
 - [ ] readme.txt に変更内容は書いたか？
+- [ ] readme.txt に記載の変更内容はエンドユーザーが見て変更の概要がわかるように書かれているか？
 - [ ] 本当にちゃんと確認をしたか？
 
 ## プログラムの変更の場合
 
-テストを書かないのは普通ではありません。書けるテストは極力書くようにしてください。
+<!-- テストを書かないのは普通ではありません。書けるテストは極力書くようにしてください。 -->
 
 - [ ] 書けそうなテストは書いたか？
 

readme.txt

@@ -4,7 +4,7 @@ Donate link:
 Tags: Gutenberg,FAQ,alert
 Requires at least: 6.4
 Tested up to: 6.7
-Stable tag: 1.93.0.1
+Stable tag: 1.93.1.1
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -107,11 +107,14 @@ e.g.
 
 == Changelog ==
 
+= 1.93.2 =
+[ Bug fix ][ Post List Slider (Pro) ] Fixed sliding behavior when multiple post-list-slider blocks are present.
+
 = 1.93.1 =
-[ Bug fix ][ Post List ( Pro ) / Post List Slider ( Pro ) ] Fix the issue where posts are always displayed from the first post regardless of the "Display from the first post always" setting.
-[ Bug fix ][ Post List (Pro) ][ Post List Slider (Pro) ] Fixed missing "No relevant posts." message when no post types are selected.
+[ Bug fix ][ Post List (Pro) / Post List Slider (Pro) ] Fix the issue where posts are always displayed from the first post regardless of the "Display from the first post always" setting.
+[ Bug fix ][ Post List (Pro) / Post List Slider (Pro) ] Fixed missing "No relevant posts." message when no post types are selected.
 [ Bug fix ][ Tab (Pro) ] Added a CSS class to improve style priority with the Lightning theme.
-[ Bug fix ][ Core List ][ Border Box ] Improved handling of List's is-style-default style and Border Box color.
+[ Bug fix ][ Core List / Border Box ] Improved handling of List's is-style-default style and Border Box color.
 [ Specification change ][ Outer (Pro) ] Removed the aria-label attribute from links, and updated to exclude target and rel attributes when they are empty.
 
 = 1.93.0 =
@@ -121,7 +124,7 @@ e.g.
 [ Bug fix ][ Post List (Pro) ][ Post List Slider (Pro) ] Fixed missing "No relevant posts." message when no post types are selected.
 [ Bug fix ][ Table of Contents (Pro) ] Fix line break.
 [ Bug fix ][ Category Badge (Pro) ] Exclude post_tag.
-[ Bug fix ][ Post List Slider ( Pro ) ] Fix 404 Error of Load Module at free version.
+[ Bug fix ][ Post List Slider (Pro) ] Fix 404 Error of Load Module at free version.
 
 = 1.92.1 =
 [ Bug fix ][ Post List (Pro) ] Remove white space above title
@@ -366,7 +369,7 @@ e.g.
 = 1.68.0 =
 [ Add function ][ Dynamic Text (Pro) ] Add feature to display logged-in username.
 [ Specification change ][ Hidden extension ] Add VK Icon
-[ Specification change ][ Outer ( Pro ) ] Allowed decimal points in 'Container Inner Side Space Setting'.
+[ Specification change ][ Outer (Pro) ] Allowed decimal points in 'Container Inner Side Space Setting'.
 [ Specification change ][ Headding ] Marked as Not Recommended
 
 = 1.67.0 =
@@ -416,7 +419,7 @@ e.g.
 [ Bug fix ][ Button ] Fix console warning
 
 = 1.61.2 =
-[ Bug fix ][ Outer ( Pro ) ] Fixed opacity with previous Outer version.
+[ Bug fix ][ Outer (Pro) ] Fixed opacity with previous Outer version.
 
 = 1.61.1 =
 [ Bug fix ] Fix error WordPress 6.3 live previewing block themes.
@@ -425,7 +428,7 @@ e.g.
 = 1.61.0 =
 [ Specification change ] Update the required WordPress version.
 [ Specification change ] Changed to display Font Awesome version change button only when select is changed.
-[ Specification change ][ Outer ( Pro ) ]  Change opacity setting can be set in increments of 0.01.
+[ Specification change ][ Outer (Pro) ]  Change opacity setting can be set in increments of 0.01.
 [ Specification change ][ Animation(Pro) ] Fix WordPress 6.3 transforms settings.
 [ Bug fix ][ Taxonomy (Pro) ] Fixed error when selected taxonomy dose not exists.
 [ Bug fix ][ Taxonomy (Pro) ] Fixed individual CSS was loaded on all pages with classic theme.
@@ -440,7 +443,7 @@ e.g.
 [ Bug fix ][ Icon Block ] Fix enable hidden extension.
 
 = 1.59.0 =
-[ Add Filter Hook ( Pro ) ] Add filter fook of display license key form or not
+[ Add Filter Hook (Pro) ] Add filter fook of display license key form or not
 [ Specification change ] Change option value update via Redux Store.
 [ Bug fix ][ Page Content ] Fix duplicate Additional CSS classes.
 [ Bug fix ] Fix swiper file path ( // -> / )

src/blocks/_pro/post-list-slider/block.json

@@ -4,13 +4,8 @@
 	"category": "vk-blocks-cat",
 	"title": "Post List Slider",
 	"styleHandles": ["vk-blocks-build-css"],
-	"scriptHandles": ["vk-swiper-script", "vk-blocks/post-list-slider-script"],
 	"editorStyleHandles": ["vk-swiper-style", "vk-blocks-build-editor-css"],
-	"editorScriptHandles": [
-		"vk-blocks-build-js",
-		"vk-swiper-script",
-		"vk-blocks/post-list-slider-script"
-	],
+	"editorScriptHandles": ["vk-blocks-build-js"],
 	"attributes": {
 		"layout": {
 			"type": "string",

src/blocks/_pro/post-list-slider/edit.js

@@ -20,9 +20,10 @@ import { DisplayItemsControl } from '@vkblocks/components/display-items-control'
 import { DisplayCondition } from '@vkblocks/components/display-condition';
 import { AdvancedToggleControl } from '@vkblocks/components/advanced-toggle-control';
 import { MultiItemSetting } from './multi-item-setting.js';
+import { isParentReusableBlock } from '@vkblocks/utils/is-parent-reusable-block';
 
 export default function PostListSliderEdit(props) {
-	const { attributes, setAttributes } = props;
+	const { attributes, setAttributes, clientId } = props;
 
 	const postTypesProps = vk_block_post_type_params.post_type_option;
 	const termsByTaxonomyName = vk_block_post_type_params.term_by_taxonomy_name;
@@ -38,10 +39,22 @@ export default function PostListSliderEdit(props) {
 		effect,
 		speed,
 		navigationPosition,
+		blockId,
 	} = attributes;
 
 	const blockProps = useBlockProps();
 
+	useEffect(() => {
+		// blockID が定義されていない場合は blockID に clientID を挿入
+		// 再利用ブロックのインナーブロックではない場合 blockID を更新
+		if (
+			blockId === undefined ||
+			isParentReusableBlock(clientId) === false
+		) {
+			setAttributes({ blockId: clientId });
+		}
+	}, [clientId]);
+
 	useEffect(() => {
 		if (layout === 'postListText') {
 			setAttributes({ slidesPerGroup: 'one-by-one' });

src/blocks/_pro/post-list-slider/index.php

@@ -5,6 +5,8 @@
  * @package vk-blocks
  */
 
+use VektorInc\VK_Swiper\VkSwiper;
+
 /**
  * Post List Get Block Data
  *
@@ -227,6 +229,15 @@ function vk_blocks_register_block_post_list_slider() {
 		);
 	}
 
+	VkSwiper::register_swiper();
+
+	wp_register_script(
+		'vk-blocks/post-list-slider-script',
+		VK_BLOCKS_DIR_URL . 'build/vk-post-list-slider.min.js',
+		array( 'vk-swiper-script' ),
+		VK_BLOCKS_VERSION,
+		true
+	);
 	// クラシックテーマ & 6.5 環境で $assets = array() のように空にしないと重複登録になるため
 	// ここで初期化しておく
 	$assets = array(
@@ -237,7 +248,7 @@ function vk_blocks_register_block_post_list_slider() {
 	if ( method_exists( 'VK_Blocks_Block_Loader', 'should_load_separate_assets' ) && VK_Blocks_Block_Loader::should_load_separate_assets() ) {
 		$assets = array(
 			'style_handles'         => array( 'vk-blocks/post-list-slider' ),
-			'script_handles'        => array(),
+			'script_handles'        => array( 'vk-blocks/post-list-slider-script' ),
 			'editor_style_handles'  => array( 'vk-swiper-style', 'vk-blocks-build-editor-css' ),
 			'editor_script_handles' => array( 'vk-blocks-build-js' ),
 			'render_callback'       => 'vk_blocks_post_list_slider_render_callback',

vk-blocks.php

@@ -3,9 +3,9 @@
  * Plugin Name: VK Blocks Pro
  * Plugin URI: https://github.com/vektor-inc/vk-blocks
  * Description: This is a plugin that extends Block Editor.
- * Version: 1.93.1.0
- * Stable tag: 1.93.0.1
- * Requires at least: 6.3
+ * Version: 1.93.2.0
+ * Stable tag: 1.93.1.1
+ * Requires at least: 6.4
  * Author: Vektor,Inc.
  * Author URI: https://vektor-inc.co.jp
  * Text Domain: vk-blocks-pro