fcr-ui-scene 3.7.4 → 3.7.5

package/public/index.html

@@ -66,6 +66,7 @@
         margin: 0 auto;
         cursor: pointer;
       }
+
       .fcr-launch-failure-comp-banner-box {
         position: relative;
         width: 100%;
@@ -178,7 +179,7 @@
 
     (async () => {
       let creator;
-      window.runtime.onCreatorInit = (config) => {
+      window.cppSdkHelper.onCreatorInit = (config) => {
         if (creator) {
           creator.release();
           creator = undefined;
@@ -187,28 +188,29 @@
         creator = new FcrUIScene.FcrUISceneCreator(config);
       };
 
-      window.runtime.onSettingOpen = () => {
+      window.cppSdkHelper.onSettingOpen = () => {
         creator.openSetting();
       };
 
-      window.runtime.onSettingClose = () => {
+      window.cppSdkHelper.onSettingClose = () => {
         creator.closeSetting();
       };
 
-      window.runtime.onSetParameters = (parameters) => {
+      window.cppSdkHelper.onSetParameters = (parameters) => {
         creator.setParameters(parameters);
       };
 
-      window.runtime.onRenewUserToken = (token) => {
+      window.cppSdkHelper.onRenewUserToken = (token) => {
         creator.renewUserToken(token);
       };
 
-      window.runtime.onLaunchMeeting = (launchOptions) => {
+      window.cppSdkHelper.onLaunchMeeting = (launchOptions) => {
         setFullScreenFailureComp(false);
         setLoading(true);
         document.querySelector('#fcr-launch-failure-confirm-btn').addEventListener('click', () => {
           setFullScreenFailureComp(false);
-          window.runtime.browserWindow.hide();
+          console.log('windows_release ui scene closed callback');
+          window.runtime.getCurrentBrowserWindow().hide();
         });
         const { widgets, ...others } = launchOptions;
 
@@ -220,25 +222,41 @@
         const uiScene = creator.launch(
           others,
           () => {
-            window.runtime.browserWindow.hide();
+            console.log('windows_release ui scene closed callback');
+            window.runtime.getCurrentBrowserWindow().hide();
           },
           () => {},
           () => {},
           document.getElementById('root'),
         );
 
-        window.runtime.exitUiScene = () => {
-          uiScene.exit();
+        window.cppSdkHelper.exitUiScene = () => {
+          try {
+            uiScene.exit();
+          } catch (error) {
+            window.cppSdkHelper.exitedMeeting(roomId, FcrUIExitReason.USER_QUIT);
+          }
         };
 
         uiScene.addObserver({
           onLaunchSuccess: () => {
             setLoading(false);
-            const roomName = uiScene._roomProvider._currentRoomControl.getRoomInfo().roomName || '';
-            // document.querySelector('title').innerText = renderMeetingName(roomName);
+            const roomProvider = uiScene._objectManager.getObject('roomProvider');
+            if (!roomProvider) {
+              throw new Error('roomProvider not found in uiScene');
+            }
+            const currentRoomControl = roomProvider.currentRoomControl;
+            if (!currentRoomControl) {
+              throw new Error('currentRoomControl not found in uiScene');
+            }
+            const roomInfo = currentRoomControl.getRoomInfo();
+
+            if (!roomInfo) {
+              throw new Error('roomInfo not found in uiScene');
+            }
+            const { roomName, roomId } = roomInfo;
             document.querySelector('title').innerText = roomName;
-            const roomId = uiScene._roomProvider._currentRoomControl.getRoomInfo().roomId || '';
-            window.runtime.launchSuccess(roomId);
+            window.cppSdkHelper.launchSuccess(roomId);
           },
           onLaunchFailure: (roomId, error) => {
             const errorCode = Number(error.code);
@@ -257,20 +275,21 @@
             }
 
             setFullScreenFailureComp(true, errorMessage);
-            window.runtime.launchFailure(roomId, errorCode);
+            window.cppSdkHelper.launchFailure(roomId, errorCode);
           },
 
           onExited: (roomId, reason) => {
-            window.runtime.exitedMeeting(roomId, reason);
+            window.cppSdkHelper.exitedMeeting(roomId, reason);
             setTimeout(() => {
-              window.runtime.browserWindow.hide();
+              console.log('windows_release ui scene exited callback');
+              window.runtime.getCurrentBrowserWindow().hide();
             });
           },
           onWidgetClicked: (widgetId) => {
-            window.runtime.onWidgetClicked(widgetId);
+            window.cppSdkHelper.onWidgetClicked(widgetId);
           },
           onUserTokenWillExpire: () => {
-            window.runtime.onUserTokenWillExpire();
+            window.cppSdkHelper.onUserTokenWillExpire();
           },
         });
       };

package/lib/modules/action-bar/index.dev.js

@@ -1,94 +0,0 @@
-// import { FcrActionBarUIModule } from '.';
-// import ReactDOM from 'react-dom';
-// import { hot } from 'react-hot-loader/root';
-
-// import { FcrStreamLatencyLevel, FcrUISceneConfig, FcrUserRole } from '../../type';
-// import { PropsWithChildren } from 'react';
-// import { useUnmount } from '../../utilities/hooks';
-// import { FcrSecurityStore } from '../../common/security-store';
-// import { FcrDeviceStreamStore } from '../../common/device-stream-store';
-// import { FcrUIEventStore } from '../../common/event-control';
-// import { FcrDeviceStore } from '../../common/device-store';
-// import { FcrRoomStore } from '../../common/room-control';
-
-// const App = hot(() => null);
-
-// ReactDOM.render(<App />, document.querySelector('#root')!);
-
-// const Layout: React.FC<PropsWithChildren<{}>> = (props) => (
-//   <div style={{ height: '100vh', background: '#E3E7EF' }}>
-//     <div style={{ position: 'absolute', left: '5vw', bottom: '50px', width: '90vw' }}>
-//       {props.children}
-//     </div>
-//   </div>
-// );
-
-// window.__DEV_ENGINE_IS_READY__.then(async () => {
-//   const engine = window.__DEV_ENGINE__;
-//   const roomId = window.__DEV_ROOM_ID__;
-
-//   await engine.login();
-
-//   const roomControl = engine.createMainRoomControl(roomId);
-
-//   const userRole = FcrUserRole.HOST;
-
-//   const userName = 'host-user';
-
-//   await roomControl.join({
-//     userRole,
-//     userName,
-//     roomToken: window.__DEV_USER_TOKEN__,
-//     streamLatency: FcrStreamLatencyLevel.ULTRA_LOW,
-//     createStreamConfigs: [],
-//   });
-
-//   const userControl = roomControl.getUserControl();
-
-//   const uiEventStore = new FcrUIEventStore();
-//   const securityStore = new FcrSecurityStore(
-//     roomControl.getPrivilegeControl(),
-//     roomControl.getUserControl(),
-//     roomControl.getStreamControl(),
-//     uiEventStore,
-//   );
-//   const deviceStore = new FcrDeviceStore(engine.getDesktopMediaControl(), uiEventStore);
-//   const config = {
-//     mediaControl: engine.getDesktopMediaControl(),
-//     roomControl,
-//     securityStore,
-//     deviceStore,
-//     uiEventStore,
-//     roomStore: new FcrRoomStore(uiEventStore, deviceStore, {} as FcrUISceneConfig, engine),
-//     streamControl: roomControl.getStreamControl(),
-//     userControl,
-//     privilegeControl: roomControl.getPrivilegeControl(),
-//     interpreterControl: roomControl.getInterpreterControl(),
-//     chatRoomControl: roomControl.getChatRoomControl(),
-//     engine: null as any,
-//     remoteVideoRenderManager: null as any,
-//     config: null as any,
-//     parameters: null as any,
-//   };
-//   const deviceStreamStore = new FcrDeviceStreamStore(config);
-
-//   const uiModule = new FcrActionBarUIModule({ ...config, deviceStreamStore });
-
-//   const App = hot(() => {
-//     useUnmount(() => {
-//       uiModule?.release();
-//       roomControl.leave();
-//       engine.logout();
-//     });
-
-//     return uiModule?.getComponent();
-//   });
-
-//   ReactDOM.render(
-//     <Layout>
-//       <App />
-//     </Layout>,
-//     document.querySelector('#root')!,
-//   );
-// });
-"use strict";

package/lib/modules/annotation/annotation-index.d.ts

@@ -1,2 +0,0 @@
-import './style.css';
-export declare const Toolbar: () => import("react/jsx-runtime").JSX.Element;

package/lib/modules/annotation/annotation-index.js

@@ -1,80 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Toolbar = void 0;
-require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.date.to-string.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.map.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _mobxReact = require("mobx-react");
-var _react = require("react");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _icon = require("agora-ui-foundation/lib/components/icon");
-var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _i18n = require("agora-ui-foundation/lib/i18n");
-var _annotationToolbarStore = require("./annotation-toolbar-store");
-var _moveHandle = require("./components/move-handle");
-var _foldIcon = _interopRequireDefault(require("./components/icons/fold-icon"));
-require("./style.css");
-var _hooks = require("./hooks");
-var _jsxRuntime = require("react/jsx-runtime");
-var Toolbar = exports.Toolbar = (0, _mobxReact.observer)(function () {
-  var _useAnnotationVisible = (0, _hooks.useAnnotationVisibleTools)(),
-    mainTools = _useAnnotationVisible.mainTools;
-  var _useContext = (0, _react.useContext)(_annotationToolbarStore.AnnotationReceiverToolbarContext),
-    repositionToolbar = _useContext.repositionToolbar;
-  var transI18n = (0, _i18n.useI18n)();
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    folded = _useState2[0],
-    setFolded = _useState2[1];
-  var handleFoldClick = function handleFoldClick() {
-    setFolded(!folded);
-  };
-  (0, _react.useEffect)(function () {
-    repositionToolbar();
-  }, []);
-  var clsn = (0, _classnames["default"])({
-    'fcr-board-toolbar--folded': folded,
-    // prevent first animation play
-    'fcr-board-toolbar--unfolded': typeof folded !== 'undefined' && !folded
-  });
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_moveHandle.DraggableWrapper, {
-    className: clsn,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "fcr-board-toolbar-main",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
-        className: "fcr-board-toolbar-list",
-        children: mainTools.map(function (_ref, i) {
-          var renderItem = _ref.renderItem;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
-            children: renderItem()
-          }, i.toString());
-        })
-      })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "fcr-board-toolbar-fold",
-      onClick: handleFoldClick,
-      children: !folded ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_foldIcon["default"], {}) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "fcr-board-toobar-folded-button",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-          type: _type.FcrIconType.FCR_WHITEBOARD_EXPAND2,
-          colors: {
-            iconPrimary: '#000',
-            iconSecondary: '#000'
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          children: transI18n('fmt_screenshare_whiteboard_button_spread')
-        })]
-      })
-    })]
-  });
-});

