solara 1.29.0__py2.py3-none-any.whl → 1.30.0__py2.py3-none-any.whl

solara/__init__.py

@@ -1,5 +1,5 @@
 """Build webapps using IPywidgets"""
-__version__ = "1.29.0"
+__version__ = "1.30.0"
 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/__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/autorouting.py

@@ -123,15 +123,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 +143,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(level_max + 1):
         # 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,8 +156,12 @@ 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:
-            level_max = level
+        # used in for example the docs for use_route, only the route path are specified,
+        # nothing else, which means we will not follow that route path, but limit it to rendering
+        # router.path_routes[level_max] instead. It's assumed that component (Page) will continue
+        # handling the rest of the routing
+        if route.data is None and route.module is None and route.component is None:
+            level_max = level - 1
     route_current = router.path_routes[level_max]
     routes_siblings = router.path_routes_siblings[level_max]
     routes_siblings_index = routes_siblings.index(route_current)
@@ -224,9 +226,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 +238,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 +287,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 +343,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 +371,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 +379,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,7 +393,9 @@ 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__)
@@ -405,7 +409,9 @@ 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)
+                route = solara.Route(
+                    name, component=get_page(submod, required=False), children=generate_routes(submod), module=submod, layout=None, label=title
+                )
                 # skip empty subpackages
                 if len(route.children) == 0:
                     continue
@@ -417,7 +423,9 @@ def generate_routes(module: ModuleType) -> List[solara.Route]:
                 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 = solara.Route(
+                    name, component=get_page(submod, required=False), module=submod, layout=module_layout, children=children, label=title, file=subfile
+                )
             routes.append(route)
         if route_order:
             lookup = {k.path: k for k in routes}
@@ -429,12 +437,27 @@ 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)]
+        children = []
+        if hasattr(module, "routes"):
+            children = getattr(module, "routes", [])
+            root = get_root(children)
+            if layout is not None and root is not None and root.layout is None:
+                warnings.warn(f'You defined routes in {file}, in this case, layout should be set on the root route (with path="/"), not on the module level')
+                layout = None
+        children = fix_routes(children, file, layout)
+        return [
+            solara.Route(
+                path="/",
+                component=get_page(module, required=False),
+                data=None,
+                module=module,
+                label=get_title(module),
+                layout=layout,
+                children=children,
+                file=file,
+            )
+        ]
 
     return routes
 
@@ -451,7 +474,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).
 
     """
 
@@ -491,9 +514,8 @@ 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
@@ -506,8 +528,27 @@ def _generate_route_path(subpath: Path, layout=None, first=False, has_index=Fals
         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)
+        layout = getattr(module, "Layout", module_layout)
+        root = get_root(children)
+        if hasattr(module, "routes"):
+            children = getattr(module, "routes", [])
+            root = get_root(children)
+            if layout is not None and root is not None and root.layout is None:
+                warnings.warn(f'You defined routes in {subpath}, in this case, layout should be set on the root route (with path="/"), not on the module level')
+                layout = None
+        children = fix_routes(children, subpath, layout)
+        component = get_page(module, required=False)
+        if root and component and root.component and component is not root.component:
+            warnings.warn(
+                f"In {subpath}, 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."
+            )
+    route = solara.Route(route_path, component=component, module=module, label=title, children=children, data=data, layout=layout, file=subpath)
     return route
+
+
+def get_root(routes: List[solara.Route]) -> Optional[solara.Route]:
+    for route in routes:
+        if route.path == "/":
+            return route
+    return None

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/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/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/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/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/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/components/component_vue.py

@@ -78,7 +78,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
 

solara/components/cross_filter.py

@@ -3,9 +3,8 @@ from typing import Any, List, cast
 
 import ipyvuetify
 import reacton.ipyvuetify as v
-import traitlets
-
 import solara
+import traitlets
 from solara import CellAction, ColumnAction
 
 from ..lab.hooks.dataframe import use_df_column_names
@@ -55,7 +54,7 @@ def CrossFilterSelect(
 ):
     """A Select widget that will cross filter a DataFrame.
 
-    See [use_cross_filter](/api/use_cross_filter) for more information about how to use cross filtering.
+    See [use_cross_filter](/documentation/api/hooks/use_cross_filter) for more information about how to use cross filtering.
 
     ## Arguments
 
@@ -170,7 +169,7 @@ def CrossFilterReport(df, classes: List[str] = []):
 
     Shows number of rows filtered, and the total number of rows.
 
