feat(route): adds route-link

packages/core/src/components.d.ts

@@ -2546,31 +2546,30 @@ declare global {
 
 
 import {
-  RouteLink as IonRouteLink
+  RouteLink as IonAnchor
 } from './components/route-link/route-link';
 
 declare global {
-  interface HTMLIonRouteLinkElement extends IonRouteLink, HTMLStencilElement {
+  interface HTMLIonAnchorElement extends IonAnchor, HTMLStencilElement {
   }
-  var HTMLIonRouteLinkElement: {
+  var HTMLIonAnchorElement: {
-    prototype: HTMLIonRouteLinkElement;
+    prototype: HTMLIonAnchorElement;
-    new (): HTMLIonRouteLinkElement;
+    new (): HTMLIonAnchorElement;
   };
   interface HTMLElementTagNameMap {
-    "ion-route-link": HTMLIonRouteLinkElement;
+    "ion-anchor": HTMLIonAnchorElement;
   }
   interface ElementTagNameMap {
-    "ion-route-link": HTMLIonRouteLinkElement;
+    "ion-anchor": HTMLIonAnchorElement;
   }
   namespace JSX {
     interface IntrinsicElements {
-      "ion-route-link": JSXElements.IonRouteLinkAttributes;
+      "ion-anchor": JSXElements.IonAnchorAttributes;
     }
   }
   namespace JSXElements {
-    export interface IonRouteLinkAttributes extends HTMLAttributes {
+    export interface IonAnchorAttributes extends HTMLAttributes {
-      router?: any;
+      href?: string;
-      url?: string;
     }
   }
 }

packages/core/src/components/button/button.tsx

@@ -1,7 +1,7 @@
 import { Component, Element, Event, EventEmitter, Prop, State } from '@stencil/core';
 import { CssClassMap } from '../../index';
 import { BlurEvent, FocusEvent } from '../../utils/input-interfaces';
-import { getButtonClassMap, getElementClassMap } from '../../utils/theme';
+import { getButtonClassMap, getElementClassMap, openURL } from '../../utils/theme';
 
 
 @Component({
@@ -133,16 +133,16 @@ export class Button {
 
     const attrs = (TagType === 'button')
       ? { type: this.type }
-      : {};
+      : { href: this.href };
 
     return (
       <TagType
         {...attrs}
         class={buttonClasses}
         disabled={this.disabled}
-        href={this.href}
         onFocus={this.onFocus.bind(this)}
         onKeyUp={this.onKeyUp.bind(this)}
+        onClick={(ev) => openURL(this.href, ev)}
         onBlur={this.onBlur.bind(this)}>
           <span class='button-inner'>
             <slot name='icon-only'></slot>

packages/core/src/components/item/item.tsx

@@ -1,5 +1,5 @@
 import { Component, Element, Listen, Prop, State } from '@stencil/core';
-import { createThemedClasses, getElementClassMap } from '../../utils/theme';
+import { createThemedClasses, getElementClassMap, openURL } from '../../utils/theme';
 import { CssClassMap } from '../../index';
 
 
@@ -104,10 +104,10 @@ export class Item {
 
     const clickable = !!(this.href || this.onclick || this.tappable);
 
-    let TagType = 'div';
+    const TagType = clickable
-    if (clickable) {
+      ? this.href ? 'a' : 'button'
-      TagType = this.href ? 'a' : 'button';
+      : 'div';
-    }
+
     const attrs = (TagType === 'button')
       ? {type: 'button'}
       : {href: this.href};
@@ -125,7 +125,10 @@ export class Item {
     this.hasStyleChange = false;
 
     return (
-      <TagType class={themedClasses} {...attrs}>
+      <TagType
+        {...attrs}
+        class={themedClasses}
+        onClick={(ev) => openURL(this.href, ev)}>
         <slot name='start'></slot>
         <div class='item-inner'>
           <div class='input-wrapper'>

packages/core/src/components/route-link/readme.md

@@ -7,24 +7,14 @@
 
 ## Properties
 
-#### router
+#### href
-
-any
-
-
-#### url
 
 string
 
 
 ## Attributes
 
-#### router
+#### href
-
-any
-
-
-#### url
 
 string
 

packages/core/src/components/route-link/route-link.tsx

@@ -1,12 +1,17 @@
 import { Component, Prop } from '@stencil/core';
+import { openURL } from '../../utils/theme';
 
 
 @Component({
-  tag: 'ion-route-link'
+  tag: 'ion-anchor'
 })
 export class RouteLink {
-  @Prop() url: string;
 
-  // The instance of the router
+  @Prop() href: string;
-  @Prop() router: any;
+
+  render() {
+    return <a
+      href={this.href}
+      onClick={(ev) => openURL(this.href, ev)}><slot/></a>;
+  }
 }

packages/core/src/components/router/readme.md

@@ -29,6 +29,11 @@ string
 boolean
 
 
+## Methods
+
+#### pushURL()
+
+
 
 ----------------------------------------------
 

packages/core/src/components/router/router.tsx

@@ -1,8 +1,8 @@
-import { Component, Element, Listen, Prop } from '@stencil/core';
+import { Component, Element, Listen, Method, Prop } from '@stencil/core';
 import { Config, DomController } from '../../index';
 import { flattenRouterTree, readRoutes } from './utils/parser';
 import { readNavState, writeNavState } from './utils/dom';
-import { chainToPath, readPath, writePath } from './utils/path';
+import { chainToPath, parsePath, readPath, writePath } from './utils/path';
 import { RouteChain } from './utils/interfaces';
 import { routerIDsToChain, routerPathToChain } from './utils/matching';
 
@@ -42,11 +42,8 @@ export class Router {
       this.state++;
       window.history.replaceState(this.state, document.title, document.location.href);
     }
-    if (!this.busy) {
-      console.debug('[OUT] hash changed -> write nav state');
     this.writeNavStateRoot();
   }
-  }
 
   @Listen('body:ionNavChanged')
   protected onNavChanged(ev: CustomEvent) {
@@ -63,21 +60,34 @@ export class Router {
     }
 
     const isPop = ev.detail.isPop === true;
-    this.writePath(chain, isPop);
+    const path = chainToPath(chain);
+    this.writePath(path, isPop);
+  }
+
+  @Method()
+  pushURL(url: string) {
+    this.writePath(parsePath(url), false);
+    return this.writeNavStateRoot();
   }
 
   private writeNavStateRoot(): Promise<any> {
-    const node = document.querySelector('ion-app');
+    if (this.busy) {
+      return Promise.resolve();
+    }
     const currentPath = this.readPath();
+    if (!currentPath) {
+      return Promise.resolve();
+    }
     const direction = window.history.state >= this.state ? 1 : -1;
-    if (currentPath) {
+    const node = document.querySelector('ion-app');
     const {chain} = routerPathToChain(currentPath, this.routes);
     return this.writeNavState(node, chain, direction);
   }
-    return Promise.resolve();
-  }
 
   private writeNavState(node: any, chain: RouteChain, direction: number): Promise<any> {
+    if (this.busy) {
+      return Promise.resolve();
+    }
     this.busy = true;
     return writeNavState(node, chain, 0, direction)
       .catch(err => console.error(err))
@@ -89,8 +99,7 @@ export class Router {
     return readNavState(root);
   }
 
-  private writePath(chain: RouteChain, isPop: boolean) {
+  private writePath(path: string[], isPop: boolean) {
-    const path = chainToPath(chain);
     this.state = writePath(window.history, this.base, this.useHash, path, isPop, this.state);
   }
 

packages/core/src/utils/theme.ts

@@ -62,3 +62,14 @@ export function getClassMap(classes: string | undefined): CssClassMap {
   return map;
 }
 
+export function openURL(url: string, ev: Event) {
+  if (url && url.indexOf('://') === -1) {
+    const router = document.querySelector('ion-router');
+    if (router) {
+      ev && ev.preventDefault();
+      return router.componentOnReady().then(() => router.pushURL(url));
+    }
+  }
+  return Promise.resolve();
+}
+