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

package/lib/cjs/appui-react/toolbar/ToolbarItemsManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolbarItemsManager.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/ToolbarItemsManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n */\r\n\r\nimport { ConditionalBooleanValue, ConditionalStringValue } from \"@itwin/appui-abstract\";\r\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { isToolbarGroupItem, ToolbarActionItem, ToolbarGroupItem, ToolbarItem } from \"./ToolbarItem\";\r\n\r\nfunction isInstance<T>(args: T | ReadonlyArray<T>): args is T {\r\n  return !Array.isArray(args);\r\n}\r\n\r\n/** Arguments of [[ToolbarItemsManager.onChanged]] event.\r\n * @internal\r\n */\r\nexport interface ToolbarItemsChangedArgs {\r\n  readonly items: ReadonlyArray<ToolbarItem>;\r\n}\r\n\r\n/**\r\n * Controls status bar items.\r\n * @internal\r\n */\r\nexport class ToolbarItemsManager {\r\n  protected _items: ReadonlyArray<ToolbarItem> = [];\r\n\r\n  constructor(items?: ReadonlyArray<ToolbarItem>) {\r\n    if (items)\r\n      this.loadItemsInternal(items, true, false);\r\n  }\r\n\r\n  /** Event raised when Toolbar items are changed.\r\n   * @internal\r\n   */\r\n  public readonly onItemsChanged = new BeEvent<(args: ToolbarItemsChangedArgs) => void>();\r\n\r\n  private loadItemsInternal(items: ReadonlyArray<ToolbarItem>, processConditions: boolean, sendItemChanged: boolean) {\r\n    if (processConditions && items) {\r\n      const eventIds = ToolbarItemsManager.getSyncIdsOfInterest(items);\r\n      if (0 !== eventIds.length) {\r\n        const { itemsUpdated, updatedItems } = this.internalRefreshAffectedItems(items, new Set(eventIds));\r\n\r\n        // istanbul ignore else\r\n        if (itemsUpdated)\r\n          items = updatedItems;\r\n      }\r\n    }\r\n\r\n    this._items = items;\r\n    if (sendItemChanged)\r\n      this.onItemsChanged.raiseEvent({ items });\r\n  }\r\n\r\n  /** load items but do not fire onItemsChanged\r\n   * @internal\r\n   */\r\n  public loadItems(items: ReadonlyArray<ToolbarItem>) {\r\n    this.loadItemsInternal(items, true, false);\r\n  }\r\n\r\n  /** Get an array of the Toolbar items  */\r\n  public get items(): ReadonlyArray<ToolbarItem> {\r\n    return this._items;\r\n  }\r\n\r\n  public set items(items: ReadonlyArray<ToolbarItem>) {\r\n    // istanbul ignore else\r\n    if (items !== this._items)\r\n      this.loadItemsInternal(items, true, true);\r\n  }\r\n\r\n  public add(itemOrItems: ToolbarItem | ReadonlyArray<ToolbarItem>) {\r\n    let itemsToAdd;\r\n    if (isInstance(itemOrItems))\r\n      itemsToAdd = [itemOrItems];\r\n    else {\r\n      itemsToAdd = itemOrItems.filter((itemToAdd, index) => itemOrItems.findIndex((item) => item.id === itemToAdd.id) === index);\r\n    }\r\n    itemsToAdd = itemsToAdd.filter((itemToAdd) => this._items.find((item) => item.id === itemToAdd.id) === undefined);\r\n    if (itemsToAdd.length === 0)\r\n      return;\r\n    const items = [\r\n      ...this._items,\r\n      ...itemsToAdd,\r\n    ];\r\n    this.items = items;\r\n  }\r\n\r\n  /** Remove Toolbar items based on id */\r\n  public remove(itemIdOrItemIds: ToolbarItem[\"id\"] | ReadonlyArray<ToolbarItem[\"id\"]>) {\r\n    const items = this._items.filter((item) => {\r\n      return isInstance(itemIdOrItemIds) ? item.id !== itemIdOrItemIds : !itemIdOrItemIds.find((itemId) => itemId === item.id);\r\n    });\r\n    this.items = items;\r\n  }\r\n\r\n  /** @internal */\r\n  public removeAll() {\r\n    this._items = [];\r\n  }\r\n\r\n  private static gatherSyncIds(eventIds: Set<string>, items: readonly ToolbarItem[]) {\r\n    for (const item of items) {\r\n      for (const [, entry] of Object.entries(item)) {\r\n        if (entry instanceof ConditionalBooleanValue) {\r\n          entry.syncEventIds.forEach((eventId: string) => eventIds.add(eventId.toLowerCase()));\r\n        } else /* istanbul ignore else */ if (entry instanceof ConditionalStringValue) {\r\n          entry.syncEventIds.forEach((eventId: string) => eventIds.add(eventId.toLowerCase()));\r\n        }\r\n      }\r\n\r\n      // istanbul ignore else\r\n      if (isToolbarGroupItem(item)) {\r\n        this.gatherSyncIds(eventIds, item.items);\r\n      }\r\n    }\r\n  }\r\n\r\n  public static getSyncIdsOfInterest(items: readonly ToolbarItem[]): string[] {\r\n    const eventIds = new Set<string>();\r\n    this.gatherSyncIds(eventIds, items);\r\n    return [...eventIds.values()];\r\n  }\r\n\r\n  private static refreshChildItems(parentItem: ToolbarGroupItem, eventIds: Set<string>): { childrenUpdated: boolean, childItems: ReadonlyArray<ToolbarActionItem | ToolbarGroupItem> } {\r\n    const updatedItems: Array<ToolbarActionItem | ToolbarGroupItem> = [];\r\n    let itemsUpdated = false;\r\n\r\n    for (const item of parentItem.items) {\r\n      let updatedItem;\r\n      if (isToolbarGroupItem(item)) {\r\n        updatedItem = { ...item };\r\n        const { childrenUpdated, childItems } = this.refreshChildItems(updatedItem, eventIds);\r\n        // istanbul ignore else\r\n        if (childrenUpdated) {\r\n          updatedItem.items = childItems;\r\n          itemsUpdated = true;\r\n        }\r\n      } else {\r\n        updatedItem = { ...item };\r\n      }\r\n\r\n      for (const [, entry] of Object.entries(updatedItem)) {\r\n        if (entry instanceof ConditionalBooleanValue) {\r\n          // istanbul ignore else\r\n          if (ConditionalBooleanValue.refreshValue(entry, eventIds))\r\n            itemsUpdated = true;\r\n        } else /* istanbul ignore else */ if (entry instanceof ConditionalStringValue) {\r\n          // istanbul ignore else\r\n          if (ConditionalStringValue.refreshValue(entry, eventIds))\r\n            itemsUpdated = true;\r\n        }\r\n      }\r\n\r\n      updatedItems.push(updatedItem);\r\n    }\r\n    return { childrenUpdated: itemsUpdated, childItems: updatedItems };\r\n  }\r\n\r\n  private internalRefreshAffectedItems(items: readonly ToolbarItem[], eventIds: Set<string>): { itemsUpdated: boolean, updatedItems: ToolbarItem[] } {\r\n    // istanbul ignore next\r\n    if (0 === eventIds.size)\r\n      return { itemsUpdated: false, updatedItems: [] };\r\n\r\n    let updateRequired = false;\r\n\r\n    const newItems: ToolbarItem[] = [];\r\n    for (const item of items) {\r\n      let updatedItem = { ...item };\r\n      if (isToolbarGroupItem(updatedItem)) {\r\n        const { childrenUpdated, childItems } = ToolbarItemsManager.refreshChildItems(updatedItem, eventIds);\r\n        // istanbul ignore else\r\n        if (childrenUpdated) {\r\n          updatedItem = {\r\n            ...updatedItem,\r\n            items: childItems,\r\n          };\r\n          updateRequired = true;\r\n        }\r\n      }\r\n\r\n      for (const [, entry] of Object.entries(updatedItem)) {\r\n        if (entry instanceof ConditionalBooleanValue) {\r\n          // istanbul ignore else\r\n          if (ConditionalBooleanValue.refreshValue(entry, eventIds))\r\n            updateRequired = true;\r\n        } else /* istanbul ignore else */ if (entry instanceof ConditionalStringValue) {\r\n          // istanbul ignore else\r\n          if (ConditionalStringValue.refreshValue(entry, eventIds))\r\n            updateRequired = true;\r\n        }\r\n      }\r\n\r\n      newItems.push(updatedItem);\r\n    }\r\n\r\n    return { itemsUpdated: updateRequired, updatedItems: newItems };\r\n  }\r\n\r\n  public refreshAffectedItems(eventIds: Set<string>) {\r\n    // istanbul ignore next\r\n    if (0 === eventIds.size)\r\n      return;\r\n\r\n    const { itemsUpdated, updatedItems } = this.internalRefreshAffectedItems(this.items, eventIds);\r\n\r\n    // istanbul ignore else\r\n    if (itemsUpdated)\r\n      this.loadItemsInternal(updatedItems, false, true);\r\n  }\r\n\r\n  private static isActiveToolIdRefreshRequiredForChildren(children: ReadonlyArray<ToolbarActionItem | ToolbarGroupItem>, toolId: string): boolean {\r\n    for (const item of children) {\r\n      if (isToolbarGroupItem(item)) {\r\n        if (this.isActiveToolIdRefreshRequiredForChildren(item.items, toolId))\r\n          return true;\r\n      } else {\r\n        const isActive = !!item.isActive;\r\n        if ((isActive && item.id !== toolId) || (!isActive && item.id === toolId))\r\n          return true;\r\n      }\r\n    }\r\n    return false;\r\n  }\r\n\r\n  private isActiveToolIdRefreshRequired(toolId: string): boolean {\r\n    for (const item of this.items) {\r\n      if (isToolbarGroupItem(item)) {\r\n        if (ToolbarItemsManager.isActiveToolIdRefreshRequiredForChildren(item.items, toolId))\r\n          return true;\r\n      } else {\r\n        const isActive = !!item.isActive;\r\n        if ((isActive && item.id !== toolId) || (!isActive && item.id === toolId))\r\n          return true;\r\n      }\r\n    }\r\n\r\n    return false;\r\n  }\r\n\r\n  private static refreshActiveToolIdInChildItems(parentItem: ToolbarGroupItem, toolId: string): Array<ToolbarActionItem | ToolbarGroupItem> {\r\n    const newChildren: Array<ToolbarActionItem | ToolbarGroupItem> = [];\r\n    for (const item of parentItem.items) {\r\n      let updatedItem = { ...item };\r\n\r\n      if (isToolbarGroupItem(updatedItem)) {\r\n        updatedItem = {\r\n          ...updatedItem,\r\n          items: ToolbarItemsManager.refreshActiveToolIdInChildItems(updatedItem, toolId),\r\n        };\r\n      }\r\n\r\n      updatedItem.isActive = (updatedItem.id === toolId);\r\n      newChildren.push(updatedItem);\r\n    }\r\n    return newChildren;\r\n  }\r\n\r\n  public setActiveToolId(toolId: string) {\r\n    // first see if any updates are really necessary\r\n    if (!this.isActiveToolIdRefreshRequired(toolId))\r\n      return;\r\n\r\n    const newItems: ToolbarItem[] = [];\r\n    for (const item of this.items) {\r\n      let updatedItem = { ...item };\r\n\r\n      if (isToolbarGroupItem(updatedItem)) {\r\n        updatedItem = {\r\n          ...updatedItem,\r\n          items: ToolbarItemsManager.refreshActiveToolIdInChildItems(updatedItem, toolId),\r\n        };\r\n      }\r\n\r\n      updatedItem.isActive = (updatedItem.id === toolId);\r\n      newItems.push(updatedItem);\r\n    }\r\n\r\n    this.items = newItems;\r\n  }\r\n\r\n}\r\n"]}

