solara 1.29.1__tar.gz → 1.30.1__tar.gz

{solara-1.29.1 → solara-1.30.1}/PKG-INFO

@@ -1,6 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: solara
-Version: 1.29.1
+Version: 1.30.1
+Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Author-email: "Maarten A. Breddels" <maartenbreddels@gmail.com>
 License: The MIT License (MIT)
@@ -49,7 +50,7 @@ Requires-Dist: watchdog
 Requires-Dist: watchfiles; python_version > '3.6'
 Requires-Dist: websockets
 Provides-Extra: assets
-Requires-Dist: solara-assets==1.29.1; extra == 'assets'
+Requires-Dist: solara-assets==1.30.1; extra == 'assets'
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: bqplot; extra == 'dev'
@@ -138,7 +139,7 @@ Run:
 pip install solara
 ```
 
-Or follow the [Installation instructions](https://solara.dev/docs/installing) for more detailed instructions.
+Or follow the [Installation instructions](https://solara.dev/documentation/getting_started/installing) for more detailed instructions.
 
 ## First script
 
@@ -184,7 +185,7 @@ Solara server is starting at http://localhost:8765
 Or copy-paste this to a Jupyter notebook cell and execute it (the `Page()` expression at the end
 will cause it to automatically render the component in the notebook).
 
-See this snippet run live at https://solara.dev/docs/quickstart
+See this snippet run live at https://solara.dev/documentation/getting_started
 
 ## Demo
 
@@ -211,7 +212,7 @@ By building on top of ipywidgets, we automatically leverage an existing ecosyste
 
 Visit our main website or jump directly to the introduction
 
-[![Introduction](https://dabuttonfactory.com/button.png?t=Introduction&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/docs)
-[![Quickstart](https://dabuttonfactory.com/button.png?t=Quickstart&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/docs/quickstart)
+[![Introduction](https://dabuttonfactory.com/button.png?t=Introduction&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/documentation)
+[![Quickstart](https://dabuttonfactory.com/button.png?t=Quickstart&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/documentation/getting_started)
 
 *Note that the solara.dev website is created using Solara*

{solara-1.29.1 → solara-1.30.1}/README.md

@@ -27,7 +27,7 @@ Run:
 pip install solara
 ```
 
