@itwin/map-layers 3.1.0-dev.38 → 3.1.0-dev.41

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @itwin/map-layers
 
-This log was last generated on Mon, 24 Jan 2022 14:00:52 GMT and should not be manually modified.
+This log was last generated on Thu, 24 Feb 2022 15:26:55 GMT and should not be manually modified.
+
+## 3.0.1
+Thu, 24 Feb 2022 15:26:55 GMT
+
+_Version update only_
 
 ## 3.0.0
 Mon, 24 Jan 2022 14:00:52 GMT

package/lib/cjs/map-layers.d.ts

@@ -2,5 +2,6 @@ export * from "./mapLayers";
 export * from "./ui/Interfaces";
 export * from "./ui/MapLayersUiItemsProvider";
 export * from "./ui/FeatureInfoUiItemsProvider";
+export * from "./ui/MapFeatureInfoTool";
 export * from "./ui/widget/MapLayersWidget";
 //# sourceMappingURL=map-layers.d.ts.map

package/lib/cjs/map-layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-layers.d.ts","sourceRoot":"","sources":["../../src/map-layers.ts"],"names":[],"mappings":"AAIA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"map-layers.d.ts","sourceRoot":"","sources":["../../src/map-layers.ts"],"names":[],"mappings":"AAIA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC"}

package/lib/cjs/map-layers.js

@@ -18,5 +18,6 @@ __exportStar(require("./mapLayers"), exports);
 __exportStar(require("./ui/Interfaces"), exports);
 __exportStar(require("./ui/MapLayersUiItemsProvider"), exports);
 __exportStar(require("./ui/FeatureInfoUiItemsProvider"), exports);
+__exportStar(require("./ui/MapFeatureInfoTool"), exports);
 __exportStar(require("./ui/widget/MapLayersWidget"), exports);
 //# sourceMappingURL=map-layers.js.map

package/lib/cjs/map-layers.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-layers.js","sourceRoot":"","sources":["../../src/map-layers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,8CAA4B;AAC5B,kDAAgC;AAChC,gEAA8C;AAC9C,kEAAgD;AAChD,8DAA4C","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\nexport * from \"./mapLayers\";\r\nexport * from \"./ui/Interfaces\";\r\nexport * from \"./ui/MapLayersUiItemsProvider\";\r\nexport * from \"./ui/FeatureInfoUiItemsProvider\";\r\nexport * from \"./ui/widget/MapLayersWidget\";\r\n"]}
+{"version":3,"file":"map-layers.js","sourceRoot":"","sources":["../../src/map-layers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,8CAA4B;AAC5B,kDAAgC;AAChC,gEAA8C;AAC9C,kEAAgD;AAChD,0DAAwC;AACxC,8DAA4C","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\nexport * from \"./mapLayers\";\r\nexport * from \"./ui/Interfaces\";\r\nexport * from \"./ui/MapLayersUiItemsProvider\";\r\nexport * from \"./ui/FeatureInfoUiItemsProvider\";\r\nexport * from \"./ui/MapFeatureInfoTool\";\r\nexport * from \"./ui/widget/MapLayersWidget\";\r\n"]}

package/lib/cjs/mapLayers.d.ts