package/lib/cjs/appui-react/toolbar/toUIAToolbarItem.d.ts

@@ -0,0 +1,8 @@
+/** @packageDocumentation
+ * @module Toolbar
+ */
+import { CommonToolbarItem as UIA_CommonToolbarItem } from "@itwin/appui-abstract";
+import { ToolbarItem } from "./ToolbarItem";
+/** @internal */
+export declare function toUIAToolbarItem(item: ToolbarItem): UIA_CommonToolbarItem;
+//# sourceMappingURL=toUIAToolbarItem.d.ts.map

package/lib/cjs/appui-react/toolbar/toUIAToolbarItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toUIAToolbarItem.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/toUIAToolbarItem.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnF,OAAO,EAAuB,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjE,gBAAgB;AAChB,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,qBAAqB,CAWzE"}

package/lib/cjs/appui-react/toolbar/toUIAToolbarItem.js

@@ -0,0 +1,26 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Toolbar
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toUIAToolbarItem = void 0;
+const ToolbarItem_1 = require("./ToolbarItem");
+/** @internal */
+function toUIAToolbarItem(item) {
+    if ((0, ToolbarItem_1.isToolbarCustomItem)(item)) {
+        const customItem = {
+            ...item,
+            isCustom: true,
+            icon: item.icon,
+            panelContentNode: item.panelContent,
+        };
+        return customItem;
+    }
+    return item; // TODO: 4.0
+}
+exports.toUIAToolbarItem = toUIAToolbarItem;
+//# sourceMappingURL=toUIAToolbarItem.js.map