-    See [use_cross_filter](/api/use_cross_filter) for more information about how to use cross filtering.
+    See [use_cross_filter](/documentation/api/hooks/use_cross_filter) for more information about how to use cross filtering.
 
     ## Arguments
 
@@ -214,7 +213,7 @@ def CrossFilterSlider(
 ):
     """A Slider widget that will cross filter a DataFrame.
 
-    See [use_cross_filter](/api/use_cross_filter) for more information about how to use cross filtering.
+    See [use_cross_filter](/documentation/api/hooks/use_cross_filter) for more information about how to use cross filtering.
 
     ## Arguments
 
@@ -318,9 +317,9 @@ def CrossFilterSlider(
 def CrossFilterDataFrame(df, items_per_page=20, column_actions: List[ColumnAction] = [], cell_actions: List[CellAction] = [], scrollable=False):
     """Display a DataFrame with filters applied from the cross filter.
 
-    This component wraps [DataFrame](/api/dataframe).
+    This component wraps [DataFrame](/documentation/components/data/dataframe).
 
-    See [use_cross_filter](/api/use_cross_filter) for more information about how to use cross filtering.
+    See [use_cross_filter](/documentation/api/hooks/use_cross_filter) for more information about how to use cross filtering.
 
     # Arguments
 

solara/components/datatable.py

@@ -6,11 +6,10 @@ from typing import Callable, List, Optional
 
 import ipyvuetify as v
 import ipywidgets
-import traitlets
-
 import solara
 import solara.hooks.dataframe
 import solara.lab
+import traitlets
 from solara.lab.hooks.dataframe import use_df_column_names
 from solara.lab.utils.dataframe import df_type
 
