feat: Support callbacks for box(path=) #76

h2oai · Aug 25, 2022 · 3f29a2e · 3f29a2e
1 parent 2c3ce90
commit 3f29a2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/py/pkg/h2o_nitro/core.py b/py/pkg/h2o_nitro/core.py
@@ -676,6 +676,7 @@ def __init__(
         self._plugins = plugins
         self._locales = locales
         self._default_locale = default_locale or 'en-US'
+        # TODO clone instead? (to account for view-local closures)
         self._delegator = delegator or Delegator()
 
         for options in [self._menu, self._nav, self._hotkeys, self._routes]:
@@ -775,6 +776,7 @@ def _run(self):
                 return
 
     def _write(self, read: bool, b: Box, edit: Edit):
+        self._delegator.scan(b)
         self._send(_marshal(_clean(dict(t=_MsgType.Output, box=b.dump(), edit=edit.dump() if edit else None))))
         if read:
             return self._read(_MsgType.Input)
@@ -910,6 +912,7 @@ async def _read(self, expected: int):
         raise InterruptError()
 
     async def _write(self, read: bool, b: Box, edit: Edit):
+        self._delegator.scan(b)
         await self._send(_marshal(_clean(dict(t=_MsgType.Output, box=b.dump(), edit=edit.dump() if edit else None))))
         if read:
             return await self._read(_MsgType.Input)

diff --git a/web/src/heuristics.ts b/web/src/heuristics.ts
@@ -150,7 +150,7 @@ const determineMode = (box: Box): BoxMode => {
     return 'text'
   }
 
-  if (box.text && !box.style) {
+  if (box.text && !box.path && !box.style) {
     return 'md'
   }
 

diff --git a/web/src/zone.tsx b/web/src/zone.tsx
@@ -116,11 +116,10 @@ export const Zone = ({ context, box }: Container) => {
       onClick = path ? (e: React.MouseEvent<HTMLDivElement>) => {
         jump(path ?? '')
         e.preventDefault()
-      } : undefined,
-      pointer = path ? 'cursor-pointer' : undefined
+      } : undefined
     return (
       <div
-        className={css(flex, pointer, style)}
+        className={css(flex, path ? 'cursor-pointer' : undefined, style)}
         data-name={box.name ?? undefined}
         onClick={onClick}
         style={background}