Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

【テスト追加待ち】The Button Block has been made compatible for use within the Core Navigation Block. #1957

Draft
wants to merge 67 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
37cc48f
[ Specification Change ] The Button Block has been made compatible fo…
kurudrive Apr 3, 2024
6ebea46
lint
kurudrive Apr 3, 2024
2d04f28
change test version
kurudrive Apr 3, 2024
ec497c6
Merge branch 'develop' into add/vk-fixed-block
kurudrive Apr 11, 2024
b063f60
Change default 'delete' to 'display' for headerDisplay and footerDisplay
mtdkei Aug 8, 2024
aac8d6a
Change default 'delete' to 'display' for headerDisplay and footerDisplay
mtdkei Aug 8, 2024
ed99e03
Change default 'delete' to 'display' for footerDisplay
mtdkei Aug 8, 2024
c07a4dd
Change default 'delete' to 'display' for headerDisplay
mtdkei Aug 8, 2024
a7015cc
Set 'core/button' block to center
mtdkei Aug 8, 2024
600dffe
Add deprecated file
Aug 9, 2024
74c740b
Add test file
Aug 9, 2024
2760dd7
Add changelog
Aug 9, 2024
f7ab912
Fix: test
mtdkei Aug 9, 2024
5c396f4
Add deprecated file
Aug 23, 2024
29d2cf0
Merge develop file
Aug 23, 2024
de2e796
Fix: import file
Aug 23, 2024
3ebb24f
Merge develop
Sep 12, 2024
6ad3a60
Added data attributes for headerDisplay and footerDisplay
Sep 12, 2024
5c8b6f5
Fix: test file
Sep 12, 2024
73efdf8
Fix: undo default attributes
Sep 13, 2024
b563b40
Delete src/blocks/_pro/gridcolcard-item/deprecated/1.81.0/save.js
mtdkei Sep 13, 2024
defd6aa
Add deprecated file
Sep 13, 2024
6b710d3
Add deprecated file
Sep 13, 2024
ab042cd
Add deprecated file
Sep 13, 2024
d80169b
Delete src/blocks/_pro/gridcolcard-item-header/deprecated/1.81.0/save.js
mtdkei Sep 13, 2024
b36f7ea
Add deprecated file
Sep 13, 2024
e1e92cb
Fix: text
mtdkei Sep 13, 2024
d4b6ccd
Revert "Fix: undo default attributes"
Sep 13, 2024
b07349e
Fix: undo default attributes
Sep 13, 2024
c96f60c
Add: deprecated file
Sep 13, 2024
0768c8a
Delete blockAttributes2
mtdkei Sep 13, 2024
96112b6
Delete src/blocks/_pro/gridcolcard-item-footer/deprecated/1.84.0/save.js
mtdkei Sep 13, 2024
b6b92ca
Delete src/blocks/_pro/gridcolcard-item-header/deprecated/1.84.0/save.js
mtdkei Sep 13, 2024
79274fa
Delete blockAttributes2
mtdkei Sep 13, 2024
ad96f43
Delete src/blocks/_pro/gridcolcard/deprecated/1.84.0/save.js
mtdkei Sep 13, 2024
7e201cd
Revert src/blocks/_pro/gridcolcard/deprecated/index.js to commit a9e1d53
Sep 13, 2024
35bc8ed
Merge develop file
Oct 3, 2024
7c57f82
Fix: change blockProps
Oct 3, 2024
517458e
Add test file
Oct 3, 2024
eb34828
Add deprecated file
Oct 3, 2024
f553939
Fix: change blockProps
Oct 3, 2024
1743293
Delete readme.txt
mtdkei Oct 3, 2024
362c19e
Delete test/e2e-tests/fixtures/blocks/vk-blocks__gridcolcard__depreca…
mtdkei Oct 3, 2024
ff56ed1
Add changelog
Oct 3, 2024
f723c34
Delete blank space
Oct 3, 2024
49741d5
fix: cssのwarningを回避
mthaichi Oct 9, 2024
db67c03
Merge pull request #2263 from vektor-inc/fix/common-css/build-error
goutetsuguma Oct 9, 2024
f39bb34
リンクコンポーネントで tel: と mailto: リンクの不具合を修正
MasayaMORIMOTO Oct 11, 2024
b45992b
リンクコンポーネントで tel: と mailto: リンクの不具合を修正
MasayaMORIMOTO Oct 11, 2024
99378f1
dev時にsource-mapを有効化する
mthaichi Oct 14, 2024
5320fc3
fix
mthaichi Oct 14, 2024
f75b2a7
Merge pull request #2267 from vektor-inc/fix/link-component/add-tel-m…
goutetsuguma Oct 15, 2024
ef52b9d
Merge branch 'develop' into fix/gridcolcard-header-footer-display
mtdkei Oct 15, 2024
01c3651
Revert gridcolcard-item-footer/edit.js to commit b18082b
Oct 15, 2024
90f3673
Add deprecated test
Oct 15, 2024
e7c261c
Delete src/blocks/_pro/gridcolcard-item/deprecated/1.84.0/save.js
mtdkei Oct 15, 2024
62fcf19
Rename vk-blocks__gridcolcard__deprecated-1-85-1.html to vk-blocks__g…
mtdkei Oct 15, 2024
3ad5fe0
Fix: save name
Oct 15, 2024
da4a9e5
[ Bug fix ][ Slider ] Fix an issue where full width alignment does no…
kurudrive Oct 16, 2024
8ebfc72
Merge pull request #2268 from vektor-inc/env/source-map
kurudrive Oct 17, 2024
578d75c
Merge pull request #2271 from vektor-inc/fix/slider/width-tt4-tt5
sysbird Oct 18, 2024
503913e
Merge branch 'develop' into fix/gridcolcard-header-footer-display
mthaichi Oct 21, 2024
5c912f7
Merge pull request #2166 from vektor-inc/fix/gridcolcard-header-foote…
mthaichi Oct 21, 2024
31da9fd
[ Specification change ] Add filter vk_post_taxonomies_html ( Update …
kurudrive Oct 21, 2024
8d8afb8
Merge pull request #2274 from vektor-inc/update/vk-posts-1-6-1
kurudrive Oct 21, 2024
b87dc2d
[ Change version ] 1.88.0.0
kurudrive Oct 21, 2024
31913ed
Merge branch 'develop' into update/button-to-core-navigation
kurudrive Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions inc/vk-components/package/_scss/_vk-post-type-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ https://github.com/vektor-inc/vektor-wp-libraries
.card-body {
height: 100%;
padding-bottom: 1.5em;
box-sizing:border-box;
}
}

