@itwin/core-frontend 5.3.0-dev.10 → 5.3.0-dev.12

package/lib/cjs/internal/tile/map/ImageryProviders/ArcGISImageryProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGISImageryProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/tile/map/ImageryProviders/ArcGISImageryProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAmB,qBAAqB,EAAmB,oBAAoB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAKvM;;;;;;GAMG;AACH,8BAAsB,qBAAsB,SAAQ,uBAAuB;IAEzE,SAAS,CAAC,aAAa,EAAE,oBAAoB,GAAC,SAAS,CAAC;IACxD,SAAS,CAAC,gBAAgB,EAAE,mBAAmB,GAAC,SAAS,CAAC;IAE1D;;MAEE;IACF,SAAS,CAAC,oBAAoB,UAAS;IAEvC,SAAS,CAAC,eAAe,UAAS;IAElC,IAAoB,sBAAsB,YAAkC;gBAEhE,QAAQ,EAAE,qBAAqB,EAAE,eAAe,EAAE,OAAO;IAKrE;SACK;cACc,eAAe,CAAC,MAAM,EAAE,6BAA6B;IAaxE;;;MAGE;cACc,cAAc;IAuB9B;;;;;OAKG;cACa,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW;CAsGtD"}
+{"version":3,"file":"ArcGISImageryProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/tile/map/ImageryProviders/ArcGISImageryProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAmB,qBAAqB,EAAmB,oBAAoB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAKvM;;;;;;GAMG;AACH,8BAAsB,qBAAsB,SAAQ,uBAAuB;IAEzE,SAAS,CAAC,aAAa,EAAE,oBAAoB,GAAC,SAAS,CAAC;IACxD,SAAS,CAAC,gBAAgB,EAAE,mBAAmB,GAAC,SAAS,CAAC;IAE1D;;MAEE;IACF,SAAS,CAAC,oBAAoB,UAAS;IAEvC,SAAS,CAAC,eAAe,UAAS;IAElC,IAAoB,sBAAsB,YAAkC;gBAEhE,QAAQ,EAAE,qBAAqB,EAAE,eAAe,EAAE,OAAO;IAKrE;SACK;cACc,eAAe,CAAC,MAAM,EAAE,6BAA6B;IAaxE;;;MAGE;cACc,cAAc;IAuB9B;;;;;OAKG;cACa,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW;CAuGtD"}

package/lib/cjs/internal/tile/map/ImageryProviders/ArcGISImageryProvider.js

