architwin 1.8.2 → 1.8.4

package/lib/atwinui/components/toolbar/i18n.js

@@ -81,7 +81,30 @@ i18n
                 "UpperLeft": "Upper left",
                 "UpperRight": "Upper right",
                 "BottomLeft": "Bottom left",
-                "BottomRight": "Bottom right"
+                "BottomRight": "Bottom right",
+                "AddRoom": "Add Room",
+                "EditRoom": "Edit Room",
+                "Memo": "Memo",
+                "WallHeight": "Wall Height",
+                "DrawPartition": "Draw Partition",
+                "DeleteRoom": "Delete Room",
+                "CompleteDrawing": "Complete Drawing",
+                "NoPartitionDisplay": "No partition to display",
+                "Partition": "Partition",
+                "Partitions": "Partitions",
+                "FloorsAndWalls": "Floors and Walls",
+                "Floor": "Floor",
+                "Wall": "Wall",
+                "ClickEditName": "Click to edit name",
+                "RoomCreation": "Room Creation",
+                "RoomTree": "Room Tree",
+                "Report": "Report",
+                "ALL": "ALL",
+                "FloorLevel": "Floor Level",
+                "Line": "Line",
+                "Name": "Name",
+                "NoRoomSave": "No Room Saved",
+                "NothingToReport": "Nothing to report. Please create a partition."
             }
         },
         ja: {
@@ -157,7 +180,29 @@ i18n
                 "UpperLeft": "左上",
                 "UpperRight": "右上",
                 "BottomLeft": "左下",
-                "BottomRight": "右下"
+                "BottomRight": "右下",
+                "RoomCreation": "ルーム作成",
+                "RoomTree": "ルーム構成",
+                "Report": "レポート作成",
+                "ALL": "全選択",
+                "AddRoom": "ルーム追加",
+                "EditRoom": "ルーム編集",
+                "Memo": "メモ",
+                "WallHeight": "高さ",
+                "DrawPartition": "区画描画",
+                "DeleteRoom": "ルーム削除",
+                "CompleteDrawing": "描画完了",
+                "NoPartitionDisplay": "表示する区画がありません",
+                "Partition": "区画",
+                "Partitions": "区画",
+                "FloorsAndWalls": "床と壁",
+                "Floor": "床",
+                "Wall": "壁",
+                "ClickEditName": "クリック",
+                "FloorLevel": "床の基本高",
+                "Line": "線",
+                "Name": "名前",
+                "NothingToReport": "Nothing to report. Please create a partition."
             }
         }
     },

package/lib/atwinui/components/toolbar/index.js

@@ -18,8 +18,10 @@ import { renderModelControlPane, toggleModelControl } from "./modelControlsPane"
 import { getURLParams } from "../../../utils";
 import './i18n';
 import i18n from './i18n';
+import { renderRoomLayerListPane } from "./roomCreation/roomLayerListPane";
+import { renderRoomFormPane } from "./roomCreation/roomFormPane";
 let iFrame, sidebarContainer;
