piral-blazor 1.5.1-beta.6844 → 1.5.1-beta.6849

package/esm/navigation.js

@@ -14,21 +14,24 @@ function eventHasSpecialKey(event) {
     return event.ctrlKey || event.shiftKey || event.altKey || event.metaKey;
 }
 export function isInternalNavigation(event) {
-    const anchorTarget = getAnchorTarget(event);
-    return (anchorTarget &&
-        event.type === 'click' &&
-        event.button === 0 &&
-        !event.defaultPrevented &&
-        !eventHasSpecialKey(event) &&
-        anchorTarget.hasAttribute('href') &&
-        (!anchorTarget.target || anchorTarget.target !== '_self') &&
-        !anchorTarget.hasAttribute('download') &&
-        isWithinBaseUriSpace(anchorTarget.href));
+    if (event.type === 'click' && event.button === 0 && !event.defaultPrevented) {
+        const anchorTarget = getAnchorTarget(event);
+        return (anchorTarget &&
+            !eventHasSpecialKey(event) &&
+            anchorTarget.hasAttribute('href') &&
+            !anchorTarget.hasAttribute('download') &&
+            (!anchorTarget.target || anchorTarget.target === '_self') &&
+            isWithinBaseUriSpace(anchorTarget.href));
+    }
+    return false;
 }
 export function performInternalNavigation(event) {
     const anchorTarget = getAnchorTarget(event);
     event.preventDefault();
+    const baseURI = document.baseURI;
+    const baseUriUntilLastSlash = baseURI.substr(0, baseURI.lastIndexOf('/') + 1);
     const to = anchorTarget.getAttribute('href');
-    window.Blazor.emitNavigateEvent(anchorTarget, to);
+    const path = to.startsWith(baseUriUntilLastSlash) ? to.substring(baseUriUntilLastSlash.length) : to;
+    window.Blazor.emitNavigateEvent(anchorTarget, path);
 }
 //# sourceMappingURL=navigation.js.map

package/esm/navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,CAAC,OAAuB,EAAE,OAAe;IACnE,2CAA2C;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AACvH,CAAC;AAED,SAAS,eAAe,CAAC,KAAiB;IACxC,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAwB,EAAE,GAAG,CAA6B,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB;IAC3C,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAiB;IACpD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,CACL,YAAY;QACZ,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,CAAC,KAAK,CAAC,gBAAgB;QACvB,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAC1B,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC;QACzD,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACtC,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CACxC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAiB;IACzD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,CAAC,OAAuB,EAAE,OAAe;IACnE,2CAA2C;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AACvH,CAAC;AAED,SAAS,eAAe,CAAC,KAAiB;IACxC,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAwB,EAAE,GAAG,CAA6B,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB;IAC3C,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAiB;IACpD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAC3E,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,CACL,YAAY;YACZ,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC1B,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;YACjC,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;YACtC,CAAC,CAAC,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC;YACzD,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CACxC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAiB;IACzD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,MAAM,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACtD,CAAC"}

package/lib/navigation.js

@@ -17,23 +17,26 @@ function eventHasSpecialKey(event) {
     return event.ctrlKey || event.shiftKey || event.altKey || event.metaKey;
 }
 function isInternalNavigation(event) {
-    const anchorTarget = getAnchorTarget(event);
-    return (anchorTarget &&
-        event.type === 'click' &&
-        event.button === 0 &&
-        !event.defaultPrevented &&
-        !eventHasSpecialKey(event) &&
-        anchorTarget.hasAttribute('href') &&
-        (!anchorTarget.target || anchorTarget.target !== '_self') &&
-        !anchorTarget.hasAttribute('download') &&
-        isWithinBaseUriSpace(anchorTarget.href));
+    if (event.type === 'click' && event.button === 0 && !event.defaultPrevented) {
+        const anchorTarget = getAnchorTarget(event);
+        return (anchorTarget &&
+            !eventHasSpecialKey(event) &&
+            anchorTarget.hasAttribute('href') &&
+            !anchorTarget.hasAttribute('download') &&
+            (!anchorTarget.target || anchorTarget.target === '_self') &&
+            isWithinBaseUriSpace(anchorTarget.href));
+    }
+    return false;
 }
 exports.isInternalNavigation = isInternalNavigation;
 function performInternalNavigation(event) {
     const anchorTarget = getAnchorTarget(event);
     event.preventDefault();
+    const baseURI = document.baseURI;
+    const baseUriUntilLastSlash = baseURI.substr(0, baseURI.lastIndexOf('/') + 1);
     const to = anchorTarget.getAttribute('href');
-    window.Blazor.emitNavigateEvent(anchorTarget, to);
+    const path = to.startsWith(baseUriUntilLastSlash) ? to.substring(baseUriUntilLastSlash.length) : to;
+    window.Blazor.emitNavigateEvent(anchorTarget, path);
 }
 exports.performInternalNavigation = performInternalNavigation;
 //# sourceMappingURL=navigation.js.map

