solara 1.7.0__tar.gz → 1.7.1__tar.gz

{solara-1.7.0 → solara-1.7.1}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.7.0
+current_version = 1.7.1
 commit = True
 tag = True
 parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))((?P<release>.)(?P<build>\d+))?

{solara-1.7.0 → solara-1.7.1}/PKG-INFO

@@ -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 → solara-1.7.1}/packages/assets/solara_assets/__init__.py

@@ -1,2 +1,2 @@
 "CDN assets for Solara"
-__version__ = "1.7.0"
+__version__ = "1.7.1"

{solara-1.7.0 → solara-1.7.1}/packages/solara-enterprise/pyproject.toml

@@ -11,7 +11,7 @@ license = {file = "LICENSE"}
 classifiers = ["License :: Free for non-commercial use"]
 dynamic = ["version", "description"]
 dependencies = [
-    "solara==1.7.0",
+    "solara==1.7.1",
 ]
 
 ssg = [

{solara-1.7.0 → solara-1.7.1}/packages/solara-enterprise/solara_enterprise/__init__.py

@@ -1,2 +1,2 @@
 "Enterprise features for Solara"
-__version__ = "1.7.0"
+__version__ = "1.7.1"

{solara-1.7.0 → solara-1.7.1}/pyproject.toml

@@ -78,7 +78,7 @@ dev = [
     "pytest-playwright; python_version > '3.6'",
 ]
 assets = [
-    "solara-assets==1.7.0"
+    "solara-assets==1.7.1"
 ]
 flask = [
     "flask",

{solara-1.7.0 → solara-1.7.1}/release.md

@@ -7,14 +7,14 @@
 ## Making an alpha release
 
 
-    $ ./release.sh patch --new-version 1.7.0a1
+    $ ./release.sh patch --new-version 1.7.1a1
 
 
 # semi automated
 To make a new release
 ```
 # update solara/__init__.py
-$ git add -u && git commit -m 'Release v1.7.0' && git tag v1.7.0 && git push upstream master v1.7.0
+$ git add -u && git commit -m 'Release v1.7.1' && git tag v1.7.1 && git push upstream master v1.7.1
 ```
 
 
@@ -22,5 +22,5 @@ If a problem happens, and you want to keep the history clean
 ```
 # do fix
 $ git rebase -i HEAD~3
-$ git tag v1.7.0 -f &&  git push upstream master v1.7.0 -f
+$ git tag v1.7.1 -f &&  git push upstream master v1.7.1 -f
 ```

{solara-1.7.0 → solara-1.7.1}/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-1.7.0 → solara-1.7.1}/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-1.7.0 → solara-1.7.1}/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);
       }