diff --git a/package-lock.json b/package-lock.json index 31576e09..0f2e7443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vim-webgl-component", - "version": "0.3.20", + "version": "0.3.22", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vim-webgl-component", - "version": "0.3.20", + "version": "0.3.22", "bundleDependencies": [ "vim-webgl-viewer" ], @@ -15,7 +15,7 @@ "@firefox-devtools/react-contextmenu": "^5.1.1", "jsx": "^0.9.89", "re-resizable": "^6.9.9", - "react-complex-tree": "^2.0.0", + "react-complex-tree": "^2.4.6", "react-tooltip": "^4.2.21", "stats-js": "^1.0.1", "tailwindcss-scoped-preflight": "^3.2.8", @@ -3830,9 +3830,12 @@ } }, "node_modules/react-complex-tree": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-complex-tree/-/react-complex-tree-2.1.1.tgz", - "integrity": "sha512-dSL3J6MpyoRvkiILPXBPKHdVndGPs7bLhXrKTl9f3NmlSsSV0h7ux/sG9CiPAHgIzzZqozM152sHV4ikSf0Ygg==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/react-complex-tree/-/react-complex-tree-2.4.6.tgz", + "integrity": "sha512-Akt55R8sI2r66ngxwU7lSgh0YxoBsQHjaVnLzRVCL3Xe+7vbrYfkRpdCK9i/Awga2vYkkdAh9z8etnO3PF/lAg==", + "funding": { + "url": "https://github.com/sponsors/lukasbach" + }, "peerDependencies": { "react": ">=16.0.0" } @@ -7418,9 +7421,9 @@ } }, "react-complex-tree": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-complex-tree/-/react-complex-tree-2.1.1.tgz", - "integrity": "sha512-dSL3J6MpyoRvkiILPXBPKHdVndGPs7bLhXrKTl9f3NmlSsSV0h7ux/sG9CiPAHgIzzZqozM152sHV4ikSf0Ygg==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/react-complex-tree/-/react-complex-tree-2.4.6.tgz", + "integrity": "sha512-Akt55R8sI2r66ngxwU7lSgh0YxoBsQHjaVnLzRVCL3Xe+7vbrYfkRpdCK9i/Awga2vYkkdAh9z8etnO3PF/lAg==", "requires": {} }, "react-dom": { diff --git a/package.json b/package.json index 4ff2038b..bd083395 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vim-webgl-component", - "version": "0.3.21", + "version": "0.3.23", "description": "A demonstration app built on top of the vim-webgl-viewer", "files": [ "dist" @@ -58,7 +58,7 @@ "@firefox-devtools/react-contextmenu": "^5.1.1", "jsx": "^0.9.89", "re-resizable": "^6.9.9", - "react-complex-tree": "^2.0.0", + "react-complex-tree": "^2.4.6", "react-tooltip": "^4.2.21", "stats-js": "^1.0.1", "tailwindcss-scoped-preflight": "^3.2.8", diff --git a/src/package/bim/bimTree.tsx b/src/package/bim/bimTree.tsx index 22b825d6..d3c0e245 100644 --- a/src/package/bim/bimTree.tsx +++ b/src/package/bim/bimTree.tsx @@ -257,7 +257,7 @@ export function BimTree (props: { ) }} > - + ) diff --git a/src/package/errors/fileDownloadingError.tsx b/src/package/errors/fileDownloadingError.tsx index 8fbcf546..3e8bdfc3 100644 --- a/src/package/errors/fileDownloadingError.tsx +++ b/src/package/errors/fileDownloadingError.tsx @@ -1,7 +1,7 @@ import React from 'react' import { MessageBoxProps } from '../panels/messageBox' import * as style from './errorStyle' -import * as Urls from '../../urls' +import * as Urls from '../urls' import { isFilePathOrUri } from './errorUtils' import { fileOpeningError } from './fileOpeningError' diff --git a/src/package/errors/fileLoadingError.tsx b/src/package/errors/fileLoadingError.tsx index e09bba1d..66b44afd 100644 --- a/src/package/errors/fileLoadingError.tsx +++ b/src/package/errors/fileLoadingError.tsx @@ -1,7 +1,7 @@ import React from 'react' import { MessageBoxProps } from '../panels/messageBox' import * as style from './errorStyle' -import * as Urls from '../../urls' +import * as Urls from '../urls' export function serverFileLoadingError (url: string): MessageBoxProps { return { diff --git a/src/package/errors/fileOpeningError.tsx b/src/package/errors/fileOpeningError.tsx index 2d73a193..6de47d83 100644 --- a/src/package/errors/fileOpeningError.tsx +++ b/src/package/errors/fileOpeningError.tsx @@ -1,7 +1,7 @@ import React from 'react' import { MessageBoxProps } from '../panels/messageBox' import * as style from './errorStyle' -import * as Urls from '../../urls' +import * as Urls from '../urls' export function fileOpeningError (url: string): MessageBoxProps { return { diff --git a/src/package/errors/serverCompatibilityError.tsx b/src/package/errors/serverCompatibilityError.tsx index 04663b7e..558c5c96 100644 --- a/src/package/errors/serverCompatibilityError.tsx +++ b/src/package/errors/serverCompatibilityError.tsx @@ -1,7 +1,7 @@ import React from 'react' import { MessageBoxProps } from '../panels/messageBox' import * as style from './errorStyle' -import * as Urls from '../../urls' +import * as Urls from '../urls' export function serverCompatibilityError (url: string, localVersion: string, remoteVersion: string): MessageBoxProps { return { diff --git a/src/package/errors/serverConnectionError.tsx b/src/package/errors/serverConnectionError.tsx index 546c103b..eb639675 100644 --- a/src/package/errors/serverConnectionError.tsx +++ b/src/package/errors/serverConnectionError.tsx @@ -1,7 +1,7 @@ import React from 'react' import { MessageBoxProps } from '../panels/messageBox' import * as style from './errorStyle' -import * as Urls from '../../urls' +import * as Urls from '../urls' import { isLocalUrl } from './errorUtils' export function serverConnectionError (url: string): MessageBoxProps { diff --git a/src/package/index.ts b/src/package/index.ts index 3a4dd0dd..4193ffb7 100644 --- a/src/package/index.ts +++ b/src/package/index.ts @@ -3,6 +3,6 @@ export * as Webgl from './webgl/webglComponent' export * as Ultra from './ultra/ultraComponent' export * as ErrorStyle from './errors/errorStyle' export * as Errors from './errors/errors' -export * as Urls from '../urls' +export * as Urls from './urls' export type { MessageBoxProps } from './panels/messageBox' export * from './container' diff --git a/src/package/urls.ts b/src/package/urls.ts new file mode 100644 index 00000000..64193bbe --- /dev/null +++ b/src/package/urls.ts @@ -0,0 +1,3 @@ + +export const support = 'https://docs.vimaec.com' +export const supportControls = 'https://docs.vimaec.com/docs/vim-cloud/webgl-navigation-and-controls-guide' diff --git a/src/urls.ts b/src/pages/devUrls.ts similarity index 74% rename from src/urls.ts rename to src/pages/devUrls.ts index 85594269..18787f3a 100644 --- a/src/urls.ts +++ b/src/pages/devUrls.ts @@ -3,9 +3,6 @@ export const residence = 'https://vim.azureedge.net/samples/residence.v1.2.75.vi // Ask Martin or Simon for the access token export const residenceWithAccessToken = 'https://saas-api-v2.vimaec.com/api/public/542c2335-992d-4af0-ffd9-08dd0262dd9c/2024-11-11T15:09:43' -export const support = 'https://docs.vimaec.com' -export const supportControls = 'https://docs.vimaec.com/docs/vim-cloud/webgl-navigation-and-controls-guide' - export const notAVim = 'https://vimdevelopment01storage.blob.core.windows.net/samples/not_a_vim.vim' export const medicalTower = 'https://vim.azureedge.net/samples/Medical_Tower.vim' diff --git a/src/pages/ultra/00_home.tsx b/src/pages/ultra/00_home.tsx index f12c71de..8dd0d167 100644 --- a/src/pages/ultra/00_home.tsx +++ b/src/pages/ultra/00_home.tsx @@ -2,7 +2,7 @@ import React, { useRef } from 'react' import { useUltra } from './ultraPageUtils' import { UltraComponentRef } from '../../package/ultra/ultraComponent' import * as ULTRA from 'vim-ultra-viewer' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' export function UltraHome () { const div = useRef(null) diff --git a/src/pages/ultra/04_loadError.tsx b/src/pages/ultra/04_loadError.tsx index e780ce3d..a8f81ce1 100644 --- a/src/pages/ultra/04_loadError.tsx +++ b/src/pages/ultra/04_loadError.tsx @@ -1,7 +1,7 @@ import React, { useRef } from 'react' import { useUltra } from './ultraPageUtils' import { UltraComponentRef } from '../../package/ultra/ultraComponent' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' export function UltraLoadError () { const div = useRef(null) diff --git a/src/pages/ultra/05_abortError.tsx b/src/pages/ultra/05_abortError.tsx index 818464e3..74566f76 100644 --- a/src/pages/ultra/05_abortError.tsx +++ b/src/pages/ultra/05_abortError.tsx @@ -1,7 +1,7 @@ import React, { useRef } from 'react' import { useUltra } from './ultraPageUtils' import { UltraComponentRef } from '../../package/ultra/ultraComponent' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' export function UltraAbortError () { const div = useRef(null) useUltra(div, (ultra) => { diff --git a/src/pages/ultra/ultraPageUtils.tsx b/src/pages/ultra/ultraPageUtils.tsx index 1d776e37..f658e834 100644 --- a/src/pages/ultra/ultraPageUtils.tsx +++ b/src/pages/ultra/ultraPageUtils.tsx @@ -1,6 +1,6 @@ import { Vim } from 'vim-ultra-viewer' import { UltraComponentRef, createUltraComponent } from '../../package/ultra/ultraComponent' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' import { useRef, useEffect, RefObject } from 'react' export function useUltra (div: RefObject, onCreated: (ultra: UltraComponentRef) => void) { diff --git a/src/pages/webgl/00_home.tsx b/src/pages/webgl/00_home.tsx index 39ac5d3d..0c6c1433 100644 --- a/src/pages/webgl/00_home.tsx +++ b/src/pages/webgl/00_home.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef } from 'react' import { createWebglComponent } from '../../package/webgl/webglComponent' import { THREE } from 'vim-webgl-viewer' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' export function WebglHome () { const div = useRef(null) diff --git a/src/pages/webgl/01_accessToken.tsx b/src/pages/webgl/01_accessToken.tsx index a1737221..99e8ec78 100644 --- a/src/pages/webgl/01_accessToken.tsx +++ b/src/pages/webgl/01_accessToken.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react' import { createWebglComponent } from '../../package/webgl/webglComponent' import { THREE } from 'vim-webgl-viewer' import { LocalTextBox } from '../localTextBox' -import * as Urls from '../../urls' +import * as Urls from '../devUrls' export function WebglAccessToken () { const containerRef = useRef(null)