@@ -88,6 +88,7 @@ class ArcGISImageryProvider extends internal_1.MapLayerImageryProvider {
         if (this._accessTokenRequired && this._accessClient) {
             this._lastAccessToken = await internal_1.ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {
                 mapLayerUrl: new URL(this._settings.url),
+                portal: typeof this._settings.properties?.portal === "string" ? this._settings.properties.portal : undefined,
                 userName: this._settings.userName,
                 password: this._settings.password
             });

package/lib/cjs/internal/tile/map/ImageryProviders/ArcGISImageryProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGISImageryProvider.js","sourceRoot":"","sources":["../../../../../../src/internal/tile/map/ImageryProviders/ArcGISImageryProvider.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Tiles\r\n */\r\n\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { ArcGisErrorCode, ArcGISServiceMetadata, ArcGisUtilities, MapLayerAccessClient, MapLayerAccessToken, MapLayerImageryProvider, MapLayerImageryProviderStatus } from \"../../../../tile/internal\";\r\nimport { IModelApp } from \"../../../../IModelApp\";\r\nimport { NotifyMessageDetails, OutputMessagePriority } from \"../../../../NotificationManager\";\r\nimport { headersIncludeAuthMethod } from \"../../../../request/utils\";\r\n\r\n/** Base class for ArcGIS map-layer imagery providers.\r\n *\r\n * The initial purpose of this class is to offer shared methods\r\n * to query ArcGIS services and apply the appropriate security token.\r\n * @see [[ArcGISMapLayerImageryProvider]]\r\n * @internal\r\n */\r\nexport abstract class ArcGISImageryProvider extends MapLayerImageryProvider {\r\n\r\n  protected _accessClient: MapLayerAccessClient|undefined;\r\n  protected _lastAccessToken: MapLayerAccessToken|undefined;\r\n\r\n  /** Flag indicating if access token should be added to request.\r\n  * @note We assume a service to require access token for the entire viewing session.\r\n  */\r\n  protected _accessTokenRequired = false;\r\n\r\n  protected _querySupported = false;\r\n\r\n  public override get supportsMapFeatureInfo() { return this._querySupported;}\r\n\r\n  constructor(settings: ImageMapLayerSettings, usesCachedTiles: boolean) {\r\n    super(settings, usesCachedTiles);\r\n    this._accessClient = IModelApp.mapLayerFormatRegistry?.getAccessClient(settings.formatId);\r\n  }\r\n\r\n  /** Updates the accessClient token state whenever the status of the provider change.\r\n   * */\r\n  protected override onStatusUpdated(status: MapLayerImageryProviderStatus) {\r\n    if (status === MapLayerImageryProviderStatus.RequireAuth) {\r\n\r\n      // Invalidate the token, so a new one get generated\r\n      if (this._accessClient?.invalidateToken !== undefined && this._lastAccessToken !== undefined) {\r\n        this._accessClient.invalidateToken(this._lastAccessToken);\r\n      }\r\n\r\n      // Make sure we don't re-use this token again (i.e force login process)\r\n      this._lastAccessToken = undefined;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Fetch an ArcGIS service metadata, and returns its JSON representation.\r\n   * This wrapper maintains token state and should be used instead of the the ArcGisUtilities version.\r\n  */\r\n  protected async getServiceJson() {\r\n    let metadata: ArcGISServiceMetadata|undefined;\r\n    try {\r\n      metadata = await ArcGisUtilities.getServiceJson({url: this._settings.url, formatId: this._settings.formatId, userName: this._settings.userName, password: this._settings.password, queryParams: this._settings.collectQueryParams()});\r\n\r\n    } catch {\r\n    }\r\n    if (metadata && metadata.accessTokenRequired) {\r\n      const accessClient = IModelApp.mapLayerFormatRegistry.getAccessClient(this._settings.formatId);\r\n      if (accessClient) {\r\n        try {\r\n          // Keep track of last used access token, so we can invalidate it later when an errors occurs\r\n          const accessToken = await accessClient.getAccessToken({mapLayerUrl: new URL(this._settings.url)});\r\n          this._lastAccessToken = accessToken;\r\n        } catch {\r\n        }\r\n      }\r\n      // By turning this ON, tiles requests will include security token\r\n      this._accessTokenRequired = metadata.accessTokenRequired;\r\n    }\r\n    return metadata;\r\n  }\r\n\r\n  /**\r\n   * Make a request to an ArcGIS service using the provided URL and init parameters.\r\n   * @param url URL to query\r\n   * @param options Custom settings to apply to the request.\r\n   * Refer to fetch API for more details (https://developer.mozilla.org/en-US/docs/Web/API/fetch)\r\n   */\r\n  protected async fetch(url: URL, options?: RequestInit) {\r\n\r\n    let errorCode: number | undefined;\r\n    const urlObj = new URL(url);\r\n    const queryParams = this._settings.collectQueryParams();\r\n    Object.keys(queryParams).forEach((paramKey) => {\r\n      if (!urlObj.searchParams.has(paramKey))\r\n        urlObj.searchParams.append(paramKey, queryParams[paramKey]);\r\n    });\r\n\r\n    if (this._accessTokenRequired && this._accessClient) {\r\n      this._lastAccessToken = await ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {\r\n        mapLayerUrl: new URL(this._settings.url),\r\n        userName: this._settings.userName,\r\n        password: this._settings.password });\r\n    }\r\n\r\n    // We want to complete the first request before letting other requests go;\r\n    // this done to avoid flooding server with requests missing credentials\r\n    if (!this._firstRequestPromise)\r\n      this._firstRequestPromise  = new Promise<void>((resolve: any) => this.onFirstRequestCompleted.addOnce(()=>resolve()));\r\n    else\r\n      await this._firstRequestPromise;\r\n\r\n    let response: Response|undefined;\r\n    try {\r\n      response = await fetch(urlObj, {...options, credentials: this._includeUserCredentials ?  \"include\" : undefined});\r\n\r\n      if (response.status === 401 && !this._lastAccessToken && headersIncludeAuthMethod(response.headers, [\"ntlm\", \"negotiate\"])) {\r\n      // We got a http 401 challenge, lets try again with SSO enabled (i.e. Windows Authentication)\r\n        response = await fetch(urlObj, {...options, credentials: \"include\" });\r\n        if (response.status === 200) {\r\n          this._includeUserCredentials = true;    // avoid going through 401 challenges over and over\r\n        }\r\n      }\r\n\r\n      if ((this._lastAccessToken && response.status === 400)\r\n       || response.headers.get(\"content-type\")?.toLowerCase().includes(\"htm\")) {\r\n      // For some reasons when we make a request with the fetch() api and there is a token error\r\n      // we receive a status 400 instead of proper json response. (i.e doing the same request in the browser gives a different response)\r\n      // For some other request, we also seen error message  in html.\r\n      // When it occurs, we fall back to root service request so we get a proper JSON response with error code.\r\n        const tmpUrl = new URL(this._settings.url);\r\n        if (this._lastAccessToken && this._accessTokenRequired)\r\n          tmpUrl.searchParams.append(\"token\", this._lastAccessToken.token);\r\n        tmpUrl.searchParams.append(\"f\",\"json\");\r\n        response = await  fetch(tmpUrl.toString(), options);\r\n      }\r\n\r\n      errorCode = await ArcGisUtilities.checkForResponseErrorCode(response);\r\n\r\n      if (errorCode !== undefined &&\r\n       (   errorCode === ArcGisErrorCode.TokenRequired\r\n        || errorCode === ArcGisErrorCode.InvalidToken\r\n        || errorCode === ArcGisErrorCode.MissingPermissions\r\n       ) ) {\r\n\r\n        if (this._settings.userName && this._settings.userName.length > 0 && this._lastAccessToken ) {\r\n        // **** Legacy token ONLY ***\r\n\r\n          // Token might have expired, make a second attempt by forcing new token.\r\n          if (this._accessClient?.invalidateToken !== undefined && this._lastAccessToken !== undefined)\r\n            this._accessClient.invalidateToken(this._lastAccessToken);\r\n\r\n          const urlObj2 = new URL(url);\r\n          if (this._accessClient) {\r\n            try {\r\n              this._lastAccessToken = await ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {mapLayerUrl: urlObj, userName: this._settings.userName, password: this._settings.password });\r\n            } catch {\r\n            }\r\n          }\r\n\r\n          // Make a second attempt with refreshed token\r\n          response = await fetch(urlObj2.toString(), options);\r\n          errorCode  = await ArcGisUtilities.checkForResponseErrorCode(response);\r\n        }\r\n\r\n        if (errorCode !== undefined &&\r\n          (   errorCode === ArcGisErrorCode.TokenRequired\r\n           || errorCode === ArcGisErrorCode.InvalidToken\r\n           || errorCode === ArcGisErrorCode.MissingPermissions\r\n          ) ) {\r\n          // Looks like the initially generated token has expired.\r\n\r\n          if (this.status === MapLayerImageryProviderStatus.Valid ) {\r\n            // Only report new status change to avoid spamming the UI\r\n            this.setStatus(MapLayerImageryProviderStatus.RequireAuth);\r\n            this.onStatusChanged.raiseEvent(this);\r\n            const msg = IModelApp.localization.getLocalizedString(\"iModelJs:MapLayers.Messages.FetchTooltipTokenError\", { layerName: this._settings.name });\r\n            IModelApp.notifications.outputMessage(new NotifyMessageDetails(OutputMessagePriority.Warning, msg));\r\n          }\r\n        }\r\n      }\r\n    } finally {\r\n      this.onFirstRequestCompleted.raiseEvent();\r\n    }\r\n\r\n    if (response === undefined)\r\n      throw new Error(\"fetch call failed\");\r\n\r\n    return response;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGISImageryProvider.js","sourceRoot":"","sources":["../../../../../../src/internal/tile/map/ImageryProviders/ArcGISImageryProvider.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Tiles\r\n */\r\n\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { ArcGisErrorCode, ArcGISServiceMetadata, ArcGisUtilities, MapLayerAccessClient, MapLayerAccessToken, MapLayerImageryProvider, MapLayerImageryProviderStatus } from \"../../../../tile/internal\";\r\nimport { IModelApp } from \"../../../../IModelApp\";\r\nimport { NotifyMessageDetails, OutputMessagePriority } from \"../../../../NotificationManager\";\r\nimport { headersIncludeAuthMethod } from \"../../../../request/utils\";\r\n\r\n/** Base class for ArcGIS map-layer imagery providers.\r\n *\r\n * The initial purpose of this class is to offer shared methods\r\n * to query ArcGIS services and apply the appropriate security token.\r\n * @see [[ArcGISMapLayerImageryProvider]]\r\n * @internal\r\n */\r\nexport abstract class ArcGISImageryProvider extends MapLayerImageryProvider {\r\n\r\n  protected _accessClient: MapLayerAccessClient|undefined;\r\n  protected _lastAccessToken: MapLayerAccessToken|undefined;\r\n\r\n  /** Flag indicating if access token should be added to request.\r\n  * @note We assume a service to require access token for the entire viewing session.\r\n  */\r\n  protected _accessTokenRequired = false;\r\n\r\n  protected _querySupported = false;\r\n\r\n  public override get supportsMapFeatureInfo() { return this._querySupported;}\r\n\r\n  constructor(settings: ImageMapLayerSettings, usesCachedTiles: boolean) {\r\n    super(settings, usesCachedTiles);\r\n    this._accessClient = IModelApp.mapLayerFormatRegistry?.getAccessClient(settings.formatId);\r\n  }\r\n\r\n  /** Updates the accessClient token state whenever the status of the provider change.\r\n   * */\r\n  protected override onStatusUpdated(status: MapLayerImageryProviderStatus) {\r\n    if (status === MapLayerImageryProviderStatus.RequireAuth) {\r\n\r\n      // Invalidate the token, so a new one get generated\r\n      if (this._accessClient?.invalidateToken !== undefined && this._lastAccessToken !== undefined) {\r\n        this._accessClient.invalidateToken(this._lastAccessToken);\r\n      }\r\n\r\n      // Make sure we don't re-use this token again (i.e force login process)\r\n      this._lastAccessToken = undefined;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Fetch an ArcGIS service metadata, and returns its JSON representation.\r\n   * This wrapper maintains token state and should be used instead of the the ArcGisUtilities version.\r\n  */\r\n  protected async getServiceJson() {\r\n    let metadata: ArcGISServiceMetadata|undefined;\r\n    try {\r\n      metadata = await ArcGisUtilities.getServiceJson({url: this._settings.url, formatId: this._settings.formatId, userName: this._settings.userName, password: this._settings.password, queryParams: this._settings.collectQueryParams()});\r\n\r\n    } catch {\r\n    }\r\n    if (metadata && metadata.accessTokenRequired) {\r\n      const accessClient = IModelApp.mapLayerFormatRegistry.getAccessClient(this._settings.formatId);\r\n      if (accessClient) {\r\n        try {\r\n          // Keep track of last used access token, so we can invalidate it later when an errors occurs\r\n          const accessToken = await accessClient.getAccessToken({mapLayerUrl: new URL(this._settings.url)});\r\n          this._lastAccessToken = accessToken;\r\n        } catch {\r\n        }\r\n      }\r\n      // By turning this ON, tiles requests will include security token\r\n      this._accessTokenRequired = metadata.accessTokenRequired;\r\n    }\r\n    return metadata;\r\n  }\r\n\r\n  /**\r\n   * Make a request to an ArcGIS service using the provided URL and init parameters.\r\n   * @param url URL to query\r\n   * @param options Custom settings to apply to the request.\r\n   * Refer to fetch API for more details (https://developer.mozilla.org/en-US/docs/Web/API/fetch)\r\n   */\r\n  protected async fetch(url: URL, options?: RequestInit) {\r\n\r\n    let errorCode: number | undefined;\r\n    const urlObj = new URL(url);\r\n    const queryParams = this._settings.collectQueryParams();\r\n    Object.keys(queryParams).forEach((paramKey) => {\r\n      if (!urlObj.searchParams.has(paramKey))\r\n        urlObj.searchParams.append(paramKey, queryParams[paramKey]);\r\n    });\r\n\r\n    if (this._accessTokenRequired && this._accessClient) {\r\n      this._lastAccessToken = await ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {\r\n        mapLayerUrl: new URL(this._settings.url),\r\n        portal: typeof this._settings.properties?.portal === \"string\" ? this._settings.properties.portal : undefined,\r\n        userName: this._settings.userName,\r\n        password: this._settings.password });\r\n    }\r\n\r\n    // We want to complete the first request before letting other requests go;\r\n    // this done to avoid flooding server with requests missing credentials\r\n    if (!this._firstRequestPromise)\r\n      this._firstRequestPromise  = new Promise<void>((resolve: any) => this.onFirstRequestCompleted.addOnce(()=>resolve()));\r\n    else\r\n      await this._firstRequestPromise;\r\n\r\n    let response: Response|undefined;\r\n    try {\r\n      response = await fetch(urlObj, {...options, credentials: this._includeUserCredentials ?  \"include\" : undefined});\r\n\r\n      if (response.status === 401 && !this._lastAccessToken && headersIncludeAuthMethod(response.headers, [\"ntlm\", \"negotiate\"])) {\r\n      // We got a http 401 challenge, lets try again with SSO enabled (i.e. Windows Authentication)\r\n        response = await fetch(urlObj, {...options, credentials: \"include\" });\r\n        if (response.status === 200) {\r\n          this._includeUserCredentials = true;    // avoid going through 401 challenges over and over\r\n        }\r\n      }\r\n\r\n      if ((this._lastAccessToken && response.status === 400)\r\n       || response.headers.get(\"content-type\")?.toLowerCase().includes(\"htm\")) {\r\n      // For some reasons when we make a request with the fetch() api and there is a token error\r\n      // we receive a status 400 instead of proper json response. (i.e doing the same request in the browser gives a different response)\r\n      // For some other request, we also seen error message  in html.\r\n      // When it occurs, we fall back to root service request so we get a proper JSON response with error code.\r\n        const tmpUrl = new URL(this._settings.url);\r\n        if (this._lastAccessToken && this._accessTokenRequired)\r\n          tmpUrl.searchParams.append(\"token\", this._lastAccessToken.token);\r\n        tmpUrl.searchParams.append(\"f\",\"json\");\r\n        response = await  fetch(tmpUrl.toString(), options);\r\n      }\r\n\r\n      errorCode = await ArcGisUtilities.checkForResponseErrorCode(response);\r\n\r\n      if (errorCode !== undefined &&\r\n       (   errorCode === ArcGisErrorCode.TokenRequired\r\n        || errorCode === ArcGisErrorCode.InvalidToken\r\n        || errorCode === ArcGisErrorCode.MissingPermissions\r\n       ) ) {\r\n\r\n        if (this._settings.userName && this._settings.userName.length > 0 && this._lastAccessToken ) {\r\n        // **** Legacy token ONLY ***\r\n\r\n          // Token might have expired, make a second attempt by forcing new token.\r\n          if (this._accessClient?.invalidateToken !== undefined && this._lastAccessToken !== undefined)\r\n            this._accessClient.invalidateToken(this._lastAccessToken);\r\n\r\n          const urlObj2 = new URL(url);\r\n          if (this._accessClient) {\r\n            try {\r\n              this._lastAccessToken = await ArcGisUtilities.appendSecurityToken(urlObj, this._accessClient, {mapLayerUrl: urlObj, userName: this._settings.userName, password: this._settings.password });\r\n            } catch {\r\n            }\r\n          }\r\n\r\n          // Make a second attempt with refreshed token\r\n          response = await fetch(urlObj2.toString(), options);\r\n          errorCode  = await ArcGisUtilities.checkForResponseErrorCode(response);\r\n        }\r\n\r\n        if (errorCode !== undefined &&\r\n          (   errorCode === ArcGisErrorCode.TokenRequired\r\n           || errorCode === ArcGisErrorCode.InvalidToken\r\n           || errorCode === ArcGisErrorCode.MissingPermissions\r\n          ) ) {\r\n          // Looks like the initially generated token has expired.\r\n\r\n          if (this.status === MapLayerImageryProviderStatus.Valid ) {\r\n            // Only report new status change to avoid spamming the UI\r\n            this.setStatus(MapLayerImageryProviderStatus.RequireAuth);\r\n            this.onStatusChanged.raiseEvent(this);\r\n            const msg = IModelApp.localization.getLocalizedString(\"iModelJs:MapLayers.Messages.FetchTooltipTokenError\", { layerName: this._settings.name });\r\n            IModelApp.notifications.outputMessage(new NotifyMessageDetails(OutputMessagePriority.Warning, msg));\r\n          }\r\n        }\r\n      }\r\n    } finally {\r\n      this.onFirstRequestCompleted.raiseEvent();\r\n    }\r\n\r\n    if (response === undefined)\r\n      throw new Error(\"fetch call failed\");\r\n\r\n    return response;\r\n  }\r\n}\r\n"]}