package/lib/cjs/appui-react/toolbar/toUIAToolbarItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toUIAToolbarItem.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/toUIAToolbarItem.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAIH,+CAAiE;AAEjE,gBAAgB;AAChB,SAAgB,gBAAgB,CAAC,IAAiB;IAChD,IAAI,IAAA,iCAAmB,EAAC,IAAI,CAAC,EAAE;QAC7B,MAAM,UAAU,GAAsB;YACpC,GAAG,IAAI;YACP,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,IAAI,CAAC,IAAc;YACzB,gBAAgB,EAAE,IAAI,CAAC,YAAY;SACpC,CAAC;QACF,OAAO,UAAU,CAAC;KACnB;IACD,OAAO,IAA6B,CAAC,CAAC,YAAY;AACpD,CAAC;AAXD,4CAWC","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 { CommonToolbarItem as UIA_CommonToolbarItem } from \"@itwin/appui-abstract\";\r\nimport { CustomToolbarItem } from \"@itwin/components-react\";\r\nimport { isToolbarCustomItem, ToolbarItem } from \"./ToolbarItem\";\r\n\r\n/** @internal */\r\nexport function toUIAToolbarItem(item: ToolbarItem): UIA_CommonToolbarItem {\r\n  if (isToolbarCustomItem(item)) {\r\n    const customItem: CustomToolbarItem = {\r\n      ...item,\r\n      isCustom: true,\r\n      icon: item.icon as string,\r\n      panelContentNode: item.panelContent,\r\n    };\r\n    return customItem;\r\n  }\r\n  return item as UIA_CommonToolbarItem; // TODO: 4.0\r\n}\r\n"]}

package/lib/cjs/appui-react/toolbar/useDefaultToolbarItems.d.ts

@@ -1,9 +1,10 @@
 /** @packageDocumentation
  * @module Toolbar
  */
-import { CommonToolbarItem, ToolbarItemsManager } from "@itwin/appui-abstract";
+import { ToolbarItem } from "./ToolbarItem";
+import { ToolbarItemsManager } from "./ToolbarItemsManager";
 /** Hook that returns items from [[ToolbarItemsManager]].
  * @public
  */
-export declare const useDefaultToolbarItems: (manager: ToolbarItemsManager) => readonly CommonToolbarItem[];
+export declare const useDefaultToolbarItems: (manager: ToolbarItemsManager) => readonly ToolbarItem[];
 //# sourceMappingURL=useDefaultToolbarItems.d.ts.map

package/lib/cjs/appui-react/toolbar/useDefaultToolbarItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDefaultToolbarItems.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useDefaultToolbarItems.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,iBAAiB,EAA2B,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAExG;;GAEG;AACH,eAAO,MAAM,sBAAsB,YAAa,mBAAmB,KAAG,SAAS,iBAAiB,EAoB/F,CAAC"}
+{"version":3,"file":"useDefaultToolbarItems.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useDefaultToolbarItems.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,sBAAsB,YAAa,mBAAmB,KAAG,SAAS,WAAW,EAgBzF,CAAC"}

package/lib/cjs/appui-react/toolbar/useDefaultToolbarItems.js

@@ -23,13 +23,9 @@ const useDefaultToolbarItems = (manager) => {
         }
     }, [manager, manager.items]);
     React.useEffect(() => {
-        const handleChanged = (args) => {
+        return manager.onItemsChanged.addListener((args) => {
             setItems(args.items);
-        };
-        manager.onItemsChanged.addListener(handleChanged);
-        return () => {
-            manager.onItemsChanged.removeListener(handleChanged);
-        };
+        });
     }, [manager]);
     return items;
 };

