solara-ui 1.40.0__py2.py3-none-any.whl → 1.42.0__py2.py3-none-any.whl

solara/website/pages/documentation/examples/utilities/countdown_timer.py

@@ -9,7 +9,6 @@ The UI code demonstrates a lot of conditional rendering.
 import time
 
 import solara
-from solara.alias import rv
 
 
 @solara.component
@@ -41,24 +40,23 @@ def Page():
 
     solara.use_thread(run_timer, dependencies=[duration, running])
 
-    with solara.VBox() as main:
-        if not running:
-            if duration < 1:
-                solara.Error("Duration must be at least 1 second")
-            else:
-                solara.Markdown(f"# Timer set to {seconds} seconds")
+    if not running:
+        if duration < 1:
+            solara.Error("Duration must be at least 1 second")
         else:
-            if seconds:
-                solara.Markdown(f"# {seconds} seconds left")
-            else:
-                solara.solara.Markdown("# Time's up!")
-        rv.TextField(type="number", v_model=duration, on_v_model=on_duration, disabled=running)
-        with solara.HBox():
-            if running:
-                solara.Button("Stop", on_click=lambda: set_running(False), icon_name="mdi-stop")
+            solara.Markdown(f"# Timer set to {seconds} seconds")
+    else:
+        if seconds:
+            solara.Markdown(f"# {seconds} seconds left")
+        else:
+            solara.solara.Markdown("# Time's up!")
+
+    solara.v.TextField(type="number", v_model=duration, on_v_model=on_duration, disabled=running)
+    with solara.Row():
+        if running:
+            solara.Button("Stop", on_click=lambda: set_running(False), icon_name="mdi-stop")
+        else:
+            if duration != seconds:
+                solara.Button("Reset", on_click=lambda: set_seconds(duration), icon_name="mdi-restart")
             else:
-                if duration != seconds:
-                    solara.Button("Reset", on_click=lambda: set_seconds(duration), icon_name="mdi-restart")
-                else:
-                    solara.Button("Start", on_click=lambda: set_running(True), icon_name="mdi-play", disabled=seconds < 1)
-    return main
+                solara.Button("Start", on_click=lambda: set_running(True), icon_name="mdi-play", disabled=seconds < 1)

solara/website/pages/documentation/examples/visualization/annotator.py

