architwin 1.13.0 → 1.13.1

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

@@ -167,6 +167,7 @@ i18n
                 "RotateMinimap": "Rotate Minimap",
                 "General Settings": "General Settings",
                 "UploadImage": "Upload Image",
+                "Unsend": "Unsend",
                 "Pipes": "Pipes",
                 "SelectPipeType": "Select Pipe Type",
                 "AddPipeType": "Add Pipe Type",
@@ -255,7 +256,7 @@ i18n
                 "Object": "オブジェクト",
                 "Minimap": "ミニマップ",
                 "Meeting": "打ち合わせ",
-                "Screenshot": "スクリーンショット",
+                "Screenshot": "スクショ",
                 "Close": "閉じる",
                 "Translate": "移動",
                 "Rotate": "回転",
@@ -355,9 +356,10 @@ i18n
                 "General Settings": "一般設定",
                 "BIM Settings": "BIM設定",
                 "Due to restrictions, original minimap is unavailable in password protected spaces. Please select and setup a custom minimap instead.": "制限事項により、パスワードで保護されたスペースではオリジナルのミニマップはご利用いただけません。代わりにカスタムミニマップを選択して設定してください。",
-                "RotateMinimap": "ミニマップの回転",
+                "RotateMinimap": "画像回転",
                 "Search...": "検索...",
                 "UploadImage": "画像をアップロード",
+                "Unsend": "取り消し",
                 "Pipes": "配管",
                 "SelectPipeType": "配管種別選択",
                 "AddPipeType": "配管種別を追加",

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