package/lib/cjs/appui-react/toolbar/useDefaultToolbarItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDefaultToolbarItems.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useDefaultToolbarItems.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,+BAA+B;AAG/B;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAA4B,EAAgC,EAAE;IACnG,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,cAAc,CAAC,OAAO;YACxB,cAAc,CAAC,OAAO,GAAG,KAAK,CAAC;aAC5B;YACH,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;YACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAClD,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AApBW,QAAA,sBAAsB,0BAoBjC","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 { CommonToolbarItem, ToolbarItemsChangedArgs, ToolbarItemsManager } from \"@itwin/appui-abstract\";\r\n\r\n/** Hook that returns items from [[ToolbarItemsManager]].\r\n * @public\r\n */\r\nexport const useDefaultToolbarItems = (manager: ToolbarItemsManager): readonly CommonToolbarItem[] => {\r\n  const [items, setItems] = React.useState(() => manager.items);\r\n  const isInitialMount = React.useRef(true);\r\n  React.useEffect(() => {\r\n    if (isInitialMount.current)\r\n      isInitialMount.current = false;\r\n    else {\r\n      setItems(manager.items);\r\n    }\r\n  }, [manager, manager.items]);\r\n  React.useEffect(() => {\r\n    const handleChanged = (args: ToolbarItemsChangedArgs) => {\r\n      setItems(args.items);\r\n    };\r\n    manager.onItemsChanged.addListener(handleChanged);\r\n    return () => {\r\n      manager.onItemsChanged.removeListener(handleChanged);\r\n    };\r\n  }, [manager]);\r\n  return items;\r\n};\r\n"]}
+{"version":3,"file":"useDefaultToolbarItems.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useDefaultToolbarItems.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,+BAA+B;AAI/B;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAA4B,EAA0B,EAAE;IAC7F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,cAAc,CAAC,OAAO;YACxB,cAAc,CAAC,OAAO,GAAG,KAAK,CAAC;aAC5B;YACH,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,OAAO,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE;YACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACd,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAhBW,QAAA,sBAAsB,0BAgBjC","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 { ToolbarItem } from \"./ToolbarItem\";\r\nimport { ToolbarItemsManager } from \"./ToolbarItemsManager\";\r\n\r\n/** Hook that returns items from [[ToolbarItemsManager]].\r\n * @public\r\n */\r\nexport const useDefaultToolbarItems = (manager: ToolbarItemsManager): readonly ToolbarItem[] => {\r\n  const [items, setItems] = React.useState(() => manager.items);\r\n  const isInitialMount = React.useRef(true);\r\n  React.useEffect(() => {\r\n    if (isInitialMount.current)\r\n      isInitialMount.current = false;\r\n    else {\r\n      setItems(manager.items);\r\n    }\r\n  }, [manager, manager.items]);\r\n  React.useEffect(() => {\r\n    return manager.onItemsChanged.addListener((args) => {\r\n      setItems(args.items);\r\n    });\r\n  }, [manager]);\r\n  return items;\r\n};\r\n"]}

package/lib/cjs/appui-react/toolbar/useUiItemsProviderToolbarItems.d.ts

@@ -1,9 +1,10 @@
 /** @packageDocumentation
  * @module Toolbar
  */
-import { CommonToolbarItem, ToolbarItemsManager, ToolbarOrientation, ToolbarUsage } from "@itwin/appui-abstract";
+import { ToolbarItem, ToolbarOrientation, ToolbarUsage } from "./ToolbarItem";
+import { ToolbarItemsManager } from "./ToolbarItemsManager";
 /** Hook that returns items from [[ToolbarItemsManager]].
  * @public
  */
-export declare const useUiItemsProviderToolbarItems: (manager: ToolbarItemsManager, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation) => readonly CommonToolbarItem[];
+export declare const useUiItemsProviderToolbarItems: (manager: ToolbarItemsManager, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation) => readonly ToolbarItem[];
 //# sourceMappingURL=useUiItemsProviderToolbarItems.d.ts.map

package/lib/cjs/appui-react/toolbar/useUiItemsProviderToolbarItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUiItemsProviderToolbarItems.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useUiItemsProviderToolbarItems.tsx"],"names":[],"mappings":"AAKA;;GAEG;AAGH,OAAO,EACL,iBAAiB,EAA2B,mBAAmB,EAAE,kBAAkB,EAAE,YAAY,EAClG,MAAM,uBAAuB,CAAC;AAK/B;;GAEG;AACH,eAAO,MAAM,8BAA8B,YAAa,mBAAmB,gBAAgB,YAAY,sBAAsB,kBAAkB,KAAG,SAAS,iBAAiB,EAiC3K,CAAC"}
+{"version":3,"file":"useUiItemsProviderToolbarItems.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useUiItemsProviderToolbarItems.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAMH,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,8BAA8B,YAAa,mBAAmB,gBAAgB,YAAY,sBAAsB,kBAAkB,KAAG,SAAS,WAAW,EA6BrK,CAAC"}

package/lib/cjs/appui-react/toolbar/useUiItemsProviderToolbarItems.js

@@ -3,17 +3,16 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-/* eslint-disable deprecation/deprecation */
 /** @packageDocumentation
  * @module Toolbar
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useUiItemsProviderToolbarItems = void 0;
 const React = require("react");
-const appui_abstract_1 = require("@itwin/appui-abstract");
 const useActiveStageId_1 = require("../hooks/useActiveStageId");
 const useAvailableUiItemsProviders_1 = require("../hooks/useAvailableUiItemsProviders");
-const FrontstageManager_1 = require("../frontstage/FrontstageManager");
+const UiFramework_1 = require("../UiFramework");
+const UiItemsManager_1 = require("../ui-items-provider/UiItemsManager");
 /** Hook that returns items from [[ToolbarItemsManager]].
  * @public
  */
@@ -27,27 +26,22 @@ const useUiItemsProviderToolbarItems = (manager, toolbarUsage, toolbarOrientatio
     // current stage's composer allows entries from extensions.
     React.useEffect(() => {
         const uiProviders = uiItemsProviderIds.join("-");
-        const handleChanged = (args) => {
-            setItems(args.items);
-        };
-        manager.onItemsChanged.addListener(handleChanged);
         // istanbul ignore else
         if (providersRef.current !== uiProviders || currentStageRef.current !== stageId) {
-            const frontstageDef = FrontstageManager_1.FrontstageManager.activeFrontstageDef;
+            const frontstageDef = UiFramework_1.UiFramework.frontstages.activeFrontstageDef;
             // istanbul ignore else
             if (frontstageDef) {
                 const usage = frontstageDef.usage;
-                const applicationData = frontstageDef.applicationData;
                 currentStageRef.current = stageId;
                 providersRef.current = uiProviders;
-                const toolbarItems = appui_abstract_1.UiItemsManager.getToolbarButtonItems(stageId, usage, toolbarUsage, toolbarOrientation, applicationData);
+                const toolbarItems = UiItemsManager_1.UiItemsManager.getToolbarButtonItems(stageId, usage, toolbarUsage, toolbarOrientation);
                 manager.loadItems(toolbarItems);
                 setItems(manager.items);
             }
         }
-        return () => {
-            manager.onItemsChanged.removeListener(handleChanged);
-        };
+        return manager.onItemsChanged.addListener((args) => {
+            setItems(args.items);
+        });
     }, [uiItemsProviderIds, stageId, manager, toolbarUsage, toolbarOrientation]);
     return items;
 };

