@tarojs/router 3.7.0-alpha.2 → 3.7.0-alpha.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/dist/api.js +6 -1
  2. package/dist/events/scroll.d.ts +1 -1
  3. package/dist/events/scroll.js +3 -3
  4. package/dist/history.js +1 -1
  5. package/dist/index.cjs.d.ts +0 -1
  6. package/dist/index.cjs.js +277 -142
  7. package/dist/index.cjs.js.map +1 -1
  8. package/dist/index.esm.d.ts +0 -1
  9. package/dist/index.esm.js +279 -144
  10. package/dist/index.esm.js.map +1 -1
  11. package/dist/router/index.js +2 -2
  12. package/dist/router/mpa.d.ts +1 -1
  13. package/dist/router/mpa.js +4 -1
  14. package/dist/router/multi-page.d.ts +4 -1
  15. package/dist/router/multi-page.js +56 -11
  16. package/dist/router/page.d.ts +4 -1
  17. package/dist/router/page.js +57 -22
  18. package/dist/router/spa.d.ts +1 -1
  19. package/dist/router/spa.js +23 -17
  20. package/dist/style.d.ts +8 -0
  21. package/dist/style.js +71 -0
  22. package/package.json +10 -9
  23. package/dist/animation.d.ts +0 -4
  24. package/dist/animation.js +0 -29
package/dist/api.js CHANGED
@@ -65,7 +65,12 @@ function navigate(option, method) {
65
65
  }
66
66
  else if (method === 'navigateBack') {
67
67
  stacks.delta = option.delta;
68
- history.go(-option.delta);
68
+ if (stacks.length > option.delta) {
69
+ history.go(-option.delta);
70
+ }
71
+ else {
72
+ history.go(1 - stacks.length);
73
+ }
69
74
  }
70
75
  }
71
76
  catch (error) {
package/dist/events/scroll.d.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  import { PageInstance } from '@tarojs/runtime';
2
- export declare function bindPageScroll(page: PageInstance, pageEl: HTMLElement, distance?: number): void;
2
+ export declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;
package/dist/events/scroll.js CHANGED
@@ -1,11 +1,11 @@
1
1
  import { Current } from '@tarojs/runtime';
2
2
  const pageScrollFn = {};
3
3
  let pageDOM = window;
4
- export function bindPageScroll(page, pageEl, distance = 50) {
4
+ export function bindPageScroll(page, scrollEl, distance = 50) {
5
5
  var _a;
6
6
  const pagePath = (page ? page === null || page === void 0 ? void 0 : page.path : (_a = Current.router) === null || _a === void 0 ? void 0 : _a.path);
7
- pageScrollFn[pagePath] && pageEl.removeEventListener('scroll', pageScrollFn[pagePath]);
8
- pageDOM = pageEl;
7
+ pageScrollFn[pagePath] && scrollEl.removeEventListener('scroll', pageScrollFn[pagePath]);
8
+ pageDOM = scrollEl;
9
9
  let isReachBottom = false;
10
10
  pageScrollFn[pagePath] = function () {
11
11
  var _a;
package/dist/history.js CHANGED
@@ -35,7 +35,7 @@ class MpaHistory {
35
35
  return url;
36
36
  }
37
37
  push(to, _state = {}) {
38
- window.location.pathname = this.parseUrl(to);
38
+ window.location.assign(this.parseUrl(to));
39
39
  // this.pushState(_state, '', this.parseUrl(to))
40
40
  }
41
41
  replace(to, _state = {}) {
package/dist/index.cjs.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import Taro from "@tarojs/taro";
2
2
  import { History } from "history";
3
- /* eslint-disable dot-notation */
4
3
  import { AppInstance } from "@tarojs/runtime";
5
4
  import { MpaRouterConfig, SpaRouterConfig } from "../../types/router";
6
5
  declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;