package/lib/cjs/tile/map/MapLayerAuthentication.d.ts

@@ -18,6 +18,10 @@ export interface MapLayerAccessToken {
 /** @beta */
 export interface MapLayerAccessTokenParams {
     mapLayerUrl: URL;
+    /**
+     * Optional portal URL for ArcGIS services. If set overrides the portal inferred from the mapLayerUrl
+     */
+    portal?: string;
     userName?: string;
     password?: string;
 }

package/lib/cjs/tile/map/MapLayerAuthentication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerAuthentication.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerAuthentication.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAExD,YAAY;AACZ,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAAC;IACjD,MAAM,IAAI,MAAM,CAAC;CAClB;AAED,YAAY;AACZ,MAAM,WAAW,0BAA0B;IACzC,aAAa,CAAC,EAAE,qBAAqB,CAAC;CACvC;AAED,YAAY;AACZ,MAAM,WAAW,mBAAmB;IAElC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,YAAY;AACZ,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,GAAG,CAAC;IAGjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,YAAY;AACZ,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAC5F,uBAAuB,CAAC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;IAC1F,eAAe,CAAC,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC;IAEtD,iBAAiB,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CACvC"}
+{"version":3,"file":"MapLayerAuthentication.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerAuthentication.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAExD,YAAY;AACZ,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAAC;IACjD,MAAM,IAAI,MAAM,CAAC;CAClB;AAED,YAAY;AACZ,MAAM,WAAW,0BAA0B;IACzC,aAAa,CAAC,EAAE,qBAAqB,CAAC;CACvC;AAED,YAAY;AACZ,MAAM,WAAW,mBAAmB;IAElC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,YAAY;AACZ,MAAM,WAAW,yBAAyB;IAExC,WAAW,EAAE,GAAG,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,YAAY;AACZ,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAC5F,uBAAuB,CAAC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;IAC1F,eAAe,CAAC,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC;IAEtD,iBAAiB,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CACvC"}

package/lib/cjs/tile/map/MapLayerAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerAuthentication.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerAuthentication.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module MapLayers\r\n */\r\n\r\nimport { BeEvent, Listener } from \"@itwin/core-bentley\";\r\n\r\n/** @beta */\r\nexport interface MapLayerTokenEndpoint {\r\n  getLoginUrl(stateData?: any): string | undefined;\r\n  getUrl(): string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAuthenticationInfo {\r\n  tokenEndpoint?: MapLayerTokenEndpoint;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessToken {\r\n  // The generated token.\r\n  token: string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessTokenParams {\r\n  mapLayerUrl: URL;\r\n\r\n  // credentials are used to generate non-oauth tokens (i.e ArcGIS legacy tokens)\r\n  userName?: string;\r\n  password?: string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessClient {\r\n  getAccessToken(params: MapLayerAccessTokenParams): Promise<MapLayerAccessToken | undefined>;\r\n  getTokenServiceEndPoint?(mapLayerUrl: string): Promise<MapLayerTokenEndpoint | undefined>;\r\n  invalidateToken?(token: MapLayerAccessToken): boolean;\r\n\r\n  onOAuthProcessEnd?: BeEvent<Listener>;\r\n}\r\n\r\n"]}
+{"version":3,"file":"MapLayerAuthentication.js","sourceRoot":"","sources":["../../../../src/tile/map/MapLayerAuthentication.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module MapLayers\r\n */\r\n\r\nimport { BeEvent, Listener } from \"@itwin/core-bentley\";\r\n\r\n/** @beta */\r\nexport interface MapLayerTokenEndpoint {\r\n  getLoginUrl(stateData?: any): string | undefined;\r\n  getUrl(): string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAuthenticationInfo {\r\n  tokenEndpoint?: MapLayerTokenEndpoint;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessToken {\r\n  // The generated token.\r\n  token: string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessTokenParams {\r\n  /* @deprecated in 5.2.0. Use `portal` instead */\r\n  mapLayerUrl: URL;\r\n\r\n  /**\r\n   * Optional portal URL for ArcGIS services. If set overrides the portal inferred from the mapLayerUrl\r\n   */\r\n  portal?: string;\r\n\r\n  // credentials are used to generate non-oauth tokens (i.e ArcGIS legacy tokens)\r\n  userName?: string;\r\n  password?: string;\r\n}\r\n\r\n/** @beta */\r\nexport interface MapLayerAccessClient {\r\n  getAccessToken(params: MapLayerAccessTokenParams): Promise<MapLayerAccessToken | undefined>;\r\n  getTokenServiceEndPoint?(mapLayerUrl: string): Promise<MapLayerTokenEndpoint | undefined>;\r\n  invalidateToken?(token: MapLayerAccessToken): boolean;\r\n\r\n  onOAuthProcessEnd?: BeEvent<Listener>;\r\n}\r\n\r\n"]}

