@itwin/map-layers 5.4.2 → 5.4.4

package/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Change Log - @itwin/map-layers
 
-This log was last generated on Mon, 11 Mar 2024 18:18:05 GMT and should not be manually modified.
+This log was last generated on Tue, 21 May 2024 13:26:08 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 5.4.4
+
+Tue, 21 May 2024 13:26:08 GMT
+
+### Patches
+
+- Url scheme validation when adding a new map layer and fix an issue with usersPreferences and browser storage. ([#836](https://github.com/iTwin/viewer-components-react/pull/836))
+- Added copy property value button in Map Layers Info widget ([#834](https://github.com/iTwin/viewer-components-react/pull/834))
+
+## 5.4.3
+
+Thu, 04 Apr 2024 14:19:35 GMT
+
+### Patches
+
+- Clear MapFeatureInfo Widget when active tool changes ([#803](https://github.com/iTwin/viewer-components-react/pull/803))
+
 ## 5.4.2
 
-Mon, 11 Mar 2024 18:18:05 GMT
+Mon, 11 Mar 2024 18:18:16 GMT
 
 ### Patches
 

package/lib/cjs/BrowserStorage.d.ts

@@ -15,7 +15,7 @@ export declare class BrowserStorage<Type> {
     private readonly _throwOnDeleteMissingKey;
     constructor(opts: BrowserStorageOptions);
     private loadFromStorage;
-    get(key: string | undefined): Type[] | undefined;
+    get(key: string | undefined): Type | Type[] | undefined;
     getContent(): KeyContentProps<Type> | undefined;
     delete(key: string): void;
     deleteMatchingContent(content: Type): void;

package/lib/cjs/BrowserStorage.js

@@ -29,7 +29,7 @@ class BrowserStorage {
         if (key) {
             if (!Object.keys(map).includes(key))
                 return undefined;
-            return [map[key]];
+            return map[key];
         }
         else { // No key provided, return all objects
             return Object.entries(map).map(([_key, value]) => value);

package/lib/cjs/BrowserStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserStorage.js","sourceRoot":"","sources":["../../src/BrowserStorage.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\n/** Index signature holding preferences content\n *\n * @internal\n */\ninterface KeyContentProps<Type> {\n  [preferenceKey: string]: Type;\n}\n\nexport interface BrowserStorageOptions {\n  /** indicate whether or not delete function should throw an error if the provided key cannot be found. */\n  throwOnDeleteMissingKey?: boolean;\n  itemKeyName: string;\n}\n\nexport class BrowserStorage<Type>  {\n\n  private readonly _itemKeyName;\n  private readonly _throwOnDeleteMissingKey;\n\n  constructor(opts: BrowserStorageOptions) {\n    this._itemKeyName = opts.itemKeyName;\n    this._throwOnDeleteMissingKey = opts.throwOnDeleteMissingKey ?? true;\n  }\n\n  private loadFromStorage() {\n    const storage = window.localStorage;\n\n    let map: KeyContentProps<Type> = {};\n    const itemStr = storage.getItem(this._itemKeyName);\n    if (itemStr === null) {\n      return undefined;\n    }\n    if (!itemStr || itemStr === \"{}\")\n      return map;\n\n    map = JSON.parse(itemStr);\n    return map;\n  }\n\n  public get(key: string|undefined) {\n    const map = this.loadFromStorage();\n    if (map === undefined)\n      return undefined;\n\n    if (key) {\n      if (!Object.keys(map).includes(key))\n        return undefined;\n\n      return [map[key]];\n    } else {  // No key provided, return all objects\n      return Object.entries(map).map(([_key, value]) => value);\n    }\n  }\n\n  public getContent() {\n    return this.loadFromStorage();\n  }\n\n  public delete(key: string) {\n    const map = this.loadFromStorage();\n    if (map === undefined) {\n      if (this._throwOnDeleteMissingKey)\n        throw new Error(\"Could not find key from storage.\");\n      else\n        return;\n    }\n\n    if (!Object.keys(map).includes(key)) {\n      if (this._throwOnDeleteMissingKey)\n        throw Error(\"Could not find key from storage.\");\n      else\n        return;\n    }\n    delete map[key];\n    window.localStorage.setItem(this._itemKeyName, JSON.stringify(map));\n  }\n\n  public deleteMatchingContent(content: Type) {\n    const map = this.loadFromStorage();\n    if (map === undefined) {\n      return;\n    }\n    const contentJson = JSON.stringify(content);\n    for (const [key, value] of Object.entries(map)) {\n      if (JSON.stringify(value) === contentJson)\n        delete map[key];\n    }\n\n    window.localStorage.setItem(this._itemKeyName, JSON.stringify(map));\n  }\n\n  public save(key: string, content: Type) {\n    let map = this.loadFromStorage();\n    if (map === undefined)\n      map = {};\n\n    map[key] = content;\n\n    const itemValue = JSON.stringify(map);\n    window.localStorage.setItem(this._itemKeyName, itemValue);\n  }\n}\n"]}
+{"version":3,"file":"BrowserStorage.js","sourceRoot":"","sources":["../../src/BrowserStorage.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\n/** Index signature holding preferences content\n *\n * @internal\n */\ninterface KeyContentProps<Type> {\n  [preferenceKey: string]: Type;\n}\n\nexport interface BrowserStorageOptions {\n  /** indicate whether or not delete function should throw an error if the provided key cannot be found. */\n  throwOnDeleteMissingKey?: boolean;\n  itemKeyName: string;\n}\n\nexport class BrowserStorage<Type>  {\n\n  private readonly _itemKeyName;\n  private readonly _throwOnDeleteMissingKey;\n\n  constructor(opts: BrowserStorageOptions) {\n    this._itemKeyName = opts.itemKeyName;\n    this._throwOnDeleteMissingKey = opts.throwOnDeleteMissingKey ?? true;\n  }\n\n  private loadFromStorage() {\n    const storage = window.localStorage;\n\n    let map: KeyContentProps<Type> = {};\n    const itemStr = storage.getItem(this._itemKeyName);\n    if (itemStr === null) {\n      return undefined;\n    }\n    if (!itemStr || itemStr === \"{}\")\n      return map;\n\n    map = JSON.parse(itemStr);\n    return map;\n  }\n\n  public get(key: string|undefined) {\n    const map = this.loadFromStorage();\n    if (map === undefined)\n      return undefined;\n\n    if (key) {\n      if (!Object.keys(map).includes(key))\n        return undefined;\n\n      return map[key];\n    } else {  // No key provided, return all objects\n      return Object.entries(map).map(([_key, value]) => value);\n    }\n  }\n\n  public getContent() {\n    return this.loadFromStorage();\n  }\n\n  public delete(key: string) {\n    const map = this.loadFromStorage();\n    if (map === undefined) {\n      if (this._throwOnDeleteMissingKey)\n        throw new Error(\"Could not find key from storage.\");\n      else\n        return;\n    }\n\n    if (!Object.keys(map).includes(key)) {\n      if (this._throwOnDeleteMissingKey)\n        throw Error(\"Could not find key from storage.\");\n      else\n        return;\n    }\n    delete map[key];\n    window.localStorage.setItem(this._itemKeyName, JSON.stringify(map));\n  }\n\n  public deleteMatchingContent(content: Type) {\n    const map = this.loadFromStorage();\n    if (map === undefined) {\n      return;\n    }\n    const contentJson = JSON.stringify(content);\n    for (const [key, value] of Object.entries(map)) {\n      if (JSON.stringify(value) === contentJson)\n        delete map[key];\n    }\n\n    window.localStorage.setItem(this._itemKeyName, JSON.stringify(map));\n  }\n\n  public save(key: string, content: Type) {\n    let map = this.loadFromStorage();\n    if (map === undefined)\n      map = {};\n\n    map[key] = content;\n\n    const itemValue = JSON.stringify(map);\n    window.localStorage.setItem(this._itemKeyName, itemValue);\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"CustomParamUtils.d.ts","sourceRoot":"","sources":["../../src/CustomParamUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,qBAAa,gBAAgB;WACb,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE;CAiBvF"}
+{"version":3,"file":"CustomParamUtils.d.ts","sourceRoot":"","sources":["../../src/CustomParamUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,gBAAgB;WACb,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE;CAyBvF"}

package/lib/cjs/CustomParamUtils.js

@@ -6,17 +6,25 @@ class CustomParamUtils {
     static setSourceCustomParams(source, customParamNames) {
         const cpStorage = new CustomParamsStorage_1.CustomParamsStorage();
         customParamNames.forEach((paramName) => {
-            const customParam = cpStorage.get(paramName);
-            if (customParam && customParam.length > 0 && source) {
-                if (customParam[0].secret) {
+            const paramFromStorage = cpStorage.get(paramName);
+            let customParam;
+            if (Array.isArray(paramFromStorage)) {
+                if (paramFromStorage.length > 0)
+                    customParam = paramFromStorage[0];
+            }
+            else {
+                customParam = paramFromStorage;
+            }
+            if (customParam && source) {
+                if (customParam.secret) {
                     if (!source.unsavedQueryParams)
                         source.unsavedQueryParams = {};
-                    source.unsavedQueryParams[customParam[0].key] = customParam[0].value;
+                    source.unsavedQueryParams[customParam.key] = customParam.value;
                 }
                 else {
                     if (!source.savedQueryParams)
                         source.savedQueryParams = {};
-                    source.savedQueryParams[customParam[0].key] = customParam[0].value;
+                    source.savedQueryParams[customParam.key] = customParam.value;
                 }
             }
         });

package/lib/cjs/CustomParamUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomParamUtils.js","sourceRoot":"","sources":["../../src/CustomParamUtils.ts"],"names":[],"mappings":";;;AAKA,+DAA4D;AAE5D,MAAa,gBAAgB;IACpB,MAAM,CAAC,qBAAqB,CAAC,MAAsB,EAAE,gBAA0B;QACpF,MAAM,SAAS,GAAG,IAAI,yCAAmB,EAAE,CAAC;QAC5C,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,EAAE;gBACnD,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;oBACzB,IAAI,CAAC,MAAM,CAAC,kBAAkB;wBAC5B,MAAM,CAAC,kBAAkB,GAAG,EAAE,CAAC;oBACjC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;iBACtE;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,gBAAgB;wBAC1B,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;oBAC/B,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;iBACpE;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAlBD,4CAkBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { MapLayerSource } from \"@itwin/core-frontend\";\nimport { CustomParamsStorage } from \"./CustomParamsStorage\";\n\nexport class CustomParamUtils  {\n  public static setSourceCustomParams(source: MapLayerSource, customParamNames: string[]) {\n    const cpStorage = new CustomParamsStorage();\n    customParamNames.forEach((paramName) => {\n      const customParam = cpStorage.get(paramName);\n      if (customParam && customParam.length > 0 && source) {\n        if (customParam[0].secret) {\n          if (!source.unsavedQueryParams)\n            source.unsavedQueryParams = {};\n          source.unsavedQueryParams[customParam[0].key] = customParam[0].value;\n        } else {\n          if (!source.savedQueryParams)\n            source.savedQueryParams = {};\n          source.savedQueryParams[customParam[0].key] = customParam[0].value;\n        }\n      }\n    });\n  }\n}\n"]}
+{"version":3,"file":"CustomParamUtils.js","sourceRoot":"","sources":["../../src/CustomParamUtils.ts"],"names":[],"mappings":";;;AAKA,+DAA4D;AAG5D,MAAa,gBAAgB;IACpB,MAAM,CAAC,qBAAqB,CAAC,MAAsB,EAAE,gBAA0B;QACpF,MAAM,SAAS,GAAG,IAAI,yCAAmB,EAAE,CAAC;QAC5C,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACrC,MAAM,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,WAAwC,CAAC;YAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACnC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC;oBAC7B,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACrC;iBAAM;gBACL,WAAW,GAAE,gBAAgB,CAAC;aAC/B;YAED,IAAI,WAAW,IAAI,MAAM,EAAE;gBACzB,IAAI,WAAW,CAAC,MAAM,EAAE;oBACtB,IAAI,CAAC,MAAM,CAAC,kBAAkB;wBAC5B,MAAM,CAAC,kBAAkB,GAAG,EAAE,CAAC;oBACjC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC;iBAChE;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,gBAAgB;wBAC1B,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;oBAC/B,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC;iBAC9D;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1BD,4CA0BC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { MapLayerSource } from \"@itwin/core-frontend\";\nimport { CustomParamsStorage } from \"./CustomParamsStorage\";\nimport { CustomParamItem } from \"./ui/Interfaces\";\n\nexport class CustomParamUtils  {\n  public static setSourceCustomParams(source: MapLayerSource, customParamNames: string[]) {\n    const cpStorage = new CustomParamsStorage();\n    customParamNames.forEach((paramName) => {\n      const paramFromStorage = cpStorage.get(paramName);\n      let customParam: CustomParamItem | undefined;\n      if (Array.isArray(paramFromStorage)) {\n        if (paramFromStorage.length > 0)\n          customParam = paramFromStorage[0];\n      } else {\n        customParam =paramFromStorage;\n      }\n\n      if (customParam && source) {\n        if (customParam.secret) {\n          if (!source.unsavedQueryParams)\n            source.unsavedQueryParams = {};\n          source.unsavedQueryParams[customParam.key] = customParam.value;\n        } else {\n          if (!source.savedQueryParams)\n            source.savedQueryParams = {};\n          source.savedQueryParams[customParam.key] = customParam.value;\n        }\n      }\n    });\n  }\n}\n"]}

package/lib/cjs/PreferencesBrowserStorage.d.ts

@@ -35,7 +35,7 @@ export declare class PreferencesBrowserStorage implements UserPreferencesAccess
     constructor(storageItemKeyPrefix: string, opts?: PreferencesBrowserStorageOptions);
     private getStorageItemKey;
     private static getPreferenceKey;
-    get(arg: PreferenceKeyArg & ITwinIdArg): Promise<KeyContentProps[] | undefined>;
+    get(arg: PreferenceKeyArg & ITwinIdArg): Promise<KeyContentProps | KeyContentProps[] | undefined>;
     delete(arg: PreferenceKeyArg & ITwinIdArg): Promise<void>;
     save(arg: PreferenceArg & ITwinIdArg): Promise<void>;
 }

package/lib/cjs/ui/widget/CustomParamsSettings.js

@@ -23,7 +23,7 @@ function CustomParamsSettingsPanel() {
     const [params, setParams] = React.useState(() => {
         const paramsMap = {};
         const paramsList = storage.get(undefined);
-        if (paramsList) {
+        if (Array.isArray(paramsList)) {
             for (const param of paramsList)
                 paramsMap[param.name] = param;
         }

package/lib/cjs/ui/widget/CustomParamsSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomParamsSettings.js","sourceRoot":"","sources":["../../../../src/ui/widget/CustomParamsSettings.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport \"./CustomParamsSettings.scss\";\nimport * as React from \"react\";\nimport { UiFramework } from \"@itwin/appui-react\";\nimport { Listbox, ListboxItem, ListboxValue } from \"@itwin/core-react\";\nimport { SvgTechnicalPreviewMini } from \"@itwin/itwinui-icons-color-react\";\nimport { SvgAdd, SvgDelete, SvgEdit } from \"@itwin/itwinui-icons-react\";\nimport { Icon, IconButton } from \"@itwin/itwinui-react\";\nimport { CustomParamsMappingStorage } from \"../../CustomParamsMappingStorage\";\nimport { CustomParamsStorage } from \"../../CustomParamsStorage\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { CustomParamItem } from \"../Interfaces\";\nimport { CustomParamEditDialog } from \"./CustomParamEditDialog\";\n\ninterface CustomParamsMap {\n  [paramName: string]: CustomParamItem;\n}\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function CustomParamsSettingsPanel() {\n\n  const [storage] = React.useState(() => new CustomParamsStorage());\n  const [mappingStorage] = React.useState(() => new CustomParamsMappingStorage());\n\n  const [params, setParams] = React.useState<CustomParamsMap>(() => {\n    const paramsMap: CustomParamsMap ={};\n    const paramsList = storage.get(undefined);\n    if (paramsList) {\n      for (const param of paramsList)\n        paramsMap[param.name] = param;\n    }\n    return paramsMap;\n  });\n\n  const [listItemUnderCursor, setListItemUnderCursor] = React.useState<string | undefined>();\n  const [selectedValue, setSelectedValue] = React.useState<string | undefined>();\n\n  const deleteMapping = React.useCallback((name: string) => {\n    const tmpParams = {...params};\n    delete tmpParams[name];\n    setParams(tmpParams);\n    storage.delete(name);\n\n    // Cascade delete to api key mapping\n    const mappingContent = mappingStorage.getContent();\n    if (mappingContent) {\n      for (const itemKey of Object.keys(mappingContent)) {\n        if (mappingContent[itemKey].customParamNames.includes(name)) {\n          const newParamNames = mappingContent[itemKey].customParamNames.filter((value) => value !== name);\n          newParamNames.length > 0 ?  mappingStorage.save(itemKey, {customParamNames: newParamNames}) : mappingStorage.delete(itemKey);\n        }\n      }\n    }\n  }, [mappingStorage, params, storage]);\n\n  /*\n   Handle Remove layer button clicked\n   */\n  const onItemRemoveButtonClicked = React.useCallback((name: string, event) => {\n    event.stopPropagation();  // We don't want the owning ListBox to react on mouse click.\n    deleteMapping(name);\n  }, [deleteMapping]);\n\n  const onCancelEdit = React.useCallback(() => {\n    UiFramework.dialogs.modal.close();\n    setSelectedValue(undefined); // clear listbox focus\n  }, []);\n\n  const onOkEdit = React.useCallback((newItem: CustomParamItem, oldItem?: CustomParamItem) => {\n\n    UiFramework.dialogs.modal.close();\n\n    // If the edited item has a new name, delete the entry first.\n    const tmpParams = {...params};\n    if (oldItem && oldItem.name !== newItem.name) {\n      delete tmpParams[oldItem.name];\n      setParams(tmpParams);\n      storage.delete(oldItem.name);\n\n      const mappingContent = mappingStorage.getContent();\n      if (mappingContent) {\n        for (const itemKey of Object.keys(mappingContent)) {\n          if (mappingContent[itemKey].customParamNames.includes(oldItem.name )) {\n            const newParamNames = mappingContent[itemKey].customParamNames.filter((value) => value !== oldItem.name);\n            newParamNames.push(newItem.name);\n            mappingStorage.save(itemKey, {customParamNames: newParamNames});\n          }\n        }\n      }\n    }\n    storage.save(newItem.name, newItem);\n\n    tmpParams[newItem.name] = newItem;\n    setParams(tmpParams);\n    setSelectedValue(undefined); // clear listbox focus\n  }, [mappingStorage, params, storage]);\n\n  const handleAddClick = React.useCallback(() => {\n    UiFramework.dialogs.modal.open(\n      <CustomParamEditDialog\n        onOkResult={onOkEdit}\n        onCancelResult={onCancelEdit}\n      />);\n    return;\n  }, [onCancelEdit, onOkEdit]);\n\n  const onListboxValueChange = React.useCallback((newValue: ListboxValue, _isControlOrCommandPressed?: boolean)=> {\n    const item = params[newValue];\n    if (item)\n      UiFramework.dialogs.modal.open(<CustomParamEditDialog item={item} onOkResult={onOkEdit} onCancelResult={onCancelEdit}/>);\n\n    setSelectedValue(newValue);\n    return;\n  }, [params, onCancelEdit, onOkEdit]);\n\n  return (\n    <div className=\"customParamsSettings-container\">\n      <div className=\"customParamsSettings-header\">\n        <span className=\"customParamsSettings-header-label\">\n          {MapLayersUI.translate(\"CustomParamSettings.SectionLabel\")}\n          <div title={MapLayersUI.translate(\"Labels.TechPreviewBadgeTooltip\")} className=\"customParamsSettings-previewBadge\">\n            <Icon size=\"small\"><SvgTechnicalPreviewMini /></Icon>\n          </div>\n        </span>\n\n        <IconButton size=\"small\" styleType=\"borderless\" className=\"customParamsSettings-header-add-button\" onClick={handleAddClick}>\n          <SvgAdd/>\n        </IconButton>\n      </div>\n      <div className=\"customParamsSettings-content\">\n        <Listbox\n          selectedValue={selectedValue}\n          onListboxValueChange={onListboxValueChange}\n          className=\"customParamsSettings-content-listbox\" >\n          {\n            Object.keys(params).map((keyName) =>\n              <ListboxItem\n                key={keyName}\n                className=\"customParamsSettings-content-entry\"\n                value={keyName}\n                onMouseEnter={() => setListItemUnderCursor(keyName)}\n                onMouseLeave={() => setListItemUnderCursor(undefined)}\n              >\n                <span className=\"customParamsSettings-content-entry-name\" title={keyName}>{keyName}</span>\n                { // Display the delete icon only when the mouse over a specific item otherwise list feels cluttered.\n                  (listItemUnderCursor && listItemUnderCursor === keyName) &&\n                  <>\n                    <IconButton\n                      size=\"small\"\n                      styleType=\"borderless\"\n                      className=\"map-source-list-entry-button\"\n                      title={MapLayersUI.translate(\"CustomParamSettings.EditButtonTitle\")}>\n                      <SvgEdit/>\n                    </IconButton>\n                    <IconButton\n                      size=\"small\"\n                      styleType=\"borderless\"\n                      className=\"customParamsSettings-content-entry-button\"\n                      title={MapLayersUI.translate(\"CustomParamSettings.DeleteButtonTitle\")}\n                      onClick={(event) => {onItemRemoveButtonClicked(keyName, event);}}>\n                      <SvgDelete/>\n                    </IconButton>\n                  </>}\n              </ListboxItem>\n            )\n          }\n        </Listbox>\n      </div>\n    </div>\n  );\n}\n"]}
+{"version":3,"file":"CustomParamsSettings.js","sourceRoot":"","sources":["../../../../src/ui/widget/CustomParamsSettings.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport \"./CustomParamsSettings.scss\";\nimport * as React from \"react\";\nimport { UiFramework } from \"@itwin/appui-react\";\nimport { Listbox, ListboxItem, ListboxValue } from \"@itwin/core-react\";\nimport { SvgTechnicalPreviewMini } from \"@itwin/itwinui-icons-color-react\";\nimport { SvgAdd, SvgDelete, SvgEdit } from \"@itwin/itwinui-icons-react\";\nimport { Icon, IconButton } from \"@itwin/itwinui-react\";\nimport { CustomParamsMappingStorage } from \"../../CustomParamsMappingStorage\";\nimport { CustomParamsStorage } from \"../../CustomParamsStorage\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { CustomParamItem } from \"../Interfaces\";\nimport { CustomParamEditDialog } from \"./CustomParamEditDialog\";\n\ninterface CustomParamsMap {\n  [paramName: string]: CustomParamItem;\n}\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function CustomParamsSettingsPanel() {\n\n  const [storage] = React.useState(() => new CustomParamsStorage());\n  const [mappingStorage] = React.useState(() => new CustomParamsMappingStorage());\n\n  const [params, setParams] = React.useState<CustomParamsMap>(() => {\n    const paramsMap: CustomParamsMap ={};\n    const paramsList = storage.get(undefined);\n    if (Array.isArray(paramsList)) {\n      for (const param of paramsList)\n        paramsMap[param.name] = param;\n    }\n    return paramsMap;\n  });\n\n  const [listItemUnderCursor, setListItemUnderCursor] = React.useState<string | undefined>();\n  const [selectedValue, setSelectedValue] = React.useState<string | undefined>();\n\n  const deleteMapping = React.useCallback((name: string) => {\n    const tmpParams = {...params};\n    delete tmpParams[name];\n    setParams(tmpParams);\n    storage.delete(name);\n\n    // Cascade delete to api key mapping\n    const mappingContent = mappingStorage.getContent();\n    if (mappingContent) {\n      for (const itemKey of Object.keys(mappingContent)) {\n        if (mappingContent[itemKey].customParamNames.includes(name)) {\n          const newParamNames = mappingContent[itemKey].customParamNames.filter((value) => value !== name);\n          newParamNames.length > 0 ?  mappingStorage.save(itemKey, {customParamNames: newParamNames}) : mappingStorage.delete(itemKey);\n        }\n      }\n    }\n  }, [mappingStorage, params, storage]);\n\n  /*\n   Handle Remove layer button clicked\n   */\n  const onItemRemoveButtonClicked = React.useCallback((name: string, event) => {\n    event.stopPropagation();  // We don't want the owning ListBox to react on mouse click.\n    deleteMapping(name);\n  }, [deleteMapping]);\n\n  const onCancelEdit = React.useCallback(() => {\n    UiFramework.dialogs.modal.close();\n    setSelectedValue(undefined); // clear listbox focus\n  }, []);\n\n  const onOkEdit = React.useCallback((newItem: CustomParamItem, oldItem?: CustomParamItem) => {\n\n    UiFramework.dialogs.modal.close();\n\n    // If the edited item has a new name, delete the entry first.\n    const tmpParams = {...params};\n    if (oldItem && oldItem.name !== newItem.name) {\n      delete tmpParams[oldItem.name];\n      setParams(tmpParams);\n      storage.delete(oldItem.name);\n\n      const mappingContent = mappingStorage.getContent();\n      if (mappingContent) {\n        for (const itemKey of Object.keys(mappingContent)) {\n          if (mappingContent[itemKey].customParamNames.includes(oldItem.name )) {\n            const newParamNames = mappingContent[itemKey].customParamNames.filter((value) => value !== oldItem.name);\n            newParamNames.push(newItem.name);\n            mappingStorage.save(itemKey, {customParamNames: newParamNames});\n          }\n        }\n      }\n    }\n    storage.save(newItem.name, newItem);\n\n    tmpParams[newItem.name] = newItem;\n    setParams(tmpParams);\n    setSelectedValue(undefined); // clear listbox focus\n  }, [mappingStorage, params, storage]);\n\n  const handleAddClick = React.useCallback(() => {\n    UiFramework.dialogs.modal.open(\n      <CustomParamEditDialog\n        onOkResult={onOkEdit}\n        onCancelResult={onCancelEdit}\n      />);\n    return;\n  }, [onCancelEdit, onOkEdit]);\n\n  const onListboxValueChange = React.useCallback((newValue: ListboxValue, _isControlOrCommandPressed?: boolean)=> {\n    const item = params[newValue];\n    if (item)\n      UiFramework.dialogs.modal.open(<CustomParamEditDialog item={item} onOkResult={onOkEdit} onCancelResult={onCancelEdit}/>);\n\n    setSelectedValue(newValue);\n    return;\n  }, [params, onCancelEdit, onOkEdit]);\n\n  return (\n    <div className=\"customParamsSettings-container\">\n      <div className=\"customParamsSettings-header\">\n        <span className=\"customParamsSettings-header-label\">\n          {MapLayersUI.translate(\"CustomParamSettings.SectionLabel\")}\n          <div title={MapLayersUI.translate(\"Labels.TechPreviewBadgeTooltip\")} className=\"customParamsSettings-previewBadge\">\n            <Icon size=\"small\"><SvgTechnicalPreviewMini /></Icon>\n          </div>\n        </span>\n\n        <IconButton size=\"small\" styleType=\"borderless\" className=\"customParamsSettings-header-add-button\" onClick={handleAddClick}>\n          <SvgAdd/>\n        </IconButton>\n      </div>\n      <div className=\"customParamsSettings-content\">\n        <Listbox\n          selectedValue={selectedValue}\n          onListboxValueChange={onListboxValueChange}\n          className=\"customParamsSettings-content-listbox\" >\n          {\n            Object.keys(params).map((keyName) =>\n              <ListboxItem\n                key={keyName}\n                className=\"customParamsSettings-content-entry\"\n                value={keyName}\n                onMouseEnter={() => setListItemUnderCursor(keyName)}\n                onMouseLeave={() => setListItemUnderCursor(undefined)}\n              >\n                <span className=\"customParamsSettings-content-entry-name\" title={keyName}>{keyName}</span>\n                { // Display the delete icon only when the mouse over a specific item otherwise list feels cluttered.\n                  (listItemUnderCursor && listItemUnderCursor === keyName) &&\n                  <>\n                    <IconButton\n                      size=\"small\"\n                      styleType=\"borderless\"\n                      className=\"map-source-list-entry-button\"\n                      title={MapLayersUI.translate(\"CustomParamSettings.EditButtonTitle\")}>\n                      <SvgEdit/>\n                    </IconButton>\n                    <IconButton\n                      size=\"small\"\n                      styleType=\"borderless\"\n                      className=\"customParamsSettings-content-entry-button\"\n                      title={MapLayersUI.translate(\"CustomParamSettings.DeleteButtonTitle\")}\n                      onClick={(event) => {onItemRemoveButtonClicked(keyName, event);}}>\n                      <SvgDelete/>\n                    </IconButton>\n                  </>}\n              </ListboxItem>\n            )\n          }\n        </Listbox>\n      </div>\n    </div>\n  );\n}\n"]}

package/lib/cjs/ui/widget/FeatureInfoDataProvider.d.ts

@@ -9,6 +9,7 @@ export declare class FeatureInfoDataProvider implements IPropertyDataProvider {
     private readonly _detachToolAdminListener;
     onDataChanged: PropertyDataChangeEvent;
     private _data;
+    private _isActive;
     constructor();
     private handleActiveToolChanged;
     private handleOnInfoReadyChanged;

package/lib/cjs/ui/widget/FeatureInfoDataProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoDataProvider.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAoD,sBAAsB,EAAuB,MAAM,sBAAsB,CAAC;AAerI;;GAEG;AACH,qBAAa,uBAAwB,YAAW,qBAAqB;IACnE,OAAO,CAAC,yBAAyB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAe;IAEjD,aAAa,0BAAiC;IACrD,OAAO,CAAC,KAAK,CAA4B;;IAMzC,OAAO,CAAC,uBAAuB,CAY7B;IAEF,OAAO,CAAC,wBAAwB,CAE9B;IAEF,OAAO,CAAC,yBAAyB;IAIjC,OAAO,CAAC,4BAA4B;IAI7B,QAAQ;IAQf,IAAW,UAAU,YAEpB;YAEa,OAAO;IAiCd,mBAAmB,CAAC,YAAY,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB;IAazF,cAAc,CAAC,YAAY,EAAE,MAAM;IAInC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAM/C,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAMrD,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAO7C,WAAW,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAUvE,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAe5E,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO;IAclG,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;CAG9C"}
+{"version":3,"file":"FeatureInfoDataProvider.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAoD,sBAAsB,EAAuB,MAAM,sBAAsB,CAAC;AAerI;;GAEG;AACH,qBAAa,uBAAwB,YAAW,qBAAqB;IACnE,OAAO,CAAC,yBAAyB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAe;IAEjD,aAAa,0BAAiC;IACrD,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,SAAS,CAAS;;IAM1B,OAAO,CAAC,uBAAuB,CAuB7B;IAEF,OAAO,CAAC,wBAAwB,CAE9B;IAEF,OAAO,CAAC,yBAAyB;IAIjC,OAAO,CAAC,4BAA4B;IAI7B,QAAQ;IAQf,IAAW,UAAU,YAEpB;YAEa,OAAO;IAiCd,mBAAmB,CAAC,YAAY,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB;IAazF,cAAc,CAAC,YAAY,EAAE,MAAM;IAInC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAM/C,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAMrD,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAO7C,WAAW,CAAC,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAUvE,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAe5E,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO;IAclG,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;CAG9C"}

package/lib/cjs/ui/widget/FeatureInfoDataProvider.js

@@ -27,16 +27,27 @@ class FeatureInfoDataProvider {
     constructor() {
         this.onDataChanged = new components_react_1.PropertyDataChangeEvent();
         this._data = new SimplePropertyData();
+        this._isActive = false;
         this.handleActiveToolChanged = (tool, _start) => {
-            if (this._detachActiveToolListener) {
+            if (this._detachActiveToolListener)
                 this._detachActiveToolListener();
-                this._detachActiveToolListener = undefined;
-            }
+            this._detachActiveToolListener = undefined;
             if (tool.toolId === map_layers_formats_1.MapFeatureInfoTool.toolId) {
                 const mapInfoTool = tool;
                 this._detachActiveToolListener = mapInfoTool.onInfoReady.addListener(this.handleOnInfoReadyChanged);
+                if (this._isActive) {
+                    // This is a tool reset, simply clear previous data
+                    this._data = new SimplePropertyData();
+                    this.onDataChanged.raiseEvent();
+                }
+                else {
+                    this._isActive = true;
+                }
+            }
+            else {
                 this._data = new SimplePropertyData();
                 this.onDataChanged.raiseEvent();
+                this._isActive = false;
             }
         };
         this.handleOnInfoReadyChanged = (data) => {

package/lib/cjs/ui/widget/FeatureInfoDataProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoDataProvider.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { PropertyRecord } from \"@itwin/appui-abstract\";\nimport { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"@itwin/components-react\";\nimport { IModelApp, MapFeatureInfo, MapLayerFeatureRecord, MapSubLayerFeatureInfo, StartOrResume, Tool } from \"@itwin/core-frontend\";\nimport { MapFeatureInfoTool, MapFeatureInfoToolData } from \"@itwin/map-layers-formats\";\n\n/**\n * Implementation of [IPropertyDataProvider] that uses an associative  array.\n * @internal\n */\n\nclass SimplePropertyData implements PropertyData {\n  public label: PropertyRecord = PropertyRecord.fromString(\"\");\n  public description?: string;\n  public categories: PropertyCategory[] = [];\n  public records: { [categoryName: string]: PropertyRecord[] } = {};\n}\n\n/**\n * @internal\n */\nexport class FeatureInfoDataProvider implements IPropertyDataProvider {\n  private _detachActiveToolListener: VoidFunction | undefined;\n  private readonly _detachToolAdminListener: VoidFunction;\n\n  public onDataChanged = new PropertyDataChangeEvent();\n  private _data = new SimplePropertyData();\n\n  constructor() {\n    this._detachToolAdminListener = IModelApp.toolAdmin.activeToolChanged.addListener(this.handleActiveToolChanged);\n  }\n\n  private handleActiveToolChanged = (tool: Tool, _start: StartOrResume) => {\n    if (this._detachActiveToolListener) {\n      this._detachActiveToolListener();\n      this._detachActiveToolListener = undefined;\n    }\n\n    if (tool.toolId === MapFeatureInfoTool.toolId) {\n      const mapInfoTool = tool as MapFeatureInfoTool;\n      this._detachActiveToolListener = mapInfoTool.onInfoReady.addListener(this.handleOnInfoReadyChanged);\n      this._data = new SimplePropertyData();\n      this.onDataChanged.raiseEvent();\n    }\n  };\n\n  private handleOnInfoReadyChanged = (data: MapFeatureInfoToolData) => {\n    void this.setInfo(data.mapInfo).then(); // No need to wait for data parsing.\n  };\n\n  private generateLayerCategoryName(subLayerName: string) {\n    return `_layer_${subLayerName}`;\n  }\n\n  private generateSubLayerCategoryName(subLayerName: string) {\n    return `_subLayer_${subLayerName}`;\n  }\n\n  public onUnload() {\n    this._detachToolAdminListener();\n    if (this._detachActiveToolListener) {\n      this._detachActiveToolListener();\n      this._detachActiveToolListener = undefined;\n    }\n  }\n\n  public get hasRecords() {\n    return this._data.categories.length > 0;\n  }\n\n  private async setInfo(mapInfo?: MapFeatureInfo) {\n    this._data = new SimplePropertyData();\n\n    if (mapInfo?.layerInfos) {\n      for (const curLayerInfo of mapInfo.layerInfos) {\n        const categoryName = this.generateLayerCategoryName(curLayerInfo.layerName);\n        const layerCatIdx = this.findCategoryIndexByName(categoryName);\n        let nbRecords = 0;\n\n        const layerCategory =\n          layerCatIdx === -1 ? { name: categoryName, label: curLayerInfo.layerName, expand: true, childCategories: [] } : this._data.categories[layerCatIdx];\n\n        if (curLayerInfo.subLayerInfos) {\n          for (const subLayerInfo of curLayerInfo.subLayerInfos) {\n            this.addSubLayerCategory(subLayerInfo, layerCategory);\n\n            // Add every feature records for this sub-layer\n            for (const feature of subLayerInfo.features) {\n              nbRecords++;\n              for (const attribute of feature.attributes) {\n                // Always use the string value for now\n                this.addProperty(MapLayerFeatureRecord.createRecordFromAttribute(attribute), this.generateSubLayerCategoryName(subLayerInfo.subLayerName));\n              }\n            }\n          }\n          if (layerCatIdx === -1 && nbRecords > 0) this.addCategory(layerCategory);\n        }\n      }\n    }\n\n    this.onDataChanged.raiseEvent();\n  }\n\n  public addSubLayerCategory(subLayerInfo: MapSubLayerFeatureInfo, layerCategory: PropertyCategory) {\n    const subLayerName = this.generateSubLayerCategoryName(subLayerInfo.subLayerName);\n    const subCatIdx = layerCategory.childCategories?.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === subLayerName;\n    });\n\n    let subLayerCategory;\n    if (subCatIdx === -1) {\n      subLayerCategory = { name: subLayerName, label: subLayerInfo.subLayerName, expand: true };\n      this.addSubCategory(subLayerName);\n      layerCategory.childCategories?.push(subLayerCategory);\n    }\n  }\n  public addSubCategory(categoryName: string) {\n    this._data.records[categoryName] = [];\n  }\n\n  public addCategory(category: PropertyCategory): number {\n    const categoryIdx = this._data.categories.push(category) - 1;\n    this._data.records[this._data.categories[categoryIdx].name] = [];\n    return categoryIdx;\n  }\n\n  public findCategoryIndex(category: PropertyCategory): number {\n    const index = this._data.categories.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === category.name;\n    });\n    return index;\n  }\n  public findCategoryIndexByName(name: string): number {\n    const index = this._data.categories.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === name;\n    });\n    return index;\n  }\n\n  public addProperty(propertyRecord: PropertyRecord, categoryName: string): void {\n    const idx = this._data.records[categoryName].findIndex((prop) => prop.property.name === propertyRecord.property.name);\n    if (idx === -1) {\n      this._data.records[categoryName].push(propertyRecord);\n    } else {\n      this._data.records[categoryName][idx].isMerged = true;\n      this._data.records[categoryName][idx].isReadonly = true;\n    }\n  }\n\n  public removeProperty(propertyRecord: PropertyRecord, categoryIdx: number): boolean {\n    const index = this._data.records[this._data.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\n      return record === propertyRecord;\n    });\n\n    let result = false;\n\n    if (index >= 0) {\n      this._data.records[this._data.categories[categoryIdx].name].splice(index, 1);\n      this.onDataChanged.raiseEvent();\n      result = true;\n    }\n    return result;\n  }\n\n  public replaceProperty(propertyRecord: PropertyRecord, categoryIdx: number, newRecord: PropertyRecord): boolean {\n    const index = this._data.records[this._data.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\n      return record === propertyRecord;\n    });\n\n    let result = false;\n\n    if (index >= 0) {\n      this._data.records[this._data.categories[categoryIdx].name].splice(index, 1, newRecord);\n      result = true;\n    }\n    return result;\n  }\n\n  public async getData(): Promise<PropertyData> {\n    return this._data;\n  }\n}\n"]}
+{"version":3,"file":"FeatureInfoDataProvider.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoDataProvider.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,0DAAuD;AACvD,8DAAyH;AACzH,wDAAqI;AACrI,kEAAuF;AAEvF;;;GAGG;AAEH,MAAM,kBAAkB;IAAxB;QACS,UAAK,GAAmB,+BAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAEtD,eAAU,GAAuB,EAAE,CAAC;QACpC,YAAO,GAAiD,EAAE,CAAC;IACpE,CAAC;CAAA;AAED;;GAEG;AACH,MAAa,uBAAuB;IAQlC;QAJO,kBAAa,GAAG,IAAI,0CAAuB,EAAE,CAAC;QAC7C,UAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACjC,cAAS,GAAG,KAAK,CAAC;QAMlB,4BAAuB,GAAG,CAAC,IAAU,EAAE,MAAqB,EAAE,EAAE;YAEtE,IAAI,IAAI,CAAC,yBAAyB;gBAChC,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACnC,IAAI,CAAC,yBAAyB,GAAG,SAAS,CAAC;YAE3C,IAAI,IAAI,CAAC,MAAM,KAAK,uCAAkB,CAAC,MAAM,EAAE;gBAC7C,MAAM,WAAW,GAAG,IAA0B,CAAC;gBAE/C,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBAEpG,IAAI,IAAI,CAAC,SAAS,EAAE;oBAClB,mDAAmD;oBACnD,IAAI,CAAC,KAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;oBACtC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;iBACjC;qBAAM;oBACL,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;iBACvB;aACF;iBAAM;gBACL,IAAI,CAAC,KAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBACtC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;aACxB;QACH,CAAC,CAAC;QAEM,6BAAwB,GAAG,CAAC,IAA4B,EAAE,EAAE;YAClE,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,oCAAoC;QAC9E,CAAC,CAAC;QA9BA,IAAI,CAAC,wBAAwB,GAAG,yBAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAClH,CAAC;IA+BO,yBAAyB,CAAC,YAAoB;QACpD,OAAO,UAAU,YAAY,EAAE,CAAC;IAClC,CAAC;IAEO,4BAA4B,CAAC,YAAoB;QACvD,OAAO,aAAa,YAAY,EAAE,CAAC;IACrC,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAClC,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACjC,IAAI,CAAC,yBAAyB,GAAG,SAAS,CAAC;SAC5C;IACH,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,OAAwB;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAEtC,IAAI,OAAO,EAAE,UAAU,EAAE;YACvB,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,UAAU,EAAE;gBAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC5E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;gBAC/D,IAAI,SAAS,GAAG,CAAC,CAAC;gBAElB,MAAM,aAAa,GACjB,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;gBAErJ,IAAI,YAAY,CAAC,aAAa,EAAE;oBAC9B,KAAK,MAAM,YAAY,IAAI,YAAY,CAAC,aAAa,EAAE;wBACrD,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;wBAEtD,+CAA+C;wBAC/C,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE;4BAC3C,SAAS,EAAE,CAAC;4BACZ,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;gCAC1C,sCAAsC;gCACtC,IAAI,CAAC,WAAW,CAAC,qCAAqB,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;6BAC5I;yBACF;qBACF;oBACD,IAAI,WAAW,KAAK,CAAC,CAAC,IAAI,SAAS,GAAG,CAAC;wBAAE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;iBAC1E;aACF;SACF;QAED,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IAClC,CAAC;IAEM,mBAAmB,CAAC,YAAoC,EAAE,aAA+B;QAC9F,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;YAC5F,OAAO,YAAY,CAAC,IAAI,KAAK,YAAY,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC;QACrB,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;YACpB,gBAAgB,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC1F,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;YAClC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACvD;IACH,CAAC;IACM,cAAc,CAAC,YAAoB;QACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC;IAEM,WAAW,CAAC,QAA0B;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACjE,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,iBAAiB,CAAC,QAA0B;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;YAC/E,OAAO,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IACM,uBAAuB,CAAC,IAAY;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,YAA8B,EAAE,EAAE;YAC/E,OAAO,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,WAAW,CAAC,cAA8B,EAAE,YAAoB;QACrE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtH,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACvD;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;SACzD;IACH,CAAC;IAEM,cAAc,CAAC,cAA8B,EAAE,WAAmB;QACvE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAsB,EAAE,EAAE;YAC7G,OAAO,MAAM,KAAK,cAAc,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,GAAG,IAAI,CAAC;SACf;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,eAAe,CAAC,cAA8B,EAAE,WAAmB,EAAE,SAAyB;QACnG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,MAAsB,EAAE,EAAE;YAC7G,OAAO,MAAM,KAAK,cAAc,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,KAAK,IAAI,CAAC,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YACxF,MAAM,GAAG,IAAI,CAAC;SACf;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AA5KD,0DA4KC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n\nimport { PropertyRecord } from \"@itwin/appui-abstract\";\nimport { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"@itwin/components-react\";\nimport { IModelApp, MapFeatureInfo, MapLayerFeatureRecord, MapSubLayerFeatureInfo, StartOrResume, Tool } from \"@itwin/core-frontend\";\nimport { MapFeatureInfoTool, MapFeatureInfoToolData } from \"@itwin/map-layers-formats\";\n\n/**\n * Implementation of [IPropertyDataProvider] that uses an associative  array.\n * @internal\n */\n\nclass SimplePropertyData implements PropertyData {\n  public label: PropertyRecord = PropertyRecord.fromString(\"\");\n  public description?: string;\n  public categories: PropertyCategory[] = [];\n  public records: { [categoryName: string]: PropertyRecord[] } = {};\n}\n\n/**\n * @internal\n */\nexport class FeatureInfoDataProvider implements IPropertyDataProvider {\n  private _detachActiveToolListener: VoidFunction | undefined;\n  private readonly _detachToolAdminListener: VoidFunction;\n\n  public onDataChanged = new PropertyDataChangeEvent();\n  private _data = new SimplePropertyData();\n  private _isActive = false;\n\n  constructor() {\n    this._detachToolAdminListener = IModelApp.toolAdmin.activeToolChanged.addListener(this.handleActiveToolChanged);\n  }\n\n  private handleActiveToolChanged = (tool: Tool, _start: StartOrResume) => {\n\n    if (this._detachActiveToolListener)\n      this._detachActiveToolListener();\n    this._detachActiveToolListener = undefined;\n\n    if (tool.toolId === MapFeatureInfoTool.toolId) {\n      const mapInfoTool = tool as MapFeatureInfoTool;\n\n      this._detachActiveToolListener = mapInfoTool.onInfoReady.addListener(this.handleOnInfoReadyChanged);\n\n      if (this._isActive) {\n        // This is a tool reset, simply clear previous data\n        this._data = new SimplePropertyData();\n        this.onDataChanged.raiseEvent();\n      } else {\n        this._isActive = true;\n      }\n    } else {\n      this._data = new SimplePropertyData();\n      this.onDataChanged.raiseEvent();\n      this._isActive = false;\n    }\n  };\n\n  private handleOnInfoReadyChanged = (data: MapFeatureInfoToolData) => {\n    void this.setInfo(data.mapInfo).then(); // No need to wait for data parsing.\n  };\n\n  private generateLayerCategoryName(subLayerName: string) {\n    return `_layer_${subLayerName}`;\n  }\n\n  private generateSubLayerCategoryName(subLayerName: string) {\n    return `_subLayer_${subLayerName}`;\n  }\n\n  public onUnload() {\n    this._detachToolAdminListener();\n    if (this._detachActiveToolListener) {\n      this._detachActiveToolListener();\n      this._detachActiveToolListener = undefined;\n    }\n  }\n\n  public get hasRecords() {\n    return this._data.categories.length > 0;\n  }\n\n  private async setInfo(mapInfo?: MapFeatureInfo) {\n    this._data = new SimplePropertyData();\n\n    if (mapInfo?.layerInfos) {\n      for (const curLayerInfo of mapInfo.layerInfos) {\n        const categoryName = this.generateLayerCategoryName(curLayerInfo.layerName);\n        const layerCatIdx = this.findCategoryIndexByName(categoryName);\n        let nbRecords = 0;\n\n        const layerCategory =\n          layerCatIdx === -1 ? { name: categoryName, label: curLayerInfo.layerName, expand: true, childCategories: [] } : this._data.categories[layerCatIdx];\n\n        if (curLayerInfo.subLayerInfos) {\n          for (const subLayerInfo of curLayerInfo.subLayerInfos) {\n            this.addSubLayerCategory(subLayerInfo, layerCategory);\n\n            // Add every feature records for this sub-layer\n            for (const feature of subLayerInfo.features) {\n              nbRecords++;\n              for (const attribute of feature.attributes) {\n                // Always use the string value for now\n                this.addProperty(MapLayerFeatureRecord.createRecordFromAttribute(attribute), this.generateSubLayerCategoryName(subLayerInfo.subLayerName));\n              }\n            }\n          }\n          if (layerCatIdx === -1 && nbRecords > 0) this.addCategory(layerCategory);\n        }\n      }\n    }\n\n    this.onDataChanged.raiseEvent();\n  }\n\n  public addSubLayerCategory(subLayerInfo: MapSubLayerFeatureInfo, layerCategory: PropertyCategory) {\n    const subLayerName = this.generateSubLayerCategoryName(subLayerInfo.subLayerName);\n    const subCatIdx = layerCategory.childCategories?.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === subLayerName;\n    });\n\n    let subLayerCategory;\n    if (subCatIdx === -1) {\n      subLayerCategory = { name: subLayerName, label: subLayerInfo.subLayerName, expand: true };\n      this.addSubCategory(subLayerName);\n      layerCategory.childCategories?.push(subLayerCategory);\n    }\n  }\n  public addSubCategory(categoryName: string) {\n    this._data.records[categoryName] = [];\n  }\n\n  public addCategory(category: PropertyCategory): number {\n    const categoryIdx = this._data.categories.push(category) - 1;\n    this._data.records[this._data.categories[categoryIdx].name] = [];\n    return categoryIdx;\n  }\n\n  public findCategoryIndex(category: PropertyCategory): number {\n    const index = this._data.categories.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === category.name;\n    });\n    return index;\n  }\n  public findCategoryIndexByName(name: string): number {\n    const index = this._data.categories.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === name;\n    });\n    return index;\n  }\n\n  public addProperty(propertyRecord: PropertyRecord, categoryName: string): void {\n    const idx = this._data.records[categoryName].findIndex((prop) => prop.property.name === propertyRecord.property.name);\n    if (idx === -1) {\n      this._data.records[categoryName].push(propertyRecord);\n    } else {\n      this._data.records[categoryName][idx].isMerged = true;\n      this._data.records[categoryName][idx].isReadonly = true;\n    }\n  }\n\n  public removeProperty(propertyRecord: PropertyRecord, categoryIdx: number): boolean {\n    const index = this._data.records[this._data.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\n      return record === propertyRecord;\n    });\n\n    let result = false;\n\n    if (index >= 0) {\n      this._data.records[this._data.categories[categoryIdx].name].splice(index, 1);\n      this.onDataChanged.raiseEvent();\n      result = true;\n    }\n    return result;\n  }\n\n  public replaceProperty(propertyRecord: PropertyRecord, categoryIdx: number, newRecord: PropertyRecord): boolean {\n    const index = this._data.records[this._data.categories[categoryIdx].name].findIndex((record: PropertyRecord) => {\n      return record === propertyRecord;\n    });\n\n    let result = false;\n\n    if (index >= 0) {\n      this._data.records[this._data.categories[categoryIdx].name].splice(index, 1, newRecord);\n      result = true;\n    }\n    return result;\n  }\n\n  public async getData(): Promise<PropertyData> {\n    return this._data;\n  }\n}\n"]}

package/lib/cjs/ui/widget/FeatureInfoWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoWidget.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,sDAG9C;AAGD,UAAU,yBAAyB;IACjC,eAAe,EAAE,qBAAqB,CAAC;CACxC;AAGD,wBAAgB,oBAAoB,CAAC,EAAE,eAAe,EAAE,EAAE,yBAAyB,eAyDlF"}
+{"version":3,"file":"FeatureInfoWidget.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,sDAG9C;AAGD,UAAU,yBAAyB;IACjC,eAAe,EAAE,qBAAqB,CAAC;CACxC;AAGD,wBAAgB,oBAAoB,CAAC,EAAE,eAAe,EAAE,EAAE,yBAAyB,eAyElF"}

package/lib/cjs/ui/widget/FeatureInfoWidget.js

@@ -9,6 +9,8 @@ const React = require("react");
 const appui_react_1 = require("@itwin/appui-react");
 const components_react_1 = require("@itwin/components-react");
 const core_react_1 = require("@itwin/core-react");
+const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
+const itwinui_react_1 = require("@itwin/itwinui-react");
 const mapLayers_1 = require("../../mapLayers");
 const FeatureInfoUiItemsProvider_1 = require("../FeatureInfoUiItemsProvider");
 const FeatureInfoDataProvider_1 = require("./FeatureInfoDataProvider");
@@ -46,9 +48,18 @@ function MapFeatureInfoWidget({ featureInfoOpts }) {
     const handleResize = React.useCallback((w, h) => {
         setSize({ width: w, height: h });
     }, []);
+    const copyButton = React.useCallback((props) => props.isPropertyHovered &&
+        React.createElement("div", null,
+            React.createElement(itwinui_react_1.IconButton, { styleType: "borderless", onClick: () => {
+                    const value = props.property.value;
+                    if (value !== undefined && value.hasOwnProperty("displayValue"))
+                        navigator.clipboard.writeText(value.displayValue ?? "").catch((_) => { });
+                } },
+                React.createElement(itwinui_icons_react_1.SvgCopy, null))), []);
     if (hasData && dataProvider.current) {
         return (React.createElement(core_react_1.ResizableContainerObserver, { onResize: handleResize },
-            React.createElement(components_react_1.VirtualizedPropertyGridWithDataProvider, { width: width, height: height, dataProvider: dataProvider.current, orientation: core_react_1.Orientation.Vertical, isPropertySelectionEnabled: featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled })));
+            React.createElement(components_react_1.VirtualizedPropertyGridWithDataProvider, { width: width, height: height, dataProvider: dataProvider.current, orientation: core_react_1.Orientation.Vertical, isPropertySelectionEnabled: featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled, isPropertyHoverEnabled // This need to be turned on to have the action button appears only when property hovered
+                : true, actionButtonRenderers: [copyButton] })));
     }
     else {
         return (React.createElement(core_react_1.FillCentered, null,

package/lib/cjs/ui/widget/FeatureInfoWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureInfoWidget.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\nimport * as React from \"react\";\nimport { useActiveFrontstageDef, WidgetState } from \"@itwin/appui-react\";\nimport { VirtualizedPropertyGridWithDataProvider } from \"@itwin/components-react\";\nimport { FillCentered, Orientation, ResizableContainerObserver } from \"@itwin/core-react\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { FeatureInfoUiItemsProvider } from \"../FeatureInfoUiItemsProvider\";\nimport { MapFeatureInfoOptions } from \"../Interfaces\";\nimport { FeatureInfoDataProvider } from \"./FeatureInfoDataProvider\";\n\nexport function useSpecificWidgetDef(id: string) {\n  const frontstageDef = useActiveFrontstageDef();\n  return frontstageDef?.findWidgetDef(id);\n}\n\n// MapFeatureInfoWidgetProps\ninterface MapFeatureInfoWidgetProps {\n  featureInfoOpts: MapFeatureInfoOptions;\n}\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function MapFeatureInfoWidget({ featureInfoOpts }: MapFeatureInfoWidgetProps) {\n\n  const dataProvider = React.useRef<FeatureInfoDataProvider>();\n  const [hasData, setHasData] = React.useState<boolean>(false);\n\n  const [noRecordsMessage] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:FeatureInfoWidget.NoRecords\"));\n\n  const [{ width, height }, setSize] = React.useState({ width: 0, height: 0 });\n\n  const widgetDef = useSpecificWidgetDef(FeatureInfoUiItemsProvider.widgetId);\n  const handleDataChanged = React.useCallback(() => {\n    const dataAvailable = dataProvider.current !== undefined && dataProvider.current.hasRecords;\n    setHasData(dataAvailable);\n    if (widgetDef) {\n      widgetDef.setWidgetState(dataAvailable ? WidgetState.Open : WidgetState.Hidden);\n    }\n  }, [widgetDef]);\n\n  React.useEffect(() => {\n    dataProvider.current = new FeatureInfoDataProvider();\n    return () => {\n      dataProvider?.current?.onUnload();\n    };\n  }, []);\n\n  React.useEffect(() => {\n    dataProvider.current?.onDataChanged.addListener(handleDataChanged);\n    return () => {\n      dataProvider.current?.onDataChanged.removeListener(handleDataChanged);\n    };\n  }, [handleDataChanged]);\n\n  const handleResize = React.useCallback((w: number, h: number) => {\n    setSize({ width: w, height: h });\n  }, []);\n\n  if (hasData && dataProvider.current) {\n    return (\n      <ResizableContainerObserver onResize={handleResize}>\n        <VirtualizedPropertyGridWithDataProvider\n          width={width}\n          height={height}\n          dataProvider={dataProvider.current}\n          orientation={Orientation.Vertical}\n          isPropertySelectionEnabled={featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled}\n        />\n      </ResizableContainerObserver>\n    );\n  } else {\n    return (\n      <FillCentered>\n        <span>\n          <i>{noRecordsMessage}</i>\n        </span>\n      </FillCentered>\n    );\n  }\n}\n"]}
+{"version":3,"file":"FeatureInfoWidget.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\nimport * as React from \"react\";\nimport { PrimitiveValue } from \"@itwin/appui-abstract\";\nimport { useActiveFrontstageDef, WidgetState } from \"@itwin/appui-react\";\nimport { ActionButtonRendererProps, VirtualizedPropertyGridWithDataProvider } from \"@itwin/components-react\";\nimport { FillCentered, Orientation, ResizableContainerObserver } from \"@itwin/core-react\";\nimport { SvgCopy } from \"@itwin/itwinui-icons-react\";\nimport { IconButton } from \"@itwin/itwinui-react\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { FeatureInfoUiItemsProvider } from \"../FeatureInfoUiItemsProvider\";\nimport { MapFeatureInfoOptions } from \"../Interfaces\";\nimport { FeatureInfoDataProvider } from \"./FeatureInfoDataProvider\";\n\nexport function useSpecificWidgetDef(id: string) {\n  const frontstageDef = useActiveFrontstageDef();\n  return frontstageDef?.findWidgetDef(id);\n}\n\n// MapFeatureInfoWidgetProps\ninterface MapFeatureInfoWidgetProps {\n  featureInfoOpts: MapFeatureInfoOptions;\n}\n\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function MapFeatureInfoWidget({ featureInfoOpts }: MapFeatureInfoWidgetProps) {\n\n  const dataProvider = React.useRef<FeatureInfoDataProvider>();\n  const [hasData, setHasData] = React.useState<boolean>(false);\n\n  const [noRecordsMessage] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:FeatureInfoWidget.NoRecords\"));\n\n  const [{ width, height }, setSize] = React.useState({ width: 0, height: 0 });\n\n  const widgetDef = useSpecificWidgetDef(FeatureInfoUiItemsProvider.widgetId);\n  const handleDataChanged = React.useCallback(() => {\n    const dataAvailable = dataProvider.current !== undefined && dataProvider.current.hasRecords;\n    setHasData(dataAvailable);\n    if (widgetDef) {\n      widgetDef.setWidgetState(dataAvailable ? WidgetState.Open : WidgetState.Hidden);\n    }\n  }, [widgetDef]);\n\n  React.useEffect(() => {\n    dataProvider.current = new FeatureInfoDataProvider();\n    return () => {\n      dataProvider?.current?.onUnload();\n    };\n  }, []);\n\n  React.useEffect(() => {\n    dataProvider.current?.onDataChanged.addListener(handleDataChanged);\n    return () => {\n      dataProvider.current?.onDataChanged.removeListener(handleDataChanged);\n    };\n  }, [handleDataChanged]);\n\n  const handleResize = React.useCallback((w: number, h: number) => {\n    setSize({ width: w, height: h });\n  }, []);\n\n  const copyButton = React.useCallback(\n    (props: ActionButtonRendererProps) => props.isPropertyHovered &&\n      <div>\n        <IconButton styleType=\"borderless\" onClick={() => {\n          const value = props.property.value;\n          if (value !== undefined && value.hasOwnProperty(\"displayValue\"))\n            navigator.clipboard.writeText((value as PrimitiveValue).displayValue ?? \"\").catch((_) => { });\n        }}>\n          <SvgCopy/>\n        </IconButton>\n      </div>,\n    [],\n  );\n\n  if (hasData && dataProvider.current) {\n    return (\n      <ResizableContainerObserver onResize={handleResize}>\n        <VirtualizedPropertyGridWithDataProvider\n          width={width}\n          height={height}\n          dataProvider={dataProvider.current}\n          orientation={Orientation.Vertical}\n          isPropertySelectionEnabled={featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled}\n          isPropertyHoverEnabled   // This need to be turned on to have the action button appears only when property hovered\n          actionButtonRenderers={[copyButton]}\n        />\n      </ResizableContainerObserver>\n    );\n  } else {\n    return (\n      <FillCentered>\n        <span>\n          <i>{noRecordsMessage}</i>\n        </span>\n      </FillCentered>\n    );\n  }\n}\n"]}

package/lib/cjs/ui/widget/MapLayerManager.js

@@ -196,8 +196,8 @@ function MapLayerManager(props) {
                 // Find existing entries to avoid adding duplicated sources
                 if (!sources.find((curSource) => source.name === curSource.name)) {
                     const cpMapping = cpMappingStorage.get(source.url.toLowerCase());
-                    if (cpMapping && cpMapping.length > 0) {
-                        CustomParamUtils_1.CustomParamUtils.setSourceCustomParams(source, cpMapping[0].customParamNames);
+                    if (cpMapping && !Array.isArray(cpMapping)) {
+                        CustomParamUtils_1.CustomParamUtils.setSourceCustomParams(source, cpMapping.customParamNames);
                     }
                     addSource(source);
                 }