mobile-navigation-controller - npm Package Compare versions

Comparing version 1.3.1 to 1.3.2

dist/index.js

@@ -1,5 +0,5 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
-    value: true
+  value: true
 });
@@ -9,16 +9,14 @@
 
-var _react = require('react');
+var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _jquery = require('./jquery-3.3.1.min');
+var _jquery = require("./jquery-3.3.1.min");
 
 var _jquery2 = _interopRequireDefault(_jquery);
 
-require('./styles.css');
+require("./styles.css");
 
-require('./animate.css');
+require("./animate.css");
 
-var _reactRouterDom = require('react-router-dom');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,421 +30,430 @@
 
+// import { setTimeout } from "timers";
+
 var Navigator = function (_React$Component) {
-    _inherits(Navigator, _React$Component);
+  _inherits(Navigator, _React$Component);
 
-    function Navigator(props) {
-        _classCallCheck(this, Navigator);
+  function Navigator(props) {
+    _classCallCheck(this, Navigator);
 
-        var _this = _possibleConstructorReturn(this, (Navigator.__proto__ || Object.getPrototypeOf(Navigator)).call(this, props));
+    var _this = _possibleConstructorReturn(this, (Navigator.__proto__ || Object.getPrototypeOf(Navigator)).call(this, props));
 
-        var startPage = "";
-        var mobileMode = false;
-        if (window.cordova) {
-            if (window.cordova.platformId !== "browser") mobileMode = true;
-        }
+    var startPage = "";
+    var mobileMode = false;
+    if (window.cordova) {
+      if (window.cordova.platformId !== "browser") mobileMode = true;
+    }
 
-        var homePage = _this.props.homePageKey ? _this.props.homePageKey : Array.isArray(_this.props.children) ? _this.props.children[0].key : _this.props.children.key;
+    var homePage = _this.props.homePageKey ? _this.props.homePageKey : Array.isArray(_this.props.children) ? _this.props.children[0].key : _this.props.children.key;
 
-        var changeRoute = true; //default
-        if (mobileMode) changeRoute = false;
-        if (_this.props.changeRoute !== undefined) changeRoute = _this.props.changeRoute;
+    var changeRoute = true; //default
+    if (mobileMode) changeRoute = false;
+    if (_this.props.changeRoute !== undefined) changeRoute = _this.props.changeRoute;
 
-        if (!changeRoute) {
-            startPage = homePage;
-        } else {
+    if (!changeRoute) {
+      startPage = homePage;
+    } else {
+      startPage = window.location.href.substr(window.location.href.lastIndexOf("/")) === "/" || window.location.href.substr(window.location.href.lastIndexOf("/")) === "/#" ? homePage : window.location.href.substr(window.location.href.lastIndexOf("/") + 2);
+    }
+    _this.touchBackPage = "";
 
-            startPage = window.location.href.substr(window.location.href.lastIndexOf("/")) === "/" || window.location.href.substr(window.location.href.lastIndexOf("/")) === "/#" ? homePage : window.location.href.substr(window.location.href.lastIndexOf("/") + 2);
-        }
-        _this.touchBackPage = "";
+    _this.callbackFunOnChangePage = function () {};
 
-        _this.callbackFunOnChangePage = function () {};
+    var historyPages = [];
+    historyPages.push(homePage);
+    if (startPage !== homePage) historyPages.push(startPage);
 
-        var historyPages = [];
-        historyPages.push(homePage);
-        if (startPage !== homePage) historyPages.push(startPage);
+    _this.state = {
+      changeRoute: changeRoute,
+      historyPages: historyPages,
+      nowPage: startPage,
+      homePageKey: homePage,
+      // height: this.props.height ? this.props.height : "100%",
+      startPage: startPage,
+      mobileMode: mobileMode,
+      swipeRight_x: 0,
+      swipeRightStart_x: 0,
+      props: []
+    };
 
-        _this.state = {
-            changeRoute: changeRoute,
-            historyPages: historyPages,
-            nowPage: startPage,
-            homePageKey: homePage,
-            // height: this.props.height ? this.props.height : "100%",
-            startPage: startPage,
-            mobileMode: mobileMode,
-            swipeRight_x: 0,
-            swipeRightStart_x: 0,
-            props: []
-        };
+    _this.swipeRight = false;
+    // this.myComponentApp = this.props.myComponentApp;
 
-        _this.swipeRight = false;
-        // this.myComponentApp = this.props.myComponentApp;
+    _this.historyPages = _this.state.historyPages;
 
-        _this.historyPages = _this.state.historyPages;
+    _this.listLevelPages = [];
 
-        _this.listLevelPages = [];
+    _this.componentTransitionIn = [];
+    _this.componentTransitionOut = [];
 
-        var listLevelPages = _this.listLevelPages;
+    var listLevelPages = _this.listLevelPages;
 
-        Array.isArray(_this.props.children) ? _this.props.children.forEach(function (child) {
-            listLevelPages[child.key] = child.props.levelPage === undefined ? child.key === homePage ? 0 : 99 : child.props.levelPage;
-        }) : listLevelPages[_this.props.children.key] = _this.props.children.props.levelPage === undefined ? _this.props.children.key === homePage ? 0 : 99 : _this.props.children.props.levelPage;
+    if (Array.isArray(_this.props.children)) {
+      _this.props.children.forEach(function (child) {
+        listLevelPages[child.key] = child.props.levelPage === undefined ? child.key === homePage ? 0 : 99 : child.props.levelPage;
 
-        // const childrenWithProps = React.Children.map(this.props.children, child =>
-        //   React.cloneElement(child, { doSomething: this.doSomething })
-        // );
-        // this.props.nowPage(this.historyPages[this.historyPages.length - 1]);
+        if (child.props.transitionIn) _this.componentTransitionIn[child.key] = child.props.transitionIn;
+        if (child.props.transitionOut) _this.componentTransitionOut[child.key] = child.props.transitionOut;
+      });
+    } else {
+      listLevelPages[_this.props.children.key] = _this.props.children.props.levelPage === undefined ? _this.props.children.key === homePage ? 0 : 99 : _this.props.children.props.levelPage;
 
-        _this.busy = false;
-
-        _this.props.onRef(_this);
-
-        _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");
-        });
-
-        return _this;
+      if (children.props.transitionIn) _this.componentTransitionIn[children.key] = children.props.transitionIn;
+      if (children.props.transitionOut) _this.componentTransitionOut[children.key] = children.props.transitionOut;
     }
 
-    _createClass(Navigator, [{
-        key: 'componentDidMount',
-        value: function componentDidMount() {
-            if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], "In");
-        }
-        //----navigator and animation----///
+    // const childrenWithProps = React.Children.map(this.props.children, child =>
+    //   React.cloneElement(child, { doSomething: this.doSomething })
+    // );
+    // this.props.nowPage(this.historyPages[this.historyPages.length - 1]);
 
-    }, {
-        key: 'funAnimationIn1',
-        value: function funAnimationIn1(goToPage, fromPage) {
-            var fthis = this;
+    _this.busy = false;
 
-            if (this.props.beforChangePage !== undefined) this.props.beforChangePage(goToPage, this.compareTwoPagesLavel(goToPage, fromPage));
+    _this.props.onRef(_this);
 
-            //--נכנסים דף פנימה Up--//
-            var callbackFun = function callbackFun() {
-                fthis.funAnimationIn2(goToPage, fromPage);
-                document.getElementById(goToPage).removeEventListener("webkitAnimationEnd", callbackFun);
-            };
+    _this.changePage = _this.changePage.bind(_this);
 
-            document.getElementById(goToPage).addEventListener("webkitAnimationEnd", callbackFun, false);
+    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");
+    });
+    return _this;
+  }
 
