clean up remote-ui example app and tests

examples/kitchen-sink/app/remote/examples/remote-ui.ts

@@ -0,0 +1,83 @@
+import type {RenderAPI} from '../../types.ts';
+import {Modal} from '../elements.ts';
+
+export function renderUsingRemoteUI(root: Element, api: RenderAPI) {
+  let count = 0;
+
+  function handlePress() {
+    updateCount(count + 1);
+  }
+
+  function handleClose() {
+    if (count > 0) {
+      api.alert(`You clicked ${count} times!`);
+    }
+
+    updateCount(0);
+  }
+
+  function updateCount(newCount: number) {
+    count = newCount;
+    countText.textContent = String(count);
+  }
+
+  function handlePrimaryAction() {
+    modal.close();
+  }
+
+  const countText = document.createElement('ui-text');
+  countText.textContent = String(count);
+  countText.setAttribute('emphasis', '');
+
+  const template = document.createElement('div');
+
+  template.innerHTML = `
+    <ui-modal slot="modal">
+      <ui-text>Click count: </ui-text>
+      <ui-button>Click me!</ui-button>
+      <ui-button slot="primaryAction">
+        Close
+      </ui-button>
+    </ui-modal>
+  `.trim();
+
+  const modal = template.querySelector('ui-modal')! as InstanceType<
+    typeof Modal
+  >;
+
+  modal.addEventListener('close', handleClose);
+
+  modal.querySelector('ui-text')!.append(countText);
+
+  const [countButton, primaryActionButton] = [
+    ...modal.querySelectorAll('ui-button'),
+  ];
+
+  countButton!.addEventListener('press', handlePress);
+  primaryActionButton!.addEventListener('press', handlePrimaryAction);
+
+  template.innerHTML = `
+    <ui-stack spacing>
+      <ui-text>
+        Rendering example: <ui-text emphasis></ui-text>
+      </ui-text>
+      <ui-text>
+        Rendering in sandbox: <ui-text emphasis></ui-text>
+      </ui-text>
+
+      <ui-button>Open modal</ui-button>
+    </ui-stack>
+  `.trim();
+
+  const stack = template.firstElementChild!;
+
+  const [exampleText, sandboxText] = [
+    ...stack.querySelectorAll('ui-text[emphasis]')!,
+  ];
+  exampleText!.textContent = api.example;
+  sandboxText!.textContent = api.sandbox;
+
+  stack.querySelector('ui-button')!.append(modal);
+
+  root.append(stack);
+}

examples/remote-ui/app/host/components.tsx

