Update to support new routing code in F7 Vue

Author: bc022699

framework7-react-component-gen.js

@@ -89,7 +89,7 @@ const generateTypeScriptInterfaceFromProps = (props, componentName, eventList, s
 };
 
 const getEventList = (vueComponentString) => {
-    const regex = new RegExp(/\$emit\(["']([A-Za-z0-9-:]+)["'],/, 'g');
+    const regex = new RegExp(/\$emit\(["']([A-Za-z0-9-:]+)["'],?/, 'g');
     let match;
     const events = [];
 

src/components/Framework7App.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 import Framework7Router from '../../framework7-vue/router';
-import {Framework7, IFramework7Params} from '../Framework7';
+import {Framework7, IFramework7Params, Dom7} from '../Framework7';
 import {applyOverscrollFix} from '../utils/OverscrollFix';
 
 export type ThemeTypeEnum  = 'ios' | 'material';
@@ -34,6 +34,7 @@ export interface IFramework7AppContext {
     onRouteChange: (componentId: number, callback: (route: IFramework7Route) => void) => void;
     unregisterRouteChange: (callback: (componentId: number) => void) => void;
     getCurrentRoute: () => any;
+    getRouter: () => any;
 }
 
 export interface IFramework7AppProps extends IFramework7Params, React.Props<any> {
@@ -49,6 +50,7 @@ export class Framework7App extends React.Component<IFramework7AppProps, Framewor
     private framework7InitCallbacks: ((framework7: Framework7) => void)[] = [];
     private routeChangeCallbacks: any = {};
     private currentRoute;
+    private router;
 
     public static childContextTypes = {
         framework7AppContext: React.PropTypes.object
@@ -65,7 +67,8 @@ export class Framework7App extends React.Component<IFramework7AppProps, Framewor
                 },
                 onRouteChange: this.onRouteChange.bind(this),
                 unregisterRouteChange: this.unregisterRouteChange.bind(this),
-                getCurrentRoute: () => this.currentRoute
+                getCurrentRoute: () => this.currentRoute,
+                getRouter: () => this.router
             }
         };
     }
@@ -88,7 +91,7 @@ export class Framework7App extends React.Component<IFramework7AppProps, Framewor
     private initFramework7() {
         this.framework7 = new Framework7(this.props);
 
-        const router = new Framework7Router(this.props.routes, this.framework7);    
+        const router = this.router = new Framework7Router(this.props.routes, this.framework7, Dom7);    
 
         router.setRouteChangeHandler(route => {
             this.currentRoute = route;      

src/utils/ReactifyF7Vue.ts

@@ -32,7 +32,7 @@ export const reactifyF7Vue = <TProps>(args: IReactifyF7VueArgs) => {
         args: {
             ...args.args,
             $$: Dom7,
-            $t7: Template7
+            $t7: Template7            
         },
         mixin: args.mixin
     });
@@ -45,6 +45,12 @@ export const reactifyF7Vue = <TProps>(args: IReactifyF7VueArgs) => {
                 this.framework7 = f7;
             });
 
+            Object.defineProperty(args.component, '$router', {
+                get: framework7AppContext.getRouter,
+                enumerable: true,
+                configurable: true
+            });            
+
             Object.defineProperty(args.component, '$route', {
                 get: framework7AppContext.getCurrentRoute,
                 enumerable: true,