Expand Down
24 changes: 13 additions & 11 deletions inc/vk-components/package/class-vk-component-posts.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* VK Components Posts
*
* @package VK Component
* @version 1.6.0
* @version 1.6.1
*
* *********************** CAUTION ***********************
* The original of this file is located at:
Expand Down Expand Up @@ -136,14 +136,12 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
$loop_outer_class_post_types = array();
if ( ! isset( $wp_query->query['post_type'] ) ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-post';
} else {
if ( is_array( $wp_query->query['post_type'] ) ) {
foreach ( $wp_query->query['post_type'] as $key => $value ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
}
} else {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
} elseif ( is_array( $wp_query->query['post_type'] ) ) {
foreach ( $wp_query->query['post_type'] as $key => $value ) {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $value;
}
} else {
$loop_outer_class_post_types[] = 'vk_posts-postType-' . $wp_query->query['post_type'];
}

$loop_outer_class_post_types[] = 'vk_posts-layout-' . $options['layout'];
Expand Down Expand Up @@ -207,7 +205,7 @@ public static function get_loop( $wp_query, $options, $loop_options = array() )
$vk_posts_loop_item_count = 0;

while ( $wp_query->have_posts() ) {
$vk_posts_loop_item_count++;
++$vk_posts_loop_item_count;

$wp_query->the_post();
global $post;
Expand Down Expand Up @@ -716,12 +714,16 @@ public static function get_view_body( $post, $options ) {
}
if ( $taxonomies ) {
$html .= '<div class="vk_post_taxonomies">';

// 各タクソノミーの処理
$taxonomies_html = '';
foreach ( $taxonomies as $key => $value ) {
$html .= '<dl class="vk_post_taxonomy vk_post_taxonomy-' . $key . '">' . $value . '</dl>';
$taxonomies_html .= '<dl class="vk_post_taxonomy vk_post_taxonomy-' . $key . '">' . $value . '</dl>';
} // foreach

$html .= apply_filters( 'vk_post_taxonomies_html', $taxonomies_html );
$html .= '</div>';
}

}

$html .= apply_filters( 'vk_post_taxonomies_after', '' );
Expand Down
2 changes: 1 addition & 1 deletion inc/vk-components/package/css/vk-components.css

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions languages/vk-blocks-pro-js.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1247,13 +1247,13 @@ msgid "Setting up a link"
msgstr ""

#: src/blocks/_pro/dynamic-text/edit.js:389
#: src/blocks/_pro/gridcolcard-item/edit.js:346
#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/icon-card-item/edit.js:128
#: src/blocks/button/edit.js:283
#: src/blocks/icon/edit.js:306
#: src/blocks/pr-blocks/edit.js:262
#: src/blocks/pr-content/edit.js:131
#: src/components/link-toolbar/index.js:288
#: src/components/link-toolbar/index.js:293
msgid "Open link new tab."
msgstr ""

Expand Down Expand Up @@ -1456,63 +1456,63 @@ msgstr ""
msgid "You can create a variety of layouts with grid column card blocks."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:242
#: src/blocks/_pro/gridcolcard-item/edit.js:249
#: src/blocks/_pro/select-post-list-item/edit.js:66
#: src/blocks/button/edit.js:249
#: src/components/link-toolbar/index.js:247
#: src/components/link-toolbar/index.js:252
msgid "Unlink"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:243
#: src/blocks/_pro/gridcolcard-item/edit.js:250
#: src/blocks/button/edit.js:250
#: src/components/link-toolbar/index.js:248
#: src/components/link-toolbar/index.js:253
msgid "Input Link URL"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:273
#: src/blocks/_pro/gridcolcard-item/edit.js:280
#: src/blocks/_pro/select-post-list-item/edit.js:102
#: src/blocks/button/edit.js:278
#: src/components/link-toolbar/index.js:282
#: src/components/link-toolbar/index.js:287
msgid "Submit"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:297
#: src/blocks/_pro/gridcolcard-item/edit.js:304
msgid "Edit mode"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:307
#: src/blocks/_pro/gridcolcard-item/edit.js:314
msgid "All columns"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:315
#: src/blocks/_pro/gridcolcard-item/edit.js:322
msgid "This column only"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:320
#: src/blocks/_pro/gridcolcard-item/edit.js:327
msgid "Edit Lock"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:323
#: src/blocks/_pro/gridcolcard-item/edit.js:330
msgid "Lock edits this block from the parent and other Grid Column Item block"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:334
#: src/blocks/_pro/gridcolcard-item/edit.js:341
msgid "Column Setting"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:338
#: src/blocks/_pro/gridcolcard-item/edit.js:345
#: src/blocks/_pro/icon-card-item/edit.js:120
#: src/blocks/pr-blocks/edit.js:254
msgid "Link URL:"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/gridcolcard-item/edit.js:360
msgid ""
"If you set a link URL, do not place the link element (text or button) in "
"the Grid Column Card Item. It may not be displayed correctly."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:357
#: src/blocks/_pro/gridcolcard-item/edit.js:364
msgid "Make sure that no link is specified for the image block, etc."
msgstr ""

Expand Down Expand Up @@ -3322,23 +3322,23 @@ msgstr ""
msgid "Link target"
msgstr ""

#: src/components/link-toolbar/index.js:28
#: src/components/link-toolbar/index.js:31
msgid "Currently selected"
msgstr ""

#: src/components/link-toolbar/index.js:317
#: src/components/link-toolbar/index.js:322
msgid "Link copied to clipboard."
msgstr ""

#: src/components/link-toolbar/index.js:66
#: src/components/link-toolbar/index.js:69
msgid "Deleting Link"
msgstr ""

#: src/components/link-toolbar/index.js:76
#: src/components/link-toolbar/index.js:79
msgid "Copy link: %s"
msgstr ""

#: src/components/link-toolbar/index.js:83
#: src/components/link-toolbar/index.js:86
msgid "Copy link"
msgstr ""

Expand Down
50 changes: 25 additions & 25 deletions languages/vk-blocks-pro.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is distributed under the same license as the VK Blocks Pro plugin.
msgid ""
msgstr ""
"Project-Id-Version: VK Blocks Pro 1.86.0.0\n"
"Project-Id-Version: VK Blocks Pro 1.87.0.0\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vk-blocks-pro\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2024-10-08T14:42:00+00:00\n"
"POT-Creation-Date: 2024-10-21T14:55:12+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.10.0\n"
"X-Domain: vk-blocks-pro\n"
Expand Down Expand Up @@ -1252,13 +1252,13 @@ msgid "Setting up a link"
msgstr ""

#: src/blocks/_pro/dynamic-text/edit.js:389
#: src/blocks/_pro/gridcolcard-item/edit.js:346
#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/icon-card-item/edit.js:128
#: src/blocks/button/edit.js:283
#: src/blocks/icon/edit.js:306
#: src/blocks/pr-blocks/edit.js:262
#: src/blocks/pr-content/edit.js:131
#: src/components/link-toolbar/index.js:288
#: src/components/link-toolbar/index.js:293
msgid "Open link new tab."
msgstr ""

Expand Down Expand Up @@ -1459,61 +1459,61 @@ msgstr ""
msgid "You can create a variety of layouts with grid column card blocks."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:242
#: src/blocks/_pro/gridcolcard-item/edit.js:249
#: src/blocks/_pro/select-post-list-item/edit.js:66
#: src/blocks/button/edit.js:249
#: src/components/link-toolbar/index.js:247
#: src/components/link-toolbar/index.js:252
msgid "Unlink"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:243
#: src/blocks/_pro/gridcolcard-item/edit.js:250
#: src/blocks/button/edit.js:250
#: src/components/link-toolbar/index.js:248
#: src/components/link-toolbar/index.js:253
msgid "Input Link URL"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:273
#: src/blocks/_pro/gridcolcard-item/edit.js:280
#: src/blocks/_pro/select-post-list-item/edit.js:102
#: src/blocks/button/edit.js:278
#: src/components/link-toolbar/index.js:282
#: src/components/link-toolbar/index.js:287
msgid "Submit"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:297
#: src/blocks/_pro/gridcolcard-item/edit.js:304
msgid "Edit mode"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:307
#: src/blocks/_pro/gridcolcard-item/edit.js:314
msgid "All columns"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:315
#: src/blocks/_pro/gridcolcard-item/edit.js:322
msgid "This column only"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:320
#: src/blocks/_pro/gridcolcard-item/edit.js:327
msgid "Edit Lock"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:323
#: src/blocks/_pro/gridcolcard-item/edit.js:330
msgid "Lock edits this block from the parent and other Grid Column Item block"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:334
#: src/blocks/_pro/gridcolcard-item/edit.js:341
msgid "Column Setting"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:338
#: src/blocks/_pro/gridcolcard-item/edit.js:345
#: src/blocks/_pro/icon-card-item/edit.js:120
#: src/blocks/pr-blocks/edit.js:254
msgid "Link URL:"
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:353
#: src/blocks/_pro/gridcolcard-item/edit.js:360
msgid "If you set a link URL, do not place the link element (text or button) in the Grid Column Card Item. It may not be displayed correctly."
msgstr ""

#: src/blocks/_pro/gridcolcard-item/edit.js:357
#: src/blocks/_pro/gridcolcard-item/edit.js:364
msgid "Make sure that no link is specified for the image block, etc."
msgstr ""

Expand Down Expand Up @@ -3315,23 +3315,23 @@ msgstr ""
msgid "Link target"
msgstr ""

#: src/components/link-toolbar/index.js:28
#: src/components/link-toolbar/index.js:31
msgid "Currently selected"
msgstr ""

#: src/components/link-toolbar/index.js:317
#: src/components/link-toolbar/index.js:322
msgid "Link copied to clipboard."
msgstr ""

#: src/components/link-toolbar/index.js:66
#: src/components/link-toolbar/index.js:69
msgid "Deleting Link"
msgstr ""

#: src/components/link-toolbar/index.js:76
#: src/components/link-toolbar/index.js:79
msgid "Copy link: %s"
msgstr ""

#: src/components/link-toolbar/index.js:83
#: src/components/link-toolbar/index.js:86
msgid "Copy link"
msgstr ""

Expand Down Expand Up @@ -3680,6 +3680,7 @@ msgid "PC size"
msgstr ""

#: src/extensions/core/table/style.js:41
#: dist/vk-blocks-pro/inc/vk-blocks/view/class-vk-blocks-scrollhintrenderer.php:72
#: inc/vk-blocks/view/class-vk-blocks-scrollhintrenderer.php:72
msgid "You can scroll"
msgstr ""
Expand Down Expand Up @@ -3857,7 +3858,6 @@ msgstr ""
msgid "Installing Plugin: %s"
msgstr ""

#. translators: %s = plugin name.
#: dist/vk-blocks-pro/inc/tgm-plugin-activation/tgm-config.php:76
#: inc/tgm-plugin-activation/tgm-config.php:76
msgid "Something went wrong with the plugin API."
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"dist": "composer install --no-dev && npm run build && npm run clean:dist && npm run create:dist-dir && npm run copy:files && composer install",
"prebuild": "rimraf ./inc/vk-blocks/build/*",
"build:dev": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development && gulp build:dev:pro",
"build": "gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress && gulp build:pro && npm run build:js && npm run translate",
"build:dev:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development --env enableCache=true && gulp build:dev:pro",
"build:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --env enableCache=true && gulp build:pro && npm run translate",
"build": "gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=production && gulp build:pro && npm run build:js && npm run translate",
"build:cache": "composer install && gulp text-domain-pro && wp-scripts build --webpack-copy-php --config webpack.config.js --progress --mode=development --env enableCache=true && gulp build:dev:pro",
"build:dev:cache": "npm run build:cache",
"build:free": "gulp text-domain-free && wp-scripts build --webpack-copy-php --config webpack.config.js && gulp build:free && npm run build:js",
"build:pot": "wp i18n make-pot --merge=languages/vk-blocks-pro-js.pot --skip-js . languages/vk-blocks-pro.pot",
"translate": "npm run build:pot && npm run translate:block && npm run translate:admin && cd languages && wp i18n make-php . && cd ../",
Expand Down
12 changes: 10 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link:
Tags: Gutenberg,FAQ,alert
Requires at least: 6.3
Tested up to: 6.6
Stable tag: 1.86.1.0
Stable tag: 1.87.0.1
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -106,6 +106,14 @@ e.g.

== Changelog ==

[ Specification Change ] The Button Block has been made compatible for use within the Core Navigation Block.

= 1.88.0 =
[ Specification change ][ Grid Column Card (Pro) ] Changed the default settings of headerDisplay and footerDisplay from "Delete" to "Display".
[ Specification change ] Add filter vk_post_taxonomies_html ( Update VK Components 1.6.1 )
[ Bug fix ][ Link Component ] Fix adding "http://" with "tel:" and "mailto:" link.
[ Bug fix ][ Slider ] Fix an issue where full width alignment does not work in tt4 and tt5.

= 1.87.0 =
[ Add function ][ Link Toolbar ] Added to skip retrieving metadata (title and favicon) for external links in link toolbar to prevent CORS errors.
[ Add function ][ icon ] Add toolbar link for components.
Expand Down Expand Up @@ -1793,4 +1801,4 @@ First release

== Upgrade Notice ==

Nothing.
Nothing.
2 changes: 1 addition & 1 deletion src/blocks/_pro/gridcolcard-item-footer/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"attributes": {
"footerDisplay": {
"type": "string",
"default": "delete"
"default": "display"
}
}
}
Loading