npm - @itwin/appui-react - Versions diffs - 4.0.0-dev.10 → 4.0.0-dev.11 - Mend

@itwin/appui-react 4.0.0-dev.10 → 4.0.0-dev.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (693) hide show

package/lib/esm/appui-react/toolbar/ToolbarComposer.js CHANGED Viewed

@@ -6,20 +6,22 @@
  * @module Toolbar
  */
 import * as React from "react";
+import { ConditionalBooleanValue } from "@itwin/appui-abstract";
+import { Direction, ToolbarOpacitySetting, ToolbarPanelAlignment, ToolbarWithOverflow } from "@itwin/components-react";
 import { Logger } from "@itwin/core-bentley";
-import { ConditionalBooleanValue, ToolbarItemsManager, ToolbarItemUtilities, } from "@itwin/appui-abstract";
 import { Orientation } from "@itwin/core-react";
-import { Direction, ToolbarOpacitySetting, ToolbarPanelAlignment, ToolbarWithOverflow } from "@itwin/components-react";
 import { SyncUiEventDispatcher } from "../syncui/SyncUiEventDispatcher";
 import { UiFramework } from "../UiFramework";
 import { ToolbarDragInteractionContext } from "./DragInteraction";
 import { useDefaultToolbarItems } from "./useDefaultToolbarItems";
 import { useUiItemsProviderToolbarItems } from "./useUiItemsProviderToolbarItems";
