merge changes

Author: jascolley

framework7-react-component-gen.js

@@ -196,7 +196,7 @@ const generateReactifyF7VueCall = (
 
     const imports = [
         `import * as React from 'react'`,
-        generateImportString('reactifyF7Vue', '../src/utils/reactifyF7Vue'),
+        generateImportString('reactifyF7Vue', '../src/utils/ReactifyF7Vue'),
         generateImportString(vueComponentName, '../framework7-vue/framework7-vue')
     ];    
 

kitchen-sink/components/pages/FormsPage.tsx

@@ -43,7 +43,7 @@ export class FormsPage extends React.Component<any, IFormsPageState> {
                 <List form>
                     <ListItem>
                         <FormLabel>Name</FormLabel>  
-                        <FormInput type="text" placeholder="Name" value={"Test"}/>   
+                        <FormInput type="text" placeholder="Name" />   
                     </ListItem>
                     <ListItem>
                         <FormLabel>Password</FormLabel>  

…ink/components/pages/ProgressBarPage.tsx …ink/components/pages/ProgressbarPage.tsxkitchen-sink/components/pages/ProgressBarPage.tsx renamed to kitchen-sink/components/pages/ProgressbarPage.tsx kitchen-sink/components/pages/ProgressBarPage.tsx renamed to kitchen-sink/components/pages/ProgressbarPage.tsx

@@ -54,10 +54,8 @@
     "vinyl-source-stream": "^1.1.0"
   },
   "dependencies": {
-    "bluebird": "^3.4.6",
     "change-case": "^3.0.0",
     "framework7": "^1.5.0",
-    "invariant": "2.2.1",
     "query-string": "^4.3.1",
     "react": "^15.4.0",
     "universal-router": "^2.0.0"

package.json

@@ -12,7 +12,6 @@ import {
     getDefaultProps,
     addCompiledTemplateFunctionsToVueComponent,
     generateCreateElementFunctionForClass,
-    removePropsFromElementAndChildren,
     applyPropOverridesToTopLevelElement,
     initData
 } from './ReactClassRuntime';

src/utils/reactify-vue/react-class-creation-and-runtime/GenerateReactClass.ts

@@ -130,7 +130,7 @@ const attributeMap = {
 
 const handleRefs = (element: HTMLElement, vueComponent: IVueComponent, events: {[eventName: string]: Function}, props) => {
     if (events) {
-        Object.keys(events).forEach(eventName => {
+        for (let eventName in events) {
             if (element && element.addEventListener && !((element as any).vueListeners && (element as any).vueListeners[eventName])) {
                 element.addEventListener(eventName, (...args: any[]) => {
                     const eventHandler = events[eventName];
@@ -140,7 +140,7 @@ const handleRefs = (element: HTMLElement, vueComponent: IVueComponent, events: {
                 (element as any).vueListeners = (element as any).vueListeners || {};
                 (element as any).vueListeners[eventName] = true;
             }
-        });
+        }
     }
 
     if (props['data-vue-ref']) {        
@@ -189,7 +189,7 @@ export class PropsProcessor {
         this.getInnerHTML(args, props);
         this.handleEvents(resolvedComponent, args.on, vueComponentInstance, props)
         this.handleRef(args.ref, vueComponentInstance, props);        
-
+        
         return props;
     }
 
@@ -205,10 +205,16 @@ export class PropsProcessor {
         if (args.staticClass) { 
             classObject[args.staticClass] = true; 
         }
-
-        if (Object.keys(classObject).length) {
-            props.className = classNames(classObject);
-        }        
+        
+        const classes = [];  
+        
+        for (let key in classObject) {
+            if (classObject[key]) {
+                classes.push(key);
+            }
+        }
+        
+        props.className = classes.join(' ');
     }
 
     private getStyle(args, vueComponent, props) {
@@ -232,12 +238,12 @@ export class PropsProcessor {
 
         } else {
             if (eventHandlers) {
-                Object.keys(eventHandlers).forEach(eventName => {
+                for (let eventName in eventHandlers) {
                     const camelCasedEventName = `${camelCase('on-' + renameEvent(eventName))}`;
                     props[camelCasedEventName] = (...eventArgs: any[]) => {
                         eventHandlers[eventName].apply(parentVueComponentInstance, eventArgs);
                     };
-                });
+                }
             }
         }
     }
@@ -253,11 +259,7 @@ export class PropsProcessor {
 
     private getPropsFromArgs(args, props) {
         if (args.props) {
-            const keys = Object.keys(args.props);
-            let length = keys.length;
-            
-            while (length--) {
-                let prop = keys[length];
+            for (let prop in args.props) {
                 props[camelCase(prop)] = args.props[prop];
             }
         }        
@@ -271,12 +273,7 @@ export class PropsProcessor {
 
     private convertAttrsToProps(args, componentOrComponentName, resolvedComponent, props) {
         if (args.attrs) {
-            const keys = Object.keys(args.attrs);
-            let length = keys.length;
-
-            while (length--) {
-                let attr = keys[length];
-
+            for (let attr in args.attrs) {
                 attr = renameAttribute(componentOrComponentName, attr);
 
                 const resolvedVueComponent = resolvedComponent.vueComponent;
@@ -314,8 +311,8 @@ export class PropsProcessor {
         let length = children && children.length;        
 
         if (children && length && Array.isArray(children)) {
-            while (length--) {            
-                let child = children[length];
+            for (let i = 0, length = children.length; i < length; i++) {            
+                let child = children[i];
 
                 if (child && child.tag && child.tag.indexOf('f7-') !== -1) {                    
                     child.props = {...child.props, parentVueComponent: vueComponent };

src/utils/reactify-vue/react-element-creation/PropsProcessor.ts

@@ -1,8 +1,5 @@
 {
   "globalDependencies": {
-    "bluebird": "registry:dt/bluebird#3.0.0+20160928162057",    
-    "invariant": "registry:dt/invariant#2.2.0+20160317120654",
-    "jquery": "registry:dt/jquery#1.10.0+20160929162922",
     "react": "registry:dt/react#0.14.0+20161008064207",
     "react-dom": "registry:dt/react-dom#0.14.0+20160412154040",
     "react-router": "registry:dt/react-router#2.0.0+20160928130202",