package/lib/navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":";;;AAAA,SAAS,mBAAmB,CAAC,OAAuB,EAAE,OAAe;IACnE,2CAA2C;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AACvH,CAAC;AAED,SAAS,eAAe,CAAC,KAAiB;IACxC,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAwB,EAAE,GAAG,CAA6B,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB;IAC3C,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAiB;IACpD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,CACL,YAAY;QACZ,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,CAAC,KAAK,CAAC,gBAAgB;QACvB,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAC1B,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC;QACzD,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;QACtC,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CACxC,CAAC;AACJ,CAAC;AAbD,oDAaC;AAED,SAAgB,yBAAyB,CAAC,KAAiB;IACzD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACpD,CAAC;AALD,8DAKC"}
+{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":";;;AAAA,SAAS,mBAAmB,CAAC,OAAuB,EAAE,OAAe;IACnE,2CAA2C;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AACvH,CAAC;AAED,SAAS,eAAe,CAAC,KAAiB;IACxC,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAwB,EAAE,GAAG,CAA6B,CAAC;AAC9F,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAiB;IAC3C,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAiB;IACpD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;QAC3E,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,CACL,YAAY;YACZ,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC1B,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;YACjC,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;YACtC,CAAC,CAAC,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,CAAC;YACzD,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CACxC,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAdD,oDAcC;AAED,SAAgB,yBAAyB,CAAC,KAAiB;IACzD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,CAAC,cAAc,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,MAAM,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACtD,CAAC;AARD,8DAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-blazor",
-  "version": "1.5.1-beta.6844",
+  "version": "1.5.1-beta.6849",
   "description": "Plugin for integrating Blazor components in Piral.",
   "keywords": [
     "piral",
@@ -67,7 +67,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "piral-core": "1.5.1-beta.6844"
+    "piral-core": "1.5.1-beta.6849"
   },
-  "gitHead": "c2fc8e5fa119b46300f6e7c61c359aa04423a2a3"
+  "gitHead": "12a9d67b3f999d378d3786a9a0ca8d696cf0f75e"
 }

package/src/navigation.ts

@@ -18,23 +18,27 @@ function eventHasSpecialKey(event: MouseEvent) {
 }
 
 export function isInternalNavigation(event: MouseEvent) {
-  const anchorTarget = getAnchorTarget(event);
-  return (
-    anchorTarget &&
-    event.type === 'click' &&
-    event.button === 0 &&
-    !event.defaultPrevented &&
-    !eventHasSpecialKey(event) &&
-    anchorTarget.hasAttribute('href') &&
-    (!anchorTarget.target || anchorTarget.target !== '_self') &&
-    !anchorTarget.hasAttribute('download') &&
-    isWithinBaseUriSpace(anchorTarget.href)
-  );
+  if (event.type === 'click' && event.button === 0 && !event.defaultPrevented) {
+    const anchorTarget = getAnchorTarget(event);
+    return (
+      anchorTarget &&
+      !eventHasSpecialKey(event) &&
+      anchorTarget.hasAttribute('href') &&
+      !anchorTarget.hasAttribute('download') &&
+      (!anchorTarget.target || anchorTarget.target === '_self') &&
+      isWithinBaseUriSpace(anchorTarget.href)
+    );
+  }
+
+  return false;
 }
 
 export function performInternalNavigation(event: MouseEvent) {
   const anchorTarget = getAnchorTarget(event);
   event.preventDefault();
+  const baseURI = document.baseURI;
+  const baseUriUntilLastSlash = baseURI.substr(0, baseURI.lastIndexOf('/') + 1);
   const to = anchorTarget.getAttribute('href');
-  window.Blazor.emitNavigateEvent(anchorTarget, to);
+  const path = to.startsWith(baseUriUntilLastSlash) ? to.substring(baseUriUntilLastSlash.length) : to;
+  window.Blazor.emitNavigateEvent(anchorTarget, path);
 }