Fix camera

src/events/index.ts

@@ -1,4 +1,5 @@
 export * from './avatar-editor';
+export * from './camera';
 export * from './catalog';
 export * from './friend-list';
 export * from './inventory';

src/events/room-widgets/index.ts

@@ -1,2 +1 @@
-export * from './camera';
 export * from './thumbnail';

src/layout/card/grid/index.ts

@@ -0,0 +1,4 @@
+export * from './context';
+export * from './item';
+export * from './NitroCardGridView';
+export * from './NitroCardGridView.types';

src/layout/card/grid/item/index.ts

@@ -0,0 +1,2 @@
+export * from './NitroCardGridItemView';
+export * from './NitroCardGridItemView.types';

src/layout/card/index.ts

@@ -1,6 +1,7 @@
 export * from './accordion';
 export * from './content';
 export * from './context';
+export * from './grid';
 export * from './header';
 export * from './NitroCardView';
 export * from './NitroCardView.types';

src/views/Styles.scss

@@ -1,5 +1,6 @@
 @import './shared/Shared';
 @import './avatar-editor/AvatarEditorView';
+@import './camera/CameraWidgetView';
 @import './catalog/CatalogView';
 @import './friend-list/FriendListView';
 @import './groups/GroupView';

src/views/camera/CameraWidgetView.scss

@@ -33,7 +33,7 @@
         position: relative;
         width: 340px;
         height: 462px;
