From 1492e187039ded6131b2c0f3be586557794f0feb Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:14:57 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=E5=AD=90=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=81=A7=E8=A1=A8=E7=A4=BA=E8=A6=81=E7=B4=A0=E3=81=AE=E4=B8=AD?= =?UTF-8?q?=E3=81=AE=E3=80=8C=E7=94=BB=E5=83=8F=E5=8F=B3=E4=B8=8A=E5=88=86?= =?UTF-8?q?=E9=A1=9E=E5=90=8D=E3=80=8D=E3=81=A8=E3=80=8C=E5=88=86=E9=A1=9E?= =?UTF-8?q?=E3=80=8D=E3=82=92=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display-items-control/index.js | 87 ++++++++++--------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 03c50d1a8..72eb7a69a 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -10,20 +10,24 @@ import { export const DisplayItemsControl = (props) => { const { setAttributes, attributes } = props; const { - display_image, //eslint-disable-line camelcase - display_image_overlay_term, //eslint-disable-line camelcase - display_excerpt, //eslint-disable-line camelcase - display_author, //eslint-disable-line camelcase - display_date, //eslint-disable-line camelcase - display_new, //eslint-disable-line camelcase - display_taxonomies, //eslint-disable-line camelcase - display_btn, //eslint-disable-line camelcase - new_date, //eslint-disable-line camelcase - new_text, //eslint-disable-line camelcase - btn_text, //eslint-disable-line camelcase - btn_align, //eslint-disable-line camelcase + display_image, + display_image_overlay_term, + display_excerpt, + display_author, + display_date, + display_new, + display_taxonomies, + display_btn, + new_date, + new_text, + btn_text, + btn_align, } = attributes; + // 「子ページリスト」ブロックかどうかをチェック + const isChildPageList = props.name === 'vk-blocks/child-page'; + + return ( { > setAttributes({ display_image: checked }) } /> - - setAttributes({ display_image_overlay_term: checked }) - } - /> + {/* 「子ページリスト」ブロックの場合、画像右上分類名を表示しない */} + {!isChildPageList && ( + + setAttributes({ display_image_overlay_term: checked }) + } + /> + )} setAttributes({ display_excerpt: checked }) } /> setAttributes({ display_author: checked }) } /> setAttributes({ display_date: checked })} /> - setAttributes({ display_new: checked })} /> - - - setAttributes({ display_taxonomies: checked }) - } - /> - + {/* 「子ページリスト」ブロックの場合、分類（全項目）を表示しない */} + {!isChildPageList && ( + + setAttributes({ display_taxonomies: checked }) + } + /> + )} setAttributes({ display_btn: checked })} />

{__('New mark option', 'vk-blocks-pro')}

@@ -88,7 +95,7 @@ export const DisplayItemsControl = (props) => { 'Number of days to display the new post mark', 'vk-blocks-pro' )} - value={new_date} //eslint-disable-line camelcase + value={new_date} onChange={(value) => setAttributes({ new_date: parseInt(value) }) } @@ -96,7 +103,7 @@ export const DisplayItemsControl = (props) => { /> setAttributes({ new_text: value })} />

@@ -110,7 +117,7 @@ export const DisplayItemsControl = (props) => {

setAttributes({ btn_text: value })} /> { id={'vk_displayItem-buttonAlign'} > setAttributes({ btn_align: value })} options={[ { @@ -138,4 +145,4 @@ export const DisplayItemsControl = (props) => { ); -}; +}; \ No newline at end of file From 3a83033878a5effc29c5d9e7eb13be5a9199b8e0 Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:24:04 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=8C=E6=8A=9C=E3=81=91=E3=81=A6?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E6=88=BB=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display-items-control/index.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 72eb7a69a..b1e67b8cb 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -10,18 +10,18 @@ import { export const DisplayItemsControl = (props) => { const { setAttributes, attributes } = props; const { - display_image, - display_image_overlay_term, - display_excerpt, - display_author, - display_date, - display_new, - display_taxonomies, - display_btn, - new_date, - new_text, - btn_text, - btn_align, + display_image, //eslint-disable-line camelcase + display_image_overlay_term, //eslint-disable-line camelcase + display_excerpt, //eslint-disable-line camelcase + display_author, //eslint-disable-line camelcase + display_date, //eslint-disable-line camelcase + display_new, //eslint-disable-line camelcase + display_taxonomies, //eslint-disable-line camelcase + display_btn, //eslint-disable-line camelcase + new_date, //eslint-disable-line camelcase + new_text, //eslint-disable-line camelcase + btn_text, //eslint-disable-line camelcase + btn_align, //eslint-disable-line camelcase } = attributes; // 「子ページリスト」ブロックかどうかをチェック @@ -145,4 +145,4 @@ export const DisplayItemsControl = (props) => { ); -}; \ No newline at end of file +}; From 9fc5f79a928f512da98e77bd60b5b126b5485d98 Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:24:47 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=8C=E6=8A=9C=E3=81=91=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E6=88=BB=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display-items-control/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index b1e67b8cb..236323487 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -35,7 +35,7 @@ export const DisplayItemsControl = (props) => { > setAttributes({ display_image: checked }) } From 13343dab2616d8827b950d63d040c09b0a3cb97d Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:25:51 +0900 Subject: [PATCH 04/11] Update index.js --- src/components/display-items-control/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 236323487..0eb658ff7 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -40,6 +40,13 @@ export const DisplayItemsControl = (props) => { setAttributes({ display_image: checked }) } /> + + setAttributes({ display_image_overlay_term: checked }) + } + /> {/* 「子ページリスト」ブロックの場合、画像右上分類名を表示しない */} {!isChildPageList && ( Date: Mon, 1 Apr 2024 15:27:21 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E6=88=BB=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display-items-control/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 0eb658ff7..05de87548 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -51,7 +51,7 @@ export const DisplayItemsControl = (props) => { {!isChildPageList && ( setAttributes({ display_image_overlay_term: checked }) } @@ -59,26 +59,26 @@ export const DisplayItemsControl = (props) => { )} setAttributes({ display_excerpt: checked }) } /> setAttributes({ display_author: checked }) } /> setAttributes({ display_date: checked })} /> setAttributes({ display_new: checked })} /> {/* 「子ページリスト」ブロックの場合、分類（全項目）を表示しない */} From 693b673a9c918e630da9242a6d6ff479570370c9 Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:28:48 +0900 Subject: [PATCH 06/11] Update index.js --- src/components/display-items-control/index.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 05de87548..de964b73c 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -40,13 +40,6 @@ export const DisplayItemsControl = (props) => { setAttributes({ display_image: checked }) } /> - - setAttributes({ display_image_overlay_term: checked }) - } - /> {/* 「子ページリスト」ブロックの場合、画像右上分類名を表示しない */} {!isChildPageList && ( { {!isChildPageList && ( - setAttributes({ display_taxonomies: checked }) - } + checked={display_taxonomies} //eslint-disable-line camelcase + onChange={(checked) =>setAttributes({ display_taxonomies: checked })} /> )} Date: Mon, 1 Apr 2024 15:30:11 +0900 Subject: [PATCH 07/11] Update index.js --- src/components/display-items-control/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index de964b73c..14f4d727c 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -84,7 +84,7 @@ export const DisplayItemsControl = (props) => { )} setAttributes({ display_btn: checked })} />

{__('New mark option', 'vk-blocks-pro')}

@@ -100,7 +100,7 @@ export const DisplayItemsControl = (props) => { type={'number'} /> setAttributes({ new_text: value })} /> From 9240dddf48179e84a411b4fb736a2e1612898770 Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:31:06 +0900 Subject: [PATCH 08/11] Update index.js --- src/components/display-items-control/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 14f4d727c..18f74f53d 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -100,8 +100,8 @@ export const DisplayItemsControl = (props) => { type={'number'} /> setAttributes({ new_text: value })} />

@@ -115,7 +115,7 @@ export const DisplayItemsControl = (props) => {

setAttributes({ btn_text: value })} /> Date: Mon, 1 Apr 2024 15:32:01 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E6=88=BB=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display-items-control/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 18f74f53d..72fb13f84 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -93,7 +93,7 @@ export const DisplayItemsControl = (props) => { 'Number of days to display the new post mark', 'vk-blocks-pro' )} - value={new_date} + value={new_date} //eslint-disable-line camelcase onChange={(value) => setAttributes({ new_date: parseInt(value) }) } @@ -123,7 +123,7 @@ export const DisplayItemsControl = (props) => { id={'vk_displayItem-buttonAlign'} > setAttributes({ btn_align: value })} options={[ { From 1c769476f1b4d6276639df8f6dec956b4bb23cae Mon Sep 17 00:00:00 2001 From: mtdkei Date: Mon, 1 Apr 2024 15:37:59 +0900 Subject: [PATCH 10/11] Update readme.txt --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index a2baecc6e..689bfd7c4 100644 --- a/readme.txt +++ b/readme.txt @@ -103,6 +103,8 @@ e.g. == Changelog == +[ Specification Change ][ Child Page List ] Hide "Term's name on Image" and "Taxonomies (all)" display options. + = 1.70.0 = [ Specification Change ] core/social-link, core/site-logo, core/site-title and core/site-tagline correspond to margin-extension [ Add function ][ Breadcrumb ] Add the ability to input breadcrumb separators. From cc714a1ebbb8db92d3acbdfb65eee6808f0853c8 Mon Sep 17 00:00:00 2001 From: sysbird Date: Fri, 5 Apr 2024 11:40:48 +0900 Subject: [PATCH 11/11] line break --- src/components/display-items-control/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/display-items-control/index.js b/src/components/display-items-control/index.js index 72fb13f84..9f4669d54 100644 --- a/src/components/display-items-control/index.js +++ b/src/components/display-items-control/index.js @@ -27,7 +27,6 @@ export const DisplayItemsControl = (props) => { // 「子ページリスト」ブロックかどうかをチェック const isChildPageList = props.name === 'vk-blocks/child-page'; - return ( { setAttributes({ display_taxonomies: checked })} + onChange={(checked) => + setAttributes({ display_taxonomies: checked }) + } /> )}