1.7.3

Author: orchuban

README.md

@@ -4,6 +4,16 @@
 
 It's manager for your pages like mobile app.<br>
 
+<br/><br/>
+
+I dedicate a considerable amount of my free time to developing and maintaining this plugin, along with my other Open Source software. To help ensure this Cli is kept updated, new features are added and bugfixes are implemented quickly, please donate a couple of dollars (or a little more if you can stretch) as this will help me to afford to dedicate time to its maintenance. Please consider donating if you're using this plugin in an app that makes you money, if you're being paid to make the app, if you're asking for new features or priority bug fixes.
+
+<a href="https://paypal.me/orchoban">
+  <img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG_global.gif" width="200px" alt=""/>
+</a>
+
+<br/>
+
 #### `import Navigator from 'react.cordova-navigation_controller';`
 
 <br>
@@ -120,7 +130,7 @@ options = {  animatioPageIn:"fadeInRight" // have defult
      <td>string</td>
       <td>optional</td>
        <td>The key of the first child</td>
-       <td>(nowPageKey,levelAction) => { ... }</td>
+       <td></td>
     </tr>
   </tbody>
 </table>
@@ -170,8 +180,14 @@ options = {  animatioPageIn:"fadeInRight" // have defult
        <tr>
       <td>transitionIn</td>
      <td>json:{ animatioPageIn:string
-             ,animatioPageOut:string
-             ,animationTimeInMS:integer}</td>
+             ,animatioPageOut:string}</td>
+      <td>optional</td>
+     <td>-</td>
+     <td></td>
+    </tr>
+      <tr>
+      <td>animationTimeInMS</td>
+     <td>integer</td>
       <td>optional</td>
      <td>-</td>
      <td></td>

dist/index.js

@@ -110,6 +110,12 @@ var Navigator = function (_React$Component) {
     _this.props.onRef(_this);
 
     _this.changePage = _this.changePage.bind(_this);
+    _this.back = _this.back.bind(_this);
+    _this.funAnimationIn1 = _this.funAnimationIn1.bind(_this);
+    _this.funAnimationIn2 = _this.funAnimationIn2.bind(_this);
+    _this.funAnimationOut1 = _this.funAnimationOut1.bind(_this);
+    _this.funAnimationOut2 = _this.funAnimationOut2.bind(_this);
+    _this.compareTwoPagesLavel = _this.compareTwoPagesLavel.bind(_this);
 
     if (Array.isArray(_this.props.children)) _this.props.children.map(function (child) {
       if (child.key === null || child.key === "") window.console.log("navigation_controller: key value it's required");
@@ -223,12 +229,11 @@ var Navigator = function (_React$Component) {
       var fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
 
       var aniTime = 250;
+
       if (this.props.children.filter(function (x) {
         return x.key === goToPage;
-      }).length > 0) {
-        if (this.props.children.filter(function (x) {
-          return x.key === goToPage;
-        })[0].props.animationTimeInMS) aniTime = this.props.children.filter(function (x) {
+      })[0].props.animationTimeInMS) {
+        aniTime = this.props.children.filter(function (x) {
           return x.key === goToPage;
         })[0].props.animationTimeInMS;
       } else {
@@ -241,11 +246,11 @@ var Navigator = function (_React$Component) {
           _options$props = _options.props,
           props = _options$props === undefined ? null : _options$props,
           _options$animationIn = _options.animationIn,
-          animationIn = _options$animationIn === undefined ? this.componentTransitionIn[goToPage] ? this.componentTransitionIn[goToPage].animatioPageIn ? this.componentTransitionIn[goToPage].animatioPageIn : null : null : _options$animationIn,
+          animationIn = _options$animationIn === undefined ? this.componentTransitionIn[goToPage] ? this.componentTransitionIn[goToPage] : null : _options$animationIn,
           _options$timeAnimatio = _options.timeAnimationInMS,
           timeAnimationInMS = _options$timeAnimatio === undefined ? aniTime : _options$timeAnimatio,
           _options$animationOut = _options.animationOut,
-          animationOut = _options$animationOut === undefined ? this.swipeRight ? "slideOutRight" : this.componentTransitionOut[fromPage] ? this.componentTransitionOut[fromPage].animatioPageOut ? this.componentTransitionOut[fromPage].animatioPageOut : null : null : _options$animationOut,
+          animationOut = _options$animationOut === undefined ? this.swipeRight ? "slideOutRight" : this.componentTransitionOut[fromPage] ? this.componentTransitionOut[fromPage] : null : _options$animationOut,
           _options$callbackFun = _options.callbackFun,
           callbackFun = _options$callbackFun === undefined ? null : _options$callbackFun;
 
@@ -353,6 +358,18 @@ var Navigator = function (_React$Component) {
   }, {
     key: "back",
     value: function back(options) {
+      var _this4 = this;
+
+      this.props.children.forEach(function (child) {
+        if (child.props.kill) {
+          _this4.historyPages = _this4.historyPages.filter(function (x) {
+            return x !== child.key;
+          });
+        }
+      });
+      this.setState({ historyPages: this.historyPages });
+
+      //---
       if (options === null || options === undefined) {
         this.changePage(this.state.historyPages[this.state.historyPages.length - 2]);
       } else {
@@ -362,7 +379,7 @@ var Navigator = function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this4 = this;
+      var _this5 = this;
 
       var fthis = this;
       // window.navigation_controller = this;
@@ -403,7 +420,7 @@ var Navigator = function (_React$Component) {
                     fthis.swipeRight = true;
                     fthis.setState({ swipeRightStart_x: e.touches[0].clientX });
 
-                    var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
+                    var goToPage = _this5.state.historyPages[_this5.state.historyPages.length - 2];
 
                     (0, _jquery2.default)("#" + goToPage).css("z-index", 0);
                     (0, _jquery2.default)("#" + nowPage).css("z-index", 89);
@@ -418,7 +435,7 @@ var Navigator = function (_React$Component) {
                 }
               },
               onTouchEnd: function onTouchEnd(e) {
-                var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
+                var goToPage = _this5.state.historyPages[_this5.state.historyPages.length - 2];
 
                 if (fthis.swipeRight && fthis.state.swipeRight_x > 0.25 * innerWidth) {
                   fthis.callbackFunOnChangePage = function () {
@@ -448,7 +465,7 @@ var Navigator = function (_React$Component) {
               style: {
                 left: fthis.swipeRight ? fthis.touchBackPage === child.key ? fthis.state.swipeRight_x : "" : "",
                 backgroundColor: child.props.backgroundColor ? child.props.backgroundColor : "#fff",
-                height: child.props.height ? child.props.height : fthis.props.height ? _this4.props.height : "100%"
+                height: child.props.height ? child.props.height : fthis.props.height ? _this5.props.height : "100%"
               },
               id: child.key,
               key: child.key,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react.cordova-navigation_controller",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Navigator for Cordova with React.js(react.cordova), This will help you to manage your pages history in the app and change pages with animation.",
   "main": "dist/index.js",
   "scripts": {

src/index.js

@@ -110,6 +110,12 @@ export default class Navigator extends React.Component {
     this.props.onRef(this);
 
     this.changePage = this.changePage.bind(this);
+    this.back = this.back.bind(this);
+    this.funAnimationIn1 = this.funAnimationIn1.bind(this);
+    this.funAnimationIn2 = this.funAnimationIn2.bind(this);
+    this.funAnimationOut1 = this.funAnimationOut1.bind(this);
+    this.funAnimationOut2 = this.funAnimationOut2.bind(this);
+    this.compareTwoPagesLavel = this.compareTwoPagesLavel.bind(this);
 
     if (Array.isArray(this.props.children))
       this.props.children.map((child) => {
@@ -237,13 +243,13 @@ export default class Navigator extends React.Component {
     const fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
 
     let aniTime = 250;
-    if (this.props.children.filter((x) => x.key === goToPage).length > 0) {
-      if (
-        this.props.children.filter((x) => x.key === goToPage)[0].props
-          .animationTimeInMS
-      )
-        aniTime = this.props.children.filter((x) => x.key === goToPage)[0].props
-          .animationTimeInMS;
+
+    if (
+      this.props.children.filter((x) => x.key === goToPage)[0].props
+        .animationTimeInMS
+    ) {
+      aniTime = this.props.children.filter((x) => x.key === goToPage)[0].props
+        .animationTimeInMS;
     } else {
       if (this.props.animationTimeInMS) aniTime = this.props.animationTimeInMS;
     }
@@ -253,17 +259,13 @@ export default class Navigator extends React.Component {
     const {
       props = null,
       animationIn = this.componentTransitionIn[goToPage]
-        ? this.componentTransitionIn[goToPage].animatioPageIn
-          ? this.componentTransitionIn[goToPage].animatioPageIn
-          : null
+        ? this.componentTransitionIn[goToPage]
         : null,
       timeAnimationInMS = aniTime,
       animationOut = this.swipeRight
         ? "slideOutRight"
         : this.componentTransitionOut[fromPage]
-        ? this.componentTransitionOut[fromPage].animatioPageOut
-          ? this.componentTransitionOut[fromPage].animatioPageOut
-          : null
+        ? this.componentTransitionOut[fromPage]
         : null,
       callbackFun = null,
     } = options;
@@ -420,6 +422,14 @@ export default class Navigator extends React.Component {
   }
 
   back(options) {
+    this.props.children.forEach((child) => {
+      if (child.props.kill) {
+        this.historyPages = this.historyPages.filter((x) => x !== child.key);
+      }
+    });
+    this.setState({ historyPages: this.historyPages });
+
+    //---
     if (options === null || options === undefined) {
       this.changePage(
         this.state.historyPages[this.state.historyPages.length - 2]