package/lib/cjs/appui-react/toolbar/useUiItemsProviderToolbarItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUiItemsProviderToolbarItems.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useUiItemsProviderToolbarItems.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F,4CAA4C;AAC5C;;GAEG;;;AAEH,+BAA+B;AAC/B,0DAE+B;AAC/B,gEAA6D;AAC7D,wFAAqF;AACrF,uEAAoE;AAEpE;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAAC,OAA4B,EAAE,YAA0B,EAAE,kBAAsC,EAAgC,EAAE;IAC/K,MAAM,kBAAkB,GAAG,IAAA,2DAA4B,GAAE,CAAC;IAC1D,MAAM,OAAO,GAAG,IAAA,mCAAgB,GAAE,CAAC;IACnC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,wHAAwH;IACxH,2DAA2D;IAC3D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;YACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;QACF,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAClD,uBAAuB;QACvB,IAAI,YAAY,CAAC,OAAO,KAAK,WAAW,IAAI,eAAe,CAAC,OAAO,KAAK,OAAO,EAAE;YAC/E,MAAM,aAAa,GAAG,qCAAiB,CAAC,mBAAmB,CAAC;YAC5D,uBAAuB;YACvB,IAAI,aAAa,EAAE;gBACjB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBAClC,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;gBACtD,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC;gBAClC,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC;gBACnC,MAAM,YAAY,GAAG,+BAAc,CAAC,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC;gBAC7H,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAChC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aACzB;SACF;QACD,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAjCW,QAAA,8BAA8B,kCAiCzC","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/* eslint-disable deprecation/deprecation */\r\n/** @packageDocumentation\r\n * @module Toolbar\r\n */\r\n\r\nimport * as React from \"react\";\r\nimport {\r\n  CommonToolbarItem, ToolbarItemsChangedArgs, ToolbarItemsManager, ToolbarOrientation, ToolbarUsage, UiItemsManager,\r\n} from \"@itwin/appui-abstract\";\r\nimport { useActiveStageId } from \"../hooks/useActiveStageId\";\r\nimport { useAvailableUiItemsProviders } from \"../hooks/useAvailableUiItemsProviders\";\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\n\r\n/** Hook that returns items from [[ToolbarItemsManager]].\r\n * @public\r\n */\r\nexport const useUiItemsProviderToolbarItems = (manager: ToolbarItemsManager, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation): readonly CommonToolbarItem[] => {\r\n  const uiItemsProviderIds = useAvailableUiItemsProviders();\r\n  const stageId = useActiveStageId();\r\n  const [items, setItems] = React.useState(manager.items);\r\n  const providersRef = React.useRef(\"\");\r\n  const currentStageRef = React.useRef(\"\");\r\n  // gathers items from registered extensions - dependent on when a uiItemsProvider is register or unregistered and if the\r\n  // current stage's composer allows entries from extensions.\r\n  React.useEffect(() => {\r\n    const uiProviders = uiItemsProviderIds.join(\"-\");\r\n    const handleChanged = (args: ToolbarItemsChangedArgs) => {\r\n      setItems(args.items);\r\n    };\r\n    manager.onItemsChanged.addListener(handleChanged);\r\n    // istanbul ignore else\r\n    if (providersRef.current !== uiProviders || currentStageRef.current !== stageId) {\r\n      const frontstageDef = FrontstageManager.activeFrontstageDef;\r\n      // istanbul ignore else\r\n      if (frontstageDef) {\r\n        const usage = frontstageDef.usage;\r\n        const applicationData = frontstageDef.applicationData;\r\n        currentStageRef.current = stageId;\r\n        providersRef.current = uiProviders;\r\n        const toolbarItems = UiItemsManager.getToolbarButtonItems(stageId, usage, toolbarUsage, toolbarOrientation, applicationData);\r\n        manager.loadItems(toolbarItems);\r\n        setItems(manager.items);\r\n      }\r\n    }\r\n    return () => {\r\n      manager.onItemsChanged.removeListener(handleChanged);\r\n    };\r\n  }, [uiItemsProviderIds, stageId, manager, toolbarUsage, toolbarOrientation]);\r\n  return items;\r\n};\r\n"]}
+{"version":3,"file":"useUiItemsProviderToolbarItems.js","sourceRoot":"","sources":["../../../../src/appui-react/toolbar/useUiItemsProviderToolbarItems.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,+BAA+B;AAC/B,gEAA6D;AAC7D,wFAAqF;AACrF,gDAA6C;AAE7C,wEAAqE;AAGrE;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAAC,OAA4B,EAAE,YAA0B,EAAE,kBAAsC,EAA0B,EAAE;IACzK,MAAM,kBAAkB,GAAG,IAAA,2DAA4B,GAAE,CAAC;IAC1D,MAAM,OAAO,GAAG,IAAA,mCAAgB,GAAE,CAAC;IACnC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,wHAAwH;IACxH,2DAA2D;IAC3D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjD,uBAAuB;QACvB,IAAI,YAAY,CAAC,OAAO,KAAK,WAAW,IAAI,eAAe,CAAC,OAAO,KAAK,OAAO,EAAE;YAC/E,MAAM,aAAa,GAAG,yBAAW,CAAC,WAAW,CAAC,mBAAmB,CAAC;YAClE,uBAAuB;YACvB,IAAI,aAAa,EAAE;gBACjB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBAClC,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC;gBAClC,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC;gBACnC,MAAM,YAAY,GAAG,+BAAc,CAAC,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;gBAC5G,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAChC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aACzB;SACF;QACD,OAAO,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE;YACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AA7BW,QAAA,8BAA8B,kCA6BzC","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 { useActiveStageId } from \"../hooks/useActiveStageId\";\r\nimport { useAvailableUiItemsProviders } from \"../hooks/useAvailableUiItemsProviders\";\r\nimport { UiFramework } from \"../UiFramework\";\r\nimport { ToolbarItem, ToolbarOrientation, ToolbarUsage } from \"./ToolbarItem\";\r\nimport { UiItemsManager } from \"../ui-items-provider/UiItemsManager\";\r\nimport { ToolbarItemsManager } from \"./ToolbarItemsManager\";\r\n\r\n/** Hook that returns items from [[ToolbarItemsManager]].\r\n * @public\r\n */\r\nexport const useUiItemsProviderToolbarItems = (manager: ToolbarItemsManager, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation): readonly ToolbarItem[] => {\r\n  const uiItemsProviderIds = useAvailableUiItemsProviders();\r\n  const stageId = useActiveStageId();\r\n  const [items, setItems] = React.useState(manager.items);\r\n  const providersRef = React.useRef(\"\");\r\n  const currentStageRef = React.useRef(\"\");\r\n  // gathers items from registered extensions - dependent on when a uiItemsProvider is register or unregistered and if the\r\n  // current stage's composer allows entries from extensions.\r\n  React.useEffect(() => {\r\n    const uiProviders = uiItemsProviderIds.join(\"-\");\r\n\r\n    // istanbul ignore else\r\n    if (providersRef.current !== uiProviders || currentStageRef.current !== stageId) {\r\n      const frontstageDef = UiFramework.frontstages.activeFrontstageDef;\r\n      // istanbul ignore else\r\n      if (frontstageDef) {\r\n        const usage = frontstageDef.usage;\r\n        currentStageRef.current = stageId;\r\n        providersRef.current = uiProviders;\r\n        const toolbarItems = UiItemsManager.getToolbarButtonItems(stageId, usage, toolbarUsage, toolbarOrientation);\r\n        manager.loadItems(toolbarItems);\r\n        setItems(manager.items);\r\n      }\r\n    }\r\n    return manager.onItemsChanged.addListener((args) => {\r\n      setItems(args.items);\r\n    });\r\n  }, [uiItemsProviderIds, stageId, manager, toolbarUsage, toolbarOrientation]);\r\n  return items;\r\n};\r\n"]}