-            this.busy = true;
-            (0, _jquery2.default)('#' + goToPage).removeClass('hiddenPage');
-            (0, _jquery2.default)('#' + goToPage).addClass('scrollPage showPage');
-            (0, _jquery2.default)('#' + fromPage).css('z-index', 0);
-            (0, _jquery2.default)('#' + goToPage).css('z-index', 89);
-        }
-    }, {
-        key: 'funAnimationIn2',
-        value: function funAnimationIn2(goToPage, fromPage) {
-            (0, _jquery2.default)('#' + fromPage).css('z-index', "");
-            (0, _jquery2.default)('#' + goToPage).css('z-index', "");
-            (0, _jquery2.default)('#' + goToPage).css('animation', '');
-            (0, _jquery2.default)('#' + fromPage).removeClass('showPage');
-            (0, _jquery2.default)('#' + fromPage).removeClass('scrollPage');
-            (0, _jquery2.default)('#' + fromPage).addClass('hiddenPage');
-            this.busy = false;
-            this.setState({ nowPage: goToPage });
+  _createClass(Navigator, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], "In");
+    }
+    //----navigator and animation----///
 
-            if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], this.compareTwoPagesLavel(goToPage, fromPage));
-        }
-    }, {
-        key: 'funAnimationOut1',
-        value: function funAnimationOut1(goToPage, fromPage) {
-            var _this2 = this;
+  }, {
+    key: "funAnimationIn1",
+    value: function funAnimationIn1(goToPage, fromPage) {
+      var fthis = this;
 
-            //--חזרה בדפים Down--//  
+      if (this.props.beforChangePage !== undefined) this.props.beforChangePage(goToPage, this.compareTwoPagesLavel(goToPage, fromPage));
 
-            if (this.props.beforChangePage !== undefined) this.props.beforChangePage(goToPage, this.compareTwoPagesLavel(goToPage, fromPage));
+      //--נכנסים דף פנימה Up--//
+      var callbackFun = function callbackFun() {
+        fthis.funAnimationIn2(goToPage, fromPage);
+        document.getElementById(goToPage).removeEventListener("webkitAnimationEnd", callbackFun);
+      };
 
-            var callbackFun = function callbackFun() {
-                _this2.funAnimationOut2(goToPage, fromPage);
-                document.getElementById(fromPage).removeEventListener("webkitAnimationEnd", callbackFun);
-            };
-            document.getElementById(fromPage).addEventListener("webkitAnimationEnd", callbackFun);
-            this.busy = true;
-            (0, _jquery2.default)('#' + goToPage).css('z-index', 0);
-            (0, _jquery2.default)('#' + fromPage).css('z-index', 89);
-            (0, _jquery2.default)('#' + goToPage).removeClass('hiddenPage');
-            (0, _jquery2.default)('#' + goToPage).addClass('scrollPage showPage');
-        }
-    }, {
-        key: 'funAnimationOut2',
-        value: function funAnimationOut2(goToPage, fromPage) {
-            (0, _jquery2.default)('#' + fromPage).css('animation', '');
-            (0, _jquery2.default)('#' + goToPage).css('z-index', "");
-            (0, _jquery2.default)('#' + goToPage).css('left', "");
-            (0, _jquery2.default)('#' + fromPage).css('z-index', "");
-            (0, _jquery2.default)('#' + fromPage).removeClass('showPage');
-            (0, _jquery2.default)('#' + fromPage).removeClass('scrollPage');
-            (0, _jquery2.default)('#' + fromPage).addClass('hiddenPage');
-            this.busy = false;
-            this.setState({ nowPage: goToPage });
+      document.getElementById(goToPage).addEventListener("webkitAnimationEnd", callbackFun, false);
 
-            if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], this.compareTwoPagesLavel(goToPage, fromPage));
+      this.busy = true;
+      (0, _jquery2.default)("#" + goToPage).removeClass("hiddenPage");
+      (0, _jquery2.default)("#" + goToPage).addClass("scrollPage showPage");
+      (0, _jquery2.default)("#" + fromPage).css("z-index", 0);
+      (0, _jquery2.default)("#" + goToPage).css("z-index", 89);
+    }
+  }, {
+    key: "funAnimationIn2",
+    value: function funAnimationIn2(goToPage, fromPage) {
+      (0, _jquery2.default)("#" + fromPage).css("z-index", "");
+      (0, _jquery2.default)("#" + goToPage).css("z-index", "");
+      (0, _jquery2.default)("#" + goToPage).css("animation", "");
+      (0, _jquery2.default)("#" + fromPage).removeClass("showPage");
+      (0, _jquery2.default)("#" + fromPage).removeClass("scrollPage");
+      (0, _jquery2.default)("#" + fromPage).addClass("hiddenPage");
+      this.busy = false;
+      this.setState({ nowPage: goToPage });
 
-            this.callbackFunOnChangePage();
-        }
-    }, {
-        key: 'compareTwoPagesLavel',
-        value: function compareTwoPagesLavel(goToPage, fromPage) {
-            if (this.listLevelPages[goToPage] < this.listLevelPages[fromPage]) return "Out";
-            if (this.listLevelPages[goToPage] > this.listLevelPages[fromPage]) return "In";
-            return "SameLevel";
-        }
-    }, {
-        key: 'changePage',
-        value: function changePage(goToPage, options) {
-            var _this3 = this;
+      if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], this.compareTwoPagesLavel(goToPage, fromPage));
+    }
+  }, {
+    key: "funAnimationOut1",
+    value: function funAnimationOut1(goToPage, fromPage) {
+      var _this2 = this;
 
-            options = options === undefined ? [] : options;
+      //--חזרה בדפים Down--//
 
-            var _options = options,
-                _options$props = _options.props,
-                props = _options$props === undefined ? null : _options$props,
-                _options$animationIn = _options.animationIn,
-                animationIn = _options$animationIn === undefined ? this.swipeRight ? 'slideInRight' : null : _options$animationIn,
-                _options$timeAnimatio = _options.timeAnimationInMS,
-                timeAnimationInMS = _options$timeAnimatio === undefined ? 250 : _options$timeAnimatio,
-                _options$animationOut = _options.animationOut,
-                animationOut = _options$animationOut === undefined ? this.swipeRight ? 'slideOutRight' : null : _options$animationOut,
-                _options$callbackFun = _options.callbackFun,
-                callbackFun = _options$callbackFun === undefined ? null : _options$callbackFun;
+      if (this.props.beforChangePage !== undefined) this.props.beforChangePage(goToPage, this.compareTwoPagesLavel(goToPage, fromPage));
 
+      var callbackFun = function callbackFun() {
+        _this2.funAnimationOut2(goToPage, fromPage);
+        document.getElementById(fromPage).removeEventListener("webkitAnimationEnd", callbackFun);
+      };
+      document.getElementById(fromPage).addEventListener("webkitAnimationEnd", callbackFun);
+      this.busy = true;
+      (0, _jquery2.default)("#" + goToPage).css("z-index", 0);
+      (0, _jquery2.default)("#" + fromPage).css("z-index", 89);
+      (0, _jquery2.default)("#" + goToPage).removeClass("hiddenPage");
+      (0, _jquery2.default)("#" + goToPage).addClass("scrollPage showPage");
+    }
+  }, {
+    key: "funAnimationOut2",
+    value: function funAnimationOut2(goToPage, fromPage) {
+      (0, _jquery2.default)("#" + fromPage).css("animation", "");
+      (0, _jquery2.default)("#" + goToPage).css("z-index", "");
+      (0, _jquery2.default)("#" + goToPage).css("left", "");
+      (0, _jquery2.default)("#" + fromPage).css("z-index", "");
+      (0, _jquery2.default)("#" + fromPage).removeClass("showPage");
+      (0, _jquery2.default)("#" + fromPage).removeClass("scrollPage");
+      (0, _jquery2.default)("#" + fromPage).addClass("hiddenPage");
+      this.busy = false;
+      this.setState({ nowPage: goToPage });
 
-            if (props !== null) {
-                // let oldProps = this.state.props;
-                var newProps = [];
-                newProps[goToPage] = props;
-                this.setState({ props: newProps });
-            } else {}
+      if (this.props.onChangePage !== undefined) this.props.onChangePage(this.state.historyPages[this.state.historyPages.length - 1], this.compareTwoPagesLavel(goToPage, fromPage));
 
-            if (!this.busy) {
-                var fthis = this;
+      this.callbackFunOnChangePage();
+    }
+  }, {
+    key: "compareTwoPagesLavel",
+    value: function compareTwoPagesLavel(goToPage, fromPage) {
+      if (this.listLevelPages[goToPage] < this.listLevelPages[fromPage]) return "Out";
+      if (this.listLevelPages[goToPage] > this.listLevelPages[fromPage]) return "In";
+      return "SameLevel";
+    }
+  }, {
+    key: "changePage",
+    value: function changePage(goToPage, options) {
+      var _this3 = this;
 
-                var fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
+      this.setState({ historyPages: this.historyPages });
 
-                //--animation time defult
-                var timeAnimation = timeAnimationInMS; //param.timeAnimationInMS !== undefined && param.timeAnimationInMS !== null ? param.timeAnimationInMS :
-                //     250; //ms
+      var fromPage = "" + this.historyPages[this.historyPages.length - 1] + "";
 
-                if (goToPage !== fromPage) {
-                    //---ניהול חזרות----//
-                    this.busy = true;
-                    //סיום האפליקציה, סגור
-                    if (this.state.historyPages.length === 1 && goToPage === undefined) {
-                        console.log('"window.navigator.app.exitApp()"');
-                        // fthis.showSwalLater ?
-                        //     fthis.myChildrens.swal.runSwal(true) :
-                        window.navigator.app.exitApp();
-                    } else {
-                        ///שמור היסטוריה
-                        var new_historyPages = this.state.historyPages.slice();
+      options = options === undefined ? [] : options;
 
-                        if (this.listLevelPages[goToPage] <= this.listLevelPages[fromPage]) {
-                            //חוזרים אחורה, מחק את כל הדפים שהרמה שלהם גבוהה משלי.
-                            //new_historyPages.splice(new_historyPages.length - 1, 1);
-                            new_historyPages = new_historyPages.filter(function (x) {
-                                return _this3.listLevelPages[x] < _this3.listLevelPages[goToPage];
-                            });
-                        }
-                        new_historyPages.push(goToPage);
-                        //שמירת שינויים בהיסטוריה
-                        this.setState({ historyPages: new_historyPages });
-                    }
+      var _options = options,
+          _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,
+          _options$timeAnimatio = _options.timeAnimationInMS,
+          timeAnimationInMS = _options$timeAnimatio === undefined ? 250 : _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,
+          _options$callbackFun = _options.callbackFun,
+          callbackFun = _options$callbackFun === undefined ? null : _options$callbackFun;
 
-                    if (this.state.changeRoute) {
 
-                        window.location.href = window.location.href.substr(0, window.location.href.lastIndexOf("/") + 1) + "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
-                    }
+      if (props !== null) {
+        // let oldProps = this.state.props;
+        var newProps = [];
+        newProps[goToPage] = props;
+        this.setState({ props: newProps });
+      } else {}
 
-                    //----navigator and animation----///
+      if (!this.busy) {
+        var fthis = this;
 
-                    if (this.listLevelPages[goToPage] > this.listLevelPages[fromPage]) {
-                        //--נכנסים דף פנימה Up--//
-                        this.funAnimationIn1(goToPage, fromPage);
+        //--animation time defult
+        var timeAnimation = timeAnimationInMS; //param.timeAnimationInMS !== undefined && param.timeAnimationInMS !== null ? param.timeAnimationInMS :
+        //     250; //ms
 
-                        if (this.listLevelPages[goToPage] === 1) {
-                            //Up from level 0 to level 1
-                            (0, _jquery2.default)('#' + goToPage).css('animation', (animationIn !== null && animationIn !== undefined ? animationIn : 'slideInRight') + " " + timeAnimation + 'ms');
-                        } else {
-                            //else if (this.listLevelPages[goToPage] === 2) {
-                            //Up from level 1 to level 2
-                            (0, _jquery2.default)('#' + goToPage).css('animation', (animationIn !== null && animationIn !== undefined ? animationIn : 'zoomIn') + " " + timeAnimation + 'ms');
-                        }
-                    } else {
-                        //--חזרה בדפים Down--//   
-                        this.funAnimationOut1(goToPage, fromPage);
-                        if (this.listLevelPages[fromPage] === 1) {
-                            //Down from level 1 to level 0
-                            (0, _jquery2.default)('#' + fromPage).css('animation', (animationOut !== null && animationOut !== undefined ? animationOut : 'slideOutRight') + " " + timeAnimation + 'ms');
-                        } else {
-                            //else if (this.listLevelPages[goToPage] === 1) {
-                            //Down from level 2 to level 1
-                            (0, _jquery2.default)('#' + fromPage).css('animation', (animationOut !== null && animationOut !== undefined ? animationOut : 'zoomOut') + " " + timeAnimation + 'ms');
-                        }
-                    }
-                    // //עיצוב כפתור חזרה
-                    // if (goToPage === "home") {
-                    //     $('#navigatorBack').css('display', "none");
-                    // } else {
-                    //     $('#navigatorBack').css('display', "flex");
-                    // }
+        if (goToPage !== fromPage) {
+          //---ניהול חזרות----//
+          this.busy = true;
+          //סיום האפליקציה, סגור
+          if (this.state.historyPages.length === 1 && goToPage === undefined) {
+            console.log('"window.navigator.app.exitApp()"');
+            // fthis.showSwalLater ?
+            //     fthis.myChildrens.swal.runSwal(true) :
+            window.navigator.app.exitApp();
+          } else {
+            ///שמור היסטוריה
+            var new_historyPages = this.state.historyPages.slice();
 
-
-                    if (callbackFun !== undefined && callbackFun !== null) callbackFun();
-                }
+            if (this.listLevelPages[goToPage] <= this.listLevelPages[fromPage]) {
+              //חוזרים אחורה, מחק את כל הדפים שהרמה שלהם גבוהה משלי.
+              //new_historyPages.splice(new_historyPages.length - 1, 1);
+              new_historyPages = new_historyPages.filter(function (x) {
+                return _this3.listLevelPages[x] < _this3.listLevelPages[goToPage];
+              });
             }
-        }
-    }, {
-        key: 'componentWillMount',
-        value: function componentWillMount() {
-            var fthis = this;
-            if (!fthis.state.changeRoute) {
+            new_historyPages.push(goToPage);
+            //שמירת שינויים בהיסטוריה
+            this.setState({ historyPages: new_historyPages });
+          }
 
-                // //---lock portrait
-                // window.screen.orientation.lock('portrait');
+          if (this.state.changeRoute) {
+            window.location.href = window.location.href.substr(0, window.location.href.lastIndexOf("/") + 1) + "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
+          }
 
-                //--back button in android
+          //----navigator and animation----///
 
-                document.addEventListener("backbutton", function (e) {
-                    fthis.back();
-                }, false);
+          if (this.listLevelPages[goToPage] > this.listLevelPages[fromPage]) {
+            //--נכנסים דף פנימה Up--//
+            this.funAnimationIn1(goToPage, fromPage);
+
+            if (this.listLevelPages[goToPage] === 1) {
+              //Up from level 0 to level 1
+              (0, _jquery2.default)("#" + goToPage).css("animation", (animationIn !== null && animationIn !== undefined ? animationIn : "slideInRight") + " " + timeAnimation + "ms");
             } else {
-                //--back on change browser url
-                window.addEventListener("hashchange", function (e) {
-                    fthis.changePage(window.location.href.substr(window.location.href.lastIndexOf("/") + 2) === "" ? fthis.state.homePageKey : window.location.href.substr(window.location.href.lastIndexOf("/") + 2));
-                });
+              //else if (this.listLevelPages[goToPage] === 2) {
+              //Up from level 1 to level 2
+              (0, _jquery2.default)("#" + goToPage).css("animation", (animationIn !== null && animationIn !== undefined ? animationIn : "zoomIn") + " " + timeAnimation + "ms");
             }
-        }
-    }, {
-        key: 'back',
-        value: function back(options) {
-            if (options === null || options === undefined) {
-                this.changePage(this.state.historyPages[this.state.historyPages.length - 2]);
+          } else {
+            //--חזרה בדפים Down--//
+            this.funAnimationOut1(goToPage, fromPage);
+            if (this.listLevelPages[fromPage] === 1) {
+              //Down from level 1 to level 0
+              (0, _jquery2.default)("#" + fromPage).css("animation", (animationOut !== null && animationOut !== undefined ? animationOut : "slideOutRight") + " " + timeAnimation + "ms");
             } else {
-                this.changePage(this.state.historyPages[this.state.historyPages.length - 2], options);
+              //else if (this.listLevelPages[goToPage] === 1) {
+              //Down from level 2 to level 1
+              (0, _jquery2.default)("#" + fromPage).css("animation", (animationOut !== null && animationOut !== undefined ? animationOut : "zoomOut") + " " + timeAnimation + "ms");
             }
+          }
+          // //עיצוב כפתור חזרה
+          // if (goToPage === "home") {
+          //     $('#navigatorBack').css('display', "none");
+          // } else {
+          //     $('#navigatorBack').css('display', "flex");
+          // }
+
+          if (callbackFun !== undefined && callbackFun !== null) callbackFun();
         }
-    }, {
-        key: 'render',
-        value: function render() {
-            var _this4 = this;
+      }
+    }
+  }, {
+    key: "componentWillMount",
+    value: function componentWillMount() {
+      var fthis = this;
+      if (!fthis.state.changeRoute) {
+        // //---lock portrait
+        // window.screen.orientation.lock('portrait');
 
-            var fthis = this;
-            // window.navigation_controller = this;
-            var nowPage = this.state.historyPages[this.state.historyPages.length - 1];
-            this.historyPages = this.state.historyPages;
-            this.nowPage = this.state.nowPage;
-            // var currentRoutes = this.context.router.getCurrentRoutes();
-            // var activeRouteName = currentRoutes[currentRoutes.length - 1].name;
-            // debugger;
+        //--back button in android
 
+        document.addEventListener("backbutton", function (e) {
+          fthis.back();
+        }, false);
+      } else {
+        //--back on change browser url
+        window.addEventListener("hashchange", function (e) {
+          fthis.changePage(window.location.href.substr(window.location.href.lastIndexOf("/") + 2) === "" ? fthis.state.homePageKey : window.location.href.substr(window.location.href.lastIndexOf("/") + 2));
+        });
+      }
+    }
+  }, {
+    key: "back",
+    value: function back(options) {
+      if (options === null || options === undefined) {
+        this.changePage(this.state.historyPages[this.state.historyPages.length - 2]);
+      } else {
+        this.changePage(this.state.historyPages[this.state.historyPages.length - 2], options);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this4 = this;
 
-            // if (Array.isArray(this.props.children)) {
-            //     this.props.children.map(child => {
-            //         if (fthis.state.props[child.key] !== undefined) { 
-            //             fthis.state.props[child.key].forEach((prop)=>{
-            //                 this.props.children.filter((x)=>x.key===child.key)[0].props[prop]
-            //             })
-            //         }
-            //     });
-            // }
+      var fthis = this;
+      // window.navigation_controller = this;
+      var nowPage = this.state.historyPages[this.state.historyPages.length - 1];
 
+      this.historyPages = this.state.historyPages; //.slice();
+      this.nowPage = this.state.nowPage;
 
-            this.historyPages = this.state.historyPages.slice();
-            return Array.isArray(this.props.children) ? this.props.children.map(function (child) {
-                debugger;
+      // if (Array.isArray(this.props.children)) {
+      //     this.props.children.map(child => {
+      //         if (fthis.state.props[child.key] !== undefined) {
+      //             fthis.state.props[child.key].forEach((prop)=>{
+      //                 this.props.children.filter((x)=>x.key===child.key)[0].props[prop]
+      //             })
+      //         }
+      //     });
+      // }
 
-                // childElement.type.name === "Route"
-                //     ? (childElement.props.children ? childElement.props.children : React.createElement(childElement.props.component))
-                //     : childElement;
+      return Array.isArray(this.props.children) ? this.props.children.map(function (child) {
+        if (child.props.kill) {
+          fthis.historyPages = fthis.historyPages.filter(function (x) {
+            return x !== child.key;
+          });
 
-                return _react2.default.cloneElement(child, child.key, _react2.default.createElement(
-                    'div',
-                    {
-                        // onTouchStart={(e) => {
+          return _react2.default.createElement("div", null);
+        } else {
+          return _react2.default.createElement(
+            "div",
+            {
+              // onTouchStart={(e) => {
 
+              // }}
 
-                        // }}
+              onTouchMove: function onTouchMove(e) {
+                if (child.props.backOnSwipeRight && !fthis.swipeRight) {
+                  if (e.touches[0].clientX < 0.2 * innerWidth) {
+                    fthis.touchBackPage = nowPage;
+                    fthis.swipeRight = true;
+                    fthis.setState({ swipeRightStart_x: e.touches[0].clientX });
 
+                    var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
 
-                        onTouchMove: function onTouchMove(e) {
-                            if (child.props.backOnSwipeRight && !fthis.swipeRight) {
-                                if (e.touches[0].clientX < 0.20 * innerWidth) {
-                                    fthis.touchBackPage = nowPage;
-                                    fthis.swipeRight = true;
-                                    fthis.setState({ swipeRightStart_x: e.touches[0].clientX });
+                    (0, _jquery2.default)("#" + goToPage).css("z-index", 0);
+                    (0, _jquery2.default)("#" + nowPage).css("z-index", 89);
+                    (0, _jquery2.default)("#" + goToPage).removeClass("hiddenPage");
+                    (0, _jquery2.default)("#" + goToPage).addClass("showPage overflow_Y_hidden");
+                  }
+                }
+                if (fthis.swipeRight) {
+                  fthis.setState({
+                    swipeRight_x: e.touches[0].clientX - fthis.state.swipeRightStart_x <= 0 ? 1 : e.touches[0].clientX - fthis.state.swipeRightStart_x
+                  });
+                }
+              },
+              onTouchEnd: function onTouchEnd(e) {
+                var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
 
-                                    var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
+                if (fthis.swipeRight && fthis.state.swipeRight_x > 0.25 * innerWidth) {
+                  fthis.callbackFunOnChangePage = function () {
+                    (0, _jquery2.default)("#" + fthis.touchBackPage).css("left", "");
+                    (0, _jquery2.default)("#" + goToPage).removeClass("overflow_Y_hidden");
+                    fthis.setState({ swipeRight_x: 0 });
+                    fthis.swipeRight = false;
+                    fthis.touchBackPage = "";
+                    fthis.callbackFunOnChangePage = function () {};
+                  };
 
-                                    (0, _jquery2.default)('#' + goToPage).css('z-index', 0);
-                                    (0, _jquery2.default)('#' + nowPage).css('z-index', 89);
-                                    (0, _jquery2.default)('#' + goToPage).removeClass('hiddenPage');
-                                    (0, _jquery2.default)('#' + goToPage).addClass('showPage overflow_Y_hidden');
-                                }
-                            }
-                            if (fthis.swipeRight) {
-                                fthis.setState({ swipeRight_x: e.touches[0].clientX - fthis.state.swipeRightStart_x <= 0 ? 1 : e.touches[0].clientX - fthis.state.swipeRightStart_x });
-                            }
-                        },
-                        onTouchEnd: function onTouchEnd(e) {
-                            var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
+                  // fthis.touchBackPage = nowPage;
+                  fthis.back();
+                } else {
+                  (0, _jquery2.default)("#" + nowPage).css("left", "");
+                  (0, _jquery2.default)("#" + goToPage).css("z-index", "");
+                  (0, _jquery2.default)("#" + nowPage).css("z-index", "");
+                  (0, _jquery2.default)("#" + goToPage).removeClass("showPage");
+                  (0, _jquery2.default)("#" + goToPage).addClass("hiddenPage");
+                  fthis.setState({ swipeRight_x: 0 });
+                  fthis.swipeRight = false;
+                  fthis.touchBackPage = "";
+                }
 
-                            if (fthis.swipeRight && fthis.state.swipeRight_x > 0.25 * innerWidth) {
-
-                                fthis.callbackFunOnChangePage = function () {
-                                    (0, _jquery2.default)('#' + fthis.touchBackPage).css('left', "");
-                                    (0, _jquery2.default)('#' + goToPage).removeClass('overflow_Y_hidden');
-                                    fthis.setState({ swipeRight_x: 0 });
-                                    fthis.swipeRight = false;
-                                    fthis.touchBackPage = "";
-                                    fthis.callbackFunOnChangePage = function () {};
-                                };
-
-                                // fthis.touchBackPage = nowPage;
-                                fthis.back();
-                            } else {
-                                (0, _jquery2.default)('#' + nowPage).css('left', "");
-                                (0, _jquery2.default)('#' + goToPage).css('z-index', "");
-                                (0, _jquery2.default)('#' + nowPage).css('z-index', "");
-                                (0, _jquery2.default)('#' + goToPage).removeClass('showPage');
-                                (0, _jquery2.default)('#' + goToPage).addClass('hiddenPage');
-                                fthis.setState({ swipeRight_x: 0 });
-                                fthis.swipeRight = false;
-                                fthis.touchBackPage = "";
-                            }
-
-                            // }
-                        },
-                        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%"
-                        },
-                        id: child.key, key: child.key, className: fthis.state.startPage === child.key ? "showPage scrollPage" : "hiddenPage" },
-                    child.props.component ? child.props.component() : child.props.children // ? React.cloneElement(
-                    //     child,//childElement
-                    //     fthis.state.props[child.key],
-                    //     child.props.children,
-                    // )}
-                    /* : <div /> */
-
-                ));
-            }) : _react2.default.createElement(
-                'div',
-                { style: {
-                        backgroundColor: this.props.children.props.backgroundColor ? this.props.children.props.backgroundColor : "#fff",
-                        height: this.props.children.props.height ? this.props.children.props : fthis.props.height ? this.props.height : "100%"
-                    },
-                    id: this.props.children.key, key: this.props.children.key, className: fthis.state.startPage === this.props.children.key ? "showPage scrollPage" : "hiddenPage" },
-                nowPage === this.props.children.key || fthis.state.historyPages.includes(this.props.children.key) || this.props.children.props.alwaysLive ? _react2.default.cloneElement(this.props.children, fthis.state.props[this.props.children.key], this.props.children.props.children) // this.props.children
-                : _react2.default.createElement('div', null)
-            );
+                // }
+              },
+              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%"
+              },
+              id: child.key,
+              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.createElement(
+        "div",
+        {
+          style: {
+            backgroundColor: this.props.children.props.backgroundColor ? this.props.children.props.backgroundColor : "#fff",
+            height: this.props.children.props.height ? this.props.children.props : fthis.props.height ? this.props.height : "100%"
+          },
+          id: this.props.children.key,
+          key: this.props.children.key,
+          className: fthis.state.startPage === this.props.children.key ? "showPage scrollPage" : "hiddenPage"
+        },
+        nowPage === this.props.children.key || fthis.state.historyPages.includes(this.props.children.key) || this.props.children.props.alwaysLive ? _react2.default.cloneElement(this.props.children, fthis.state.props[this.props.children.key], this.props.children.props.children) // this.props.children
+        : _react2.default.createElement("div", null)
+      );
+    }
+  }]);
 
-    return Navigator;
+  return Navigator;
 }(_react2.default.Component);
 
 exports.default = Navigator;

package.json

 {
   "name": "mobile-navigation-controller",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Navigator for JavaScript mobile app, This will help you to manage your pages history in the app and change pages with animation.",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

README.md

@@ -168,2 +168,16 @@ # mobile-navigation-controller
     </tr>
+     <tr>
+      <td>transitionIn</td>
+     <td>json</td>
+      <td>optional</td>
+     <td>-</td>
+     <td></td>
+    </tr>
+       <tr>
+      <td>kill</td>
+     <td>boolean</td>
+      <td>optional</td>
+     <td>-</td>
+     <td></td>
+    </tr>
     
@@ -170,0 +184,0 @@ </tbody>

No alert changes

Improved metrics

Lines of code

28866

increased by0.05%

Number of lines in readme file

236

increased by6.31%

Worsened metrics

Total package byte prevSize

1231201

decreased by-0.14%

No dependency changes