@netless/fastboard-react 0.2.6 → 0.2.9

package/src/components/Toolbar/hooks.ts

@@ -1,4 +1,5 @@
 import type { ApplianceNames, Color, MemberState, ShapeType } from "white-web-sdk";
+import type { AppsStatus } from "@netless/fastboard-core";
 
 import { useCallback, useState } from "react";
 
@@ -12,6 +13,7 @@ export interface ToolbarHook {
   readonly writable: boolean;
   readonly memberState: MemberState | undefined;
   readonly lastShape: UnifiedShape;
+  readonly appsStatus: AppsStatus;
   cleanCurrentScene(): void;
   setAppliance(appliance: ApplianceNames, shape?: ShapeType): void;
   setStrokeWidth(width: number): void;
@@ -22,10 +24,15 @@ export function useRoomState() {
   return useFastboardValue(useFastboardApp().memberState);
 }
 
+export function useAppsStatus() {
+  return useFastboardValue(useFastboardApp().appsStatus);
+}
+
 export function useToolbar(): ToolbarHook {
   const app = useFastboardApp();
   const writable = useWritable();
   const memberState = useRoomState();
+  const appsStatus = useAppsStatus();
   const [lastShape, setLastShape] = useState<UnifiedShape>("rectangle" as ApplianceNames.rectangle);
 
   const cleanCurrentScene = useCallback(() => {
@@ -62,6 +69,7 @@ export function useToolbar(): ToolbarHook {
     writable,
     memberState,
     lastShape,
+    appsStatus,
     cleanCurrentScene,
     setAppliance,
     setStrokeWidth,
@@ -73,6 +81,7 @@ export const EmptyToolbarHook: ToolbarHook = {
   writable: false,
   memberState: undefined,
   lastShape: "rectangle" as ApplianceNames.rectangle,
+  appsStatus: {},
   cleanCurrentScene: noop,
   setAppliance: noop,
   setStrokeWidth: noop,

package/src/components/Toolbar/icons/Laser.tsx

@@ -0,0 +1,21 @@
+import type { IconProps } from "../../../typings";
+
+import React from "react";
+import { getStroke } from "../../../theme";
+
+export const Laser = (props: IconProps) => {
+  const stroke = getStroke(props);
+  return (
+    <svg viewBox="0 0 24 24">
+      <g fill="none" fill-rule="evenodd">
+        <circle cx="12" cy="12" r="2" fill={stroke} />
+        <path
+          stroke={stroke}
+          stroke-linecap="square"
+          stroke-linejoin="round"
+          d="M12 4v2m0 12v2m8-8h-2M6 12H4m13.657 5.657-1.414-1.414M7.757 7.757 6.343 6.343m0 11.314 1.414-1.414m8.486-8.486 1.414-1.414"
+        />
+      </g>
+    </svg>
+  );
+};

package/src/components/Toolbar/icons/Loading.tsx

@@ -0,0 +1,13 @@
+import type { IconProps } from "../../../typings";
+
+import React from "react";
+import { getStroke } from "../../../theme";
+
+export const Loading = (props: IconProps) => {
+  const stroke = getStroke(props);
+  return (
+    <svg viewBox="0 0 24 24">
+      <path fill={stroke} d="M12 4V2A10 10 0 0 0 2 12h2a8 8 0 0 1 8-8Z"></path>
+    </svg>
+  );
+};

package/src/components/ZoomControl/ZoomControl.scss

@@ -7,19 +7,19 @@ $name: "fastboard-zoom-control";
   gap: 4px;
   padding: 4px;
   border-radius: 4px;
-  backdrop-filter: blur(2px);
-  -webkit-backdrop-filter: blur(2px);
+  backdrop-filter: blur(5px);
+  -webkit-backdrop-filter: blur(5px);
 
   &.light {
     color: #333;
-    background-color: rgba($color: #fff, $alpha: 0.85);
-    border: 1px solid rgba(0, 0, 0, 0.15);
+    background-color: rgba(255, 255, 255, 0.9);
+    border: 1px solid #e5e8f0;
   }
 
   &.dark {
     color: #ddd;
-    background-color: rgba($color: #333, $alpha: 0.85);
-    border: 1px solid rgba(0, 0, 0, 0.45);
+    background-color: #14181e;
+    border: 1px solid #383b42;
   }
 }
 
@@ -38,8 +38,8 @@ $name: "fastboard-zoom-control";
 
   svg,
   img {
-    width: 1em;
-    height: 1em;
+    width: 100%;
+    height: 100%;
   }
 
   &:disabled {
@@ -48,11 +48,11 @@ $name: "fastboard-zoom-control";
   }
 
   &.light:not(:disabled):hover {
-    background-color: rgba(51, 129, 255, 0.1);
+    background-color: #ebf2ff;
   }
 
   &.dark:not(:disabled):hover {
-    background-color: rgba(51, 129, 255, 0.25);
+    background-color: #383b42;
   }
 }
 
@@ -69,12 +69,16 @@ $name: "fastboard-zoom-control";
   }
 }
 
+.#{$name}-text {
+  line-height: 24px;
+}
+
 .#{$name}-percent {
   opacity: 0.6;
 }
 
 .#{$name}-scale,
 .#{$name}-percent {
-  font-size: 12px;
+  font-size: 14px;
   font-variant-numeric: tabular-nums;
 }

package/src/components/ZoomControl/ZoomControl.tsx

@@ -55,8 +55,10 @@ export function ZoomControl({
           />
         </button>
       </Tippy>
-      <span className={clsx(`${name}-scale`, theme)}>{Math.ceil(scale * 100)}</span>
-      <span className={clsx(`${name}-percent`, theme)}>%</span>
+      <span className={clsx(`${name}-text`, theme)}>
+        <span className={clsx(`${name}-scale`, theme)}>{Math.ceil(scale * 100)}</span>
+        <span className={clsx(`${name}-percent`, theme)}>%</span>
+      </span>
       <Tippy
         className="fastboard-tip"
         content={t("zoomIn")}

package/src/components/tippy-util.ts

@@ -0,0 +1,18 @@
+import type { Instance } from "tippy.js";
+import tippy from "tippy.js";
+
+export const instances = new Set<Instance>();
+
+export function onCreate(instance: Instance) {
+  instances.add(instance);
+}
+
+export function onDestroy(instance: Instance) {
+  instances.delete(instance);
+}
+
+tippy.setDefaultProps({ onCreate, onDestroy });
+
+export function hideAll() {
+  instances.forEach(instance => instance.hide());
+}

package/src/icons/Left.tsx

@@ -0,0 +1,15 @@
+import type { IconProps } from "../typings";
+
+import React from "react";
+import { themes } from "../theme";
+
+export function Left({ theme = "light", active }: IconProps) {
+  const config = themes[theme];
+  const stroke = active ? config.activeColor : config.color;
+
+  return (
+    <svg viewBox="0 0 24 24" fill="none">
+      <path d="m14 8-2 2-2 2 2 2 2 2" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
+    </svg>
+  );
+}

package/src/icons/Minus.tsx

@@ -8,8 +8,8 @@ export function Minus({ theme = "light", active }: IconProps) {
   const stroke = active ? config.activeColor : config.color;
 
   return (
-    <svg viewBox="0 0 24 24">
-      <path fill="none" stroke={stroke} strokeLinecap="round" strokeLinejoin="round" d="M7 12h10" />
+    <svg viewBox="0 0 24 24" fill="none">
+      <path d="M5 12h14" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
     </svg>
   );
 }

package/src/icons/Plus.tsx

@@ -8,8 +8,8 @@ export function Plus({ theme = "light", active }: IconProps) {
   const stroke = active ? config.activeColor : config.color;
 
   return (
-    <svg viewBox="0 0 24 24">
-      <path fill="none" stroke={stroke} strokeLinecap="round" strokeLinejoin="round" d="M12 7v10m-5-5h10" />
+    <svg viewBox="0 0 24 24" fill="none">
+      <path d="M5 12h14m-7-7v14" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
     </svg>
   );
 }

package/src/icons/Redo.tsx

@@ -8,11 +8,12 @@ export function Redo({ theme = "light", active }: IconProps) {
   const stroke = active ? config.activeColor : config.color;
 
   return (
-    <svg viewBox="0 0 24 24">
-      <g fill="none" fillRule="evenodd" stroke={stroke} strokeLinecap="round" strokeLinejoin="round">
-        <path d="M14 14h4v-4" />
-        <path d="m18 14-.788-.9A7.005 7.005 0 0 0 6 14h0" />
-      </g>
+    <svg viewBox="0 0 24 24" fill="none">
+      <path
+        d="M19 9.625H9v-1.25h10v1.25ZM5.625 13v6h-1.25v-6h1.25ZM9 9.625A3.375 3.375 0 0 0 5.625 13h-1.25A4.625 4.625 0 0 1 9 8.375v1.25Z"
+        fill={stroke}
+      />
+      <path d="m15 5 4 4-4 4" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
     </svg>
   );
 }

package/src/icons/Reset.tsx

@@ -8,12 +8,10 @@ export function Reset({ theme = "light", active }: IconProps) {
   const stroke = active ? config.activeColor : config.color;
 
   return (
-    <svg viewBox="0 0 24 24">
-      <g fill="none" fillRule="evenodd" transform="translate(-176 -684)">
-        <path stroke={stroke} strokeLinejoin="round" d="M188 688v4m0 8v4m8-8h-4m-8 0h-4" />
-        <circle cx="188" cy="696" r="6" stroke={stroke} />
-        <circle cx="188" cy="696" r="1" fill={stroke} />
-      </g>
+    <svg viewBox="0 0 24 24" fill="none">
+      <circle cx="12" cy="12" fill={stroke} r="2" />
+      <path d="M12 3v4m0 10v4m9-9h-4M7 12H3" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
+      <circle cx="12" cy="12" r="7" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
     </svg>
   );
 }

package/src/icons/Right.tsx

@@ -0,0 +1,15 @@
+import type { IconProps } from "../typings";
+
+import React from "react";
+import { themes } from "../theme";
+
+export function Right({ theme = "light", active }: IconProps) {
+  const config = themes[theme];
+  const stroke = active ? config.activeColor : config.color;
+
+  return (
+    <svg viewBox="0 0 24 24" fill="none">
+      <path d="m10 8 2 2 2 2-2 2-2 2" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
+    </svg>
+  );
+}

package/src/icons/Undo.tsx

@@ -8,11 +8,12 @@ export function Undo({ theme = "light", active }: IconProps) {
   const stroke = active ? config.activeColor : config.color;
 
   return (
-    <svg viewBox="0 0 24 24">
-      <g fill="none" fillRule="evenodd" stroke={stroke} strokeLinecap="round" strokeLinejoin="round">
-        <path d="M10 14H6v-4" />
-        <path d="m6 14 .788-.9A7.005 7.005 0 0 1 18 14h0" />
-      </g>
+    <svg viewBox="0 0 24 24" fill="none">
+      <path
+        d="M5 9.625h10v-1.25H5v1.25ZM18.375 13v6h1.25v-6h-1.25ZM15 9.625A3.375 3.375 0 0 1 18.375 13h1.25A4.625 4.625 0 0 0 15 8.375v1.25Z"
+        fill={stroke}
+      />
+      <path d="M9 5 5 9l4 4" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
     </svg>
   );
 }

package/src/icons/WhiteboardAdd.tsx

@@ -0,0 +1,26 @@
+import type { IconProps } from "../typings";
+
+import React from "react";
+import { themes } from "../theme";
+
+export function WhiteboardAdd({ theme = "light", active }: IconProps) {
+  const config = themes[theme];
+  const stroke = active ? config.activeColor : config.color;
+
+  return (
+    <svg viewBox="0 0 24 24" fill="none">
+      <path d="M4 20h16M4 6h16" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
+      <rect
+        height="10"
+        rx="1"
+        stroke={stroke}
+        strokeLinejoin="round"
+        strokeWidth="1.25"
+        width="14"
+        x="5"
+        y="8"
+      />
+      <path d="M12 4v2m-3 7h6m-3-3v6" stroke={stroke} strokeLinejoin="round" strokeWidth="1.25" />
+    </svg>
+  );
+}

package/src/index.ts

@@ -8,4 +8,5 @@ export * from "./components/PageControl";
 export * from "./components/Toolbar";
 export * from "./components/PlayerControl";
 export * from "./components/Fastboard";
+export * from "./components/ReplayFastboard";
 export * from "./vanilla";

package/src/vanilla/index.tsx

@@ -5,14 +5,24 @@ import React from "react";
 import ReactDOM from "react-dom";
 import { Fastboard } from "../components/Fastboard";
 
+export type MountProps = Omit<FastboardProps & DivProps, "ref">;
+
 /**
  * Mount fastboard app to some dom, returns the disposer, which will unmount the app.
  * @example
  * let app = await createFastboard({ ...config })
- * let disposer = mount(app, document.getElementById("whiteboard"))
- * disposer()
+ * const { update, destroy } = mount(app, document.getElementById("whiteboard"))
+ * update({ theme: 'dark' })
+ * destroy()
  */
-export function mount(app: FastboardApp, dom: HTMLElement, props: Omit<FastboardProps & DivProps, "ref">) {
+export function mount(app: FastboardApp, dom: HTMLElement, props: MountProps) {
   ReactDOM.render(<Fastboard app={app} {...props} />, dom);
-  return () => ReactDOM.unmountComponentAtNode(dom);
+  return {
+    update(props: MountProps) {
+      ReactDOM.render(<Fastboard app={app} {...props} />, dom);
+    },
+    destroy() {
+      ReactDOM.unmountComponentAtNode(dom);
+    },
+  };
 }

package/src/icons/ChevronLeft.tsx

@@ -1,21 +0,0 @@
-import type { IconProps } from "../typings";
-
-import React from "react";
-import { themes } from "../theme";
-
-export function ChevronLeft({ theme = "light", active }: IconProps) {
-  const config = themes[theme];
-  const stroke = active ? config.activeColor : config.color;
-
-  return (
-    <svg viewBox="0 0 24 24">
-      <path
-        fill="none"
-        stroke={stroke}
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="m14 16-2-2-2-2 2-2 2-2"
-      />
-    </svg>
-  );
-}

package/src/icons/ChevronRight.tsx

@@ -1,21 +0,0 @@
-import type { IconProps } from "../typings";
-
-import React from "react";
-import { themes } from "../theme";
-
-export function ChevronRight({ theme = "light", active }: IconProps) {
-  const config = themes[theme];
-  const stroke = active ? config.activeColor : config.color;
-
-  return (
-    <svg viewBox="0 0 24 24">
-      <path
-        fill="none"
-        stroke={stroke}
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        d="m10 16 2-2 2-2-2-2-2-2"
-      />
-    </svg>
-  );
-}

package/src/icons/FilePlus.tsx

@@ -1,18 +0,0 @@
-import type { IconProps } from "../typings";
-
-import React from "react";
-import { themes } from "../theme";
-
-export function FilePlus({ theme = "light", active }: IconProps) {
-  const config = themes[theme];
-  const stroke = active ? config.activeColor : config.color;
-
-  return (
-    <svg viewBox="0 0 24 24">
-      <path
-        fill={stroke}
-        d="M12 7.5a.5.5 0 0 1 .09.992L12 8.5H8a1.5 1.5 0 0 0-1.493 1.356L6.5 10v6a1.5 1.5 0 0 0 1.356 1.493L8 17.5h6a1.5 1.5 0 0 0 1.493-1.356L15.5 16v-4a.5.5 0 0 1 .992-.09l.008.09v4a2.5 2.5 0 0 1-2.336 2.495L14 18.5H8a2.5 2.5 0 0 1-2.495-2.336L5.5 16v-6a2.5 2.5 0 0 1 2.336-2.495L8 7.5h4Zm4-2a.5.5 0 0 1 .492.41L16.5 6v1.5H18a.5.5 0 0 1 .09.992L18 8.5h-1.5V10a.5.5 0 0 1-.992.09L15.5 10V8.5H14a.5.5 0 0 1-.09-.992L14 7.5h1.5V6a.5.5 0 0 1 .5-.5Z"
-      />
-    </svg>
-  );
-}