@@ -45,7 +45,11 @@ export function Button({
         class="Button"
         type="button"
         onClick={() => {
-          onPress?.();
+          if (onPress) {
+            onPress();
+          } else {
+            document.querySelector('dialog')?.showModal();
+          }
         }}
       >
         {children}
@@ -74,11 +78,16 @@ export const Modal = forwardRef<
     children?: ComponentChildren;
     primaryAction?: ComponentChildren;
   } & ModalProperties
->(function Modal({children, primaryAction}) {
+>(function Modal({children, primaryAction, onClose}) {
   return (
-    <div class="Modal">
+    <dialog
+      class="Modal"
+      onClose={() => {
+        onClose?.();
+      }}
+    >
       <div class="Modal-Content">{children}</div>
       {primaryAction && <div class="Modal-Actions">{primaryAction}</div>}
-    </div>
+    </dialog>
   );
 });

examples/remote-ui/app/host/host.tsx

@@ -9,7 +9,8 @@ import {
 } from '@remote-dom/preact/host';
 import {adaptToLegacyRemoteChannel} from '@remote-dom/core/legacy';
 import {createEndpoint, fromIframe, retain, release} from '@remote-ui/rpc';
-import {Button, Modal, Stack, Text} from './components.tsx';
+import {Button, Modal, Stack, Text, ModalProvider} from './components.tsx';
+import {EndpointApi} from '../types.ts';
 
 const components = new Map([
   ['Text', createRemoteComponentRenderer(Text)],
@@ -21,7 +22,7 @@ const components = new Map([
 
 const root = document.querySelector('#root')!;
 const iframe = document.querySelector('#remote-iframe') as HTMLIFrameElement;
-const endpoint = createEndpoint(fromIframe(iframe));
+const endpoint = createEndpoint<EndpointApi>(fromIframe(iframe));
 
 const receiver = new SignalRemoteReceiver({retain, release});
 const channel = adaptToLegacyRemoteChannel(receiver.connection);
@@ -32,7 +33,10 @@ render(
 );
 
 endpoint.call.render(channel, {
-  showAlert: (message: string) => {
+  showAlert: async (message: string) => {
     alert(message);
   },
+  closeModal: async () => {
+    document.querySelector('dialog')?.close();
+  },
 });

examples/remote-ui/app/remote/app.tsx

@@ -3,58 +3,57 @@
 
 import {useState} from 'react';
 import {Button, Modal, Stack, Text} from './components';
+import {RenderAPI} from '../types';
 
-export function App({api}: {api: any}) {
-  const [showModal, setShowModal] = useState(false);
-  const [count, setCount] = useState(0);
-
-  function removeModal() {
-    setShowModal(false);
-  }
-
+export function App({api}: {api: RenderAPI}) {
   return (
     <Stack spacing>
       <>
         <Text>
           Rendering example: <Text emphasis>remote-ui legacy</Text>
         </Text>
+        <Button modal={<CountModal {...api} />}>Open modal</Button>
+      </>
+    </Stack>
+  );
+}
+
+function CountModal({showAlert, closeModal}: RenderAPI) {
+  const [count, setCount] = useState(0);
+
+  const primaryAction = (
+    <Button
+      onPress={() => {
+        closeModal();
+      }}
+    >
+      Close
+    </Button>
+  );
+
+  return (
+    <Modal
+      primaryAction={primaryAction}
+      onClose={() => {
+        if (count > 0) {
+          showAlert(`You clicked ${count} times!`);
+        }
+
+        setCount(0);
+      }}
+    >
+      <Stack spacing>
+        <Text>
+          Click count: <Text emphasis>{count}</Text>
+        </Text>
         <Button
-          onPress={() => setShowModal(true)}
-          modal={
-            showModal ? (
-              <Modal
-                primaryAction={
-                  <Button
-                    onPress={() => {
-                      removeModal();
-                      if (count > 0) {
-                        void api.showAlert(`You clicked ${count} times!`);
-                      }
-                    }}
-                  >
-                    Close
-                  </Button>
-                }
-              >
-                <Stack spacing>
-                  <Text>
-                    Click count: <Text emphasis>{count}</Text>
-                  </Text>
-                  <Button
-                    onPress={() => {
-                      setCount((count) => count + 1);
-                    }}
-                  >
-                    Click me!
-                  </Button>
-                </Stack>
-              </Modal>
-            ) : undefined
-          }
+          onPress={() => {
+            setCount((count) => count + 1);
+          }}
         >
-          Open modal
+          Click me!
         </Button>
-      </>
-    </Stack>
+      </Stack>
+    </Modal>
   );
 }

examples/remote-ui/app/remote/remote.tsx

@@ -5,8 +5,10 @@ import {createRoot, createRemoteRoot} from '@remote-ui/react';
 
 import * as components from './components';
 import {App} from './app';
+import {EndpointApi} from '../types';
+
+const endpoint = createEndpoint<EndpointApi>(fromInsideIframe());
 
-const endpoint = createEndpoint(fromInsideIframe());
 endpoint.expose({
   render(channel, api) {
     retain(channel);

examples/remote-ui/app/style.css

@@ -164,6 +164,14 @@ li {
   background: rgba(9, 9, 11, 0.65);
 }
 
+.Modal[open] {
+  animation: OpenModal 0.2s ease normal;
+}
+
+.Modal:not([open]) {
+  display: none;
+}
+
 @keyframes OpenModal {
   from {
     opacity: 0;

examples/remote-ui/app/types.ts

@@ -2,7 +2,7 @@
 // They will be used to describe the properties that are available on the elements that can
 // be synchronized between the two environments.
 
-import {RemoteFragment} from '@remote-ui/core';
+import {RemoteChannel, RemoteFragment} from '@remote-ui/core';
 
 /**
  * A `Text` element renders a styled string of text.
@@ -62,3 +62,12 @@ export interface StackProperties {
    */
   spacing?: boolean;
 }
+
+export interface EndpointApi {
+  render(channel: RemoteChannel, api: RenderAPI): Promise<void>;
+}
+
+export interface RenderAPI {
+  closeModal(): void;
+  showAlert(message: string): void;
+}