@itwin/map-layers 5.2.5 → 5.2.7

package/lib/esm/ui/widget/BasemapPanel.js

@@ -4,16 +4,16 @@
 *--------------------------------------------------------------------------------------------*/
 /* eslint-disable deprecation/deprecation */
 // cSpell:ignore droppable Sublayer Basemap
+import "./BasemapPanel.scss";
+import * as React from "react";
 import { UiFramework } from "@itwin/appui-react";
-import { BackgroundMapType, BaseMapLayerSettings, ColorByName, ColorDef, ImageMapLayerSettings } from "@itwin/core-common";
+import { BackgroundMapType, BaseMapLayerSettings, ColorByName, ColorDef, ImageMapLayerSettings, } from "@itwin/core-common";
 import { WebFontIcon } from "@itwin/core-react";
 import { ColorPickerDialog, ColorSwatch } from "@itwin/imodel-components-react";
 import { Button, Select } from "@itwin/itwinui-react";
 import { MapLayersUI } from "../../mapLayers";
 import { useSourceMapContext } from "./MapLayerManager";
 import { TransparencyPopupButton } from "./TransparencyPopupButton";
-import * as React from "react";
-import "./BasemapPanel.scss";
 const customBaseMapValue = "customBaseMap";
 const getSelectKeyFromProvider = (base) => `${base.provider ? `${base.provider.name}.${BackgroundMapType[base.provider.type]}` : `${base.name}`}`;
 /** @internal */