package/lib/modules/annotation/annotation-toolbar-store.d.ts

@@ -1,75 +0,0 @@
-import { FcrBoardShape, WhiteboardThemeType } from '../whiteboard/type';
-import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
-import { FcrPrivilegedAnnotationControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/annotation-control/type';
-export declare class AnnotationReceiverToolbarStore {
-    private _whiteboardControl;
-    private _roomControl;
-    private _eventProvider;
-    private _sharedAnnotationDataSource;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _lastStrokeWidth;
-    private _boardObserver;
-    private _whiteboardObserver;
-    accessor observables: {
-        currentTool: FcrBoardToolType | undefined;
-        currentShape: FcrBoardShape | undefined;
-        currentColor: string;
-        currentStrokeWidth: number;
-        currentThemeType: WhiteboardThemeType;
-        toolbarPosition: {
-            x: number;
-            y: number;
-        };
-        toolbarReleased: boolean;
-        toolbarDockPosition: {
-            x: number | undefined;
-            y: number | undefined;
-            placement: "left" | "right";
-        };
-        redoSteps: boolean;
-        undoSteps: boolean;
-        lastPen: FcrBoardShape | undefined;
-        lastShape: FcrBoardShape | undefined;
-        maxCountVisibleTools: number;
-        layoutReady: boolean;
-        colors: string[];
-        commonColorIndex: number;
-        background: string;
-        commonColors: string[];
-        progress: number;
-    };
-    get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
-    get boardMainWindow(): import("fcr-core/lib/room-control/whiteboard-control/types").FcrBoardMainWindow | null;
-    constructor(_whiteboardControl: FcrPrivilegedAnnotationControl, _roomControl: FcrBaseRoomControl, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
-    resetToolbarVars(): void;
-    get annotationHasStart(): boolean;
-    redo(): void;
-    undo(): void;
-    clean(): void;
-    setTool(tool: FcrBoardToolType): void;
-    setPen(shape: FcrBoardShape): void;
-    setShape(shape: FcrBoardShape): void;
-    setStrokeColor(color: string): void;
-    setStrokeWidth(strokeWidth: number): void;
-    clickExpansionTool(): void;
-    setToolbarPosition(pos: {
-        x: number;
-        y: number;
-    }): void;
-    dragToolbar(): void;
-    releaseToolbar(): void;
-    captureScreen(hideWindow?: boolean): void;
-    saveDraft(): void;
-    setCommonColor(color: string): void;
-    repositionToolbar(): void;
-    release(): void;
-    private _updateDockPlacement;
-    private _updateDockPosition;
-    private _updateMaxVisibleTools;
-    private _getSnapshotImage;
-    private _convertShapeToBoardToolType;
-}
-export declare const AnnotationReceiverToolbarContext: import("react").Context<AnnotationReceiverToolbarStore>;