solara 1.7.0__py2.py3-none-any.whl → 1.7.1__py2.py3-none-any.whl

solara/__init__.py

@@ -1,5 +1,5 @@
 """Build webapps using IPywidgets"""
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

solara/server/static/solara_bootstrap.py

@@ -119,7 +119,7 @@ async def main():
     ]
     for dep in requirements:
         await micropip.install(dep, keep_going=True)
-    await micropip.install("/wheels/solara-1.7.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.7.1-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

solara/widgets/vue/navigator.vue

@@ -1,4 +1,6 @@
-<template><span></span></template>
+<template>
+  <span></span>
+</template>
 ​
 <script>
 modules.export = {
@@ -23,7 +25,7 @@ modules.export = {
     if (location.indexOf("#") !== -1) {
       location = location.slice(0, location.indexOf("#"));
     }
-    this.location = location;
+    this.location = location + window.location.search;
     window.addEventListener("popstate", this.onPopState);
     window.addEventListener("scroll", this.onScroll);
   },
@@ -40,7 +42,7 @@ modules.export = {
       );
     },
     onPopState(event) {
-      console.log("pop state!", event.state, window.location.pathname);
+      console.log("pop state!", event.state, window.location.href);
       if (!window.location.pathname.startsWith(solara.rootPath)) {
         throw `window.location.pathname = ${window.location.pathname}, but it should start with the solara.rootPath = ${solara.rootPath}`;
       }
@@ -49,7 +51,7 @@ modules.export = {
       if (newLocation.indexOf("#") !== -1) {
         newLocation = newLocation.slice(0, newLocation.indexOf("#"));
       }
-      this.location = newLocation;
+      this.location = newLocation + window.location.search;
       if (event.state) {
         const top = event.state.top;
         /*
@@ -65,13 +67,15 @@ modules.export = {
   watch: {
     location(value) {
       console.log("changed", this.location, value);
+      pathnameNew = (new URL(value, window.location)).pathname
+      pathnameOld = window.location.pathname
       // if we use the back navigation, this watch will trigger,
       // but we don't want to push the history
       // otherwise we cannot go forward
       if (!window.location.pathname.startsWith(solara.rootPath)) {
         throw `window.location.pathname = ${window.location.pathname}, but it should start with the solara.rootPath = ${solara.rootPath}`;
       }
-      const oldLocation = window.location.pathname.slice(solara.rootPath.length);
+      const oldLocation = window.location.pathname.slice(solara.rootPath.length) + window.location.search;
       console.log(
         "location changed",
         oldLocation,
@@ -80,7 +84,11 @@ modules.export = {
       );
       if (oldLocation != this.location) {
         window.history.pushState({ top: 0 }, null, solara.rootPath + this.location);
-        window.scrollTo(0, 0);
+        if (pathnameNew != pathnameOld) {
+          // we scroll to the top only when we change page, not when we change
+          // the search string
+          window.scrollTo(0, 0);
+        }
         const event = new Event('solara.router');
         window.dispatchEvent(event);
       }

{solara-1.7.0.dist-info → solara-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solara
-Version: 1.7.0
+Version: 1.7.1
 Summary: Build webapps using IPywidgets
 Author-email: "Maarten A. Breddels" <maartenbreddels@gmail.com>
 Classifier: License :: OSI Approved :: MIT License
@@ -33,7 +33,7 @@ Requires-Dist: jupyter_client>=7.0.0
 Requires-Dist: watchdog
 Requires-Dist: requests
 Requires-Dist: pygments==2.10; python_version < '3.7'
-Requires-Dist: solara-assets==1.7.0 ; extra == "assets"
+Requires-Dist: solara-assets==1.7.1 ; extra == "assets"
 Requires-Dist: flake8 ; extra == "dev"
 Requires-Dist: bqplot ; extra == "dev"
 Requires-Dist: bqplot-image-gl ; extra == "dev"

{solara-1.7.0.dist-info → solara-1.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-solara/__init__.py,sha256=O_Pl62uZgKDjJ9gmMfgS2Od0EowPjjINmSmX2bxWrRg,3091
+solara/__init__.py,sha256=yvKCSAKUXMUrUCNf2wuFheR6FcMPvbRiVBjx2MjCYag,3091
 solara/__main__.py,sha256=ztXaMuWiQdyc4hEmws7ABy-E-CuaRkKhiArMP72M7ak,21260
 solara/alias.py,sha256=9vfLzud77NP8in3OID9b5mmIO8NyrnFjN2_aE0lSb1k,216
 solara/autorouting.py,sha256=njdkEoJMSAPJlG1R2sj3c9aFfzi0tqIF5t4oVm7OYYw,17763
@@ -103,7 +103,7 @@ solara/server/static/highlight-dark.css,sha256=gmC3pr3x2BqJgTswNoN6AkqfEhBk24hPF
 solara/server/static/highlight.css,sha256=k8ZdT5iwrGQ5tXTQHAXuxvZrSUq3kwCdEpy3mlFoZjs,2637
 solara/server/static/main-vuetify.js,sha256=-twJ3DaObXPToFk-s4guHtXrMtlrtFUVhnAuOSSHFbk,7981
 solara/server/static/main.js,sha256=mcx4JNQ4Lg4pNdUIqMoZos1mZyYFS48yd_JNFFJUqIE,5679
-solara/server/static/solara_bootstrap.py,sha256=v0ygQ0hQaGPx20ZFm1-1qY7EcuBsu501oP-hXlaMsQ0,3194
+solara/server/static/solara_bootstrap.py,sha256=saSn_brryciMNW5OyHw0gNZSTe3uOWVo8b4OVxtrxz4,3194
 solara/server/static/sun.svg,sha256=jEKBAGCr7b9zNYv0VUb7lMWKjnU2dX69_Ye_DZWGXJI,6855
 solara/server/static/webworker.js,sha256=cjAFz7-SygStHJnYlJUlJs-gE_7YQeQ-WBDcmKYyjvo,1372
 solara/server/templates/index.html.j2,sha256=JXQo1M-STFHLBOFetgG7509cAq8xUP0VAEtYDzz35fY,31
@@ -289,12 +289,12 @@ solara/widgets/__init__.py,sha256=D3RfEez9dllmst64_nyzzII-NZXoNMEPDnEog4ov3VE,43
 solara/widgets/widgets.py,sha256=dZNRxJp1JRh3S5HRUR3FnN_dsYX45139kf5kEJiJ98Q,1894
 solara/widgets/vue/gridlayout.vue,sha256=EGeq8RmdRSd8AD2Us6L80zGFefh7TaQqJSnazX7YyDw,3559
 solara/widgets/vue/html.vue,sha256=9vaHrddQU1J9zgnhy0W1-YXJ0JH68fet1rDEHoe539Q,404
-solara/widgets/vue/navigator.vue,sha256=JIC8y329MBZrMV1SEVjr7nH025dkQod0ESK6ss8EUDk,3120
+solara/widgets/vue/navigator.vue,sha256=-1CINPrZbLBpZhYcG0R1_nU7HTOF0KZL8RXAgR20D4c,3467
 solara/widgets/vue/vegalite.vue,sha256=Dr4i6fXayDxdo8FqByTlJshQSQ6vawecDq7AHZL93TI,3231
-solara-1.7.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
-solara-1.7.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara-1.7.0.dist-info/entry_points.txt,sha256=AXTWXiaLDBs0LuR81mrek-v6m8xU1J7JYgc-Ob40OoU,47
-solara-1.7.0.dist-info/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
-solara-1.7.0.dist-info/WHEEL,sha256=kdeDBNPvBI0w3meLKPoGgAnEr54n1jzrZWUoaLmGzVY,99
-solara-1.7.0.dist-info/METADATA,sha256=zWsa_AKwSlFY1eavg7o0e-nMO3R552WlDv_RC__l8t8,2754
-solara-1.7.0.dist-info/RECORD,,
+solara-1.7.1.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
+solara-1.7.1.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
+solara-1.7.1.dist-info/entry_points.txt,sha256=AXTWXiaLDBs0LuR81mrek-v6m8xU1J7JYgc-Ob40OoU,47
+solara-1.7.1.dist-info/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
+solara-1.7.1.dist-info/WHEEL,sha256=kdeDBNPvBI0w3meLKPoGgAnEr54n1jzrZWUoaLmGzVY,99
+solara-1.7.1.dist-info/METADATA,sha256=MjHc0mqmXUbzSW5E-zvGSK6pAJyh0PcMteZNEqYMZyk,2754
+solara-1.7.1.dist-info/RECORD,,