package/lib/cjs/tools/AccuDrawViewportUI.d.ts

@@ -29,37 +29,93 @@ export declare class AccuDrawViewportUI extends AccuDraw {
         simplifiedInput: boolean;
         /** Enable simple math operations not supported by quantity parser. */
         mathOperations: boolean;
-        /** Number of visible characters to show in text input fields. */
-        fieldSize: number;
-        /** Row spacing of text input fields for vertical arrangement. */
-        rowSpacingFactor: number;
-        /** Column spacing of text input fields and buttons for horizontal arrangement. */
-        columnSpacingFactor: number;
-        /** Corner radius of text input fields and locks buttons. */
-        borderRadius: string;
-        /** Background color of unfocused text input fields and unlocked buttons. */
-        backgroundColor: string;
-        /** Settings specific to text input fields and lock button labels. */
-        text: {
-            /** Font family to use for text input field values and button labels. */
-            fontFamily: string;
-            /** Font size to use for text input field values and button labels. */
-            fontSize: string;
-            /** Font color to use for text input field values and button labels. */
+        /** Settings that apply to both text input fields and lock buttons. */
+        field: {
+            /** Number of visible characters to show in text input fields. */
+            size: number;
+            /** Height of text input fields and lock buttons. */
+            height: string;
+            /** Border settings for text input fields and lock buttons. */
+            border: {
+                /** Border width to use for text input fields and lock buttons. */
+                width: string;
+                /** Border style to use for text input fields and lock buttons. */
+                style: string;
+                /** Corner radius of text input fields and locks buttons. */
+                radius: string;
+            };
+            /** Settings specific to text input fields and lock button labels. */
+            text: {
+                /** Font family to use for text input field values and button labels. */
+                fontFamily: string;
+                /** Font size to use for text input field values and button labels. */
+                fontSize: string;
+            };
+        };
+        /** Settings specific to text input fields. */
+        input: {
+            /** Font color to use for text input field values. */
             color: string;
-            /** Background color of focused text input field. */
-            focusColor: string;
+            /** Padding applied to text input fields. */
+            padding: string;
+            /** Settings applied to text input fields when they have focus. */
+            focused: {
+                /** Background color for focused text input fields. */
+                backgroundColor: string;
+                /** Inner stroke for focused text input fields. */
+                innerStroke: string;
+                /** Border settings for focused text input fields. */
+                border: {
+                    /** Border color for focused text input fields. */
+                    color: string;
+                };
+            };
+            /** Settings applied to text input fields when they do not have focus. */
+            unfocused: {
+                /** Background color for unfocused text input fields. */
+                backgroundColor: string;
+                /** Border settings for unfocused text input fields. */
+                border: {
+                    /** Border color for unfocused text input fields. */
+                    color: string;
+                };
+            };
         };
         /** Settings specific to lock buttons. */
         button: {
-            /** Background color of locked buttons. */
-            pressedColor: string;
-            /** Margin to use on left and right to position relative to text input field. */
+            /** Padding applied to lock buttons. */
+            padding: string;
+            /** Settings applied to lock buttons when they are unlocked. */
+            unlocked: {
+                /** Text color for unlocked lock buttons. */
+                color: string;
+                /** Background color for unlocked lock buttons. */
+                backgroundColor: string;
+                /** Border settings for unlocked lock buttons. */
+                border: {
+                    /** Border color for unlocked lock buttons. */
+                    color: string;
+                };
+            };
+            /** Settings applied to lock buttons when they are locked. */
+            locked: {
+                /** Text color for locked lock buttons. */
+                color: string;
+                /** Background color for locked lock buttons. */
+                backgroundColor: string;
+                /** Border settings for locked lock buttons. */
+                border: {
+                    /** Border color for locked lock buttons. */
+                    color: string;
+                };
+            };
+        };
+        /** Spacing between fields within a control and between rows of controls. */
+        spacing: {
+            /** Spacing between input field and lock button within each field group. */
+            gap: string;
+            /** Spacing between field groups (distance/angle, x, y, z controls). */
             margin: string;
-            /** Width of border outline. */
-            outlineWidth: string;
-            /** Shadow shown when unlocked to make it appear raised. */
-            shadow: string;
         };
     };
     /** Create a new instance of this class to set as [[IModelAppOptions.accuDraw]] for this session. */

package/lib/cjs/tools/AccuDrawViewportUI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccuDrawViewportUI.d.ts","sourceRoot":"","sources":["../../../src/tools/AccuDrawViewportUI.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccuDrawViewportUI.d.ts","sourceRoot":"","sources":["../../../src/tools/AccuDrawViewportUI.ts"],"names":[],"mappings":"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"}

package/lib/cjs/tools/AccuDrawViewportUI.js

@@ -38,37 +38,93 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         simplifiedInput: true,
         /** Enable simple math operations not supported by quantity parser. */
         mathOperations: true,
-        /** Number of visible characters to show in text input fields. */
-        fieldSize: 12,
-        /** Row spacing of text input fields for vertical arrangement. */
-        rowSpacingFactor: 1.2,
-        /** Column spacing of text input fields and buttons for horizontal arrangement. */
-        columnSpacingFactor: 1.1,
-        /** Corner radius of text input fields and locks buttons. */
-        borderRadius: "0.5em",
-        /** Background color of unfocused text input fields and unlocked buttons. */
-        backgroundColor: "rgba(150, 150, 150, 0.5)",
-        /** Settings specific to text input fields and lock button labels. */
-        text: {
-            /** Font family to use for text input field values and button labels. */
-            fontFamily: "sans-serif",
-            /** Font size to use for text input field values and button labels. */
-            fontSize: "9pt",
-            /** Font color to use for text input field values and button labels. */
-            color: "white",
-            /** Background color of focused text input field. */
-            focusColor: "rgba(50, 50, 200, 0.75)",
+        /** Settings that apply to both text input fields and lock buttons. */
+        field: {
+            /** Number of visible characters to show in text input fields. */
+            size: 12,
+            /** Height of text input fields and lock buttons. */
+            height: "var(--iui-component-height-small, 1.75em)",
+            /** Border settings for text input fields and lock buttons. */
+            border: {
+                /** Border width to use for text input fields and lock buttons. */
+                width: "1px",
+                /** Border style to use for text input fields and lock buttons. */
+                style: "solid",
+                /** Corner radius of text input fields and locks buttons. */
+                radius: "var(--iui-border-radius-1, 0.25rem)",
+            },
+            /** Settings specific to text input fields and lock button labels. */
+            text: {
+                /** Font family to use for text input field values and button labels. */
+                fontFamily: "var(--iui-font-sans, sans-serif)",
+                /** Font size to use for text input field values and button labels. */
+                fontSize: "var(--iui-font-size-1, 0.875rem)",
+            },
+        },
+        /** Settings specific to text input fields. */
+        input: {
+            /** Font color to use for text input field values. */
+            color: "var(--iui-color-white, white)",
+            /** Padding applied to text input fields. */
+            padding: "0 var(--iui-size-s, 0.5rem)",
+            /** Settings applied to text input fields when they have focus. */
+            focused: {
+                /** Background color for focused text input fields. */
+                backgroundColor: "hsl(var(--iui-color-accent-hsl, 166 96% 30.7%) / var(--iui-opacity-2, 85%))",
+                /** Inner stroke for focused text input fields. */
+                innerStroke: `inset 0px 0px 0px 1px var(--iui-color-background, #333c41)`,
+                /** Border settings for focused text input fields. */
+                border: {
+                    /** Border color for focused text input fields. */
+                    color: "hsl(var(--iui-color-accent-hsl, 166 96% 51%))",
+                },
+            },
+            /** Settings applied to text input fields when they do not have focus. */
+            unfocused: {
+                /** Background color for unfocused text input fields. */
+                backgroundColor: "hsl(var(--iui-color-background-hsl, 203 6% 21.25%) / var(--iui-opacity-2, 85%))",
+                /** Border settings for unfocused text input fields. */
+                border: {
+                    /** Border color for unfocused text input fields. */
+                    color: "var(--iui-color-border, hsla(215, 8%, 30%))",
+                },
+            },
         },
         /** Settings specific to lock buttons. */
         button: {
-            /** Background color of locked buttons. */
-            pressedColor: "rgba(50, 50, 50, 0.75)",
-            /** Margin to use on left and right to position relative to text input field. */
-            margin: "0.25em",
-            /** Width of border outline. */
-            outlineWidth: "thin",
-            /** Shadow shown when unlocked to make it appear raised. */
-            shadow: "0.25em 0.25em 0.2em rgb(75, 75, 75)",
+            /** Padding applied to lock buttons. */
+            padding: "var(--iui-size-2xs, 0.25rem)",
+            /** Settings applied to lock buttons when they are unlocked. */
+            unlocked: {
+                /** Text color for unlocked lock buttons. */
+                color: "var(--iui-color-text-muted, #cccccc)",
+                /** Background color for unlocked lock buttons. */
+                backgroundColor: "hsl(var(--iui-color-background-hsl, 203 6% 21.25%) / var(--iui-opacity-2, 85%))",
+                /** Border settings for unlocked lock buttons. */
+                border: {
+                    /** Border color for unlocked lock buttons. */
+                    color: "var(--iui-color-border, hsla(215, 8%, 30%))",
+                },
+            },
+            /** Settings applied to lock buttons when they are locked. */
+            locked: {
+                /** Text color for locked lock buttons. */
+                color: "hsla(0, 0%, 100%, 1)",
+                /** Background color for locked lock buttons. */
+                backgroundColor: "hsla(0, 0%, 100%, 0.16)",
+                /** Border settings for locked lock buttons. */
+                border: {
+                    /** Border color for locked lock buttons. */
+                    color: "hsla(0, 0%, 100%, 1)",
+                },
+            },
+        },
+        /** Spacing between fields within a control and between rows of controls. */
+        spacing: {
+            /** Spacing between input field and lock button within each field group. */
+            gap: "var(--iui-size-2xs, 0.25rem)",
+            /** Spacing between field groups (distance/angle, x, y, z controls). */
+            margin: "var(--iui-size-s, 0.75rem)",
         },
     };
     /** Create a new instance of this class to set as [[IModelAppOptions.accuDraw]] for this session. */
@@ -320,7 +376,9 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
                 if (itemField.selectionStart !== (moveLeft ? operatorPosIns + this._expression.operator.length : operatorPosIns))
                     break;
                 // Treat expression operator string as a single character when moving the text insertion cursor...
-                itemField.selectionStart = itemField.selectionEnd = (moveLeft ? operatorPosIns : operatorPosIns + this._expression.operator.length);
+                itemField.selectionStart = itemField.selectionEnd = moveLeft
+                    ? operatorPosIns
+                    : operatorPosIns + this._expression.operator.length;
                 ev.preventDefault();
                 return true;
             case "Backspace":
@@ -431,10 +489,18 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         div.className = "accudraw-controls";
         const style = div.style;
         style.pointerEvents = "none";
-        style.overflow = "visible"; // Don't clip/hide outline or shadow...
         style.position = "absolute";
-        style.top = style.left = "0";
-        style.height = style.width = "100%";
+        style.display = "flex";
+        const isHorizontal = AccuDrawViewportUI.controlProps.horizontalArrangement;
+        style.flexDirection = isHorizontal ? "row" : "column";
+        if (isHorizontal) {
+            // Make the space between each control group bigger than the space between fields within a group
+            style.columnGap = AccuDrawViewportUI.controlProps.spacing.margin;
+        }
+        else {
+            // Make the space between each control group equal than the space between fields within a group
+            style.rowGap = AccuDrawViewportUI.controlProps.spacing.gap;
+        }
         return div;
     }
     updateItemFieldKeyinStatus(itemField, item) {
@@ -450,27 +516,52 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
     }
     updateItemFieldLock(itemLock, item) {
         const locked = this.getFieldLock(item);
-        itemLock.style.outlineStyle = locked ? "inset" : "outset";
-        itemLock.style.boxShadow = locked ? "none" : AccuDrawViewportUI.controlProps.button.shadow;
-        itemLock.style.backgroundColor = locked ? AccuDrawViewportUI.controlProps.button.pressedColor : AccuDrawViewportUI.controlProps.backgroundColor;
+        itemLock.style.backgroundColor = locked
+            ? AccuDrawViewportUI.controlProps.button.locked.backgroundColor
+            : AccuDrawViewportUI.controlProps.button.unlocked.backgroundColor;
+        itemLock.style.border = `${AccuDrawViewportUI.controlProps.field.border.width} ${AccuDrawViewportUI.controlProps.field.border.style} ${locked
+            ? AccuDrawViewportUI.controlProps.button.locked.border.color
+            : AccuDrawViewportUI.controlProps.button.unlocked.border.color}`;
+        itemLock.style.color = locked
+            ? AccuDrawViewportUI.controlProps.button.locked.color
+            : AccuDrawViewportUI.controlProps.button.unlocked.color;
     }
     initializeItemStyle(style, isButton) {
         style.pointerEvents = "none"; // Don't receive pointer events...
-        style.position = "absolute";
         style.textWrap = "nowrap";
         style.textAnchor = "top";
-        style.textAlign = isButton ? "center" : "left";
+        style.boxSizing = "border-box";
         const controlProps = AccuDrawViewportUI.controlProps;
-        style.fontFamily = controlProps.text.fontFamily;
-        style.fontSize = controlProps.text.fontSize;
-        style.color = controlProps.text.color;
-        style.backgroundColor = controlProps.backgroundColor;
-        style.borderRadius = controlProps.borderRadius;
+        style.height = controlProps.field.height;
+        const baseBorder = `${controlProps.field.border.width} ${controlProps.field.border.style} `;
+        switch (isButton) {
+            case true:
+                style.display = "flex";
+                style.justifyContent = "center";
+                style.alignItems = "center";
+                style.backgroundColor = controlProps.button.unlocked.backgroundColor;
+                style.padding = controlProps.button.padding;
+                style.border = baseBorder + controlProps.button.unlocked.border.color;
+                style.color = controlProps.button.unlocked.color;
+                style.aspectRatio = "1";
+                break;
+            case false:
+                style.backgroundColor = controlProps.input.unfocused.backgroundColor;
+                style.outline = "none";
+                style.padding = controlProps.input.padding;
+                style.border = baseBorder + controlProps.input.unfocused.border.color;
+                style.color = controlProps.input.color;
+                style.width = "120px";
+                break;
+        }
+        style.fontFamily = controlProps.field.text.fontFamily;
+        style.fontSize = controlProps.field.text.fontSize;
+        style.borderRadius = controlProps.field.border.radius;
     }
     createItemField(item) {
         const itemField = document.createElement("input");
         itemField.contentEditable = "true";
-        itemField.size = AccuDrawViewportUI.controlProps.fieldSize;
+        itemField.size = AccuDrawViewportUI.controlProps.field.size;
         const style = itemField.style;
         this.initializeItemStyle(style, false);
         this.updateItemFieldValue(itemField, item);
@@ -478,7 +569,6 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         itemField.onkeyup = async (ev) => { await this.onKeyboardEvent(ev, false); };
         itemField.onfocus = (ev) => { this.onFocusChange(ev, item, true); };
         itemField.onblur = (ev) => { this.onFocusChange(ev, item, false); };
-        ;
         return itemField;
     }
     createItemFieldLock(item) {
@@ -506,10 +596,6 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         const style = itemLock.style;
         this.initializeItemStyle(style, true);
         this.updateItemFieldLock(itemLock, item);
-        const button = AccuDrawViewportUI.controlProps.button;
-        style.paddingLeft = style.paddingRight = "0";
-        style.marginLeft = style.marginRight = button.margin;
-        style.outlineWidth = button.outlineWidth;
         return itemLock;
     }
     /** Called after the controls have been removed from the view. */