@@ -208,7 +207,7 @@ def DataFrame(
      * `cell_actions` -  Triggered via clicking on the triple dot icon in the cell (visible when hovering).
      * `on_column_header_hover` - Optional callback when the user hovers over the triple dot icon on a header.
      * `column_header_info` - Element to display in the column menu popup (visible when hovering), provide an
-            empty container element (like [Column](/api/column)) to force showing the trigle dot icon (see example).
+            empty container element (like [Column](/documentation/components/layout/column)) to force showing the trigle dot icon (see example).
 
     """
     return DataTable(

solara/components/figure_altair.py

@@ -12,7 +12,7 @@ def FigureAltair(
 ):
     """Renders an Altair chart using VegaLite.
 
-    See also [our altair example](/examples/libraries/altair).
+    See also [our altair example](/documentation/examples/libraries/altair).
 
     ## Arguments
 

solara/components/file_download.py

@@ -144,8 +144,8 @@ def FileDownload(
     ## Note on file size
 
     Note that the data will be kept in memory when downloading.
-    If the file is large (>10 MB), and when using [Solara server](/docs/understanding), we recommend using the
-    [static files directory](/docs/reference/static-files) instead.
+    If the file is large (>10 MB), and when using [Solara server](/documentation/advanced/understanding/solara-server), we recommend using the
+    [static files directory](/documentation/getting_started/reference/static-files) instead.
 
     """
     request_download, set_request_download = solara.use_state(False)

solara/components/file_drop.py

@@ -1,6 +1,6 @@
 import threading
 import typing
-from typing import Callable, Optional, cast
+from typing import Callable, List, Optional, Union, cast
 
 import traitlets
 from ipyvue import Template
@@ -25,45 +25,26 @@ class FileDropZone(FileInput):
     template_file = (__file__, "file_drop.vue")
     items = traitlets.List(default_value=[]).tag(sync=True)
     label = traitlets.Unicode().tag(sync=True)
+    multiple = traitlets.Bool(True).tag(sync=True)
 
 
 @solara.component
-def FileDrop(
-    label="Drop file here",
+def _FileDrop(
+    label="Drop file(s) here",
     on_total_progress: Optional[Callable[[float], None]] = None,
-    on_file: Optional[Callable[[FileInfo], None]] = None,
+    on_file: Optional[Callable[[Union[FileInfo, List[FileInfo]]], None]] = None,
     lazy: bool = True,
+    multiple: bool = False,
 ):
-    """Region a user can drop a file into for file uploading.
-
-    If lazy=True, no file content will be loaded into memory,
-    nor will any data be transferred by default.
-    A file object is passed to the `on_file` callback, and data will be transferred
-    when needed.
-
-    If lazy=False, the file content will be loaded into memory and passed to the `on_file` callback via the `.data` attribute.
-
-    The on_file callback takes the following argument type:
-    ```python
-    class FileInfo(typing.TypedDict):
-        name: str  # file name
-        size: int  # file size in bytes
-        file_obj: typing.BinaryIO
-        data: Optional[bytes]: bytes  # only present if lazy=False
-    ```
-
-
-    ## Arguments
-     * `on_total_progress`: Will be called with the progress in % of the file upload.
-     * `on_file`: Will be called with a `FileInfo` object, which contains the file `.name`, `.length` and a `.file_obj` object.
-     * `lazy`: Whether to load the file content into memory or not. If `False`,
-        the file content will be loaded into memory and passed to the `on_file` callback via the `.data` attribute.
+    """Generic implementation used by FileDrop and FileDropMultiple.
 
+    If multiple=True, multiple files can be uploaded.
     """
+
     file_info, set_file_info = solara.use_state(None)
     wired_files, set_wired_files = solara.use_state(cast(Optional[typing.List[FileInfo]], None))
 
-    file_drop = FileDropZone.element(label=label, on_total_progress=on_total_progress, on_file_info=set_file_info)  # type: ignore
+    file_drop = FileDropZone.element(label=label, on_total_progress=on_total_progress, on_file_info=set_file_info, multiple=multiple)  # type: ignore
 
     def wire_files():
         if not file_info:
@@ -83,14 +64,76 @@ def FileDrop(
         if not wired_files:
             return
         if on_file:
-            if not lazy:
-                wired_files[0]["data"] = wired_files[0]["file_obj"].read()
+            for i in range(len(wired_files)):
+                if not lazy:
+                    wired_files[i]["data"] = wired_files[i]["file_obj"].read()
+                else:
+                    wired_files[i]["data"] = None
+            if multiple:
+                on_file(wired_files)
             else:
-                wired_files[0]["data"] = None
-            on_file(wired_files[0])
+                on_file(wired_files[0])
 
     result: solara.Result = hooks.use_thread(handle_file, [wired_files])
     if result.error:
         raise result.error
 
     return file_drop
+
+
+@solara.component
+def FileDrop(
+    label="Drop file here",
+    on_total_progress: Optional[Callable[[float], None]] = None,
+    on_file: Optional[Callable[[FileInfo], None]] = None,
+    lazy: bool = True,
+):
+    """Region a user can drop a file into for file uploading.
+
+    If lazy=True, no file content will be loaded into memory,
+    nor will any data be transferred by default.
+    If lazy=False, file content will be loaded into memory and passed to the `on_file` callback via the `FileInfo.data` attribute.
+
+
+    A file object is of the following argument type:
+    ```python
+    class FileInfo(typing.TypedDict):
+        name: str  # file name
+        size: int  # file size in bytes
+        file_obj: typing.BinaryIO
+        data: Optional[bytes]: bytes  # only present if lazy=False
+    ```
+
+
+    ## Arguments
+     * `on_total_progress`: Will be called with the progress in % of the file upload.
+     * `on_file`: Will be called with a `FileInfo` object, which contains the file `.name`, `.length` and a `.file_obj` object.
+     * `lazy`: Whether to load the file contents into memory or not. If `False`,
+        the file contents will be loaded into memory via the `.data` attribute of file object(s).
+
+    """
+
+    return _FileDrop(label=label, on_total_progress=on_total_progress, on_file=on_file, lazy=lazy, multiple=False)
+
+
+@solara.component
+def FileDropMultiple(
+    label="Drop files here",
+    on_total_progress: Optional[Callable[[float], None]] = None,
+    on_file: Optional[Callable[[List[FileInfo]], None]] = None,
+    lazy: bool = True,
+):
+    """Region a user can drop multiple files into for file uploading.
+
+    Almost identical to `FileDrop` except that multiple files can be dropped and `on_file` is called
+    with a list of `FileInfo` objects.
+
+    ## Arguments
+     * `on_total_progress`: Will be called with the progress in % of the file(s) upload.
+     * `on_file`: Will be called with a `List[FileInfo]`.
+        Each `FileInfo` contains the file `.name`, `.length`, `.file_obj` object, and `.data` attributes.
+     * `lazy`: Whether to load the file contents into memory or not.
+
+    """
+
+    return _FileDrop(label=label, on_total_progress=on_total_progress, on_file=on_file, lazy=lazy, multiple=True)