@@ -17,3 +17,4 @@ export declare function renderCategoryDropdownOptions(elementId: string, items:
 export declare function renderSubcategoryDropdownOptions(elementId: string, items: Array<ITagCategory>): void;
 export declare function clearTagFormDropdown(): void;
 export declare function clearTagFilterDropdown(): void;
+export declare function setTagFormMode(formMode: FORM_MODE): void;

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

@@ -7,7 +7,7 @@ let tagNameInput, tagDescriptionInput, tagEmbedInput, tagCategoryDropdown, tagSu
 let selectedCategoryId = undefined;
 let selectedSubCategoryId = undefined;
 let isChevronEventAdded = false;
-export let tagFormMode = "ADD" /* FORM_MODE.ADD */;
+export let tagFormMode = "NONE" /* FORM_MODE.NONE */;
 export let selectedTag = undefined;
 export function renderTagFormPane() {
     const element = document.createElement('div');
@@ -531,3 +531,6 @@ export function clearTagFilterDropdown() {
     }
     selectOption(noSelection, 'at-subcategory-filter-dropdown-toggle', subcatSkipToggle);
 }
+export function setTagFormMode(formMode) {
+    tagFormMode = formMode;
+}

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

@@ -134,6 +134,7 @@ export function renderTagMessage(message, optimisticUpdate = false) {
     //const created_on = format(new Date(), 'yyyy-MM-dd HH:mm:ss')
     const parsedDate = parseISO(message.created_on);
     const created_on = dateToString(parsedDate);
+    const displayUnsendBtn = `display: ${message.is_sender ? 'block' : 'none'}`;
     if (optimisticUpdate && message.binaryFile) {
         const reader = new FileReader();
         reader.onload = function (event) {
@@ -153,8 +154,8 @@ export function renderTagMessage(message, optimisticUpdate = false) {
                         ` : ``}
                         <small>${created_on}</small><br>
                         <div class="at_flex at_justify_center at_comment_unsend_container" style="${checkTimeoutDifference(message.created_on, 'check') == true ? 'at_comment_unsend_container' : 'display: none'} id="at-unsend-container-${message.uuid}">
-                            <small class="mdi mdi-arrow-u-left-top at_text_xxs at_align_center at_comment_unsend_text">&nbsp;</small>
-                            <small class="at_text_xxs at_align_center at_comment_unsend_text" id="at-unsend-user-text-${created_on}">Unsend</small>
+                            <small class="mdi mdi-arrow-u-left-top at_text_xxs at_align_center at_comment_unsend_text" style="${displayUnsendBtn}">&nbsp;</small>
+                            <small class="at_text_xxs at_align_center at_comment_unsend_text" id="at-unsend-user-text-${created_on}" style="${displayUnsendBtn}">${i18n.t('Unsend')}</small>
                         </div>
                     </div>
                 </div>
@@ -179,8 +180,8 @@ export function renderTagMessage(message, optimisticUpdate = false) {
                     ` : ``}
                     <small>${created_on}</small><br>
                     <div class="at_flex at_justify_center at_comment_unsend_container" id="at-unsend-container-${message.uuid}" style="${checkTimeoutDifference(message.created_on, 'check') == true ? 'at_comment_unsend_container' : 'display: none'}">
-                        <small class="mdi mdi-arrow-u-left-top at_text_xxs at_align_center at_comment_unsend_text">&nbsp;</small>
-                        <small class="at_text_xxs at_align_center at_comment_unsend_text" id="at-unsend-admin-text-${message.uuid}" value="${message.uuid}">Unsend</small>
+                        <small class="mdi mdi-arrow-u-left-top at_text_xxs at_align_center at_comment_unsend_text" style="${displayUnsendBtn}">&nbsp;</small>
+                        <small class="at_text_xxs at_align_center at_comment_unsend_text" id="at-unsend-admin-text-${message.uuid}" value="${message.uuid}" style="${displayUnsendBtn}">${i18n.t('Unsend')}</small>
                     </div>
                 </div>
 
@@ -350,7 +351,6 @@ export function unsendComment(payload) {
 }
 // this sets the Interval to check if Timeout hadn't pass yet
 export function timedoutComment(payload) {
-    console.log('timedoutComment()', payload);
     setInterval(function () {
         // console.log("This message prints every 5 seconds.", payload);
         payload.filter((message) => __awaiter(this, void 0, void 0, function* () {

package/lib/atwinui/events.js

@@ -11,8 +11,8 @@ import { actionBar, renderObjectCards, renderLibraryCards, renderTags, renderTag
 import { getTargetPosition, addMediaScreen, _3DXObjects, selectedObject, setTransformControls, copyObject, revertTransform, clearSelectedObject, removeTransformControls, getLibrary, getMpTags, renderTag, captureSpaceScreenshot, moveTag, subscribeSpaceEvent, setModelVisibility, disposeModel, disposeTag, _tags, _tagCategories, dispatchSpaceEvent, editTagLabel, editTagDescription, setTagMessageRecepients, setTagMessages, setSelectedTagUuid, renderMeetingSidebar, setTagIcon, setObjectTransformation, getSelectedObject, _atwin, isCdnMapDataAvailable, captureScreenshotAndCameraDetails, _mpConfig, cancelModelPlacement, _modelDetails, actionHistory, get3DXObjects, transformHistory, goToModel, themeManager, _partitionNodes, setSpacePartitionNodes, getSpaceId, setFloorBaseHeight, toggleWallVisibility, getChildrenOfModel, toggleFloorVisibility, renderPolygon, getCurrentPolygon, getFloorBaseHeight, setSelectedObject, redoDrawAction, undoDrawAction, setWallBaseHeight, clearWallBaseHeight, clearFloorBaseHeight, isToolbarFeatureEnabled, captureCurrentView, getCurrentFloor, setPipeCategories, setPipes, detachTagMedia, getTagDataCollection } from "../architwin";
 import { Notyf } from 'notyf';
 import 'notyf/notyf.min.css';
-import { SPACE_EVENTS, COORDINATE_SYSTEM, UNITS, DEGREE, MAP_OPTIONS } from "../types";
-import { initFormData } from "./components/toolbar/tagFormPane";
+import { SPACE_EVENTS, COORDINATE_SYSTEM, UNITS, DEGREE, MAP_OPTIONS, CUSTOM_MAP_MODE } from "../types";
+import { initFormData, setTagFormMode } from "./components/toolbar/tagFormPane";
 import { renderObjectList } from "./components/toolbar/objectListPane";
 import { renderLibraryList } from "./components/toolbar/libraryPane";
 import { renderObjectCard } from "./components/toolbar/card";
@@ -222,6 +222,7 @@ function toggleDisplayPane(targetId) {
                 }
                 if (paneId === 'at-tag-form-pane') {
                     log.info("Tag Form Pane");
+                    setTagFormMode("ADD" /* FORM_MODE.ADD */);
                     clearTagFormDropdown();
                     initFormData();
                     setTagCategoriesOption();
@@ -1049,6 +1050,7 @@ function handleSaveTag() {
         clearTagFormDropdown();
         iTag = null;
         saveTagBtn.classList.remove('at_disabled');
+        setTagFormMode("NONE" /* FORM_MODE.NONE */);
     }));
 }
 function handleScreenshot() {
@@ -2607,21 +2609,37 @@ function handleShowCustomMinimapSettings() {
         settingsBtn.addEventListener('click', () => {
             isCustomMapControlsVisible = !isCustomMapControlsVisible;
             if (mapControlsContainer) {
+                // Shows setting controls
                 if (isCustomMapControlsVisible) {
                     mapControlsContainer.classList.add('show');
                     minimapPane.classList.add('show-settings');
+                    minimap.setCustomMapMode(CUSTOM_MAP_MODE.EDIT);
+                    // Enter edit mode; Update sweep color
+                    updateSweepColor(CUSTOM_MAP_MODE.EDIT);
                 }
                 else {
+                    // Hides setting controld
                     mapControlsContainer.classList.remove('show');
                     if (minimap.getMinimapPosition().includes('bottom')) {
                         minimapPane.classList.add('no-transition');
                     }
                     minimapPane.classList.remove('show-settings');
+                    minimap.setCustomMapMode(CUSTOM_MAP_MODE.DEFAULT);
+                    // Exit edit mode; Back to default color
+                    updateSweepColor(CUSTOM_MAP_MODE.DEFAULT);
                 }
             }
         });
     }
 }
+function updateSweepColor(mode) {
+    const addClass = mode === CUSTOM_MAP_MODE.EDIT ? 'at_sweep_color_edit' : 'at_sweep_color_default';
+    const removeClass = mode === CUSTOM_MAP_MODE.EDIT ? 'at_sweep_color_default' : 'at_sweep_color_edit';
+    document.querySelectorAll('.at_custom_sweep').forEach(el => {
+        el.classList.remove(removeClass);
+        el.classList.add(addClass);
+    });
+}
 /**
  * Closes the custom minimap  panel.
  */

package/lib/minimap.d.ts

@@ -1,5 +1,5 @@
 import { MpSdk } from "../bundle/sdk";
-import { ISweep, SweepColor, DEGREE, CustomMapFloorData } from "./types";
+import { ISweep, SweepColor, DEGREE, CustomMapFloorData, CUSTOM_MAP_MODE } from "./types";
 import 'notyf/notyf.min.css';
 declare let isMinimapNavigation: boolean;
 interface FloorData {
@@ -120,4 +120,6 @@ declare function getCustomMapFloorData(index?: number): CustomMapFloorData[] | C
 declare function resetCustomMapSettingValues(): void;
 declare function setMpSDK(mpSdk: MpSdk): void;
 declare function getMpSdk(): MpSdk;
-export { isMinimapNavigation, mapPositions, setMap, showMinimap, hideMinimap, locateAvatar, resetSweepMarkerColors, renderOverlaySweep, showDirection, toggleMinimapVisibility, setSweepMarkerColor, setStandaloneMap, toggleMinimapFloor, getFloorsInSpace, createDropdown, setMinimapPosition, setCurrentMinimapPosition, setCustomMap, setupCustomMinimapPane, setCustomMinimapRotation, getCustomMinimapRotation, generateCustomMinimap, setCustomMapScale, setCustomMapTranslate, setCustomMapXOffset, setCustomMapYOffset, getCustomMapScale, getCustomMapTranslate, getCustomMapXOffset, getCustomMapYOffset, setMinAndMax, setCustomMapFloorData, getCustomMapFloorData, resetCustomMapSettingValues, getMinimapPosition, subscribeToFloorChanges, setMpSDK, getMpSdk };
+declare function setCustomMapMode(mode: CUSTOM_MAP_MODE): void;
+declare function getCustomMapMode(): CUSTOM_MAP_MODE;
+export { isMinimapNavigation, mapPositions, setMap, showMinimap, hideMinimap, locateAvatar, resetSweepMarkerColors, renderOverlaySweep, showDirection, toggleMinimapVisibility, setSweepMarkerColor, setStandaloneMap, toggleMinimapFloor, getFloorsInSpace, createDropdown, setMinimapPosition, setCurrentMinimapPosition, setCustomMap, setupCustomMinimapPane, setCustomMinimapRotation, getCustomMinimapRotation, generateCustomMinimap, setCustomMapScale, setCustomMapTranslate, setCustomMapXOffset, setCustomMapYOffset, getCustomMapScale, getCustomMapTranslate, getCustomMapXOffset, getCustomMapYOffset, setMinAndMax, setCustomMapFloorData, getCustomMapFloorData, resetCustomMapSettingValues, getMinimapPosition, subscribeToFloorChanges, setMpSDK, getMpSdk, setCustomMapMode, getCustomMapMode };

package/lib/minimap.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as superviz from './superviz';
 import { _mpConfig, getCurrentCameraPose, getCurrentSweep, getMapConfig, dispatchSpaceEvent, isCdnMapDataAvailable, getCurrentFloor, minimap } from "./architwin";
-import { SPACE_EVENTS, DEGREE, MAP_OPTIONS } from "./types";
+import { SPACE_EVENTS, DEGREE, MAP_OPTIONS, CUSTOM_MAP_MODE } from "./types";
 import { isValidCSSColor } from "./color";
 import { _participants } from "./participant";
 import { getAtwinSdk } from "./architwin";
@@ -46,6 +46,7 @@ let _customMapContainer;
 let _customMapFloorData = [];
 let _minimapPosition = "bottomRight";
 let _mpSdk;
+let _customMapMode = CUSTOM_MAP_MODE.DEFAULT;
 let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500, types: [
         {
             type: 'info',
@@ -1343,7 +1344,12 @@ function displaySweepToCustomMap(sweepItem, mpSdk) {
     const posY = sweepItem.y;
     let thisSweep = document.createElement('button');
     log.info("getCurrentSweep().id ==> ", getCurrentSweep().id);
-    const cList = getCurrentSweep().id === sweepItem.id ? 'at_custom_sweep active' : 'at_custom_sweep';
+    const isActive = getCurrentSweep().id === sweepItem.id;
+    const isDefaultMode = _customMapMode === CUSTOM_MAP_MODE.DEFAULT;
+    const cList = isActive
+        ? 'at_custom_sweep active'
+        : `at_custom_sweep ${isDefaultMode ? 'at_sweep_color_default' : 'at_sweep_color_edit'}`;
+    // const cList = getCurrentSweep().id === sweepItem.id ? 'at_custom_sweep active' : 'at_custom_sweep'
     const scaleX = _customMapScale;
     const scaleY = (_customMapScale * 21 / 9) / _customMapTranslate;
     const scaledX = scaleToContainer(posX, minX, maxX, scaleX, 0);
@@ -1618,8 +1624,15 @@ function setMpSDK(mpSdk) {
 function getMpSdk() {
     return _mpSdk;
 }
+function setCustomMapMode(mode) {
+    log.info("__@ setCustomMapMode: ", mode);
+    _customMapMode = mode;
+}
+function getCustomMapMode() {
+    return _customMapMode;
+}
 export { 
 // _miniMapData as minimapData,
 isMinimapNavigation, mapPositions, setMap, showMinimap, hideMinimap, locateAvatar, resetSweepMarkerColors, renderOverlaySweep, showDirection, toggleMinimapVisibility, setSweepMarkerColor, setStandaloneMap, toggleMinimapFloor, getFloorsInSpace, createDropdown, setMinimapPosition, setCurrentMinimapPosition, 
 // custom minimap
-setCustomMap, setupCustomMinimapPane, setCustomMinimapRotation, getCustomMinimapRotation, generateCustomMinimap, setCustomMapScale, setCustomMapTranslate, setCustomMapXOffset, setCustomMapYOffset, getCustomMapScale, getCustomMapTranslate, getCustomMapXOffset, getCustomMapYOffset, setMinAndMax, setCustomMapFloorData, getCustomMapFloorData, resetCustomMapSettingValues, getMinimapPosition, subscribeToFloorChanges, setMpSDK, getMpSdk };
+setCustomMap, setupCustomMinimapPane, setCustomMinimapRotation, getCustomMinimapRotation, generateCustomMinimap, setCustomMapScale, setCustomMapTranslate, setCustomMapXOffset, setCustomMapYOffset, getCustomMapScale, getCustomMapTranslate, getCustomMapXOffset, getCustomMapYOffset, setMinAndMax, setCustomMapFloorData, getCustomMapFloorData, resetCustomMapSettingValues, getMinimapPosition, subscribeToFloorChanges, setMpSDK, getMpSdk, setCustomMapMode, getCustomMapMode };

package/lib/types.d.ts

@@ -1007,6 +1007,7 @@ export interface TagMessage {
     binaryFile?: File;
     created_on?: any;
     modified_on?: any;
+    is_sender?: boolean;
 }
 export interface EmbedlyData {
     author_name: string;
@@ -1116,7 +1117,8 @@ export declare const enum SCREEN_POSITIONS {
 }
 export declare const enum FORM_MODE {
     ADD = "ADD",
-    EDIT = "EDIT"
+    EDIT = "EDIT",
+    NONE = "NONE"
 }
 export declare enum ZOOM_COMMAND {
     TOGGLE_VIDEO_ON = "TOGGLE VIDEO ON",
@@ -1335,6 +1337,10 @@ export declare enum MAP_OPTIONS {
     DEFAULT_MAP = "Default Minimap",
     CUSTOM_MAP = "Custom Minimap"
 }
+export declare enum CUSTOM_MAP_MODE {
+    DEFAULT = "DEFAULT",
+    EDIT = "EDIT"
+}
 export interface VetexData {
     uuid: string;
     name: string;

package/lib/types.js

@@ -167,6 +167,11 @@ export var MAP_OPTIONS;
     MAP_OPTIONS["DEFAULT_MAP"] = "Default Minimap";
     MAP_OPTIONS["CUSTOM_MAP"] = "Custom Minimap";
 })(MAP_OPTIONS || (MAP_OPTIONS = {}));
+export var CUSTOM_MAP_MODE;
+(function (CUSTOM_MAP_MODE) {
+    CUSTOM_MAP_MODE["DEFAULT"] = "DEFAULT";
+    CUSTOM_MAP_MODE["EDIT"] = "EDIT";
+})(CUSTOM_MAP_MODE || (CUSTOM_MAP_MODE = {}));
 export var COLLAPSE;
 (function (COLLAPSE) {
     COLLAPSE["TOGGLE_ID"] = "at-collapse-toggle-btn";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",

package/static/map.css

@@ -397,7 +397,7 @@ display: inline-block;
 	width: 0.5rem;
     opacity: var(--map-sweep-opacity);
 	/* border: 0.20rem solid rgba(255, 255, 0, 0.79); */
-	border: 0.20rem solid var(--map-sweep-color);
+	/* border: 0.20rem solid var(--map-sweep-color); */
 	border-radius: 50%;
 	box-sizing: content-box;
 	background-color: transparent;
@@ -405,6 +405,14 @@ display: inline-block;
     cursor: pointer;
 }
 
+.at_sweep_color_edit {
+  border: 0.20rem solid rgba(255, 255, 0, 0.79);
+}
+
+.at_sweep_color_default {
+  border: 0.20rem solid var(--map-sweep-color);
+}
+
 .at_custom_sweep.active {
 	background-color: orangered;
 	/* background-color: var(--map-sweep-color); */