-import { ToolbarOrientation, ToolbarUsage } from "./ToolbarItem";
+import { isToolbarActionItem, isToolbarGroupItem, ToolbarOrientation, ToolbarUsage } from "./ToolbarItem";
+import { ToolbarItemsManager } from "./ToolbarItemsManager";
+import { toUIAToolbarItem } from "./toUIAToolbarItem";
 /** Private function to set up sync event monitoring of toolbar items */
 function useToolbarItemSyncEffect(uiDataProvider, syncIdsOfInterest) {
     React.useEffect(() => {
-        const handleSyncUiEvent = (args) => {
+        return SyncUiEventDispatcher.onSyncUiEvent.addListener((args) => {
             if (0 === syncIdsOfInterest.length)
                 return;
             // istanbul ignore else
@@ -27,33 +29,25 @@ function useToolbarItemSyncEffect(uiDataProvider, syncIdsOfInterest) {
                 // process each item that has interest
                 uiDataProvider.refreshAffectedItems(args.eventIds);
             }
-        };
-        SyncUiEventDispatcher.onSyncUiEvent.addListener(handleSyncUiEvent);
-        return () => {
-            SyncUiEventDispatcher.onSyncUiEvent.removeListener(handleSyncUiEvent);
-        };
+        });
     }, [uiDataProvider, syncIdsOfInterest, uiDataProvider.items]);
     React.useEffect(() => {
-        const handleToolActivatedEvent = ({ toolId }) => {
+        return UiFramework.frontstages.onToolActivatedEvent.addListener(({ toolId }) => {
             uiDataProvider.setActiveToolId(toolId);
-        };
-        UiFramework.frontstages.onToolActivatedEvent.addListener(handleToolActivatedEvent);
-        return () => {
-            UiFramework.frontstages.onToolActivatedEvent.removeListener(handleToolActivatedEvent);
-        };
+        });
     }, [uiDataProvider, uiDataProvider.items]);
 }
 function nestedAddItemToSpecifiedParentGroup(items, groupChildren) {
     const outItems = [];
     for (const toolbarItem of items) {
-        if (!ToolbarItemUtilities.isGroupButton(toolbarItem)) {
+        if (!isToolbarGroupItem(toolbarItem)) {
             outItems.push(toolbarItem);
             continue;
         }
         const newChildren = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);
         const foundIndices = [];
         groupChildren.forEach((entry, index) => {
-            if (entry.parentToolGroupId === toolbarItem.id) {
+            if (entry.parentGroupItemId === toolbarItem.id) {
                 foundIndices.push(index);
             }
         });
@@ -74,14 +68,14 @@ function nestedAddItemToSpecifiedParentGroup(items, groupChildren) {
 function addItemToSpecifiedParentGroup(items, groupChildren) {
     const outItems = [];
     for (const toolbarItem of items) {
-        if (!ToolbarItemUtilities.isGroupButton(toolbarItem)) {
+        if (!isToolbarGroupItem(toolbarItem)) {
             outItems.push(toolbarItem);
             continue;
         }
         const newChildren = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);
         const foundIndices = [];
         groupChildren.forEach((entry, index) => {
-            if (entry.parentToolGroupId === toolbarItem.id) {
+            if (entry.parentGroupItemId === toolbarItem.id) {
                 foundIndices.push(index);
             }
         });
@@ -102,7 +96,7 @@ function addItemToSpecifiedParentGroup(items, groupChildren) {
 function cloneGroup(inGroup) {
     const childItems = [];
     inGroup.items.forEach((item) => {
-        if (ToolbarItemUtilities.isGroupButton(item))
+        if (isToolbarGroupItem(item))
             childItems.push(cloneGroup(item));
         else
             childItems.push(item);
@@ -119,7 +113,7 @@ function getSortedChildren(group) {
         .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))
         .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))
         .map((i) => {
-        if (ToolbarItemUtilities.isGroupButton(i)) {
+        if (isToolbarGroupItem(i)) {
             return { ...i, items: getSortedChildren(i) };
         }
         return i;
@@ -135,8 +129,8 @@ function combineItems(defaultItems, addonItems) {
         defaultItems.forEach((srcItem) => {
             if (-1 === items.findIndex((item) => item.id === srcItem.id)) {
                 // if the default item is a group that an addon may insert into copy it so we don't mess with original
-                const toolbarItem = ToolbarItemUtilities.isGroupButton(srcItem) ? cloneGroup(srcItem) : srcItem;
-                if (toolbarItem.parentToolGroupId && (ToolbarItemUtilities.isGroupButton(toolbarItem) || ToolbarItemUtilities.isActionButton(toolbarItem)))
+                const toolbarItem = isToolbarGroupItem(srcItem) ? cloneGroup(srcItem) : srcItem;
+                if ((isToolbarGroupItem(toolbarItem) || isToolbarActionItem(toolbarItem)) && toolbarItem.parentGroupItemId)
                     groupChildren.push(toolbarItem);
                 else
                     items.push(toolbarItem);
@@ -148,8 +142,8 @@ function combineItems(defaultItems, addonItems) {
         addonItems.forEach((srcItem) => {
             if (-1 === items.findIndex((item) => item.id === srcItem.id)) {
                 // if the default item is a group that an addon may insert into copy it so we don't mess with original
-                const toolbarItem = ToolbarItemUtilities.isGroupButton(srcItem) ? cloneGroup(srcItem) : srcItem;
-                if (toolbarItem.parentToolGroupId && (ToolbarItemUtilities.isGroupButton(toolbarItem) || ToolbarItemUtilities.isActionButton(toolbarItem)))
+                const toolbarItem = isToolbarGroupItem(srcItem) ? cloneGroup(srcItem) : srcItem;
+                if ((isToolbarGroupItem(toolbarItem) || isToolbarActionItem(toolbarItem)) && toolbarItem.parentGroupItemId)
                     groupChildren.push(toolbarItem);
                 else
                     items.push(toolbarItem);
@@ -161,7 +155,7 @@ function combineItems(defaultItems, addonItems) {
         items = addItemToSpecifiedParentGroup(items, groupChildren);
         if (groupChildren.length) {
             groupChildren.forEach((toolbarItem) => {
-                Logger.logWarning("ToolbarComposer", `Requested Parent Group [${toolbarItem.parentToolGroupId}] not found, so item [${toolbarItem.id}] is added directly to toolbar.`);
+                Logger.logWarning("ToolbarComposer", `Requested Parent Group [${toolbarItem.parentGroupItemId}] not found, so item [${toolbarItem.id}] is added directly to toolbar.`);
                 items.push(toolbarItem);
             });
         }
@@ -170,7 +164,7 @@ function combineItems(defaultItems, addonItems) {
         .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))
         .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))
         .map((i) => {
-        if (ToolbarItemUtilities.isGroupButton(i)) {
+        if (isToolbarGroupItem(i)) {
             return { ...i, items: getSortedChildren(i) };
         }
         return i;
@@ -210,7 +204,10 @@ export function ToolbarComposer(props) {
     const addonItems = useUiItemsProviderToolbarItems(addonItemsManager, usage, orientation);
     const addonSyncIdsOfInterest = React.useMemo(() => ToolbarItemsManager.getSyncIdsOfInterest(addonItems), [addonItems]);
     useToolbarItemSyncEffect(addonItemsManager, addonSyncIdsOfInterest);
-    const toolbarItems = React.useMemo(() => combineItems(defaultItems, addonItems), [defaultItems, addonItems]);
+    const toolbarItems = React.useMemo(() => {
+        const items = combineItems(defaultItems, addonItems);
+        return items.map((item) => toUIAToolbarItem(item));
+    }, [defaultItems, addonItems]);
     const toolbarOrientation = orientation === ToolbarOrientation.Horizontal ? Orientation.Horizontal : Orientation.Vertical;
     const expandsTo = toolbarOrientation === Orientation.Horizontal ? Direction.Bottom : usage === ToolbarUsage.ViewNavigation ? Direction.Left : Direction.Right;
     const panelAlignment = (toolbarOrientation === Orientation.Horizontal && usage === ToolbarUsage.ViewNavigation) ? ToolbarPanelAlignment.End : ToolbarPanelAlignment.Start;

package/lib/esm/appui-react/toolbar/ToolbarComposer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolbarComposer.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarComposer.tsx"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n /\r\n\r\nimport as React from \"react\";\r\nimport { Logger } from \"@itwin/core-bentley\";\r\nimport {\r\n ActionButton, CommonToolbarItem, ConditionalBooleanValue, GroupButton, ToolbarItemsManager, ToolbarItemUtilities, UiSyncEventArgs,\r\n} from \"@itwin/appui-abstract\";\r\nimport { Orientation } from \"@itwin/core-react\";\r\nimport { Direction, ToolbarItem, ToolbarOpacitySetting, ToolbarPanelAlignment, ToolbarWithOverflow } from \"@itwin/components-react\";\r\nimport { SyncUiEventDispatcher } from \"../syncui/SyncUiEventDispatcher\";\r\nimport { UiFramework } from \"../UiFramework\";\r\nimport { ToolbarDragInteractionContext } from \"./DragInteraction\";\r\nimport { useDefaultToolbarItems } from \"./useDefaultToolbarItems\";\r\nimport { useUiItemsProviderToolbarItems } from \"./useUiItemsProviderToolbarItems\";\r\nimport { ToolActivatedEventArgs } from \"../framework/FrameworkFrontstages\";\r\nimport { ToolbarOrientation, ToolbarUsage } from \"./ToolbarItem\";\r\n\r\n/** Private function to set up sync event monitoring of toolbar items /\r\nfunction useToolbarItemSyncEffect(uiDataProvider: ToolbarItemsManager, syncIdsOfInterest: string[]) {\r\n React.useEffect(() => {\r\n const handleSyncUiEvent = (args: UiSyncEventArgs) => {\r\n if (0 === syncIdsOfInterest.length)\r\n return;\r\n\r\n // istanbul ignore else\r\n if (syncIdsOfInterest.some((value: string): boolean => args.eventIds.has(value.toLowerCase()))) {\r\n // process each item that has interest\r\n uiDataProvider.refreshAffectedItems(args.eventIds);\r\n }\r\n };\r\n\r\n SyncUiEventDispatcher.onSyncUiEvent.addListener(handleSyncUiEvent);\r\n return () => {\r\n SyncUiEventDispatcher.onSyncUiEvent.removeListener(handleSyncUiEvent);\r\n };\r\n }, [uiDataProvider, syncIdsOfInterest, uiDataProvider.items]);\r\n\r\n React.useEffect(() => {\r\n const handleToolActivatedEvent = ({ toolId }: ToolActivatedEventArgs) => {\r\n uiDataProvider.setActiveToolId(toolId);\r\n };\r\n\r\n UiFramework.frontstages.onToolActivatedEvent.addListener(handleToolActivatedEvent);\r\n\r\n return () => {\r\n UiFramework.frontstages.onToolActivatedEvent.removeListener(handleToolActivatedEvent);\r\n };\r\n }, [uiDataProvider, uiDataProvider.items]);\r\n}\r\n\r\nfunction nestedAddItemToSpecifiedParentGroup(items: ReadonlyArray<ActionButton \| GroupButton>, groupChildren: Array<ActionButton \| GroupButton>): Array<ActionButton \| GroupButton> {\r\n const outItems: Array<ActionButton \| GroupButton> = [];\r\n for (const toolbarItem of items) {\r\n if (!ToolbarItemUtilities.isGroupButton(toolbarItem)) {\r\n outItems.push(toolbarItem);\r\n continue;\r\n }\r\n\r\n const newChildren: Array<ActionButton \| GroupButton> = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);\r\n const foundIndices: number[] = [];\r\n\r\n groupChildren.forEach((entry, index) => {\r\n if (entry.parentToolGroupId === toolbarItem.id) {\r\n foundIndices.push(index);\r\n }\r\n });\r\n\r\n // istanbul ignore else\r\n if (foundIndices.length) {\r\n // process in reverse order so groupChildren can be reduced as we find matches\r\n foundIndices.sort(\r\n // istanbul ignore next\r\n (a, b) => a - b,\r\n ).reverse().forEach((foundIndex) => {\r\n newChildren.push(groupChildren[foundIndex]);\r\n groupChildren.splice(foundIndex);\r\n });\r\n }\r\n\r\n outItems.push({ ...toolbarItem, items: newChildren });\r\n }\r\n return outItems;\r\n}\r\n\r\nfunction addItemToSpecifiedParentGroup(items: readonly CommonToolbarItem[], groupChildren: Array<ActionButton \| GroupButton>): CommonToolbarItem[] {\r\n const outItems: CommonToolbarItem[] = [];\r\n for (const toolbarItem of items) {\r\n if (!ToolbarItemUtilities.isGroupButton(toolbarItem)) {\r\n outItems.push(toolbarItem);\r\n continue;\r\n }\r\n\r\n const newChildren: Array<ActionButton \| GroupButton> = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);\r\n const foundIndices: number[] = [];\r\n\r\n groupChildren.forEach((entry, index) => {\r\n if (entry.parentToolGroupId === toolbarItem.id) {\r\n foundIndices.push(index);\r\n }\r\n });\r\n\r\n // istanbul ignore else\r\n if (foundIndices.length) {\r\n // process in reverse order so groupChildren can be reduced as we find matches\r\n foundIndices.sort(\r\n // istanbul ignore next\r\n (a, b) => a - b,\r\n ).reverse().forEach((foundIndex) => {\r\n newChildren.push(groupChildren[foundIndex]);\r\n groupChildren.splice(foundIndex);\r\n });\r\n }\r\n\r\n outItems.push({ ...toolbarItem, items: newChildren });\r\n }\r\n return outItems;\r\n}\r\n\r\nfunction cloneGroup(inGroup: GroupButton): GroupButton {\r\n const childItems: Array<ActionButton \| GroupButton> = [];\r\n inGroup.items.forEach((item) => {\r\n if (ToolbarItemUtilities.isGroupButton(item))\r\n childItems.push(cloneGroup(item));\r\n else\r\n childItems.push(item);\r\n });\r\n\r\n const clonedGroup = { ...inGroup, items: childItems };\r\n return clonedGroup;\r\n}\r\n\r\nfunction getItemSortValue(item: ToolbarItem) {\r\n const groupValue = undefined === item.groupPriority ? 0 : / istanbul ignore next / item.groupPriority;\r\n return groupValue 10000 + item.itemPriority;\r\n}\r\n\r\nfunction getSortedChildren(group: GroupButton): ReadonlyArray<ActionButton \| GroupButton> {\r\n const sortedChildren = group.items\r\n .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))\r\n .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))\r\n .map((i) => {\r\n if (ToolbarItemUtilities.isGroupButton(i)) {\r\n return { ...i, items: getSortedChildren(i) };\r\n }\r\n return i;\r\n });\r\n return sortedChildren;\r\n}\r\n\r\n/** local function to combine items from Stage and from Extensions /\r\nfunction combineItems(defaultItems: ReadonlyArray<CommonToolbarItem>, addonItems: ReadonlyArray<CommonToolbarItem>) {\r\n let items: CommonToolbarItem[] = [];\r\n const groupChildren: Array<ActionButton \| GroupButton> = [];\r\n\r\n // istanbul ignore else\r\n if (defaultItems.length) {\r\n defaultItems.forEach((srcItem: CommonToolbarItem) => {\r\n if (-1 === items.findIndex((item) => item.id === srcItem.id)) {\r\n // if the default item is a group that an addon may insert into copy it so we don't mess with original\r\n const toolbarItem = ToolbarItemUtilities.isGroupButton(srcItem) ? cloneGroup(srcItem) : srcItem;\r\n if (toolbarItem.parentToolGroupId && (ToolbarItemUtilities.isGroupButton(toolbarItem) \|\| ToolbarItemUtilities.isActionButton(toolbarItem)))\r\n groupChildren.push(toolbarItem);\r\n else\r\n items.push(toolbarItem);\r\n }\r\n });\r\n }\r\n // istanbul ignore else\r\n if (addonItems.length) {\r\n addonItems.forEach((srcItem: CommonToolbarItem) => {\r\n if (-1 === items.findIndex((item) => item.id === srcItem.id)) {\r\n // if the default item is a group that an addon may insert into copy it so we don't mess with original\r\n const toolbarItem = ToolbarItemUtilities.isGroupButton(srcItem) ? cloneGroup(srcItem) : srcItem;\r\n if (toolbarItem.parentToolGroupId && (ToolbarItemUtilities.isGroupButton(toolbarItem) \|\| ToolbarItemUtilities.isActionButton(toolbarItem)))\r\n groupChildren.push(toolbarItem);\r\n else\r\n items.push(toolbarItem);\r\n }\r\n });\r\n }\r\n\r\n // if an item from an addon has specified a parent group then try to find it and insert it. If no parent is found, add item at root level.\r\n if (groupChildren.length) {\r\n items = addItemToSpecifiedParentGroup(items, groupChildren);\r\n\r\n if (groupChildren.length) {\r\n groupChildren.forEach((toolbarItem: ActionButton \| GroupButton) => {\r\n Logger.logWarning(\"ToolbarComposer\", `Requested Parent Group [${toolbarItem.parentToolGroupId!}] not found, so item [${toolbarItem.id}] is added directly to toolbar.`);\r\n items.push(toolbarItem);\r\n });\r\n }\r\n }\r\n\r\n const availableItems = items\r\n .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))\r\n .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))\r\n .map((i) => {\r\n if (ToolbarItemUtilities.isGroupButton(i)) {\r\n return { ...i, items: getSortedChildren(i) };\r\n }\r\n return i;\r\n });\r\n\r\n return availableItems;\r\n}\r\n\r\nconst useProximityOpacitySetting = () => {\r\n const [proximityOpacity, setProximityOpacity] = React.useState(UiFramework.visibility.useProximityOpacity);\r\n React.useEffect(() => {\r\n // istanbul ignore next\r\n const handleUiVisibilityChanged = () => {\r\n setProximityOpacity(UiFramework.visibility.useProximityOpacity);\r\n };\r\n UiFramework.onUiVisibilityChanged.addListener(handleUiVisibilityChanged);\r\n return () => {\r\n UiFramework.onUiVisibilityChanged.removeListener(handleUiVisibilityChanged);\r\n };\r\n }, []);\r\n return proximityOpacity;\r\n};\r\n\r\n/* Properties for the [[ToolbarComposer]] React components\r\n * @public\r\n /\r\nexport interface ExtensibleToolbarProps {\r\n items: CommonToolbarItem[];\r\n usage: ToolbarUsage; // eslint-disable-line deprecation/deprecation\r\n /* Toolbar orientation. /\r\n orientation: ToolbarOrientation; // eslint-disable-line deprecation/deprecation\r\n}\r\n\r\n/\r\n Toolbar that is populated and maintained by item managers.\r\n * @public\r\n /\r\nexport function ToolbarComposer(props: ExtensibleToolbarProps) {\r\n const { usage, orientation } = props;\r\n\r\n const [defaultItemsManager, setDefaultItemsManager] = React.useState(() => new ToolbarItemsManager(props.items));\r\n React.useEffect(() => {\r\n setDefaultItemsManager(new ToolbarItemsManager(props.items));\r\n }, [props.items]); // eslint-disable-line react-hooks/exhaustive-deps\r\n\r\n // process default items\r\n const defaultItems = useDefaultToolbarItems(defaultItemsManager);\r\n const syncIdsOfInterest = React.useMemo(() => ToolbarItemsManager.getSyncIdsOfInterest(defaultItems), [defaultItems]);\r\n useToolbarItemSyncEffect(defaultItemsManager, syncIdsOfInterest);\r\n\r\n // process items from addon UI providers\r\n const [addonItemsManager] = React.useState(() => new ToolbarItemsManager());\r\n const addonItems = useUiItemsProviderToolbarItems(addonItemsManager, usage, orientation);\r\n const addonSyncIdsOfInterest = React.useMemo(() => ToolbarItemsManager.getSyncIdsOfInterest(addonItems), [addonItems]);\r\n useToolbarItemSyncEffect(addonItemsManager, addonSyncIdsOfInterest);\r\n\r\n const toolbarItems = React.useMemo(() => combineItems(defaultItems, addonItems), [defaultItems, addonItems]);\r\n\r\n const toolbarOrientation = orientation === ToolbarOrientation.Horizontal ? Orientation.Horizontal : Orientation.Vertical;\r\n const expandsTo = toolbarOrientation === Orientation.Horizontal ? Direction.Bottom : usage === ToolbarUsage.ViewNavigation ? Direction.Left : Direction.Right;\r\n const panelAlignment = (toolbarOrientation === Orientation.Horizontal && usage === ToolbarUsage.ViewNavigation) ? ToolbarPanelAlignment.End : ToolbarPanelAlignment.Start;\r\n const isDragEnabled = React.useContext(ToolbarDragInteractionContext);\r\n const useProximityOpacity = useProximityOpacitySetting();\r\n\r\n return <ToolbarWithOverflow\r\n expandsTo={expandsTo}\r\n panelAlignment={panelAlignment}\r\n items={toolbarItems}\r\n useDragInteraction={isDragEnabled}\r\n toolbarOpacitySetting={useProximityOpacity && !UiFramework.isMobile() ? ToolbarOpacitySetting.Proximity : / istanbul ignore next */ ToolbarOpacitySetting.Defaults}\r\n />;\r\n}\r\n"]}
1	+ {"version":3,"file":"ToolbarComposer.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarComposer.tsx"],"names":[],"mappings":"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","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n /\r\n\r\nimport as React from \"react\";\r\nimport { ConditionalBooleanValue } from \"@itwin/appui-abstract\";\r\nimport { Direction, ToolbarOpacitySetting, ToolbarPanelAlignment, ToolbarWithOverflow } from \"@itwin/components-react\";\r\nimport { Logger } from \"@itwin/core-bentley\";\r\nimport { Orientation } from \"@itwin/core-react\";\r\nimport { SyncUiEventDispatcher } from \"../syncui/SyncUiEventDispatcher\";\r\nimport { UiFramework } from \"../UiFramework\";\r\nimport { ToolbarDragInteractionContext } from \"./DragInteraction\";\r\nimport { useDefaultToolbarItems } from \"./useDefaultToolbarItems\";\r\nimport { useUiItemsProviderToolbarItems } from \"./useUiItemsProviderToolbarItems\";\r\nimport { isToolbarActionItem, isToolbarGroupItem, ToolbarActionItem, ToolbarGroupItem, ToolbarItem, ToolbarOrientation, ToolbarUsage } from \"./ToolbarItem\";\r\nimport { ToolbarItemsManager } from \"./ToolbarItemsManager\";\r\nimport { toUIAToolbarItem } from \"./toUIAToolbarItem\";\r\n\r\n/** Private function to set up sync event monitoring of toolbar items /\r\nfunction useToolbarItemSyncEffect(uiDataProvider: ToolbarItemsManager, syncIdsOfInterest: string[]) {\r\n React.useEffect(() => {\r\n return SyncUiEventDispatcher.onSyncUiEvent.addListener((args) => {\r\n if (0 === syncIdsOfInterest.length)\r\n return;\r\n\r\n // istanbul ignore else\r\n if (syncIdsOfInterest.some((value: string): boolean => args.eventIds.has(value.toLowerCase()))) {\r\n // process each item that has interest\r\n uiDataProvider.refreshAffectedItems(args.eventIds);\r\n }\r\n });\r\n }, [uiDataProvider, syncIdsOfInterest, uiDataProvider.items]);\r\n\r\n React.useEffect(() => {\r\n return UiFramework.frontstages.onToolActivatedEvent.addListener(({ toolId }) => {\r\n uiDataProvider.setActiveToolId(toolId);\r\n });\r\n }, [uiDataProvider, uiDataProvider.items]);\r\n}\r\n\r\nfunction nestedAddItemToSpecifiedParentGroup(items: ReadonlyArray<ToolbarActionItem \| ToolbarGroupItem>, groupChildren: Array<ToolbarActionItem \| ToolbarGroupItem>): Array<ToolbarActionItem \| ToolbarGroupItem> {\r\n const outItems: Array<ToolbarActionItem \| ToolbarGroupItem> = [];\r\n for (const toolbarItem of items) {\r\n if (!isToolbarGroupItem(toolbarItem)) {\r\n outItems.push(toolbarItem);\r\n continue;\r\n }\r\n\r\n const newChildren: Array<ToolbarActionItem \| ToolbarGroupItem> = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);\r\n const foundIndices: number[] = [];\r\n\r\n groupChildren.forEach((entry, index) => {\r\n if (entry.parentGroupItemId === toolbarItem.id) {\r\n foundIndices.push(index);\r\n }\r\n });\r\n\r\n // istanbul ignore else\r\n if (foundIndices.length) {\r\n // process in reverse order so groupChildren can be reduced as we find matches\r\n foundIndices.sort(\r\n // istanbul ignore next\r\n (a, b) => a - b,\r\n ).reverse().forEach((foundIndex) => {\r\n newChildren.push(groupChildren[foundIndex]);\r\n groupChildren.splice(foundIndex);\r\n });\r\n }\r\n\r\n outItems.push({ ...toolbarItem, items: newChildren });\r\n }\r\n return outItems;\r\n}\r\n\r\nfunction addItemToSpecifiedParentGroup(items: readonly ToolbarItem[], groupChildren: Array<ToolbarActionItem \| ToolbarGroupItem>): ToolbarItem[] {\r\n const outItems: ToolbarItem[] = [];\r\n for (const toolbarItem of items) {\r\n if (!isToolbarGroupItem(toolbarItem)) {\r\n outItems.push(toolbarItem);\r\n continue;\r\n }\r\n\r\n const newChildren: Array<ToolbarActionItem \| ToolbarGroupItem> = nestedAddItemToSpecifiedParentGroup(toolbarItem.items, groupChildren);\r\n const foundIndices: number[] = [];\r\n\r\n groupChildren.forEach((entry, index) => {\r\n if (entry.parentGroupItemId === toolbarItem.id) {\r\n foundIndices.push(index);\r\n }\r\n });\r\n\r\n // istanbul ignore else\r\n if (foundIndices.length) {\r\n // process in reverse order so groupChildren can be reduced as we find matches\r\n foundIndices.sort(\r\n // istanbul ignore next\r\n (a, b) => a - b,\r\n ).reverse().forEach((foundIndex) => {\r\n newChildren.push(groupChildren[foundIndex]);\r\n groupChildren.splice(foundIndex);\r\n });\r\n }\r\n\r\n outItems.push({ ...toolbarItem, items: newChildren });\r\n }\r\n return outItems;\r\n}\r\n\r\nfunction cloneGroup(inGroup: ToolbarGroupItem): ToolbarGroupItem {\r\n const childItems: Array<ToolbarActionItem \| ToolbarGroupItem> = [];\r\n inGroup.items.forEach((item) => {\r\n if (isToolbarGroupItem(item))\r\n childItems.push(cloneGroup(item));\r\n else\r\n childItems.push(item);\r\n });\r\n\r\n const clonedGroup = { ...inGroup, items: childItems };\r\n return clonedGroup;\r\n}\r\n\r\nfunction getItemSortValue(item: ToolbarItem) {\r\n const groupValue = undefined === item.groupPriority ? 0 : / istanbul ignore next / item.groupPriority;\r\n return groupValue 10000 + item.itemPriority;\r\n}\r\n\r\nfunction getSortedChildren(group: ToolbarGroupItem): ReadonlyArray<ToolbarActionItem \| ToolbarGroupItem> {\r\n const sortedChildren = group.items\r\n .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))\r\n .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))\r\n .map((i) => {\r\n if (isToolbarGroupItem(i)) {\r\n return { ...i, items: getSortedChildren(i) };\r\n }\r\n return i;\r\n });\r\n return sortedChildren;\r\n}\r\n\r\n/** local function to combine items from Stage and from Extensions /\r\nfunction combineItems(defaultItems: ReadonlyArray<ToolbarItem>, addonItems: ReadonlyArray<ToolbarItem>): ToolbarItem[] {\r\n let items: ToolbarItem[] = [];\r\n const groupChildren: Array<ToolbarActionItem \| ToolbarGroupItem> = [];\r\n\r\n // istanbul ignore else\r\n if (defaultItems.length) {\r\n defaultItems.forEach((srcItem: ToolbarItem) => {\r\n if (-1 === items.findIndex((item) => item.id === srcItem.id)) {\r\n // if the default item is a group that an addon may insert into copy it so we don't mess with original\r\n const toolbarItem = isToolbarGroupItem(srcItem) ? cloneGroup(srcItem) : srcItem;\r\n if ((isToolbarGroupItem(toolbarItem) \|\| isToolbarActionItem(toolbarItem)) && toolbarItem.parentGroupItemId)\r\n groupChildren.push(toolbarItem);\r\n else\r\n items.push(toolbarItem);\r\n }\r\n });\r\n }\r\n // istanbul ignore else\r\n if (addonItems.length) {\r\n addonItems.forEach((srcItem: ToolbarItem) => {\r\n if (-1 === items.findIndex((item) => item.id === srcItem.id)) {\r\n // if the default item is a group that an addon may insert into copy it so we don't mess with original\r\n const toolbarItem = isToolbarGroupItem(srcItem) ? cloneGroup(srcItem) : srcItem;\r\n if ((isToolbarGroupItem(toolbarItem) \|\| isToolbarActionItem(toolbarItem)) && toolbarItem.parentGroupItemId)\r\n groupChildren.push(toolbarItem);\r\n else\r\n items.push(toolbarItem);\r\n }\r\n });\r\n }\r\n\r\n // if an item from an addon has specified a parent group then try to find it and insert it. If no parent is found, add item at root level.\r\n if (groupChildren.length) {\r\n items = addItemToSpecifiedParentGroup(items, groupChildren);\r\n\r\n if (groupChildren.length) {\r\n groupChildren.forEach((toolbarItem) => {\r\n Logger.logWarning(\"ToolbarComposer\", `Requested Parent Group [${toolbarItem.parentGroupItemId!}] not found, so item [${toolbarItem.id}] is added directly to toolbar.`);\r\n items.push(toolbarItem);\r\n });\r\n }\r\n }\r\n\r\n const availableItems = items\r\n .filter((item) => !(ConditionalBooleanValue.getValue(item.isHidden)))\r\n .sort((a, b) => getItemSortValue(a) - getItemSortValue(b))\r\n .map((i) => {\r\n if (isToolbarGroupItem(i)) {\r\n return { ...i, items: getSortedChildren(i) };\r\n }\r\n return i;\r\n });\r\n\r\n return availableItems;\r\n}\r\n\r\nconst useProximityOpacitySetting = () => {\r\n const [proximityOpacity, setProximityOpacity] = React.useState(UiFramework.visibility.useProximityOpacity);\r\n React.useEffect(() => {\r\n // istanbul ignore next\r\n const handleUiVisibilityChanged = () => {\r\n setProximityOpacity(UiFramework.visibility.useProximityOpacity);\r\n };\r\n UiFramework.onUiVisibilityChanged.addListener(handleUiVisibilityChanged);\r\n return () => {\r\n UiFramework.onUiVisibilityChanged.removeListener(handleUiVisibilityChanged);\r\n };\r\n }, []);\r\n return proximityOpacity;\r\n};\r\n\r\n/* Properties for the [[ToolbarComposer]] React components\r\n * @public\r\n /\r\nexport interface ExtensibleToolbarProps {\r\n items: ToolbarItem[];\r\n usage: ToolbarUsage;\r\n /* Toolbar orientation. /\r\n orientation: ToolbarOrientation;\r\n}\r\n\r\n/\r\n Toolbar that is populated and maintained by item managers.\r\n * @public\r\n /\r\nexport function ToolbarComposer(props: ExtensibleToolbarProps) {\r\n const { usage, orientation } = props;\r\n\r\n const [defaultItemsManager, setDefaultItemsManager] = React.useState(() => new ToolbarItemsManager(props.items));\r\n React.useEffect(() => {\r\n setDefaultItemsManager(new ToolbarItemsManager(props.items));\r\n }, [props.items]); // eslint-disable-line react-hooks/exhaustive-deps\r\n\r\n // process default items\r\n const defaultItems = useDefaultToolbarItems(defaultItemsManager);\r\n const syncIdsOfInterest = React.useMemo(() => ToolbarItemsManager.getSyncIdsOfInterest(defaultItems), [defaultItems]);\r\n useToolbarItemSyncEffect(defaultItemsManager, syncIdsOfInterest);\r\n\r\n // process items from addon UI providers\r\n const [addonItemsManager] = React.useState(() => new ToolbarItemsManager());\r\n const addonItems = useUiItemsProviderToolbarItems(addonItemsManager, usage, orientation);\r\n const addonSyncIdsOfInterest = React.useMemo(() => ToolbarItemsManager.getSyncIdsOfInterest(addonItems), [addonItems]);\r\n useToolbarItemSyncEffect(addonItemsManager, addonSyncIdsOfInterest);\r\n\r\n const toolbarItems = React.useMemo(() => {\r\n const items = combineItems(defaultItems, addonItems);\r\n return items.map((item) => toUIAToolbarItem(item));\r\n }, [defaultItems, addonItems]);\r\n\r\n const toolbarOrientation = orientation === ToolbarOrientation.Horizontal ? Orientation.Horizontal : Orientation.Vertical;\r\n const expandsTo = toolbarOrientation === Orientation.Horizontal ? Direction.Bottom : usage === ToolbarUsage.ViewNavigation ? Direction.Left : Direction.Right;\r\n const panelAlignment = (toolbarOrientation === Orientation.Horizontal && usage === ToolbarUsage.ViewNavigation) ? ToolbarPanelAlignment.End : ToolbarPanelAlignment.Start;\r\n const isDragEnabled = React.useContext(ToolbarDragInteractionContext);\r\n const useProximityOpacity = useProximityOpacitySetting();\r\n\r\n return <ToolbarWithOverflow\r\n expandsTo={expandsTo}\r\n panelAlignment={panelAlignment}\r\n items={toolbarItems}\r\n useDragInteraction={isDragEnabled}\r\n toolbarOpacitySetting={useProximityOpacity && !UiFramework.isMobile() ? ToolbarOpacitySetting.Proximity : / istanbul ignore next */ ToolbarOpacitySetting.Defaults}\r\n />;\r\n}\r\n"]}

package/lib/esm/appui-react/toolbar/ToolbarHelper.d.ts CHANGED Viewed

@@ -2,26 +2,22 @@
  * @module Toolbar
  */
 import * as React from "react";
-import { ActionButton, CommonToolbarItem, CustomButtonDefinition, GroupButton, ToolbarItem } from "@itwin/appui-abstract";
-import { CustomToolbarItem } from "@itwin/components-react";
+import { ActionButton, CommonToolbarItem, CustomButtonDefinition, GroupButton } from "@itwin/appui-abstract";
 import { AnyItemDef } from "../shared/AnyItemDef";
 import { CustomItemDef } from "../shared/CustomItemDef";
+import { ToolbarActionItem, ToolbarCustomItem, ToolbarGroupItem, ToolbarItem } from "./ToolbarItem";
 /** Helper functions for defining an ToolbarComposer.
  * @public
  */
 export declare class ToolbarHelper {
     /** Construct CustomToolbarItem definitions given a CustomItemDef. */
-    static createCustomDefinitionToolbarItem(itemPriority: number, itemDef: CustomItemDef, overrides?: Partial<CustomButtonDefinition>): CustomToolbarItem;
+    static createCustomDefinitionToolbarItem(itemPriority: number, itemDef: CustomItemDef, overrides?: Partial<CustomButtonDefinition>): ToolbarCustomItem;
     /** Construct ActionButton and GroupButton definitions given an array to ItemDefs. */
-    static constructChildToolbarItems(itemDefs: AnyItemDef[]): Array<ActionButton | GroupButton>;
+    static constructChildToolbarItems(itemDefs: AnyItemDef[]): Array<ToolbarActionItem | ToolbarGroupItem>;
     private static getStringOrConditionalString;
     static getIconReactNode(item: ActionButton | GroupButton): React.ReactNode;
     /** Helper method to creates a generic toolbar item entry */
-    static createToolbarItemFromItemDef(itemPriority: number, itemDef: AnyItemDef, overrides?: Partial<ToolbarItem>): CommonToolbarItem;
-    static createToolbarItemsFromItemDefs(itemDefs: AnyItemDef[], startingItemPriority?: number, overrides?: Partial<ToolbarItem>): CommonToolbarItem[];
-    /** CustomToolbarButton type guard.
-     * @internal
-     */
-    static isCustomToolbarButton: (item: CommonToolbarItem) => item is CustomToolbarItem;
+    static createToolbarItemFromItemDef(itemPriority: number, itemDef: AnyItemDef, overrides?: Partial<CommonToolbarItem>): ToolbarItem;
+    static createToolbarItemsFromItemDefs(itemDefs: AnyItemDef[], startingItemPriority?: number, overrides?: Partial<CommonToolbarItem>): ToolbarItem[];
 }
 //# sourceMappingURL=ToolbarHelper.d.ts.map

package/lib/esm/appui-react/toolbar/ToolbarHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolbarHelper.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarHelper.tsx"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,YAAY,EAAE,iBAAiB,EAA0B,sBAAsB,EAAE,WAAW,~~EAAgB~~,~~WAAW,EACxH,~~MAAM,uBAAuB,CAAC;~~AAC~~/B,OAAO,EAAE,~~iBAAiB~~,~~EAAuB~~,MAAM,~~yBAAyB~~,CAAC;~~AAEjF~~,OAAO,EAAE,~~UAAU~~,EAAE,MAAM,~~sBAAsB~~,CAAC;~~AAElD~~,OAAO,EAAE,~~aAAa~~,EAAE,MAAM,~~yBAAyB~~,CAAC;~~AAIxD~~;;GAEG;AACH,qBAAa,aAAa;IACxB,qEAAqE;WACvD,iCAAiC,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAAG,iBAAiB;IAwB7J,qFAAqF;WACvE,0BAA0B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,~~YAAY~~,GAAG,~~WAAW~~,CAAC;~~IAanG~~,OAAO,CAAC,MAAM,CAAC,4BAA4B;WAO7B,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,GAAG,KAAK,CAAC,SAAS;IAIjF,4DAA4D;WAC9C,4BAA4B,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,~~WAAW~~,CAAC,GAAG,~~iBAAiB~~;~~WA4D5H~~,8BAA8B,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,oBAAoB,SAAK,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,~~WAAW~~,CAAC,GAAG,~~iBAAiB~~,EAAE;~~IAUtJ;;OAEG;IACH,OAAc,qBAAqB,SAAU,iBAAiB,+BAE5D;CACH~~"}
1	+ {"version":3,"file":"ToolbarHelper.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarHelper.tsx"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,YAAY,EAAE,iBAAiB,EAA0B,sBAAsB,EAAE,WAAW,EAC7F,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAA2C,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE7I;;GAEG;AACH,qBAAa,aAAa;IACxB,qEAAqE;WACvD,iCAAiC,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAAG,iBAAiB;IAwB7J,qFAAqF;WACvE,0BAA0B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAa7G,OAAO,CAAC,MAAM,CAAC,4BAA4B;WAO7B,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,GAAG,KAAK,CAAC,SAAS;IAIjF,4DAA4D;WAC9C,4BAA4B,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,WAAW;WAwD5H,8BAA8B,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,oBAAoB,SAAK,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,WAAW,EAAE;CASvJ"}

package/lib/esm/appui-react/toolbar/ToolbarHelper.js CHANGED Viewed

@@ -1,10 +1,10 @@
-import { ConditionalStringValue, ToolbarItemUtilities, } from "@itwin/appui-abstract";
-import { isCustomToolbarItem } from "@itwin/components-react";
+import { ConditionalStringValue, } from "@itwin/appui-abstract";
 import { IconHelper } from "@itwin/core-react";
 import { CommandItemDef } from "../shared/CommandItemDef";
 import { CustomItemDef } from "../shared/CustomItemDef";
 import { ToolItemDef } from "../shared/ToolItemDef";
 import { GroupItemDef } from "./GroupItem";
+import { isToolbarActionItem, isToolbarGroupItem } from "./ToolbarItem";
 /** Helper functions for defining an ToolbarComposer.
  * @public
  */
@@ -28,7 +28,7 @@ export class ToolbarHelper {
             isDisabled,
             internalData,
             badgeType,
-            panelContentNode: itemDef.popupPanelNode,
+            panelContent: itemDef.popupPanelNode,
             ...overrides,
         };
     }
@@ -40,7 +40,7 @@ export class ToolbarHelper {
             const item = this.createToolbarItemFromItemDef(count, itemDef);
             count = count + 10;
             // istanbul ignore else
-            if (ToolbarItemUtilities.isActionButton(item) || ToolbarItemUtilities.isGroupButton(item))
+            if (isToolbarActionItem(item) || isToolbarGroupItem(item))
                 items.push(item);
         }
         return items;
@@ -57,10 +57,9 @@ export class ToolbarHelper {
     static createToolbarItemFromItemDef(itemPriority, itemDef, overrides) {
         const isHidden = itemDef.isHidden;
         const isDisabled = itemDef.isDisabled;
-        const internalData = new Map(); // used to store ReactNode if iconSpec hold a ReactNode
-        const icon = IconHelper.getIconData(itemDef.iconSpec, internalData);
+        const icon = itemDef.iconSpec;
         const label = this.getStringOrConditionalString(itemDef.rawLabel);
-        const badgeType = itemDef.badgeType;
+        const badge = itemDef.badgeType;
         // istanbul ignore else
         if (itemDef instanceof CommandItemDef) {
             return {
@@ -72,8 +71,7 @@ export class ToolbarHelper {
                 isDisabled,
                 isActive: itemDef.isActive,
                 execute: itemDef.execute,
-                badgeType,
-                internalData,
+                badge,
                 ...overrides,
             };
         }
@@ -92,8 +90,7 @@ export class ToolbarHelper {
                 isDisabled,
                 items: children,
                 isActive: false,
-                badgeType,
-                internalData,
+                badge,
                 ...overrides,
             };
         }
@@ -107,8 +104,7 @@ export class ToolbarHelper {
                 isDisabled,
                 isActive: itemDef.isActive,
                 execute: itemDef.execute,
-                badgeType,
-                internalData,
+                badge,
                 ...overrides,
             };
         }
@@ -126,10 +122,4 @@ export class ToolbarHelper {
         return items;
     }
 }
-/** CustomToolbarButton type guard.
- * @internal
- */
-ToolbarHelper.isCustomToolbarButton = (item) => {
-    return isCustomToolbarItem(item);
-};
 //# sourceMappingURL=ToolbarHelper.js.map

package/lib/esm/appui-react/toolbar/ToolbarHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolbarHelper.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarHelper.tsx"],"names":[],"mappings":"AAQA,OAAO,EAC4B,sBAAsB,~~EAAkE~~,~~oBAAoB,GAC9I,~~MAAM,uBAAuB,CAAC;AAC/B,OAAO,~~EAAqB,mBAAmB,~~EAAE,~~MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,~~UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;~~AAE3C~~;;GAEG;AACH,MAAM,OAAO,aAAa;IACxB,qEAAqE;IAC9D,MAAM,CAAC,iCAAiC,CAAC,YAAoB,EAAE,OAAsB,EAAE,SAA2C;QACvI,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAe,CAAC,CAAE,uDAAuD;QACrG,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEpC,uBAAuB;QACvB,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,YAAY;YACZ,IAAI;YACJ,KAAK;YACL,QAAQ,EAAE,IAAI;YACd,QAAQ;YACR,UAAU;YACV,YAAY;YACZ,SAAS;YACT,~~gBAAgB~~,EAAE,OAAO,CAAC,cAAc;~~YACxC~~,GAAG,SAAS;SACb,CAAC;IACJ,CAAC;IAED,qFAAqF;IAC9E,MAAM,CAAC,0BAA0B,CAAC,QAAsB;QAC7D,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,KAAK,~~GAAsC~~,EAAE,CAAC;~~QACpD~~,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC/D,KAAK,GAAG,KAAK,GAAG,EAAE,CAAC;YACnB,uBAAuB;YACvB,IAAI,~~oBAAoB~~,CAAC,~~cAAc,CAAC,~~IAAI,CAAC,IAAI,~~oBAAoB~~,CAAC,~~aAAa,CAAC,~~IAAI,CAAC;~~gBACvF~~,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,4BAA4B,CAAC,QAAwD;QAClG,IAAI,QAAQ,YAAY,sBAAsB,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAC5E,OAAO,QAAQ,CAAC;QAElB,OAAO,QAAQ,EAAE,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,IAAgC;QAC7D,OAAO,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC;IAED,4DAA4D;IACrD,MAAM,CAAC,4BAA4B,CAAC,YAAoB,EAAE,OAAmB,EAAE,~~SAAgC~~;~~QACpH~~,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,~~YAAY,GAAG,~~IAAI,GAAG,~~EAAe,CAAC,CAAE,uDAAuD;QACrG,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,~~OAAO,CAAC,QAAQ,~~EAAE,YAAY,~~CAAC~~,CAAC~~;~~QACpE~~,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,~~SAAS~~,GAAG,OAAO,CAAC,SAAS,CAAC;~~QAEpC~~,uBAAuB;QACvB,IAAI,OAAO,YAAY,cAAc,EAAE;YACrC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,UAAU;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,~~SAAS~~;~~gBACT~~,~~YAAY;gBACZ,~~GAAG,SAAS;aACb,CAAC;SACH;aAAM,IAAI,OAAO,YAAY,aAAa,EAAE;YAC3C,OAAO,aAAa,CAAC,iCAAiC,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SAC1F;aAAM,IAAI,OAAO,YAAY,YAAY,EAAE;YAC1C,MAAM,QAAQ,~~GAAsC~~,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;~~YACnG~~,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ;gBACR,UAAU;gBACV,KAAK,EAAE,QAAQ;gBACf,QAAQ,EAAE,KAAK;gBACf,~~SAAS~~;~~gBACT~~,~~YAAY;gBACZ,~~GAAG,SAAS;aACb,CAAC;SACH;aAAM,IAAI,OAAO,YAAY,WAAW,EAAE;YACzC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,UAAU;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,~~SAAS~~;~~gBACT~~,~~YAAY;gBACZ,~~GAAG,SAAS;aACb,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;SACzE;IACH,CAAC;IAEM,MAAM,CAAC,8BAA8B,CAAC,QAAsB,EAAE,oBAAoB,GAAG,EAAE,EAAE,~~SAAgC~~;~~QAC9H~~,IAAI,YAAY,GAAG,oBAAoB,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAmB,EAAE,EAAE;YACjD,MAAM,IAAI,GAAG,aAAa,CAAC,4BAA4B,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAC1F,YAAY,GAAG,YAAY,GAAG,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC~~;;AAED;;GAEG~~;~~AACW,mCAAqB,GAAG,CAAC,IAAuB,EAA6B,EAAE;IAC3F,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC~~","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n /\r\nimport as React from \"react\";\r\nimport {\r\n ActionButton, CommonToolbarItem, ConditionalStringValue, CustomButtonDefinition, GroupButton, StringGetter~~, ToolbarItem, ToolbarItemUtilities~~,\r\n} from \"@itwin/appui-abstract\";\r\nimport { ~~CustomToolbarItem,~~ ~~isCustomToolbarItem~~ } from \"@itwin/~~components~~-react\";\r\nimport { ~~IconHelper~~ } from \"~~@itwin~~/~~core-react~~\";\r\nimport { ~~AnyItemDef~~ } from \"../shared/~~AnyItemDef~~\";\r\nimport { ~~CommandItemDef~~ } from \"../shared/~~CommandItemDef~~\";\r\nimport { ~~CustomItemDef~~ } from \"../shared/~~CustomItemDef~~\";\r\nimport { ~~ToolItemDef~~ } from \"~~../shared/ToolItemDef~~\";\r\nimport { ~~GroupItemDef~~ } from \"./~~GroupItem~~\";\r\n\r\n/** Helper functions for defining an ToolbarComposer.\r\n * @public\r\n /\r\nexport class ToolbarHelper {\r\n /* Construct CustomToolbarItem definitions given a CustomItemDef. /\r\n public static createCustomDefinitionToolbarItem(itemPriority: number, itemDef: CustomItemDef, overrides?: Partial<CustomButtonDefinition>): ~~CustomToolbarItem~~ {\r\n const isHidden = itemDef.isHidden;\r\n const isDisabled = itemDef.isDisabled;\r\n const internalData = new Map<string, any>(); // used to store ReactNode if iconSpec hold a ReactNode\r\n const icon = IconHelper.getIconData(itemDef.iconSpec, internalData);\r\n const label = this.getStringOrConditionalString(itemDef.rawLabel);\r\n const badgeType = itemDef.badgeType;\r\n\r\n // istanbul ignore else\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isCustom: true,\r\n isHidden,\r\n isDisabled,\r\n internalData,\r\n badgeType,\r\n ~~panelContentNode~~: itemDef.popupPanelNode,\r\n ...overrides,\r\n };\r\n }\r\n\r\n /* Construct ActionButton and GroupButton definitions given an array to ItemDefs. /\r\n public static constructChildToolbarItems(itemDefs: AnyItemDef[]): Array<~~ActionButton~~ \| ~~GroupButton~~> {\r\n let count = 10;\r\n const items: Array<~~ActionButton~~ \| ~~GroupButton~~> = [];\r\n for (const itemDef of itemDefs) {\r\n const item = this.createToolbarItemFromItemDef(count, itemDef);\r\n count = count + 10;\r\n // istanbul ignore else\r\n if (~~ToolbarItemUtilities.isActionButton~~(item) \|\| ~~ToolbarItemUtilities.isGroupButton~~(item))\r\n items.push(item);\r\n }\r\n return items;\r\n }\r\n\r\n private static getStringOrConditionalString(inString: string \| StringGetter \| ConditionalStringValue): string \| ConditionalStringValue {\r\n if (inString instanceof ConditionalStringValue \|\| typeof inString === \"string\")\r\n return inString;\r\n\r\n return inString();\r\n }\r\n\r\n public static getIconReactNode(item: ActionButton \| GroupButton): React.ReactNode {\r\n return IconHelper.getIconReactNode(item.icon, item.internalData);\r\n }\r\n\r\n /* Helper method to creates a generic toolbar item entry /\r\n public static createToolbarItemFromItemDef(itemPriority: number, itemDef: AnyItemDef, overrides?: Partial<~~ToolbarItem~~>): ~~CommonToolbarItem~~ {\r\n const isHidden = itemDef.isHidden;\r\n const isDisabled = itemDef.isDisabled;\r\n const ~~internalData = new Map<string, any>(); // used to store ReactNode if iconSpec hold a ReactNode\r\n const~~ icon = ~~IconHelper.getIconData(~~itemDef.iconSpec~~, internalData)~~;\r\n const label = this.getStringOrConditionalString(itemDef.rawLabel);\r\n const ~~badgeType~~ = itemDef.badgeType;\r\n\r\n // istanbul ignore else\r\n if (itemDef instanceof CommandItemDef) {\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isHidden,\r\n isDisabled,\r\n isActive: itemDef.isActive,\r\n execute: itemDef.execute,\r\n ~~badgeType~~,\r\n ~~internalData,\r\n~~ ...overrides,\r\n };\r\n } else if (itemDef instanceof CustomItemDef) {\r\n return ToolbarHelper.createCustomDefinitionToolbarItem(itemPriority, itemDef, overrides);\r\n } else if (itemDef instanceof GroupItemDef) {\r\n const children: Array<~~ActionButton~~ \| ~~GroupButton~~> = this.constructChildToolbarItems(itemDef.items);\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n panelLabel: itemDef.panelLabel,\r\n isHidden,\r\n isDisabled,\r\n items: children,\r\n isActive: false,\r\n ~~badgeType~~,\r\n ~~internalData,\r\n~~ ...overrides,\r\n };\r\n } else if (itemDef instanceof ToolItemDef) {\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isHidden,\r\n isDisabled,\r\n isActive: itemDef.isActive,\r\n execute: itemDef.execute,\r\n ~~badgeType~~,\r\n ~~internalData,\r\n~~ ...overrides,\r\n };\r\n } else {\r\n throw new Error(`Invalid Item type encountered, item id=${itemDef.id}`);\r\n }\r\n }\r\n\r\n public static createToolbarItemsFromItemDefs(itemDefs: AnyItemDef[], startingItemPriority = 10, overrides?: Partial<~~ToolbarItem~~>): ~~CommonToolbarItem~~[] {\r\n let itemPriority = startingItemPriority;\r\n const items = itemDefs.map((itemDef: AnyItemDef) => {\r\n const item = ToolbarHelper.createToolbarItemFromItemDef(itemPriority, itemDef, overrides);\r\n itemPriority = itemPriority + 10;\r\n return item;\r\n });\r\n return items;\r\n }\r\n\r\n /* CustomToolbarButton type guard.\r\n * @internal\r\n */\r\n public static isCustomToolbarButton = (item: CommonToolbarItem): item is CustomToolbarItem => {\r\n return isCustomToolbarItem(item);\r\n }~~;\r~~\~~n}\~~r\n"]}
1	+ {"version":3,"file":"ToolbarHelper.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarHelper.tsx"],"names":[],"mappings":"AAQA,OAAO,EAC4B,sBAAsB,GACxD,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAuE,MAAM,eAAe,CAAC;AAE7I;;GAEG;AACH,MAAM,OAAO,aAAa;IACxB,qEAAqE;IAC9D,MAAM,CAAC,iCAAiC,CAAC,YAAoB,EAAE,OAAsB,EAAE,SAA2C;QACvI,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAe,CAAC,CAAE,uDAAuD;QACrG,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEpC,uBAAuB;QACvB,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,YAAY;YACZ,IAAI;YACJ,KAAK;YACL,QAAQ,EAAE,IAAI;YACd,QAAQ;YACR,UAAU;YACV,YAAY;YACZ,SAAS;YACT,YAAY,EAAE,OAAO,CAAC,cAAc;YACpC,GAAG,SAAS;SACb,CAAC;IACJ,CAAC;IAED,qFAAqF;IAC9E,MAAM,CAAC,0BAA0B,CAAC,QAAsB;QAC7D,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,KAAK,GAAgD,EAAE,CAAC;QAC9D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC/D,KAAK,GAAG,KAAK,GAAG,EAAE,CAAC;YACnB,uBAAuB;YACvB,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC;gBACvD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,4BAA4B,CAAC,QAAwD;QAClG,IAAI,QAAQ,YAAY,sBAAsB,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAC5E,OAAO,QAAQ,CAAC;QAElB,OAAO,QAAQ,EAAE,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,IAAgC;QAC7D,OAAO,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC;IAED,4DAA4D;IACrD,MAAM,CAAC,4BAA4B,CAAC,YAAoB,EAAE,OAAmB,EAAE,SAAsC;QAC1H,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;QAEhC,uBAAuB;QACvB,IAAI,OAAO,YAAY,cAAc,EAAE;YACrC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,UAAU;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK;gBACL,GAAG,SAAS;aACb,CAAC;SACH;aAAM,IAAI,OAAO,YAAY,aAAa,EAAE;YAC3C,OAAO,aAAa,CAAC,iCAAiC,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SAC1F;aAAM,IAAI,OAAO,YAAY,YAAY,EAAE;YAC1C,MAAM,QAAQ,GAAgD,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC7G,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ;gBACR,UAAU;gBACV,KAAK,EAAE,QAAQ;gBACf,QAAQ,EAAE,KAAK;gBACf,KAAK;gBACL,GAAG,SAAS;aACb,CAAC;SACH;aAAM,IAAI,OAAO,YAAY,WAAW,EAAE;YACzC,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,YAAY;gBACZ,IAAI;gBACJ,KAAK;gBACL,QAAQ;gBACR,UAAU;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK;gBACL,GAAG,SAAS;aACb,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;SACzE;IACH,CAAC;IAEM,MAAM,CAAC,8BAA8B,CAAC,QAAsB,EAAE,oBAAoB,GAAG,EAAE,EAAE,SAAsC;QACpI,IAAI,YAAY,GAAG,oBAAoB,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAmB,EAAE,EAAE;YACjD,MAAM,IAAI,GAAG,aAAa,CAAC,4BAA4B,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAC1F,YAAY,GAAG,YAAY,GAAG,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;CACF","sourcesContent":["/---------------------------------------------------------------------------------------------\r\n Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n--------------------------------------------------------------------------------------------/\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n /\r\nimport as React from \"react\";\r\nimport {\r\n ActionButton, CommonToolbarItem, ConditionalStringValue, CustomButtonDefinition, GroupButton, StringGetter,\r\n} from \"@itwin/appui-abstract\";\r\nimport { IconHelper } from \"@itwin/core-react\";\r\nimport { AnyItemDef } from \"../shared/AnyItemDef\";\r\nimport { CommandItemDef } from \"../shared/CommandItemDef\";\r\nimport { CustomItemDef } from \"../shared/CustomItemDef\";\r\nimport { ToolItemDef } from \"../shared/ToolItemDef\";\r\nimport { GroupItemDef } from \"./GroupItem\";\r\nimport { isToolbarActionItem, isToolbarGroupItem, ToolbarActionItem, ToolbarCustomItem, ToolbarGroupItem, ToolbarItem } from \"./ToolbarItem\";\r\n\r\n/** Helper functions for defining an ToolbarComposer.\r\n * @public\r\n /\r\nexport class ToolbarHelper {\r\n /* Construct CustomToolbarItem definitions given a CustomItemDef. /\r\n public static createCustomDefinitionToolbarItem(itemPriority: number, itemDef: CustomItemDef, overrides?: Partial<CustomButtonDefinition>): ToolbarCustomItem {\r\n const isHidden = itemDef.isHidden;\r\n const isDisabled = itemDef.isDisabled;\r\n const internalData = new Map<string, any>(); // used to store ReactNode if iconSpec hold a ReactNode\r\n const icon = IconHelper.getIconData(itemDef.iconSpec, internalData);\r\n const label = this.getStringOrConditionalString(itemDef.rawLabel);\r\n const badgeType = itemDef.badgeType;\r\n\r\n // istanbul ignore else\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isCustom: true,\r\n isHidden,\r\n isDisabled,\r\n internalData,\r\n badgeType,\r\n panelContent: itemDef.popupPanelNode,\r\n ...overrides,\r\n };\r\n }\r\n\r\n /* Construct ActionButton and GroupButton definitions given an array to ItemDefs. /\r\n public static constructChildToolbarItems(itemDefs: AnyItemDef[]): Array<ToolbarActionItem \| ToolbarGroupItem> {\r\n let count = 10;\r\n const items: Array<ToolbarActionItem \| ToolbarGroupItem> = [];\r\n for (const itemDef of itemDefs) {\r\n const item = this.createToolbarItemFromItemDef(count, itemDef);\r\n count = count + 10;\r\n // istanbul ignore else\r\n if (isToolbarActionItem(item) \|\| isToolbarGroupItem(item))\r\n items.push(item);\r\n }\r\n return items;\r\n }\r\n\r\n private static getStringOrConditionalString(inString: string \| StringGetter \| ConditionalStringValue): string \| ConditionalStringValue {\r\n if (inString instanceof ConditionalStringValue \|\| typeof inString === \"string\")\r\n return inString;\r\n\r\n return inString();\r\n }\r\n\r\n public static getIconReactNode(item: ActionButton \| GroupButton): React.ReactNode {\r\n return IconHelper.getIconReactNode(item.icon, item.internalData);\r\n }\r\n\r\n /* Helper method to creates a generic toolbar item entry */\r\n public static createToolbarItemFromItemDef(itemPriority: number, itemDef: AnyItemDef, overrides?: Partial<CommonToolbarItem>): ToolbarItem {\r\n const isHidden = itemDef.isHidden;\r\n const isDisabled = itemDef.isDisabled;\r\n const icon = itemDef.iconSpec;\r\n const label = this.getStringOrConditionalString(itemDef.rawLabel);\r\n const badge = itemDef.badgeType;\r\n\r\n // istanbul ignore else\r\n if (itemDef instanceof CommandItemDef) {\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isHidden,\r\n isDisabled,\r\n isActive: itemDef.isActive,\r\n execute: itemDef.execute,\r\n badge,\r\n ...overrides,\r\n };\r\n } else if (itemDef instanceof CustomItemDef) {\r\n return ToolbarHelper.createCustomDefinitionToolbarItem(itemPriority, itemDef, overrides);\r\n } else if (itemDef instanceof GroupItemDef) {\r\n const children: Array<ToolbarActionItem \| ToolbarGroupItem> = this.constructChildToolbarItems(itemDef.items);\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n panelLabel: itemDef.panelLabel,\r\n isHidden,\r\n isDisabled,\r\n items: children,\r\n isActive: false,\r\n badge,\r\n ...overrides,\r\n };\r\n } else if (itemDef instanceof ToolItemDef) {\r\n return {\r\n id: itemDef.id,\r\n itemPriority,\r\n icon,\r\n label,\r\n isHidden,\r\n isDisabled,\r\n isActive: itemDef.isActive,\r\n execute: itemDef.execute,\r\n badge,\r\n ...overrides,\r\n };\r\n } else {\r\n throw new Error(`Invalid Item type encountered, item id=${itemDef.id}`);\r\n }\r\n }\r\n\r\n public static createToolbarItemsFromItemDefs(itemDefs: AnyItemDef[], startingItemPriority = 10, overrides?: Partial<CommonToolbarItem>): ToolbarItem[] {\r\n let itemPriority = startingItemPriority;\r\n const items = itemDefs.map((itemDef: AnyItemDef) => {\r\n const item = ToolbarHelper.createToolbarItemFromItemDef(itemPriority, itemDef, overrides);\r\n itemPriority = itemPriority + 10;\r\n return item;\r\n });\r\n return items;\r\n }\r\n}\r\n"]}

package/lib/esm/appui-react/toolbar/ToolbarItem.d.ts CHANGED Viewed

@@ -1,53 +1,104 @@
 /** @packageDocumentation
  * @module Toolbar
  */
-import { ActionButton, CustomButtonDefinition, GroupButton, CommonToolbarItem as UIA_CommonToolbarItem, ToolbarItem as UIA_ToolbarItem, ToolbarOrientation as UIA_ToolbarOrientation, ToolbarUsage as UIA_ToolbarUsage } from "@itwin/appui-abstract";
+/// <reference types="react" />
+import { BadgeType, ConditionalBooleanValue, ConditionalStringValue } from "@itwin/appui-abstract";
+import { IconSpec } from "@itwin/core-react";
 /** Used to specify the usage of the toolbar which determine the toolbar position.
- * @public // TODO: 4.x cleanup
+ * @public
  */
-export declare type ToolbarUsage = UIA_ToolbarUsage;
-/** Used to specify the usage of the toolbar which determine the toolbar position.
- * @public // TODO: 4.x cleanup
- */
-export declare const ToolbarUsage: typeof UIA_ToolbarUsage;
-/** Used to specify the orientation of the toolbar.
- * @public // TODO: 4.x cleanup
- */
-export declare type ToolbarOrientation = UIA_ToolbarOrientation;
+export declare enum ToolbarUsage {
+    /** Contains tools to Create Update and Delete content - in ninezone this is in top left of content area. */
+    ContentManipulation = 0,
+    /** Manipulate view/camera - in ninezone this is in top right of content area. */
+    ViewNavigation = 1
+}
 /** Used to specify the orientation of the toolbar.
- * @public // TODO: 4.x cleanup
+ * @public
  */
-export declare const ToolbarOrientation: typeof UIA_ToolbarOrientation;
+export declare enum ToolbarOrientation {
+    /** Horizontal toolbar. */
+    Horizontal = 0,
+    /** Vertical toolbar. */
+    Vertical = 1
+}
 /** Describes the data needed to insert a UI items into an existing set of UI items.
- * @beta
+ * @public
  */
-export declare type CommonToolbarItem = UIA_ToolbarItem;
+export interface CommonToolbarItem {
+    /** Require uniqueId for the item. To ensure uniqueness it is suggested that a namespace prefix of the extension name be used. */
+    readonly id: string;
+    /** Describes badge. Renders no badge if not specified. */
+    readonly badge?: BadgeType;
+    /** Optional description */
+    readonly description?: string | ConditionalStringValue;
+    /** Defines if the item is active (shown with an active stripe/bar). */
+    readonly isActive?: boolean;
+    /** Describes if the item is visible or hidden. The default is for the item to be visible. */
+    readonly isHidden?: boolean | ConditionalBooleanValue;
+    /** Describes if the item is enabled or disabled. The default is for the item to be enabled. */
+    readonly isDisabled?: boolean | ConditionalBooleanValue;
+    /** Specifies the item's grouping value. Items are sorted by group and then item priority. When
+     * group priority changes a separator is inserted. It is recommended using values 10 through 100, incrementing by 10. This
+     * allows extensions enough gaps to insert their own groups. If the value is not specified a groupPriority of 0 is used.
+     */
+    readonly groupPriority?: number;
+    /** Priority within a toolbar or group. */
+    readonly itemPriority: number;
+}
 /** Describes the data needed to insert an action button into a toolbar.
- * @beta
+ * @public
  */
-export declare type ToolbarActionItem = ActionButton;
+export interface ToolbarActionItem extends CommonToolbarItem {
+    /** Name of icon WebFont entry or if specifying an imported SVG symbol use "webSvg:" prefix  to imported symbol Id. */
+    readonly icon: IconSpec;
+    /** label, shown as tool tip on a button or an item label in a group. */
+    readonly label: string | ConditionalStringValue;
+    /** function to run when the button is pressed. */
+    readonly execute: () => void;
+    /** Optional parent tool group to add the tool to. */
+    readonly parentGroupItemId?: string;
+}
 /** Describes the data needed to insert a group button into a toolbar.
- * @beta
+ * @public
  */
-export declare type ToolbarGroupItem = GroupButton;
+export interface ToolbarGroupItem extends CommonToolbarItem {
+    /** Name of icon WebFont entry or if specifying an imported SVG symbol use "webSvg:" prefix to imported symbol Id. */
+    readonly icon: IconSpec;
+    /** label, shown as tool tip on group button or a group button label in a group panel. */
+    readonly label: string | ConditionalStringValue;
+    /** label shown as the title in at top of group panel. */
+    readonly panelLabel?: string | ConditionalStringValue;
+    /** children of the group */
+    readonly items: ReadonlyArray<ToolbarActionItem | ToolbarGroupItem>;
+    /** Optional parent tool group to add the tool to. */
+    readonly parentGroupItemId?: string;
+}
 /** Describes the data needed to insert a custom button into a toolbar.
- * @beta
+ * @public
  */
-export declare type ToolbarCustomItem = CustomButtonDefinition;
+export interface ToolbarCustomItem extends CommonToolbarItem {
+    /** Name of icon WebFont entry or if specifying an imported SVG symbol use "webSvg:" prefix to imported symbol Id. */
+    readonly icon?: IconSpec;
+    /** label, shown as tool tip on group button or a group button label in a group panel. */
+    readonly label?: string | ConditionalStringValue;
+    /** defines the content to display in popup panel */
+    readonly panelContent?: React.ReactNode;
+}
 /** Any Button Type that can be inserted into a toolbar.
- * @beta
+ * @public
  */
-export declare type ToolbarItem = UIA_CommonToolbarItem;
+export declare type ToolbarItem = ToolbarActionItem | ToolbarGroupItem | ToolbarCustomItem;
 /** ToolbarActionItem type guard.
- * @beta
+ * @public
  */
 export declare function isToolbarActionItem(item: ToolbarItem): item is ToolbarActionItem;
 /** ToolbarGroupItem type guard.
- * @beta
+ * @public
  */
 export declare function isToolbarGroupItem(item: ToolbarItem): item is ToolbarGroupItem;
 /** ToolbarCustomItem type guard.
- * @beta
+ * @public
  */
 export declare function isToolbarCustomItem(item: ToolbarItem): item is ToolbarCustomItem;
 //# sourceMappingURL=ToolbarItem.d.ts.map

package/lib/esm/appui-react/toolbar/ToolbarItem.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolbarItem.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarItem.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,~~EACL~~,~~YAAY~~,~~EACZ~~,sBAAsB,~~EACtB~~,~~WAAW~~,~~EACX~~,~~iBAAiB~~,~~IAAI~~,~~qBAAqB~~,~~EAC1C~~,~~WAAW~~,IAAI,~~eAAe~~,~~EAE9B~~,kBAAkB,IAAI,~~sBAAsB~~,~~EAC5C~~,~~YAAY,~~IAAI,~~gBAAgB~~,~~EACjC~~,MAAM,uBAAuB,CAAC;~~AAE~~/~~B;;GAEG;AACH~~,~~oBAAY~~,~~YAAY~~,GAAG,~~gBAAgB~~,CAAC;~~AAE5C;;GAEG~~;~~AACH~~,~~eAAO~~,MAAM,YAAY,~~yBAAmB~~,CAAC;~~AAE7C~~;;GAEG;AACH,~~oBAAY~~,~~kBAAkB~~,GAAG,sBAAsB,CAAC;~~AAExD;;GAEG~~;~~AACH~~,~~eAAO~~,MAAM,~~kBAAkB,+BAAyB~~,CAAC;~~AAEzD;;GAEG~~;~~AACH~~,~~oBAAY~~,iBAAiB,~~GAAG~~,~~eAAe~~,CAAC;~~AAEhD~~;;GAEG;AACH,~~oBAAY~~,iBAAiB,GAAG,~~YAAY~~,CAAC;~~AAE7C;;GAEG~~;~~AACH~~,~~oBAAY~~,~~gBAAgB~~,GAAG,~~WAAW~~,CAAC;~~AAE3C~~;;GAEG;AACH,~~oBAAY~~,iBAAiB,GAAG,sBAAsB,CAAC;~~AAEvD~~;;GAEG;AACH,oBAAY,WAAW,GAAG,~~qBAAqB~~,CAAC;~~AAEhD~~;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,iBAAiB,CAEhF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,gBAAgB,CAE9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,iBAAiB,CAEhF"}
1	+ {"version":3,"file":"ToolbarItem.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarItem.ts"],"names":[],"mappings":"AAIA;;GAEG;;AAEH,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,oBAAY,YAAY;IACtB,4GAA4G;IAC5G,mBAAmB,IAAI;IACvB,iFAAiF;IACjF,cAAc,IAAI;CACnB;AAED;;GAEG;AACH,oBAAY,kBAAkB;IAC5B,0BAA0B;IAC1B,UAAU,IAAI;IACd,wBAAwB;IACxB,QAAQ,IAAI;CACb;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,iIAAiI;IACjI,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAC3B,2BAA2B;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAC;IACvD,uEAAuE;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,6FAA6F;IAC7F,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAC;IACtD,+FAA+F;IAC/F,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,uBAAuB,CAAC;IACxD;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,0CAA0C;IAC1C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,sHAAsH;IACtH,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAChD,kDAAkD;IAClD,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,qDAAqD;IACrD,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,qHAAqH;IACrH,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,yFAAyF;IACzF,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAAC;IAChD,yDAAyD;IACzD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAC;IACtD,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,CAAC;IACpE,qDAAqD;IACrD,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,qHAAqH;IACrH,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IACzB,yFAAyF;IACzF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAC;IACjD,oDAAoD;IACpD,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,oBAAY,WAAW,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;AAEnF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,iBAAiB,CAEhF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,gBAAgB,CAE9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,IAAI,iBAAiB,CAEhF"}

package/lib/esm/appui-react/toolbar/ToolbarItem.js CHANGED Viewed

@@ -5,31 +5,42 @@
 /** @packageDocumentation
  * @module Toolbar
  */
-import { ToolbarItemUtilities as UIA_ToolbarItemUtilities, ToolbarOrientation as UIA_ToolbarOrientation, ToolbarUsage as UIA_ToolbarUsage, } from "@itwin/appui-abstract";
 /** Used to specify the usage of the toolbar which determine the toolbar position.
- * @public // TODO: 4.x cleanup
+ * @public
  */
-export const ToolbarUsage = UIA_ToolbarUsage; // eslint-disable-line @typescript-eslint/no-redeclare, deprecation/deprecation
+export var ToolbarUsage;
+(function (ToolbarUsage) {
+    /** Contains tools to Create Update and Delete content - in ninezone this is in top left of content area. */
+    ToolbarUsage[ToolbarUsage["ContentManipulation"] = 0] = "ContentManipulation";
+    /** Manipulate view/camera - in ninezone this is in top right of content area. */
+    ToolbarUsage[ToolbarUsage["ViewNavigation"] = 1] = "ViewNavigation";
+})(ToolbarUsage || (ToolbarUsage = {}));
 /** Used to specify the orientation of the toolbar.
- * @public // TODO: 4.x cleanup
+ * @public
  */
-export const ToolbarOrientation = UIA_ToolbarOrientation; // eslint-disable-line @typescript-eslint/no-redeclare, deprecation/deprecation
+export var ToolbarOrientation;
+(function (ToolbarOrientation) {
+    /** Horizontal toolbar. */
+    ToolbarOrientation[ToolbarOrientation["Horizontal"] = 0] = "Horizontal";
+    /** Vertical toolbar. */
+    ToolbarOrientation[ToolbarOrientation["Vertical"] = 1] = "Vertical";
+})(ToolbarOrientation || (ToolbarOrientation = {}));
 /** ToolbarActionItem type guard.
- * @beta
+ * @public
  */
 export function isToolbarActionItem(item) {
-    return UIA_ToolbarItemUtilities.isActionButton(item);
+    return "execute" in item;
 }
 /** ToolbarGroupItem type guard.
- * @beta
+ * @public
  */
 export function isToolbarGroupItem(item) {
-    return UIA_ToolbarItemUtilities.isGroupButton(item);
+    return "items" in item;
 }
 /** ToolbarCustomItem type guard.
- * @beta
+ * @public
  */
 export function isToolbarCustomItem(item) {
-    return UIA_ToolbarItemUtilities.isCustomDefinition(item);
+    return !isToolbarActionItem(item) && !isToolbarGroupItem(item);
 }
 //# sourceMappingURL=ToolbarItem.js.map