Merge branch 'main' into ADAPP-18656-cocos-2-dx-v-5-migration-guide

adjust · Sep 27, 2024 · bb7ed0c · bb7ed0c
2 parents 87cc17d + 27160dd
commit bb7ed0c
Show file tree

Hide file tree

Showing 20 changed files with 568 additions and 163 deletions.
diff --git a/markdoc.config.mjs b/markdoc.config.mjs
@@ -76,6 +76,9 @@ export default defineMarkdocConfig({
             }
          }
       },
+      deflist: {
+         render: component("src/components/DefList.astro"),
+      },
       listcolumns: {
          render: component("src/components/ListColumns.astro"),
       },

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/BigToc.astro b/src/components/BigToc.astro
@@ -26,19 +26,22 @@ const { title, headings } = Astro.props;
           headings.length > 0 &&
           headings
             .filter(({ depth }) => depth > 1 && depth < 5)
-            .map((heading) => (
-              <li
-                class={`toc-item depth-${heading.depth} ml-${heading.depth > 2 ? 6 : 0}`}
-              >
-                <a
-                  class="toc-link text-gray-700 hover:text-blue-600 hover:no-underline"
-                  data-slug={heading.slug}
-                  href={`#${heading.slug}`}
-                >
-                  {heading.text}
-                </a>
-              </li>
-            ))
+            .map(
+              (heading) =>
+                heading.slug && (
+                  <li
+                    class={`toc-item depth-${heading.depth} ml-${heading.depth > 2 ? 6 : 0}`}
+                  >
+                    <a
+                      class="toc-link text-gray-700 hover:text-blue-600 hover:no-underline"
+                      data-slug={heading.slug}
+                      href={`#${heading.slug}`}
+                    >
+                      {heading.text}
+                    </a>
+                  </li>
+                ),
+            )
       }
     </ul>
   </div>

diff --git a/src/components/DefList.astro b/src/components/DefList.astro
@@ -0,0 +1,8 @@
+---
+import { decode } from "tiny-decode";
+import { parseDefList } from "@components/utils/parseDefList";
+const content = decode(await Astro.slots.render("default"));
+const parsedContent = await parseDefList(content);
+---
+
+<Fragment set:html={parsedContent} />
diff --git a/src/components/ListColumns.astro b/src/components/ListColumns.astro
@@ -6,7 +6,7 @@ const content = Astro.slots.has("default")
 const lists = content.split("<hr>");
 ---
 
-<div class="col-group grid grid-flow-row lg:grid-flow-col gap-6">
+<div class="col-group grid grid-flow-row lg:grid-flow-col gap-6 mb-7">
   {
     lists.map((list) => (
       <div class="column">

diff --git a/src/components/pages/search/Pagination.tsx b/src/components/pages/search/Pagination.tsx
@@ -33,9 +33,9 @@ const Pagination: FC<PaginationProps> = ({ canRefine, lang }) => {
   const iconRightColor = isLastPage ? "#808080" : "#000";
 
   return (
-    <>
+    <div className="flex justify-center items-center mb-16">
       {isPaginaton && (
-        <div className="flex justify-center items-center mb-16">
+        <>
           <span
             className={classNames(
               "mr-3  flex items-center justify-center min-h-[20px] min-w-[20px]",
@@ -65,9 +65,9 @@ const Pagination: FC<PaginationProps> = ({ canRefine, lang }) => {
           >
             <Icon name="ChevronRight" size="small" color={iconRightColor} />
           </span>
-        </div>
+        </>
       )}
-    </>
+    </div>
   );
 };