architwin 1.14.1 → 1.14.3

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

@@ -126,11 +126,11 @@ export function handleClickEventUserRow() {
                 _screenShareUser = user;
                 if (user.onlineStatus === 'offline')
                     return;
-                if (user.onlineStatus === 'sharing')
+                if (user.onlineStatus === 'in_session')
                     return;
                 if (user.onlineStatus === 'pending')
                     return;
-                if (user.onlineStatus === 'in_session') {
+                if (user.onlineStatus === 'sharing') {
                     if (!_screenShareSession) {
                         return;
                     }

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

@@ -19,5 +19,5 @@ export declare function searchTagList(tags: Array<ITag>): Array<ITag>;
 export declare function setSearchTagTerm(searchTagName: string): void;
 export declare function searchClearfield(): void;
 export declare const sortTags: (items: ITag[], options: SortConfig) => ITag[];
-export declare function updateSelectedTagSortOption(textSortOption: string): void;
+export declare function updateSelectedTagSortOption(sortOption: string): void;
 export declare function resetSelectedTagSortOption(): void;

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

@@ -17,6 +17,7 @@ import { Notyf } from 'notyf';
 import { _tagCategories } from "../../../architwin";
 import i18n from './i18n';
 import log from 'loglevel';
+// import { e } from "mathjs";
 let notify = new Notyf({ position: { x: 'left', y: 'bottom' } });
 let _tagLink;
 let isChevronEventAdded = false;
@@ -37,16 +38,16 @@ export function renderTagListPane() {
             <span>${i18n.t('Tags')}</span>
         </div>
         <div class="at_form_container at_h-min-65 at_tag_list_pane">
-            <!-- <div class="at_sort_btn_container">
+            <div class="at_sort_btn_container">
                 <div id="at-tag-sort-icon" class="mdi mdi-filter mdi-24px at_icon_hover">
                     <span id="at-tag-sort-options-tooltip" class="at_custom_tooltip">
-                        <p class="at_tag_sort_option at_sort_option_selected">Ascending</p>
-                        <p class="at_tag_sort_option">Descending</p>
-                        <p class="at_tag_sort_option">Newest</p>
-                        <p class="at_tag_sort_option">Oldest</p>
+                        <p class="at_tag_sort_option at_sort_option_selected" data-sort="Ascending">${i18n.t('Ascending')}</p>
+                        <p class="at_tag_sort_option" data-sort="Descending">${i18n.t('Descending')}</p>
+                        <p class="at_tag_sort_option" data-sort="Newest">${i18n.t('Newest')}</p>
+                        <p class="at_tag_sort_option" data-sort="Oldest">${i18n.t('Oldest')}</p>
                     </span>
                 </div>
-            </div> -->
+            </div>
             <div class="at_flex_row">
                 <input class="at_field_search_input" type="text" name="search_name" id="at-tag-name-search" data-cy="at-tag-name-search" placeholder=${i18n.t('Search...')}>
                 <span class="mdi mdi-close at_button_search_tag" id="at-clear-search-tag-name" style="display:none"></span>
@@ -530,12 +531,12 @@ export const sortTags = (items, options) => {
         return options.order === 'desc' ? -comparison : comparison;
     });
 };
-export function updateSelectedTagSortOption(textSortOption) {
-    selectedTagSortOption = sortTagOptions[textSortOption] || { by: 'label', order: 'asc' };
+export function updateSelectedTagSortOption(sortOption) {
+    selectedTagSortOption = sortTagOptions[sortOption] || { by: 'label', order: 'asc' };
     const tooltip = document.getElementById('at-tag-sort-options-tooltip');
     const options = tooltip.querySelectorAll('.at_tag_sort_option');
     options.forEach((option) => {
-        if (option.innerText === textSortOption) {
+        if (option.dataset.sort === sortOption) {
             option.classList.add('at_sort_option_selected');
         }
         else {
@@ -551,7 +552,7 @@ export function resetSelectedTagSortOption() {
         const options = tooltip.querySelectorAll('.at_tag_sort_option');
         if (options) {
             options.forEach((option) => {
-                if (option.innerText === 'Ascending') {
+                if (option.dataset.sort === 'Ascending') {
                     option.classList.add('at_sort_option_selected');
                 }
                 else {

package/lib/atwinui/events.js

@@ -19,7 +19,7 @@ import { renderObjectCard } from "./components/toolbar/card";
 import { toggleModelControl, getCoordinateValues, showCurrentCoordinateValue, handleModelControlInputs, setSelectedObjectCoordinateSystem, getSelectedObjectCoordinateSystem, getCurrentTransformationValues, setCurrentTransformationValues, getTransformValues, clearCurrentTransformationValues } from "./components/toolbar/modelControlsPane";
 import { attachTagMedia, handleTagPlacerCreated, cancelMoveTag } from "../tag";
 import i18n from './components/toolbar/i18n';
-import { isValidUrl, debounce, isElementVisible, extractUUID, showLoader } from "../utils";
+import { isValidUrl, debounce, isElementVisible, extractUUID, showLoader, isVec3Equal, isQuatEqual } from "../utils";
 import log from 'loglevel';
 import * as minimap from '../minimap';
 import { clearActiveThemeCard, getSelectedTheme } from "./components/toolbar/themePane";
@@ -1348,16 +1348,6 @@ function handleConfirmTransform() {
             const selected = getSelectedObject();
             if (transform) {
                 setObjectTransformation(selected.node, transform);
-                //clearCoordinateInputs()
-                //Add to the action history so it can be reverse with undo or redo
-                const currentTransform = JSON.stringify(transform);
-                actionHistory.push(currentTransform);
-                //@ts-expect-error
-                transformHistory.addAction(selected.object.id, transform.object_position, transform.object_rotation, transform.object_scale);
-                if (_mpConfig.toolbarConfig) {
-                    toggleActionBarButtons('at-redo-action-btn', transformHistory.canRedo(selected.object.id));
-                    toggleActionBarButtons('at-undo-action-btn', transformHistory.canUndo(selected.object.id));
-                }
                 //Emit a drag end event so app side can listen
                 const payload = selected.object;
                 payload.object_position = transform.object_position;
@@ -1397,6 +1387,24 @@ function handleConfirmTransform() {
                 activeElement.classList.remove("at_sidebar_button_icon_active");
                 removeTransformControls();
                 toggleModelControl(false);
+                // Add to the action history so it can be reversed with undo or redo
+                // Get the most recent action in the transformHistory
+                const { object_position: lastPos, object_rotation: lastRot, object_scale: lastScale } = JSON.parse(transformHistory.getTransformHistory(selected.object.id).at(transformHistory.getCurrentIndex(selected.object.id)));
+                const isPositionEqual = isVec3Equal(selected.node.position, lastPos);
+                // @ts-expect-error
+                const isRotationEqual = isQuatEqual(selected.node.obj3D.rotation, lastRot);
+                const isScaleEqual = isVec3Equal(selected.node.scale, lastScale);
+                // Only push actionHistory when the previous action is not equal to the current action
+                if (!isPositionEqual || !isRotationEqual || !isScaleEqual) {
+                    const currentTransform = JSON.stringify(transform);
+                    actionHistory.push(currentTransform);
+                    // @ts-expect-error
+                    transformHistory.addAction(selected.object.id, selected.node.position, selected.node.obj3D.rotation, selected.node.scale);
+                    if (_mpConfig.toolbarConfig) {
+                        toggleActionBarButtons('at-redo-action-btn', transformHistory.canRedo(selected.object.id));
+                        toggleActionBarButtons('at-undo-action-btn', transformHistory.canUndo(selected.object.id));
+                    }
+                }
             }
         });
     }
@@ -3170,7 +3178,6 @@ function handleClickEventInTagSortOption() {
     if (sortIcon) {
         sortIcon.addEventListener('mouseover', () => {
             const sortTooltip = document.getElementById('at-tag-sort-options-tooltip');
-            // console.log('Tooltip ready:', !!sortTooltip)
             // Only add the click listener once
             if (sortTooltip && !clickListenerAdded) {
                 clickListenerAdded = true;
@@ -3178,11 +3185,11 @@ function handleClickEventInTagSortOption() {
                     const target = event.target;
                     const closestOption = target.closest('.at_tag_sort_option');
                     if (closestOption) {
-                        const innerText = closestOption.innerText;
-                        updateSelectedTagSortOption(innerText);
+                        const sortOption = closestOption.dataset.sort;
+                        updateSelectedTagSortOption(sortOption);
                         const tags = getMpTags();
                         const filteredTags = filterTagList(tags);
-                        const sortConfig = sortTagOptions[innerText] || { by: 'label', order: 'asc' };
+                        const sortConfig = sortTagOptions[sortOption] || { by: 'label', order: 'asc' };
                         if (selectedCategoryFilterId || selectedSubCategoryFilterId) {
                             const sortedTags = sortTags(filteredTags, sortConfig);
                             renderTags(sortedTags);
@@ -3211,12 +3218,12 @@ function handleClickEventInObjectSortOption() {
                     const target = event.target;
                     const closestOption = target.closest('.at_object_sort_option');
                     if (closestOption) {
-                        const innerText = closestOption.innerText;
-                        updateSelectedObjectSortOption(innerText);
+                        const sortOption = closestOption.dataset.sort;
+                        updateSelectedObjectSortOption(sortOption);
                         const objectsInSpace = get3DXObjects();
                         const objectComponents = objectsInSpace.map(obj => obj.component);
                         const spaceObjects = objectsInSpace.filter(obj => obj.type !== 'POLYGON' && obj.type !== 'BASEPOINT').map(obj => obj.object);
-                        const sortConfig = sortObjectOptions[innerText] || { by: 'label', order: 'asc' };
+                        const sortConfig = sortObjectOptions[sortOption] || { by: 'label', order: 'asc' };
                         const sortedObjects = sortShowcaseObjects(spaceObjects, sortConfig);
                         renderObjectCards(sortedObjects, objectComponents);
                     }

package/lib/loaders/polydrawerLoader.js

@@ -325,7 +325,8 @@ export class TubeLine {
         }
     }
     onDestroy() {
-        this.texture.dispose();
+        var _a;
+        (_a = this.texture) === null || _a === void 0 ? void 0 : _a.dispose();
         if (this.panel) {
             this.panel.dispose();
             //@ts-expect-error

package/lib/utils.d.ts

@@ -91,3 +91,5 @@ export declare function convertMeasurement(value: any, fromUnit: any, toUnit: an
 export declare function showLoader(visible: boolean): void;
 export declare function percentToScale(percentValue: Vector3): Vector3;
 export declare function scaleToPercent(scaleValue: Vector3): Vector3;
+export declare function isVec3Equal(a: any, b: any): boolean;
+export declare function isQuatEqual(a: any, b: any): boolean;

package/lib/utils.js

@@ -449,3 +449,10 @@ export function scaleToPercent(scaleValue) {
         z: parseFloat((clampMin(scaleValue.z) * 100).toFixed(2)),
     };
 }
+// Helper for comparing {x, y, z}
+export function isVec3Equal(a, b) {
+    return a.x.toFixed(3) === b.x.toFixed(3) && a.y.toFixed(3) === b.y.toFixed(3) && a.z.toFixed(3) === b.z.toFixed(3);
+}
+export function isQuatEqual(a, b) {
+    return a._x.toFixed(3) === b._x.toFixed(3) && a._y.toFixed(3) === b._y.toFixed(3) && a._z.toFixed(3) === b._z.toFixed(3);
+}

package/package.json

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