Merge pull request #1765 from vektor-inc/develop

[ Change version ] 1.60.0.0
vektor-inc · Jul 12, 2023 · 010e0b8 · 010e0b8
2 parents b135c1e + 4306d58
commit 010e0b8
Show file tree

Hide file tree

Showing 19 changed files with 810 additions and 552 deletions.
diff --git a/editor-css/_editor_before_icon_list.scss b/editor-css/_editor_before_icon_list.scss
@@ -3,40 +3,73 @@
 /*-------------------------------------------*/
 .vk-blocks-advanced-popover-control {
 	.components-popover__content {
-		min-width: 260px;
+		min-width: 280px;
 		margin-left: -46px !important;
 		padding: 20px 15px;
-		.vk_icon_list {
-			margin-top: 5px;
-			.components-base-control__field,
-			.components-flex {
+		.vk_icon_list_wrap {
+			max-height: 300px;
+			overflow-y: scroll;
+			.vk_icon_list_title {
+				margin: 0;
+			}
+			.vk_icon_list {
 				display: flex;
 				flex-wrap: wrap;
-				flex-direction: row;
-				gap: 0;
-				justify-content: left;
-				.components-radio-control__option {
-					border: 1px solid #666;
-					width: 36px;
-					height: 36px;
-					border-radius: 3px;
+				margin-top: 5px;
+				.vk_icon_area {
 					margin-right: 7px;
-					position: relative;
-					input {
-						display: none;
+					.vk_icon_button_icon_area {
+						position: relative;
+						.vk_icon_button {
+							border: 1px solid #666;
+							color: inherit;
+							width: 36px;
+							height: 36px;
+							border-radius: 3px;
+							position: relative;
+							box-shadow: none;
+							i {
+								font-size: 1.5em;
+								position: absolute;
+								top: 50%;
+								left: 50%;
+								-webkit-transform: translateY(-50%) translateX(-50%);
+								transform: translateY(-50%) translateX(-50%);
+							}
+						}
+						.vk_icon_button_closeSmall {
+							position: absolute;
+							top: -10%;
+							left: 80%;
+							padding: 0;
+							min-width: auto;
+							width: 12px;
+							height: 12px;
+							background: #fff;
+							border-radius: 50%;
+							svg {
+								width: 100%;
+								height: 100%;
+							}
+						}
 					}
-					.svg-inline--fa,
-					i {
-						font-size: 1.5em;
-						position: absolute;
-						top: 50%;
-						left: 50%;
-						transform: translateY(-50%) translateX(-50%);
+					.vk_icon_button_button_area {
+						display: flex;
+						justify-content: space-between;
+						margin-bottom:  5px;
+						.vk_icon_button_chevronLeft,
+						.vk_icon_button_chevronRight {
+							padding: 0;
+							min-width: auto;
+							width: 12px;
+							height: 12px;
+							svg {
+								width: 100%;
+								height: 100%;
+							}
+						}
 					}
 				}
-				.components-radio-control__option:not(:last-child) {
-					margin-bottom: 4px;
-				}					
 			}
 		}
 	}

diff --git a/inc/vk-blocks/admin/admin.php b/inc/vk-blocks/admin/admin.php
@@ -198,6 +198,7 @@ function vk_blocks_options_enqueue_scripts( $hook_suffix ) {
 		'vk-blocks-admin-js',
 		'vkBlocksObject',
 		array(
+			'options'          => VK_Blocks_Options::get_options(),
 			'isLicenseSetting' => vk_blocks_is_license_setting(),
 			'isPro'            => vk_blocks_is_pro(),
 			'deprecatedLists'  => VK_Blocks_Options::get_deprecated_lists(),

diff --git a/inc/vk-blocks/class-vk-blocks-options.php b/inc/vk-blocks/class-vk-blocks-options.php
@@ -328,6 +328,9 @@ public static function get_vk_blocks_options_properties() {
 					),
 				),
 			),
+			'icon_custom_lists'           => array(
+				'type' => 'array',
+			),
 		);
 		return $properties;
 	}
@@ -399,6 +402,7 @@ public static function get_vk_blocks_options_defaults( $activation = false ) {
 			'custom_block_style_lists'    => array(),
 			'balloon_meta_lists'          => array(),
 			'disable_block_style_lists'   => array(),
+			'icon_custom_lists'           => array(),
 		);
 		return $default;
 	}

diff --git a/languages/vk-blocks-pro-ja-vk-blocks-admin-js.json b/languages/vk-blocks-pro-ja-vk-blocks-admin-js.json
diff --git a/languages/vk-blocks-pro-ja-vk-blocks-build-js.json b/languages/vk-blocks-pro-ja-vk-blocks-build-js.json
diff --git a/languages/vk-blocks-pro-ja.mo b/languages/vk-blocks-pro-ja.mo
diff --git a/languages/vk-blocks-pro-ja.po b/languages/vk-blocks-pro-ja.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VK Blocks Pro\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/vk-blocks-pro\n"
-"POT-Creation-Date: 2023-07-10T09:40:41+00:00\n"
-"PO-Revision-Date: 2023-07-10 18:55+0900\n"
+"POT-Creation-Date: 2023-07-10T23:21:48+00:00\n"
+"PO-Revision-Date: 2023-07-11 09:05+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.3.1\n"
+"X-Generator: Poedit 3.3.2\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
 "X-Poedit-WPHeader: vk-blocks.php\n"
@@ -409,6 +409,18 @@ msgstr "インポート"
 msgid "Import Success"
 msgstr "インポート成功"
 
+#: src/utils/font-awesome-new.js:172
+msgid "Custom list"
+msgstr "カスタムリスト"
+
+#: src/utils/font-awesome-new.js:327
+msgid "Preset"
+msgstr "プリセット"
+
+#: src/admin/import-export/index.js:124
+msgid "Font Awesome Custom Lists Setting"
+msgstr "Font Awesomeカスタムリスト設定"
+
 #: src/admin/import-export/index.js:130
 #: dist/vk-blocks-pro/inc/vk-blocks/admin/admin.php:86
 #: inc/vk-blocks/admin/admin.php:119
@@ -484,6 +496,14 @@ msgstr ""
 msgid "ex)"
 msgstr "例）"
 
+#: src/utils/font-awesome-new.js:391
+msgid "Add selected icon to custom list"
+msgstr "選択中アイコンをカスタムリストに追加"
+
+#: src/utils/font-awesome-new.js:399
+msgid "Delete/Sort mode"
+msgstr "削除・並び替えモード"
+
 #: src/admin/margin.js:133 src/blocks/border-box/edit.js:192
 #: src/blocks/icon-outer/edit.js:150 src/blocks/icon/edit.js:139
 msgid "Margin"
@@ -877,8 +897,6 @@ msgstr "投稿タイプ名"
 #: dist/vk-blocks-pro/inc/vk-blocks/build/blocks/ancestor-page-list/index.php:44
 #: inc/vk-blocks/build/blocks/ancestor-page-list/index.php:44
 #: src/blocks/ancestor-page-list/index.php:44
-#: test/phpunit/pro/test-ancestor-page-list.php:89
-#: test/phpunit/pro/test-ancestor-page-list.php:173
 msgid "Ancestor Page Title"
 msgstr "先祖ページのタイトル"
 
@@ -947,7 +965,7 @@ msgstr "WYSIWYG"
 
 #: src/blocks/_pro/dynamic-text/edit.js:262
 msgid "Setting up a link"
-msgstr ""
+msgstr "リンクを設定する"
 
 #: src/blocks/_pro/dynamic-text/edit.js:274
 #: src/blocks/_pro/gridcolcard-item/edit.js:322
@@ -3232,14 +3250,12 @@ msgstr "非推奨ブロック"
 #: dist/vk-blocks-pro/inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: src/blocks/ancestor-page-list/index.php:83
-#: test/phpunit/pro/test-ancestor-page-list.php:173
 msgid "Dummy Text"
 msgstr "ダミーテキスト"
 
 #: dist/vk-blocks-pro/inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: src/blocks/ancestor-page-list/index.php:83
-#: test/phpunit/pro/test-ancestor-page-list.php:173
 msgid ""
 "Because of the site editor have not child page that, the page list from "
 "ancestor is not displayed. Now displaying the dummy text list instead of the "
@@ -3252,14 +3268,12 @@ msgstr ""
 #: dist/vk-blocks-pro/inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: inc/vk-blocks/build/blocks/ancestor-page-list/index.php:83
 #: src/blocks/ancestor-page-list/index.php:83
-#: test/phpunit/pro/test-ancestor-page-list.php:173
 msgid "This message only display on the edit screen."
 msgstr "このメッセージは編集画面でのみ表示されます。"
 
 #: dist/vk-blocks-pro/inc/vk-blocks/build/blocks/page-content/index.php:126
 #: inc/vk-blocks/build/blocks/page-content/index.php:123
 #: src/blocks/page-content/index.php:123
-#: test/phpunit/free/test-page-content.php:59
 msgid "Edit this area"
 msgstr "このエリアを編集"
 

diff --git a/languages/vk-blocks-pro-js.pot b/languages/vk-blocks-pro-js.pot
@@ -24,7 +24,7 @@ msgstr ""
 #: src/admin/custom-block-style/item/title-area/delete-button/index.js:63
 #: src/admin/custom-format/add-item.js:152
 #: src/admin/custom-format/delete-item-button.js:63
-#: src/admin/import-export/import-form.js:417
+#: src/admin/import-export/import-form.js:510
 msgid "Cancel"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr ""
 
 #: src/admin/custom-block-style/add-button/index.js:141
 #: src/admin/custom-format/add-item.js:164
-#: src/admin/import-export/import-form.js:312
+#: src/admin/import-export/import-form.js:346
 msgid "Add"
 msgstr ""
 
@@ -338,48 +338,52 @@ msgstr ""
 msgid "Toggle all"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:164
+#: src/admin/import-export/import-form.js:196
 msgid "Invalid JSON file"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:167
+#: src/admin/import-export/import-form.js:199
 msgid "Unknown error"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:231
+#: src/admin/import-export/import-form.js:263
 msgid "Import data confirmation"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:238
+#: src/admin/import-export/import-form.js:270
 msgid "No import data"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:273
+#: src/admin/import-export/import-form.js:305
 #. Import %s
 msgid "Import %s"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:298
+#: src/admin/import-export/import-form.js:332
 msgid "Import method"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:319
+#: src/admin/import-export/import-form.js:353
 msgid "Override"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:357
+#: src/admin/import-export/import-form.js:456
 msgid "The following data will not be imported because the identifiers are covered."
 msgstr ""
 
-#: src/admin/import-export/import-form.js:432
+#: src/admin/import-export/import-form.js:525
 msgid "Import"
 msgstr ""
 
-#: src/admin/import-export/import-form.js:442
+#: src/admin/import-export/import-form.js:535
 msgid "Import Success"
 msgstr ""
 
-#: src/admin/import-export/index.js:130
+#: src/admin/import-export/index.js:124
+msgid "Font Awesome Custom Lists Setting"
+msgstr ""
+
+#: src/admin/import-export/index.js:141
 msgid "Import Export Tool"
 msgstr ""
 
@@ -927,11 +931,11 @@ msgstr ""
 msgid "wysiwyg"
 msgstr ""
 
-#: src/blocks/_pro/dynamic-text/edit.js:262
+#: src/blocks/_pro/dynamic-text/edit.js:263
 msgid "Setting up a link"
 msgstr ""
 
-#: src/blocks/_pro/dynamic-text/edit.js:274
+#: src/blocks/_pro/dynamic-text/edit.js:276
 #: src/blocks/_pro/gridcolcard-item/edit.js:322
 #: src/blocks/_pro/icon-card-item/edit.js:128
 #: src/blocks/button/edit.js:271
@@ -1234,7 +1238,7 @@ msgstr ""
 #: src/blocks/heading/edit.js:335
 #: src/blocks/icon/edit.js:269
 #: src/blocks/pr-content/edit.js:212
-#: src/utils/font-awesome-new.js:66
+#: src/utils/font-awesome-new.js:166
 msgid "Icon"
 msgstr ""
 
@@ -2894,32 +2898,48 @@ msgstr ""
 msgid "Lorem ipsum"
 msgstr ""
 
-#: src/utils/font-awesome-new.js:243
+#: src/utils/font-awesome-new.js:172
+msgid "Custom list"
+msgstr ""
+
+#: src/utils/font-awesome-new.js:324
+msgid "Preset"
+msgstr ""
+
+#: src/utils/font-awesome-new.js:363
 msgid "Font Awesome icon list"
 msgstr ""
 
-#: src/utils/font-awesome-new.js:246
+#: src/utils/font-awesome-new.js:366
 msgid ""
 "If you want to use an icon other than the ones listed above, you can use "
 "any of the icons from Font Awesome's icon list Please select a tag and "
 "enter it."
 msgstr ""
 
-#: src/utils/font-awesome-new.js:251
+#: src/utils/font-awesome-new.js:371
 msgid "Ex) "
 msgstr ""
 
-#: src/utils/font-awesome-new.js:265
+#: src/utils/font-awesome-new.js:385
+msgid "Add selected icon to custom list"
+msgstr ""
+
+#: src/utils/font-awesome-new.js:393
+msgid "Delete/Sort mode"
+msgstr ""
+
+#: src/utils/font-awesome-new.js:407
 msgid ""
 "When you click save button, the window will be reloaded and this setting "
 "will be applied."
 msgstr ""
 
-#: src/utils/font-awesome-new.js:275
+#: src/utils/font-awesome-new.js:417
 msgid "Save"
 msgstr ""
 
-#: src/utils/font-awesome-new.js:291
+#: src/utils/font-awesome-new.js:433
 msgid "Select Icon"
 msgstr ""