@@ -21,7 +21,9 @@ const getSelectKeyFromProvider = (base) => `${base.provider ? `${base.provider.n
 export function BasemapPanel(props) {
     const [useColorLabel] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:Basemap.ColorFill"));
     const { activeViewport, bases } = useSourceMapContext();
-    const [selectedBaseMap, setSelectedBaseMap] = React.useState(activeViewport?.displayStyle.settings.mapImagery.backgroundBase);
+    const [selectedBaseMap, setSelectedBaseMap] = React.useState(() => {
+        return activeViewport?.displayStyle.settings.mapImagery.backgroundBase;
+    });
     const [baseMapTransparencyValue, setBaseMapTransparencyValue] = React.useState(() => {
         if (activeViewport) {
             const mapImagery = activeViewport.displayStyle.settings.mapImagery;
@@ -46,12 +48,40 @@ export function BasemapPanel(props) {
         }
         return false;
     });
+    const getBaseMapOptions = React.useCallback((baseMap) => {
+        const baseOptions = [];
+        baseOptions.push({ value: useColorLabel, label: useColorLabel });
+        if (bases) {
+            baseOptions.push(...bases.map((bgProvider) => {
+                const value = getSelectKeyFromProvider(bgProvider);
+                const label = MapLayersUI.translate(`WellKnownBaseMaps.${value}`);
+                return { value, label };
+            }));
+        }
+        // Add new custom base map definition (avoid adding duplicate entry)
+        if (baseMap instanceof BaseMapLayerSettings && !baseMap.provider) {
+            // Add new option only if not created duplicate (Support of base map definition without provider)
+            if (undefined === baseOptions.find((opt) => opt.label === baseMap.name)) {
+                baseOptions.push({ value: customBaseMapValue, label: baseMap.name });
+            }
+        }
+        else if (customBaseMap) {
+            // Add previously defined custom map definition
+            baseOptions.push({ value: customBaseMapValue, label: customBaseMap.name });
+        }
+        return baseOptions;
+    }, [bases, customBaseMap, useColorLabel]);
+    const [baseMapOptions, setBaseMapOptions] = React.useState(() => getBaseMapOptions(selectedBaseMap));
+    const updateBaseMapOptions = React.useCallback((baseMap) => {
+        setBaseMapOptions(getBaseMapOptions(baseMap));
+    }, [getBaseMapOptions]);
     const handleMapImageryChanged = React.useCallback((args) => {
         const baseMap = args.backgroundBase;
         // Optimization:  If serialized 'backgroundBase' objects are identical, skip refresh
         if (JSON.stringify(baseMap.toJSON()) === JSON.stringify(selectedBaseMap?.toJSON()))
             return;
         setSelectedBaseMap(baseMap); // cache current base map objects
+        updateBaseMapOptions(baseMap);
         if (baseMap instanceof ImageMapLayerSettings) {
             if (baseMap.transparency !== baseMapTransparencyValue)
                 setBaseMapTransparencyValue(baseMap.transparency);
@@ -63,7 +93,7 @@ export function BasemapPanel(props) {
                 setBaseMapTransparencyValue(baseMap.getAlpha() / 255);
             }
         }
-    }, [baseMapTransparencyValue, baseMapVisible, selectedBaseMap]);
+    }, [baseMapTransparencyValue, baseMapVisible, selectedBaseMap, updateBaseMapOptions]);
     React.useEffect(() => {
         const handleDisplayStyleChange = (vp) => {
             handleMapImageryChanged(vp.displayStyle.settings.mapImagery);
@@ -87,21 +117,14 @@ export function BasemapPanel(props) {
             setBaseMapTransparencyValue(transparency);
         }
     }, [activeViewport]);
-    const baseMapOptions = React.useMemo(() => {
-        const baseOptions = [];
-        baseOptions.push({ value: useColorLabel, label: useColorLabel });
-        if (bases) {
-            baseOptions.push(...bases.map((bgProvider) => {
-                const value = getSelectKeyFromProvider(bgProvider);
-                const label = MapLayersUI.translate(`WellKnownBaseMaps.${value}`);
-                return { value, label };
-            }));
-        }
-        if (customBaseMap) {
-            baseOptions.push({ value: customBaseMapValue, label: customBaseMap.name });
+    // This effect is only to keep a custom base map option when a 'default' base map is picked.
+    React.useEffect(() => {
+        if (selectedBaseMap instanceof BaseMapLayerSettings
+            && !selectedBaseMap.provider
+            && undefined === baseMapOptions.find((opt) => opt.label === selectedBaseMap.name)) {
+            setCustomBaseMap(selectedBaseMap);
         }
-        return baseOptions;
-    }, [bases, useColorLabel, customBaseMap]);
+    }, [baseMapOptions, selectedBaseMap]);
     const [presetColors] = React.useState([
         ColorDef.create(ColorByName.grey),
         ColorDef.create(ColorByName.lightGrey),
@@ -116,25 +139,40 @@ export function BasemapPanel(props) {
     const baseIsMap = React.useMemo(() => !baseIsColor && (selectedBaseMap !== undefined), [baseIsColor, selectedBaseMap]);
     const bgColor = React.useMemo(() => baseIsColor ? selectedBaseMap.toJSON() : presetColors[0].toJSON(), [baseIsColor, selectedBaseMap, presetColors]);
     const [colorDialogTitle] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:ColorDialog.Title"));
-    const selectedBaseMapValue = React.useMemo(() => {
+    const [selectedBaseMapValue, setSelectedBaseMapValue] = React.useState({ value: "", label: "" });
+    React.useEffect(() => {
         if (baseIsMap) {
             if (selectedBaseMap instanceof BaseMapLayerSettings && selectedBaseMap.provider) {
                 const mapName = getSelectKeyFromProvider(selectedBaseMap);
                 const foundItem = baseMapOptions.find((value) => value.value === mapName);
-                if (foundItem)
-                    return foundItem;
+                if (foundItem) {
+                    setSelectedBaseMapValue(foundItem);
+                    return;
+                }
             }
             else if (selectedBaseMap instanceof BaseMapLayerSettings) {
-                // We got a custom base map, create en entry for it.
-                setCustomBaseMap(selectedBaseMap);
-                return { value: customBaseMapValue, label: selectedBaseMap.name };
+                // We got a custom base map
+                // First check if the name matches a label of existing base map.
+                // If it matches, we assume it's a legacy base map definition missing the provider information.
+                let foundItem = baseMapOptions.find((opt) => opt.value !== customBaseMapValue && opt.label === selectedBaseMap.name);
+                if (foundItem) {
+                    setSelectedBaseMapValue(foundItem);
+                    return;
+                }
+                // Use custom base map entry
+                foundItem = baseMapOptions.find((opt) => opt.value === customBaseMapValue);
+                if (foundItem) {
+                    setSelectedBaseMapValue(foundItem);
+                    return;
+                }
             }
         }
         else if (baseIsColor) {
-            return baseMapOptions[0];
+            setSelectedBaseMapValue(baseMapOptions[0]);
+            return;
         }
-        return { value: "", label: "" }; // will display the place holder
-    }, [baseIsMap, baseIsColor, selectedBaseMap, baseMapOptions]);
+        setSelectedBaseMapValue({ value: "", label: "" });
+    }, [baseIsColor, baseIsMap, baseMapOptions, selectedBaseMap]);
     const handleBackgroundColorDialogOk = React.useCallback((bgColorDef) => {
         UiFramework.dialogs.modal.close();
         if (activeViewport) {
@@ -154,7 +192,6 @@ export function BasemapPanel(props) {
     const handleBaseMapSelection = React.useCallback((value) => {
         if (activeViewport && value) {
             if (value === customBaseMapValue && customBaseMap) {
-                setSelectedBaseMap(customBaseMap);
                 activeViewport.displayStyle.backgroundMapBase = customBaseMap;
             }
             else if (bases) {
@@ -167,17 +204,15 @@ export function BasemapPanel(props) {
                     else {
                         activeViewport.displayStyle.backgroundMapBase = BaseMapLayerSettings.fromJSON({ ...baseProps, visible: baseMapVisible });
                     }
-                    setSelectedBaseMap(baseMap);
                 }
                 else {
                     const bgColorDef = ColorDef.fromJSON(bgColor);
                     const curTransparency = activeViewport.displayStyle.backgroundMapBase instanceof ColorDef ? activeViewport.displayStyle.backgroundMapBase.getTransparency() : 0;
                     activeViewport.displayStyle.backgroundMapBase = bgColorDef.withTransparency(curTransparency);
-                    setSelectedBaseMap(bgColorDef);
                 }
             }
         }
-    }, [activeViewport, bases, customBaseMap, baseMapVisible, bgColor]);
+    }, [activeViewport, customBaseMap, bases, baseMapVisible, bgColor]);
     const handleVisibilityChange = React.useCallback(() => {
         if (activeViewport) {
             const newState = !baseMapVisible;

package/lib/esm/ui/widget/BasemapPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BasemapPanel.js","sourceRoot":"","sources":["../../../../src/ui/widget/BasemapPanel.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/* eslint-disable deprecation/deprecation */\n// cSpell:ignore droppable Sublayer Basemap\n\nimport { UiFramework } from \"@itwin/appui-react\";\nimport { BackgroundMapType, BaseLayerSettings, BaseMapLayerSettings, ColorByName, ColorDef, ImageMapLayerSettings, MapImagerySettings, MapLayerProps } from \"@itwin/core-common\";\nimport { WebFontIcon } from \"@itwin/core-react\";\nimport { ColorPickerDialog, ColorSwatch } from \"@itwin/imodel-components-react\";\nimport { Button, Select, SelectOption } from \"@itwin/itwinui-react\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { useSourceMapContext } from \"./MapLayerManager\";\nimport { TransparencyPopupButton } from \"./TransparencyPopupButton\";\nimport * as React from \"react\";\nimport \"./BasemapPanel.scss\";\nimport { Viewport } from \"@itwin/core-frontend\";\n\nconst customBaseMapValue = \"customBaseMap\";\nconst getSelectKeyFromProvider = (base: BaseMapLayerSettings) => `${base.provider ? `${base.provider.name}.${BackgroundMapType[base.provider.type]}` : `${base.name}`}`;\n\ninterface BasemapPanelProps {\n  disabled?: boolean;\n}\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function BasemapPanel(props: BasemapPanelProps) {\n  const [useColorLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.ColorFill\"));\n  const { activeViewport, bases } = useSourceMapContext();\n  const [selectedBaseMap, setSelectedBaseMap] = React.useState<BaseLayerSettings | undefined>(activeViewport?.displayStyle.settings.mapImagery.backgroundBase);\n  const [baseMapTransparencyValue, setBaseMapTransparencyValue] = React.useState(() => {\n    if (activeViewport) {\n      const mapImagery = activeViewport.displayStyle.settings.mapImagery;\n      if (mapImagery.backgroundBase instanceof ImageMapLayerSettings) {\n        return mapImagery.backgroundBase.transparency;\n      } else if (mapImagery.backgroundBase instanceof ColorDef ) {\n        return mapImagery.backgroundBase.getAlpha()/255;\n      } else {\n        return 0;\n      }\n    } else {\n      return 0;\n    }\n  });\n  const [customBaseMap, setCustomBaseMap] = React.useState<BaseMapLayerSettings|undefined>();\n  const [baseMapVisible, setBaseMapVisible] = React.useState(() => {\n    if (activeViewport && activeViewport.displayStyle.backgroundMapBase instanceof ImageMapLayerSettings) {\n      return activeViewport.displayStyle.backgroundMapBase.visible;\n    }\n    return false;\n  });\n\n  const handleMapImageryChanged = React.useCallback((args: Readonly<MapImagerySettings>) => {\n    const baseMap = args.backgroundBase;\n\n    // Optimization:  If serialized 'backgroundBase' objects are identical, skip refresh\n    if (JSON.stringify(baseMap.toJSON()) === JSON.stringify(selectedBaseMap?.toJSON()))\n      return;\n\n    setSelectedBaseMap(baseMap);  // cache current base map objects\n\n    if (baseMap instanceof ImageMapLayerSettings) {\n      if (baseMap.transparency !== baseMapTransparencyValue)\n        setBaseMapTransparencyValue(baseMap.transparency);\n\n      if (baseMap.visible !== baseMapVisible)\n        setBaseMapVisible(baseMap.visible);\n\n    } else if (baseMap instanceof ColorDef) {\n      if (baseMap.getAlpha() !== baseMapTransparencyValue ) {\n        setBaseMapTransparencyValue(baseMap.getAlpha()/255);\n      }\n    }\n  }, [baseMapTransparencyValue, baseMapVisible, selectedBaseMap]);\n\n  React.useEffect(() => {\n    const handleDisplayStyleChange = (vp: Viewport) => {\n      handleMapImageryChanged(vp.displayStyle.settings.mapImagery);\n    };\n    return activeViewport?.onDisplayStyleChanged.addListener(handleDisplayStyleChange);\n  }, [activeViewport, handleMapImageryChanged]);\n\n  // Monitor display style's onMapImageryChanged event\n  React.useEffect(() => {\n    return activeViewport?.displayStyle.settings.onMapImageryChanged.addListener(handleMapImageryChanged);\n  }, [activeViewport, handleMapImageryChanged]);\n\n  // Monitor viewport updates, and refresh the widget accordingly .\n  // Note: This is needed for multiple viewport applications.\n  React.useEffect(() => {\n    if (activeViewport) {\n      handleMapImageryChanged(activeViewport.displayStyle.settings.mapImagery);\n    }\n  }, [activeViewport, handleMapImageryChanged]);\n\n  const handleBasemapTransparencyChange = React.useCallback((transparency: number) => {\n    if (activeViewport) {\n      activeViewport.displayStyle.changeBaseMapTransparency(transparency);\n      setBaseMapTransparencyValue(transparency);\n    }\n  }, [activeViewport]);\n\n  const baseMapOptions = React.useMemo<SelectOption<string>[]>(() => {\n    const baseOptions: SelectOption<string>[] = [];\n\n    baseOptions.push({ value: useColorLabel, label: useColorLabel });\n\n    if (bases) {\n      baseOptions.push(...bases.map((bgProvider) => {\n        const value = getSelectKeyFromProvider(bgProvider);\n        const label = MapLayersUI.translate(`WellKnownBaseMaps.${value}`);\n        return { value, label };\n      } ));\n    }\n    if (customBaseMap) {\n      baseOptions.push({value: customBaseMapValue, label: customBaseMap.name});\n    }\n    return baseOptions;\n  }, [bases, useColorLabel, customBaseMap]);\n\n  const [presetColors] = React.useState([\n    ColorDef.create(ColorByName.grey),\n    ColorDef.create(ColorByName.lightGrey),\n    ColorDef.create(ColorByName.darkGrey),\n    ColorDef.create(ColorByName.lightBlue),\n    ColorDef.create(ColorByName.lightGreen),\n    ColorDef.create(ColorByName.darkGreen),\n    ColorDef.create(ColorByName.tan),\n    ColorDef.create(ColorByName.darkBrown),\n  ]);\n\n  const baseIsColor = React.useMemo(() => selectedBaseMap instanceof ColorDef, [selectedBaseMap]);\n  const baseIsMap = React.useMemo(() => !baseIsColor && (selectedBaseMap !== undefined), [baseIsColor, selectedBaseMap]);\n  const bgColor = React.useMemo(() => baseIsColor ? (selectedBaseMap as ColorDef).toJSON(): presetColors[0].toJSON(),\n    [baseIsColor, selectedBaseMap, presetColors]);\n  const [colorDialogTitle] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:ColorDialog.Title\"));\n  const selectedBaseMapValue = React.useMemo(() => {\n    if (baseIsMap) {\n      if (selectedBaseMap instanceof BaseMapLayerSettings && selectedBaseMap.provider) {\n        const mapName = getSelectKeyFromProvider(selectedBaseMap);\n        const foundItem = baseMapOptions.find((value) => value.value === mapName);\n        if (foundItem)\n          return foundItem;\n      } else if (selectedBaseMap instanceof BaseMapLayerSettings) {\n        // We got a custom base map, create en entry for it.\n        setCustomBaseMap(selectedBaseMap);\n        return {value: customBaseMapValue, label: selectedBaseMap.name};\n      }\n    } else if (baseIsColor) {\n      return baseMapOptions[0];\n    }\n    return {value: \"\", label: \"\"};     // will display the place holder\n\n  }, [baseIsMap, baseIsColor, selectedBaseMap, baseMapOptions]);\n\n  const handleBackgroundColorDialogOk = React.useCallback((bgColorDef: ColorDef) => {\n    UiFramework.dialogs.modal.close();\n    if (activeViewport) {\n      // change color and make sure previously set transparency is not lost.\n      const curTransparency = activeViewport.displayStyle.backgroundMapBase instanceof ColorDef ? activeViewport.displayStyle.backgroundMapBase.getTransparency() : 0;\n      activeViewport.displayStyle.backgroundMapBase = bgColorDef.withTransparency(curTransparency);\n      setSelectedBaseMap(bgColorDef);\n    }\n  }, [activeViewport]);\n\n  const handleBackgroundColorDialogCancel = React.useCallback(() => {\n    UiFramework.dialogs.modal.close();\n  }, []);\n\n  const handleBgColorClick = React.useCallback((newColor: ColorDef, e: React.MouseEvent<Element, MouseEvent>) => {\n    e.preventDefault();\n    UiFramework.dialogs.modal.open(<ColorPickerDialog dialogTitle={colorDialogTitle} color={newColor} colorPresets={presetColors} colorInputType={\"rgb\"}\n      onOkResult={handleBackgroundColorDialogOk} onCancelResult={handleBackgroundColorDialogCancel} />);\n  }, [presetColors, handleBackgroundColorDialogOk]); // eslint-disable-line react-hooks/exhaustive-deps\n\n  const handleBaseMapSelection = React.useCallback((value: string) => {\n    if (activeViewport && value) {\n      if (value === customBaseMapValue && customBaseMap) {\n        setSelectedBaseMap(customBaseMap);\n        activeViewport.displayStyle.backgroundMapBase = customBaseMap;\n      } else if (bases) {\n        const baseMap = bases.find((provider) => getSelectKeyFromProvider(provider) === value);\n        if (baseMap) {\n          const baseProps: MapLayerProps = baseMap.toJSON();\n          if (activeViewport.displayStyle.backgroundMapBase instanceof BaseMapLayerSettings) {\n            activeViewport.displayStyle.backgroundMapBase = activeViewport.displayStyle.backgroundMapBase.clone({...baseProps, visible: baseMapVisible});\n          } else {\n            activeViewport.displayStyle.backgroundMapBase = BaseMapLayerSettings.fromJSON({...baseProps, visible: baseMapVisible});\n          }\n          setSelectedBaseMap(baseMap);\n        } else {\n          const bgColorDef = ColorDef.fromJSON(bgColor);\n          const curTransparency = activeViewport.displayStyle.backgroundMapBase instanceof ColorDef ? activeViewport.displayStyle.backgroundMapBase.getTransparency() : 0;\n          activeViewport.displayStyle.backgroundMapBase = bgColorDef.withTransparency(curTransparency);\n          setSelectedBaseMap(bgColorDef);\n        }\n      }\n    }\n  }, [activeViewport, bases, customBaseMap, baseMapVisible, bgColor]);\n\n  const handleVisibilityChange = React.useCallback(() => {\n    if (activeViewport) {\n      const newState = !baseMapVisible;\n      // BaseMap visibility is only support when backgroundBase is an instance of BaseMapLayerSettings (i.e not a color)...\n      if (activeViewport.displayStyle.backgroundMapBase instanceof BaseMapLayerSettings) {\n        activeViewport.displayStyle.backgroundMapBase = activeViewport.displayStyle.backgroundMapBase.clone({ visible: newState });\n      }\n      setBaseMapVisible(newState);\n    }\n  }, [baseMapVisible, activeViewport]);\n\n  const [baseLayerLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.BaseLayer\"));\n  const [selectBaseMapLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.SelectBaseMap\"));\n  const [toggleVisibility] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.ToggleVisibility\"));\n\n  return (\n    <>\n      <span className=\"map-manager-base-label\">{baseLayerLabel}</span>\n      <div className=\"map-manager-base-item\" >\n        <Button className=\"map-manager-basemap-visibility map-manager-visibility-icon\" size=\"small\" styleType=\"borderless\" title={toggleVisibility} onClick={handleVisibilityChange} disabled={props.disabled || !activeViewport || !(activeViewport.displayStyle.backgroundMapBase instanceof ImageMapLayerSettings)}>\n          <WebFontIcon iconName={baseMapVisible ? \"icon-visibility\" : \"icon-visibility-hide-2\"} />\n        </Button>\n        <Select className=\"map-manager-base-item-select\"\n          options={baseMapOptions}\n          placeholder={selectBaseMapLabel}\n          value={selectedBaseMapValue.value}\n          onChange={handleBaseMapSelection} size=\"small\"\n          disabled={props.disabled}\n        />\n        {\n          baseIsColor &&\n          <ColorSwatch className=\"map-manager-base-item-color\" colorDef={ColorDef.fromJSON(bgColor)} round={false} onColorPick={handleBgColorClick} />\n        }\n        <TransparencyPopupButton disabled={props.disabled} transparency={baseMapTransparencyValue} onTransparencyChange={handleBasemapTransparencyChange} />\n      </div>\n    </>\n  );\n}\n"]}
+{"version":3,"file":"BasemapPanel.js","sourceRoot":"","sources":["../../../../src/ui/widget/BasemapPanel.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/* eslint-disable deprecation/deprecation */\n// cSpell:ignore droppable Sublayer Basemap\n\nimport \"./BasemapPanel.scss\";\nimport * as React from \"react\";\nimport { UiFramework } from \"@itwin/appui-react\";\nimport {\n  BackgroundMapType, BaseLayerSettings, BaseMapLayerSettings, ColorByName, ColorDef, ImageMapLayerSettings, MapImagerySettings, MapLayerProps,\n} from \"@itwin/core-common\";\nimport { Viewport } from \"@itwin/core-frontend\";\nimport { WebFontIcon } from \"@itwin/core-react\";\nimport { ColorPickerDialog, ColorSwatch } from \"@itwin/imodel-components-react\";\nimport { Button, Select, SelectOption } from \"@itwin/itwinui-react\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { useSourceMapContext } from \"./MapLayerManager\";\nimport { TransparencyPopupButton } from \"./TransparencyPopupButton\";\n\nconst customBaseMapValue = \"customBaseMap\";\nconst getSelectKeyFromProvider = (base: BaseMapLayerSettings) => `${base.provider ? `${base.provider.name}.${BackgroundMapType[base.provider.type]}` : `${base.name}`}`;\n\ninterface BasemapPanelProps {\n  disabled?: boolean;\n}\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function BasemapPanel(props: BasemapPanelProps) {\n  const [useColorLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.ColorFill\"));\n  const { activeViewport, bases } = useSourceMapContext();\n  const [selectedBaseMap, setSelectedBaseMap] = React.useState<BaseLayerSettings | undefined>(()=> {\n    return activeViewport?.displayStyle.settings.mapImagery.backgroundBase;\n  });\n  const [baseMapTransparencyValue, setBaseMapTransparencyValue] = React.useState(() => {\n    if (activeViewport) {\n      const mapImagery = activeViewport.displayStyle.settings.mapImagery;\n      if (mapImagery.backgroundBase instanceof ImageMapLayerSettings) {\n        return mapImagery.backgroundBase.transparency;\n      } else if (mapImagery.backgroundBase instanceof ColorDef ) {\n        return mapImagery.backgroundBase.getAlpha()/255;\n      } else {\n        return 0;\n      }\n    } else {\n      return 0;\n    }\n  });\n  const [customBaseMap, setCustomBaseMap] = React.useState<BaseMapLayerSettings|undefined>();\n  const [baseMapVisible, setBaseMapVisible] = React.useState(() => {\n    if (activeViewport && activeViewport.displayStyle.backgroundMapBase instanceof ImageMapLayerSettings) {\n      return activeViewport.displayStyle.backgroundMapBase.visible;\n    }\n    return false;\n  });\n\n  const getBaseMapOptions = React.useCallback((baseMap: BaseLayerSettings|undefined) => {\n    const baseOptions: SelectOption<string>[] = [];\n\n    baseOptions.push({ value: useColorLabel, label: useColorLabel });\n\n    if (bases) {\n      baseOptions.push(...bases.map((bgProvider) => {\n        const value = getSelectKeyFromProvider(bgProvider);\n        const label = MapLayersUI.translate(`WellKnownBaseMaps.${value}`);\n        return { value, label };\n      } ));\n    }\n\n    // Add new custom base map definition (avoid adding duplicate entry)\n    if (baseMap instanceof BaseMapLayerSettings && !baseMap.provider) {\n      // Add new option only if not created duplicate (Support of base map definition without provider)\n      if (undefined === baseOptions.find((opt)=>opt.label === baseMap.name)) {\n        baseOptions.push({value: customBaseMapValue, label: baseMap.name});\n      }\n    } else if (customBaseMap) {\n      // Add previously defined custom map definition\n      baseOptions.push({value: customBaseMapValue, label: customBaseMap.name});\n    }\n    return  baseOptions;\n\n  }, [bases, customBaseMap, useColorLabel]);\n\n  const [baseMapOptions, setBaseMapOptions] = React.useState<SelectOption<string>[]>(()=>getBaseMapOptions(selectedBaseMap));\n\n  const updateBaseMapOptions = React.useCallback((baseMap: BaseLayerSettings|undefined) => {\n    setBaseMapOptions(getBaseMapOptions(baseMap));\n  }, [getBaseMapOptions]);\n\n  const handleMapImageryChanged = React.useCallback((args: Readonly<MapImagerySettings>) => {\n\n    const baseMap = args.backgroundBase;\n\n    // Optimization:  If serialized 'backgroundBase' objects are identical, skip refresh\n    if (JSON.stringify(baseMap.toJSON()) === JSON.stringify(selectedBaseMap?.toJSON()))\n      return;\n\n    setSelectedBaseMap(baseMap);  // cache current base map objects\n    updateBaseMapOptions(baseMap);\n\n    if (baseMap instanceof ImageMapLayerSettings) {\n      if (baseMap.transparency !== baseMapTransparencyValue)\n        setBaseMapTransparencyValue(baseMap.transparency);\n\n      if (baseMap.visible !== baseMapVisible)\n        setBaseMapVisible(baseMap.visible);\n\n    } else if (baseMap instanceof ColorDef) {\n      if (baseMap.getAlpha() !== baseMapTransparencyValue ) {\n        setBaseMapTransparencyValue(baseMap.getAlpha()/255);\n      }\n    }\n  }, [baseMapTransparencyValue, baseMapVisible, selectedBaseMap, updateBaseMapOptions]);\n\n  React.useEffect(() => {\n    const handleDisplayStyleChange = (vp: Viewport) => {\n      handleMapImageryChanged(vp.displayStyle.settings.mapImagery);\n    };\n    return activeViewport?.onDisplayStyleChanged.addListener(handleDisplayStyleChange);\n  }, [activeViewport, handleMapImageryChanged]);\n\n  // Monitor display style's onMapImageryChanged event\n  React.useEffect(() => {\n    return activeViewport?.displayStyle.settings.onMapImageryChanged.addListener(handleMapImageryChanged);\n  }, [activeViewport, handleMapImageryChanged]);\n\n  // Monitor viewport updates, and refresh the widget accordingly .\n  // Note: This is needed for multiple viewport applications.\n  React.useEffect(() => {\n    if (activeViewport) {\n      handleMapImageryChanged(activeViewport.displayStyle.settings.mapImagery);\n    }\n  }, [activeViewport, handleMapImageryChanged]);\n\n  const handleBasemapTransparencyChange = React.useCallback((transparency: number) => {\n    if (activeViewport) {\n      activeViewport.displayStyle.changeBaseMapTransparency(transparency);\n      setBaseMapTransparencyValue(transparency);\n    }\n  }, [activeViewport]);\n\n  // This effect is only to keep a custom base map option when a 'default' base map is picked.\n  React.useEffect(() => {\n    if (selectedBaseMap instanceof BaseMapLayerSettings\n       && !selectedBaseMap.provider\n       && undefined === baseMapOptions.find((opt)=>opt.label === selectedBaseMap.name)) {\n      setCustomBaseMap(selectedBaseMap);\n    }\n  }, [baseMapOptions, selectedBaseMap]);\n\n  const [presetColors] = React.useState([\n    ColorDef.create(ColorByName.grey),\n    ColorDef.create(ColorByName.lightGrey),\n    ColorDef.create(ColorByName.darkGrey),\n    ColorDef.create(ColorByName.lightBlue),\n    ColorDef.create(ColorByName.lightGreen),\n    ColorDef.create(ColorByName.darkGreen),\n    ColorDef.create(ColorByName.tan),\n    ColorDef.create(ColorByName.darkBrown),\n  ]);\n\n  const baseIsColor = React.useMemo(() => selectedBaseMap instanceof ColorDef, [selectedBaseMap]);\n  const baseIsMap = React.useMemo(() => !baseIsColor && (selectedBaseMap !== undefined), [baseIsColor, selectedBaseMap]);\n  const bgColor = React.useMemo(() => baseIsColor ? (selectedBaseMap as ColorDef).toJSON(): presetColors[0].toJSON(),\n    [baseIsColor, selectedBaseMap, presetColors]);\n  const [colorDialogTitle] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:ColorDialog.Title\"));\n  const [selectedBaseMapValue, setSelectedBaseMapValue] = React.useState<SelectOption<string>>({value: \"\", label: \"\"});\n\n  React.useEffect(() => {\n    if (baseIsMap) {\n      if (selectedBaseMap instanceof BaseMapLayerSettings && selectedBaseMap.provider) {\n        const mapName = getSelectKeyFromProvider(selectedBaseMap);\n        const foundItem = baseMapOptions.find((value) => value.value === mapName);\n        if (foundItem) {\n          setSelectedBaseMapValue(foundItem);\n          return;\n        }\n      } else if (selectedBaseMap instanceof BaseMapLayerSettings) {\n        // We got a custom base map\n\n        // First check if the name matches a label of existing base map.\n        // If it matches, we assume it's a legacy base map definition missing the provider information.\n        let foundItem = baseMapOptions.find((opt) => opt.value !== customBaseMapValue && opt.label === selectedBaseMap.name);\n        if (foundItem) {\n          setSelectedBaseMapValue(foundItem);\n          return;\n        }\n\n        // Use custom base map entry\n        foundItem = baseMapOptions.find((opt) => opt.value === customBaseMapValue);\n        if (foundItem) {\n          setSelectedBaseMapValue(foundItem);\n          return;\n        }\n\n      }\n    } else if (baseIsColor) {\n      setSelectedBaseMapValue(baseMapOptions[0]);\n      return;\n    }\n    setSelectedBaseMapValue({value: \"\", label: \"\"});\n  }, [baseIsColor, baseIsMap, baseMapOptions, selectedBaseMap]);\n\n  const handleBackgroundColorDialogOk = React.useCallback((bgColorDef: ColorDef) => {\n    UiFramework.dialogs.modal.close();\n    if (activeViewport) {\n      // change color and make sure previously set transparency is not lost.\n      const curTransparency = activeViewport.displayStyle.backgroundMapBase instanceof ColorDef ? activeViewport.displayStyle.backgroundMapBase.getTransparency() : 0;\n      activeViewport.displayStyle.backgroundMapBase = bgColorDef.withTransparency(curTransparency);\n\n      setSelectedBaseMap(bgColorDef);\n    }\n  }, [activeViewport]);\n\n  const handleBackgroundColorDialogCancel = React.useCallback(() => {\n    UiFramework.dialogs.modal.close();\n  }, []);\n\n  const handleBgColorClick = React.useCallback((newColor: ColorDef, e: React.MouseEvent<Element, MouseEvent>) => {\n    e.preventDefault();\n    UiFramework.dialogs.modal.open(<ColorPickerDialog dialogTitle={colorDialogTitle} color={newColor} colorPresets={presetColors} colorInputType={\"rgb\"}\n      onOkResult={handleBackgroundColorDialogOk} onCancelResult={handleBackgroundColorDialogCancel} />);\n  }, [presetColors, handleBackgroundColorDialogOk]); // eslint-disable-line react-hooks/exhaustive-deps\n\n  const handleBaseMapSelection = React.useCallback((value: string) => {\n    if (activeViewport && value) {\n      if (value === customBaseMapValue && customBaseMap) {\n        activeViewport.displayStyle.backgroundMapBase = customBaseMap;\n      } else if (bases) {\n        const baseMap = bases.find((provider) => getSelectKeyFromProvider(provider) === value);\n        if (baseMap) {\n          const baseProps: MapLayerProps = baseMap.toJSON();\n          if (activeViewport.displayStyle.backgroundMapBase instanceof BaseMapLayerSettings) {\n            activeViewport.displayStyle.backgroundMapBase = activeViewport.displayStyle.backgroundMapBase.clone({...baseProps, visible: baseMapVisible});\n          } else {\n            activeViewport.displayStyle.backgroundMapBase = BaseMapLayerSettings.fromJSON({...baseProps, visible: baseMapVisible});\n          }\n        } else {\n          const bgColorDef = ColorDef.fromJSON(bgColor);\n          const curTransparency = activeViewport.displayStyle.backgroundMapBase instanceof ColorDef ? activeViewport.displayStyle.backgroundMapBase.getTransparency() : 0;\n          activeViewport.displayStyle.backgroundMapBase = bgColorDef.withTransparency(curTransparency);\n        }\n      }\n    }\n  }, [activeViewport, customBaseMap, bases, baseMapVisible, bgColor]);\n\n  const handleVisibilityChange = React.useCallback(() => {\n    if (activeViewport) {\n      const newState = !baseMapVisible;\n      // BaseMap visibility is only support when backgroundBase is an instance of BaseMapLayerSettings (i.e not a color)...\n      if (activeViewport.displayStyle.backgroundMapBase instanceof BaseMapLayerSettings) {\n        activeViewport.displayStyle.backgroundMapBase = activeViewport.displayStyle.backgroundMapBase.clone({ visible: newState });\n      }\n      setBaseMapVisible(newState);\n    }\n  }, [baseMapVisible, activeViewport]);\n\n  const [baseLayerLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.BaseLayer\"));\n  const [selectBaseMapLabel] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Basemap.SelectBaseMap\"));\n  const [toggleVisibility] = React.useState(MapLayersUI.localization.getLocalizedString(\"mapLayers:Widget.ToggleVisibility\"));\n\n  return (\n    <>\n      <span className=\"map-manager-base-label\">{baseLayerLabel}</span>\n      <div className=\"map-manager-base-item\" >\n        <Button className=\"map-manager-basemap-visibility map-manager-visibility-icon\" size=\"small\" styleType=\"borderless\" title={toggleVisibility} onClick={handleVisibilityChange} disabled={props.disabled || !activeViewport || !(activeViewport.displayStyle.backgroundMapBase instanceof ImageMapLayerSettings)}>\n          <WebFontIcon iconName={baseMapVisible ? \"icon-visibility\" : \"icon-visibility-hide-2\"} />\n        </Button>\n        <Select className=\"map-manager-base-item-select\"\n          options={baseMapOptions}\n          placeholder={selectBaseMapLabel}\n          value={selectedBaseMapValue.value}\n          onChange={handleBaseMapSelection} size=\"small\"\n          disabled={props.disabled}\n        />\n        {\n          baseIsColor &&\n          <ColorSwatch className=\"map-manager-base-item-color\" colorDef={ColorDef.fromJSON(bgColor)} round={false} onColorPick={handleBgColorClick} />\n        }\n        <TransparencyPopupButton disabled={props.disabled} transparency={baseMapTransparencyValue} onTransparencyChange={handleBasemapTransparencyChange} />\n      </div>\n    </>\n  );\n}\n"]}

package/lib/esm/ui/widget/ConfirmMessageDialog.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CommonProps } from "@itwin/core-react";
 import "./MapUrlDialog.scss";
 interface ConfirmMessageDialogProps extends CommonProps {

package/lib/esm/ui/widget/ConfirmMessageDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfirmMessageDialog.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/ConfirmMessageDialog.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAU,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,CAAC;AAG7B,UAAU,yBAA0B,SAAQ,WAAW;IAErD,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,yJAAyJ;IACzJ,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,yIAAyI;IACzI,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,0IAA0I;IAC1I,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAGD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eA2BpE"}
+{"version":3,"file":"ConfirmMessageDialog.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/ConfirmMessageDialog.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAU,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,CAAC;AAG7B,UAAU,yBAA0B,SAAQ,WAAW;IAErD,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,yJAAyJ;IACzJ,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,yIAAyI;IACzI,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,0IAA0I;IAC1I,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B;AAGD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eA2BpE"}

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

@@ -12,6 +12,8 @@ export declare class FeatureInfoDataProvider implements IPropertyDataProvider {
     constructor();
     private handleActiveToolChanged;
     private handleOnInfoReadyChanged;
+    private generateLayerCategoryName;
+    private generateSubLayerCategoryName;
     onUnload(): void;
     get hasRecords(): boolean;
     private setInfo;

package/lib/esm/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,EAAqD,sBAAsB,EAAuB,MAAM,sBAAsB,CAAC;AAetI;;GAEG;AACH,qBAAa,uBAAwB,YAAW,qBAAqB;IACnE,OAAO,CAAC,yBAAyB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAe;IAEjD,aAAa,0BAAiC;IACrD,OAAO,CAAC,KAAK,CAA4B;;IAMzC,OAAO,CAAC,uBAAuB,CAa7B;IAEF,OAAO,CAAC,wBAAwB,CAG9B;IAEK,QAAQ;IAQf,IAAW,UAAU,YAEpB;YAEa,OAAO;IAmCd,mBAAmB,CAAC,YAAY,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB;IAYzF,cAAc,CAAC,YAAY,EAAE,MAAM;IAInC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM;IAO/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;;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"}

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

@@ -1,13 +1,13 @@
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 import { PropertyRecord } from "@itwin/appui-abstract";
 import { PropertyDataChangeEvent } from "@itwin/components-react";
 import { IModelApp, MapLayerFeatureRecord } from "@itwin/core-frontend";
 import { MapFeatureInfoTool } from "@itwin/map-layers-formats";
 /**
- * Implementation of [IPropertyDataProvider] that uses an associative array.
+ * Implementation of [IPropertyDataProvider] that uses an associative  array.
  * @internal
  */
 class SimplePropertyData {
@@ -39,7 +39,13 @@ export class FeatureInfoDataProvider {
         this.handleOnInfoReadyChanged = (data) => {
             void this.setInfo(data.mapInfo).then(); // No need to wait for data parsing.
         };
-        this._detachToolAdminListener = (IModelApp.toolAdmin.activeToolChanged.addListener(this.handleActiveToolChanged));
+        this._detachToolAdminListener = IModelApp.toolAdmin.activeToolChanged.addListener(this.handleActiveToolChanged);
+    }
+    generateLayerCategoryName(subLayerName) {
+        return `_layer_${subLayerName}`;
+    }
+    generateSubLayerCategoryName(subLayerName) {
+        return `_subLayer_${subLayerName}`;
     }
     onUnload() {
         this._detachToolAdminListener();
@@ -55,11 +61,10 @@ export class FeatureInfoDataProvider {
         this._data = new SimplePropertyData();
         if (mapInfo?.layerInfos) {
             for (const curLayerInfo of mapInfo.layerInfos) {
-                const layerCatIdx = this.findCategoryIndexByName(curLayerInfo.layerName);
+                const categoryName = this.generateLayerCategoryName(curLayerInfo.layerName);
+                const layerCatIdx = this.findCategoryIndexByName(categoryName);
                 let nbRecords = 0;
-                const layerCategory = (layerCatIdx === -1 ?
-                    { name: curLayerInfo.layerName, label: curLayerInfo.layerName, expand: true, childCategories: [] }
-                    : this._data.categories[layerCatIdx]);
+                const layerCategory = layerCatIdx === -1 ? { name: categoryName, label: curLayerInfo.layerName, expand: true, childCategories: [] } : this._data.categories[layerCatIdx];
                 if (curLayerInfo.subLayerInfos) {
                     for (const subLayerInfo of curLayerInfo.subLayerInfos) {
                         this.addSubLayerCategory(subLayerInfo, layerCategory);
@@ -68,7 +73,7 @@ export class FeatureInfoDataProvider {
                             nbRecords++;
                             for (const attribute of feature.attributes) {
                                 // Always use the string value for now
-                                this.addProperty(MapLayerFeatureRecord.createRecordFromAttribute(attribute), subLayerInfo.subLayerName);
+                                this.addProperty(MapLayerFeatureRecord.createRecordFromAttribute(attribute), this.generateSubLayerCategoryName(subLayerInfo.subLayerName));
                             }
                         }
                     }
@@ -80,13 +85,14 @@ export class FeatureInfoDataProvider {
         this.onDataChanged.raiseEvent();
     }
     addSubLayerCategory(subLayerInfo, layerCategory) {
+        const subLayerName = this.generateSubLayerCategoryName(subLayerInfo.subLayerName);
         const subCatIdx = layerCategory.childCategories?.findIndex((testCategory) => {
-            return testCategory.name === subLayerInfo.subLayerName;
+            return testCategory.name === subLayerName;
         });
         let subLayerCategory;
         if (subCatIdx === -1) {
-            subLayerCategory = { name: subLayerInfo.subLayerName, label: subLayerInfo.subLayerName, expand: true };
-            this.addSubCategory(subLayerCategory.name);
+            subLayerCategory = { name: subLayerName, label: subLayerInfo.subLayerName, expand: true };
+            this.addSubCategory(subLayerName);
             layerCategory.childCategories?.push(subLayerCategory);
         }
     }

package/lib/esm/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\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\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 layerCatIdx = this.findCategoryIndexByName(curLayerInfo.layerName);\n        let nbRecords = 0;\n\n        const layerCategory = (\n          layerCatIdx === -1 ?\n            { name: curLayerInfo.layerName, label: curLayerInfo.layerName, expand: true, childCategories: [] }\n            : 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), subLayerInfo.subLayerName);\n              }\n            }\n          }\n          if (layerCatIdx === -1 && nbRecords > 0)\n            this.addCategory(layerCategory);\n        }\n      }\n    }\n\n    this.onDataChanged.raiseEvent();\n  }\n\n  public addSubLayerCategory(subLayerInfo: MapSubLayerFeatureInfo, layerCategory: PropertyCategory) {\n    const subCatIdx = layerCategory.childCategories?.findIndex((testCategory: PropertyCategory) => {\n      return testCategory.name === subLayerInfo.subLayerName;\n    });\n\n    let subLayerCategory;\n    if (subCatIdx === -1) {\n      subLayerCategory = { name: subLayerInfo.subLayerName, label: subLayerInfo.subLayerName, expand: true };\n      this.addSubCategory(subLayerCategory.name);\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\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":"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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"]}

package/lib/esm/ui/widget/FeatureInfoWidget.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { MapFeatureInfoOptions } from "../Interfaces";
 export declare function useSpecificWidgetDef(id: string): import("@itwin/appui-react").WidgetDef | undefined;
 interface MapFeatureInfoWidgetProps {

package/lib/esm/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;AAKtD,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,eA4DlF"}
+{"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"}

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

@@ -1,14 +1,14 @@
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 import * as React from "react";
+import { useActiveFrontstageDef, WidgetState } from "@itwin/appui-react";
 import { VirtualizedPropertyGridWithDataProvider } from "@itwin/components-react";
 import { FillCentered, Orientation, ResizableContainerObserver } from "@itwin/core-react";
-import { FeatureInfoDataProvider } from "./FeatureInfoDataProvider";
 import { MapLayersUI } from "../../mapLayers";
-import { useActiveFrontstageDef, WidgetState } from "@itwin/appui-react";
 import { FeatureInfoUiItemsProvider } from "../FeatureInfoUiItemsProvider";
+import { FeatureInfoDataProvider } from "./FeatureInfoDataProvider";
 export function useSpecificWidgetDef(id) {
     const frontstageDef = useActiveFrontstageDef();
     return frontstageDef?.findWidgetDef(id);
@@ -19,44 +19,37 @@ export function MapFeatureInfoWidget({ featureInfoOpts }) {
     const [hasData, setHasData] = React.useState(false);
     const [noRecordsMessage] = React.useState(MapLayersUI.localization.getLocalizedString("mapLayers:FeatureInfoWidget.NoRecords"));
     const [{ width, height }, setSize] = React.useState({ width: 0, height: 0 });
-    const handleDataChanged = () => {
-        setHasData(dataProvider.current !== undefined && dataProvider.current.hasRecords);
-    };
+    const widgetDef = useSpecificWidgetDef(FeatureInfoUiItemsProvider.widgetId);
+    const handleDataChanged = React.useCallback(() => {
+        const dataAvailable = dataProvider.current !== undefined && dataProvider.current.hasRecords;
+        setHasData(dataAvailable);
+        if (widgetDef) {
+            widgetDef.setWidgetState(dataAvailable ? WidgetState.Open : WidgetState.Hidden);
+        }
+    }, [widgetDef]);
     React.useEffect(() => {
         dataProvider.current = new FeatureInfoDataProvider();
         return () => {
             dataProvider?.current?.onUnload();
         };
     }, []);
-    const widgetDef = useSpecificWidgetDef(FeatureInfoUiItemsProvider.widgetId);
-    React.useEffect(() => {
-        if (hasData) {
-            widgetDef?.setWidgetState(WidgetState.Open);
-        }
-        else {
-            widgetDef?.setWidgetState(WidgetState.Hidden);
-        }
-    }, [widgetDef, hasData]);
     React.useEffect(() => {
         dataProvider.current?.onDataChanged.addListener(handleDataChanged);
         return () => {
             dataProvider.current?.onDataChanged.removeListener(handleDataChanged);
         };
-    }, []);
+    }, [handleDataChanged]);
     const handleResize = React.useCallback((w, h) => {
         setSize({ width: w, height: h });
     }, []);
-    if (!hasData) {
+    if (hasData && dataProvider.current) {
+        return (React.createElement(ResizableContainerObserver, { onResize: handleResize },
+            React.createElement(VirtualizedPropertyGridWithDataProvider, { width: width, height: height, dataProvider: dataProvider.current, orientation: Orientation.Vertical, isPropertySelectionEnabled: featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled })));
+    }
+    else {
         return (React.createElement(FillCentered, null,
             React.createElement("span", null,
                 React.createElement("i", null, noRecordsMessage))));
     }
-    else {
-        if (dataProvider.current)
-            return (React.createElement(ResizableContainerObserver, { onResize: handleResize },
-                React.createElement(VirtualizedPropertyGridWithDataProvider, { width: width, height: height, dataProvider: dataProvider.current, orientation: Orientation.Vertical, isPropertySelectionEnabled: featureInfoOpts?.propertyGridOptions?.isPropertySelectionEnabled })));
-        else
-            return (React.createElement(React.Fragment, null));
-    }
 }
 //# sourceMappingURL=FeatureInfoWidget.js.map

package/lib/esm/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\";\n\nimport { VirtualizedPropertyGridWithDataProvider } from \"@itwin/components-react\";\nimport { FillCentered, Orientation, ResizableContainerObserver } from \"@itwin/core-react\";\n\nimport { FeatureInfoDataProvider} from \"./FeatureInfoDataProvider\";\nimport { MapFeatureInfoOptions } from \"../Interfaces\";\nimport { MapLayersUI } from \"../../mapLayers\";\nimport { useActiveFrontstageDef, WidgetState } from \"@itwin/appui-react\";\nimport { FeatureInfoUiItemsProvider } from \"../FeatureInfoUiItemsProvider\";\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 handleDataChanged = () => {\n    setHasData(dataProvider.current !== undefined && dataProvider.current.hasRecords);\n  };\n\n  React.useEffect(() => {\n    dataProvider.current = new FeatureInfoDataProvider();\n    return () => {\n      dataProvider?.current?.onUnload();\n    };\n  }, []);\n\n  const widgetDef = useSpecificWidgetDef(FeatureInfoUiItemsProvider.widgetId);\n\n  React.useEffect(() => {\n    if (hasData) {\n      widgetDef?.setWidgetState(WidgetState.Open);\n    } else {\n      widgetDef?.setWidgetState(WidgetState.Hidden);\n    }\n  }, [widgetDef, hasData]);\n\n  React.useEffect(() => {\n\n    dataProvider.current?.onDataChanged.addListener(handleDataChanged);\n    return () => {\n      dataProvider.current?.onDataChanged.removeListener(handleDataChanged);\n    };\n\n  }, []);\n\n  const handleResize = React.useCallback((w: number, h: number) => {\n    setSize({ width: w, height: h });\n  }, []);\n\n  if (!hasData) {\n    return (<FillCentered><span><i>{noRecordsMessage}</i></span></FillCentered>);\n  } else {\n    if (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        </ResizableContainerObserver>\n      );\n    else\n      return (<></>);\n  }\n}\n"]}
+{"version":3,"file":"FeatureInfoWidget.js","sourceRoot":"","sources":["../../../../src/ui/widget/FeatureInfoWidget.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,uCAAuC,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,UAAU,oBAAoB,CAAC,EAAU;IAC7C,MAAM,aAAa,GAAG,sBAAsB,EAAE,CAAC;IAC/C,OAAO,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC;AAOD,gEAAgE;AAChE,MAAM,UAAU,oBAAoB,CAAC,EAAE,eAAe,EAA6B;IAEjF,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,EAA2B,CAAC;IAC7D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAE7D,MAAM,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,uCAAuC,CAAC,CAAC,CAAC;IAEhI,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAE7E,MAAM,SAAS,GAAG,oBAAoB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC/C,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5F,UAAU,CAAC,aAAa,CAAC,CAAC;QAC1B,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACjF;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,YAAY,CAAC,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACrD,OAAO,GAAG,EAAE;YACV,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACpC,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACnE,OAAO,GAAG,EAAE;YACV,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACxE,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAC9D,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,OAAO,IAAI,YAAY,CAAC,OAAO,EAAE;QACnC,OAAO,CACL,oBAAC,0BAA0B,IAAC,QAAQ,EAAE,YAAY;YAChD,oBAAC,uCAAuC,IACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,CAAC,OAAO,EAClC,WAAW,EAAE,WAAW,CAAC,QAAQ,EACjC,0BAA0B,EAAE,eAAe,EAAE,mBAAmB,EAAE,0BAA0B,GAC5F,CACyB,CAC9B,CAAC;KACH;SAAM;QACL,OAAO,CACL,oBAAC,YAAY;YACX;gBACE,+BAAI,gBAAgB,CAAK,CACpB,CACM,CAChB,CAAC;KACH;AACH,CAAC","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"]}

package/lib/esm/ui/widget/MapLayerActionButtons.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface MapLayerActionButtonsProps {
     disabled: boolean;
     checked: boolean;

package/lib/esm/ui/widget/MapLayerActionButtons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLayerActionButtons.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerActionButtons.tsx"],"names":[],"mappings":"AASA,UAAU,0BAA0B;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAE7B;AAED,eAAO,MAAM,qBAAqB,wFAS/B,0BAA0B,gBAqD5B,CAAC"}
+{"version":3,"file":"MapLayerActionButtons.d.ts","sourceRoot":"","sources":["../../../../src/ui/widget/MapLayerActionButtons.tsx"],"names":[],"mappings":";AASA,UAAU,0BAA0B;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAE7B;AAED,eAAO,MAAM,qBAAqB,wFAS/B,0BAA0B,gBAqD5B,CAAC"}

package/lib/esm/ui/widget/MapLayerDroppable.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScreenViewport } from "@itwin/core-frontend";
 import { MapTypesOptions, StyleMapLayerSettings } from "../Interfaces";
 import "./MapLayerManager.scss";