Skip to content

Commit

Permalink
Merge pull request #2182 from vektor-inc/develop
Browse files Browse the repository at this point in the history 
[ Change version ] 1.82.0.0
  • Loading branch information
@kurudrive
kurudrive authored Aug 20, 2024
2 parents b3df82e + ff286c5 commit 619e361
Show file tree
Hide file tree
Showing 20 changed files with 426 additions and 480 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/develop-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1']
wp-versions: ['6.5','6.4','6.3']
wp-versions: ['6.6','6.5','6.4']
name: PHP Unit test ${{ matrix.php-versions }} / WP ${{ matrix.wp-versions }} Test
services:
mysql:
Expand Down
215 changes: 215 additions & 0 deletions inc/vk-blocks/style/common-margin.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
<?php
/**
* Common Margin CSS
*
* @package vektor-inc/vk-blocks-pro
*/

/**
* スペーサーのサイズ（数値）を取得する関数
*
* @param array $options VK Blocks 共通オプション.
* @param string $spacer_size スペーサーのサイズ.
* @param string $device 対象デバイス.
*
* @return integer|float $return 返り値
*/
function vk_blocks_get_spacer_size( $options, $spacer_size, $device ) {

// そもそも値がなかった場合.
if ( ! isset( $options['margin_size'][ $spacer_size ] ) ) {
return null;
}

// 配列じゃない（デバイス毎のサイズが登録されていない）場合.
if ( ! is_array( $options['margin_size'][ $spacer_size ] ) ) {
return $options['margin_size'][ $spacer_size ];
}

// カスタム値がある場合⇒カスタム値を返す.
// 指定デバイスでのサイズ指定がない場合、他のデバイスで指定しているサイズを自動割り振り
// tablet -> pc -> mobile の順で自動適用する.
// でないと PC と タブが指定済 / モバイル未指定のときに モバイルに tablet より広い PC のサイズが適用されてしまうため.
if ( ! empty( $options['margin_size'][ $spacer_size ]['custom'] ) ) {
return $options['margin_size'][ $spacer_size ]['custom'];
} elseif ( isset( $options['margin_size'][ $spacer_size ][ $device ] ) ) { // 各サイズのデバイス毎のサイズ.
return $options['margin_size'][ $spacer_size ][ $device ];
} elseif ( isset( $options['margin_size'][ $spacer_size ]['tablet'] ) ) {
return $options['margin_size'][ $spacer_size ]['tablet'];
} elseif ( isset( $options['margin_size'][ $spacer_size ]['pc'] ) ) {
return $options['margin_size'][ $spacer_size ]['pc'];
} elseif ( isset( $options['margin_size'][ $spacer_size ]['mobile'] ) ) {
return $options['margin_size'][ $spacer_size ]['mobile'];
} else {
return null;
}
}

/**
* 画面サイズ毎のCSSをインライン出力するかどうかを判定する関数
*
* @param array $options VK Blocks 共通オプション.
* @param string $device : 画面の広さ mobile / tablet / pc.
* @return bool : 出力するかどうか
*/
function vk_blocks_is_size_print( $options, $device ) {
$return = false;
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'xxs', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'xs', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'sm', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'md', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'lg', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'xl', $device ) ) ) {
$return = true;
}
if ( is_numeric( vk_blocks_get_spacer_size( $options, 'xxl', $device ) ) ) {
$return = true;
}
return $return;
}

/**
* スペーサーのサイズのCSS変数（１行）を出力する関数
*
* @param array $options VK Blocks 共通オプション.
* @param string $spacer_size スペーサーのサイズ.
* @param string $device 対象デバイス.
* @param string $unit 単位.
*
* @return string $style CSS変数指定（１行分）.
*/
function vk_blocks_get_spacer_size_style( $options, $spacer_size, $device, $unit ) {
$style = '';
$return_size = vk_blocks_get_spacer_size( $options, $spacer_size, $device );
if ( ! empty( $return_size ) ) {
// 数値の場合
if ( is_numeric( $return_size ) ) {
$style = '--vk-margin-' . $spacer_size . ':' . $return_size . $unit . ';';
} elseif ( is_string( $return_size ) ) { // カスタム値の場合
$style = '--vk-margin-' . $spacer_size . ':' . $return_size . ';';
}
}
return $style;
}

