Merge pull request #1914 from vektor-inc/develop

[ Change version ] 1.69.0.0

.github/workflows/develop-test.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
         wp-versions: ['6.3','6.2','6.1']
     name: PHP Unit test ${{ matrix.php-versions }} / WP ${{ matrix.wp-versions }} Test on ${{ matrix.operating-system }}
     services:

composer.json

@@ -21,7 +21,7 @@
 		"vektor-inc/vk-color-palette-manager": "^0.4.0",
 		"vektor-inc/vk-breadcrumb": "^0.2.5",
 		"vektor-inc/vk-term-color": "^0.7.1",
-		"vektor-inc/vk-css-optimize": "^0.2.0"
+		"vektor-inc/vk-css-optimize": "^0.2.2"
 	},
 	"require-dev": {
 		"doctrine/instantiator": "1.5.0",

editor-css/_editor_before_slider.scss

@@ -2,14 +2,9 @@
 /* 管理画面
 /*-------------------------------------------*/
 .edit-post-visual-editor {
-	.swiper-button-prev,
-	.swiper-button-next {
-		//button非表示
-		display: none;
-	}
 	/* vk_width-full は廃止になったが互換処理のために 2022年7月末までは残す */
-	.swiper-container.vk_slider.vk_width-full,
-	.swiper-container.vk_slider.alignfull {
+	.vk_slider.vk_swiper.vk_slider.vk_swiper.vk_width-full,
+	.vk_slider.vk_swiper.vk_slider.vk_swiper.alignfull {
 		max-width: 100vw;
 		.vk_slider_item {
 			margin: auto;
@@ -27,7 +22,7 @@
 	}
 }
 // インサーターが左右左右中央にならないので補正
-.swiper-container>.swiper-wrapper>div>.block-editor-inner-blocks>.block-editor-block-list__layout>.block-list-appender {
+vk_slider>.vk_slider_wrapper>div>.block-editor-inner-blocks>.block-editor-block-list__layout>.block-list-appender {
 	margin-left:auto;
 	margin-right:auto;
 }

gulpfile.js

@@ -94,6 +94,10 @@ gulp.task('helper-js', (done) => {
 		.pipe(uglify())
 		.pipe(rename('vk-slider.min.js'))
 		.pipe(gulp.dest('./build/'));
+	gulp.src('src/blocks/slider/editor-script.js')
+		.pipe(uglify())
+		.pipe(rename('editor-script.js'))
+		.pipe(gulp.dest('./build/slider'));
 	done();
 });
 

inc/vk-blocks/view/class-vk-blocks-postlist.php

@@ -168,12 +168,13 @@ public static function get_loop_query( $attributes ) {
 		global $wp_query;
 		// とりあえず１を入れつつ2ページ目の情報があったら上書き
 		$paged = 1;
-		if ( is_singular() && isset( $wp_query->query_vars['page'] ) ) {
+		if ( ! empty( $attributes['pagedlock'] ) ) {
+			$paged = 1;
+		} elseif ( is_singular() && isset( $wp_query->query_vars['page'] ) ) {
 			$paged = $wp_query->query_vars['page'];
 		} elseif ( isset( $wp_query->query_vars['paged'] ) ) {
 			$paged = $wp_query->query_vars['paged'];
 		}
-
 		$args = array(
 			'post_type'      => $is_checked_post_type,
 			'tax_query'      => self::format_terms( $tax_query_relation, $is_checked_terms ),