-Or follow the [Installation instructions](https://solara.dev/docs/installing) for more detailed instructions.
+Or follow the [Installation instructions](https://solara.dev/documentation/getting_started/installing) for more detailed instructions.
 
 ## First script
 
@@ -73,7 +73,7 @@ Solara server is starting at http://localhost:8765
 Or copy-paste this to a Jupyter notebook cell and execute it (the `Page()` expression at the end
 will cause it to automatically render the component in the notebook).
 
-See this snippet run live at https://solara.dev/docs/quickstart
+See this snippet run live at https://solara.dev/documentation/getting_started
 
 ## Demo
 
@@ -100,7 +100,7 @@ By building on top of ipywidgets, we automatically leverage an existing ecosyste
 
 Visit our main website or jump directly to the introduction
 
-[![Introduction](https://dabuttonfactory.com/button.png?t=Introduction&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/docs)
-[![Quickstart](https://dabuttonfactory.com/button.png?t=Quickstart&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/docs/quickstart)
+[![Introduction](https://dabuttonfactory.com/button.png?t=Introduction&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/documentation)
+[![Quickstart](https://dabuttonfactory.com/button.png?t=Quickstart&f=Open+Sans-Bold&ts=20&tc=fff&hp=45&vp=12&c=8&bgt=unicolored&bgc=f19f41)](https://solara.dev/documentation/getting_started)
 
 *Note that the solara.dev website is created using Solara*

{solara-1.29.1 → solara-1.30.1}/pyproject.toml

@@ -99,7 +99,7 @@ dev = [
     "polars",
 ]
 assets = [
-    "solara-assets==1.29.1"
+    "solara-assets==1.30.1"
 ]
 flask = [
     "flask",

{solara-1.29.1 → solara-1.30.1}/solara/__init__.py

@@ -1,5 +1,5 @@
 """Build webapps using IPywidgets"""
-__version__ = "1.29.1"
+__version__ = "1.30.1"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 
@@ -77,10 +77,10 @@ def display(*objs, **kwargs):
 
     However, if you require callback functions, use the specific Solara components, e.g.:
 
-      * [Plotly](/api/plotly)
-      * [Altair](/api/altair)
-      * [Matplotlib](/api/matplotlib)
-      * [Dataframe](/api/dataframe)
+      * [Plotly](/documentation/components/viz/plotly)
+      * [Altair](/documentation/components/viz/altair)
+      * [Matplotlib](/documentation/components/viz/matplotlib)
+      * [Dataframe](/documentation/components/data/dataframe)
 
     ```solara
     import solara

{solara-1.29.1 → solara-1.30.1}/solara/__main__.py

@@ -489,7 +489,7 @@ def deploy():
 
     time.sleep(1)
     rprint("Want your app to run instantly on awesomeapp-mystartup-gh.solara.run?")
-    rprint("\tCheck out https://solara.dev/docs/deploying/cloud-hosted")
+    rprint("\tCheck out https://solara.dev/documentation/getting_started/deploying/cloud-hosted")
 
 
 @cli.command()
@@ -723,7 +723,11 @@ cli.add_command(ssg)
 
 
 def main():
-    cli()
+    args = sys.argv
+    # skip everything after -- if it exists
+    if "--" in args:
+        args = args[: args.index("--")]
+    cli(args[1:])
 
 
 if __name__ == "__main__":

{solara-1.29.1 → solara-1.30.1}/solara/autorouting.py

@@ -24,6 +24,7 @@ DEBUG = False
 solara_root = Path(solara.__file__).parent
 
 DefaultLayout = solara.AppLayout
+_redirects: Dict[str, str] = {}
 
 
 def source_to_module(path: Path, initial_namespace={}) -> ModuleType:
@@ -89,12 +90,17 @@ def arg_cast(args: List[str], f: Callable):
 def RoutingProvider(children: List[reacton.core.Element] = [], routes: List[solara.Route] = [], pathname: str = ""):
     """Wraps the app, adds extra context, like navigation/routing."""
     path, set_path = solara.use_state(pathname, key="solara-context-path")
+
+    def set_path_with_redirect(path):
+        path = _redirects.get(path, path)
+        set_path(path)
+
     # TODO: since we provide a cross filter context here, I don't think name `RoutingProvider` is a good name
     # we might want to change/refactor this.
     solara.provide_cross_filter()
-    nav = solara.Navigator(location=path, on_location=set_path)
-    solara.routing._location_context.provide(solara.routing._Location(path, set_path))
-    solara.routing.router_context.provide(solara.routing.Router(path, routes=routes, set_path=set_path))
+    nav = solara.Navigator(location=path, on_location=set_path_with_redirect)
+    solara.routing._location_context.provide(solara.routing._Location(path, set_path_with_redirect))
+    solara.routing.router_context.provide(solara.routing.Router(path, routes=routes, set_path=set_path_with_redirect))
 
     def get_nav_widget():
         # not sure why get_widget(nav) does not work
@@ -123,15 +129,14 @@ def RoutingProvider(children: List[reacton.core.Element] = [], routes: List[sola
 @solara.component
 def RenderPage(main_name: str = "Page"):
     """Renders the page that matches the route."""
-    level_start = solara.use_route_level()
     router = solara.use_context(solara.routing.router_context)
     # we use these to cache script runs that use regular ipywidgets
     modules = cast(Dict[str, ModuleType], solara.use_memo(dict, dependencies=[]))
-    modules_modified_times = solara.use_memo(dict, dependencies=[])
+    modules_modified_times = cast(Dict[str, float], solara.use_memo(dict, dependencies=[]))
 
-    if len(router.path_routes) <= level_start:
+    if not router.path_routes:
         with solara.VBox() as main:
-            solara.Error(f"Page not found: {router.path}, len(router.path_routes)={len(router.path_routes)} <= level_start={level_start}")
+            solara.Error(f"Page not found: {router.path}")
             parent = "/" + "/".join(router.parts[:-1])
             with solara.Link(parent):
                 solara.Button(f"Go to parent: {parent}", text=True)
@@ -144,10 +149,9 @@ def RenderPage(main_name: str = "Page"):
                     pp(router.routes)
         return main
 
-    level_max = level_start
     layouts = []  # nested layouts
-    # find the 'RenderPage' sentinel value to find the deepest level we should render
-    for level in range(level_start, len(router.path_routes)):
+    level_max = len(router.path_routes) - 1
+    for level in range(len(router.path_routes)):
         # we always level_start the 'package'/'root' layout
         roots = [k for k in router.path_routes_siblings[level] if k.path == "/"]
         if len(roots) == 1:
@@ -158,16 +162,21 @@ def RenderPage(main_name: str = "Page"):
         # and, if not the root layout, include the layout for the current route
         if route.path != "/" and route.layout:
             layouts.append(route.layout)
-        if route.component is RenderPage:
+        # We found the leaf (or node) that defines a component or markdown file
+        if (route.file and route.file.suffix == ".md") or route.component:
             level_max = level
+            break
+
     route_current = router.path_routes[level_max]
     routes_siblings = router.path_routes_siblings[level_max]
     routes_siblings_index = routes_siblings.index(route_current)
+
     # if no layouts are found, we use the default layout
     if layouts == []:
         layouts = [DefaultLayout]
-    if route_current.data is None and route_current.module is None and route_current.component is None:
-        return solara.Error(f"Page not found: {router.path}, route does not link to a path or module or component")
+
+    if route_current.component is None and route_current.module is None and (route_current.file is None or route_current.file.suffix != ".md"):
+        return solara.Error(f"Page not found: {router.path}, route does not link to a (markdown) path or module or component")
 
     def wrap_in_layouts(element: reacton.core.Element, layouts):
         for Layout in reversed(layouts):
@@ -182,9 +191,10 @@ def RenderPage(main_name: str = "Page"):
         else:
             return []
 
-    if isinstance(route_current.data, Path):
+    if str(route_current.file).endswith(".md") or isinstance(route_current.data, Path):
         path = cast(Path, route_current.data)
         if path.suffix == ".md":
+            component = route_current.component or solara.Markdown
             with solara.HBox() as navigation:
                 if routes_siblings_index > 0:
                     prev = routes_siblings[routes_siblings_index - 1]
@@ -204,9 +214,11 @@ def RenderPage(main_name: str = "Page"):
                         solara.Button(
                             icon_name="mdi-pencil", icon=True, href=url, target="_blank", style={"position": "absolute", "top": "0px", "right": "0px"}
                         )
-                    solara.Markdown(path.read_text(), unsafe_solara_execute=True)
+                    # solara.Markdown(path.read_text(), unsafe_solara_execute=True)
+                    component(path.read_text(), unsafe_solara_execute=True)
             else:
-                content = solara.Markdown(path.read_text(), unsafe_solara_execute=True)
+                # content = solara.Markdown(path.read_text(), unsafe_solara_execute=True)
+                content = component(path.read_text(), unsafe_solara_execute=True)
 
             main = solara.Div(
                 classes=["solara-autorouter-content"],
@@ -224,9 +236,6 @@ def RenderPage(main_name: str = "Page"):
         title_element = solara.Title(title)
         module = None
         Page = route_current.component
-        # translate the default RenderPage as no value given (None)
-        if Page is RenderPage:
-            Page = None
         if route_current.module is not None and (Page is None):
             # if not a custom component is given, we try to find a Page component
             # in the module
@@ -239,9 +248,6 @@ def RenderPage(main_name: str = "Page"):
                 Page = namespace.get("page", namespace.get("app", Page))
                 Page = nested_get(namespace, main_name, Page)
 
-        if Page is None and route_current.children:
-            # we we did not get a component, but we recursively render
-            Page = RenderPage
         if isinstance(Page, ipywidgets.Widget):
             # If we have a widget, we need to execute this again for each
             # connection, since we cannot share widgets between connections/users.
@@ -291,12 +297,12 @@ def RenderPage(main_name: str = "Page"):
             main = wrap_in_layouts(main, layouts)
         else:
             if route_current.module:
-                path = route_current.module.__file__
+                path_str = route_current.module.__file__
                 local_scope = route_current.module.__dict__
                 ignore = ["display"]
                 options = [k for k in list(local_scope) if k not in ignore and not k.startswith("_")]
                 matches = difflib.get_close_matches(main_name, options)
-                msg = f"No object with name {main_name} found for {path}"
+                msg = f"No object with name {main_name} found for {path_str}"
                 if matches:
                     msg += " Did you mean: " + " or ".join(map(repr, matches))
                 else:
@@ -347,17 +353,22 @@ def get_title(module: ModuleType, required=True):
     return title
 
 
-def fix_route(route: solara.Route, new_file: Path) -> solara.Route:
+def fix_route(route: solara.Route, new_file: Path, new_layout=None) -> solara.Route:
     file = route.file or new_file
+    layout = route.layout or new_layout
     children = fix_routes(route.children, new_file) if route.children else []
 
-    return dataclasses.replace(route, file=file, children=children)
+    return dataclasses.replace(route, file=file, children=children, layout=layout)
 
 
-def fix_routes(routes: List[solara.Route], new_file: Path):
+def fix_routes(routes: List[solara.Route], new_file: Path, new_layout=None):
     new_routes = []
     for route in routes:
-        new_routes.append(fix_route(route, new_file))
+        if route.path == "/":
+            route = fix_route(route, new_file, new_layout)
+        else:
+            route = fix_route(route, new_file)
+        new_routes.append(route)
     return new_routes
 
 
@@ -370,7 +381,7 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
     files are not Python modules.
 
 
-    See [our multipage guide](/docs/howto/multipage#as-a-package) for more details.
+    See [our multipage guide](/documentation/advanced/howto/multipage#as-a-package) for more details.
 
 
     """
@@ -378,6 +389,7 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
 
     assert module.__file__ is not None
     routes = []
+    children: List[solara.Route]
     file = Path(module.__file__)
 
     if module.__file__.endswith("__init__.py"):
@@ -391,13 +403,14 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
         title = get_title(module)
         children = getattr(module, "routes", [])
         if hasattr(module, "Page"):
-            routes.append(solara.Route(path="/", component=RenderPage, data=module, module=module, layout=layout, children=children, label=title, file=file))
+            routes.append(
+                solara.Route(path="/", component=get_page(module), data=module, module=module, layout=layout, children=children, label=title, file=file)
+            )
 
         assert module.__file__ is not None
         reload.reloader.watcher.add_file(module.__file__)
         for info in pkgutil.iter_modules([str(Path(module.__file__).parent)]):
             submod = importlib.import_module(module.__name__ + f".{info.name}")
-            subfile = Path(submod.__file__) if submod.__file__ is not None else None
             title = get_title(submod)
 
             name = info.name
@@ -405,7 +418,11 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
             # however, this may break things.
             # name = name.replace("_", "-")
             if info.ispkg:
-                route = solara.Route(name, component=RenderPage, children=generate_routes(submod), module=submod, layout=None, label=title)
+                # we are in a package, like 'portal/solara_portal/pages', not the module itself
+                # (e.g. portal/solara_portal/pages/__init__.py)
+                # so here name='pages', and the children will come from the submodules
+                children = generate_routes(submod)
+                route = solara.Route(name, component=None, children=children, module=submod, layout=None, label=title)
                 # skip empty subpackages
                 if len(route.children) == 0:
                     continue
@@ -413,11 +430,7 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
                 # skip empty modules
                 if get_renderable(submod) is None and not hasattr(submod, "routes"):
                     continue
-                children = getattr(submod, "routes", [])
-                if subfile:
-                    children = fix_routes(children, subfile)
-                module_layout = getattr(submod, "Layout", None)
-                route = solara.Route(name, component=RenderPage, module=submod, layout=module_layout, children=children, label=title, file=subfile)
+                route = _generate_route(name, submod)
             routes.append(route)
         if route_order:
             lookup = {k.path: k for k in routes}
@@ -429,17 +442,12 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
                 warnings.warn(f"Some routes are not in route_order: {set(lookup) - set(route_order)}")
 
     else:
-        children = getattr(module, "routes", [])
-        children = fix_routes(children, file)
-        layout = getattr(module, "Layout", None)
-        # children = []
-        # single module, single route
-        return [solara.Route(path="/", component=RenderPage, data=None, module=module, label=get_title(module), layout=layout, children=children, file=file)]
+        return [_generate_route("/", module)]
 
     return routes
 
 
-def generate_routes_directory(path: Path) -> List[solara.Route]:
+def generate_routes_directory(path: Path, markdown_component=None) -> List[solara.Route]:
     """Generate routes for a directory.
 
     This is a recursive function that will generate routes for all
@@ -451,7 +459,7 @@ def generate_routes_directory(path: Path) -> List[solara.Route]:
     Python files ending in .py, or Jupyter notebooks ending in .ipynb
     will be executed and its `Page` component will be rendered.
 
-    Automatic titles will be [generated as explained in the multipage guide](/docs/howto/multipage).
+    Automatic titles will be [generated as explained in the multipage guide](/documentation/advanced/howto/multipage).
 
     """
 
@@ -472,13 +480,13 @@ def generate_routes_directory(path: Path) -> List[solara.Route]:
             continue
         if subpath.stem.startswith("_") or subpath.stem.startswith("."):
             continue
-        route = _generate_route_path(subpath, layout=layout, first=first, has_index=has_index)
+        route = _generate_route_path(subpath, layout=layout, first=first, has_index=has_index, markdown_component=markdown_component)
         first = False
         routes.append(route)
     return routes
 
 
-def _generate_route_path(subpath: Path, layout=None, first=False, has_index=False, initial_namespace={}) -> solara.Route:
+def _generate_route_path(subpath: Path, layout=None, first=False, has_index=False, initial_namespace={}, markdown_component=None) -> solara.Route:
     from .server import reload
 
     name = subpath.stem
@@ -491,23 +499,47 @@ def _generate_route_path(subpath: Path, layout=None, first=False, has_index=Fals
         route_path = "/"
     else:
         route_path = "-".join([k.lower() for k in title_parts])
-    # used as a 'sentinel' to find the deepest level of the route tree we need to render in 'RenderPage'
-    component = RenderPage
-    children = []
+    component = None
+    children: List[solara.Route] = []
     module: Optional[ModuleType] = None
     data: Any = None
     module_layout = layout if first else None
     if subpath.suffix == ".md":
         data = subpath
+        component = markdown_component
         reload.reloader.watcher.add_file(subpath)
     elif subpath.is_dir():
-        children = generate_routes_directory(subpath)
+        children = generate_routes_directory(subpath, markdown_component=markdown_component)
     else:
         reload.reloader.watcher.add_file(subpath)
         module = source_to_module(subpath, initial_namespace=initial_namespace)
-        title = get_title(module)
-        children = getattr(module, "routes", children)
-        children = fix_routes(children, subpath)
-        module_layout = getattr(module, "Layout", module_layout)
-    route = solara.Route(route_path, component=component, module=module, label=title, children=children, data=data, layout=module_layout, file=subpath)
+        return _generate_route(route_path, module, default_layout=module_layout)
+    route = solara.Route(route_path, component=component, module=module, label=title, children=children, data=data, layout=layout, file=subpath)
     return route
+
+
+def _generate_route(route_path: str, module: ModuleType, default_layout=None, data=None) -> solara.Route:
+    path = Path(module.__file__) if module.__file__ is not None else None
+    title = get_title(module)
+    layout = getattr(module, "Layout", default_layout)
+    if inspect.isclass(layout) and issubclass(layout, ipywidgets.Layout):
+        layout = None
+    component = None
+    children = getattr(module, "routes", [])
+    root_route = get_root(children)
+    # if we have no children or the children have no explicit root component (at '/')
+    if not children or (root_route and root_route.component is None):
+        component = get_page(module, required=False)
+    if root_route and component and root_route.component and component is not root_route.component:
+        warnings.warn(
+            f"In {path}, you defined a Page component, but also a component on the root route (with path='/') "
+            "which is not equal to the Page component at the module level. This is not recommended."
+        )
+    return solara.Route(route_path, component=component, module=module, label=title, children=children, data=data, layout=layout, file=path)
+
+
+def get_root(routes: List[solara.Route]) -> Optional[solara.Route]:
+    for route in routes:
+        if route.path == "/":
+            return route
+    return None

{solara-1.29.1 → solara-1.30.1}/solara/cache.py

@@ -221,7 +221,7 @@ def memoize(
     memory content.
 
     The storage can be any object that implements the MutableMapping interface, for instance a dict or
-    a cachetools.LRUCache. Or a new instance of `solara.cache.Memory`, see [caching](/docs/reference/caching)
+    a cachetools.LRUCache. Or a new instance of `solara.cache.Memory`, see [caching](/documentation/getting_started/reference/caching)
     for cache storage options.
 
     The return value of the decorator behaves like the original function, but also has a few attributes:
@@ -233,7 +233,7 @@ def memoize(
         If the value is already cached, the function will not be executed in a thread.
 
 
-    See also the [reference on caching](/docs/reference/caching) for more caching details.
+    See also the [reference on caching](/documentation/getting_started/reference/caching) for more caching details.
 
     """
 

{solara-1.29.1 → solara-1.30.1}/solara/checks.html

@@ -60,7 +60,7 @@
                     const div = document.createElement("div")
                     const div2 = document.createElement("div")
                     div.innerHTML = `Run <code>${jupyter_python_executable} -m pip install ${needsInstall.join(" ")}</code>. Refresh the page after installation.`
-                    div2.innerHTML = `Visit <a href="https://solara.dev/docs/troubleshoot" target="_blank">https://solara/dev/docs/troubleshoot</a> for more information.`
+                    div2.innerHTML = `Visit <a href="https://solara.dev/documentation/getting_started/troubleshoot" target="_blank">https://solara/dev/documentation/getting_started/troubleshoot</a> for more information.`
                     rootEl.appendChild(div)
                     rootEl.appendChild(div2)
                 }

{solara-1.29.1 → solara-1.30.1}/solara/components/__init__.py

@@ -46,7 +46,7 @@ from .echarts import FigureEcharts  # noqa: #F401 F403
 from .figure_altair import FigureAltair, AltairChart  # noqa: #F401 F403
 from .meta import Meta  # noqa: #F401 F403
 from .columns import Columns, ColumnsResponsive  # noqa: #F401 F403
-from .file_drop import FileDrop  # noqa: #F401 F403
+from .file_drop import FileDrop, FileDropMultiple  # noqa: #F401 F403
 from .file_download import FileDownload  # noqa: #F401 F403
 from .tooltip import Tooltip  # noqa: #F401 F403
 from .card import Card, CardActions  # noqa: #F401 F403

{solara-1.29.1 → solara-1.30.1}/solara/components/applayout.py

@@ -90,7 +90,7 @@ def AppBar(children=[]):
 
     This component does not need to be a direct child of the AppLayout, it can be at any level in your component tree.
 
-    If a [Tabs](/api/tabs) component is used as direct child of the app bar, it will be shown under the app bar.
+    If a [Tabs](/documentation/components/lab/tabs) component is used as direct child of the app bar, it will be shown under the app bar.
 
     ## Example showing an app bar
     ```solara
@@ -204,11 +204,11 @@ def AppLayout(
 ):
     """The default layout for Solara apps. It consists of an toolbar bar, a sidebar and a main content area.
 
-     * The title of the app is set using the [Title](/api/title) component.
-     * The sidebar content is set using the [Sidebar](/api/sidebar) component.
+     * The title of the app is set using the [Title](/documentation/components/page/title) component.
+     * The sidebar content is set using the [Sidebar](/documentation/components/layout/sidebar) component.
      * The content is set by the `Page` component provided by the user.
 
-    This component is usually not used directly, but rather through via the [Layout system](/docs/howto/layout).
+    This component is usually not used directly, but rather through via the [Layout system](/documentation/advanced/howto/layout).
 
     The sidebar is only added when the AppLayout has more than one child.
 
@@ -224,7 +224,7 @@ def AppLayout(
 
      * `children`: The children of the AppLayout. The first child is used as the sidebar content, the rest as the main content.
      * `sidebar_open`: Whether the sidebar is open or not.
-     * `title`: The title of the app shown in the app bar, can also be set using the [Title](/api/title) component.
+     * `title`: The title of the app shown in the app bar, can also be set using the [Title](/documentation/components/page/title) component.
      * `toolbar_dark`: Whether the toolbar should be dark or not.
      * `navigation`: Whether the navigation tabs based on routing should be shown.
      * `color`: The color of the toolbar.

{solara-1.29.1 → solara-1.30.1}/solara/components/button.py

@@ -1,10 +1,9 @@
 from typing import Callable, Dict, List, Optional, Union
 
-from reacton import ipyvue
-from reacton import ipyvuetify as v
-
 import solara
 import solara.util
+from reacton import ipyvue
+from reacton import ipyvuetify as v
 
 
 @solara.component
@@ -51,7 +50,8 @@ def Button(
     - `disabled`: Whether the button is disabled.
     - `text`: Whether the button should be displayed as text, it has no shadow and no background.
     - `outlined`: Whether the button should be displayed as outlined, it has no background.
-    - `value`: (Optional) When used as a child of a ToggleButtons component, the value of the selected button, see [ToggleButtons](/api/togglebuttons).
+    - `value`: (Optional) When used as a child of a ToggleButtons component, the value of the selected button, see
+        [ToggleButtons](/documentation/components/input/togglebuttons).
     - `classes`: Additional CSS classes to apply.
     - `style`: CSS style to apply.
 

{solara-1.29.1 → solara-1.30.1}/solara/components/card.py

@@ -1,7 +1,6 @@
 from typing import Dict, List, Optional, Union
 
 import reacton.ipyvuetify as v
-
 import solara
 from solara.util import _combine_classes
 
@@ -79,7 +78,7 @@ def Card(
 def CardActions(children: List[solara.Element] = []):
     """Container for actions in a card.
 
-    See [Card](/api/card) for an example.
+    See [Card](/documentation/components/layout/card) for an example.
 
     # Arguments
 

{solara-1.29.1 → solara-1.30.1}/solara/components/component_vue.py

@@ -20,8 +20,8 @@ def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Ca
         if name.startswith("event_"):
             event_name = name[6:]
 
-            def event_handler(self, data, buffers=None, event_name=event_name):
-                callback = self._event_callbacks.get(event_name)
+            def event_handler(self, data, buffers=None, event_name=event_name, param=param):
+                callback = self._event_callbacks.get(event_name, param.default)
                 if callback:
                     if buffers:
                         callback(data, buffers)
@@ -29,14 +29,15 @@ def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Ca
                         callback(data)
 
             classprops[f"vue_{event_name}"] = event_handler
-        if name.startswith("on_") and name[3:] in parameters:
+        elif name.startswith("on_") and name[3:] in parameters:
             # callback, will be handled by reacton
             continue
-        if param.default == inspect.Parameter.empty:
-            trait = traitlets.Any()
         else:
-            trait = traitlets.Any(default_value=param.default)
-        classprops[name] = trait.tag(sync=True, **widgets.widget_serialization)
+            if param.default == inspect.Parameter.empty:
+                trait = traitlets.Any()
+            else:
+                trait = traitlets.Any(default_value=param.default)
+            classprops[name] = trait.tag(sync=True, **widgets.widget_serialization)
     # maps event_foo to a callable
     classprops["_event_callbacks"] = traitlets.Dict(default_value={})
 
@@ -78,7 +79,7 @@ def component_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]],
     [See the vue v2 api](https://v2.vuejs.org/v2/api/) for more information on how to use Vue, like `watch`,
     `methods` and lifecycle hooks such as `mounted` and `destroyed`.
 
-    See the [Vue component example](/examples/general/vue_component) for an example of how to use this decorator.
+    See the [Vue component example](/documentation/examples/general/vue_component) for an example of how to use this decorator.
 
     ## Arguments