@@ -45,9 +45,7 @@ def Page():
     fig = go.FigureWidget(
         layout=go.Layout(
             showlegend=False,
-            autosize=False,
-            width=600,
-            height=600,
+            autosize=True,
             dragmode="drawrect",
             modebar={
                 "add": [

solara/website/pages/documentation/examples/visualization/linked_views.py

@@ -49,8 +49,8 @@ def ClickScatter(df, x, y, color, click_row, on_click: Callable[[ClickPoint], No
         click_y = df[y].values[click_row]
         fig.add_trace(px.scatter(x=[click_x], y=[click_y], text=["⭐️"]).data[0])
     # make the figure a bit smaller
-    fig.update_layout(width=400)
-    with solara.VBox() as main:
+    fig.update_layout(width=340)
+    with solara.Column(style={"width": "340px"}) as main:
         solara.FigurePlotly(fig, on_click=on_click_trace)
         solara.Select(label="X-axis", value=x, values=columns, on_value=set_x)
         solara.Select(label="Y-axis", value=y, values=columns, on_value=set_y)
@@ -65,8 +65,7 @@ def Page():
     else:
         clicked_row = None
 
-    with solara.VBox() as main:
-        with solara.HBox():
+        with solara.Row(justify="center", style={"flex-wrap": "wrap"}):
             ClickScatter(df, "sepal_length", "sepal_width", "species", clicked_row, on_click=set_click_point)
             ClickScatter(df, "petal_length", "petal_width", "species", clicked_row, on_click=set_click_point)
         if click_point is not None:
@@ -80,5 +79,3 @@ def Page():
             )
         else:
             solara.Info("Click to select a point")
-
-    return main

solara/website/pages/documentation/getting_started/content/00-quickstart.md

@@ -24,7 +24,7 @@ Run `pip install solara`, or follow the [Installation instructions](/documentati
 
 Put the following Python snippet in a file (we suggest `sol.py`), or put it in a Jupyter notebook cell:
 
-```solara
+```solara {pycafe-link}
 import solara
 
 # Declare reactive variables at the top level. Components using these variables
@@ -87,3 +87,21 @@ In case you forgot how to start a notebook server:
 Or the more modern Jupyter lab:
 
     $ jupyter lab
+
+
+## Run as app (experimental)
+
+You can also run the script as a standalone app. This requires the extra packages `qtpy` and `PySide6` (or `PyQt6`) to be installed.
+
+```bash
+$ pip install pip install qtpy PySide6
+```
+
+Run from the command line in the same directory where you put your file (`sol.py`):
+
+```bash
+$ solara run sol.py --qt
+```
+
+
+<img src="https://dxhl76zpt6fap.cloudfront.net/public/solara-quickstart-app.webp" alt="Markdown Monster icon"/>

solara/website/pages/documentation/getting_started/content/01-introduction.md

@@ -48,7 +48,7 @@ Follow the [installation instructions](/documentation/getting_started/installing
 
 Create a file `myapp.py`, or put the following code in the Jupyter notebook:
 
-```solara
+```solara {pycafe-link}
 import solara
 
 clicks = solara.reactive(0)

solara/website/pages/roadmap/roadmap.md

@@ -11,6 +11,9 @@ Exciting news! We aim to release Solara 2.0 by the end of the year. For the 2.0
 
 - Elimination of common mistakes, such as detecting state mutations and avoiding misuse of hooks (e.g., using hooks in loops).
 
+    State mutation detection will be the default for Solara 2.0, but can be enabled in Solara > 1.41.0 by setting the environment variable `SOLARA_STORAGE_MUTATION_DETECTION=1`.
+
+
 - [See more details in the 2.0 milestone on GitHub.](https://github.com/widgetti/solara/milestone/1)
 
 

solara/widgets/vue/navigator.vue

@@ -14,43 +14,37 @@ modules.export = {
     }
     window.solara.router.push = (href) => {
       console.log("external router push", href);
-      // take of the anchor
-      if (href.indexOf("#") !== -1) {
-        href = href.slice(0, href.indexOf("#"));
-      }
-      this.location = href;
+      const url = new URL(href, window.location.origin + solara.rootPath);
+      this.location = url.pathname + url.search;
+      this.hash = url.hash;
     };
     let location = window.location.pathname.slice(solara.rootPath.length);
-    // take of the anchor
-    if (location.indexOf("#") !== -1) {
-      location = location.slice(0, location.indexOf("#"));
-    }
     this.location = location + window.location.search;
+    this.hash = window.location.hash;
     window.addEventListener("popstate", this.onPopState);
     window.addEventListener("scroll", this.onScroll);
+    window.addEventListener("hashchange", this.onHashChange);
+    window.addEventListener("solara.pageReady", this.onPageLoad);
   },
   destroyed() {
     window.removeEventListener("popstate", this.onPopState);
     window.removeEventListener("scroll", this.onScroll);
+    window.removeEventListener("hashchange", this.onHashChange);
+    window.removeEventListener("solara.pageReady", this.onPageLoad);
   },
   methods: {
     onScroll() {
       window.history.replaceState(
         { top: document.documentElement.scrollTop },
         null,
-        solara.rootPath + this.location
+        window.location.href
       );
     },
     onPopState(event) {
-      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}`;
       }
       let newLocation = window.location.pathname.slice(solara.rootPath.length);
-      // the router/server shouldn't care about the hash, that's for the frontend
-      if (newLocation.indexOf("#") !== -1) {
-        newLocation = newLocation.slice(0, newLocation.indexOf("#"));
-      }
       this.location = newLocation + window.location.search;
       if (event.state) {
         const top = event.state.top;
@@ -63,6 +57,32 @@ modules.export = {
         */
       }
     },
+    onHashChange(event) {
+      if (!window.location.pathname.startsWith(solara.rootPath)) {
+        throw `window.location.pathname = ${window.location.pathname}, but it should start with the solara.rootPath = ${solara.rootPath}`;
+      }
+      this.hash = window.location.hash;
+    },
+    onPageLoad(event) {
+      if (!window.location.pathname.startsWith(solara.rootPath)) {
+        throw `window.location.pathname = ${window.location.pathname}, but it should start with the solara.rootPath = ${solara.rootPath}`;
+      }
+      // If we've navigated to a hash with the same name on a different page the watch on hash won't trigger
+      if (this.hash && this.hash === window.location.hash) {
+        this.navigateToHash(this.hash);
+      }
+      this.hash = window.location.hash;
+    },
+    makeFullRelativeUrl() {
+      const url = new URL(this.location, window.location.origin + solara.rootPath);
+      return url.pathname + this.hash + url.search;
+    },
+    navigateToHash(hash) {
+      const targetEl = document.getElementById(hash.slice(1));
+      if (targetEl) {
+        targetEl.scrollIntoView();
+      }
+    },
   },
   watch: {
     location(value) {
@@ -89,7 +109,7 @@ modules.export = {
         document.documentElement.scrollTop
       );
       if (oldLocation != this.location) {
-        window.history.pushState({ top: 0 }, null, solara.rootPath + this.location);
+        window.history.pushState({ top: 0 }, null, this.makeFullRelativeUrl());
         if (pathnameNew != pathnameOld) {
           // we scroll to the top only when we change page, not when we change
           // the search string
@@ -99,6 +119,16 @@ modules.export = {
         window.dispatchEvent(event);
       }
     },
+    hash(value) {
+      if (value) {
+        this.navigateToHash(value);
+      }
+    },
+  },
+  data() {
+    return {
+      hash: "",
+    };
   },
 };
 </script>

solara/widgets/vue/vegalite.vue

@@ -15,6 +15,11 @@ module.exports = {
     mounted() {
         this.do_plot_debounced();
     },
+    destroyed() {
+        if (this.observer) {
+            this.observer.disconnect();
+        }
+    },
     watch: {
         spec() {
             this.do_plot_debounced();
@@ -29,7 +34,15 @@ module.exports = {
                 (async () => {
                     const spec = {
                         ...this.spec,
+                        "renderer": "svg",
                     };
+                    if (spec.width === "container") {
+                        this.$refs.plotElement.classList.add("width-container")
+                        this.observer = new ResizeObserver(() => {
+                            view.resize();
+                        });
+                        this.observer.observe(this.$refs.plotElement);
+                    }
                     const { view } = await vegaEmbed(this.$refs.plotElement, spec);
                     // events https://github.com/vega/vega-view#event-handling
                     if (this.listen_to_click) {
@@ -110,3 +123,8 @@ module.exports = {
     },
 }
 </script>
+<style id="vega-embed-container-width">
+.width-container.vega-embed {
+    width: 100%;
+}
+</style>

{solara_ui-1.40.0.dist-info → solara_ui-1.42.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solara-ui
-Version: 1.40.0
+Version: 1.42.0
 Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Project-URL: Documentation, https://solara.dev
@@ -26,7 +26,6 @@ License: The MIT License (MIT)
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
         THE SOFTWARE.
-License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: humanize
 Requires-Dist: ipyvue>=1.9.0
@@ -35,9 +34,13 @@ Requires-Dist: ipywidgets>=7.7
 Requires-Dist: reacton>=1.7.1
 Requires-Dist: requests
 Provides-Extra: all
-Requires-Dist: solara-ui[cache]; extra == 'all'
-Requires-Dist: solara-ui[extra]; extra == 'all'
-Requires-Dist: solara-ui[markdown]; extra == 'all'
+Requires-Dist: cachetools; extra == 'all'
+Requires-Dist: markdown; extra == 'all'
+Requires-Dist: numpy; extra == 'all'
+Requires-Dist: pillow; extra == 'all'
+Requires-Dist: pygments; extra == 'all'
+Requires-Dist: pygments==2.10; (python_version < '3.7') and extra == 'all'
+Requires-Dist: pymdown-extensions; extra == 'all'
 Provides-Extra: cache
 Requires-Dist: cachetools; extra == 'cache'
 Provides-Extra: extra