reorganize + misc simplifications + test coverage

Author: rmorshea

examples/chart.js

@@ -13,13 +13,7 @@ export default {
         domainPadding=${20}
       >
         <${VictoryBar}
-          data=${[
-            { x: 1, y: 2 },
-            { x: 2, y: 4 },
-            { x: 3, y: 7 },
-            { x: 4, y: 3 },
-            { x: 5, y: 5 },
-          ]}
+          data=${props.data}
           dataComponent=${html`
             <${Bar}
               events=${{

examples/introduction.ipynb

@@ -80,6 +80,7 @@
     "\n",
     "def display(element, *args, **kwargs):\n",
     "    view_id = mount(element, *args, **kwargs)\n",
+    "    print(f\"View ID: {view_id}\")\n",
     "    return idom.display(\"jupyter\", server_url, {\"view_id\": view_id})"
    ]
   },
@@ -296,6 +297,15 @@
     "for the `mu` and `sigma` inputs to be the same."
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import inspect"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -351,11 +361,11 @@
     "    var = idom.Var(value)\n",
     "\n",
     "    inputs = []\n",
-    "    for t in types:\n",
-    "        inp = idom.Input(t, value, **attributes)\n",
+    "    for tp in types:\n",
+    "        inp = idom.Input(tp, value, attributes, cast=float)\n",
     "\n",
     "        @inp.events.on(\"change\")\n",
-    "        async def on_change(inp, event):\n",
+    "        async def on_change(event, inp=inp):\n",
     "            for i in inputs:\n",
     "                i.update(inp.value)\n",
     "            var.set(inp.value)\n",
@@ -673,9 +683,10 @@
    "source": [
     "print(\"It may take a moment to download and install Victory... 🕒\")\n",
     "\n",
-    "victory = idom.Import(\"victory\", fallback=\"loading...\", install=True)\n",
+    "victory = idom.Module(\"victory\", install=True)\n",
+    "VictoryBar = victory.Import(\"VictoryBar\")\n",
     "\n",
-    "display(victory.VictoryBar, {\"style\": {\"parent\": {\"width\": \"500px\"}}})"
+    "display(VictoryBar, {\"style\": {\"parent\": {\"width\": \"500px\"}}})"
    ]
   },
   {
@@ -697,14 +708,23 @@
    "source": [
     "print(\"Click the bars to see event data printed in Python 👇\")\n",
     "\n",
-    "chart = idom.widgets.define_module(\"chart\", \"chart.js\")\n",
+    "with open(\"chart.js\") as f:\n",
+    "    ClickableChart = idom.Module(\"chart\", source=f).Import(\"ClickableChart\")\n",
     "\n",
     "async def handle_event(event):\n",
     "    print(event)\n",
     "\n",
+    "data = [\n",
+    "    {\"x\": 1, \"y\": 2},\n",
+    "    {\"x\": 2, \"y\": 4},\n",
+    "    {\"x\": 3, \"y\": 7},\n",
+    "    {\"x\": 4, \"y\": 3},\n",
+    "    {\"x\": 5, \"y\": 5},\n",
+    "]\n",
+    "\n",
     "display(\n",
-    "    chart.ClickableChart,\n",
-    "    {\"onClick\": handle_event, \"style\": {\"parent\": {\"width\": \"500px\"}}}\n",
+    "    ClickableChart,\n",
+    "    {\"data\": data, \"onClick\": handle_event, \"style\": {\"parent\": {\"width\": \"500px\"}}}\n",
     ")"
    ]
   },

idom/__init__.py

@@ -7,11 +7,11 @@
 from .core.layout import Layout
 from .core.vdom import vdom
 
+from .widgets.input import Input
 from .widgets.html import html
-from .widgets.common import hotswap, Import
+from .widgets.utils import Module, Import, hotswap, multiview
 from .widgets.display import display
-from .widgets.inputs import Input
-from .widgets.images import Image
+from .widgets.image import Image
 
 from .tools import Var, html_to_vdom
 
@@ -42,8 +42,10 @@
     "Var",
     "vdom",
     "Image",
+    "Module",
     "Import",
     "hotswap",
+    "multiview",
     "display",
     "Input",
     "html_to_vdom",

idom/client/__init__.py

@@ -14,31 +14,42 @@
 WEB_MODULES = CLIENT_DIR / "web_modules"
 
 
-def import_path(name: str) -> str:
+def core_module(name: str) -> str:
+    path = f"../{CORE_MODULES.name}/{name}.js"
+    if not core_module_exists(name):
+        raise ValueError(f"Module '{path}' does not exist.")
+    return path
+
+
+def core_module_exists(name: str) -> bool:
+    return _find_module_os_path(CORE_MODULES, name) is not None
+
+
+def web_module(name: str) -> str:
     path = f"../{WEB_MODULES.name}/{name}.js"
-    if not module_exists(name):
+    if not web_module_exists(name):
         raise ValueError(f"Module '{path}' does not exist.")
     return path
 
 
-def define_module(name: str, source: str) -> str:
+def web_module_exists(name: str) -> bool:
+    return _find_module_os_path(WEB_MODULES, name) is not None
+
+
+def define_web_module(name: str, source: str) -> str:
     path = _create_web_module_os_path(name)
     with path.open("w+") as f:
         f.write(source)
-    return import_path(name)
+    return web_module(name)
 
 
-def delete_module(name: str) -> None:
-    path = _find_web_module_os_path(name)
+def delete_web_module(name: str) -> None:
+    path = _find_module_os_path(WEB_MODULES, name)
     if path is None:
         raise ValueError(f"Module '{name}' does not exist.")
     _delete_os_paths(path)
 
 
-def module_exists(name: str) -> bool:
-    return _find_web_module_os_path(name) is not None
-
-
 def install(dependencies: Dict[str, str]) -> None:
     pkg = _package_json()
 
@@ -98,8 +109,7 @@ def _run_subprocess(args: List[str], cwd: Union[str, Path]):
         raise
 
 
-def _find_web_module_os_path(name: str) -> Optional[Path]:
-    path = WEB_MODULES
+def _find_module_os_path(path: Path, name: str) -> Optional[Path]:
     for name_part in name.split("/"):
         if not path.is_dir():
             return None

idom/core/element.py

@@ -14,6 +14,7 @@
     overload,
     Awaitable,
     Union,
+    overload,
 )
 
 
@@ -115,7 +116,11 @@ async def unmount(self) -> None:
         """
         self._layout = None
 
-    def _update_layout(self) -> None:
+    # FIXME: https://github.com/python/mypy/issues/5876
+    update: Callable[..., Any]
+
+    def update(self) -> None:  # type: ignore
+        """Schedule this element to be rendered again soon."""
         if self._layout is not None:
             self._layout.update(self)
 
@@ -184,7 +189,7 @@ def update(self, *args: Any, **kwargs: Any) -> None:
             self._state = {}
             self._state_updated = True
             self._cancel_animation()
-            self._update_layout()
+            super().update()
         bound = self._function_signature.bind_partial(None, *args, **kwargs)
         self._state.update(list(bound.arguments.items())[1:])
 

idom/core/events.py

@@ -1,5 +1,3 @@
-from weakref import proxy, CallableProxyType
-from functools import partial
 from typing import (
     Mapping,
     Dict,
@@ -11,7 +9,6 @@
     Awaitable,
     Union,
 )
-from .element import AbstractElement
 
 
 EventsMapping = Union[
@@ -66,13 +63,10 @@ class Events(Mapping[str, "EventHandler"]):
     Assign this object to the ``"eventHandlers"`` field of an element model.
     """
 
-    __slots__ = ("_handlers", "_bound")
+    __slots__ = "_handlers"
 
-    def __init__(self, bound: Optional[AbstractElement] = None) -> None:
+    def __init__(self) -> None:
         self._handlers: Dict[str, EventHandler] = {}
-        self._bound: Optional[CallableProxyType] = None
-        if bound is not None:
-            self._bound = proxy(bound)
 
     def on(
         self, event: str, stop_propagation: bool = False, prevent_default: bool = False
@@ -118,8 +112,6 @@ def handler(event):
             handler = self._handlers[event_name]
 
         def setup(function: EventHandlerFunction) -> EventHandlerFunction:
-            if self._bound is not None:
-                function = partial(function, self._bound)
             handler.add(function)
             return function