markmap-view 0.15.0 → 0.15.3

package/dist/browser/index.js

@@ -1,8 +1,8 @@
-/*! markmap-view v0.15.0 | MIT License */
+/*! markmap-view v0.15.3 | MIT License */
 (function (exports, d3) {
 'use strict';
 
-/*! markmap-common v0.15.0 | MIT License */
+/*! markmap-common v0.15.3 | MIT License */
 function _extends$1() {
   _extends$1 = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -27,18 +27,23 @@ class UrlBuilder {
     this.providers = _extends$1({}, defaultProviders);
     this.provider = "jsdelivr";
   }
-  getFastestProvider(path = testPath) {
-    return Promise.any(Object.entries(this.providers).map(async ([name, factory]) => {
-      const res = await fetch(factory(path));
-      if (!res.ok) {
-        throw res;
-      }
-      await res.text();
-      return name;
-    }));
+  getFastestProvider(timeout = 5e3, path = testPath) {
+    return new Promise((resolve, reject) => {
+      Promise.all(Object.entries(this.providers).map(async ([name, factory]) => {
+        try {
+          const res = await fetch(factory(path));
+          if (!res.ok) {
+            throw res;
+          }
+          await res.text();
+          resolve(name);
+        } catch (_unused) {}
+      })).then(() => reject(new Error("All providers failed")));
+      setTimeout(reject, timeout, new Error("Timed out"));
+    });
   }
-  async findFastestProvider() {
-    this.provider = await this.getFastestProvider();
+  async findFastestProvider(timeout) {
+    this.provider = await this.getFastestProvider(timeout);
     return this.provider;
   }
   setProvider(name, factory) {
@@ -1230,7 +1235,7 @@ class Markmap {
     };
     this.handleClick = (e, d) => {
       let recursive = this.options.toggleRecursively;
-      if (e.ctrlKey) recursive = !recursive;
+      if (isMacintosh ? e.metaKey : e.ctrlKey) recursive = !recursive;
       this.toggleNode(d.data, recursive);
     };
     this.viewHooks = createViewHooks();

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! markmap-view v0.15.0 | MIT License */
+/*! markmap-view v0.15.3 | MIT License */
 import { Hook, getId, addClass, walkTree, childSelector, noop } from 'markmap-common';
 export { loadCSS, loadJS } from 'markmap-common';
 import { scaleOrdinal, schemeCategory10, zoomTransform, select, zoom, linkHorizontal, min, max, zoomIdentity, minIndex } from 'd3';
@@ -870,7 +870,7 @@ class Markmap {
     };
     this.handleClick = (e, d) => {
       let recursive = this.options.toggleRecursively;
-      if (e.ctrlKey) recursive = !recursive;
+      if (isMacintosh ? e.metaKey : e.ctrlKey) recursive = !recursive;
       this.toggleNode(d.data, recursive);
     };
     this.viewHooks = createViewHooks();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-view",
-  "version": "0.15.0",
+  "version": "0.15.3",
   "description": "View markmaps in browser",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -46,10 +46,10 @@
   },
   "devDependencies": {
     "@types/d3-flextree": "^2.1.1",
-    "markmap-common": "0.15.0"
+    "markmap-common": "0.15.3"
   },
   "peerDependencies": {
     "markmap-common": "*"
   },
-  "gitHead": "9c13bae5e28346ec613362046a023839ef64538b"
+  "gitHead": "428254f2f36d56a89a3e161658f079d74dd16d15"
 }