-let menuBar, actionBar, objectListPane, addObjectPane, tagListPane, tagFormPane, addMediaScreenForm, libraryPane, tagMessagingPane, themePane, modelControlPane;
+let menuBar, actionBar, objectListPane, addObjectPane, tagListPane, tagFormPane, addMediaScreenForm, libraryPane, tagMessagingPane, themePane, modelControlPane, roomLayerListPane, roomFormPane;
 function getIframeElement(iframeId) {
     if (!iframeId || iframeId === '') {
         console.error("IframeId is empty or undefined");
@@ -83,9 +85,13 @@ function renderToolbarUI(payload) {
     tagMessagingPane = renderTagMessagingPane();
     themePane = renderThemePane();
     modelControlPane = renderModelControlPane();
+    roomLayerListPane = renderRoomLayerListPane();
+    roomFormPane = renderRoomFormPane();
     renderModal();
     sidebarContainer.appendChild(modelControlPane);
     sidebarContainer.appendChild(actionBar);
+    sidebarContainer.appendChild(roomLayerListPane);
+    sidebarContainer.appendChild(roomFormPane);
     sidebarContainer.appendChild(themePane);
     sidebarContainer.appendChild(tagMessagingPane);
     sidebarContainer.appendChild(libraryPane);
@@ -109,6 +115,8 @@ function renderToolbarUI(payload) {
     libraryPane.style.display = 'none';
     tagMessagingPane.style.display = 'none';
     themePane.style.display = 'none';
+    roomLayerListPane.style.display = 'none';
+    roomFormPane.style.display = 'none';
     const customTheme = window.localStorage.getItem('customizedTheme');
     if (customTheme && customTheme !== '') {
         console.log("customTheme: ", customTheme);

package/lib/atwinui/components/toolbar/menuBar.d.ts

@@ -1,5 +1,8 @@
 export declare let activeMenu: HTMLElement;
 export declare let isObjectListEnabled: boolean;
+export declare let isMeetingEnabled: boolean;
+export declare let isThemeEnabled: boolean;
+export declare let isRoomCreationEnabled: boolean;
 export declare function renderMenuBar(iFrame: HTMLIFrameElement): HTMLDivElement;
 export declare function setActiveMenu(id: string): void;
 export declare function clearActiveMenu(id: string): void;

package/lib/atwinui/components/toolbar/menuBar.js

@@ -4,8 +4,9 @@ import i18n from "./i18n";
 import { toggleActionBar } from "../../events";
 export let activeMenu;
 export let isObjectListEnabled = true;
-let isMeetingEnabled = false;
-let isThemeEnabled = true;
+export let isMeetingEnabled = false;
+export let isThemeEnabled = true;
+export let isRoomCreationEnabled = true;
 export function renderMenuBar(iFrame) {
     if (!iFrame) {
         log.error(`Could not find target iFrame`);
@@ -32,7 +33,7 @@ export function renderMenuBar(iFrame) {
     </div>
     <div class="at_sidebar_button_icon" style="display:${isMeetingEnabled ? 'block' : 'none'}">
         <span class="mdi mdi-message-video" id="at-videocall-btn" data-cy="at-videocall-btn" target-pane="at-video-call-pane"></span>
-        div class="at_icon_tooltip" data-cy="at-tooltip-meeting">${i18n.t('Meeting')}</div>
+        <div class="at_icon_tooltip" data-cy="at-tooltip-meeting">${i18n.t('Meeting')}</div>
     </div>
     <div class="at_sidebar_button_icon">
         <span class="mdi mdi-monitor-screenshot" id="at-screenshot-btn" data-cy="at-screenshot-btn"></span>
@@ -42,6 +43,10 @@ export function renderMenuBar(iFrame) {
         <span class="mdi mdi-palette" id="at-theme-picker-btn" data-cy="at-theme-picker-btn" target-pane="at-theme-pane"></span>
         <div class="at_icon_tooltip" data-cy="at-tooltip-theme">${i18n.t('Theme')}</div>
     </div>
+    <div class="at_sidebar_button_icon" style="display:${isRoomCreationEnabled ? 'block' : 'none'}">
+        <span class="mdi mdi-ruler-square-compass" id="at-room-creation-btn" data-cy="at-room-creation-btn" target-pane="at-room-tree-pane"></span>
+        <div class="at_icon_tooltip" data-cy="at-tooltip-theme">${i18n.t('RoomCreation')}</div>
+    </div>
     `;
     return menuBarElement;
 }
@@ -50,19 +55,29 @@ export function renderMenuBar(iFrame) {
  * based on the configuration specified in the _mpConfig object.
  */
 function setMenuItemsStatus() {
-    // MEETING
-    if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.meeting !== undefined) {
-        isMeetingEnabled = _mpConfig.toolbarConfig.menuItems.meeting;
-    }
-    log.info("__@ isMeetingEnabled: ", isMeetingEnabled);
-    // OBJECT
-    if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.models !== undefined) {
-        isObjectListEnabled = _mpConfig.toolbarConfig.menuItems.models;
-        log.info("__@ isObjectListEnabled: ", isObjectListEnabled);
-    }
-    // THEME
-    if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.theme !== undefined) {
-        isThemeEnabled = _mpConfig.toolbarConfig.menuItems.theme;
+    const toolbarConfig = _mpConfig.toolbarConfig;
+    const menuItems = _mpConfig.toolbarConfig.menuItems;
+    if (toolbarConfig && menuItems) {
+        // MEETING
+        if (menuItems.meeting !== undefined) {
+            isMeetingEnabled = _mpConfig.toolbarConfig.menuItems.meeting;
+            log.info("__@ isMeetingEnabled: ", isMeetingEnabled);
+        }
+        // OBJECT
+        if (menuItems.models !== undefined) {
+            isObjectListEnabled = _mpConfig.toolbarConfig.menuItems.models;
+            log.info("__@ isObjectListEnabled: ", isObjectListEnabled);
+        }
+        // THEME
+        if (menuItems.theme !== undefined) {
+            isThemeEnabled = _mpConfig.toolbarConfig.menuItems.theme;
+            log.info("__@ isThemeEnabled: ", isThemeEnabled);
+        }
+        // ROOM CREATION
+        if (menuItems.roomCreation !== undefined) {
+            isRoomCreationEnabled = _mpConfig.toolbarConfig.menuItems.roomCreation;
+            log.info("__@ isRoomCreationEnabled: ", isRoomCreationEnabled);
+        }
     }
 }
 export function setActiveMenu(id) {
@@ -80,6 +95,7 @@ export function setActiveMenu(id) {
         case 'at-object-list-btn':
         case 'at-minimap-btn':
         case 'at-theme-picker-btn':
+        case 'at-room-creation-btn':
             if (parent.classList.contains('at_sidebar_button_icon_active')) {
                 // remove
                 log.info("removing active...");

package/lib/atwinui/components/toolbar/objectListPane.js

@@ -47,7 +47,7 @@ export function renderObjectListPane(cardList) {
             </div>
         </div>
         <div class="at_flex at_justify_center at_price" id="at-bundle-version" data-cy="at-bundle-version">
-            <small style="font-size: 0.65em; color: white; opacity: 50%;">${getBundleVersion()}</small>
+            <small class="at_text_xxs at_text_white at_opacity_5">${getBundleVersion()}</small>
         </div>
     `;
     return element;

package/lib/atwinui/components/toolbar/roomCreation/roomFormPane.d.ts

@@ -0,0 +1,12 @@
+import { FORM_MODE, RoomNode, PolygonData } from "../../../../types";
+export declare function renderRoomFormPane(): HTMLDivElement;
+export declare function toggleDrawPartionButton(): void;
+export declare function renderRoomFormMode(): void;
+export declare function clearRoomForm(): void;
+export declare function getRoomFormData(): RoomNode;
+export declare function getPartitionFormData(): Array<RoomNode>;
+export declare function setPartitionSavingMode(mode: boolean): void;
+export declare function getPartitionSavingMode(): boolean;
+export declare function setRoomFormMode(formType: FORM_MODE): void;
+export declare function getRoomFormMode(): FORM_MODE;
+export declare function setPolygonData(payload: PolygonData): void;