@@ -1,39 +1,28 @@
-import { HitDetail, UserPreferencesAccess } from "@itwin/core-frontend";
-import { BeEvent } from "@itwin/core-bentley";
-export declare type MapHitEvent = BeEvent<(hit: HitDetail) => void>;
-export interface FeatureInfoOpts {
-    onMapHit: MapHitEvent;
+import { Localization } from "@itwin/core-common";
+import { UserPreferencesAccess } from "@itwin/core-frontend";
+import { MapFeatureInfoOptions, MapLayerOptions } from "./ui/Interfaces";
+export interface MapLayersConfig {
+    localization?: Localization;
+    /** If an iTwinConfig is provided, it will be used to load the MapLayerSources that are stored. */
+    iTwinConfig?: UserPreferencesAccess;
+    mapLayerOptions?: MapLayerOptions;
+    featureInfoOpts?: MapFeatureInfoOptions;
 }
 /** MapLayersUI is use when the package is used as a dependency to another app.
  * '''ts
- *  await MapLayersUI.initialize(registerItemsProvider);
+ *  await MapLayersUI.initialize({...MapLayersInitProps});
  * '''
  * @beta
  */
 export declare class MapLayersUI {
     private static _defaultNs;
-    private static _mapLayersItemsProvider;
-    private static _mapFeatureInfoItemsProvider;
-    private static _uiItemsProvider;
-    private static _itemsProviderRegistered?;
+    static localization: Localization;
+    private static _uiItemsProviders;
     private static _iTwinConfig?;
-    private static _onMapHit?;
     static get iTwinConfig(): UserPreferencesAccess | undefined;
-    static get onMapHit(): MapHitEvent | undefined;
-    /** Used to initialize the Map Layers.
-     *
-     * If `registerItemsProvider` is true, the UiItemsProvider will automatically insert the UI items into the host applications UI.
-     * If it is false, explicitly add widget definition to a specific FrontStage definition using the following syntax.
-     *
-     *   ```tsx
-     *   <Widget id={MapLayersWidgetControl.id} label={MapLayersWidgetControl.label} control={MapLayersWidgetControl}
-     *   iconSpec={MapLayersWidgetControl.iconSpec} />,
-     *   ```
-     *
-     * If an iTwinConfig is provided, it will be used to load the MapLayerSources that are stored.
-     */
-    static initialize(registerItemsProvider?: boolean, iTwinConfig?: UserPreferencesAccess, fInfoOps?: FeatureInfoOpts): Promise<void>;
-    /** Unregisters internationalization service namespace and UiItemManager / control */
+    /** Used to initialize the Map Layers */
+    static initialize(config?: MapLayersConfig): Promise<void>;
+    /** Unregisters internationalization service namespace and UiItemManager  */
     static terminate(): void;
     /** The internationalization service namespace. */
     static get localizationNamespace(): string;

package/lib/cjs/mapLayers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapLayers.d.ts","sourceRoot":"","sources":["../../src/mapLayers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAa,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAGnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,oBAAY,WAAW,GAAG,OAAO,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC;AAC5D,MAAM,WAAW,eAAe;IAK9B,QAAQ,EAAE,WAAW,CAAC;CACvB;AAED;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAe;IACxC,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA2B;IACjE,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAA6B;IACxE,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA2B;IAC1D,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAU;IAElD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAwB;IACpD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAc;IAEvC,WAAkB,WAAW,IAAI,qBAAqB,GAAG,SAAS,CAA8B;IAChG,WAAkB,QAAQ,IAAI,WAAW,GAAG,SAAS,CAA2B;IAEhF;;;;;;;;;;;OAWG;WACiB,UAAU,CAC5B,qBAAqB,UAAO,EAC5B,WAAW,CAAC,EAAE,qBAAqB,EACnC,QAAQ,CAAC,EAAE,eAAe,GACzB,OAAO,CAAC,IAAI,CAAC;IAuBhB,qFAAqF;WACvE,SAAS;IAevB,kDAAkD;IAClD,WAAkB,qBAAqB,IAAI,MAAM,CAEhD;CACF"}
+{"version":3,"file":"mapLayers.d.ts","sourceRoot":"","sources":["../../src/mapLayers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAa,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIxE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEzE,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kGAAkG;IAClG,WAAW,CAAC,EAAE,qBAAqB,CAAC;IACpC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAED;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAe;IACxC,OAAc,YAAY,EAAE,YAAY,CAAC;IACzC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAyB;IAEzD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAwB;IAEpD,WAAkB,WAAW,IAAI,qBAAqB,GAAG,SAAS,CAEjE;IAED,wCAAwC;WACpB,UAAU,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvE,4EAA4E;WAC9D,SAAS;IAQvB,kDAAkD;IAClD,WAAkB,qBAAqB,IAAI,MAAM,CAEhD;CACF"}

package/lib/cjs/mapLayers.js

@@ -1,70 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MapLayersUI = void 0;
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
 const core_frontend_1 = require("@itwin/core-frontend");
 const MapLayersUiItemsProvider_1 = require("./ui/MapLayersUiItemsProvider");
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const FeatureInfoUiItemsProvider_1 = require("./ui/FeatureInfoUiItemsProvider");
 /** MapLayersUI is use when the package is used as a dependency to another app.
  * '''ts
- *  await MapLayersUI.initialize(registerItemsProvider);
+ *  await MapLayersUI.initialize({...MapLayersInitProps});
  * '''
  * @beta
  */
 class MapLayersUI {
-    static get iTwinConfig() { return this._iTwinConfig; }
-    static get onMapHit() { return this._onMapHit; }
-    /** Used to initialize the Map Layers.
-     *
-     * If `registerItemsProvider` is true, the UiItemsProvider will automatically insert the UI items into the host applications UI.
-     * If it is false, explicitly add widget definition to a specific FrontStage definition using the following syntax.
-     *
-     *   ```tsx
-     *   <Widget id={MapLayersWidgetControl.id} label={MapLayersWidgetControl.label} control={MapLayersWidgetControl}
-     *   iconSpec={MapLayersWidgetControl.iconSpec} />,
-     *   ```
-     *
-     * If an iTwinConfig is provided, it will be used to load the MapLayerSources that are stored.
-     */
-    static async initialize(registerItemsProvider = true, iTwinConfig, fInfoOps) {
-        MapLayersUI._iTwinConfig = iTwinConfig;
-        MapLayersUI._onMapHit = fInfoOps === null || fInfoOps === void 0 ? void 0 : fInfoOps.onMapHit;
+    static get iTwinConfig() {
+        return this._iTwinConfig;
+    }
+    /** Used to initialize the Map Layers */
+    static async initialize(config) {
+        var _a, _b;
         // register namespace containing localized strings for this package
-        await core_frontend_1.IModelApp.localization.registerNamespace(this.localizationNamespace);
-        // _uiItemsProvider always created to provide access to localization.
-        MapLayersUI._mapLayersItemsProvider = new MapLayersUiItemsProvider_1.MapLayersUiItemsProvider(core_frontend_1.IModelApp.localization);
-        MapLayersUI._mapFeatureInfoItemsProvider = new FeatureInfoUiItemsProvider_1.FeatureInfoUiItemsProvider(core_frontend_1.IModelApp.localization);
-        if (registerItemsProvider) {
-            appui_abstract_1.UiItemsManager.register(MapLayersUI._mapLayersItemsProvider);
-            // Register the FeatureInfo widget only if MapHit was provided.
-            if (MapLayersUI._onMapHit) {
-                appui_abstract_1.UiItemsManager.register(MapLayersUI._mapFeatureInfoItemsProvider);
-            }
+        MapLayersUI.localization = (_a = config === null || config === void 0 ? void 0 : config.localization) !== null && _a !== void 0 ? _a : core_frontend_1.IModelApp.localization;
+        await MapLayersUI.localization.registerNamespace(MapLayersUI.localizationNamespace);
+        MapLayersUI._iTwinConfig = config === null || config === void 0 ? void 0 : config.iTwinConfig;
+        MapLayersUI._uiItemsProviders.push(new MapLayersUiItemsProvider_1.MapLayersUiItemsProvider({ ...config === null || config === void 0 ? void 0 : config.mapLayerOptions }));
+        // Register the FeatureInfo widget only if MapHit was provided.
+        if ((_b = config === null || config === void 0 ? void 0 : config.featureInfoOpts) === null || _b === void 0 ? void 0 : _b.onMapHit) {
+            MapLayersUI._uiItemsProviders.push(new FeatureInfoUiItemsProvider_1.FeatureInfoUiItemsProvider({ ...config === null || config === void 0 ? void 0 : config.featureInfoOpts }));
         }
-        MapLayersUI._itemsProviderRegistered = registerItemsProvider;
+        MapLayersUI._uiItemsProviders.forEach((uiProvider) => {
+            appui_abstract_1.UiItemsManager.register(uiProvider);
+        });
     }
-    /** Unregisters internationalization service namespace and UiItemManager / control */
+    /** Unregisters internationalization service namespace and UiItemManager  */
     static terminate() {
-        core_frontend_1.IModelApp.localization.unregisterNamespace(this.localizationNamespace);
-        if (MapLayersUI._itemsProviderRegistered !== undefined) {
-            if (MapLayersUI._itemsProviderRegistered) {
-                appui_abstract_1.UiItemsManager.unregister(MapLayersUI._mapLayersItemsProvider.id);
-                if (MapLayersUI._onMapHit) {
-                    appui_abstract_1.UiItemsManager.unregister(MapLayersUI._mapFeatureInfoItemsProvider.id);
-                }
-            }
-            MapLayersUI._itemsProviderRegistered = undefined;
-        }
+        core_frontend_1.IModelApp.localization.unregisterNamespace(MapLayersUI.localizationNamespace);
+        MapLayersUI._uiItemsProviders.forEach((uiProvider) => {
+            appui_abstract_1.UiItemsManager.unregister(uiProvider.id);
+        });
     }
     /** The internationalization service namespace. */
     static get localizationNamespace() {
-        return this._defaultNs;
+        return MapLayersUI._defaultNs;
     }
 }
 exports.MapLayersUI = MapLayersUI;
 MapLayersUI._defaultNs = "mapLayers";
+MapLayersUI._uiItemsProviders = [];
 //# sourceMappingURL=mapLayers.js.map

package/lib/cjs/mapLayers.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapLayers.js","sourceRoot":"","sources":["../../src/mapLayers.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,wDAAmF;AACnF,4EAAyE;AACzE,0DAAuD;AAEvD,gFAA6E;AAW7E;;;;;GAKG;AACH,MAAa,WAAW;IAUf,MAAM,KAAK,WAAW,KAAwC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IACzF,MAAM,KAAK,QAAQ,KAA8B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhF;;;;;;;;;;;OAWG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,qBAAqB,GAAG,IAAI,EAC5B,WAAmC,EACnC,QAA0B;QAG1B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,WAAW,CAAC,SAAS,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC;QAE3C,mEAAmE;QACnE,MAAM,yBAAS,CAAC,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAE3E,qEAAqE;QACrE,WAAW,CAAC,uBAAuB,GAAG,IAAI,mDAAwB,CAAC,yBAAS,CAAC,YAAY,CAAC,CAAC;QAC3F,WAAW,CAAC,4BAA4B,GAAG,IAAI,uDAA0B,CAAC,yBAAS,CAAC,YAAY,CAAC,CAAC;QAClG,IAAI,qBAAqB,EAAE;YACzB,+BAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;YAE7D,+DAA+D;YAC/D,IAAI,WAAW,CAAC,SAAS,EAAE;gBACzB,+BAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;aACnE;SACF;QAED,WAAW,CAAC,wBAAwB,GAAG,qBAAqB,CAAC;IAC/D,CAAC;IAED,qFAAqF;IAC9E,MAAM,CAAC,SAAS;QACrB,yBAAS,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAEvE,IAAI,WAAW,CAAC,wBAAwB,KAAK,SAAS,EAAE;YACtD,IAAI,WAAW,CAAC,wBAAwB,EAAE;gBACxC,+BAAc,CAAC,UAAU,CAAC,WAAW,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;gBAElE,IAAI,WAAW,CAAC,SAAS,EAAE;oBACzB,+BAAc,CAAC,UAAU,CAAC,WAAW,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC;iBACxE;aACF;YACD,WAAW,CAAC,wBAAwB,GAAG,SAAS,CAAC;SAClD;IACH,CAAC;IAED,kDAAkD;IAC3C,MAAM,KAAK,qBAAqB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;;AAvEH,kCAwEC;AAvEgB,sBAAU,GAAG,WAAW,CAAC","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\nimport { HitDetail, IModelApp, UserPreferencesAccess } from \"@itwin/core-frontend\";\r\nimport { MapLayersUiItemsProvider } from \"./ui/MapLayersUiItemsProvider\";\r\nimport { UiItemsManager } from \"@itwin/appui-abstract\";\r\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { FeatureInfoUiItemsProvider } from \"./ui/FeatureInfoUiItemsProvider\";\r\n\r\nexport type MapHitEvent = BeEvent<(hit: HitDetail) => void>;\r\nexport interface FeatureInfoOpts\r\n{\r\n  // HitDetail Event whenever the map is clicked.\r\n  // Typically the HitDetail object is provided by ElementLocateManager.doLocate.\r\n  // Every time this event is raised, FeatureInfoWidget will attempt to retrieve data from MapLayerImageryProviders.\r\n  onMapHit: MapHitEvent;\r\n}\r\n\r\n/** MapLayersUI is use when the package is used as a dependency to another app.\r\n * '''ts\r\n *  await MapLayersUI.initialize(registerItemsProvider);\r\n * '''\r\n * @beta\r\n */\r\nexport class MapLayersUI {\r\n  private static _defaultNs = \"mapLayers\";\r\n  private static _mapLayersItemsProvider: MapLayersUiItemsProvider;\r\n  private static _mapFeatureInfoItemsProvider: FeatureInfoUiItemsProvider;\r\n  private static _uiItemsProvider: MapLayersUiItemsProvider;\r\n  private static _itemsProviderRegistered?: boolean;\r\n\r\n  private static _iTwinConfig?: UserPreferencesAccess;\r\n  private static _onMapHit?: MapHitEvent;\r\n\r\n  public static get iTwinConfig(): UserPreferencesAccess | undefined { return this._iTwinConfig; }\r\n  public static get onMapHit(): MapHitEvent | undefined { return this._onMapHit; }\r\n\r\n  /** Used to initialize the Map Layers.\r\n   *\r\n   * If `registerItemsProvider` is true, the UiItemsProvider will automatically insert the UI items into the host applications UI.\r\n   * If it is false, explicitly add widget definition to a specific FrontStage definition using the following syntax.\r\n   *\r\n   *   ```tsx\r\n   *   <Widget id={MapLayersWidgetControl.id} label={MapLayersWidgetControl.label} control={MapLayersWidgetControl}\r\n   *   iconSpec={MapLayersWidgetControl.iconSpec} />,\r\n   *   ```\r\n   *\r\n   * If an iTwinConfig is provided, it will be used to load the MapLayerSources that are stored.\r\n   */\r\n  public static async initialize(\r\n    registerItemsProvider = true,\r\n    iTwinConfig?: UserPreferencesAccess,\r\n    fInfoOps?: FeatureInfoOpts\r\n  ): Promise<void> {\r\n\r\n    MapLayersUI._iTwinConfig = iTwinConfig;\r\n    MapLayersUI._onMapHit = fInfoOps?.onMapHit;\r\n\r\n    // register namespace containing localized strings for this package\r\n    await IModelApp.localization.registerNamespace(this.localizationNamespace);\r\n\r\n    // _uiItemsProvider always created to provide access to localization.\r\n    MapLayersUI._mapLayersItemsProvider = new MapLayersUiItemsProvider(IModelApp.localization);\r\n    MapLayersUI._mapFeatureInfoItemsProvider = new FeatureInfoUiItemsProvider(IModelApp.localization);\r\n    if (registerItemsProvider) {\r\n      UiItemsManager.register(MapLayersUI._mapLayersItemsProvider);\r\n\r\n      // Register the FeatureInfo widget only if MapHit was provided.\r\n      if (MapLayersUI._onMapHit) {\r\n        UiItemsManager.register(MapLayersUI._mapFeatureInfoItemsProvider);\r\n      }\r\n    }\r\n\r\n    MapLayersUI._itemsProviderRegistered = registerItemsProvider;\r\n  }\r\n\r\n  /** Unregisters internationalization service namespace and UiItemManager / control */\r\n  public static terminate() {\r\n    IModelApp.localization.unregisterNamespace(this.localizationNamespace);\r\n\r\n    if (MapLayersUI._itemsProviderRegistered !== undefined) {\r\n      if (MapLayersUI._itemsProviderRegistered) {\r\n        UiItemsManager.unregister(MapLayersUI._mapLayersItemsProvider.id);\r\n\r\n        if (MapLayersUI._onMapHit) {\r\n          UiItemsManager.unregister(MapLayersUI._mapFeatureInfoItemsProvider.id);\r\n        }\r\n      }\r\n      MapLayersUI._itemsProviderRegistered = undefined;\r\n    }\r\n  }\r\n\r\n  /** The internationalization service namespace. */\r\n  public static get localizationNamespace(): string {\r\n    return this._defaultNs;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"mapLayers.js","sourceRoot":"","sources":["../../src/mapLayers.ts"],"names":[],"mappings":";;;AAKA,wDAAwE;AACxE,4EAAyE;AACzE,0DAAwE;AACxE,gFAA6E;AAW7E;;;;;GAKG;AACH,MAAa,WAAW;IAOf,MAAM,KAAK,WAAW;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAwB;;QACrD,mEAAmE;QACnE,WAAW,CAAC,YAAY,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,yBAAS,CAAC,YAAY,CAAC;QAC1E,MAAM,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAC9C,WAAW,CAAC,qBAAqB,CAClC,CAAC;QAEF,WAAW,CAAC,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAC;QAE/C,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAChC,IAAI,mDAAwB,CAAC,EAAE,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,EAAE,CAAC,CAC7D,CAAC;QAEF,+DAA+D;QAC/D,IAAI,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,0CAAE,QAAQ,EAAE;YACrC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAChC,IAAI,uDAA0B,CAAC,EAAE,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,EAAE,CAAC,CAC/D,CAAC;SACH;QAED,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACnD,+BAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4EAA4E;IACrE,MAAM,CAAC,SAAS;QACrB,yBAAS,CAAC,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAE9E,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACnD,+BAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kDAAkD;IAC3C,MAAM,KAAK,qBAAqB;QACrC,OAAO,WAAW,CAAC,UAAU,CAAC;IAChC,CAAC;;AAjDH,kCAkDC;AAjDgB,sBAAU,GAAG,WAAW,CAAC;AAEzB,6BAAiB,GAAsB,EAAE,CAAC","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\nimport { Localization } from \"@itwin/core-common\";\r\nimport { IModelApp, UserPreferencesAccess } from \"@itwin/core-frontend\";\r\nimport { MapLayersUiItemsProvider } from \"./ui/MapLayersUiItemsProvider\";\r\nimport { UiItemsManager, UiItemsProvider } from \"@itwin/appui-abstract\";\r\nimport { FeatureInfoUiItemsProvider } from \"./ui/FeatureInfoUiItemsProvider\";\r\nimport { MapFeatureInfoOptions, MapLayerOptions } from \"./ui/Interfaces\";\r\n\r\nexport interface MapLayersConfig {\r\n  localization?: Localization;\r\n  /** If an iTwinConfig is provided, it will be used to load the MapLayerSources that are stored. */\r\n  iTwinConfig?: UserPreferencesAccess;\r\n  mapLayerOptions?: MapLayerOptions;\r\n  featureInfoOpts?: MapFeatureInfoOptions;\r\n}\r\n\r\n/** MapLayersUI is use when the package is used as a dependency to another app.\r\n * '''ts\r\n *  await MapLayersUI.initialize({...MapLayersInitProps});\r\n * '''\r\n * @beta\r\n */\r\nexport class MapLayersUI {\r\n  private static _defaultNs = \"mapLayers\";\r\n  public static localization: Localization;\r\n  private static _uiItemsProviders: UiItemsProvider[] = [];\r\n\r\n  private static _iTwinConfig?: UserPreferencesAccess;\r\n\r\n  public static get iTwinConfig(): UserPreferencesAccess | undefined {\r\n    return this._iTwinConfig;\r\n  }\r\n\r\n  /** Used to initialize the Map Layers */\r\n  public static async initialize(config?: MapLayersConfig): Promise<void> {\r\n    // register namespace containing localized strings for this package\r\n    MapLayersUI.localization = config?.localization ?? IModelApp.localization;\r\n    await MapLayersUI.localization.registerNamespace(\r\n      MapLayersUI.localizationNamespace\r\n    );\r\n\r\n    MapLayersUI._iTwinConfig = config?.iTwinConfig;\r\n\r\n    MapLayersUI._uiItemsProviders.push(\r\n      new MapLayersUiItemsProvider({ ...config?.mapLayerOptions })\r\n    );\r\n\r\n    // Register the FeatureInfo widget only if MapHit was provided.\r\n    if (config?.featureInfoOpts?.onMapHit) {\r\n      MapLayersUI._uiItemsProviders.push(\r\n        new FeatureInfoUiItemsProvider({ ...config?.featureInfoOpts })\r\n      );\r\n    }\r\n\r\n    MapLayersUI._uiItemsProviders.forEach((uiProvider) => {\r\n      UiItemsManager.register(uiProvider);\r\n    });\r\n  }\r\n\r\n  /** Unregisters internationalization service namespace and UiItemManager  */\r\n  public static terminate() {\r\n    IModelApp.localization.unregisterNamespace(MapLayersUI.localizationNamespace);\r\n\r\n    MapLayersUI._uiItemsProviders.forEach((uiProvider) => {\r\n      UiItemsManager.unregister(uiProvider.id);\r\n    });\r\n  }\r\n\r\n  /** The internationalization service namespace. */\r\n  public static get localizationNamespace(): string {\r\n    return MapLayersUI._defaultNs;\r\n  }\r\n}\r\n"]}

package/lib/cjs/ui/FeatureInfoUiItemsProvider.d.ts

@@ -1,17 +1,11 @@
-import { AbstractWidgetProps, StagePanelLocation, StagePanelSection, UiItemsProvider } from "@itwin/appui-abstract";
-import { Localization } from "@itwin/core-common";
-import { ConfigurableCreateInfo, WidgetControl } from "@itwin/appui-react";
+import { AbstractWidgetProps, AbstractZoneLocation, CommonToolbarItem, StagePanelLocation, StagePanelSection, ToolbarOrientation, ToolbarUsage, UiItemsProvider } from "@itwin/appui-abstract";
 import { MapFeatureInfoOptions } from "./Interfaces";
 export declare class FeatureInfoUiItemsProvider implements UiItemsProvider {
+    private _featureInfoOpts;
     readonly id = "FeatureInfoUiItemsProvider";
-    static localization: Localization;
-    constructor(localization: Localization);
-    provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section: StagePanelSection | undefined): ReadonlyArray<AbstractWidgetProps>;
-}
-export declare class FeatureInfoWidgetControl extends WidgetControl {
-    static id: string;
-    static iconSpec: string;
-    static label: string;
-    constructor(info: ConfigurableCreateInfo, featureInfoOpts: MapFeatureInfoOptions);
+    static readonly widgetId = "map-layers:mapFeatureInfoWidget";
+    constructor(_featureInfoOpts: MapFeatureInfoOptions);
+    provideToolbarButtonItems(_stageId: string, stageUsage: string, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation): CommonToolbarItem[];
+    provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section?: StagePanelSection, zoneLocation?: AbstractZoneLocation): ReadonlyArray<AbstractWidgetProps>;
 }
 //# sourceMappingURL=FeatureInfoUiItemsProvider.d.ts.map

package/lib/cjs/ui/FeatureInfoUiItemsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoUiItemsProvider.d.ts","sourceRoot":"","sources":["../../../src/ui/FeatureInfoUiItemsProvider.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAChI,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAGrD,qBAAc,0BAA2B,YAAW,eAAe;IACjE,SAAgB,EAAE,gCAAgC;IAClD,OAAc,YAAY,EAAE,YAAY,CAAC;gBAEtB,YAAY,EAAE,YAAY;IAItC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,mBAAmB,CAAC;CActK;AAED,qBAAa,wBAAyB,SAAQ,aAAa;IACzD,OAAc,EAAE,SAAuB;IACvC,OAAc,QAAQ,SAAc;IACpC,OAAc,KAAK,SAA8B;gBACrC,IAAI,EAAE,sBAAsB,EAAE,eAAe,EAAE,qBAAqB;CAKjF"}
+{"version":3,"file":"FeatureInfoUiItemsProvider.d.ts","sourceRoot":"","sources":["../../../src/ui/FeatureInfoUiItemsProvider.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAGxN,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAIrD,qBAAa,0BAA2B,YAAW,eAAe;IAI7C,OAAO,CAAC,gBAAgB;IAH3C,SAAgB,EAAE,gCAAgC;IAClD,gBAAuB,QAAQ,qCAAqC;gBAEzC,gBAAgB,EAAE,qBAAqB;IAE3D,yBAAyB,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,GACrC,iBAAiB,EAAE;IAiBf,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,iBAAiB,EAAE,YAAY,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC,mBAAmB,CAAC;CAiBhM"}

package/lib/cjs/ui/FeatureInfoUiItemsProvider.js

@@ -4,39 +4,48 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeatureInfoWidgetControl = exports.FeatureInfoUiItemsProvider = void 0;
+exports.FeatureInfoUiItemsProvider = void 0;
 const React = require("react");
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const appui_react_1 = require("@itwin/appui-react");
-const core_frontend_1 = require("@itwin/core-frontend");
 const FeatureInfoWidget_1 = require("./widget/FeatureInfoWidget");
+const mapLayers_1 = require("../mapLayers");
+const MapFeatureInfoTool_1 = require("./MapFeatureInfoTool");
 class FeatureInfoUiItemsProvider {
-    constructor(localization) {
+    constructor(_featureInfoOpts) {
+        this._featureInfoOpts = _featureInfoOpts;
         this.id = "FeatureInfoUiItemsProvider";
-        FeatureInfoUiItemsProvider.localization = localization;
     }
-    provideWidgets(_stageId, stageUsage, location, section) {
+    provideToolbarButtonItems(_stageId, stageUsage, toolbarUsage, toolbarOrientation) {
+        var _a;
+        if (!((_a = this._featureInfoOpts) === null || _a === void 0 ? void 0 : _a.disableDefaultFeatureInfoTool) &&
+            stageUsage === appui_abstract_1.StageUsage.General &&
+            toolbarUsage === appui_abstract_1.ToolbarUsage.ContentManipulation &&
+            toolbarOrientation === appui_abstract_1.ToolbarOrientation.Vertical) {
+            MapFeatureInfoTool_1.DefaultMapFeatureInfoTool.register(mapLayers_1.MapLayersUI.localizationNamespace);
+            return [
+                appui_react_1.ToolbarHelper.createToolbarItemFromItemDef(60, (0, MapFeatureInfoTool_1.getDefaultMapFeatureInfoToolItemDef)()),
+            ];
+        }
+        return [];
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    provideWidgets(_stageId, stageUsage, location, section, zoneLocation) {
         const widgets = [];
-        if (stageUsage === appui_abstract_1.StageUsage.General && location === appui_abstract_1.StagePanelLocation.Right && section === appui_abstract_1.StagePanelSection.End) {
+        // eslint-disable-next-line deprecation/deprecation
+        if ((undefined === section && stageUsage === appui_abstract_1.StageUsage.General && zoneLocation === appui_abstract_1.AbstractZoneLocation.BottomRight) ||
+            (stageUsage === appui_abstract_1.StageUsage.General && location === appui_abstract_1.StagePanelLocation.Right && section === appui_abstract_1.StagePanelSection.End && "1" !== appui_react_1.UiFramework.uiVersion)) {
             widgets.push({
-                id: "map-layers:mapFeatureInfoWidget",
-                label: core_frontend_1.IModelApp.localization.getLocalizedString("mapLayers:FeatureInfoWidget.Label"),
+                id: FeatureInfoUiItemsProvider.widgetId,
+                label: mapLayers_1.MapLayersUI.localization.getLocalizedString("mapLayers:FeatureInfoWidget.Label"),
                 icon: "icon-map",
-                getWidgetContent: () => React.createElement(FeatureInfoWidget_1.MapFeatureInfoWidget, { featureInfoOpts: { showLoadProgressAnimation: true } }), // eslint-disable-line react/display-name
+                getWidgetContent: () => React.createElement(FeatureInfoWidget_1.MapFeatureInfoWidget, { featureInfoOpts: this._featureInfoOpts }),
+                defaultState: appui_abstract_1.WidgetState.Closed,
             });
         }
         return widgets;
     }
 }
 exports.FeatureInfoUiItemsProvider = FeatureInfoUiItemsProvider;
-class FeatureInfoWidgetControl extends appui_react_1.WidgetControl {
-    constructor(info, featureInfoOpts) {
-        super(info, featureInfoOpts);
-        super.reactNode = React.createElement(FeatureInfoWidget_1.MapFeatureInfoWidget, { featureInfoOpts: featureInfoOpts });
-    }
-}
-exports.FeatureInfoWidgetControl = FeatureInfoWidgetControl;
-FeatureInfoWidgetControl.id = "FeatureInfoWidget";
-FeatureInfoWidgetControl.iconSpec = "icon-map";
-FeatureInfoWidgetControl.label = "FeatureInfoWidgetControl";
+FeatureInfoUiItemsProvider.widgetId = "map-layers:mapFeatureInfoWidget";
 //# sourceMappingURL=FeatureInfoUiItemsProvider.js.map

package/lib/cjs/ui/FeatureInfoUiItemsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoUiItemsProvider.js","sourceRoot":"","sources":["../../../src/ui/FeatureInfoUiItemsProvider.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,+BAA+B;AAC/B,0DAAgI;AAEhI,oDAA2E;AAC3E,wDAAiD;AAEjD,kEAAkE;AAElE,MAAc,0BAA0B;IAItC,YAAmB,YAA0B;QAH7B,OAAE,GAAG,4BAA4B,CAAC;QAIhD,0BAA0B,CAAC,YAAY,GAAG,YAAY,CAAC;IACzD,CAAC;IAEM,cAAc,CAAC,QAAgB,EAAE,UAAkB,EAAE,QAA4B,EAAE,OAAsC;QAC9H,MAAM,OAAO,GAA0B,EAAE,CAAC;QAE1C,IAAI,UAAU,KAAK,2BAAU,CAAC,OAAO,IAAI,QAAQ,KAAK,mCAAkB,CAAC,KAAK,IAAI,OAAO,KAAK,kCAAiB,CAAC,GAAG,EAAE;YACnH,OAAO,CAAC,IAAI,CAAC;gBACX,EAAE,EAAE,iCAAiC;gBACrC,KAAK,EAAE,yBAAS,CAAC,YAAY,CAAC,kBAAkB,CAAC,mCAAmC,CAAC;gBACrF,IAAI,EAAE,UAAU;gBAChB,gBAAgB,EAAE,GAAG,EAAE,CAAC,oBAAC,wCAAoB,IAAC,eAAe,EAAE,EAAC,yBAAyB,EAAE,IAAI,EAAC,GAAG,EAAE,yCAAyC;aAC/I,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAtBD,gEAsBC;AAED,MAAa,wBAAyB,SAAQ,2BAAa;IAIzD,YAAY,IAA4B,EAAE,eAAsC;QAC9E,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE7B,KAAK,CAAC,SAAS,GAAG,oBAAC,wCAAoB,IAAC,eAAe,EAAE,eAAe,GAAG,CAAC;IAC9E,CAAC;;AARH,4DASC;AARe,2BAAE,GAAG,mBAAmB,CAAC;AACzB,iCAAQ,GAAG,UAAU,CAAC;AACtB,8BAAK,GAAG,0BAA0B,CAAC","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\r\nimport * as React from \"react\";\r\nimport { AbstractWidgetProps, StagePanelLocation, StagePanelSection, StageUsage, UiItemsProvider } from \"@itwin/appui-abstract\";\r\nimport { Localization } from \"@itwin/core-common\";\r\nimport { ConfigurableCreateInfo, WidgetControl } from \"@itwin/appui-react\";\r\nimport { IModelApp } from \"@itwin/core-frontend\";\r\nimport { MapFeatureInfoOptions } from \"./Interfaces\";\r\nimport { MapFeatureInfoWidget } from \"./widget/FeatureInfoWidget\";\r\n\r\nexport class  FeatureInfoUiItemsProvider implements UiItemsProvider {\r\n  public readonly id = \"FeatureInfoUiItemsProvider\";\r\n  public static localization: Localization;\r\n\r\n  public constructor(localization: Localization) {\r\n    FeatureInfoUiItemsProvider.localization = localization;\r\n  }\r\n\r\n  public provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section: StagePanelSection | undefined): ReadonlyArray<AbstractWidgetProps> {\r\n    const widgets: AbstractWidgetProps[] = [];\r\n\r\n    if (stageUsage === StageUsage.General && location === StagePanelLocation.Right && section === StagePanelSection.End) {\r\n      widgets.push({\r\n        id: \"map-layers:mapFeatureInfoWidget\",\r\n        label: IModelApp.localization.getLocalizedString(\"mapLayers:FeatureInfoWidget.Label\"),\r\n        icon: \"icon-map\",\r\n        getWidgetContent: () => <MapFeatureInfoWidget featureInfoOpts={{showLoadProgressAnimation: true}}/>, // eslint-disable-line react/display-name\r\n      });\r\n    }\r\n\r\n    return widgets;\r\n  }\r\n}\r\n\r\nexport class FeatureInfoWidgetControl extends WidgetControl {\r\n  public static id = \"FeatureInfoWidget\";\r\n  public static iconSpec = \"icon-map\";\r\n  public static label = \"FeatureInfoWidgetControl\";\r\n  constructor(info: ConfigurableCreateInfo, featureInfoOpts: MapFeatureInfoOptions) {\r\n    super(info, featureInfoOpts);\r\n\r\n    super.reactNode = <MapFeatureInfoWidget featureInfoOpts={featureInfoOpts}/>;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"FeatureInfoUiItemsProvider.js","sourceRoot":"","sources":["../../../src/ui/FeatureInfoUiItemsProvider.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,+BAA+B;AAC/B,0DAAwN;AACxN,oDAAgE;AAChE,kEAAkE;AAElE,4CAA2C;AAC3C,6DAAsG;AAEtG,MAAa,0BAA0B;IAIrC,YAA2B,gBAAuC;QAAvC,qBAAgB,GAAhB,gBAAgB,CAAuB;QAHlD,OAAE,GAAG,4BAA4B,CAAC;IAGoB,CAAC;IAEhE,yBAAyB,CAC9B,QAAgB,EAChB,UAAkB,EAClB,YAA0B,EAC1B,kBAAsC;;QAEtC,IACE,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,6BAA6B,CAAA;YACrD,UAAU,KAAK,2BAAU,CAAC,OAAO;YACjC,YAAY,KAAK,6BAAY,CAAC,mBAAmB;YACjD,kBAAkB,KAAK,mCAAkB,CAAC,QAAQ,EAClD;YACA,8CAAyB,CAAC,QAAQ,CAAC,uBAAW,CAAC,qBAAqB,CAAC,CAAC;YACtE,OAAO;gBACL,2BAAa,CAAC,4BAA4B,CAAC,EAAE,EAAE,IAAA,wDAAmC,GAAE,CAAC;aACtF,CAAC;SACH;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,mDAAmD;IAC5C,cAAc,CAAC,QAAgB,EAAE,UAAkB,EAAE,QAA4B,EAAE,OAA2B,EAAE,YAAmC;QACxJ,MAAM,OAAO,GAA0B,EAAE,CAAC;QAE1C,mDAAmD;QACnD,IAAI,CAAC,SAAS,KAAK,OAAO,IAAI,UAAU,KAAK,2BAAU,CAAC,OAAO,IAAI,YAAY,KAAK,qCAAoB,CAAC,WAAW,CAAC;YACnH,CAAC,UAAU,KAAK,2BAAU,CAAC,OAAO,IAAI,QAAQ,KAAK,mCAAkB,CAAC,KAAK,IAAI,OAAO,KAAK,kCAAiB,CAAC,GAAG,IAAI,GAAG,KAAK,yBAAW,CAAC,SAAS,CAAC,EAAE;YACpJ,OAAO,CAAC,IAAI,CAAC;gBACX,EAAE,EAAE,0BAA0B,CAAC,QAAQ;gBACvC,KAAK,EAAE,uBAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,mCAAmC,CAAC;gBACvF,IAAI,EAAE,UAAU;gBAChB,gBAAgB,EAAE,GAAG,EAAE,CAAC,oBAAC,wCAAoB,IAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,GAAI;gBACxF,YAAY,EAAE,4BAAW,CAAC,MAAM;aACjC,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;;AA5CH,gEA6CC;AA3CwB,mCAAQ,GAAG,iCAAiC,CAAC","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\r\nimport * as React from \"react\";\r\nimport { AbstractWidgetProps, AbstractZoneLocation, CommonToolbarItem, StagePanelLocation, StagePanelSection, StageUsage, ToolbarOrientation, ToolbarUsage, UiItemsProvider, WidgetState } from \"@itwin/appui-abstract\";\r\nimport { ToolbarHelper, UiFramework } from \"@itwin/appui-react\";\r\nimport { MapFeatureInfoWidget } from \"./widget/FeatureInfoWidget\";\r\nimport { MapFeatureInfoOptions } from \"./Interfaces\";\r\nimport { MapLayersUI } from \"../mapLayers\";\r\nimport { DefaultMapFeatureInfoTool, getDefaultMapFeatureInfoToolItemDef } from \"./MapFeatureInfoTool\";\r\n\r\nexport class FeatureInfoUiItemsProvider implements UiItemsProvider {\r\n  public readonly id = \"FeatureInfoUiItemsProvider\";\r\n  public static readonly widgetId = \"map-layers:mapFeatureInfoWidget\";\r\n\r\n  public constructor(private _featureInfoOpts: MapFeatureInfoOptions) { }\r\n\r\n  public provideToolbarButtonItems(\r\n    _stageId: string,\r\n    stageUsage: string,\r\n    toolbarUsage: ToolbarUsage,\r\n    toolbarOrientation: ToolbarOrientation,\r\n  ): CommonToolbarItem[] {\r\n    if (\r\n      !this._featureInfoOpts?.disableDefaultFeatureInfoTool &&\r\n      stageUsage === StageUsage.General &&\r\n      toolbarUsage === ToolbarUsage.ContentManipulation &&\r\n      toolbarOrientation === ToolbarOrientation.Vertical\r\n    ) {\r\n      DefaultMapFeatureInfoTool.register(MapLayersUI.localizationNamespace);\r\n      return [\r\n        ToolbarHelper.createToolbarItemFromItemDef(60, getDefaultMapFeatureInfoToolItemDef()),\r\n      ];\r\n    }\r\n\r\n    return [];\r\n  }\r\n\r\n  // eslint-disable-next-line deprecation/deprecation\r\n  public provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section?: StagePanelSection, zoneLocation?: AbstractZoneLocation): ReadonlyArray<AbstractWidgetProps> {\r\n    const widgets: AbstractWidgetProps[] = [];\r\n\r\n    // eslint-disable-next-line deprecation/deprecation\r\n    if ((undefined === section && stageUsage === StageUsage.General && zoneLocation === AbstractZoneLocation.BottomRight) ||\r\n      (stageUsage === StageUsage.General && location === StagePanelLocation.Right && section === StagePanelSection.End && \"1\" !== UiFramework.uiVersion)) {\r\n      widgets.push({\r\n        id: FeatureInfoUiItemsProvider.widgetId,\r\n        label: MapLayersUI.localization.getLocalizedString(\"mapLayers:FeatureInfoWidget.Label\"),\r\n        icon: \"icon-map\",\r\n        getWidgetContent: () => <MapFeatureInfoWidget featureInfoOpts={this._featureInfoOpts} />, // eslint-disable-line react/display-name\r\n        defaultState: WidgetState.Closed,\r\n      });\r\n    }\r\n\r\n    return widgets;\r\n  }\r\n}\r\n"]}

package/lib/cjs/ui/Interfaces.d.ts

@@ -1,5 +1,6 @@
+import { BeEvent } from "@itwin/core-bentley";
 import { MapSubLayerProps } from "@itwin/core-common";
-import { MapLayerImageryProvider } from "@itwin/core-frontend";
+import { HitDetail, MapLayerImageryProvider } from "@itwin/core-frontend";
 export interface StyleMapLayerSettings {
     /** Name */
     name: string;
@@ -32,7 +33,15 @@ export interface MapLayerOptions {
 export interface MapFeatureInfoPropertyGridOptions {
     isPropertySelectionEnabled?: boolean;
 }
+export declare type MapHitEvent = BeEvent<(hit: HitDetail) => void>;
 export interface MapFeatureInfoOptions {
+    /**
+     * HitDetail Event whenever the map is clicked.
+     * Typically the HitDetail object is provided by ElementLocateManager.doLocate.
+     * Every time this event is raised, FeatureInfoWidget will attempt to retrieve data from MapLayerImageryProviders.
+     */
+    onMapHit: MapHitEvent;
+    disableDefaultFeatureInfoTool?: boolean;
     showLoadProgressAnimation?: boolean;
     propertyGridOptions?: MapFeatureInfoPropertyGridOptions;
 }

package/lib/cjs/ui/Interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Interfaces.d.ts","sourceRoot":"","sources":["../../../src/ui/Interfaces.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,WAAW,qBAAqB;IACpC,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,2MAA2M;IAC3M,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qCAAqC;IACrC,SAAS,EAAE,OAAO,CAAC;IACnB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,iCAAiC;IACjC,aAAa,EAAE,OAAO,CAAC;IACvB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,uBAAuB,CAAC;CACpC;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;CAC5C;AAED,MAAM,WAAW,eAAe;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,iCAAiC;IAChD,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,qBAAqB;IACpC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,mBAAmB,CAAC,EAAE,iCAAiC,CAAC;CACzD"}
+{"version":3,"file":"Interfaces.d.ts","sourceRoot":"","sources":["../../../src/ui/Interfaces.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,MAAM,WAAW,qBAAqB;IACpC,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,2MAA2M;IAC3M,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qCAAqC;IACrC,SAAS,EAAE,OAAO,CAAC;IACnB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,iCAAiC;IACjC,aAAa,EAAE,OAAO,CAAC;IACvB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,uBAAuB,CAAC;CACpC;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC;CAC5C;AAED,MAAM,WAAW,eAAe;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,iCAAiC;IAChD,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,oBAAY,WAAW,GAAG,OAAO,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC;AAE5D,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,QAAQ,EAAE,WAAW,CAAC;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,mBAAmB,CAAC,EAAE,iCAAiC,CAAC;CACzD"}

package/lib/cjs/ui/Interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../../../src/ui/Interfaces.ts"],"names":[],"mappings":"","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\nimport { MapSubLayerProps } from \"@itwin/core-common\";\r\nimport { MapLayerImageryProvider } from \"@itwin/core-frontend\";\r\n\r\nexport interface StyleMapLayerSettings {\r\n  /** Name */\r\n  name: string;\r\n  /** source (i.URL for ImageMapLayerSettings or modelId for ModelMapLayerSettings) */\r\n  source: string;\r\n  /** Controls visibility of layer */\r\n  visible: boolean;\r\n  /** A transparency value from 0.0 (fully opaque) to 1.0 (fully transparent) to apply to map graphics when drawing, or false to indicate the transparency should not be overridden. Default value: false. */\r\n  transparency: number;\r\n  /** Transparent background */\r\n  transparentBackground: boolean;\r\n  /** set map as underlay or overlay */\r\n  isOverlay: boolean;\r\n  /** Available map sub-layer */\r\n  subLayers?: MapSubLayerProps[];\r\n  /** sub-layer panel displayed. */\r\n  showSubLayers: boolean;\r\n  /** Some format can publish only a single layer at a time (i.e WMTS) */\r\n  provider?: MapLayerImageryProvider;\r\n}\r\n\r\nexport interface MapTypesOptions {\r\n  readonly supportTileUrl: boolean;\r\n  readonly supportWmsAuthentication: boolean;\r\n}\r\n\r\nexport interface MapLayerOptions {\r\n  hideExternalMapLayers?: boolean;\r\n  fetchPublicMapLayerSources?: boolean;\r\n  mapTypeOptions?: MapTypesOptions;\r\n}\r\n\r\nexport interface MapFeatureInfoPropertyGridOptions {\r\n  isPropertySelectionEnabled?: boolean;\r\n}\r\n\r\nexport interface MapFeatureInfoOptions {\r\n  showLoadProgressAnimation?: boolean;\r\n  propertyGridOptions?: MapFeatureInfoPropertyGridOptions;\r\n}\r\n"]}
+{"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../../../src/ui/Interfaces.ts"],"names":[],"mappings":"","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\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { MapSubLayerProps } from \"@itwin/core-common\";\r\nimport { HitDetail, MapLayerImageryProvider } from \"@itwin/core-frontend\";\r\n\r\nexport interface StyleMapLayerSettings {\r\n  /** Name */\r\n  name: string;\r\n  /** source (i.URL for ImageMapLayerSettings or modelId for ModelMapLayerSettings) */\r\n  source: string;\r\n  /** Controls visibility of layer */\r\n  visible: boolean;\r\n  /** A transparency value from 0.0 (fully opaque) to 1.0 (fully transparent) to apply to map graphics when drawing, or false to indicate the transparency should not be overridden. Default value: false. */\r\n  transparency: number;\r\n  /** Transparent background */\r\n  transparentBackground: boolean;\r\n  /** set map as underlay or overlay */\r\n  isOverlay: boolean;\r\n  /** Available map sub-layer */\r\n  subLayers?: MapSubLayerProps[];\r\n  /** sub-layer panel displayed. */\r\n  showSubLayers: boolean;\r\n  /** Some format can publish only a single layer at a time (i.e WMTS) */\r\n  provider?: MapLayerImageryProvider;\r\n}\r\n\r\nexport interface MapTypesOptions {\r\n  readonly supportTileUrl: boolean;\r\n  readonly supportWmsAuthentication: boolean;\r\n}\r\n\r\nexport interface MapLayerOptions {\r\n  hideExternalMapLayers?: boolean;\r\n  fetchPublicMapLayerSources?: boolean;\r\n  mapTypeOptions?: MapTypesOptions;\r\n}\r\n\r\nexport interface MapFeatureInfoPropertyGridOptions {\r\n  isPropertySelectionEnabled?: boolean;\r\n}\r\n\r\nexport type MapHitEvent = BeEvent<(hit: HitDetail) => void>;\r\n\r\nexport interface MapFeatureInfoOptions {\r\n  /**\r\n   * HitDetail Event whenever the map is clicked.\r\n   * Typically the HitDetail object is provided by ElementLocateManager.doLocate.\r\n   * Every time this event is raised, FeatureInfoWidget will attempt to retrieve data from MapLayerImageryProviders.\r\n   */\r\n  onMapHit: MapHitEvent;\r\n  disableDefaultFeatureInfoTool?: boolean;\r\n  showLoadProgressAnimation?: boolean;\r\n  propertyGridOptions?: MapFeatureInfoPropertyGridOptions;\r\n}\r\n"]}

package/lib/cjs/ui/MapFeatureInfoTool.d.ts

@@ -0,0 +1,14 @@
+import { BeButtonEvent, EventHandled, HitDetail, PrimitiveTool } from "@itwin/core-frontend";
+import { ToolItemDef } from "@itwin/appui-react";
+import { BeEvent } from "@itwin/core-bentley";
+export declare const getDefaultMapFeatureInfoToolItemDef: () => ToolItemDef;
+export declare class DefaultMapFeatureInfoTool extends PrimitiveTool {
+    static readonly onMapHit: BeEvent<(hit: HitDetail) => void>;
+    static toolId: string;
+    static iconSpec: string;
+    requireWriteableTarget(): boolean;
+    onDataButtonDown(ev: BeButtonEvent): Promise<EventHandled>;
+    onResetButtonUp(_ev: BeButtonEvent): Promise<EventHandled>;
+    onRestartTool(): Promise<void>;
+}
+//# sourceMappingURL=MapFeatureInfoTool.d.ts.map

package/lib/cjs/ui/MapFeatureInfoTool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MapFeatureInfoTool.d.ts","sourceRoot":"","sources":["../../../src/ui/MapFeatureInfoTool.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,SAAS,EAGT,aAAa,EACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,eAAO,MAAM,mCAAmC,QAAO,WAOnD,CAAC;AAEL,qBAAa,yBAA0B,SAAQ,aAAa;IAC1D,gBAAuB,QAAQ,gBAAqB,SAAS,KAAK,IAAI,EAAI;IAC1E,OAAuB,MAAM,SAAwB;IACrD,OAAuB,QAAQ,SAAc;IAE7B,sBAAsB,IAAI,OAAO;IAI3B,gBAAgB,CACpC,EAAE,EAAE,aAAa,GAChB,OAAO,CAAC,YAAY,CAAC;IAsBF,eAAe,CACnC,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,YAAY,CAAC;IAMX,aAAa;CAI3B"}

package/lib/cjs/ui/MapFeatureInfoTool.js

@@ -0,0 +1,51 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultMapFeatureInfoTool = exports.getDefaultMapFeatureInfoToolItemDef = void 0;
+const core_frontend_1 = require("@itwin/core-frontend");
+const appui_abstract_1 = require("@itwin/appui-abstract");
+const appui_react_1 = require("@itwin/appui-react");
+const core_bentley_1 = require("@itwin/core-bentley");
+const FeatureInfoUiItemsProvider_1 = require("./FeatureInfoUiItemsProvider");
+const getDefaultMapFeatureInfoToolItemDef = () => new appui_react_1.ToolItemDef({
+    toolId: DefaultMapFeatureInfoTool.toolId,
+    iconSpec: DefaultMapFeatureInfoTool.iconSpec,
+    label: () => DefaultMapFeatureInfoTool.flyover,
+    description: () => DefaultMapFeatureInfoTool.description,
+    execute: async () => { await core_frontend_1.IModelApp.tools.run(DefaultMapFeatureInfoTool.toolId); },
+});
+exports.getDefaultMapFeatureInfoToolItemDef = getDefaultMapFeatureInfoToolItemDef;
+class DefaultMapFeatureInfoTool extends core_frontend_1.PrimitiveTool {
+    requireWriteableTarget() {
+        return false;
+    }
+    async onDataButtonDown(ev) {
+        const hit = await core_frontend_1.IModelApp.locateManager.doLocate(new core_frontend_1.LocateResponse(), true, ev.point, ev.viewport, ev.inputSource);
+        if (hit !== undefined) {
+            const widgetDef = appui_react_1.FrontstageManager.findWidget(FeatureInfoUiItemsProvider_1.FeatureInfoUiItemsProvider.widgetId);
+            if (widgetDef && widgetDef.state !== appui_abstract_1.WidgetState.Open)
+                widgetDef.setWidgetState(appui_abstract_1.WidgetState.Open);
+            DefaultMapFeatureInfoTool.onMapHit.raiseEvent(hit);
+            return core_frontend_1.EventHandled.Yes;
+        }
+        return core_frontend_1.EventHandled.No;
+    }
+    async onResetButtonUp(_ev) {
+        /* Common reset behavior for primitive tools is calling onReinitialize to restart or exitTool to terminate. */
+        await this.onReinitialize();
+        return core_frontend_1.EventHandled.No;
+    }
+    async onRestartTool() {
+        const tool = new DefaultMapFeatureInfoTool();
+        if (!(await tool.run()))
+            return this.exitTool();
+    }
+}
+exports.DefaultMapFeatureInfoTool = DefaultMapFeatureInfoTool;
+DefaultMapFeatureInfoTool.onMapHit = new core_bentley_1.BeEvent();
+DefaultMapFeatureInfoTool.toolId = "MapFeatureInfoTool";
+DefaultMapFeatureInfoTool.iconSpec = "icon-map";
+//# sourceMappingURL=MapFeatureInfoTool.js.map

package/lib/cjs/ui/MapFeatureInfoTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MapFeatureInfoTool.js","sourceRoot":"","sources":["../../../src/ui/MapFeatureInfoTool.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,wDAO8B;AAC9B,0DAAoD;AACpD,oDAAoE;AACpE,sDAA8C;AAC9C,6EAA0E;AAEnE,MAAM,mCAAmC,GAAG,GAAgB,EAAE,CACnE,IAAI,yBAAW,CAAC;IACd,MAAM,EAAE,yBAAyB,CAAC,MAAM;IACxC,QAAQ,EAAE,yBAAyB,CAAC,QAAQ;IAC5C,KAAK,EAAE,GAAG,EAAE,CAAC,yBAAyB,CAAC,OAAO;IAC9C,WAAW,EAAE,GAAG,EAAE,CAAC,yBAAyB,CAAC,WAAW;IACxD,OAAO,EAAE,KAAK,IAAI,EAAE,GAAG,MAAM,yBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;CACtF,CAAC,CAAC;AAPQ,QAAA,mCAAmC,uCAO3C;AAEL,MAAa,yBAA0B,SAAQ,6BAAa;IAK1C,sBAAsB;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,EAAiB;QAEjB,MAAM,GAAG,GAAG,MAAM,yBAAS,CAAC,aAAa,CAAC,QAAQ,CAChD,IAAI,8BAAc,EAAE,EACpB,IAAI,EACJ,EAAE,CAAC,KAAK,EACR,EAAE,CAAC,QAAQ,EACX,EAAE,CAAC,WAAW,CACf,CAAC;QACF,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,MAAM,SAAS,GAAG,+BAAiB,CAAC,UAAU,CAC5C,uDAA0B,CAAC,QAAQ,CACpC,CAAC;YACF,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,4BAAW,CAAC,IAAI;gBACnD,SAAS,CAAC,cAAc,CAAC,4BAAW,CAAC,IAAI,CAAC,CAAC;YAE7C,yBAAyB,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACnD,OAAO,4BAAY,CAAC,GAAG,CAAC;SACzB;QAED,OAAO,4BAAY,CAAC,EAAE,CAAC;IACzB,CAAC;IAEe,KAAK,CAAC,eAAe,CACnC,GAAkB;QAElB,8GAA8G;QAC9G,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,OAAO,4BAAY,CAAC,EAAE,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,MAAM,IAAI,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAC7C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClD,CAAC;;AA5CH,8DA6CC;AA5CwB,kCAAQ,GAAG,IAAI,sBAAO,EAA4B,CAAC;AACnD,gCAAM,GAAG,oBAAoB,CAAC;AAC9B,kCAAQ,GAAG,UAAU,CAAC","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\r\nimport {\r\n  BeButtonEvent,\r\n  EventHandled,\r\n  HitDetail,\r\n  IModelApp,\r\n  LocateResponse,\r\n  PrimitiveTool,\r\n} from \"@itwin/core-frontend\";\r\nimport { WidgetState } from \"@itwin/appui-abstract\";\r\nimport { FrontstageManager, ToolItemDef } from \"@itwin/appui-react\";\r\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { FeatureInfoUiItemsProvider } from \"./FeatureInfoUiItemsProvider\";\r\n\r\nexport const getDefaultMapFeatureInfoToolItemDef = (): ToolItemDef =>\r\n  new ToolItemDef({\r\n    toolId: DefaultMapFeatureInfoTool.toolId,\r\n    iconSpec: DefaultMapFeatureInfoTool.iconSpec,\r\n    label: () => DefaultMapFeatureInfoTool.flyover,\r\n    description: () => DefaultMapFeatureInfoTool.description,\r\n    execute: async () => { await IModelApp.tools.run(DefaultMapFeatureInfoTool.toolId); },\r\n  });\r\n\r\nexport class DefaultMapFeatureInfoTool extends PrimitiveTool {\r\n  public static readonly onMapHit = new BeEvent<(hit: HitDetail) => void>();\r\n  public static override toolId = \"MapFeatureInfoTool\";\r\n  public static override iconSpec = \"icon-map\";\r\n\r\n  public override requireWriteableTarget(): boolean {\r\n    return false;\r\n  }\r\n\r\n  public override async onDataButtonDown(\r\n    ev: BeButtonEvent\r\n  ): Promise<EventHandled> {\r\n    const hit = await IModelApp.locateManager.doLocate(\r\n      new LocateResponse(),\r\n      true,\r\n      ev.point,\r\n      ev.viewport,\r\n      ev.inputSource\r\n    );\r\n    if (hit !== undefined) {\r\n      const widgetDef = FrontstageManager.findWidget(\r\n        FeatureInfoUiItemsProvider.widgetId\r\n      );\r\n      if (widgetDef && widgetDef.state !== WidgetState.Open)\r\n        widgetDef.setWidgetState(WidgetState.Open);\r\n\r\n      DefaultMapFeatureInfoTool.onMapHit.raiseEvent(hit);\r\n      return EventHandled.Yes;\r\n    }\r\n\r\n    return EventHandled.No;\r\n  }\r\n\r\n  public override async onResetButtonUp(\r\n    _ev: BeButtonEvent\r\n  ): Promise<EventHandled> {\r\n    /* Common reset behavior for primitive tools is calling onReinitialize to restart or exitTool to terminate. */\r\n    await this.onReinitialize();\r\n    return EventHandled.No;\r\n  }\r\n\r\n  public async onRestartTool() {\r\n    const tool = new DefaultMapFeatureInfoTool();\r\n    if (!(await tool.run())) return this.exitTool();\r\n  }\r\n}\r\n"]}

package/lib/cjs/ui/MapLayersUiItemsProvider.d.ts

@@ -1,23 +1,9 @@
-import { AbstractWidgetProps, StagePanelLocation, StagePanelSection, UiItemsProvider } from "@itwin/appui-abstract";
-import { Localization } from "@itwin/core-common";
-import { ConfigurableCreateInfo, WidgetControl } from "@itwin/appui-react";
+import { AbstractWidgetProps, AbstractZoneLocation, StagePanelLocation, StagePanelSection, UiItemsProvider } from "@itwin/appui-abstract";
 import { MapLayerOptions } from "./Interfaces";
 export declare class MapLayersUiItemsProvider implements UiItemsProvider {
     readonly id = "MapLayersUiItemsProvider";
-    static localization: Localization;
-    constructor(localization: Localization);
-    provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section: StagePanelSection | undefined): ReadonlyArray<AbstractWidgetProps>;
-}
-/** MapLayersWidgetControl provides a widget to attach and remove maps layers from the active view's display style.
- * ``` tsx
- *  <Widget id={MapLayersWidgetControl.id} label={MapLayersWidgetControl.label} control={MapLayersWidgetControl}
- *    iconSpec={MapLayersWidgetControl.iconSpec} />,
- * ```
- */
-export declare class MapLayersWidgetControl extends WidgetControl {
-    static id: string;
-    static iconSpec: string;
-    static get label(): string;
-    constructor(info: ConfigurableCreateInfo, mapLayerOptions: MapLayerOptions | undefined);
+    private _mapLayerOptions?;
+    constructor(mapLayerOptions?: MapLayerOptions);
+    provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section: StagePanelSection | undefined, zoneLocation?: AbstractZoneLocation): ReadonlyArray<AbstractWidgetProps>;
 }
 //# sourceMappingURL=MapLayersUiItemsProvider.d.ts.map

