Merge pull request #6 from bencompton/alert-changes

change alert and getter for framework7 to ensure framework7 is initia…

Author: bencompton

kitchen-sink/dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "framework7-react",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A library of React components that leverages Framework7 HTML + CSS",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",

package.json

@@ -44,15 +44,22 @@ export class Alert extends React.Component<IAlertProps, IAlertModalState> {
     }
 
     private get framework7() {
-        return ((this.context as any).framework7AppContext as IFramework7AppContext).framework7;
+        return ((this.context as any).framework7AppContext as IFramework7AppContext).getFramework7();
     }
 
     private showAlert() {
-        this.state.modal = this.framework7.modal({
-            title: this.props.title,
-            text: this.props.text,           
-            buttons: [{ text: this.framework7.params.modalButtonOk, bold: true, onClick: this.props.onClick }]
-        });
+        setTimeout(() => {
+            if (this.framework7) {
+                this.state.modal = this.framework7.modal({
+                    title: this.props.title,
+                    text: this.props.text,           
+                    buttons: [{ text: this.framework7.params.modalButtonOk, bold: true, onClick: this.props.onClick }]
+                });
+            } else {
+                this.showAlert();
+            }
+        }, 100);
+
     }
 
     private hideAlert() {

src/components/Alert.tsx

@@ -13,7 +13,7 @@ export interface IFramework7AppContext {
     themeType: ThemeTypeEnum;
     rtl?: boolean;
     pageAnimationDirection: AnimationDirectionEnum;
-    framework7: Framework7;
+    getFramework7: () => Framework7;
 }
 
 export interface IFramework7AppProps extends React.Props<any> {
@@ -28,15 +28,13 @@ export class Framework7App extends React.Component<IFramework7AppProps, Framewor
         framework7AppContext: React.PropTypes.object
     }
 
-    componentWillRe
-
     getChildContext() {
         return {
             framework7AppContext: {
                 themeType: this.props.themeType,
                 rtl: this.props.rtl,
                 pageAnimationDirection: this.props.pageAnimationDirection,
-                framework7: this.state                
+                getFramework7: () => this.state       
             }
         };
     }