/**
* 共通スペーサーのサイズ指定の全CSSを出力する関数
*
* @param array $options VK Blocks 共通オプション.
* @return string $dynamic_css : 出力するcss
*/
function vk_blocks_get_spacer_size_style_all( $options ) {
$dynamic_css = '';
if (
! empty( $options['margin_size']['xxs'] ) ||
! empty( $options['margin_size']['xs'] ) ||
! empty( $options['margin_size']['sm'] ) ||
! empty( $options['margin_size']['md'] ) ||
! empty( $options['margin_size']['lg'] ) ||
! empty( $options['margin_size']['xl'] ) ||
! empty( $options['margin_size']['xxl'] )
) {
if ( ! empty( $options['margin_unit'] ) ) {
$unit = $options['margin_unit'];
} else {
$unit = 'rem';
}

if ( vk_blocks_is_size_print( $options, 'mobile' ) ) {
$dynamic_css .= '
@media (max-width: 575.98px) {
:root,body{';
$dynamic_css .= ! empty( $options['margin_size']['xxs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxs', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xs', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['sm']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'sm', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['md']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'md', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['lg']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'lg', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xl', 'mobile', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xxl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxl', 'mobile', $unit ) );
$dynamic_css .= '
}
}';
}
if ( vk_blocks_is_size_print( $options, 'tablet' ) ) {
$dynamic_css .= '
@media (min-width: 576px) and (max-width: 991.98px) {
:root,body{';
$dynamic_css .= ! empty( $options['margin_size']['xxs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxs', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xs', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['sm']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'sm', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['md']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'md', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['lg']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'lg', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xl', 'tablet', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xxl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxl', 'tablet', $unit ) );
$dynamic_css .= '
}
}';
}
if ( vk_blocks_is_size_print( $options, 'pc' ) ) {
$dynamic_css .= '
@media (min-width: 992px) {
:root,body{';
$dynamic_css .= ! empty( $options['margin_size']['xxs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxs', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xs']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xs', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['sm']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'sm', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['md']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'md', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['lg']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'lg', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xl', 'pc', $unit ) );
$dynamic_css .= ! empty( $options['margin_size']['xxl']['custom'] ) ? '' : esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxl', 'pc', $unit ) );
$dynamic_css .= '
}
}';
}
}
if (
! empty( $options['margin_size']['xxs']['custom'] ) ||
! empty( $options['margin_size']['xs']['custom'] ) ||
! empty( $options['margin_size']['sm']['custom'] ) ||
! empty( $options['margin_size']['md']['custom'] ) ||
! empty( $options['margin_size']['lg']['custom'] ) ||
! empty( $options['margin_size']['xl']['custom'] ) ||
! empty( $options['margin_size']['xxl']['custom'] )
) {
$dynamic_css .= '
:root,body{';
$dynamic_css .= ! empty( $options['margin_size']['xxs']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxs', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['xs']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'xs', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['sm']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'sm', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['md']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'md', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['lg']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'lg', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['xl']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'xl', 'custom', $unit ) ) : '';
$dynamic_css .= ! empty( $options['margin_size']['xxl']['custom'] ) ? esc_attr( vk_blocks_get_spacer_size_style( $options, 'xxl', 'custom', $unit ) ) : '';
$dynamic_css .= '
}';
}
return $dynamic_css;
}

/**
* VK Blocks Assets
*/
function vk_blocks_print_spacer_size_style() {

$vk_blocks_options = VK_Blocks_Options::get_options();

$dynamic_css = vk_blocks_get_spacer_size_style_all( $vk_blocks_options );
$dynamic_css = vk_blocks_minify_css( $dynamic_css );

wp_add_inline_style( 'vk-blocks-build-css', $dynamic_css );
wp_add_inline_style( 'vk-blocks-utils-common-css', $dynamic_css );
// wp-edit-blocks がないと記事の編集画面に反映されない
wp_add_inline_style( 'wp-edit-blocks', $dynamic_css );
}
// 10 だと公開画面に出力されないので 11 に指定
// Since setting it to 10 doesn't output to the public screen, set it to 11 instead.
add_action( 'init', 'vk_blocks_print_spacer_size_style', 11 );
3 changes: 1 addition & 2 deletions inc/vk-blocks/vk-blocks-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
require_once __DIR__ . '/utils/minify-css.php';
require_once __DIR__ . '/style/balloon.php';
require_once __DIR__ . '/style/hidden-extension.php';
require_once __DIR__ . '/style/common-margin.php';
require_once __DIR__ . '/extensions/core/list.php';
require_once __DIR__ . '/view/responsive-br.php';
require_once __DIR__ . '/view/class-vk-blocks-postlist.php';
Expand Down Expand Up @@ -149,8 +150,6 @@ function vk_blocks_blocks_assets() {
}
';

$dynamic_css .= vk_blocks_get_spacer_size_style_all( $vk_blocks_options );

// Pro版のためfunction_existsを挟む
if ( function_exists( 'vk_blocks_get_custom_format_lists_inline_css' ) ) {
$dynamic_css .= vk_blocks_get_custom_format_lists_inline_css();
Expand Down
2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-admin-js.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-build-js.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja.l10n.php
View file

Large diffs are not rendered by default.

Binary file modified languages/vk-blocks-pro-ja.mo
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,7 @@ msgstr "角丸２"
#: src/blocks/balloon/edit.js:502
#: inc/vk-blocks/class-vk-blocks-global-settings.php:398
msgid "Circle"
msgstr "丸抜き"
msgstr "正円"

#: src/blocks/balloon/edit.js:511 src/blocks/button/edit.js:590
msgid "100%"
Expand Down
4 changes: 4 additions & 0 deletions languages/vk-blocks-pro-js.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3568,6 +3568,10 @@ msgstr ""
msgid "Reverse"
msgstr ""

#: src/extensions/core/cover/style.js:97
msgid "Cover link"
msgstr ""

#: src/extensions/core/group/style.js:104
msgid ""
"Because of the theme that enabled theme.json become can specify the color "
Expand Down
Loading

0 comments on commit 619e361

Please sign in to comment.