@domql/router 2.3.88 → 2.3.109

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 (3) hide show
  1. package/dist/cjs/index.js +27 -28
  2. package/index.js +24 -28
  3. package/package.json +5 -2
package/dist/cjs/index.js CHANGED
@@ -32,6 +32,7 @@ const defaultOptions = {
32
32
  pushState: true,
33
33
  scrollToTop: true,
34
34
  scrollToNode: false,
35
+ scrollNode: import_globals.document.documentElement,
35
36
  scrollBody: false,
36
37
  scrollDocument: true,
37
38
  useFragment: false,
@@ -45,38 +46,36 @@ const router = (path, element, state = {}, options = defaultOptions) => {
45
46
  const [pathname, hash] = path.split("#");
46
47
  const route = getActiveRoute(pathname, options.level);
47
48
  const content = element.routes[route] || element.routes["/*"];
48
- if (content) {
49
- if (options.pushState)
50
- import_globals.window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ""));
51
- element.set({ tag: options.useFragment && "fragment", extend: content });
52
- if (options.updateState)
53
- element.state.update({ route, hash }, { preventContentUpdate: !options.stateContentUpdate });
54
- const rootNode = element.node;
55
- const scrollNode = options.scrollBody ? document.body : options.scrollDocument ? document.documentElement : options.scrollBody ? document.body : rootNode;
56
- if (options.scrollToTop) {
49
+ if (content)
50
+ return;
51
+ if (options.pushState)
52
+ import_globals.window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ""));
53
+ element.set({ tag: options.useFragment && "fragment", extend: content });
54
+ if (options.updateState)
55
+ element.state.update({ route, hash }, { preventContentUpdate: !options.stateContentUpdate });
56
+ const rootNode = element.node;
57
+ const scrollNode = options.scrollNode;
58
+ if (options.scrollToTop) {
59
+ scrollNode.scrollTo({
60
+ ...options.scrollToOptions || {},
61
+ top: 0,
62
+ left: 0
63
+ });
64
+ }
65
+ if (options.scrollToNode) {
66
+ content.content.node.scrollIntoView(
67
+ options.scrollToOptions
68
+ );
69
+ }
70
+ if (hash) {
71
+ const activeNode = import_globals.document.getElementById(hash);
72
+ if (activeNode) {
73
+ const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0;
57
74
  scrollNode.scrollTo({
58
75
  ...options.scrollToOptions || {},
59
- top: 0,
76
+ top,
60
77
  left: 0
61
78
  });
62
79
  }
63
- if (options.scrollToNode) {
64
- content.content.node.scrollTo({
65
- ...options.scrollToOptions || {},
66
- top: 0,
67
- left: 0
68
- });
69
- }
70
- if (hash) {
71
- const activeNode = document.getElementById(hash);
72
- if (activeNode) {
73
- const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0;
74
- scrollNode.scrollTo({
75
- ...options.scrollToOptions || {},
76
- top,
77
- left: 0
78
- });
79
- }
80
- }
81
80
  }
82
81
  };
package/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  'use strict'
2
2
 
3
- import { window } from '@domql/globals'
3
+ import { document, window } from '@domql/globals'
4
4
  import { merge } from '@domql/utils'
5
5
 
6
6
  export const getActiveRoute = (
@@ -14,6 +14,7 @@ const defaultOptions = {
14
14
  pushState: true,
15
15
  scrollToTop: true,
16
16
  scrollToNode: false,
17
+ scrollNode: document.documentElement,
17
18
  scrollBody: false,
18
19
  scrollDocument: true,
19
20
  useFragment: false,
@@ -36,37 +37,32 @@ export const router = (
36
37
  const route = getActiveRoute(pathname, options.level)
37
38
  const content = element.routes[route] || element.routes['/*']
38
39
 
39
- if (content) {
40
- if (options.pushState) window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ''))
40
+ if (content) return
41
+ if (options.pushState) window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ''))
41
42
 
42
- element.set({ tag: options.useFragment && 'fragment', extend: content })
43
- if (options.updateState) element.state.update({ route, hash }, { preventContentUpdate: !options.stateContentUpdate })
43
+ element.set({ tag: options.useFragment && 'fragment', extend: content })
44
+ if (options.updateState) element.state.update({ route, hash }, { preventContentUpdate: !options.stateContentUpdate })
44
45
 
45
- const rootNode = element.node
46
- const scrollNode = options.scrollBody
47
- ? document.body
48
- : options.scrollDocument
49
- ? document.documentElement
50
- : options.scrollBody ? document.body : rootNode
51
- if (options.scrollToTop) {
46
+ const rootNode = element.node
47
+ const scrollNode = options.scrollNode
48
+ if (options.scrollToTop) {
49
+ scrollNode.scrollTo({
50
+ ...(options.scrollToOptions || {}), top: 0, left: 0
51
+ })
52
+ }
53
+ if (options.scrollToNode) {
54
+ content.content.node.scrollIntoView(
55
+ options.scrollToOptions
56
+ )
57
+ }
58
+
59
+ if (hash) {
60
+ const activeNode = document.getElementById(hash)
61
+ if (activeNode) {
62
+ const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0
52
63
  scrollNode.scrollTo({
53
- ...(options.scrollToOptions || {}), top: 0, left: 0
64
+ ...(options.scrollToOptions || {}), top, left: 0
54
65
  })
55
66
  }
56
- if (options.scrollToNode) {
57
- content.content.node.scrollTo({
58
- ...(options.scrollToOptions || {}), top: 0, left: 0
59
- })
60
- }
61
-
62
- if (hash) {
63
- const activeNode = document.getElementById(hash)
64
- if (activeNode) {
65
- const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0
66
- scrollNode.scrollTo({
67
- ...(options.scrollToOptions || {}), top, left: 0
68
- })
69
- }
70
- }
71
67
  }
72
68
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@domql/router",
3
- "version": "2.3.88",
3
+ "version": "2.3.109",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "module": "dist/esm/index.js",
@@ -25,5 +25,8 @@
25
25
  "@domql/globals": "latest",
26
26
  "@domql/utils": "latest"
27
27
  },
28
- "gitHead": "76e0c78a46457b6aa3393199557b09840814cf32"
28
+ "gitHead": "abe8666e3d77d8b287034e91756a9939cb2b6d97",
29
+ "devDependencies": {
30
+ "@babel/core": "^7.12.0"
31
+ }
29
32
  }