Merge pull request #103 from AliMD/feat/signal

Fix signal update state issue
Alwatr · Mar 13, 2022 · e930d71 · e930d71
2 parents 6ad2651 + d50ec38
commit e930d71
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -10,6 +10,7 @@
     <ol>
       <li><a href="./logger/">Logger</a></li>
       <li><a href="./signal/">Signal</a></li>
+      <li><a href="./router/">Router</a></li>
     </ol>
   </body>
 </html>
diff --git a/demo/logger/index.html b/demo/logger/index.html
@@ -3,11 +3,11 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title></title>
+    <title>@alwatr/logger</title>
+    <script type="module" src="./index.js"></script>
   </head>
 
   <body>
     <h3>Check the console</h3>
-    <script src="./index.js" type="module"></script>
   </body>
 </html>
diff --git a/demo/router/index.html b/demo/router/index.html
@@ -0,0 +1,22 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@alwatr/router</title>
+    <script type="module" src="./index.js"></script>
+  </head>
+
+  <body>
+    <h3>Check the console</h3>
+    <ol>
+      <ul><a href="/home">Home</a></ul>
+      <ul><a href="/about">About</a></ul>
+      <ul><a href="/products">Products</a></ul>
+      <ul><a href="/product/1">Product 1</a></ul>
+      <ul><a href="/contact">Contact</a></ul>
+    </ol>
+
+    <textarea id="output" cols="50" rows="10"></textarea>
+  </body>
+</html>
diff --git a/demo/router/index.ts b/demo/router/index.ts
@@ -0,0 +1,3 @@
+import {initialRouter} from '@alwatr/router';
+
+initialRouter();
diff --git a/demo/signal/index.html b/demo/signal/index.html
@@ -3,14 +3,13 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title></title>
+    <title>@alwatr/signal</title>
+    <script type="module" src="./index.js"></script>
   </head>
 
   <body>
     <h3>Check the console</h3>
     <button id="requestButton">Request Signal</button>
     <button id="requestButton2">3x Request Signal</button>
-    <script src="./index.js" type="module"></script>
-
   </body>
 </html>
diff --git a/package/router/src/core.ts b/package/router/src/core.ts
@@ -33,8 +33,8 @@ export function updateBrowserHistory(options: RequestRouteParam): void {
   options.hash ??= '';
 
   if (
-    window.location.pathname === options.pathname ||
-    window.location.search === options.search ||
+    window.location.pathname === options.pathname &&
+    window.location.search === options.search &&
     window.location.hash === options.hash
   ) {
     return;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import {initialRouter} from '@alwatr/router';

		initialRouter();