1.7.1

Author: orchuban

README.md

@@ -20,10 +20,10 @@ In the render function return
            levelPage={1}
             transitionIn={
              animatioPageIn:"fadeInRight"
-             ,animatioPageOut:"fadeOutRight"
+             ,animatioPageOut:"fadeOutLeft"
            }
             transitionOut={{
-            animatioPageOut: "fadeOutRight"
+            animatioPageOut: "fadeOutLeft"
           }}
            />
 
@@ -47,7 +47,7 @@ this.navigatorRef.changePage(
 ```
 
 ```
-options = {  animatioPageIn:"fadeInLeft" // have defult
+options = {  animatioPageIn:"fadeInRight" // have defult
             , animationPageOut:"fadeOutLeft" // have defult
             , timeAnimationInMS:integer // defult=250(ms)
             , callbackFun:function

dist/index.js

@@ -112,7 +112,7 @@ var Navigator = function (_React$Component) {
     _this.changePage = _this.changePage.bind(_this);
 
     if (Array.isArray(_this.props.children)) _this.props.children.map(function (child) {
-      if (child.key === null || child.key === "") window.console.log("react.cordova-navigation_controller: key value it's required");
+      if (child.key === null || child.key === "") window.console.log("navigation_controller: key value it's required");
     });
     return _this;
   }
@@ -208,6 +208,16 @@ var Navigator = function (_React$Component) {
     value: function changePage(goToPage, options) {
       var _this3 = this;
 
+      var fthis = this;
+
+      this.props.children.forEach(function (child) {
+        if (child.props.kill) {
+          fthis.historyPages = fthis.historyPages.filter(function (x) {
+            return x !== child.key;
+          });
+        }
+      });
+
       this.setState({ historyPages: this.historyPages });
 
       var fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
@@ -248,7 +258,7 @@ var Navigator = function (_React$Component) {
       } else {}
 
       if (!this.busy) {
-        var fthis = this;
+        // const fthis = this;
 
         //--animation time defult
         var timeAnimation = timeAnimationInMS; //param.timeAnimationInMS !== undefined && param.timeAnimationInMS !== null ? param.timeAnimationInMS :
@@ -379,7 +389,7 @@ var Navigator = function (_React$Component) {
 
           return _react2.default.createElement("div", null);
         } else {
-          return _react2.default.createElement(
+          return nowPage === child.key || fthis.state.historyPages.includes(child.key) || child.props.alwaysLive ? _react2.default.createElement(
             "div",
             {
               // onTouchStart={(e) => {
@@ -444,8 +454,8 @@ var Navigator = function (_React$Component) {
               key: child.key,
               className: fthis.state.startPage === child.key ? "showPage scrollPage" : "hiddenPage"
             },
-            nowPage === child.key || fthis.state.historyPages.includes(child.key) || child.props.alwaysLive ? _react2.default.cloneElement(child, fthis.state.props[child.key], child.props.children) : _react2.default.createElement("div", null)
-          );
+            _react2.default.cloneElement(child, fthis.state.props[child.key], child.props.children)
+          ) : null;
         }
       }) : _react2.default.createElement(
         "div",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react.cordova-navigation_controller",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "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

@@ -114,9 +114,7 @@ export default class Navigator extends React.Component {
     if (Array.isArray(this.props.children))
       this.props.children.map((child) => {
         if (child.key === null || child.key === "")
-          window.console.log(
-            "react.cordova-navigation_controller: key value it's required"
-          );
+          window.console.log("navigation_controller: key value it's required");
       });
   }
 
@@ -226,6 +224,14 @@ export default class Navigator extends React.Component {
   }
 
   changePage(goToPage, options) {
+    const fthis = this;
+
+    this.props.children.forEach((child) => {
+      if (child.props.kill) {
+        fthis.historyPages = fthis.historyPages.filter((x) => x !== child.key);
+      }
+    });
+
     this.setState({ historyPages: this.historyPages });
 
     const fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
@@ -271,7 +277,7 @@ export default class Navigator extends React.Component {
     }
 
     if (!this.busy) {
-      const fthis = this;
+      // const fthis = this;
 
       //--animation time defult
       const timeAnimation = timeAnimationInMS; //param.timeAnimationInMS !== undefined && param.timeAnimationInMS !== null ? param.timeAnimationInMS :
@@ -453,7 +459,9 @@ export default class Navigator extends React.Component {
 
           return <div></div>;
         } else {
-          return (
+          return nowPage === child.key ||
+            fthis.state.historyPages.includes(child.key) ||
+            child.props.alwaysLive ? (
             <div
               // onTouchStart={(e) => {
 
@@ -541,19 +549,13 @@ export default class Navigator extends React.Component {
                   : "hiddenPage"
               }
             >
-              {nowPage === child.key ||
-              fthis.state.historyPages.includes(child.key) ||
-              child.props.alwaysLive ? (
-                React.cloneElement(
-                  child,
-                  fthis.state.props[child.key],
-                  child.props.children
-                )
-              ) : (
-                <div />
+              {React.cloneElement(
+                child,
+                fthis.state.props[child.key],
+                child.props.children
               )}
             </div>
-          );
+          ) : null;
         }
       })
     ) : (