ronds-metadata 1.1.48 → 1.1.49

package/es/comps/MdNavbar/index.js

@@ -1,9 +1,10 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author: wangxian
  * @Date: 2022-10-14 09:05:50
- * @LastEditTime: 2022-10-14 10:55:42
+ * @LastEditTime: 2022-10-14 14:25:18
  */
 import React from 'react';
 import { getCurrentHashValue, trimArrZero } from './utils';
@@ -17,73 +18,83 @@ var MdNavbar = function MdNavbar(props) {
       onNavItemClick = props.onNavItemClick,
       onHashChange = props.onHashChange;
 
-  var _React$useState = React.useState(''),
+  var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
-      currentListNo = _React$useState2[0],
-      setCurrentListNo = _React$useState2[1];
+      navStructure = _React$useState2[0],
+      setNavStructure = _React$useState2[1];
+
+  var navStructureRef = React.useRef([]);
+
+  var _React$useState3 = React.useState(''),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      currentListNo = _React$useState4[0],
+      setCurrentListNo = _React$useState4[1];
 
   var scrollTimeoutRef = React.useRef();
   var addTargetTimeoutRef = React.useRef();
-  var navStructure = React.useMemo(function () {
-    var contentWithoutCode = source.replace(/^[^#]+\n/g, '').replace(/(?:[^\n#]+)#+\s([^#\n]+)\n*/g, '') // 匹配行内出现 # 号的情况
-    .replace(/^#\s[^#\n]*\n+/, '').replace(/```[^`\n]*\n+[^```]+```\n+/g, '').replace(/`([^`\n]+)`/g, '$1').replace(/\*\*?([^*\n]+)\*\*?/g, '$1').replace(/__?([^_\n]+)__?/g, '$1').trim();
-    var pattOfTitle = /#+\s([^#\n]+)\n*/g;
-    var matchResult = contentWithoutCode.match(pattOfTitle);
-
-    if (!matchResult) {
-      return [];
-    }
-
-    var navData = matchResult.map(function (r, i) {
-      return {
-        index: i,
-        level: r.match(/^#+/g)[0].length,
-        text: r.replace(pattOfTitle, '$1')
-      };
-    });
-    var maxLevel = 0;
-    navData.forEach(function (t) {
-      if (t.level > maxLevel) {
-        maxLevel = t.level;
+  var getNavStructure = React.useCallback(function () {
+    if (source) {
+      var contentWithoutCode = source.replace(/^[^#]+\n/g, '').replace(/(?:[^\n#]+)#+\s([^#\n]+)\n*/g, '') // 匹配行内出现 # 号的情况
+      .replace(/^#\s[^#\n]*\n+/, '').replace(/```[^`\n]*\n+[^```]+```\n+/g, '').replace(/`([^`\n]+)`/g, '$1').replace(/\*\*?([^*\n]+)\*\*?/g, '$1').replace(/__?([^_\n]+)__?/g, '$1').trim();
+      var pattOfTitle = /#+\s([^#\n]+)\n*/g;
+      var matchResult = contentWithoutCode.match(pattOfTitle);
+
+      if (!matchResult) {
+        return;
       }
-    });
-    var matchStack = []; // 此部分重构，原有方法会出现次级标题后再次出现高级标题时，listNo重复的bug
 
-    for (var i = 0; i < navData.length; i++) {
-      var t = navData[i];
-      var level = t.level;
+      var navData = matchResult.map(function (r, i) {
+        return {
+          index: i,
+          level: r.match(/^#+/g)[0].length,
+          text: r.replace(pattOfTitle, '$1')
+        };
+      });
+      var maxLevel = 0;
+      navData.forEach(function (t) {
+        if (t.level > maxLevel) {
+          maxLevel = t.level;
+        }
+      });
+      var matchStack = []; // 此部分重构，原有方法会出现次级标题后再次出现高级标题时，listNo重复的bug
 
-      while (matchStack.length && matchStack[matchStack.length - 1].level > level) {
-        matchStack.pop();
-      }
+      for (var i = 0; i < navData.length; i++) {
+        var t = navData[i];
+        var level = t.level;
 
-      if (matchStack.length === 0) {
-        var _arr = new Array(maxLevel).fill(0);
+        while (matchStack.length && matchStack[matchStack.length - 1].level > level) {
+          matchStack.pop();
+        }
 
-        _arr[level - 1] += 1;
+        if (matchStack.length === 0) {
+          var _arr = new Array(maxLevel).fill(0);
+
+          _arr[level - 1] += 1;
+          matchStack.push({
+            level: level,
+            arr: _arr
+          });
+          t.listNo = trimArrZero(_arr).join('.');
+          continue;
+        }
+
+        var arr = matchStack[matchStack.length - 1].arr;
+        var newArr = arr.slice();
+        newArr[level - 1] += 1;
         matchStack.push({
           level: level,
-          arr: _arr
+          arr: newArr
         });
-        t.listNo = trimArrZero(_arr).join('.');
-        continue;
+        t.listNo = trimArrZero(newArr).join('.');
       }
 
-      var arr = matchStack[matchStack.length - 1].arr;
-      var newArr = arr.slice();
-      newArr[level - 1] += 1;
-      matchStack.push({
-        level: level,
-        arr: newArr
-      });
-      t.listNo = trimArrZero(newArr).join('.');
+      setNavStructure(_toConsumableArray(navData));
+      navStructureRef.current = navData;
     }
-
-    return navData;
   }, [source]);
   var initHeadingsId = React.useCallback(function () {
     var headingId = decodeURIComponent(declarative ? window.location.hash.replace(/^#/, '').trim() : (window.location.hash.match(/heading-\d+/g) || [])[0]);
-    navStructure.forEach(function (t) {
+    navStructureRef.current.forEach(function (t) {
       var headings = document.querySelectorAll("h".concat(t.level));
       var curHeading = Array.prototype.slice.apply(headings).find(function (h) {
         return h.innerText.trim() === t.text.trim() && (!h.dataset || !h.dataset.id);
@@ -112,12 +123,17 @@ var MdNavbar = function MdNavbar(props) {
         setCurrentListNo(listNo);
       }
     }, 500);
-  }, []);
+  }, [navStructure]);
   React.useEffect(function () {
-    if (navStructure) {
+    if (source) {
+      getNavStructure();
+    }
+  }, [source, getNavStructure]);
+  React.useEffect(function () {
+    if (source && navStructure && navStructure.length > 0) {
       refreshNav();
     }
-  }, [navStructure]);
+  }, [navStructure, source]);
 
   var scrollToTarget = function scrollToTarget(dataId) {
     if (scrollTimeoutRef.current) {

package/es/comps/MdView/index.js

@@ -4,7 +4,7 @@ import React from "react";
 /*
  * @Author: wangxian
  * @Date: 2022-09-02 16:17:38
- * @LastEditTime: 2022-10-14 11:06:26
+ * @LastEditTime: 2022-10-14 11:44:51
  */
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.48",
+  "version": "1.1.49",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",