@vitrosoftware/common-ui-ts 1.1.218 → 1.1.220

package/dist/src/constants/Factory.d.ts

@@ -9,4 +9,5 @@ export declare class SERVICE {
     static readonly CONTENT_TYPE = "ContentTypeService";
     static readonly LOOKUP_LIST_ITEM = "LookupListItemService";
     static readonly ITEM_SELECT_DIALOG = "ItemSelectDialogService";
+    static readonly AJAX = "AjaxService";
 }

package/dist/src/controls/Alert/Alert.d.ts

@@ -5,10 +5,6 @@ interface AlertProps {
     text?: string;
     type: TYPE;
     setMessage?: any;
-    actionList?: {
-        text: string;
-        onClick: () => any;
-    }[];
     onClose?: () => any;
     isDismissible?: boolean;
     isMultiline?: boolean;

package/dist/src/controls/TabGroup/Tab.d.ts

@@ -4,7 +4,7 @@ export interface TabProps {
     active: boolean;
     onClick: (index: number) => void;
     eventKey?: string;
-    icon?: string;
-    title: string;
+    imageUrl?: string;
+    text: string;
 }
-export declare const Tab: (props: TabProps) => JSX.Element | null;
+export declare const Tab: (props: TabProps) => JSX.Element;

package/dist/src/controls/TabGroup/models/Tab.d.ts

@@ -8,7 +8,7 @@ export interface Tab {
         };
     };
     eventKey?: string;
-    icon?: string;
     title?: string;
     isAlwaysShown?: boolean;
+    imageUrl?: string;
 }

package/dist/src/controls/TableView/TableView.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { interfaces } from 'inversify';
 import { models } from '../../models';
 import { services } from '../../services';
 export declare const TableView: (props: TableViewProps) => JSX.Element;
@@ -24,4 +25,5 @@ export interface TableViewProps {
     isReadOnly?: boolean;
     isNoVScroll?: boolean;
     className?: string;
+    container?: interfaces.Container;
 }

package/dist/src/controls/TableView/TableViewConstants.d.ts