package/lib/cjs/appui-react/tools/CoreToolDefinitions.d.ts

@@ -2,19 +2,12 @@
  * @module Tools
  */
 import { CommandItemDef } from "../shared/CommandItemDef";
-import { CustomItemDef } from "../shared/CustomItemDef";
 import { ToolItemDef } from "../shared/ToolItemDef";
 import { GroupItemDef } from "../toolbar/GroupItem";
 /** Utility Class that provides definitions of tools provided by the ($core-frontend) core. These definitions can be used to populate the UI.
  * @public
  */
 export declare class CoreTools {
-    /** Get the CustomItemDef for PopupButton
-     * @deprecated in 3.6.
-     * @public
-     */
-    static get keyinBrowserButtonItemDef(): CustomItemDef;
-    private static _renderKeyInBrowser;
     static get keyinPaletteButtonItemDef(): ToolItemDef;
     static get fitViewCommand(): ToolItemDef;
     static get windowAreaCommand(): ToolItemDef;

package/lib/cjs/appui-react/tools/CoreToolDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreToolDefinitions.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/tools/CoreToolDefinitions.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAeH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD;;GAEG;AAEH,qBAAa,SAAS;IACpB;;;OAGG;IACH,WAAkB,yBAAyB,kBAiB1C;IAGD,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAIhC;IAEF,WAAkB,yBAAyB,gBAO1C;IAED,WAAkB,cAAc,gBAQ/B;IAED,WAAkB,iBAAiB,gBAQlC;IAED,WAAkB,eAAe,gBAQhC;IAED,WAAkB,cAAc,gBAQ/B;IAED,WAAkB,iBAAiB,gBAalC;IAED,WAAkB,eAAe,gBAYhC;IAED,WAAkB,oBAAoB,gBAQrC;IAED,WAAkB,mBAAmB,gBAQpC;IAED,WAAkB,uBAAuB,gBAwBxC;IAED,WAAkB,cAAc,gBAQ/B;IAID,WAAkB,eAAe,gBAwBhC;IAED,WAAkB,eAAe,gBAsBhC;IAED,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAU/B,WAAkB,4BAA4B,gBAW7C;IAGD,WAAkB,8BAA8B,gBAW/C;IAGD,WAAkB,4BAA4B,gBAW7C;IAGD,WAAkB,4BAA4B,gBAW7C;IAED,WAAkB,gBAAgB,iBAiBjC;IAED,WAAkB,yBAAyB,iBAoC1C;IAGD,WAAkB,0BAA0B,gBAU3C;IAGD,WAAkB,0BAA0B,gBAU3C;IAED,WAAkB,gBAAgB,iBAWjC;IAED,WAAkB,qBAAqB,mBAoBtC;IAED,WAAkB,qCAAqC,gBAUtD;CACF"}
+{"version":3,"file":"CoreToolDefinitions.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/tools/CoreToolDefinitions.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAUH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAWpD;;GAEG;AAEH,qBAAa,SAAS;IACpB,WAAkB,yBAAyB,gBAO1C;IAED,WAAkB,cAAc,gBAQ/B;IAED,WAAkB,iBAAiB,gBAQlC;IAED,WAAkB,eAAe,gBAQhC;IAED,WAAkB,cAAc,gBAQ/B;IAED,WAAkB,iBAAiB,gBAalC;IAED,WAAkB,eAAe,gBAYhC;IAED,WAAkB,oBAAoB,gBAQrC;IAED,WAAkB,mBAAmB,gBAQpC;IAED,WAAkB,uBAAuB,gBAwBxC;IAED,WAAkB,cAAc,gBAQ/B;IAID,WAAkB,eAAe,gBAchC;IAED,WAAkB,eAAe,gBAchC;IAED,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAU/B,WAAkB,4BAA4B,gBAW7C;IAGD,WAAkB,8BAA8B,gBAW/C;IAGD,WAAkB,4BAA4B,gBAW7C;IAGD,WAAkB,4BAA4B,gBAW7C;IAED,WAAkB,gBAAgB,iBAiBjC;IAED,WAAkB,yBAAyB,iBAoC1C;IAGD,WAAkB,0BAA0B,gBAU3C;IAGD,WAAkB,0BAA0B,gBAU3C;IAED,WAAkB,gBAAgB,iBAWjC;IAED,WAAkB,qBAAqB,mBAkBtC;IAED,WAAkB,qCAAqC,gBAUtD;CACF"}

package/lib/cjs/appui-react/tools/CoreToolDefinitions.js

@@ -8,17 +8,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreTools = void 0;
-const React = require("react");
-// cSpell:ignore configurableui keyinbrowser
+const React = require("react"); // cSpell:ignore keyinbrowser
 const core_frontend_1 = require("@itwin/core-frontend");
 const appui_abstract_1 = require("@itwin/appui-abstract");
-const components_react_1 = require("@itwin/components-react");
-const PopupButton_1 = require("../toolbar/PopupButton");
-const ContentViewManager_1 = require("../content/ContentViewManager");
-const KeyinBrowser_1 = require("../keyinbrowser/KeyinBrowser");
 const SelectionContextItemDef_1 = require("../selection/SelectionContextItemDef");
 const CommandItemDef_1 = require("../shared/CommandItemDef");
-const CustomItemDef_1 = require("../shared/CustomItemDef");
 const ToolItemDef_1 = require("../shared/ToolItemDef");
 const SyncUiEventDispatcher_1 = require("../syncui/SyncUiEventDispatcher");
 const GroupItem_1 = require("../toolbar/GroupItem");
@@ -26,30 +20,20 @@ const RestoreLayoutTool_1 = require("./RestoreLayoutTool");
 const UiFramework_1 = require("../UiFramework");
 const camera_animation_svg_1 = require("@itwin/itwinui-icons/icons/camera-animation.svg");
 const camera_animation_disabled_svg_1 = require("@itwin/itwinui-icons/icons/camera-animation-disabled.svg");
-/* eslint-disable deprecation/deprecation */
+const gyroscope_svg_1 = require("@bentley/icons-generic/icons/gyroscope.svg");
+const rotate_left_svg_1 = require("@bentley/icons-generic/icons/rotate-left.svg");
+const section_tool_svg_1 = require("@bentley/icons-generic/icons/section-tool.svg");
+const selection_clear_svg_1 = require("@bentley/icons-generic/icons/selection-clear.svg");
+const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
 /** Utility Class that provides definitions of tools provided by the ($core-frontend) core. These definitions can be used to populate the UI.
  * @public
  */
 // istanbul ignore next
 class CoreTools {
-    /** Get the CustomItemDef for PopupButton
-     * @deprecated in 3.6.
-     * @public
-     */
-    static get keyinBrowserButtonItemDef() {
-        return new CustomItemDef_1.CustomItemDef({
-            customId: "uif:keyinbrowser",
-            iconSpec: "icon-process",
-            labelKey: "UiFramework:keyinbrowser.label",
-            popupPanelNode: React.createElement(components_react_1.ToolbarPopupContext.Consumer, null, ({ closePanel }) => (React.createElement(KeyinBrowser_1.KeyinBrowser, { onExecute: closePanel, onCancel: closePanel }))),
-            // DEPRECATED way
-            reactElement: (React.createElement(PopupButton_1.PopupButton, { iconSpec: "icon-process", labelKey: "UiFramework:keyinbrowser.label" }, this._renderKeyInBrowser)),
-        });
-    }
     static get keyinPaletteButtonItemDef() {
         return new ToolItemDef_1.ToolItemDef({
             toolId: "uif:keyinpalette",
-            iconSpec: "icon-process",
+            iconSpec: React.createElement(itwinui_icons_react_1.SvgProcess, null),
             labelKey: "UiFramework:keyinbrowser.label",
             execute: () => { core_frontend_1.IModelApp.uiAdmin.showKeyinPalette(); },
         });
@@ -95,10 +79,10 @@ class CoreTools {
             toolId: core_frontend_1.RotateViewTool.toolId,
             iconSpec: new appui_abstract_1.ConditionalStringValue(() => {
                 var _a;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 if ((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is2d())
-                    return "icon-rotate-left";
-                return "icon-gyroscope";
+                    return appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(rotate_left_svg_1.default);
+                return appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(gyroscope_svg_1.default);
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             label: core_frontend_1.RotateViewTool.flyover,
             description: core_frontend_1.RotateViewTool.description,
@@ -113,7 +97,7 @@ class CoreTools {
             description: core_frontend_1.WalkViewTool.description,
             isHidden: new appui_abstract_1.ConditionalBooleanValue(() => {
                 var _a;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 return !!((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is2d());
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             execute: async () => core_frontend_1.IModelApp.tools.run(core_frontend_1.WalkViewTool.toolId, core_frontend_1.IModelApp.viewManager.selectedView),
@@ -142,7 +126,7 @@ class CoreTools {
             toolId: core_frontend_1.ViewToggleCameraTool.toolId,
             iconSpec: new appui_abstract_1.ConditionalStringValue(() => {
                 var _a, _b;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 if (((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is3d()) && ((_b = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _b === void 0 ? void 0 : _b.isCameraOn)) {
                     return appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(camera_animation_svg_1.default);
                 }
@@ -150,7 +134,7 @@ class CoreTools {
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             label: new appui_abstract_1.ConditionalStringValue(() => {
                 var _a, _b;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 if (((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is3d()) && ((_b = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _b === void 0 ? void 0 : _b.isCameraOn)) {
                     return UiFramework_1.UiFramework.translate("tools.View.ToggleCamera.turnOffFlyover");
                 }
@@ -159,7 +143,7 @@ class CoreTools {
             description: core_frontend_1.ViewToggleCameraTool.description,
             isHidden: new appui_abstract_1.ConditionalBooleanValue(() => {
                 var _a, _b;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 return !(((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is3d()) && ((_b = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _b === void 0 ? void 0 : _b.view.supportsCamera()));
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             execute: async () => core_frontend_1.IModelApp.tools.run(core_frontend_1.ViewToggleCameraTool.toolId, core_frontend_1.IModelApp.viewManager.selectedView),
@@ -180,7 +164,7 @@ class CoreTools {
         return new ToolItemDef_1.ToolItemDef({
             toolId: core_frontend_1.ViewUndoTool.toolId,
             isDisabled: new appui_abstract_1.ConditionalBooleanValue(() => {
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 if (activeContentControl && activeContentControl.viewport)
                     return !activeContentControl.viewport.isUndoPossible;
                 return false;
@@ -189,14 +173,6 @@ class CoreTools {
             label: core_frontend_1.ViewUndoTool.flyover,
             description: core_frontend_1.ViewUndoTool.description,
             execute: async () => core_frontend_1.IModelApp.tools.run(core_frontend_1.ViewUndoTool.toolId, core_frontend_1.IModelApp.viewManager.selectedView),
-            stateSyncIds: [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged],
-            stateFunc: (currentState) => {
-                const returnState = { ...currentState };
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
-                if (activeContentControl && activeContentControl.viewport)
-                    returnState.isEnabled = activeContentControl.viewport.isUndoPossible;
-                return returnState;
-            },
         });
     }
     static get viewRedoCommand() {
@@ -207,19 +183,11 @@ class CoreTools {
             description: core_frontend_1.ViewRedoTool.description,
             execute: async () => core_frontend_1.IModelApp.tools.run(core_frontend_1.ViewRedoTool.toolId, core_frontend_1.IModelApp.viewManager.selectedView),
             isDisabled: new appui_abstract_1.ConditionalBooleanValue(() => {
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 if (activeContentControl && activeContentControl.viewport)
                     return !activeContentControl.viewport.isRedoPossible;
                 return false;
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
-            stateSyncIds: [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged],
-            stateFunc: (currentState) => {
-                const returnState = { ...currentState };
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
-                if (activeContentControl && activeContentControl.viewport)
-                    returnState.isEnabled = activeContentControl.viewport.isRedoPossible;
-                return returnState;
-            },
         });
     }
     static turnOnClipVolume() {
@@ -289,10 +257,10 @@ class CoreTools {
         return new GroupItem_1.GroupItemDef({
             groupId: "sectionTools-group",
             labelKey: "UiFramework:tools.sectionTools",
-            iconSpec: "icon-section-tool",
+            iconSpec: appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(section_tool_svg_1.default),
             isHidden: new appui_abstract_1.ConditionalBooleanValue(() => {
                 var _a;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 return !!((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is2d());
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             items: [this.sectionByPlaneCommandItemDef, this.sectionByElementCommandItemDef, this.sectionByRangeCommandItemDef, this.sectionByShapeCommandItemDef],
@@ -308,10 +276,10 @@ class CoreTools {
             groupId: "sectionTools-group-with-panel",
             labelKey: "UiFramework:tools.sectionTools",
             panelLabelKey: "UiFramework:tools.sectionPanelLabel",
-            iconSpec: "icon-section-tool",
+            iconSpec: appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(section_tool_svg_1.default),
             isHidden: new appui_abstract_1.ConditionalBooleanValue(() => {
                 var _a;
-                const activeContentControl = ContentViewManager_1.ContentViewManager.getActiveContentControl();
+                const activeContentControl = UiFramework_1.UiFramework.content.getActiveContentControl();
                 return !!((_a = activeContentControl === null || activeContentControl === void 0 ? void 0 : activeContentControl.viewport) === null || _a === void 0 ? void 0 : _a.view.is2d());
             }, [SyncUiEventDispatcher_1.SyncUiEventId.ActiveContentChanged, SyncUiEventDispatcher_1.SyncUiEventId.ActiveViewportChanged, SyncUiEventDispatcher_1.SyncUiEventId.ViewStateChanged]),
             items: [
@@ -365,7 +333,7 @@ class CoreTools {
         return new GroupItem_1.GroupItemDef({
             groupId: "measureTools-group",
             labelKey: "UiFramework:tools.measureTools",
-            iconSpec: "icon-measure",
+            iconSpec: React.createElement(itwinui_icons_react_1.SvgMeasure, null),
             items: [this.measureDistanceToolItemDef, this.measureLocationToolItemDef],
             itemsInColumn: 2,
         });
@@ -373,10 +341,8 @@ class CoreTools {
     static get clearSelectionItemDef() {
         return new CommandItemDef_1.CommandItemDef({
             commandId: "UiFramework.ClearSelection",
-            iconSpec: "icon-selection-clear",
+            iconSpec: appui_abstract_1.IconSpecUtilities.createWebComponentIconSpec(selection_clear_svg_1.default),
             labelKey: "UiFramework:buttons.clearSelection",
-            stateSyncIds: (0, SelectionContextItemDef_1.getSelectionContextSyncEventIds)(),
-            stateFunc: SelectionContextItemDef_1.selectionContextStateFunc,
             isHidden: (0, SelectionContextItemDef_1.getIsHiddenIfSelectionNotActive)(),
             execute: async () => {
                 const iModelConnection = UiFramework_1.UiFramework.getIModelConnection();
@@ -404,8 +370,4 @@ class CoreTools {
     }
 }
 exports.CoreTools = CoreTools;
-// istanbul ignore next
-CoreTools._renderKeyInBrowser = ({ closePanel }) => {
-    return (React.createElement(KeyinBrowser_1.KeyinBrowser, { onExecute: closePanel, onCancel: closePanel }));
-};
 //# sourceMappingURL=CoreToolDefinitions.js.map