@@ -530,18 +616,23 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
     updateControlVisibility(isPolar, is3d) {
         if (undefined === this._controls)
             return;
-        this._controls.itemFields[AccuDraw_1.ItemField.ANGLE_Item].hidden = !isPolar;
-        this._controls.itemLocks[AccuDraw_1.ItemField.ANGLE_Item].hidden = !isPolar;
-        this._controls.itemFields[AccuDraw_1.ItemField.DIST_Item].hidden = !isPolar;
-        this._controls.itemLocks[AccuDraw_1.ItemField.DIST_Item].hidden = !isPolar;
-        this._controls.itemFields[AccuDraw_1.ItemField.X_Item].hidden = isPolar;
-        this._controls.itemLocks[AccuDraw_1.ItemField.X_Item].hidden = isPolar;
-        this._controls.itemFields[AccuDraw_1.ItemField.Y_Item].hidden = isPolar;
-        this._controls.itemLocks[AccuDraw_1.ItemField.Y_Item].hidden = isPolar;
+        const angleWrapper = this._controls.itemFields[AccuDraw_1.ItemField.ANGLE_Item]
+            .parentElement;
+        const distWrapper = this._controls.itemFields[AccuDraw_1.ItemField.DIST_Item]
+            .parentElement;
+        const xWrapper = this._controls.itemFields[AccuDraw_1.ItemField.X_Item]
+            .parentElement;
+        const yWrapper = this._controls.itemFields[AccuDraw_1.ItemField.Y_Item]
+            .parentElement;
+        const zWrapper = this._controls.itemFields[AccuDraw_1.ItemField.Z_Item]
+            .parentElement;
+        angleWrapper.style.display = !isPolar ? "none" : "flex";
+        distWrapper.style.display = !isPolar ? "none" : "flex";
+        xWrapper.style.display = isPolar ? "none" : "flex";
+        yWrapper.style.display = isPolar ? "none" : "flex";
         if (undefined === is3d)
             return;
-        this._controls.itemFields[AccuDraw_1.ItemField.Z_Item].hidden = !is3d;
-        this._controls.itemLocks[AccuDraw_1.ItemField.Z_Item].hidden = !is3d;
+        zWrapper.style.display = !is3d ? "none" : "flex";
     }
     updateControls(ev) {
         const vp = ev.viewport;
@@ -553,43 +644,28 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         if (undefined === this._controls) {
             const overlay = vp.addNewDiv("accudraw-overlay", true, 35);
             const div = this.createControlDiv();
-            const is3dLayout = this.is3dCompass(vp);
-            const isHorizontalLayout = props.horizontalArrangement;
             overlay.appendChild(div);
             const createFieldAndLock = (item) => {
-                const itemField = itemFields[item] = this.createItemField(item);
-                itemField.style.top = isHorizontalLayout ? "0" : `${rowOffset}px`;
-                itemField.style.left = isHorizontalLayout ? `${columnOffset}px` : "0";
-                div.appendChild(itemField);
-                if (is3dLayout || AccuDraw_1.ItemField.Z_Item !== item)
-                    rowOffset += itemField.offsetHeight * props.rowSpacingFactor;
-                itemWidth = itemField.offsetWidth;
-                itemHeight = itemField.offsetHeight;
-                const itemLock = itemLocks[item] = this.createItemFieldLock(item);
-                itemLock.style.top = itemField.style.top;
-                itemLock.style.left = isHorizontalLayout ? `${columnOffset + itemWidth}px` : `${itemWidth}px`;
-                itemLock.style.width = itemLock.style.height = `${itemHeight}px`; // Make square of same height as text field...
-                div.appendChild(itemLock);
-                lockWidth = itemLock.offsetWidth;
-                if (is3dLayout || AccuDraw_1.ItemField.Z_Item !== item)
-                    columnOffset += (itemWidth + lockWidth) * props.columnSpacingFactor;
+                const fieldWrapper = document.createElement("div");
+                fieldWrapper.style.display = "flex";
+                fieldWrapper.style.flexDirection = "row";
+                fieldWrapper.style.alignItems = "center";
+                fieldWrapper.style.justifyContent = "center";
+                fieldWrapper.style.columnGap = AccuDrawViewportUI.controlProps.spacing.gap;
+                fieldWrapper.style.rowGap = AccuDrawViewportUI.controlProps.spacing.gap;
+                const itemField = (itemFields[item] = this.createItemField(item));
+                fieldWrapper.appendChild(itemField);
+                const itemLock = (itemLocks[item] = this.createItemFieldLock(item));
+                fieldWrapper.appendChild(itemLock);
+                div.appendChild(fieldWrapper);
             };
-            let rowOffset = 0;
-            let columnOffset = 0;
-            let itemWidth = 0;
-            let itemHeight = 0;
-            let lockWidth = 0;
             const itemFields = [];
             const itemLocks = [];
             createFieldAndLock(AccuDraw_1.ItemField.DIST_Item);
             createFieldAndLock(AccuDraw_1.ItemField.ANGLE_Item);
-            rowOffset = 0;
-            columnOffset = 0;
             createFieldAndLock(AccuDraw_1.ItemField.X_Item);
             createFieldAndLock(AccuDraw_1.ItemField.Y_Item);
             createFieldAndLock(AccuDraw_1.ItemField.Z_Item); // Both polar and rectangular modes support Z in 3d views...
-            div.style.width = isHorizontalLayout ? `${columnOffset}px` : `${itemWidth + lockWidth + 5}px`;
-            div.style.height = isHorizontalLayout ? `${itemHeight * props.rowSpacingFactor}px` : `${rowOffset}px`;
             this._controls = { overlay, div, itemFields, itemLocks };
             this.updateControlVisibility(AccuDraw_1.CompassMode.Polar === this.compassMode, this.is3dCompass(vp));
             this.setFocusItem(this._focusItem);
@@ -600,7 +676,7 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
         const position = vp.worldToView(ev.point);
         if (props.fixedLocation) {
             position.x = (viewRect.left + ((viewRect.width - this._controls.div.offsetWidth) * 0.5));
-            position.y = (viewRect.bottom - this._controls.div.offsetHeight);
+            position.y = (viewRect.bottom - this._controls.div.offsetHeight * 1.2);
         }
         else {
             position.x += Math.floor(vp.pixelsFromInches(props.cursorOffset.x)) + 0.5;
@@ -667,7 +743,15 @@ class AccuDrawViewportUI extends AccuDraw_1.AccuDraw {
             return;
         // NOTE: Using "setSelectionRange" while value is changing in dynamics isn't pretty, use background+caret color instead...
         const itemField = this._controls.itemFields[item];
-        itemField.style.backgroundColor = (focusIn ? AccuDrawViewportUI.controlProps.text.focusColor : AccuDrawViewportUI.controlProps.backgroundColor);
+        itemField.style.backgroundColor = focusIn
+            ? AccuDrawViewportUI.controlProps.input.focused.backgroundColor
+            : AccuDrawViewportUI.controlProps.input.unfocused.backgroundColor;
+        itemField.style.border = focusIn
+            ? `${AccuDrawViewportUI.controlProps.field.border.width} ${AccuDrawViewportUI.controlProps.field.border.style} ${AccuDrawViewportUI.controlProps.input.focused.border.color}`
+            : `${AccuDrawViewportUI.controlProps.field.border.width} ${AccuDrawViewportUI.controlProps.field.border.style} ${AccuDrawViewportUI.controlProps.input.unfocused.border.color}`;
+        itemField.style.boxShadow = focusIn
+            ? AccuDrawViewportUI.controlProps.input.focused.innerStroke
+            : "none";
         this.updateItemFieldKeyinStatus(itemField, item);
         if (!focusIn)
             this.setDynamicKeyinStatus(item);