@@ -144,7 +144,10 @@ export declare enum ATTRIBUTE {
     ADDED = "Added",
     FORMULA = "Formula",
     FORMAT = "Format",
-    SPAN = "Span"
+    SPAN = "Span",
+    LANG = "Lang",
+    GMT = "GMT",
+    ACTIONS = "Actions"
 }
 export declare enum DRAG_ITEM_TYPE {
     CANNOT_DROP = 0,

package/dist/src/controls/TableView/services/impl/TableViewOnCustomAjaxServiceImpl.d.ts

@@ -0,0 +1,21 @@
+import type { TableViewEventHandler } from '../TableViewEventHandler';
+import type { TableViewService } from '../TableViewService';
+import type { AjaxService } from '../../../../services/AjaxService';
+import { EVENT } from '../../TableViewConstants';
+export declare class TableViewOnCustomAjaxServiceImpl implements TableViewEventHandler {
+    readonly id = EVENT.ON_CUSTOM_AJAX;
+    private readonly data;
+    private readonly dataRequestUrl;
+    private readonly dataResultString;
+    private readonly getRequest;
+    private readonly treeGrid;
+    private readonly api;
+    private readonly cacheVersionParam;
+    private readonly ajaxService;
+    constructor(ajaxService: AjaxService);
+    process(tableView: TableViewService, source: {
+        Url: string;
+        Method: string;
+    }, data: string, func: Function): boolean;
+    private getTreeGridFileUrl;
+}

package/dist/src/services/AjaxService.d.ts

@@ -0,0 +1,4 @@
+export interface AjaxService {
+    get(url: string | string[], scope?: string): Promise<any>;
+    post(url: string | string[], data?: any, scope?: string, onError?: (response: any) => void): Promise<any>;
+}

package/lib/dxf-viewer/OrbitControls.js

@@ -882,7 +882,7 @@ export const OrbitControls = function ( object, domElement ) {
 
 			case 1:
 
-				mouseAction = scope.mouseButtons.MIDDLE;
+				mouseAction = scope.mouseButtons.RIGHT;
 				break;
 
 			case 2:
@@ -1022,7 +1022,11 @@ export const OrbitControls = function ( object, domElement ) {
 
 	function onMouseWheel( event ) {
 
-		if ( scope.enabled === false || scope.enableZoom === false || ( state !== STATE.NONE && state !== STATE.ROTATE ) ) return;
+		if (scope.enabled === false || scope.enableZoom === false || (state !== STATE.NONE && state !== STATE.ROTATE)) return;
+
+		if (window.dxfViewer?.options && event.isTrusted) {
+			window.dxfViewer.options.autoZoom = false;
+		}
 
 		event.preventDefault();
 		event.stopPropagation();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vitrosoftware/common-ui-ts",
-    "version": "1.1.218",
+    "version": "1.1.220",
     "description": "vitro software common ui ts",
     "author": "",
     "license": "MIT",

package/src/controls/BimViewer/js/bim-viewer.js

@@ -1,11 +1,11 @@
-import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.218';
+import { BIMModel, BIMCommon, BIMAnnotation } from '/resource/bimViewer/js/bim-viewer-models.js?version=1.1.220';
 
 import {
     Viewer, XKTLoaderPlugin, NavCubePlugin, SectionPlanesPlugin, math, BCFViewpointsPlugin, AnnotationsPlugin,
     ContextMenu, TreeViewPlugin, StoreyViewsPlugin, AngleMeasurementsPlugin, CameraMemento, DistanceMeasurementsPlugin,
     GLTFLoaderPlugin, utils, FastNavPlugin, MetaObject, parsers
 }
-    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.218';
+    from '/resource/bimViewer/js/xeokit/xeokit-sdk.es.js?version=1.1.220';
 
 
 //----------------------------------------------------------------------------------------------------------------------

package/src/controls/DxfViewer/js/dxf-viewer.js

@@ -1,17 +1,17 @@
-import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.218';
-import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.218';
-import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.218';
-import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.218';
-import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.218';
-import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.218';
-import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.218';
-import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.218';
-import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.218';
-import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.218';
-import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.218';
-import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.218';
-import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.218';
-import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.218';
+import * as three from '/resource/dxfViewer/js/three/three.module.js?version=1.1.220';
+import { Matrix3, Vector2 } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.220';
+import { Batch, DxfViewer, Layer } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.220';
+import { Block as SceneBlock } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.220';
+import { Block } from '/resource/dxfViewer/js/viewer/DxfViewer.js?version=1.1.220';
+import { DxfScene, Entity, ColorCode } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.220';
+import { TextRenderer, ParseSpecialChars, HAlign, VAlign } from '/resource/dxfViewer/js/viewer/TextRenderer.js?version=1.1.220';
+import { DxfWorker } from '/resource/dxfViewer/js/viewer/DxfWorker.js?version=1.1.220';
+import { DxfFetcher } from '/resource/dxfViewer/js/viewer/DxfFetcher.js?version=1.1.220';
+import DxfParser from '/resource/dxfViewer/js/viewer/parser/DxfParser.js?version=1.1.220';
+import { RenderBatch } from '/resource/dxfViewer/js/viewer/DxfScene.js?version=1.1.220';
+import { DynamicBuffer, NativeType } from '/resource/dxfViewer/js/viewer/DynamicBuffer.js?version=1.1.220';
+import { OrbitControls } from '/resource/dxfViewer/js/viewer/OrbitControls.js?version=1.1.220';
+import { CSS2DRenderer, CSS2DObject } from '/resource/dxfViewer/js/three/three.module.js?version=1.1.220';
 
 let treeViewData = [];
 let notes = [];
@@ -449,6 +449,18 @@ export class VitroDxfScene extends DxfScene {
         delete this.overlays
     }
 
+	_BuildScene() {
+        const scene = super._BuildScene()
+
+		scene.layers = []
+        for (const layer of this.layers.values()) {
+			layer.isVisible = layer.visible && !layer.frozen
+            scene.layers.push(layer)
+        }
+
+        return scene
+    }
+	
     _ProcessLayers(dxf, xrefMap) {
         if (xrefMap) {
             for (const [, xref] of Object.entries(xrefMap)) {
@@ -1195,7 +1207,8 @@ export class Viewer extends DxfViewer {
 			options.colorCorrection = true
 			options.clearColor = new three.Color("#fff")
 			options.buildScene = true
-			options.retainParsedDxf = true
+			options.retainParsedDxf = true,
+			options.autoZoom = true
 		}
 
 		super(domContainer, options)
@@ -1331,7 +1344,9 @@ export class Viewer extends DxfViewer {
 		this.hasMissingChars = scene.hasMissingChars
 
 		for (const layer of scene.layers) {
-			this.layers.set(layer.name, new Layer(layer.name, layer.displayName, layer.color))
+			const layerObj = new Layer(layer.name, layer.displayName, layer.color)
+			layerObj.isVisible = layer.isVisible
+			this.layers.set(layer.name, layerObj)
 		}
 
 		/* Load all blocks on the first pass. */
@@ -1436,6 +1451,7 @@ export class Viewer extends DxfViewer {
 			this._Emit("added", { obj })
 			if (layer) {
 				layer.PushObject(obj)
+				obj.visible = layer.isVisible
 			}
 		}
 	}
@@ -1573,13 +1589,13 @@ export class Viewer extends DxfViewer {
 			deltaY: 1,
 			deltaMode: 0
 		})
-		this.canvas.dispatchEvent(wheelEvent)
+		this.canvas.dispatchEvent(wheelEvent);
 		wheelEvent = new WheelEvent('wheel', {
 			deltaY: -1,
 			deltaMode: 0,
 			position: [0, 0, 0]
 		})
-		this.canvas.dispatchEvent(wheelEvent)
+		this.canvas.dispatchEvent(wheelEvent);
 	}
 
 	RenderVieports(space) {
@@ -1964,6 +1980,7 @@ export class Viewer extends DxfViewer {
 	}
 
 	ZoomIn(scale) {
+		this.options.autoZoom = false;
 		const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
 		const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
 		scale = scale ? scale : Math.pow(0.95, 3);
@@ -1972,6 +1989,7 @@ export class Viewer extends DxfViewer {
 	}
 
 	ZoomOut(scale) {
+		this.options.autoZoom = false;
 		const centerX = this.canvasWidth / 2 * window.devicePixelRatio;
 		const centerY = this.canvasHeight / 2 * window.devicePixelRatio;
 		scale = scale ? scale : Math.pow(0.95, 3);
@@ -3266,24 +3284,35 @@ for (const eventName of ['loaded', 'cleared', 'destroyed', 'resized', 'pointerdo
     Subscribe(eventName);
 }
 
+let lastWheelClickTime = 0;
+const wheelDblClickThreshold = 400;
+
 function emit(eventName, event) {
     if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 1) {
-        var layout = null;
-        const viewer = window.dxfViewer;
-        const scene = viewer.scene;
-        for (let i = 0; i < scene.layouts.length; i++) {
-            if (window.dxfViewer.spaceName === scene.layouts[i].space) {
-                if (i == scene.layouts.length - 1)
-                    layout = scene.layouts[0];
-                else
-                    layout = scene.layouts[i + 1];
-
-                break;
+        const now = Date.now();
+        if (now - lastWheelClickTime < wheelDblClickThreshold) {
+            doZoomAuto();
+            lastWheelClickTime = 0;
+        } else {
+            lastWheelClickTime = now;
+
+            var layout = null;
+            const viewer = window.dxfViewer;
+            const scene = viewer.scene;
+            for (let i = 0; i < scene.layouts.length; i++) {
+                if (window.dxfViewer.spaceName === scene.layouts[i].space) {
+                    if (i == scene.layouts.length - 1)
+                        layout = scene.layouts[0];
+                    else
+                        layout = scene.layouts[i + 1];
+
+                    break;
+                }
             }
-        }
 
-        if (layout) {
-            
+            if (layout) {
+
+            }
         }
     }
     else if (eventName == 'dxf-pointerdown' && event.detail.domEvent.button == 0) {
@@ -3331,7 +3360,7 @@ function emit(eventName, event) {
         }
     }
     else if (eventName == 'dxf-viewChanged') {
-        if (+$('#scaleSelect').data('value') && dxfViewer.camera.zoom !== 1) {
+        if (dxfViewer.camera.zoom !== 1 && !window.dxfViewer.options.autoZoom) {
             updateScaleSelectValue();
         }
         anno.UpdateLabelPosition();
@@ -3570,12 +3599,17 @@ function doZoomPageFit() {
 function doZoomAuto() {
     doZoomPageFit();
     window.dxfViewer.DoFakeZoomToRedrawScene();
+    $('#pageAutoOption').text(context.scaleAutoLabel);
+    $('#scaleSelect').data('value', $('#scaleSelect').val());
+    $('#scaleSelect').val(context.scaleAutoLabel);
 }
 
 function changeZoom(scale) {
     if (scale === 'auto') {
+        window.dxfViewer.options.autoZoom = true;
         doZoomAuto();
     } else {
+        window.dxfViewer.options.autoZoom = false;
         scale = +scale;
         if (scale === 1) {
             doZoomPageFit();

package/src/controls/PdfViewer/js/pdf-viewer.js

@@ -21208,7 +21208,7 @@ const defaultOptions = {
     kind: OptionKind.WORKER
   },
   workerSrc: {
-    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.218",
+    value: "resource/pdfViewer/js/pdf.worker.js?version=1.1.220",
     kind: OptionKind.WORKER
   }
 };