-        background-image: url('../../../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
+        background-image: url('../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
         background-position: -1px -1px;
         z-index: 2;
     
@@ -43,7 +43,7 @@
             cursor: pointer;
             margin-top: 362px;
     
-            background-image: url('../../../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
+            background-image: url('../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
             background-position: -343px -321px;
     
             &:hover {
@@ -56,7 +56,7 @@
         }
 
         .camera-view-finder {
-            background-image: url('../../../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
+            background-image: url('../../assets/images/room-widgets/camera-widget/camera-spritesheet.png');
             background-position: -343px -1px;
         }
 

src/views/camera/CameraWidgetView.tsx

@@ -1,10 +1,11 @@
-import { InitCameraMessageEvent, IRoomCameraWidgetEffect, RequestCameraConfigurationComposer, RoomCameraWidgetManagerEvent } from '@nitrots/nitro-renderer';
+import { InitCameraMessageEvent, IRoomCameraWidgetEffect, RequestCameraConfigurationComposer, RoomCameraWidgetManagerEvent, RoomSessionEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
-import { GetRoomCameraWidgetManager } from '../../../../api';
-import { RoomWidgetCameraEvent } from '../../../../events/room-widgets/camera/RoomWidgetCameraEvent';
-import { useCameraEvent } from '../../../../hooks/events/nitro/camera/camera-event';
-import { useUiEvent } from '../../../../hooks/events/ui/ui-event';
-import { CreateMessageHook, SendMessageHook } from '../../../../hooks/messages/message-event';
+import { GetRoomCameraWidgetManager } from '../../api';
+import { RoomWidgetCameraEvent } from '../../events/camera/RoomWidgetCameraEvent';
+import { useRoomSessionManagerEvent } from '../../hooks';
+import { useCameraEvent } from '../../hooks/events/nitro/camera/camera-event';
+import { useUiEvent } from '../../hooks/events/ui/ui-event';
+import { CreateMessageHook, SendMessageHook } from '../../hooks/messages/message-event';
 import { CameraPicture } from './common/CameraPicture';
 import { CameraWidgetContextProvider } from './context/CameraWidgetContext';
 import { CameraWidgetCaptureView } from './views/capture/CameraWidgetCaptureView';
@@ -66,6 +67,13 @@ export const CameraWidgetView: FC<{}> = props =>
 
     CreateMessageHook(InitCameraMessageEvent, onCameraConfigurationEvent);
 
+    const onRoomSessionEvent = useCallback((event: RoomSessionEvent) =>
+    {
+        setMode(MODE_NONE);
+    }, []);
+
+    useRoomSessionManagerEvent(RoomSessionEvent.ENDED, onRoomSessionEvent);
+
     useEffect(() =>
     {
         if(!GetRoomCameraWidgetManager().isLoaded)
@@ -110,6 +118,8 @@ export const CameraWidgetView: FC<{}> = props =>
         setMode(MODE_CHECKOUT);
     }, []);
 
+    if(mode === MODE_NONE) return null;
+
     return (
         <CameraWidgetContextProvider value={ { cameraRoll, setCameraRoll, selectedPictureIndex, setSelectedPictureIndex } }>
             { (mode === MODE_CAPTURE) && <CameraWidgetCaptureView onClose={ () => processAction('close') } onEdit={ () => processAction('edit') } onDelete={ () => processAction('delete') } /> }

src/views/camera/views/capture/CameraWidgetCaptureView.tsx

@@ -1,7 +1,7 @@
 import { NitroRectangle, TextureUtils } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useRef } from 'react';
-import { GetRoomEngine, GetRoomSession, LocalizeText } from '../../../../../../api';
-import { DraggableWindow } from '../../../../../../layout/draggable-window/DraggableWindow';
+import { GetRoomEngine, GetRoomSession, LocalizeText } from '../../../../api';
+import { DraggableWindow } from '../../../../layout';
 import { CameraPicture } from '../../common/CameraPicture';
 import { useCameraWidgetContext } from '../../context/CameraWidgetContext';
 import { CameraWidgetCaptureViewProps } from './CameraWidgetCaptureView.types';

src/views/camera/views/checkout/CameraWidgetCheckoutView.tsx

@@ -1,9 +1,9 @@
 import { CameraPublishStatusMessageEvent, CameraPurchaseOKMessageEvent, CameraStorageUrlMessageEvent, PublishPhotoMessageComposer, PurchasePhotoMessageComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
-import { GetConfiguration, GetRoomEngine, LocalizeText } from '../../../../../../api';
-import { CreateMessageHook, SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../../../layout';
-import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon';
+import { GetConfiguration, GetRoomEngine, LocalizeText } from '../../../../api';
+import { CreateMessageHook, SendMessageHook } from '../../../../hooks';
+import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../layout';
+import { CurrencyIcon } from '../../../shared/currency-icon/CurrencyIcon';
 import { CameraWidgetCheckoutViewProps } from './CameraWidgetCheckoutView.types';
 
 export const CameraWidgetCheckoutView: FC<CameraWidgetCheckoutViewProps> = props =>

src/views/camera/views/editor/CameraWidgetEditorView.tsx

@@ -1,8 +1,8 @@
 import { IRoomCameraWidgetSelectedEffect, RoomCameraWidgetSelectedEffect } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import ReactSlider from 'react-slider';
-import { GetRoomCameraWidgetManager, LocalizeText } from '../../../../../../api';
-import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../../../../../layout';
+import { GetRoomCameraWidgetManager, LocalizeText } from '../../../../api';
+import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../../../layout';
 import { CameraPictureThumbnail } from '../../common/CameraPictureThumbnail';
 import { CameraWidgetEditorTabs, CameraWidgetEditorViewProps } from './CameraWidgetEditorView.types';
 import { CameraWidgetEffectListView } from './effect-list/CameraWidgetEffectListView';

src/views/camera/views/editor/effect-list-item/CameraWidgetEffectListItemView.tsx

@@ -1,6 +1,6 @@
 import { FC } from 'react';
-import { LocalizeText } from '../../../../../../../api/utils';
-import { NitroCardGridItemView } from '../../../../../../../layout/card/grid/item/NitroCardGridItemView';
+import { LocalizeText } from '../../../../../api';
+import { NitroCardGridItemView } from '../../../../../layout';
 import { CameraWidgetEffectListItemViewProps } from './CameraWidgetEffectListItemView.types';
 
 export const CameraWidgetEffectListItemView: FC<CameraWidgetEffectListItemViewProps> = props =>

src/views/camera/views/editor/effect-list/CameraWidgetEffectListView.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { NitroCardGridView } from '../../../../../../../layout/card/grid/NitroCardGridView';
+import { NitroCardGridView } from '../../../../../layout';
 import { CameraWidgetEffectListItemView } from '../effect-list-item/CameraWidgetEffectListItemView';
 import { CameraWidgetEffectListViewProps } from './CameraWidgetEffectListView.types';
 

src/views/main/MainView.tsx

@@ -4,6 +4,7 @@ import { GetCommunication } from '../../api';
 import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event';
 import { AchievementsView } from '../achievements/AchievementsView';
 import { AvatarEditorView } from '../avatar-editor/AvatarEditorView';
+import { CameraWidgetView } from '../camera/CameraWidgetView';
 import { CatalogView } from '../catalog/CatalogView';
 import { FriendListView } from '../friend-list/FriendListView';
 import { GroupsView } from '../groups/GroupsView';
@@ -64,6 +65,7 @@ export const MainView: FC<MainViewProps> = props =>
             <UserSettingsView />
             <UserProfileView />
             <GroupsView />
+            <CameraWidgetView />
         </div>
     );
 }

src/views/room/widgets/RoomWidgets.scss

@@ -1,5 +1,4 @@
 @import './avatar-info/AvatarInfoWidgetView';
-@import './camera/CameraWidgetView';
 @import './chat/ChatWidgetView';
 @import './chat-input/ChatInputView';
 @import './context-menu/ContextMenu';

src/views/room/widgets/RoomWidgetsView.tsx

@@ -4,7 +4,6 @@ import { CanManipulateFurniture, GetRoomEngine, IsFurnitureSelectionDisabled, Lo
 import { useRoomEngineEvent, useRoomSessionManagerEvent } from '../../../hooks/events';
 import { useRoomContext } from '../context/RoomContext';
 import { AvatarInfoWidgetView } from './avatar-info/AvatarInfoWidgetView';
-import { CameraWidgetView } from './camera/CameraWidgetView';
 import { ChatInputView } from './chat-input/ChatInputView';
 import { ChatWidgetView } from './chat/ChatWidgetView';
 import { FurniChooserWidgetView } from './choosers/FurniChooserWidgetView';
@@ -240,7 +239,6 @@ export const RoomWidgetsView: FC<RoomWidgetViewProps> = props =>
     return (
         <>
             <AvatarInfoWidgetView />
-            <CameraWidgetView />
             <ChatWidgetView />
             <ChatInputView />
             <DoorbellWidgetView />