@elmethis/core 0.2.6 → 0.2.8

package/dist/components/typography/ElmFragmentIdentifier.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, nextTick, createElementBlock, openBlock, normalizeClass } from "vue";
+import { defineComponent, createElementBlock, openBlock, normalizeClass } from "vue";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "ElmFragmentIdentifier",
   props: {
@@ -14,17 +14,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         target.scrollIntoView({ behavior: "smooth" });
       }
     };
-    onMounted(() => {
-      nextTick(() => {
-        const hash = window.location.hash;
-        if (hash && hash.startsWith("#")) {
-          const element = document.querySelector(hash);
-          if (element) {
-            element.scrollIntoView({ behavior: "smooth" });
-          }
-        }
-      });
-    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("span", {
         class: normalizeClass(_ctx.$style.fragment),

package/dist/components/typography/ElmHeading.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, useSlots, createBlock, openBlock, resolveDynamicComponent, normalizeStyle, unref, normalizeClass, withCtx, createCommentVNode, createElementBlock, h } from "vue";
+import { defineComponent, ref, useSlots, createBlock, openBlock, resolveDynamicComponent, normalizeStyle, unref, normalizeClass, withCtx, createCommentVNode, createElementBlock, h, isVNode } from "vue";
 import { useIntersectionObserver } from "@vueuse/core";
 import { kebabCase } from "lodash-es";
 import ElmFragmentIdentifier from "./ElmFragmentIdentifier.vue.mjs";
@@ -29,14 +29,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const slots = useSlots();
     const renderSlots = () => {
-      if (props.text != null) {
-        return h("span", {}, props.text);
-      } else if (slots.default != null) {
+      if (slots.default != null) {
         return slots.default();
+      } else if (props.text != null) {
+        return h("span", {}, props.text);
       } else {
         return h("span");
       }
     };
+    const extractTextFromVNode = (vnodes) => {
+      const nodes = Array.isArray(vnodes) ? vnodes : [vnodes];
+      const extract = (node) => {
+        if (typeof node.children === "string") {
+          return node.children;
+        }
+        if (Array.isArray(node.children)) {
+          return node.children.map((child) => {
+            return isVNode(child) ? extract(child) : typeof child === "string" ? child : "";
+          }).join("");
+        }
+        return "";
+      };
+      return nodes.map(extract).join("");
+    };
+    const extractId = () => {
+      if (props.id) return props.id;
+      if (slots.default) return kebabCase(extractTextFromVNode(slots.default()));
+      return kebabCase(props.text);
+    };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(resolveDynamicComponent(`h${_ctx.level}`), {
         ref_key: "target",
@@ -57,7 +77,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           (openBlock(), createBlock(resolveDynamicComponent(() => renderSlots()))),
           !_ctx.disableFragmentIdentifier ? (openBlock(), createBlock(ElmFragmentIdentifier, {
             key: 0,
-            id: _ctx.id ?? unref(kebabCase)(_ctx.text)
+            id: extractId()
           }, null, 8, ["id"])) : createCommentVNode("", true),
           _ctx.level === 2 ? (openBlock(), createElementBlock("span", {
             key: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elmethis/core",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "publishConfig": {
     "access": "public"
   },