itmar-block-packages 1.3.17 → 1.3.19

package/src/wordpressApi.js

@@ -9,9 +9,9 @@ import apiFetch from "@wordpress/api-fetch";
 
 //const _ = require("lodash");
 
-export const fetchData = async (rest_api) => {
+export const restFetchData = async (path) => {
   try {
-    const ret_data = await rest_api();
+    const ret_data = await apiFetch({ path: path });
     return ret_data;
   } catch (error) {
     console.error("Error fetching data:", error.message);
@@ -56,11 +56,13 @@ const ChoiceControl = (props) => {
   const {
     selectedSlug,
     choiceItems,
+    dispTaxonomies,
     type,
     blockMap,
     textDomain,
     fetchFunction,
   } = props;
+
   const [choices, setChoices] = useState([]);
   useEffect(() => {
     if (!selectedSlug) return; //ポストタイプのスラッグが選択されていないときは処理終了
@@ -76,17 +78,17 @@ const ChoiceControl = (props) => {
   }, [selectedSlug, fetchFunction]);
 
   //選択肢が変わったときに選択されている項目の配列内容を更新するハンドラ
-  const handleChoiceChange = (checked, target) => {
+  const handleChoiceChange = (checked, target, setItems) => {
     if (checked) {
       // targetが重複していない場合のみ追加
-      if (!choiceItems.some((item) => _.isEqual(item, target))) {
-        return [...choiceItems, target];
+      if (!setItems.some((item) => _.isEqual(item, target))) {
+        return [...setItems, target];
       }
     } else {
       // targetを配列から削除
-      return choiceItems.filter((item) => !_.isEqual(item, target));
+      return setItems.filter((item) => !_.isEqual(item, target));
     }
-    return choiceItems;
+    return setItems;
   };
 
   //階層化されたカスタムフィールドのフィールド名を表示する関数
@@ -126,7 +128,11 @@ const ChoiceControl = (props) => {
                 (choiceField) => choiceField === fieldName
               )}
               onChange={(checked) => {
-                const newChoiceFields = handleChoiceChange(checked, fieldName);
+                const newChoiceFields = handleChoiceChange(
+                  checked,
+                  fieldName,
+                  choiceItems
+                );
                 props.onChange(newChoiceFields);
               }}
             />
@@ -156,7 +162,21 @@ const ChoiceControl = (props) => {
         choices.map((choice, index) => {
           return (
             <div key={index} className="term_section">
-              <div className="tax_label">{choice.name}</div>
+              <div className="tax_label">
+                {choice.name}
+                <ToggleControl
+                  label={__("Display", "block-collections")}
+                  checked={dispTaxonomies.some((tax) => tax === choice.slug)}
+                  onChange={(checked) => {
+                    const newChoiceFields = handleChoiceChange(
+                      checked,
+                      choice.slug,
+                      dispTaxonomies
+                    );
+                    props.onSetDispTax(newChoiceFields);
+                  }}
+                />
+              </div>
               {choice.terms.map((term, index) => {
                 return (
                   <CheckboxControl
@@ -172,11 +192,12 @@ const ChoiceControl = (props) => {
                     onChange={(checked) => {
                       const target = {
                         taxonomy: choice.slug,
-                        term: { id: term.id, slug: term.slug },
+                        term: { id: term.id, slug: term.slug, name: term.name },
                       };
                       const newChoiceTerms = handleChoiceChange(
                         checked,
-                        target
+                        target,
+                        choiceItems
                       );
                       props.onChange(newChoiceTerms);
                     }}
@@ -212,7 +233,8 @@ const ChoiceControl = (props) => {
                   onChange={(checked) => {
                     const newChoiceFields = handleChoiceChange(
                       checked,
-                      "title"
+                      "title",
+                      choiceItems
                     );
                     props.onChange(newChoiceFields);
                   }}
@@ -226,7 +248,11 @@ const ChoiceControl = (props) => {
                     (choiceField) => choiceField === "date"
                   )}
                   onChange={(checked) => {
-                    const newChoiceFields = handleChoiceChange(checked, "date");
+                    const newChoiceFields = handleChoiceChange(
+                      checked,
+                      "date",
+                      choiceItems
+                    );
                     props.onChange(newChoiceFields);
                   }}
                 />
@@ -241,7 +267,8 @@ const ChoiceControl = (props) => {
                   onChange={(checked) => {
                     const newChoiceFields = handleChoiceChange(
                       checked,
-                      "excerpt"
+                      "excerpt",
+                      choiceItems
                     );
                     props.onChange(newChoiceFields);
                   }}
@@ -257,36 +284,80 @@ const ChoiceControl = (props) => {
                   onChange={(checked) => {
                     const newChoiceFields = handleChoiceChange(
                       checked,
-                      "featured_media"
+                      "featured_media",
+                      choiceItems
                     );
                     props.onChange(newChoiceFields);
                   }}
                 />
               )}
+              {choice.link && (
+                <div className="itmar_custom_field_set">
+                  <ToggleControl
+                    className="field_choice"
+                    label={__("Single Page Link", "block-collections")}
+                    checked={choiceItems.some(
+                      (choiceField) => choiceField === "link"
+                    )}
+                    onChange={(checked) => {
+                      const newChoiceFields = handleChoiceChange(
+                        checked,
+                        "link",
+                        choiceItems
+                      );
+                      props.onChange(newChoiceFields);
+                    }}
+                  />
+                  <ComboboxControl
+                    options={[
+                      {
+                        value: "itmar/design-button",
+                        label: "itmar/design-button",
+                      },
+                      {
+                        value: "itmar/design-title",
+                        label: "itmar/design-title",
+                      },
+                    ]}
+                    value={blockMap["link"]}
+                    onChange={(newValue) => {
+                      const newBlockMap = {
+                        ...blockMap,
+                        link: newValue,
+                      };
+                      props.onBlockMapChange(newBlockMap);
+                    }}
+                  />
+                  <p>
+                    {__(
+                      "If no block is specified, a link will be set to the parent block, Design Group.",
+                      "block-collections"
+                    )}
+                  </p>
+                </div>
+              )}
               {(metaFlg || acfFlg) && (
                 <>
                   <div className="custom_field_label">
                     {__("Custom Field", "block-collections")}
                   </div>
                   <div className="custom_field_area">
-                    <div className="custom_field_area">
-                      {dispCustumFields({
-                        ...Object.entries(choice.meta).reduce(
-                          (acc, [key, value]) => ({
-                            ...acc,
-                            [`meta_${key}`]: value,
-                          }),
-                          {}
-                        ),
-                        ...Object.entries(choice.acf).reduce(
-                          (acc, [key, value]) => ({
-                            ...acc,
-                            [`acf_${key}`]: value,
-                          }),
-                          {}
-                        ),
-                      })}
-                    </div>
+                    {dispCustumFields({
+                      ...Object.entries(choice.meta).reduce(
+                        (acc, [key, value]) => ({
+                          ...acc,
+                          [`meta_${key}`]: value,
+                        }),
+                        {}
+                      ),
+                      ...Object.entries(choice.acf).reduce(
+                        (acc, [key, value]) => ({
+                          ...acc,
+                          [`acf_${key}`]: value,
+                        }),
+                        {}
+                      ),
+                    })}
                   </div>
                 </>
               )}
@@ -381,6 +452,32 @@ export const restTaxonomies = async (post_type) => {
   return taxonomyObjects;
 };
 
+//タームの文字列化
+export const termToDispObj = (terms, connectString) => {
+  // taxonomyごとにterm.nameをまとめる
+  const result = terms.reduce((acc, item) => {
+    const taxonomy = item.taxonomy;
+    const termName = item.term.name;
+
+    // taxonomyがまだ存在しない場合は初期化
+    if (!acc[taxonomy]) {
+      acc[taxonomy] = [];
+    }
+
+    // term.nameを配列に追加
+    acc[taxonomy].push(termName);
+
+    return acc;
+  }, {});
+
+  // 各taxonomyの配列を connectString でつなげて文字列化
+  for (const taxonomy in result) {
+    result[taxonomy] = result[taxonomy].join(connectString);
+  }
+
+  return result;
+};
+
 //フィールド情報取得RestAPI関数
 export const restFieldes = async (rest_base) => {
   //投稿データに以下のフィールドが含まれているかを調べる
@@ -389,6 +486,7 @@ export const restFieldes = async (rest_base) => {
     "date",
     "excerpt",
     "featured_media",
+    "link",
     "meta",
     "acf",
   ];