diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/KonvaCanvasContainer.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/KonvaCanvasContainer.tsx index 0c291ebefa..c8728921e0 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/KonvaCanvasContainer.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/KonvaCanvasContainer.tsx @@ -9,6 +9,8 @@ export const KonvaCanvasContainer = forwardRef< >(({ className, ...props }, ref) => { // useRenderCounter("KonvaCanvasContainer"); - const classes = twMerge("pegboard -z-10", className); + const classes = twMerge("pegboard -z-10", "h-[calc(100vh-56px)]", className); return
; }); + +KonvaCanvasContainer.displayName = "KonvaCanvasContainer"; diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/KonvaRootComponent.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/KonvaRootComponent.tsx index 933c0260a7..413e8cbe26 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/KonvaRootComponent.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/KonvaRootComponent.tsx @@ -4,7 +4,7 @@ import { useCallback, useRef, useState } from "react"; import { KonvaCanvasContainer } from "./KonvaCanvasContainer"; import { ContextualToolbarNode } from "./ContextualToolbarNode"; // import { SignaledCanvasDragDropFiles } from "./SignaledCanvasDragDropFiles"; -import { SignaledDialogs } from "./SignaledDialogs"; +// import { SignaledDialogs } from "./SignaledDialogs"; import { SignaledToolbarMain } from "./SignaledToolbarMain"; // The KonvaApp is the root of the Konva stage @@ -33,7 +33,17 @@ import { uploadImage } from "../../components/reusable/UploadModalMedia/uploadIm // import { EncodeImageBitmapToBase64 } from "./utilities/EncodeImageBitmapToBase64"; import { JobProvider, useJobContext } from "./JobContext"; import { RealTimeDrawEngine } from "./KonvaApp/RenderingPrimitives/RealTimeDrawEngine"; -import { VideoResolutions } from "./KonvaApp/constants"; +// import { VideoResolutions } from "./KonvaApp/constants"; + +import { + DialogAddImage, + DialogEditText, + DialogError, +} from "./components/features"; +import { dispatchUiEvents } from "./signals"; +import { useSignals } from "@preact/signals-react/runtime"; +import { dialogError } from "./signals/uiAccess/dialogError"; + export const KonvaRootComponent = ({ className, sceneToken, @@ -41,6 +51,7 @@ export const KonvaRootComponent = ({ className: string; sceneToken?: string; }) => { + useSignals(); // This is a hook that will log the number of times the component has rerendered // Let's make sure we only log once useRenderCounter("KonvaRootComponent"); @@ -53,29 +64,38 @@ export const KonvaRootComponent = ({ const engineRef = useRef(null); const renderEngineRef = useRef(null); - const konvaContainerCallbackRef = useCallback((node: HTMLDivElement) => { - // Only initialize if we have a node and haven't initialized yet - if (node !== null && !isEngineReady && engineRef.current === null) { - try { - const options = { - navigate: navigate, - sceneToken: sceneToken, - }; - + const konvaContainerCallbackRef = useCallback( + (node: HTMLDivElement) => { + // Only initialize if we have a node and haven't initialized yet + if (node !== null && !isEngineReady && engineRef.current === null) { + try { + const options = { + navigate: navigate, + sceneToken: sceneToken, + }; - engineRef.current = KonvaApp(node, options); - renderEngineRef.current = engineRef.current.realTimeDrawEngine; - // Only set ready if initialization succeeded - if (engineRef.current) { - setIsEngineReady(true); + engineRef.current = KonvaApp(node, options); + renderEngineRef.current = engineRef.current.realTimeDrawEngine; + // Only set ready if initialization succeeded + if (engineRef.current) { + setIsEngineReady(true); + } + } catch (error) { + console.error("Failed to initialize KonvaApp:", error); + engineRef.current = null; + setIsEngineReady(false); } - } catch (error) { - console.error("Failed to initialize KonvaApp:", error); - engineRef.current = null; - setIsEngineReady(false); } - } - }, [navigate, sceneToken, isEngineReady]); + }, + [navigate, sceneToken, isEngineReady], + ); + + // Modal stuff + const props = dialogError.signal.value; + const { isShowing, title, message } = props; + const onClose = useCallback(() => { + dialogError.hide(); + }, []); return ( <> @@ -95,7 +115,6 @@ export const KonvaRootComponent = ({ {/* Conditionally render the UI components that need the engine */} {isEngineReady && engineRef.current && ( - {/* { - // will set the snapshot of the canvas internally. - await renderEngineRef.current?.render(); - }} - /> - + EncodeImageBitmapToBase64={EncodeImageBitmapToBase64} + useJobContext={useJobContext} + onEnqueuePressed={async () => { + // will set the snapshot of the canvas internally. + await renderEngineRef.current?.render(); + }} + />{" "} + + - + /> */} )} + + {/* Modals */} + + { + dispatchUiEvents.addTextToEngine(data); + }} + closeCallback={appUiContext.resetAll} + /> + + { + dispatchUiEvents.addImageToEngine(file); + }} + /> + + ); }; diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/SignaledDialogs.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/SignaledDialogs.tsx index d9f8709def..a00db1d47c 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/SignaledDialogs.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/SignaledDialogs.tsx @@ -6,11 +6,9 @@ import { DialogEditText, DialogError, } from "./components/features"; - import { AppUiSignalType } from "./contextSignals/appUi"; import { dialogError } from "./signals/uiAccess/dialogError"; - export const SignaledDialogs = ({ appUiSignal, resetAll, diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/SignaledToolbarMain.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/SignaledToolbarMain.tsx index e8188b8393..0cf18508d1 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/SignaledToolbarMain.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/SignaledToolbarMain.tsx @@ -13,6 +13,7 @@ import { AppUiContextInterface } from "./contextSignals/appUi"; import { twMerge } from "tailwind-merge"; import { paperWrapperStyles } from "./components/styles"; import { dispatchUiEvents } from "./signals/uiEvents"; +import { useSignals } from "@preact/signals-react/runtime"; export const SignaledToolbarMain = ({ // layoutSignal, @@ -21,7 +22,7 @@ export const SignaledToolbarMain = ({ layoutSignal: LayoutSignalType; appUiContext: AppUiContextInterface; }) => { - + useSignals(); const loadingBar = toolbarMain.loadingBar.signal.value; const getButtonDispatcher = (buttonName: ToolbarMainButtonNames) => { switch (buttonName) { diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogAddImage/DialogAddImage.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogAddImage/DialogAddImage.tsx index 596c18145f..5afd2b6a8a 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogAddImage/DialogAddImage.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogAddImage/DialogAddImage.tsx @@ -6,8 +6,7 @@ import { FileUploader } from "../../../components/reusable/FileUploader"; import { Button } from "@storyteller/ui-button"; import { IMAGE_FILE_TYPE } from "../../../constants/fileTypeEnums"; - -import { BaseDialog } from "../../../components/ui/BaseDialog"; +import { Modal } from "@storyteller/ui-modal"; export const DialogAddImage = ({ stagedImage = null, @@ -39,38 +38,40 @@ export const DialogAddImage = ({ } return ( - - Upload Image -
- { - setAssetFile(file); - if (file) { - onAddImage(file); - handleClose(); - } - }} - /> - {currFile && ( -
- -
- )} + +
+ Upload Image +
+ { + setAssetFile(file); + if (file) { + onAddImage(file); + handleClose(); + } + }} + /> + {currFile && ( +
+ upload img +
+ )} +
+
+ +
-
- -
- +
); }; diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogEditText/DialogEditText.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogEditText/DialogEditText.tsx index e1587ca10d..e60062ec18 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogEditText/DialogEditText.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/DialogEditText/DialogEditText.tsx @@ -31,14 +31,12 @@ export type TextNodeData = { text: string; } & TextFormatData; - import { useState } from "react"; import { DialogTitle } from "@headlessui/react"; import { Button, TextEditor } from "../../../components/ui"; -import { BaseDialog } from "../../../components/ui/BaseDialog"; - +import { Modal } from "@storyteller/ui-modal"; export const DialogEditText = ({ isOpen, @@ -92,26 +90,28 @@ export const DialogEditText = ({ closeCallback(); }; return ( - - Edit Text - -
- - + +
+ Edit Text + +
+ + +
- +
); }; diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/ToolbarMain/ToolbarMain.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/ToolbarMain/ToolbarMain.tsx index ece0f8320e..f428fc5911 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/components/features/ToolbarMain/ToolbarMain.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/components/features/ToolbarMain/ToolbarMain.tsx @@ -2,10 +2,8 @@ import { faArrowRotateLeft, faArrowRotateRight, faCircle, - faEraser, faFilePlus, faImage, - faImages, faLocationArrow, faPaintbrush, faShapes, @@ -19,18 +17,18 @@ import { Fragment, MouseEventHandler } from "react"; import { twMerge } from "tailwind-merge"; import { ToolbarButton } from "../../../components/features/ToolbarButton"; -import { Tooltip } from "~/components/ui/Tooltip"; +// import { Tooltip } from "~/components/ui/Tooltip"; // style and constants import { paperWrapperStyles, toolTipStyles } from "../../../components/styles"; import { ToolbarMainButtonNames } from "./enum"; -import { dispatchUiEvents, uiEvents } from "../../../signals/uiEvents"; +import { dispatchUiEvents } from "../../../signals/uiEvents"; import { paintColor } from "../../../signals/uiEvents/toolbarMain/paintMode"; -import { ColorPicker } from "../../../components/ui/TextEditor/ColorPicker"; +// import { ColorPicker } from "../../../components/ui/TextEditor/ColorPicker"; import { PaintModeMenu } from "../../../components/ui/ToolbarMain/PaintModeMenu"; -import { EraseModeMenu } from "../../../components/ui/ToolbarMain/EraseModeMenu"; -import { BackgroundMenu } from "../../../components/ui/ToolbarMain/BackgroundMenu"; -import { bgColor } from "../../../signals/uiEvents/toolbarMain/backgroundMenu"; +// import { EraseModeMenu } from "../../../components/ui/ToolbarMain/EraseModeMenu"; +// import { BackgroundMenu } from "../../../components/ui/ToolbarMain/BackgroundMenu"; +// import { bgColor } from "../../../signals/uiEvents/toolbarMain/backgroundMenu"; export const ToolbarMain = ({ disabled = false, @@ -53,7 +51,7 @@ export const ToolbarMain = ({ paperWrapperStyles, "glass", disabled && - "pointer-events-none cursor-default bg-ui-border shadow-md", + "bg-ui-border pointer-events-none cursor-default shadow-md", )} >
@@ -234,11 +232,11 @@ export const ToolbarMain = ({ /> */}
-
+ {/*
- {/* +
-
*/} +
-
+
*/}
); diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/components/styles.ts b/frontend/apps/editor3d/app/src/pages/Page2d/components/styles.ts index c5a4a9d8b7..63586988fe 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/components/styles.ts +++ b/frontend/apps/editor3d/app/src/pages/Page2d/components/styles.ts @@ -1,7 +1,7 @@ import { twMerge } from "tailwind-merge"; export const paperWrapperStyles = - "rounded-xl border border-ui-border p-1.5 shadow-lg bg-ui-panel"; + "rounded-xl border border-ui-panel-border p-1.5 shadow-lg bg-ui-background"; export const transitionTimingStyles = "transition duration-150 ease-in-out"; diff --git a/frontend/apps/editor3d/app/src/pages/Page2d/components/ui/ComboBox.tsx b/frontend/apps/editor3d/app/src/pages/Page2d/components/ui/ComboBox.tsx index 9c5b8c3889..88cc8a25cb 100644 --- a/frontend/apps/editor3d/app/src/pages/Page2d/components/ui/ComboBox.tsx +++ b/frontend/apps/editor3d/app/src/pages/Page2d/components/ui/ComboBox.tsx @@ -29,7 +29,7 @@ export const Combobox = ({ options, value, onChange }: ComboBoxInterface) => { onChange={onChange} onClose={() => setQuery("")} > -
+
font} @@ -41,7 +41,7 @@ export const Combobox = ({ options, value, onChange }: ComboBoxInterface) => {
{filteredOptions.map((option, idx) => ( {
- - {}} - videoSrc2D="/resources/videos/artcraft-canvas-demo.mp4" - videoSrc3D="/resources/videos/artcraft-3d-demo.mp4" - openAiLogo="/resources/images/openai-logo.png" - onOpenChange={(isOpen: boolean) => { - if (isOpen) { - disableHotkeyInput(DomLevels.DIALOGUE); - } else { - enableHotkeyInput(DomLevels.DIALOGUE); - } - }} - onArtCraftAuthSuccess={(userInfo: any) => { - authentication.status.value = AUTH_STATUS.LOGGED_IN; - authentication.userInfo.value = userInfo; - }} - /> ); }; @@ -382,7 +364,26 @@ export const PageEditor = () => { appTabIdSignal={appTabId} setAppTabId={setAppTabId} /> + {appTabId.value === "3D" ? : } + + {}} + videoSrc2D="/resources/videos/artcraft-canvas-demo.mp4" + videoSrc3D="/resources/videos/artcraft-3d-demo.mp4" + openAiLogo="/resources/images/openai-logo.png" + onOpenChange={(isOpen: boolean) => { + if (isOpen) { + disableHotkeyInput(DomLevels.DIALOGUE); + } else { + enableHotkeyInput(DomLevels.DIALOGUE); + } + }} + onArtCraftAuthSuccess={(userInfo: any) => { + authentication.status.value = AUTH_STATUS.LOGGED_IN; + authentication.userInfo.value = userInfo; + }} + /> ); };