architwin 1.7.3 → 1.7.4

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

@@ -77,7 +77,11 @@ i18n
                 "Copy": "Copy",
                 "Undo": "Undo",
                 "Redo": "Redo",
-                "Confirm": "Confirm"
+                "Confirm": "Confirm",
+                "UpperLeft": "Upper left",
+                "UpperRight": "Upper right",
+                "BottomLeft": "Bottom left",
+                "BottomRight": "Bottom right"
             }
         },
         ja: {
@@ -149,7 +153,11 @@ i18n
                 "Copy": "複写",
                 "Undo": "やり直し",
                 "Redo": "もう一度",
-                "Confirm": "確認する"
+                "Confirm": "確認する",
+                "UpperLeft": "左上",
+                "UpperRight": "右上",
+                "BottomLeft": "左下",
+                "BottomRight": "右下"
             }
         }
     },

package/lib/convert.d.ts

@@ -1,11 +1,6 @@
-export declare let generatedIds: Array<number>;
 export declare function meterToMillimeter(meter: number, decimal?: number): number;
 export declare function generateRandomUniqueNumber(currentIds: Array<number>): number;
-export declare function generateUUID(config?: {
-    length?: number;
-    separator?: string;
-}): string;
-export declare function generateRandomUsername(): string;
+export declare function generateUUID(): string;
 export declare function useHexToRgb(hexcode: string): {
     r: number;
     g: number;
@@ -16,11 +11,3 @@ export declare function useRgbToHex(color: {
     g: number;
     b: number;
 }): string;
-export declare function convertToCssRgb(values: {
-    r: number;
-    g: number;
-    b: number;
-}): string;
-export declare function arrayBufferToBase64(buffer: any): string;
-export declare function isUrlValid(userInput: string): boolean;
-export declare function dateTimeFormat(d: any): string;

package/lib/convert.js

@@ -1,6 +1,3 @@
-import { format, toDate } from 'date-fns';
-import { ja } from 'date-fns/locale';
-export let generatedIds = [];
 export function meterToMillimeter(meter, decimal = 2) {
     const mm = meter * 1000;
     return parseFloat(mm.toFixed(decimal));
@@ -16,7 +13,7 @@ export function generateRandomUniqueNumber(currentIds) {
     } while (currentIds.indexOf(randomNumber) !== -1);
     return randomNumber;
 }
-export function generateUUID(config) {
+export function generateUUID() {
     const cryptoObj = window.crypto;
     if (!cryptoObj) {
         console.error('crypto.getRandomValues() is not supported in this browser.');
@@ -32,42 +29,16 @@ export function generateUUID(config) {
         }
         hex.push(val);
     }
-    let randUUID = `${hex[0]}${hex[1]}-${hex[2]}-${hex[3]}-${hex[4]}-${hex[5]}${hex[6]}${hex[7]}`;
-    if (config && config.length) {
-        console.log('Length set');
-        randUUID = randUUID.slice(0, config.length);
-    }
-    if (config && config.separator) {
-        console.log('Separator set');
-        if (config.separator === 'none') {
-            randUUID = randUUID.replace(/-/g, config.separator);
-        }
-    }
-    return randUUID;
-}
-export function generateRandomUsername() {
-    // Helper function to generate a random word
-    function getRandomWord(length) {
-        let result = '';
-        const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-        const charactersLength = characters.length;
-        for (let i = 0; i < length; i++) {
-            result += characters.charAt(Math.floor(Math.random() * charactersLength));
-        }
-        return result;
-    }
-    const randomWord = getRandomWord(Math.floor(Math.random() * 5) + 4);
-    const randomNumber = Math.floor(Math.random() * 10000);
-    const username = `${randomWord}${randomNumber}`;
-    return username;
+    // The UUID string format is "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    return `${hex[0]}${hex[1]}-${hex[2]}-${hex[3]}-${hex[4]}-${hex[5]}${hex[6]}${hex[7]}`;
 }
 export function useHexToRgb(hexcode) {
     // Remove '#' symbol if it exists
     hexcode = hexcode.replace("#", "");
     // Parse hex values for red, green, and blue
-    const r = parseInt(hexcode.substring(0, 2), 16) / 255;
-    const g = parseInt(hexcode.substring(2, 4), 16) / 255;
-    const b = parseInt(hexcode.substring(4, 6), 16) / 255;
+    const r = parseInt(hexcode.substring(0, 2), 16);
+    const g = parseInt(hexcode.substring(2, 4), 16);
+    const b = parseInt(hexcode.substring(4, 6), 16);
     return { r, g, b };
 }
 export function useRgbToHex(color) {
@@ -81,31 +52,3 @@ export function useRgbToHex(color) {
     const hexB = color.b.toString(16).padStart(2, "0");
     return `${hexR}${hexG}${hexB}`;
 }
-export function convertToCssRgb(values) {
-    // console.log('convertToCssRgb()', values)
-    if (!values) {
-        console.log('values is undefined');
-        return;
-    }
-    let r = Math.round(values.r * 255);
-    let g = Math.round(values.g * 255);
-    let b = Math.round(values.b * 255);
-    return `rgb(${r},${g},${b})`;
-}
-export function arrayBufferToBase64(buffer) {
-    let binary = '';
-    const bytes = new Uint8Array(buffer);
-    const len = bytes.byteLength;
-    for (let i = 0; i < len; i++) {
-        binary += String.fromCharCode(bytes[i]);
-    }
-    return btoa(binary);
-}
-export function isUrlValid(userInput) {
-    const urlPattern = /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/;
-    return urlPattern.test(userInput);
-}
-export function dateTimeFormat(d) {
-    const local = format(toDate(d), 'yyyy年M月d日 HH:mm:ss', { locale: ja });
-    return local;
-}

package/lib/minimap.d.ts

@@ -41,7 +41,7 @@ declare function getFloorsInSpace(): FloorData[];
 declare function setStandaloneMap(modelId: string, appKey: string, mapId: string): Promise<void>;
 /**
  * This function creates the dropdown (HTLMElement) for available positions that Minimap can be set
- * @param options An array of strings representing the minimap positions (e.g., 'topLeft','bottomRight').
+ * @param mapPositions An array of strings representing the minimap positions (e.g., 'topLeft','bottomRight').
 * @returns HTLMElement with the specified position options.
  */
 declare function createDropdown(mapPositions: string[]): Promise<HTMLDivElement>;

package/lib/minimap.js

@@ -866,11 +866,6 @@ function setStandaloneMap(modelId, appKey, mapId) {
         toggleSweepMarkerFloors(0);
     });
 }
-/**
- * This function creates the dropdown (HTLMElement) for available positions that Minimap can be set
- * @param options An array of strings representing the minimap positions (e.g., 'topLeft','bottomRight').
-* @returns HTLMElement with the specified position options.
- */
 // async function createDropdown(options: string[]) {
 //     const element = document.createElement('div')
 //     element.classList.add('at_flex', 'at_justify_end')
@@ -894,11 +889,23 @@ function setStandaloneMap(modelId, appKey, mapId) {
 //     element.appendChild(dropdown)
 //     return element;
 // }
+/**
+ * This function creates the dropdown (HTLMElement) for available positions that Minimap can be set
+ * @param mapPositions An array of strings representing the minimap positions (e.g., 'topLeft','bottomRight').
+* @returns HTLMElement with the specified position options.
+ */
 function createDropdown(mapPositions) {
     return __awaiter(this, void 0, void 0, function* () {
         log.info('createDropdown');
         const element = document.createElement('div');
         element.setAttribute('id', 'at-map-dropdown');
+        // const formattedPositions = mapPositions.map(position => {
+        //     return position
+        //         .replace('top', 'Upper ')
+        //         .replace('bottom', 'Bottom ')
+        //         .replace('Left', 'left')
+        //         .replace('Right', 'right');
+        // });
         element.innerHTML = `
         <div style="height: 20px; padding-left: 3px" class="at_flex at_items_center">    
             <span class="mdi mdi-overscan" style="color: white; cursor: pointer;" id="at-map-position-dropdown" data-cy="at-map-position-dropdown"></span>
@@ -907,16 +914,16 @@ function createDropdown(mapPositions) {
         <div style="position:absolute;">
             <div class="at_dropdown_options" style="z-index: 999 !important; width: 150px !important;" id="at-map-position-options" data-cy="at-map-position-options">
                 <div id="at_map_bottom_right" class="at_dropdown at_flex at_items_center at_option at_custom_dropdown_option">
-                    <span class="mdi mdi-pan-bottom-right">Bottom right</span>
+                    <span class="mdi mdi-pan-bottom-right">${i18n.t('BottomRight')}</span>
                 </div>
                 <div id="at_map_top_left" class="at_dropdown at_flex at_items_center at_option at_custom_dropdown_option">
-                    <span class="mdi mdi-pan-top-left">Upper left</span>
+                    <span class="mdi mdi-pan-top-left">${i18n.t('UpperLeft')}</span>
                 </div>
                 <div id="at_map_bottom_left" class="at_dropdown at_flex at_items_center at_option at_custom_dropdown_option">
-                    <span class="mdi mdi-pan-bottom-left">Bottom left</span>
+                    <span class="mdi mdi-pan-bottom-left">${i18n.t('BottomLeft')}</span>
                 </div>
                 <div id="at_map_top_right" class="at_dropdown at_flex at_items_center at_option at_custom_dropdown_option">
-                    <span class="mdi mdi-pan-top-right">Upper right</span>
+                    <span class="mdi mdi-pan-top-right">${i18n.t('UpperRight')}</span>
                 </div>
             </div>
         </div>
@@ -931,13 +938,6 @@ function mapPositionHandler(mapPositions) {
     const mapBottomRight = document.getElementById('at_map_bottom_right');
     const mapBottomLeft = document.getElementById('at_map_bottom_left');
     const options = document.getElementById('at-map-position-options');
-    const formattedPositions = mapPositions.map(position => {
-        return position
-            .replace('top', 'Upper ')
-            .replace('bottom', 'Bottom ')
-            .replace('Left', 'left')
-            .replace('Right', 'right');
-    });
     dropdown.addEventListener('click', () => {
         console.log("__@ Dropdown Clicked!");
         options.classList.toggle('open');

package/package.json

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

package/lib/atwinui/components/toolbar/menu-bar.d.ts

@@ -1,4 +0,0 @@
-import { LitElement } from 'lit';
-export declare class Menubar extends LitElement {
-    render(): import("lit-html").TemplateResult<1>;
-}

package/lib/atwinui/components/toolbar/menu-bar.js

@@ -1,35 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { html, LitElement } from 'lit';
-import { customElement } from 'lit/decorators.js';
-let Menubar = class Menubar extends LitElement {
-    render() {
-        return html `
-    <div class="at_toolbar_container" id="at-menu-bar">
-        <div class="at_sidebar_button_icon">
-            <span class="mdi mdi-bullseye" id="at-expand-btn"></span>
-        </div>
-        <div class="at_sidebar_button_icon">      
-            <span class="mdi mdi-cube-outline" id="at-object-list-btn"></span>
-        </div>
-        <div class="at_sidebar_button_icon">
-            <span class="mdi mdi-map"  id="at-minimap-btn" target-pane="at-map"></span>
-        </div>
-        <div class="at_sidebar_button_icon">
-            <span class="mdi mdi-message-video" id="at-videocall-btn"></span>
-        </div>
-        <div class="at_sidebar_button_icon">
-            <span class="mdi mdi-monitor-screenshot" id="at-screenshot-btn"></span>
-        </div>
-    </div>
-    `;
-    }
-};
-Menubar = __decorate([
-    customElement('at-menubar')
-], Menubar);
-export { Menubar };

package/lib/atwinui/components/toolbar/sidebar-container.d.ts

@@ -1,5 +0,0 @@
-import { LitElement } from 'lit';
-export declare class SidebarContainer extends LitElement {
-    checked: boolean;
-    render(): import("lit-html").TemplateResult<1>;
-}

package/lib/atwinui/components/toolbar/sidebar-container.js

@@ -1,27 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { html, LitElement } from 'lit';
-import { customElement, property } from 'lit/decorators.js';
-let SidebarContainer = class SidebarContainer extends LitElement {
-    constructor() {
-        super(...arguments);
-        this.checked = false;
-    }
-    render() {
-        return html `
-      <div class="at_sidebar_container at_topRight" id="at-sidebar-container">
-      </div>
-    `;
-    }
-};
-__decorate([
-    property()
-], SidebarContainer.prototype, "checked", void 0);
-SidebarContainer = __decorate([
-    customElement('at-sidebar-container')
-], SidebarContainer);
-export { SidebarContainer };