package/lib/cjs/ui/MapLayersUiItemsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayersUiItemsProvider.d.ts","sourceRoot":"","sources":["../../../src/ui/MapLayersUiItemsProvider.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAChI,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBAAa,wBAAyB,YAAW,eAAe;IAC9D,SAAgB,EAAE,8BAA8B;IAChD,OAAc,YAAY,EAAE,YAAY,CAAC;gBAEtB,YAAY,EAAE,YAAY;IAItC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,mBAAmB,CAAC;CAmBtK;AAED;;;;;GAKG;AACH,qBAAa,sBAAuB,SAAQ,aAAa;IACvD,OAAc,EAAE,SAAqB;IACrC,OAAc,QAAQ,SAAc;IAEpC,WAAkB,KAAK,IAAI,MAAM,CAEhC;gBAEW,IAAI,EAAE,sBAAsB,EAAE,eAAe,EAAE,eAAe,GAAG,SAAS;CAKvF"}
+{"version":3,"file":"MapLayersUiItemsProvider.d.ts","sourceRoot":"","sources":["../../../src/ui/MapLayersUiItemsProvider.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGtJ,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,qBAAa,wBAAyB,YAAW,eAAe;IAC9D,SAAgB,EAAE,8BAA8B;IAChD,OAAO,CAAC,gBAAgB,CAAC,CAAkB;gBAExB,eAAe,CAAC,EAAE,eAAe;IAS7C,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,SAAS,EAAE,YAAY,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC,mBAAmB,CAAC;CAgB3M"}

package/lib/cjs/ui/MapLayersUiItemsProvider.js

@@ -4,52 +4,36 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapLayersWidgetControl = exports.MapLayersUiItemsProvider = void 0;
+exports.MapLayersUiItemsProvider = void 0;
 const React = require("react");
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const MapLayersWidget_1 = require("./widget/MapLayersWidget");
 const appui_react_1 = require("@itwin/appui-react");
-const core_frontend_1 = require("@itwin/core-frontend");
+const mapLayers_1 = require("../mapLayers");
 class MapLayersUiItemsProvider {
-    constructor(localization) {
+    constructor(mapLayerOptions) {
         this.id = "MapLayersUiItemsProvider";
-        MapLayersUiItemsProvider.localization = localization;
-    }
-    provideWidgets(_stageId, stageUsage, location, section) {
-        const widgets = [];
-        const mapLayerOptions = {
+        this._mapLayerOptions = mapLayerOptions !== null && mapLayerOptions !== void 0 ? mapLayerOptions : {
             hideExternalMapLayers: false,
             mapTypeOptions: { supportTileUrl: false, supportWmsAuthentication: true },
             fetchPublicMapLayerSources: false,
         };
-        if (stageUsage === appui_abstract_1.StageUsage.General && location === appui_abstract_1.StagePanelLocation.Right && section === appui_abstract_1.StagePanelSection.Start) {
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    provideWidgets(_stageId, stageUsage, location, section, zoneLocation) {
+        const widgets = [];
+        // eslint-disable-next-line deprecation/deprecation
+        if ((undefined === section && stageUsage === appui_abstract_1.StageUsage.General && zoneLocation === appui_abstract_1.AbstractZoneLocation.CenterRight) ||
+            (stageUsage === appui_abstract_1.StageUsage.General && location === appui_abstract_1.StagePanelLocation.Right && section === appui_abstract_1.StagePanelSection.Start && "1" !== appui_react_1.UiFramework.uiVersion)) {
             widgets.push({
                 id: "map-layers:mapLayersWidget",
-                label: core_frontend_1.IModelApp.localization.getLocalizedString("mapLayers:Widget.Label"),
+                label: mapLayers_1.MapLayersUI.localization.getLocalizedString("mapLayers:Widget.Label"),
                 icon: "icon-map",
-                getWidgetContent: () => React.createElement(MapLayersWidget_1.MapLayersWidget, { mapLayerOptions: mapLayerOptions }), // eslint-disable-line react/display-name
+                getWidgetContent: () => React.createElement(MapLayersWidget_1.MapLayersWidget, { mapLayerOptions: this._mapLayerOptions }), // eslint-disable-line react/display-name
             });
         }
         return widgets;
     }
 }
 exports.MapLayersUiItemsProvider = MapLayersUiItemsProvider;
-/** MapLayersWidgetControl provides a widget to attach and remove maps layers from the active view's display style.
- * ``` tsx
- *  <Widget id={MapLayersWidgetControl.id} label={MapLayersWidgetControl.label} control={MapLayersWidgetControl}
- *    iconSpec={MapLayersWidgetControl.iconSpec} />,
- * ```
- */
-class MapLayersWidgetControl extends appui_react_1.WidgetControl {
-    constructor(info, mapLayerOptions) {
-        super(info, mapLayerOptions);
-        this.reactNode = React.createElement(MapLayersWidget_1.MapLayersWidget, { mapLayerOptions: mapLayerOptions });
-    }
-    static get label() {
-        return core_frontend_1.IModelApp.localization.getLocalizedString("mapLayers:Widget.Label");
-    }
-}
-exports.MapLayersWidgetControl = MapLayersWidgetControl;
-MapLayersWidgetControl.id = "MapLayersWidget";
-MapLayersWidgetControl.iconSpec = "icon-map";
 //# sourceMappingURL=MapLayersUiItemsProvider.js.map