From 968dbd8db3cb09b473b51858784d8af5b68411ae Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Mon, 7 Oct 2024 15:16:12 +0300 Subject: [PATCH 01/26] Small fix --- common/api/summary/appui-react.exports.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/api/summary/appui-react.exports.csv b/common/api/summary/appui-react.exports.csv index 7b8efd0ff10..cde5c65e848 100644 --- a/common/api/summary/appui-react.exports.csv +++ b/common/api/summary/appui-react.exports.csv @@ -806,4 +806,4 @@ public;class;WidgetStateChangedEvent deprecated;class;WidgetStateChangedEvent public;interface;WidgetStateChangedEventArgs deprecated;interface;WidgetStateChangedEventArgs -public;enum;WidgetType \ No newline at end of file +public;enum;WidgetType From 010bb84db43f78c6471f5337deb8c8a061d1b37e Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 12:14:46 +0300 Subject: [PATCH 02/26] Removed @bentley/icons-generic elements --- apps/test-providers/src/icons/download.svg | 1 + apps/test-providers/src/icons/panorama.svg | 19 ++++++++++++++++++ apps/test-providers/src/icons/search.svg | 1 + apps/test-providers/src/icons/upload.svg | 1 + apps/test-providers/src/icons/window-add.svg | 1 + apps/test-providers/src/icons/window-new.svg | 1 + .../src/tools/ContentLayoutTools.tsx | 4 ++-- .../src/tools/InspectUiItemInfoTool.ts | 2 +- .../src/tools/OpenPopoutDialogTool.tsx | 2 +- .../src/tools/OpenPopoutViewTool.tsx | 2 +- .../src/tools/OpenSynchronizedViewTool.tsx | 2 +- .../storybook/src/deprecated/Icon.stories.tsx | 3 +-- .../icons/asset-classification-hide.svg | 12 +++++++++++ .../src/appui-react/icons/asset-isolate.svg | 14 +++++++++++++ .../appui-react/icons/cube-faces/bottom.svg | 1 + .../appui-react/icons/cube-faces/front.svg | 1 + .../appui-react/icons/cube-faces/iso-left.svg | 1 + .../icons/cube-faces/iso-right.svg | 1 + .../src/appui-react/icons/cube-faces/left.svg | 1 + .../src/appui-react/icons/cube-faces/rear.svg | 1 + .../appui-react/icons/cube-faces/right.svg | 1 + .../src/appui-react/icons/cube-faces/top.svg | 1 + .../src/appui-react/icons/gyroscope.svg | 1 + .../src/appui-react/icons/isolate.svg | 1 + .../src/appui-react/icons/layers-hide.svg | 14 +++++++++++++ .../src/appui-react/icons/layers-isolate.svg | 17 ++++++++++++++++ .../src/appui-react/icons/model-hide.svg | 1 + .../src/appui-react/icons/model-isolate.svg | 1 + .../src/appui-react/icons/remove.svg | 1 + .../src/appui-react/icons/rotate-left.svg | 1 + .../src/appui-react/icons/saved-view.svg | 1 + .../src/appui-react/icons/section-tool.svg | 1 + .../src/appui-react/icons/selection-clear.svg | 1 + .../src/appui-react/icons/settings.svg | 1 + .../src/appui-react/icons/snaps-bisector.svg | 1 + .../src/appui-react/icons/snaps-center.svg | 1 + .../appui-react/icons/snaps-intersection.svg | 1 + .../src/appui-react/icons/snaps-midpoint.svg | 1 + .../src/appui-react/icons/snaps-nearest.svg | 1 + .../src/appui-react/icons/snaps-origin.svg | 1 + .../src/appui-react/icons/snaps.svg | 1 + .../src/appui-react/icons/view-layouts.svg | 1 + .../appui-react/icons/visibility-hide_2.svg | 1 + .../icons/visibility-semi-transparent.svg | 1 + .../src/appui-react/icons/visibility.svg | 1 + .../StandardRotationNavigationAid.tsx | 16 +++++++-------- .../src/appui-react/pickers/ViewSelector.tsx | 2 +- .../selection/SelectionContextItemDef.ts | 20 +++++++++---------- .../settings/ui/UiSettingsPage.tsx | 4 ++-- .../statusfields/SectionsField.tsx | 2 +- .../src/appui-react/statusfields/SnapMode.tsx | 14 ++++++------- .../appui-react/tools/CoreToolDefinitions.tsx | 8 ++++---- .../appui-react/tools/KeyinPaletteTools.ts | 2 +- .../src/appui-react/tools/OpenSettingsTool.ts | 2 +- .../appui-react/tools/RestoreLayoutTool.ts | 2 +- .../editors/EnumButtonGroupEditor.tsx | 14 ++++++++++--- 56 files changed, 164 insertions(+), 47 deletions(-) create mode 100644 apps/test-providers/src/icons/download.svg create mode 100644 apps/test-providers/src/icons/panorama.svg create mode 100644 apps/test-providers/src/icons/search.svg create mode 100644 apps/test-providers/src/icons/upload.svg create mode 100644 apps/test-providers/src/icons/window-add.svg create mode 100644 apps/test-providers/src/icons/window-new.svg create mode 100644 ui/appui-react/src/appui-react/icons/asset-classification-hide.svg create mode 100644 ui/appui-react/src/appui-react/icons/asset-isolate.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/front.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/left.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/rear.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/right.svg create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/top.svg create mode 100644 ui/appui-react/src/appui-react/icons/gyroscope.svg create mode 100644 ui/appui-react/src/appui-react/icons/isolate.svg create mode 100644 ui/appui-react/src/appui-react/icons/layers-hide.svg create mode 100644 ui/appui-react/src/appui-react/icons/layers-isolate.svg create mode 100644 ui/appui-react/src/appui-react/icons/model-hide.svg create mode 100644 ui/appui-react/src/appui-react/icons/model-isolate.svg create mode 100644 ui/appui-react/src/appui-react/icons/remove.svg create mode 100644 ui/appui-react/src/appui-react/icons/rotate-left.svg create mode 100644 ui/appui-react/src/appui-react/icons/saved-view.svg create mode 100644 ui/appui-react/src/appui-react/icons/section-tool.svg create mode 100644 ui/appui-react/src/appui-react/icons/selection-clear.svg create mode 100644 ui/appui-react/src/appui-react/icons/settings.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-bisector.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-center.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-intersection.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-midpoint.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-nearest.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps-origin.svg create mode 100644 ui/appui-react/src/appui-react/icons/snaps.svg create mode 100644 ui/appui-react/src/appui-react/icons/view-layouts.svg create mode 100644 ui/appui-react/src/appui-react/icons/visibility-hide_2.svg create mode 100644 ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg create mode 100644 ui/appui-react/src/appui-react/icons/visibility.svg diff --git a/apps/test-providers/src/icons/download.svg b/apps/test-providers/src/icons/download.svg new file mode 100644 index 00000000000..c9512bb0b6e --- /dev/null +++ b/apps/test-providers/src/icons/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/test-providers/src/icons/panorama.svg b/apps/test-providers/src/icons/panorama.svg new file mode 100644 index 00000000000..dbe88a1e250 --- /dev/null +++ b/apps/test-providers/src/icons/panorama.svg @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/apps/test-providers/src/icons/search.svg b/apps/test-providers/src/icons/search.svg new file mode 100644 index 00000000000..5b2cdbe4d21 --- /dev/null +++ b/apps/test-providers/src/icons/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/test-providers/src/icons/upload.svg b/apps/test-providers/src/icons/upload.svg new file mode 100644 index 00000000000..90c8ad90eb1 --- /dev/null +++ b/apps/test-providers/src/icons/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/test-providers/src/icons/window-add.svg b/apps/test-providers/src/icons/window-add.svg new file mode 100644 index 00000000000..ed76934e656 --- /dev/null +++ b/apps/test-providers/src/icons/window-add.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/test-providers/src/icons/window-new.svg b/apps/test-providers/src/icons/window-new.svg new file mode 100644 index 00000000000..22505a5929a --- /dev/null +++ b/apps/test-providers/src/icons/window-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/test-providers/src/tools/ContentLayoutTools.tsx b/apps/test-providers/src/tools/ContentLayoutTools.tsx index bebb23aa144..98cdd539322 100644 --- a/apps/test-providers/src/tools/ContentLayoutTools.tsx +++ b/apps/test-providers/src/tools/ContentLayoutTools.tsx @@ -22,8 +22,8 @@ import { import { IModelConnection, ScreenViewport, Tool } from "@itwin/core-frontend"; import { SvgWindow, SvgWindowSplitVertical } from "@itwin/itwinui-icons-react"; -import layoutRestoreIconSvg from "@bentley/icons-generic/icons/download.svg"; -import layoutSaveIconSvg from "@bentley/icons-generic/icons/upload.svg"; +import layoutRestoreIconSvg from "../icons/download.svg"; +import layoutSaveIconSvg from "../icons/upload.svg"; import { ViewportContent } from "../ui/ViewportContent.js"; function getIModelSpecificKey( diff --git a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts index 9d0f2a3d681..13637210db2 100644 --- a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts +++ b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts @@ -14,7 +14,7 @@ import { IModelApp, PrimitiveTool, } from "@itwin/core-frontend"; -import inspectIconSvg from "@bentley/icons-generic/icons/search.svg"; +import inspectIconSvg from "../icons/search.svg"; export class InspectUiItemInfoTool extends PrimitiveTool { private _timerId: number | undefined; diff --git a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx index 0b19d3c8605..9e1a8f85830 100644 --- a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx @@ -8,7 +8,7 @@ import { ConditionalBooleanValue, ToolbarItemUtilities, } from "@itwin/appui-abstract"; -import windowAddSvg from "@bentley/icons-generic/icons/window-add.svg"; +import windowAddSvg from "../icons/window-add.svg"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { PopoutDialog } from "../ui/dialogs/PopoutDialog.js"; diff --git a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx index e5523b954ec..02eb1a5b90f 100644 --- a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx @@ -6,7 +6,7 @@ import { ToolbarItemUtilities } from "@itwin/appui-abstract"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { IModelApp, Tool } from "@itwin/core-frontend"; import * as React from "react"; -import windowPopoutSvg from "@bentley/icons-generic/icons/window-new.svg"; +import windowPopoutSvg from "../icons/window-new.svg"; import { PopupTestView } from "../ui/dialogs/PopupTestView.js"; export class OpenPopoutViewTool extends Tool { diff --git a/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx b/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx index 3019cd17fe2..11cddfd69f6 100644 --- a/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx +++ b/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx @@ -6,7 +6,7 @@ import { UiFramework } from "@itwin/appui-react"; import { IModelApp, Tool } from "@itwin/core-frontend"; import * as React from "react"; import { SynchronizedFloatingView } from "../ui/dialogs/SynchronizedFloatingViewComponent.js"; -import panoramaconSvg from "@bentley/icons-generic/icons/panorama.svg"; +import panoramaconSvg from "../icons/panorama.svg"; import { Dialog } from "@itwin/itwinui-react"; export class OpenSynchronizedViewTool extends Tool { diff --git a/docs/storybook/src/deprecated/Icon.stories.tsx b/docs/storybook/src/deprecated/Icon.stories.tsx index 9b2acfa3ec8..6e87af5f8fb 100644 --- a/docs/storybook/src/deprecated/Icon.stories.tsx +++ b/docs/storybook/src/deprecated/Icon.stories.tsx @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import React from "react"; import type { Decorator, Meta, StoryObj } from "@storybook/react"; -import placeholderSvg from "@bentley/icons-generic/icons/placeholder.svg"; import { useConditionalProp } from "@itwin/appui-react-internal/lib/esm/appui-react/hooks/useConditionalProp"; import { ImageRenderer } from "@itwin/components-react-internal/src/components-react/common/ImageRenderer"; import { ConditionalIconItem, Icon } from "@itwin/core-react"; @@ -50,7 +49,7 @@ export const ReactNode: Story = { export const SVGPath: Story = { args: { - iconSpec: placeholderSvg, + iconSpec: , }, }; diff --git a/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg b/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg new file mode 100644 index 00000000000..14eb3e99ecf --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg @@ -0,0 +1,12 @@ + + + + + diff --git a/ui/appui-react/src/appui-react/icons/asset-isolate.svg b/ui/appui-react/src/appui-react/icons/asset-isolate.svg new file mode 100644 index 00000000000..6f5c4c3c29d --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/asset-isolate.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg b/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg new file mode 100644 index 00000000000..ce396bcdaa1 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/front.svg b/ui/appui-react/src/appui-react/icons/cube-faces/front.svg new file mode 100644 index 00000000000..5c2af1fef5a --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/front.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg b/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg new file mode 100644 index 00000000000..a4b3f6d0209 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg b/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg new file mode 100644 index 00000000000..db79d7911e2 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/left.svg b/ui/appui-react/src/appui-react/icons/cube-faces/left.svg new file mode 100644 index 00000000000..2a9af6133eb --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg b/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg new file mode 100644 index 00000000000..5cca53fdb0b --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/right.svg b/ui/appui-react/src/appui-react/icons/cube-faces/right.svg new file mode 100644 index 00000000000..f78390c03e1 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/top.svg b/ui/appui-react/src/appui-react/icons/cube-faces/top.svg new file mode 100644 index 00000000000..8a0bdb110c2 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/gyroscope.svg b/ui/appui-react/src/appui-react/icons/gyroscope.svg new file mode 100644 index 00000000000..e0e0f8134c2 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/gyroscope.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/isolate.svg b/ui/appui-react/src/appui-react/icons/isolate.svg new file mode 100644 index 00000000000..60d52f9e052 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/isolate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/layers-hide.svg b/ui/appui-react/src/appui-react/icons/layers-hide.svg new file mode 100644 index 00000000000..bd3150c8667 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/layers-hide.svg @@ -0,0 +1,14 @@ + + + + + diff --git a/ui/appui-react/src/appui-react/icons/layers-isolate.svg b/ui/appui-react/src/appui-react/icons/layers-isolate.svg new file mode 100644 index 00000000000..3dcbee30b93 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/layers-isolate.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/ui/appui-react/src/appui-react/icons/model-hide.svg b/ui/appui-react/src/appui-react/icons/model-hide.svg new file mode 100644 index 00000000000..b5f5e1c0c3e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/model-hide.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/model-isolate.svg b/ui/appui-react/src/appui-react/icons/model-isolate.svg new file mode 100644 index 00000000000..7531e3a29aa --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/model-isolate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/remove.svg b/ui/appui-react/src/appui-react/icons/remove.svg new file mode 100644 index 00000000000..cb9dee923f6 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/remove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/rotate-left.svg b/ui/appui-react/src/appui-react/icons/rotate-left.svg new file mode 100644 index 00000000000..54264e70787 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/rotate-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/saved-view.svg b/ui/appui-react/src/appui-react/icons/saved-view.svg new file mode 100644 index 00000000000..398cb92c2a3 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/saved-view.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/section-tool.svg b/ui/appui-react/src/appui-react/icons/section-tool.svg new file mode 100644 index 00000000000..fb45a74fe81 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/section-tool.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/selection-clear.svg b/ui/appui-react/src/appui-react/icons/selection-clear.svg new file mode 100644 index 00000000000..b4945102733 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/selection-clear.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/settings.svg b/ui/appui-react/src/appui-react/icons/settings.svg new file mode 100644 index 00000000000..ea8059ade68 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-bisector.svg b/ui/appui-react/src/appui-react/icons/snaps-bisector.svg new file mode 100644 index 00000000000..dad551455e2 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-bisector.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-center.svg b/ui/appui-react/src/appui-react/icons/snaps-center.svg new file mode 100644 index 00000000000..7cd0596ae09 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-center.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-intersection.svg b/ui/appui-react/src/appui-react/icons/snaps-intersection.svg new file mode 100644 index 00000000000..4acab315b81 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-intersection.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg b/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg new file mode 100644 index 00000000000..15aeecd3d86 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-nearest.svg b/ui/appui-react/src/appui-react/icons/snaps-nearest.svg new file mode 100644 index 00000000000..667c920aebb --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-nearest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-origin.svg b/ui/appui-react/src/appui-react/icons/snaps-origin.svg new file mode 100644 index 00000000000..133da505bc7 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps-origin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps.svg b/ui/appui-react/src/appui-react/icons/snaps.svg new file mode 100644 index 00000000000..d5a5982f60f --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/snaps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/view-layouts.svg b/ui/appui-react/src/appui-react/icons/view-layouts.svg new file mode 100644 index 00000000000..bd90d6ae39e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/view-layouts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg b/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg new file mode 100644 index 00000000000..3b63d012b10 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg b/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg new file mode 100644 index 00000000000..c886fd8f295 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility.svg b/ui/appui-react/src/appui-react/icons/visibility.svg new file mode 100644 index 00000000000..ac693acc4f7 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/visibility.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx index b7542fb0b2d..bb95db27f9b 100644 --- a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx +++ b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx @@ -6,14 +6,14 @@ * @module NavigationAids */ -import svgCubeFacesBottom from "@bentley/icons-generic/icons/cube-faces/bottom.svg"; -import svgCubeFacesFront from "@bentley/icons-generic/icons/cube-faces/front.svg"; -import svgCubeFacesIsoLeft from "@bentley/icons-generic/icons/cube-faces/iso-left.svg"; -import svgCubeFacesIsoRight from "@bentley/icons-generic/icons/cube-faces/iso-right.svg"; -import svgCubeFacesLeft from "@bentley/icons-generic/icons/cube-faces/left.svg"; -import svgCubeFacesRear from "@bentley/icons-generic/icons/cube-faces/rear.svg"; -import svgCubeFacesRight from "@bentley/icons-generic/icons/cube-faces/right.svg"; -import svgCubeFacesTop from "@bentley/icons-generic/icons/cube-faces/top.svg"; +import svgCubeFacesBottom from "../icons/cube-faces/bottom.svg"; +import svgCubeFacesFront from "../icons/cube-faces/front.svg"; +import svgCubeFacesIsoLeft from "../icons/cube-faces/iso-left.svg"; +import svgCubeFacesIsoRight from "../icons/cube-faces/iso-right.svg"; +import svgCubeFacesLeft from "../icons/cube-faces/left.svg"; +import svgCubeFacesRear from "../icons/cube-faces/rear.svg"; +import svgCubeFacesRight from "../icons/cube-faces/right.svg"; +import svgCubeFacesTop from "../icons/cube-faces/top.svg"; import { RelativePosition, ToolbarItemUtilities } from "@itwin/appui-abstract"; import { Columns, diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index fb60fd8ecba..d0ba4e59bd8 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -18,7 +18,7 @@ import { ViewUtilities } from "../utils/ViewUtilities.js"; import type { ListItem } from "./ListPicker.js"; import { ListItemType, ListPicker } from "./ListPicker.js"; import { debounce } from "lodash"; -import svgSavedView from "@bentley/icons-generic/icons/saved-view.svg"; +import svgSavedView from "../icons/saved-view.svg"; import { useReduxFrameworkState } from "../uistate/useReduxFrameworkState.js"; import type { ListenerType } from "@itwin/core-react/internal"; diff --git a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts index 2631fe89908..55654381cfc 100644 --- a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts +++ b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts @@ -13,16 +13,16 @@ import type { BaseItemState } from "../shared/ItemDefBase.js"; import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; import { UiFramework } from "../UiFramework.js"; -import svgModelIsolate from "@bentley/icons-generic/icons/model-isolate.svg"; -import svgLayersIsolate from "@bentley/icons-generic/icons/layers-isolate.svg"; -import svgAssetIsolate from "@bentley/icons-generic/icons/asset-isolate.svg"; -import svgIsolate from "@bentley/icons-generic/icons/isolate.svg"; -import svgModelHide from "@bentley/icons-generic/icons/model-hide.svg"; -import svgLayersHide from "@bentley/icons-generic/icons/layers-hide.svg"; -import svgAssetClassificationHide from "@bentley/icons-generic/icons/asset-classification-hide.svg"; -import svgVisibilitySemiTransparent from "@bentley/icons-generic/icons/visibility-semi-transparent.svg"; -import svgVisibilityHide from "@bentley/icons-generic/icons/visibility-hide_2.svg"; -import svgVisibility from "@bentley/icons-generic/icons/visibility.svg"; +import svgModelIsolate from "../icons/model-isolate.svg"; +import svgLayersIsolate from "../icons/layers-isolate.svg"; +import svgAssetIsolate from "../icons/asset-isolate.svg"; +import svgIsolate from "../icons/isolate.svg"; +import svgModelHide from "../icons/model-hide.svg"; +import svgLayersHide from "../icons/layers-hide.svg"; +import svgAssetClassificationHide from "../icons/asset-classification-hide.svg"; +import svgVisibilitySemiTransparent from "../icons/visibility-semi-transparent.svg"; +import svgVisibilityHide from "../icons/visibility-hide_2.svg"; +import svgVisibility from "../icons/visibility.svg"; import type { ToolbarItems } from "../tools/ToolbarItems.js"; import { getActiveViewport } from "../utils/getActiveViewport.js"; diff --git a/ui/appui-react/src/appui-react/settings/ui/UiSettingsPage.tsx b/ui/appui-react/src/appui-react/settings/ui/UiSettingsPage.tsx index 6057087ded7..f11a076d2e4 100644 --- a/ui/appui-react/src/appui-react/settings/ui/UiSettingsPage.tsx +++ b/ui/appui-react/src/appui-react/settings/ui/UiSettingsPage.tsx @@ -6,7 +6,7 @@ * @module Settings */ -import widowSettingsIconSvg from "@bentley/icons-generic/icons/window-settings.svg"; +import { SvgWindowSettings } from "@itwin/itwinui-icons-react"; import "./UiSettingsPage.scss"; import * as React from "react"; import type { SettingsTabEntry } from "@itwin/core-react"; @@ -406,7 +406,7 @@ export function getUiSettingsManagerEntry( itemPriority, tabId: "uifw:UiStateStorage", label: UiFramework.translate("settings.uiSettingsPage.label"), - icon: widowSettingsIconSvg, + icon: , page: , isDisabled: false, tooltip: UiFramework.translate("settings.uiSettingsPage.tooltip"), diff --git a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx index 79afc570727..b96071b0c5b 100644 --- a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx +++ b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx @@ -6,7 +6,7 @@ * @module StatusBar */ -import svgSectionTool from "@bentley/icons-generic/icons/section-tool.svg"; +import svgSectionTool from "../icons/section-tool.svg"; import { IModelApp, ViewClipClearTool, diff --git a/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx b/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx index cec4aaf0c48..6426be5f4de 100644 --- a/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx +++ b/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx @@ -6,13 +6,13 @@ * @module StatusBar */ -import snapModeBisector from "@bentley/icons-generic/icons/snaps-bisector.svg"; -import snapModeCenter from "@bentley/icons-generic/icons/snaps-center.svg"; -import snapModeIntersection from "@bentley/icons-generic/icons/snaps-intersection.svg"; -import snapModeMidpoint from "@bentley/icons-generic/icons/snaps-midpoint.svg"; -import snapModeNearest from "@bentley/icons-generic/icons/snaps-nearest.svg"; -import snapModeOrigin from "@bentley/icons-generic/icons/snaps-origin.svg"; -import snapModeKeypoint from "@bentley/icons-generic/icons/snaps.svg"; +import snapModeBisector from "../icons/snaps-bisector.svg"; +import snapModeCenter from "../icons/snaps-center.svg"; +import snapModeIntersection from "../icons/snaps-intersection.svg"; +import snapModeMidpoint from "../icons/snaps-midpoint.svg"; +import snapModeNearest from "../icons/snaps-nearest.svg"; +import snapModeOrigin from "../icons/snaps-origin.svg"; +import snapModeKeypoint from "../icons/snaps.svg"; import { SnapMode } from "@itwin/core-frontend"; import { Icon } from "@itwin/core-react"; import type { CommonProps } from "@itwin/core-react"; diff --git a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx index 9717624ff09..f2b26fc04a9 100644 --- a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx +++ b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx @@ -44,10 +44,10 @@ import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; import { RestoreFrontstageLayoutTool } from "./RestoreLayoutTool.js"; import { UiFramework } from "../UiFramework.js"; -import svgGyroscope from "@bentley/icons-generic/icons/gyroscope.svg"; -import svgRotateLeft from "@bentley/icons-generic/icons/rotate-left.svg"; -import svgSectionTool from "@bentley/icons-generic/icons/section-tool.svg"; -import svgSelectionClear from "@bentley/icons-generic/icons/selection-clear.svg"; +import svgGyroscope from "../icons/gyroscope.svg"; +import svgRotateLeft from "../icons/rotate-left.svg"; +import svgSectionTool from "../icons/section-tool.svg"; +import svgSelectionClear from "../icons/selection-clear.svg"; import { SvgMeasure, SvgProcess } from "@itwin/itwinui-icons-react"; import { ConditionalIconItem } from "@itwin/core-react"; import type { ToolbarItems } from "./ToolbarItems.js"; diff --git a/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts b/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts index 5fd1681412b..6dc577d35f6 100644 --- a/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts +++ b/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts @@ -8,7 +8,7 @@ import { clearKeyinPaletteHistory } from "../popup/KeyinPalettePanel.js"; import { Tool } from "@itwin/core-frontend"; -import svgRemove from "@bentley/icons-generic/icons/remove.svg"; +import svgRemove from "../icons/remove.svg"; /** * Immediate tool that will clear the recent history of command/tool keyins shown in diff --git a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts index 7632df28e11..2c273abbc59 100644 --- a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts +++ b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts @@ -7,7 +7,7 @@ */ import { Tool } from "@itwin/core-frontend"; import { SettingsModalFrontstage } from "../frontstage/ModalSettingsStage.js"; -import svgSettings from "@bentley/icons-generic/icons/settings.svg"; +import svgSettings from "..icons/settings.svg"; /** * Immediate tool that will open the Settings modal stage. diff --git a/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts b/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts index 7617584eef9..f436bff4b69 100644 --- a/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts +++ b/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts @@ -14,7 +14,7 @@ import { import type { FrontstageDef } from "../frontstage/FrontstageDef.js"; import { InternalFrontstageManager } from "../frontstage/InternalFrontstageManager.js"; import { UiFramework } from "../UiFramework.js"; -import svgViewLayouts from "@bentley/icons-generic/icons/view-layouts.svg"; +import svgViewLayouts from "../icons/view-layouts.svg"; /** * Immediate tool that will reset the layout to that specified in the stage definition. A stage Id diff --git a/ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx b/ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx index 4374591b3c0..d14a8004471 100644 --- a/ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx +++ b/ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx @@ -24,7 +24,7 @@ import { import { Icon } from "@itwin/core-react"; import type { PropertyEditorProps, TypeEditor } from "./EditorContainer.js"; import { PropertyEditorBase } from "./PropertyEditorManager.js"; -import svgPlaceholder from "@bentley/icons-generic/icons/placeholder.svg"; +import { SvgPlaceholder } from "@itwin/itwinui-icons-react"; // cspell:ignore buttongroup enumbuttongroup @@ -115,7 +115,7 @@ export class EnumButtonGroupEditor const numChoices = choices.length; const enumIcons = new Array(numChoices); - enumIcons.fill({ iconSpec: svgPlaceholder }); + enumIcons.fill({ iconSpec: "" }); if ( propertyRecord.property.editor && @@ -196,7 +196,15 @@ export class EnumButtonGroupEditor onClick={() => this._handleButtonClick(index)} > {/* eslint-disable-next-line deprecation/deprecation */} - + + ) : ( + this.state.enumIcons[index].iconSpec + ) + } + /> ); } From d8bce4cbf580e7c3ab992d2dd31d13221a367c69 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 12:20:29 +0300 Subject: [PATCH 03/26] Path fix. --- ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts index 2c273abbc59..e07d5c11a00 100644 --- a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts +++ b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts @@ -7,7 +7,7 @@ */ import { Tool } from "@itwin/core-frontend"; import { SettingsModalFrontstage } from "../frontstage/ModalSettingsStage.js"; -import svgSettings from "..icons/settings.svg"; +import svgSettings from "../icons/settings.svg"; /** * Immediate tool that will open the Settings modal stage. From e0cc0fe377451895aab7ee6fcee3a58dc5114f65 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 14:36:48 +0300 Subject: [PATCH 04/26] Test changes --- .../appui-react/icons/cube-faces/Bottom.tsx | 21 +++++++++++++++++++ .../appui-react/icons/cube-faces/IsoLeft.tsx | 21 +++++++++++++++++++ .../appui-react/icons/cube-faces/bottom.svg | 1 - .../appui-react/icons/cube-faces/iso-left.svg | 1 - .../StandardRotationNavigationAid.tsx | 9 ++++---- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx new file mode 100644 index 00000000000..b834aaff754 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module Bottom + */ + +import * as React from "react"; +export function Bottom() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx new file mode 100644 index 00000000000..14d8564540e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module IsoLeft + */ + +import * as React from "react"; +export function IsoLeft() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg b/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg deleted file mode 100644 index ce396bcdaa1..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/bottom.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg b/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg deleted file mode 100644 index a4b3f6d0209..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/iso-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx index bb95db27f9b..2650ff01672 100644 --- a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx +++ b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx @@ -6,9 +6,10 @@ * @module NavigationAids */ -import svgCubeFacesBottom from "../icons/cube-faces/bottom.svg"; +import { Bottom as CubeFacesBottom } from "../icons/cube-faces/Bottom.js"; + import svgCubeFacesFront from "../icons/cube-faces/front.svg"; -import svgCubeFacesIsoLeft from "../icons/cube-faces/iso-left.svg"; +import { IsoLeft as CubeFacesIsoLeft } from "../icons/cube-faces/IsoLeft.js"; import svgCubeFacesIsoRight from "../icons/cube-faces/iso-right.svg"; import svgCubeFacesLeft from "../icons/cube-faces/left.svg"; import svgCubeFacesRear from "../icons/cube-faces/rear.svg"; @@ -80,7 +81,7 @@ export class StandardRotationNavigationAid extends React.Component< }, { label: UiFramework.translate("rotations.bottom"), - iconsSpec: svgCubeFacesBottom, + iconsSpec: , }, { label: UiFramework.translate("rotations.left"), @@ -100,7 +101,7 @@ export class StandardRotationNavigationAid extends React.Component< }, { label: UiFramework.translate("rotations.isoLeft"), - iconsSpec: svgCubeFacesIsoLeft, + iconsSpec: , }, { label: UiFramework.translate("rotations.isoRight"), From 4b7f024fb30582cea162c05502a4f66a7a3b02fb Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 17:00:29 +0300 Subject: [PATCH 05/26] Updated changes. --- apps/test-providers/src/icons/download.svg | 1 - apps/test-providers/src/icons/panorama.svg | 19 ----------- apps/test-providers/src/icons/search.svg | 1 - apps/test-providers/src/icons/upload.svg | 1 - apps/test-providers/src/icons/window-add.svg | 1 - apps/test-providers/src/icons/window-new.svg | 1 - .../src/tools/ContentLayoutTools.tsx | 4 +-- .../src/tools/InspectUiItemInfoTool.ts | 4 +-- .../src/tools/OpenPopoutDialogTool.tsx | 4 +-- .../src/tools/OpenPopoutViewTool.tsx | 4 +-- .../src/appui-react/icons/SavedView.tsx | 19 +++++++++++ .../{Bottom.tsx => CubeFaceBottom.tsx} | 4 +-- .../icons/cube-faces/CubeFaceFront.tsx | 21 ++++++++++++ .../{IsoLeft.tsx => CubeFaceIsoLeft.tsx} | 4 +-- .../icons/cube-faces/CubeFaceIsoRight.tsx | 21 ++++++++++++ .../icons/cube-faces/CubeFaceLeft.tsx | 21 ++++++++++++ .../icons/cube-faces/CubeFaceRear.tsx | 21 ++++++++++++ .../icons/cube-faces/CubeFaceRight.tsx | 21 ++++++++++++ .../icons/cube-faces/CubeFaceTop.tsx | 21 ++++++++++++ .../appui-react/icons/cube-faces/front.svg | 1 - .../icons/cube-faces/iso-right.svg | 1 - .../src/appui-react/icons/cube-faces/left.svg | 1 - .../src/appui-react/icons/cube-faces/rear.svg | 1 - .../appui-react/icons/cube-faces/right.svg | 1 - .../src/appui-react/icons/cube-faces/top.svg | 1 - .../src/appui-react/icons/remove.svg | 1 - .../src/appui-react/icons/saved-view.svg | 1 - .../src/appui-react/icons/settings.svg | 1 - .../src/appui-react/icons/view-layouts.svg | 1 - .../StandardRotationNavigationAid.tsx | 33 +++++++++---------- .../src/appui-react/pickers/ViewSelector.tsx | 4 +-- .../appui-react/tools/KeyinPaletteTools.ts | 2 +- .../src/appui-react/tools/OpenSettingsTool.ts | 2 +- .../appui-react/tools/RestoreLayoutTool.ts | 2 +- 34 files changed, 178 insertions(+), 68 deletions(-) delete mode 100644 apps/test-providers/src/icons/download.svg delete mode 100644 apps/test-providers/src/icons/panorama.svg delete mode 100644 apps/test-providers/src/icons/search.svg delete mode 100644 apps/test-providers/src/icons/upload.svg delete mode 100644 apps/test-providers/src/icons/window-add.svg delete mode 100644 apps/test-providers/src/icons/window-new.svg create mode 100644 ui/appui-react/src/appui-react/icons/SavedView.tsx rename ui/appui-react/src/appui-react/icons/cube-faces/{Bottom.tsx => CubeFaceBottom.tsx} (93%) create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceFront.tsx rename ui/appui-react/src/appui-react/icons/cube-faces/{IsoLeft.tsx => CubeFaceIsoLeft.tsx} (94%) create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx create mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/front.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/left.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/rear.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/right.svg delete mode 100644 ui/appui-react/src/appui-react/icons/cube-faces/top.svg delete mode 100644 ui/appui-react/src/appui-react/icons/remove.svg delete mode 100644 ui/appui-react/src/appui-react/icons/saved-view.svg delete mode 100644 ui/appui-react/src/appui-react/icons/settings.svg delete mode 100644 ui/appui-react/src/appui-react/icons/view-layouts.svg diff --git a/apps/test-providers/src/icons/download.svg b/apps/test-providers/src/icons/download.svg deleted file mode 100644 index c9512bb0b6e..00000000000 --- a/apps/test-providers/src/icons/download.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/test-providers/src/icons/panorama.svg b/apps/test-providers/src/icons/panorama.svg deleted file mode 100644 index dbe88a1e250..00000000000 --- a/apps/test-providers/src/icons/panorama.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/apps/test-providers/src/icons/search.svg b/apps/test-providers/src/icons/search.svg deleted file mode 100644 index 5b2cdbe4d21..00000000000 --- a/apps/test-providers/src/icons/search.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/test-providers/src/icons/upload.svg b/apps/test-providers/src/icons/upload.svg deleted file mode 100644 index 90c8ad90eb1..00000000000 --- a/apps/test-providers/src/icons/upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/test-providers/src/icons/window-add.svg b/apps/test-providers/src/icons/window-add.svg deleted file mode 100644 index ed76934e656..00000000000 --- a/apps/test-providers/src/icons/window-add.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/test-providers/src/icons/window-new.svg b/apps/test-providers/src/icons/window-new.svg deleted file mode 100644 index 22505a5929a..00000000000 --- a/apps/test-providers/src/icons/window-new.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/test-providers/src/tools/ContentLayoutTools.tsx b/apps/test-providers/src/tools/ContentLayoutTools.tsx index 98cdd539322..bebb23aa144 100644 --- a/apps/test-providers/src/tools/ContentLayoutTools.tsx +++ b/apps/test-providers/src/tools/ContentLayoutTools.tsx @@ -22,8 +22,8 @@ import { import { IModelConnection, ScreenViewport, Tool } from "@itwin/core-frontend"; import { SvgWindow, SvgWindowSplitVertical } from "@itwin/itwinui-icons-react"; -import layoutRestoreIconSvg from "../icons/download.svg"; -import layoutSaveIconSvg from "../icons/upload.svg"; +import layoutRestoreIconSvg from "@bentley/icons-generic/icons/download.svg"; +import layoutSaveIconSvg from "@bentley/icons-generic/icons/upload.svg"; import { ViewportContent } from "../ui/ViewportContent.js"; function getIModelSpecificKey( diff --git a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts index 13637210db2..aa36d16b78f 100644 --- a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts +++ b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts @@ -14,7 +14,7 @@ import { IModelApp, PrimitiveTool, } from "@itwin/core-frontend"; -import inspectIconSvg from "../icons/search.svg"; +import windowAddSvg from "@bentley/icons-generic/icons/window-add.svg"; export class InspectUiItemInfoTool extends PrimitiveTool { private _timerId: number | undefined; @@ -24,7 +24,7 @@ export class InspectUiItemInfoTool extends PrimitiveTool { private static _counter = 0; public static override toolId = "InspectUiItemInfoTool"; - public static override iconSpec = inspectIconSvg; + public static override iconSpec = windowAddSvg; public static override get minArgs() { return 0; diff --git a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx index 9e1a8f85830..1140c661361 100644 --- a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx @@ -8,7 +8,7 @@ import { ConditionalBooleanValue, ToolbarItemUtilities, } from "@itwin/appui-abstract"; -import windowAddSvg from "../icons/window-add.svg"; +import windowPopoutSvg from "@bentley/icons-generic/icons/window-new.svg"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { PopoutDialog } from "../ui/dialogs/PopoutDialog.js"; @@ -19,7 +19,7 @@ import { PopoutDialog } from "../ui/dialogs/PopoutDialog.js"; */ export class OpenPopoutDialogTool extends Tool { public static override toolId = "appuiTestProviders-OpenPopoutDialogTool"; - public static override iconSpec = windowAddSvg; + public static override iconSpec = windowPopoutSvg; public static override get minArgs() { return 0; diff --git a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx index 02eb1a5b90f..d18cb20fa5e 100644 --- a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx @@ -6,13 +6,13 @@ import { ToolbarItemUtilities } from "@itwin/appui-abstract"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { IModelApp, Tool } from "@itwin/core-frontend"; import * as React from "react"; -import windowPopoutSvg from "../icons/window-new.svg"; +import panoramaconSvg from "@bentley/icons-generic/icons/panorama.svg"; import { PopupTestView } from "../ui/dialogs/PopupTestView.js"; export class OpenPopoutViewTool extends Tool { private static _counter = 0; public static override toolId = "OpenViewPopout"; - public static override iconSpec = windowPopoutSvg; + public static override iconSpec = panoramaconSvg; public static get dialogId(): string { return `appui-test-app:popup-view-dialog-${OpenPopoutViewTool._counter}`; } diff --git a/ui/appui-react/src/appui-react/icons/SavedView.tsx b/ui/appui-react/src/appui-react/icons/SavedView.tsx new file mode 100644 index 00000000000..12cbf622730 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/SavedView.tsx @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module SavedView + */ + +import * as React from "react"; +export function SavedView() { + return ( + + + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceBottom.tsx similarity index 93% rename from ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx rename to ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceBottom.tsx index b834aaff754..e734f4ea7d2 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/Bottom.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceBottom.tsx @@ -3,11 +3,11 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module Bottom + * @module CubeFaceBottom */ import * as React from "react"; -export function Bottom() { +export function CubeFaceBottom() { return ( + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx similarity index 94% rename from ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx rename to ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx index 14d8564540e..4de78a671da 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/IsoLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx @@ -3,11 +3,11 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module IsoLeft + * @module CubeFaceIsoLeft */ import * as React from "react"; -export function IsoLeft() { +export function CubeFaceIsoLeft() { return ( + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx new file mode 100644 index 00000000000..7e4e5d870cf --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module CubeFaceLeft + */ + +import * as React from "react"; +export function CubeFaceLeft() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx new file mode 100644 index 00000000000..e6987d49ac9 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module CubeFaceRear + */ + +import * as React from "react"; +export function CubeFaceRear() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx new file mode 100644 index 00000000000..d15199494f1 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module CubeFaceRight + */ + +import * as React from "react"; +export function CubeFaceRight() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx new file mode 100644 index 00000000000..f5bdac6c640 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module CubeFaceTop + */ + +import * as React from "react"; +export function CubeFaceTop() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/front.svg b/ui/appui-react/src/appui-react/icons/cube-faces/front.svg deleted file mode 100644 index 5c2af1fef5a..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/front.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg b/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg deleted file mode 100644 index db79d7911e2..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/iso-right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/left.svg b/ui/appui-react/src/appui-react/icons/cube-faces/left.svg deleted file mode 100644 index 2a9af6133eb..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg b/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg deleted file mode 100644 index 5cca53fdb0b..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/rear.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/right.svg b/ui/appui-react/src/appui-react/icons/cube-faces/right.svg deleted file mode 100644 index f78390c03e1..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/top.svg b/ui/appui-react/src/appui-react/icons/cube-faces/top.svg deleted file mode 100644 index 8a0bdb110c2..00000000000 --- a/ui/appui-react/src/appui-react/icons/cube-faces/top.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/remove.svg b/ui/appui-react/src/appui-react/icons/remove.svg deleted file mode 100644 index cb9dee923f6..00000000000 --- a/ui/appui-react/src/appui-react/icons/remove.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/saved-view.svg b/ui/appui-react/src/appui-react/icons/saved-view.svg deleted file mode 100644 index 398cb92c2a3..00000000000 --- a/ui/appui-react/src/appui-react/icons/saved-view.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/settings.svg b/ui/appui-react/src/appui-react/icons/settings.svg deleted file mode 100644 index ea8059ade68..00000000000 --- a/ui/appui-react/src/appui-react/icons/settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/view-layouts.svg b/ui/appui-react/src/appui-react/icons/view-layouts.svg deleted file mode 100644 index bd90d6ae39e..00000000000 --- a/ui/appui-react/src/appui-react/icons/view-layouts.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx index 2650ff01672..c25bb9b6df4 100644 --- a/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx +++ b/ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx @@ -6,15 +6,14 @@ * @module NavigationAids */ -import { Bottom as CubeFacesBottom } from "../icons/cube-faces/Bottom.js"; - -import svgCubeFacesFront from "../icons/cube-faces/front.svg"; -import { IsoLeft as CubeFacesIsoLeft } from "../icons/cube-faces/IsoLeft.js"; -import svgCubeFacesIsoRight from "../icons/cube-faces/iso-right.svg"; -import svgCubeFacesLeft from "../icons/cube-faces/left.svg"; -import svgCubeFacesRear from "../icons/cube-faces/rear.svg"; -import svgCubeFacesRight from "../icons/cube-faces/right.svg"; -import svgCubeFacesTop from "../icons/cube-faces/top.svg"; +import { CubeFaceBottom } from "../icons/cube-faces/CubeFaceBottom.js"; +import { CubeFaceFront } from "../icons/cube-faces/CubeFaceFront.js"; +import { CubeFaceIsoLeft } from "../icons/cube-faces/CubeFaceIsoLeft.js"; +import { CubeFaceIsoRight } from "../icons/cube-faces/CubeFaceIsoRight.js"; +import { CubeFaceLeft } from "../icons/cube-faces/CubeFaceLeft.js"; +import { CubeFaceRear } from "../icons/cube-faces/CubeFaceRear.js"; +import { CubeFaceRight } from "../icons/cube-faces/CubeFaceRight.js"; +import { CubeFaceTop } from "../icons/cube-faces/CubeFaceTop.js"; import { RelativePosition, ToolbarItemUtilities } from "@itwin/appui-abstract"; import { Columns, @@ -77,35 +76,35 @@ export class StandardRotationNavigationAid extends React.Component< const list: RotationData[] = [ { label: UiFramework.translate("rotations.top"), - iconsSpec: svgCubeFacesTop, + iconsSpec: , }, { label: UiFramework.translate("rotations.bottom"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.left"), - iconsSpec: svgCubeFacesLeft, + iconsSpec: , }, { label: UiFramework.translate("rotations.right"), - iconsSpec: svgCubeFacesRight, + iconsSpec: , }, { label: UiFramework.translate("rotations.front"), - iconsSpec: svgCubeFacesFront, + iconsSpec: , }, { label: UiFramework.translate("rotations.rear"), - iconsSpec: svgCubeFacesRear, + iconsSpec: , }, { label: UiFramework.translate("rotations.isoLeft"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.isoRight"), - iconsSpec: svgCubeFacesIsoRight, + iconsSpec: , }, ]; this.state = { diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index d0ba4e59bd8..b00051e5551 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -18,7 +18,7 @@ import { ViewUtilities } from "../utils/ViewUtilities.js"; import type { ListItem } from "./ListPicker.js"; import { ListItemType, ListPicker } from "./ListPicker.js"; import { debounce } from "lodash"; -import svgSavedView from "../icons/saved-view.svg"; +import { SavedView } from "../icons/SavedView.js"; import { useReduxFrameworkState } from "../uistate/useReduxFrameworkState.js"; import type { ListenerType } from "@itwin/core-react/internal"; @@ -462,7 +462,7 @@ export class ViewSelector extends React.Component< title={this.state.title} setEnabled={this._setEnabled} items={this.state.items} - iconSpec={svgSavedView} + iconSpec={} onExpanded={this._onExpanded} searchBox={this.state.searchBox} onSearchValueChange={debounce((search: string) => { diff --git a/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts b/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts index 6dc577d35f6..5fd1681412b 100644 --- a/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts +++ b/ui/appui-react/src/appui-react/tools/KeyinPaletteTools.ts @@ -8,7 +8,7 @@ import { clearKeyinPaletteHistory } from "../popup/KeyinPalettePanel.js"; import { Tool } from "@itwin/core-frontend"; -import svgRemove from "../icons/remove.svg"; +import svgRemove from "@bentley/icons-generic/icons/remove.svg"; /** * Immediate tool that will clear the recent history of command/tool keyins shown in diff --git a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts index e07d5c11a00..7632df28e11 100644 --- a/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts +++ b/ui/appui-react/src/appui-react/tools/OpenSettingsTool.ts @@ -7,7 +7,7 @@ */ import { Tool } from "@itwin/core-frontend"; import { SettingsModalFrontstage } from "../frontstage/ModalSettingsStage.js"; -import svgSettings from "../icons/settings.svg"; +import svgSettings from "@bentley/icons-generic/icons/settings.svg"; /** * Immediate tool that will open the Settings modal stage. diff --git a/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts b/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts index f436bff4b69..7617584eef9 100644 --- a/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts +++ b/ui/appui-react/src/appui-react/tools/RestoreLayoutTool.ts @@ -14,7 +14,7 @@ import { import type { FrontstageDef } from "../frontstage/FrontstageDef.js"; import { InternalFrontstageManager } from "../frontstage/InternalFrontstageManager.js"; import { UiFramework } from "../UiFramework.js"; -import svgViewLayouts from "../icons/view-layouts.svg"; +import svgViewLayouts from "@bentley/icons-generic/icons/view-layouts.svg"; /** * Immediate tool that will reset the layout to that specified in the stage definition. A stage Id From 80de6ea6940941ded7b0666cfa02415ea932345a Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 17:04:18 +0300 Subject: [PATCH 06/26] Wrong changes rollback. --- apps/test-providers/src/tools/InspectUiItemInfoTool.ts | 4 ++-- apps/test-providers/src/tools/OpenPopoutDialogTool.tsx | 4 ++-- apps/test-providers/src/tools/OpenPopoutViewTool.tsx | 4 ++-- apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts index aa36d16b78f..9d0f2a3d681 100644 --- a/apps/test-providers/src/tools/InspectUiItemInfoTool.ts +++ b/apps/test-providers/src/tools/InspectUiItemInfoTool.ts @@ -14,7 +14,7 @@ import { IModelApp, PrimitiveTool, } from "@itwin/core-frontend"; -import windowAddSvg from "@bentley/icons-generic/icons/window-add.svg"; +import inspectIconSvg from "@bentley/icons-generic/icons/search.svg"; export class InspectUiItemInfoTool extends PrimitiveTool { private _timerId: number | undefined; @@ -24,7 +24,7 @@ export class InspectUiItemInfoTool extends PrimitiveTool { private static _counter = 0; public static override toolId = "InspectUiItemInfoTool"; - public static override iconSpec = windowAddSvg; + public static override iconSpec = inspectIconSvg; public static override get minArgs() { return 0; diff --git a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx index 1140c661361..0b19d3c8605 100644 --- a/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutDialogTool.tsx @@ -8,7 +8,7 @@ import { ConditionalBooleanValue, ToolbarItemUtilities, } from "@itwin/appui-abstract"; -import windowPopoutSvg from "@bentley/icons-generic/icons/window-new.svg"; +import windowAddSvg from "@bentley/icons-generic/icons/window-add.svg"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { PopoutDialog } from "../ui/dialogs/PopoutDialog.js"; @@ -19,7 +19,7 @@ import { PopoutDialog } from "../ui/dialogs/PopoutDialog.js"; */ export class OpenPopoutDialogTool extends Tool { public static override toolId = "appuiTestProviders-OpenPopoutDialogTool"; - public static override iconSpec = windowPopoutSvg; + public static override iconSpec = windowAddSvg; public static override get minArgs() { return 0; diff --git a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx index d18cb20fa5e..e5523b954ec 100644 --- a/apps/test-providers/src/tools/OpenPopoutViewTool.tsx +++ b/apps/test-providers/src/tools/OpenPopoutViewTool.tsx @@ -6,13 +6,13 @@ import { ToolbarItemUtilities } from "@itwin/appui-abstract"; import { ChildWindowLocationProps, UiFramework } from "@itwin/appui-react"; import { IModelApp, Tool } from "@itwin/core-frontend"; import * as React from "react"; -import panoramaconSvg from "@bentley/icons-generic/icons/panorama.svg"; +import windowPopoutSvg from "@bentley/icons-generic/icons/window-new.svg"; import { PopupTestView } from "../ui/dialogs/PopupTestView.js"; export class OpenPopoutViewTool extends Tool { private static _counter = 0; public static override toolId = "OpenViewPopout"; - public static override iconSpec = panoramaconSvg; + public static override iconSpec = windowPopoutSvg; public static get dialogId(): string { return `appui-test-app:popup-view-dialog-${OpenPopoutViewTool._counter}`; } diff --git a/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx b/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx index 11cddfd69f6..3019cd17fe2 100644 --- a/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx +++ b/apps/test-providers/src/tools/OpenSynchronizedViewTool.tsx @@ -6,7 +6,7 @@ import { UiFramework } from "@itwin/appui-react"; import { IModelApp, Tool } from "@itwin/core-frontend"; import * as React from "react"; import { SynchronizedFloatingView } from "../ui/dialogs/SynchronizedFloatingViewComponent.js"; -import panoramaconSvg from "../icons/panorama.svg"; +import panoramaconSvg from "@bentley/icons-generic/icons/panorama.svg"; import { Dialog } from "@itwin/itwinui-react"; export class OpenSynchronizedViewTool extends Tool { From e62f897d8d4af2b0432219d405402d3a10ca7a0c Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 17:05:47 +0300 Subject: [PATCH 07/26] Rollback change. --- common/api/summary/appui-react.exports.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/common/api/summary/appui-react.exports.csv b/common/api/summary/appui-react.exports.csv index cde5c65e848..64e0ae97e6e 100644 --- a/common/api/summary/appui-react.exports.csv +++ b/common/api/summary/appui-react.exports.csv @@ -806,4 +806,3 @@ public;class;WidgetStateChangedEvent deprecated;class;WidgetStateChangedEvent public;interface;WidgetStateChangedEventArgs deprecated;interface;WidgetStateChangedEventArgs -public;enum;WidgetType From d8fd4d0caf6f3f581a472a5de6de12c63dba5dd9 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 17:06:56 +0300 Subject: [PATCH 08/26] fix --- common/api/summary/appui-react.exports.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/common/api/summary/appui-react.exports.csv b/common/api/summary/appui-react.exports.csv index 64e0ae97e6e..cde5c65e848 100644 --- a/common/api/summary/appui-react.exports.csv +++ b/common/api/summary/appui-react.exports.csv @@ -806,3 +806,4 @@ public;class;WidgetStateChangedEvent deprecated;class;WidgetStateChangedEvent public;interface;WidgetStateChangedEventArgs deprecated;interface;WidgetStateChangedEventArgs +public;enum;WidgetType From cd35f8c6ef579a8bfe76aa71dd986d37bce7f001 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 17:44:25 +0300 Subject: [PATCH 09/26] Updated changes. --- .../src/appui-react/icons/SectionTool.tsx | 37 +++++++++++++++++++ .../src/appui-react/icons/section-tool.svg | 1 - .../src/appui-react/icons/snaps-bisector.svg | 1 - .../src/appui-react/icons/snaps-center.svg | 1 - .../appui-react/icons/snaps-intersection.svg | 1 - .../src/appui-react/icons/snaps-midpoint.svg | 1 - .../src/appui-react/icons/snaps-nearest.svg | 1 - .../src/appui-react/icons/snaps-origin.svg | 1 - .../src/appui-react/icons/snaps.svg | 1 - .../statusfields/SectionsField.tsx | 4 +- .../src/appui-react/statusfields/SnapMode.tsx | 14 +++---- 11 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 ui/appui-react/src/appui-react/icons/SectionTool.tsx delete mode 100644 ui/appui-react/src/appui-react/icons/section-tool.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-bisector.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-center.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-intersection.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-midpoint.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-nearest.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps-origin.svg delete mode 100644 ui/appui-react/src/appui-react/icons/snaps.svg diff --git a/ui/appui-react/src/appui-react/icons/SectionTool.tsx b/ui/appui-react/src/appui-react/icons/SectionTool.tsx new file mode 100644 index 00000000000..61cc026793f --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/SectionTool.tsx @@ -0,0 +1,37 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module SectionTool + */ + +import * as React from "react"; +export function SectionTool() { + return ( + + + + + + + + + + + + + + + + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/section-tool.svg b/ui/appui-react/src/appui-react/icons/section-tool.svg deleted file mode 100644 index fb45a74fe81..00000000000 --- a/ui/appui-react/src/appui-react/icons/section-tool.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-bisector.svg b/ui/appui-react/src/appui-react/icons/snaps-bisector.svg deleted file mode 100644 index dad551455e2..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-bisector.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-center.svg b/ui/appui-react/src/appui-react/icons/snaps-center.svg deleted file mode 100644 index 7cd0596ae09..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-center.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-intersection.svg b/ui/appui-react/src/appui-react/icons/snaps-intersection.svg deleted file mode 100644 index 4acab315b81..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-intersection.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg b/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg deleted file mode 100644 index 15aeecd3d86..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-midpoint.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-nearest.svg b/ui/appui-react/src/appui-react/icons/snaps-nearest.svg deleted file mode 100644 index 667c920aebb..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-nearest.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps-origin.svg b/ui/appui-react/src/appui-react/icons/snaps-origin.svg deleted file mode 100644 index 133da505bc7..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps-origin.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/snaps.svg b/ui/appui-react/src/appui-react/icons/snaps.svg deleted file mode 100644 index d5a5982f60f..00000000000 --- a/ui/appui-react/src/appui-react/icons/snaps.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx index b96071b0c5b..908bbe1a6fa 100644 --- a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx +++ b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx @@ -6,7 +6,7 @@ * @module StatusBar */ -import svgSectionTool from "../icons/section-tool.svg"; +import { SectionTool } from "../icons/SectionTool.js"; import { IModelApp, ViewClipClearTool, @@ -113,7 +113,7 @@ export function SectionsStatusField(props: SectionsStatusFieldProps) { data-testid="sections-status-field-button" > {/* eslint-disable-next-line deprecation/deprecation */} - + } /> diff --git a/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx b/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx index 6426be5f4de..cec4aaf0c48 100644 --- a/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx +++ b/ui/appui-react/src/appui-react/statusfields/SnapMode.tsx @@ -6,13 +6,13 @@ * @module StatusBar */ -import snapModeBisector from "../icons/snaps-bisector.svg"; -import snapModeCenter from "../icons/snaps-center.svg"; -import snapModeIntersection from "../icons/snaps-intersection.svg"; -import snapModeMidpoint from "../icons/snaps-midpoint.svg"; -import snapModeNearest from "../icons/snaps-nearest.svg"; -import snapModeOrigin from "../icons/snaps-origin.svg"; -import snapModeKeypoint from "../icons/snaps.svg"; +import snapModeBisector from "@bentley/icons-generic/icons/snaps-bisector.svg"; +import snapModeCenter from "@bentley/icons-generic/icons/snaps-center.svg"; +import snapModeIntersection from "@bentley/icons-generic/icons/snaps-intersection.svg"; +import snapModeMidpoint from "@bentley/icons-generic/icons/snaps-midpoint.svg"; +import snapModeNearest from "@bentley/icons-generic/icons/snaps-nearest.svg"; +import snapModeOrigin from "@bentley/icons-generic/icons/snaps-origin.svg"; +import snapModeKeypoint from "@bentley/icons-generic/icons/snaps.svg"; import { SnapMode } from "@itwin/core-frontend"; import { Icon } from "@itwin/core-react"; import type { CommonProps } from "@itwin/core-react"; From 5f02283d743850bda32e14db87b5f1ba07e1dde7 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 18:07:30 +0300 Subject: [PATCH 10/26] Changes. --- .../src/appui-react/icons/Gyroscope.tsx | 23 ++++++++++++ .../src/appui-react/icons/LayersIsolate.tsx | 37 +++++++++++++++++++ .../src/appui-react/icons/ModelIsolate.tsx | 20 ++++++++++ .../src/appui-react/icons/SelectionClear.tsx | 21 +++++++++++ .../src/appui-react/icons/gyroscope.svg | 1 - .../src/appui-react/icons/layers-isolate.svg | 17 --------- .../src/appui-react/icons/model-isolate.svg | 1 - .../src/appui-react/icons/rotate-left.svg | 1 - .../src/appui-react/icons/selection-clear.svg | 1 - .../appui-react/tools/CoreToolDefinitions.tsx | 25 +++++++------ 10 files changed, 115 insertions(+), 32 deletions(-) create mode 100644 ui/appui-react/src/appui-react/icons/Gyroscope.tsx create mode 100644 ui/appui-react/src/appui-react/icons/LayersIsolate.tsx create mode 100644 ui/appui-react/src/appui-react/icons/ModelIsolate.tsx create mode 100644 ui/appui-react/src/appui-react/icons/SelectionClear.tsx delete mode 100644 ui/appui-react/src/appui-react/icons/gyroscope.svg delete mode 100644 ui/appui-react/src/appui-react/icons/layers-isolate.svg delete mode 100644 ui/appui-react/src/appui-react/icons/model-isolate.svg delete mode 100644 ui/appui-react/src/appui-react/icons/rotate-left.svg delete mode 100644 ui/appui-react/src/appui-react/icons/selection-clear.svg diff --git a/ui/appui-react/src/appui-react/icons/Gyroscope.tsx b/ui/appui-react/src/appui-react/icons/Gyroscope.tsx new file mode 100644 index 00000000000..288be63c6a8 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/Gyroscope.tsx @@ -0,0 +1,23 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module Gyroscope + */ + +import * as React from "react"; +export function Gyroscope() { + return ( + + + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/LayersIsolate.tsx b/ui/appui-react/src/appui-react/icons/LayersIsolate.tsx new file mode 100644 index 00000000000..d6a45f5293e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/LayersIsolate.tsx @@ -0,0 +1,37 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module LayersIsolate + */ + +import * as React from "react"; +export function LayersIsolate() { + return ( + + + + + + + + + + + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx b/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx new file mode 100644 index 00000000000..f5889cbc096 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx @@ -0,0 +1,20 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module ModelIsolate + */ + +import * as React from "react"; +export function ModelIsolate() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/SelectionClear.tsx b/ui/appui-react/src/appui-react/icons/SelectionClear.tsx new file mode 100644 index 00000000000..958c48fedd6 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/SelectionClear.tsx @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module SelectionClear + */ + +import * as React from "react"; +export function SelectionClear() { + return ( + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/gyroscope.svg b/ui/appui-react/src/appui-react/icons/gyroscope.svg deleted file mode 100644 index e0e0f8134c2..00000000000 --- a/ui/appui-react/src/appui-react/icons/gyroscope.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/layers-isolate.svg b/ui/appui-react/src/appui-react/icons/layers-isolate.svg deleted file mode 100644 index 3dcbee30b93..00000000000 --- a/ui/appui-react/src/appui-react/icons/layers-isolate.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ui/appui-react/src/appui-react/icons/model-isolate.svg b/ui/appui-react/src/appui-react/icons/model-isolate.svg deleted file mode 100644 index 7531e3a29aa..00000000000 --- a/ui/appui-react/src/appui-react/icons/model-isolate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/rotate-left.svg b/ui/appui-react/src/appui-react/icons/rotate-left.svg deleted file mode 100644 index 54264e70787..00000000000 --- a/ui/appui-react/src/appui-react/icons/rotate-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/selection-clear.svg b/ui/appui-react/src/appui-react/icons/selection-clear.svg deleted file mode 100644 index b4945102733..00000000000 --- a/ui/appui-react/src/appui-react/icons/selection-clear.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx index f2b26fc04a9..0d1fee62534 100644 --- a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx +++ b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx @@ -44,11 +44,14 @@ import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; import { RestoreFrontstageLayoutTool } from "./RestoreLayoutTool.js"; import { UiFramework } from "../UiFramework.js"; -import svgGyroscope from "../icons/gyroscope.svg"; -import svgRotateLeft from "../icons/rotate-left.svg"; -import svgSectionTool from "../icons/section-tool.svg"; -import svgSelectionClear from "../icons/selection-clear.svg"; -import { SvgMeasure, SvgProcess } from "@itwin/itwinui-icons-react"; +import { Gyroscope } from "../icons/Gyroscope.js"; +import { SectionTool } from "../icons/SectionTool.js"; +import { SelectionClear } from "../icons/SelectionClear.js"; +import { + SvgMeasure, + SvgProcess, + SvgRotateLeft, +} from "@itwin/itwinui-icons-react"; import { ConditionalIconItem } from "@itwin/core-react"; import type { ToolbarItems } from "./ToolbarItems.js"; import { getActiveViewport } from "../utils/getActiveViewport.js"; @@ -133,10 +136,10 @@ export class CoreTools { public static get rotateViewCommand() { return new ToolItemDef({ toolId: RotateViewTool.toolId, - iconSpec: new ConditionalStringValue(() => { + iconSpec: new ConditionalIconItem(() => { const viewport = getActiveViewport(); - if (viewport?.view.is2d()) return svgRotateLeft; - return svgGyroscope; + if (viewport?.view.is2d()) return ; + return ; }, [ SyncUiEventId.ActiveContentChanged, SyncUiEventId.ActiveViewportChanged, @@ -386,7 +389,7 @@ export class CoreTools { return new GroupItemDef({ groupId: "sectionTools-group", labelKey: "UiFramework:tools.sectionTools", - iconSpec: svgSectionTool, + iconSpec: , isHidden: new ConditionalBooleanValue(() => { const viewport = getActiveViewport(); return !!viewport?.view.is2d(); @@ -415,7 +418,7 @@ export class CoreTools { groupId: "sectionTools-group-with-panel", labelKey: "UiFramework:tools.sectionTools", panelLabelKey: "UiFramework:tools.sectionPanelLabel", - iconSpec: svgSectionTool, + iconSpec: , isHidden: new ConditionalBooleanValue(() => { const viewport = getActiveViewport(); return !!viewport?.view.is2d(); @@ -488,7 +491,7 @@ export class CoreTools { public static get clearSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.ClearSelection", - iconSpec: svgSelectionClear, + iconSpec: , labelKey: "UiFramework:buttons.clearSelection", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => { From 72ebfb7e8cfeb5ff18059d99220209077c7c8b75 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 18:28:12 +0300 Subject: [PATCH 11/26] Final changes. --- .../icons/AssetClassificationHide.tsx | 34 +++++++++++++++ .../src/appui-react/icons/AssetIsolate.tsx | 34 +++++++++++++++ .../src/appui-react/icons/LayersHide.tsx | 36 ++++++++++++++++ .../src/appui-react/icons/ModelHide.tsx | 20 +++++++++ .../icons/asset-classification-hide.svg | 12 ------ .../src/appui-react/icons/asset-isolate.svg | 14 ------ .../src/appui-react/icons/layers-hide.svg | 14 ------ .../src/appui-react/icons/model-hide.svg | 1 - .../icons/visibility-semi-transparent.svg | 3 +- .../src/appui-react/icons/visibility.svg | 2 +- ...ItemDef.ts => SelectionContextItemDef.tsx} | 43 ++++++++++--------- 11 files changed, 149 insertions(+), 64 deletions(-) create mode 100644 ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx create mode 100644 ui/appui-react/src/appui-react/icons/AssetIsolate.tsx create mode 100644 ui/appui-react/src/appui-react/icons/LayersHide.tsx create mode 100644 ui/appui-react/src/appui-react/icons/ModelHide.tsx delete mode 100644 ui/appui-react/src/appui-react/icons/asset-classification-hide.svg delete mode 100644 ui/appui-react/src/appui-react/icons/asset-isolate.svg delete mode 100644 ui/appui-react/src/appui-react/icons/layers-hide.svg delete mode 100644 ui/appui-react/src/appui-react/icons/model-hide.svg rename ui/appui-react/src/appui-react/selection/{SelectionContextItemDef.ts => SelectionContextItemDef.tsx} (89%) diff --git a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx new file mode 100644 index 00000000000..c8a32b07670 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx @@ -0,0 +1,34 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module AssetClassificationHide + */ + +import * as React from "react"; +export function AssetClassificationHide() { + return ( + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/AssetIsolate.tsx b/ui/appui-react/src/appui-react/icons/AssetIsolate.tsx new file mode 100644 index 00000000000..e19e6b1e92e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/AssetIsolate.tsx @@ -0,0 +1,34 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module AssetIsolate + */ + +import * as React from "react"; +export function AssetIsolate() { + return ( + + + + + + + + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/LayersHide.tsx b/ui/appui-react/src/appui-react/icons/LayersHide.tsx new file mode 100644 index 00000000000..f2123817f7e --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/LayersHide.tsx @@ -0,0 +1,36 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module LayersHide + */ + +import * as React from "react"; +export function LayersHide() { + return ( + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/ModelHide.tsx b/ui/appui-react/src/appui-react/icons/ModelHide.tsx new file mode 100644 index 00000000000..1a00ac95241 --- /dev/null +++ b/ui/appui-react/src/appui-react/icons/ModelHide.tsx @@ -0,0 +1,20 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Bentley Systems, Incorporated. All rights reserved. + * See LICENSE.md in the project root for license terms and full copyright notice. + *--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module ModelHide + */ + +import * as React from "react"; +export function ModelHide() { + return ( + + + + + ); +} diff --git a/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg b/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg deleted file mode 100644 index 14eb3e99ecf..00000000000 --- a/ui/appui-react/src/appui-react/icons/asset-classification-hide.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/ui/appui-react/src/appui-react/icons/asset-isolate.svg b/ui/appui-react/src/appui-react/icons/asset-isolate.svg deleted file mode 100644 index 6f5c4c3c29d..00000000000 --- a/ui/appui-react/src/appui-react/icons/asset-isolate.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/ui/appui-react/src/appui-react/icons/layers-hide.svg b/ui/appui-react/src/appui-react/icons/layers-hide.svg deleted file mode 100644 index bd3150c8667..00000000000 --- a/ui/appui-react/src/appui-react/icons/layers-hide.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/ui/appui-react/src/appui-react/icons/model-hide.svg b/ui/appui-react/src/appui-react/icons/model-hide.svg deleted file mode 100644 index b5f5e1c0c3e..00000000000 --- a/ui/appui-react/src/appui-react/icons/model-hide.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg b/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg index c886fd8f295..7f35d2d4335 100644 --- a/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg +++ b/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/ui/appui-react/src/appui-react/icons/visibility.svg b/ui/appui-react/src/appui-react/icons/visibility.svg index ac693acc4f7..d29c13393a5 100644 --- a/ui/appui-react/src/appui-react/icons/visibility.svg +++ b/ui/appui-react/src/appui-react/icons/visibility.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx similarity index 89% rename from ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts rename to ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx index 55654381cfc..6a6d4cc97f3 100644 --- a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts +++ b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx @@ -12,19 +12,20 @@ import { CommandItemDef } from "../shared/CommandItemDef.js"; import type { BaseItemState } from "../shared/ItemDefBase.js"; import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; -import { UiFramework } from "../UiFramework.js"; -import svgModelIsolate from "../icons/model-isolate.svg"; -import svgLayersIsolate from "../icons/layers-isolate.svg"; -import svgAssetIsolate from "../icons/asset-isolate.svg"; -import svgIsolate from "../icons/isolate.svg"; -import svgModelHide from "../icons/model-hide.svg"; -import svgLayersHide from "../icons/layers-hide.svg"; -import svgAssetClassificationHide from "../icons/asset-classification-hide.svg"; -import svgVisibilitySemiTransparent from "../icons/visibility-semi-transparent.svg"; -import svgVisibilityHide from "../icons/visibility-hide_2.svg"; -import svgVisibility from "../icons/visibility.svg"; +import { UiFramework, UiVisibilityChangedEvent } from "../UiFramework.js"; +import { ModelIsolate } from "../icons/ModelIsolate.js"; +import { LayersIsolate } from "../icons/LayersIsolate.js"; +import { AssetIsolate } from "../icons/AssetIsolate.js"; +import { SvgIsolate } from "@itwin/itwinui-icons-react"; +import { ModelHide } from "../icons/ModelHide.js"; +import { LayersHide } from "../icons/LayersHide.js"; +import { AssetClassificationHide } from "../icons/AssetClassificationHide.js"; +import { SvgVisibilityHalf } from "@itwin/itwinui-icons-react"; +import { SvgVisibilityHide } from "@itwin/itwinui-icons-react"; +import { SvgVisibilityShow } from "@itwin/itwinui-icons-react"; import type { ToolbarItems } from "../tools/ToolbarItems.js"; import { getActiveViewport } from "../utils/getActiveViewport.js"; +import * as React from "react"; /* eslint-disable deprecation/deprecation */ @@ -161,7 +162,7 @@ export class SelectionContextToolDefinitions { public static get isolateModelsInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateModel", - iconSpec: svgModelIsolate, + iconSpec: , labelKey: "UiFramework:tools.isolateModels", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processIsolateSelectedElementsModel(), @@ -171,7 +172,7 @@ export class SelectionContextToolDefinitions { public static get isolateCategoriesInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateCategory", - iconSpec: svgLayersIsolate, + iconSpec: , labelKey: "UiFramework:tools.isolateCategories", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processIsolateSelectedElementsCategory(), @@ -181,7 +182,7 @@ export class SelectionContextToolDefinitions { public static get isolateElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateSelected", - iconSpec: svgAssetIsolate, + iconSpec: , labelKey: "UiFramework:tools.isolateSelected", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => @@ -193,7 +194,7 @@ export class SelectionContextToolDefinitions { return new GroupItemDef({ groupId: "UiFramework.IsolateSelectionGroup", labelKey: "UiFramework:tools.isolate", - iconSpec: svgIsolate, + iconSpec: , isHidden: getIsHiddenIfSelectionNotActive(), items: [ this.isolateElementsItemDef, @@ -207,7 +208,7 @@ export class SelectionContextToolDefinitions { public static get hideModelsInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideModel", - iconSpec: svgModelHide, + iconSpec: , labelKey: "UiFramework:tools.hideModels", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processHideSelectedElementsModel(), @@ -217,7 +218,7 @@ export class SelectionContextToolDefinitions { public static get hideCategoriesInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideCategory", - iconSpec: svgLayersHide, + iconSpec: , labelKey: "UiFramework:tools.hideCategories", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processHideSelectedElementsCategory(), @@ -227,7 +228,7 @@ export class SelectionContextToolDefinitions { public static get hideElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideSelected", - iconSpec: svgAssetClassificationHide, + iconSpec: , labelKey: "UiFramework:tools.hideSelected", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => @@ -239,7 +240,7 @@ export class SelectionContextToolDefinitions { return new GroupItemDef({ groupId: "UiFramework.HideSelectionGroup", labelKey: "UiFramework:tools.hide", - iconSpec: svgVisibilityHide, + iconSpec: , isHidden: getIsHiddenIfSelectionNotActive(), items: [ this.hideElementsItemDef, @@ -253,7 +254,7 @@ export class SelectionContextToolDefinitions { public static get emphasizeElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.EmphasizeSelected", - iconSpec: svgVisibilitySemiTransparent, + iconSpec: , labelKey: "UiFramework:tools.emphasizeSelected", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => @@ -264,7 +265,7 @@ export class SelectionContextToolDefinitions { public static get clearHideIsolateEmphasizeElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.ClearHideIsolateEmphasize", - iconSpec: svgVisibility, + iconSpec: , labelKey: "UiFramework:tools.clearVisibility", isHidden: getIsHiddenIfFeatureOverridesActive(), execute: async () => { From 8f0dc08063384341ae518d4bc9aa2fd16e96f2a0 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Tue, 15 Oct 2024 18:30:25 +0300 Subject: [PATCH 12/26] Deleted not needed svgs --- ui/appui-react/src/appui-react/icons/isolate.svg | 1 - ui/appui-react/src/appui-react/icons/visibility-hide_2.svg | 1 - .../src/appui-react/icons/visibility-semi-transparent.svg | 2 -- ui/appui-react/src/appui-react/icons/visibility.svg | 1 - 4 files changed, 5 deletions(-) delete mode 100644 ui/appui-react/src/appui-react/icons/isolate.svg delete mode 100644 ui/appui-react/src/appui-react/icons/visibility-hide_2.svg delete mode 100644 ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg delete mode 100644 ui/appui-react/src/appui-react/icons/visibility.svg diff --git a/ui/appui-react/src/appui-react/icons/isolate.svg b/ui/appui-react/src/appui-react/icons/isolate.svg deleted file mode 100644 index 60d52f9e052..00000000000 --- a/ui/appui-react/src/appui-react/icons/isolate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg b/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg deleted file mode 100644 index 3b63d012b10..00000000000 --- a/ui/appui-react/src/appui-react/icons/visibility-hide_2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg b/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg deleted file mode 100644 index 7f35d2d4335..00000000000 --- a/ui/appui-react/src/appui-react/icons/visibility-semi-transparent.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/ui/appui-react/src/appui-react/icons/visibility.svg b/ui/appui-react/src/appui-react/icons/visibility.svg deleted file mode 100644 index d29c13393a5..00000000000 --- a/ui/appui-react/src/appui-react/icons/visibility.svg +++ /dev/null @@ -1 +0,0 @@ - From 1b9f022fa10ab82bc0d88a015ded42a310ee4229 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Wed, 16 Oct 2024 14:28:26 +0300 Subject: [PATCH 13/26] Not needed include. --- .../src/appui-react/selection/SelectionContextItemDef.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx index 6a6d4cc97f3..0cf624ee61b 100644 --- a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx +++ b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx @@ -12,7 +12,7 @@ import { CommandItemDef } from "../shared/CommandItemDef.js"; import type { BaseItemState } from "../shared/ItemDefBase.js"; import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; -import { UiFramework, UiVisibilityChangedEvent } from "../UiFramework.js"; +import { UiFramework } from "../UiFramework.js"; import { ModelIsolate } from "../icons/ModelIsolate.js"; import { LayersIsolate } from "../icons/LayersIsolate.js"; import { AssetIsolate } from "../icons/AssetIsolate.js"; From 280870545927933ae3d8cd220d952437c4003df4 Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Wed, 23 Oct 2024 13:03:18 +0300 Subject: [PATCH 14/26] Updated storybook svg and removed depenedency on @bentley/icons-generic --- docs/storybook/assets/placeholder.svg | 1 + docs/storybook/package.json | 1 - docs/storybook/src/deprecated/Icon.stories.tsx | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 docs/storybook/assets/placeholder.svg diff --git a/docs/storybook/assets/placeholder.svg b/docs/storybook/assets/placeholder.svg new file mode 100644 index 00000000000..01eead930b3 --- /dev/null +++ b/docs/storybook/assets/placeholder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/storybook/package.json b/docs/storybook/package.json index d6a776be6ef..0f0e2419b99 100644 --- a/docs/storybook/package.json +++ b/docs/storybook/package.json @@ -15,7 +15,6 @@ "test": "" }, "dependencies": { - "@bentley/icons-generic": "^1.0.34", "@bentley/icons-generic-webfont": "^1.0.34", "@itwin/appui-abstract": "^4.0.0", "@itwin/appui-react": "workspace:*", diff --git a/docs/storybook/src/deprecated/Icon.stories.tsx b/docs/storybook/src/deprecated/Icon.stories.tsx index 6e87af5f8fb..9899d9bbbf9 100644 --- a/docs/storybook/src/deprecated/Icon.stories.tsx +++ b/docs/storybook/src/deprecated/Icon.stories.tsx @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import React from "react"; import type { Decorator, Meta, StoryObj } from "@storybook/react"; +import placeholderSvg from "../../assets/placeholder.svg"; import { useConditionalProp } from "@itwin/appui-react-internal/lib/esm/appui-react/hooks/useConditionalProp"; import { ImageRenderer } from "@itwin/components-react-internal/src/components-react/common/ImageRenderer"; import { ConditionalIconItem, Icon } from "@itwin/core-react"; @@ -49,7 +50,7 @@ export const ReactNode: Story = { export const SVGPath: Story = { args: { - iconSpec: , + iconSpec: placeholderSvg, }, }; From b618ed9b319353f5af47e2fcaaa7f8f25f262a6a Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Wed, 23 Oct 2024 13:08:39 +0300 Subject: [PATCH 15/26] Updated tsx files tags and updated pnpm-lock --- common/config/rush/pnpm-lock.yaml | 3 --- .../src/appui-react/icons/AssetClassificationHide.tsx | 4 +++- ui/appui-react/src/appui-react/icons/AssetIsolate.tsx | 4 +++- ui/appui-react/src/appui-react/icons/Gyroscope.tsx | 4 +++- ui/appui-react/src/appui-react/icons/LayersHide.tsx | 4 +++- ui/appui-react/src/appui-react/icons/LayersIsolate.tsx | 4 +++- ui/appui-react/src/appui-react/icons/ModelHide.tsx | 4 +++- ui/appui-react/src/appui-react/icons/ModelIsolate.tsx | 4 +++- ui/appui-react/src/appui-react/icons/SavedView.tsx | 4 +++- ui/appui-react/src/appui-react/icons/SectionTool.tsx | 4 +++- ui/appui-react/src/appui-react/icons/SelectionClear.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceBottom.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceFront.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceLeft.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceRear.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceRight.tsx | 4 +++- .../src/appui-react/icons/cube-faces/CubeFaceTop.tsx | 4 +++- 19 files changed, 54 insertions(+), 21 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 1708ef86333..894c2202c96 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -335,9 +335,6 @@ importers: ../../docs/storybook: dependencies: - '@bentley/icons-generic': - specifier: ^1.0.34 - version: 1.0.34 '@bentley/icons-generic-webfont': specifier: ^1.0.34 version: 1.0.34 diff --git a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx index c8a32b07670..8ce957f6f6e 100644 --- a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx +++ b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module AssetClassificationHide + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function AssetClassificationHide() { return ( diff --git a/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx b/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx index f5889cbc096..fb511849d86 100644 --- a/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx +++ b/ui/appui-react/src/appui-react/icons/ModelIsolate.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module ModelIsolate + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function ModelIsolate() { return ( diff --git a/ui/appui-react/src/appui-react/icons/SavedView.tsx b/ui/appui-react/src/appui-react/icons/SavedView.tsx index 12cbf622730..8983f4cc1b0 100644 --- a/ui/appui-react/src/appui-react/icons/SavedView.tsx +++ b/ui/appui-react/src/appui-react/icons/SavedView.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module SavedView + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function SavedView() { return ( diff --git a/ui/appui-react/src/appui-react/icons/SectionTool.tsx b/ui/appui-react/src/appui-react/icons/SectionTool.tsx index 61cc026793f..950fa782fdb 100644 --- a/ui/appui-react/src/appui-react/icons/SectionTool.tsx +++ b/ui/appui-react/src/appui-react/icons/SectionTool.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module SectionTool + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function SectionTool() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceFront.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceFront.tsx index 838ee7800a1..202f6049e93 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceFront.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceFront.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceFront + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceFront() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx index 4de78a671da..e62d901219c 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoLeft.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceIsoLeft + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceIsoLeft() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx index c8485becbe0..1e188472eb2 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceIsoRight.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceIsoRight + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceIsoRight() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx index 7e4e5d870cf..b8a91d98faf 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceLeft.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceLeft + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceLeft() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx index e6987d49ac9..443619c8a2c 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRear.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceRear + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceRear() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx index d15199494f1..12067f86b70 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceRight.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceRight + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceRight() { return ( diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx index f5bdac6c640..9e20bdd802e 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/CubeFaceTop.tsx @@ -3,10 +3,12 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ /** @packageDocumentation - * @module CubeFaceTop + * @module Utilities */ import * as React from "react"; + +/** @internal */ export function CubeFaceTop() { return ( From 35837473922cebcd44c0af22b1f0b1ab5439158c Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Wed, 23 Oct 2024 13:22:08 +0300 Subject: [PATCH 16/26] Small fixes --- ...udrevicius-RemoveIconsGeneric_2024-10-23-10-21.json | 10 ++++++++++ ...udrevicius-RemoveIconsGeneric_2024-10-23-10-21.json | 10 ++++++++++ common/config/rush/pnpm-lock.yaml | 3 --- ui/components-react/package.json | 1 - 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 common/changes/@itwin/appui-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json create mode 100644 common/changes/@itwin/components-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json diff --git a/common/changes/@itwin/appui-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json b/common/changes/@itwin/appui-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json new file mode 100644 index 00000000000..59433fc54ae --- /dev/null +++ b/common/changes/@itwin/appui-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/appui-react", + "comment": "Removed some references on @bentley/icons-generic", + "type": "none" + } + ], + "packageName": "@itwin/appui-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/components-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json b/common/changes/@itwin/components-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json new file mode 100644 index 00000000000..10c4dfca669 --- /dev/null +++ b/common/changes/@itwin/components-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/components-react", + "comment": "Removed some references on @bentley/icons-generic", + "type": "none" + } + ], + "packageName": "@itwin/components-react" +} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 894c2202c96..f4b6ada0bfb 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -728,9 +728,6 @@ importers: ../../ui/components-react: dependencies: - '@bentley/icons-generic': - specifier: ^1.0.34 - version: 1.0.34 '@itwin/itwinui-icons-react': specifier: ^2.8.0 version: 2.8.0(react-dom@18.3.1)(react@18.3.1) diff --git a/ui/components-react/package.json b/ui/components-react/package.json index 3721858d05b..3fd16fd8f22 100644 --- a/ui/components-react/package.json +++ b/ui/components-react/package.json @@ -111,7 +111,6 @@ "NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed" ], "dependencies": { - "@bentley/icons-generic": "^1.0.34", "@itwin/itwinui-variables": "^3.0.0", "@itwin/itwinui-icons-react": "^2.8.0", "@itwin/itwinui-react": "^3.11.2", From 3b881c804cea32947b5ceced29fe18d27e3e5fee Mon Sep 17 00:00:00 2001 From: Martynas Budrevicius Date: Wed, 23 Oct 2024 13:38:18 +0300 Subject: [PATCH 17/26] rush lint fix --- .../src/appui-react/icons/AssetClassificationHide.tsx | 2 +- ui/appui-react/src/appui-react/icons/AssetIsolate.tsx | 2 +- ui/appui-react/src/appui-react/icons/Gyroscope.tsx | 2 +- ui/appui-react/src/appui-react/icons/LayersHide.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx index 8ce957f6f6e..a308f3fb334 100644 --- a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx +++ b/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx @@ -19,7 +19,7 @@ export function AssetClassificationHide() { x="0px" y="0px" viewBox="0 0 16 16" - enable-background="new 0 0 16 16;" + enableBackground="new 0 0 16 16;" xmlSpace="preserve" > diff --git a/ui/appui-react/src/appui-react/icons/Gyroscope.tsx b/ui/appui-react/src/appui-react/icons/Gyroscope.tsx index c19914f85da..e0edc3d1628 100644 --- a/ui/appui-react/src/appui-react/icons/Gyroscope.tsx +++ b/ui/appui-react/src/appui-react/icons/Gyroscope.tsx @@ -14,7 +14,7 @@ export function Gyroscope() { diff --git a/ui/appui-react/src/appui-react/icons/LayersHide.tsx b/ui/appui-react/src/appui-react/icons/LayersHide.tsx index 057da852bad..84d5e245760 100644 --- a/ui/appui-react/src/appui-react/icons/LayersHide.tsx +++ b/ui/appui-react/src/appui-react/icons/LayersHide.tsx @@ -19,7 +19,7 @@ export function LayersHide() { x="0px" y="0px" viewBox="0 0 16 16" - enable-background="new 0 0 16 16;" + enableBackground="new 0 0 16 16;" xmlSpace="preserve" > Date: Tue, 29 Oct 2024 10:24:14 +0200 Subject: [PATCH 18/26] Updated Svg file naming and mved from iconSpec to icon in some places --- ...ide.tsx => SvgAssetClassificationHide.tsx} | 2 +- .../{AssetIsolate.tsx => SvgAssetIsolate.tsx} | 2 +- .../icons/{Gyroscope.tsx => SvgGyroscope.tsx} | 2 +- .../{LayersHide.tsx => SvgLayersHide.tsx} | 2 +- ...LayersIsolate.tsx => SvgLayersIsolate.tsx} | 2 +- .../icons/{ModelHide.tsx => SvgModelHide.tsx} | 2 +- .../{ModelIsolate.tsx => SvgModelIsolate.tsx} | 2 +- .../icons/{SavedView.tsx => SvgSavedView.tsx} | 2 +- .../{SectionTool.tsx => SvgSectionTool.tsx} | 2 +- ...lectionClear.tsx => SvgSelectionClear.tsx} | 2 +- ...beFaceBottom.tsx => SvgCubeFaceBottom.tsx} | 2 +- ...CubeFaceFront.tsx => SvgCubeFaceFront.tsx} | 2 +- ...FaceIsoLeft.tsx => SvgCubeFaceIsoLeft.tsx} | 2 +- ...ceIsoRight.tsx => SvgCubeFaceIsoRight.tsx} | 2 +- .../{CubeFaceLeft.tsx => SvgCubeFaceLeft.tsx} | 2 +- .../{CubeFaceRear.tsx => SvgCubeFaceRear.tsx} | 2 +- ...CubeFaceRight.tsx => SvgCubeFaceRight.tsx} | 2 +- .../{CubeFaceTop.tsx => SvgCubeFaceTop.tsx} | 2 +- .../StandardRotationNavigationAid.tsx | 32 +++++++++---------- .../src/appui-react/pickers/ViewSelector.tsx | 4 +-- .../selection/SelectionContextItemDef.tsx | 24 +++++++------- .../statusfields/SectionsField.tsx | 4 +-- .../appui-react/tools/CoreToolDefinitions.tsx | 20 ++++++------ 23 files changed, 60 insertions(+), 60 deletions(-) rename ui/appui-react/src/appui-react/icons/{AssetClassificationHide.tsx => SvgAssetClassificationHide.tsx} (96%) rename ui/appui-react/src/appui-react/icons/{AssetIsolate.tsx => SvgAssetIsolate.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{Gyroscope.tsx => SvgGyroscope.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{LayersHide.tsx => SvgLayersHide.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{LayersIsolate.tsx => SvgLayersIsolate.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{ModelHide.tsx => SvgModelHide.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{ModelIsolate.tsx => SvgModelIsolate.tsx} (96%) rename ui/appui-react/src/appui-react/icons/{SavedView.tsx => SvgSavedView.tsx} (96%) rename ui/appui-react/src/appui-react/icons/{SectionTool.tsx => SvgSectionTool.tsx} (97%) rename ui/appui-react/src/appui-react/icons/{SelectionClear.tsx => SvgSelectionClear.tsx} (95%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceBottom.tsx => SvgCubeFaceBottom.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceFront.tsx => SvgCubeFaceFront.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceIsoLeft.tsx => SvgCubeFaceIsoLeft.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceIsoRight.tsx => SvgCubeFaceIsoRight.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceLeft.tsx => SvgCubeFaceLeft.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceRear.tsx => SvgCubeFaceRear.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceRight.tsx => SvgCubeFaceRight.tsx} (96%) rename ui/appui-react/src/appui-react/icons/cube-faces/{CubeFaceTop.tsx => SvgCubeFaceTop.tsx} (96%) diff --git a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx b/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx similarity index 96% rename from ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx rename to ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx index a308f3fb334..a15dd59b86c 100644 --- a/ui/appui-react/src/appui-react/icons/AssetClassificationHide.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx @@ -9,7 +9,7 @@ import * as React from "react"; /** @internal */ -export function AssetClassificationHide() { +export function SvgAssetClassificationHide() { return ( diff --git a/ui/appui-react/src/appui-react/icons/SectionTool.tsx b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx similarity index 97% rename from ui/appui-react/src/appui-react/icons/SectionTool.tsx rename to ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx index 950fa782fdb..c071d053e6f 100644 --- a/ui/appui-react/src/appui-react/icons/SectionTool.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx @@ -9,7 +9,7 @@ import * as React from "react"; /** @internal */ -export function SectionTool() { +export function SvgSectionTool() { return ( , + iconsSpec: , }, { label: UiFramework.translate("rotations.bottom"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.left"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.right"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.front"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.rear"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.isoLeft"), - iconsSpec: , + iconsSpec: , }, { label: UiFramework.translate("rotations.isoRight"), - iconsSpec: , + iconsSpec: , }, ]; this.state = { diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index b00051e5551..054bf66016e 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -18,7 +18,7 @@ import { ViewUtilities } from "../utils/ViewUtilities.js"; import type { ListItem } from "./ListPicker.js"; import { ListItemType, ListPicker } from "./ListPicker.js"; import { debounce } from "lodash"; -import { SavedView } from "../icons/SavedView.js"; +import { SvgSavedView } from "../icons/SvgSavedView.js"; import { useReduxFrameworkState } from "../uistate/useReduxFrameworkState.js"; import type { ListenerType } from "@itwin/core-react/internal"; @@ -462,7 +462,7 @@ export class ViewSelector extends React.Component< title={this.state.title} setEnabled={this._setEnabled} items={this.state.items} - iconSpec={} + icon={} onExpanded={this._onExpanded} searchBox={this.state.searchBox} onSearchValueChange={debounce((search: string) => { diff --git a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx index 0cf624ee61b..79090ebf9d9 100644 --- a/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx +++ b/ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx @@ -13,13 +13,13 @@ import type { BaseItemState } from "../shared/ItemDefBase.js"; import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; import { UiFramework } from "../UiFramework.js"; -import { ModelIsolate } from "../icons/ModelIsolate.js"; -import { LayersIsolate } from "../icons/LayersIsolate.js"; -import { AssetIsolate } from "../icons/AssetIsolate.js"; +import { SvgModelIsolate } from "../icons/SvgModelIsolate.js"; +import { SvgLayersIsolate } from "../icons/SvgLayersIsolate.js"; +import { SvgAssetIsolate } from "../icons/SvgAssetIsolate.js"; import { SvgIsolate } from "@itwin/itwinui-icons-react"; -import { ModelHide } from "../icons/ModelHide.js"; -import { LayersHide } from "../icons/LayersHide.js"; -import { AssetClassificationHide } from "../icons/AssetClassificationHide.js"; +import { SvgModelHide } from "../icons/SvgModelHide.js"; +import { SvgLayersHide } from "../icons/SvgLayersHide.js"; +import { SvgAssetClassificationHide } from "../icons/SvgAssetClassificationHide.js"; import { SvgVisibilityHalf } from "@itwin/itwinui-icons-react"; import { SvgVisibilityHide } from "@itwin/itwinui-icons-react"; import { SvgVisibilityShow } from "@itwin/itwinui-icons-react"; @@ -162,7 +162,7 @@ export class SelectionContextToolDefinitions { public static get isolateModelsInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateModel", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.isolateModels", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processIsolateSelectedElementsModel(), @@ -172,7 +172,7 @@ export class SelectionContextToolDefinitions { public static get isolateCategoriesInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateCategory", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.isolateCategories", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processIsolateSelectedElementsCategory(), @@ -182,7 +182,7 @@ export class SelectionContextToolDefinitions { public static get isolateElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.IsolateSelected", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.isolateSelected", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => @@ -208,7 +208,7 @@ export class SelectionContextToolDefinitions { public static get hideModelsInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideModel", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.hideModels", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processHideSelectedElementsModel(), @@ -218,7 +218,7 @@ export class SelectionContextToolDefinitions { public static get hideCategoriesInSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideCategory", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.hideCategories", execute: async () => UiFramework.hideIsolateEmphasizeActionHandler.processHideSelectedElementsCategory(), @@ -228,7 +228,7 @@ export class SelectionContextToolDefinitions { public static get hideElementsItemDef() { return new CommandItemDef({ commandId: "UiFramework.HideSelected", - iconSpec: , + iconSpec: , labelKey: "UiFramework:tools.hideSelected", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => diff --git a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx index 908bbe1a6fa..b8db25193da 100644 --- a/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx +++ b/ui/appui-react/src/appui-react/statusfields/SectionsField.tsx @@ -6,7 +6,7 @@ * @module StatusBar */ -import { SectionTool } from "../icons/SectionTool.js"; +import { SvgSectionTool } from "../icons/SvgSectionTool.js"; import { IModelApp, ViewClipClearTool, @@ -113,7 +113,7 @@ export function SectionsStatusField(props: SectionsStatusFieldProps) { data-testid="sections-status-field-button" > {/* eslint-disable-next-line deprecation/deprecation */} - } /> + } /> diff --git a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx index 0d1fee62534..330a3456f13 100644 --- a/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx +++ b/ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx @@ -44,9 +44,9 @@ import { SyncUiEventId } from "../syncui/SyncUiEventDispatcher.js"; import { GroupItemDef } from "../toolbar/GroupItem.js"; import { RestoreFrontstageLayoutTool } from "./RestoreLayoutTool.js"; import { UiFramework } from "../UiFramework.js"; -import { Gyroscope } from "../icons/Gyroscope.js"; -import { SectionTool } from "../icons/SectionTool.js"; -import { SelectionClear } from "../icons/SelectionClear.js"; +import { SvgGyroscope } from "../icons/SvgGyroscope.js"; +import { SvgSectionTool } from "../icons/SvgSectionTool.js"; +import { SvgSelectionClear } from "../icons/SvgSelectionClear.js"; import { SvgMeasure, SvgProcess, @@ -66,7 +66,7 @@ export class CoreTools { public static get keyinPaletteButtonItemDef() { return new ToolItemDef({ toolId: "uif:keyinpalette", - iconSpec: , + icon: , labelKey: "UiFramework:keyinbrowser.label", execute: () => { UiFramework.showKeyinPalette( @@ -136,10 +136,10 @@ export class CoreTools { public static get rotateViewCommand() { return new ToolItemDef({ toolId: RotateViewTool.toolId, - iconSpec: new ConditionalIconItem(() => { + icon: new ConditionalIconItem(() => { const viewport = getActiveViewport(); if (viewport?.view.is2d()) return ; - return ; + return ; }, [ SyncUiEventId.ActiveContentChanged, SyncUiEventId.ActiveViewportChanged, @@ -389,7 +389,7 @@ export class CoreTools { return new GroupItemDef({ groupId: "sectionTools-group", labelKey: "UiFramework:tools.sectionTools", - iconSpec: , + icon: , isHidden: new ConditionalBooleanValue(() => { const viewport = getActiveViewport(); return !!viewport?.view.is2d(); @@ -418,7 +418,7 @@ export class CoreTools { groupId: "sectionTools-group-with-panel", labelKey: "UiFramework:tools.sectionTools", panelLabelKey: "UiFramework:tools.sectionPanelLabel", - iconSpec: , + icon: , isHidden: new ConditionalBooleanValue(() => { const viewport = getActiveViewport(); return !!viewport?.view.is2d(); @@ -482,7 +482,7 @@ export class CoreTools { return new GroupItemDef({ groupId: "measureTools-group", labelKey: "UiFramework:tools.measureTools", - iconSpec: , + icon: , items: [this.measureDistanceToolItemDef, this.measureLocationToolItemDef], itemsInColumn: 2, }); @@ -491,7 +491,7 @@ export class CoreTools { public static get clearSelectionItemDef() { return new CommandItemDef({ commandId: "UiFramework.ClearSelection", - iconSpec: , + icon: , labelKey: "UiFramework:buttons.clearSelection", isHidden: getIsHiddenIfSelectionNotActive(), execute: async () => { From 81fa3cd9ba71eebceb15a640c0bc5e8843a4749e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Tue, 29 Oct 2024 11:18:57 +0200 Subject: [PATCH 19/26] Small fix --- common/config/rush/pnpm-lock.yaml | 194 +++++++++++++++++++++++++++--- 1 file changed, 174 insertions(+), 20 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index eb5bd0ab229..e849cea9508 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -221,14 +221,14 @@ importers: specifier: ^3.0.2 version: 3.0.2 sass: - specifier: ^1.77.7 - version: 1.77.8 + specifier: ^1.80.3 + version: 1.80.4 typescript: specifier: ~5.3.3 version: 5.3.3 vite: specifier: ^5.4.7 - version: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + version: 5.4.7(@types/node@18.11.5)(sass@1.80.4) vite-plugin-static-copy: specifier: ^1.0.6 version: 1.0.6(vite@5.4.7) @@ -479,7 +479,7 @@ importers: version: 5.3.3 vite: specifier: ^5.4.7 - version: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + version: 5.4.7(@types/node@18.11.5)(sass@1.80.4) vite-plugin-static-copy: specifier: ^1.0.6 version: 1.0.6(vite@5.4.7) @@ -3725,7 +3725,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.3.3) typescript: 5.3.3 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) dev: true /@jridgewell/gen-mapping@0.3.3: @@ -3914,6 +3914,137 @@ packages: esbuild: 0.14.54 dev: true + /@parcel/watcher-android-arm64@2.4.1: + resolution: {integrity: sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-darwin-arm64@2.4.1: + resolution: {integrity: sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-darwin-x64@2.4.1: + resolution: {integrity: sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-freebsd-x64@2.4.1: + resolution: {integrity: sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-linux-arm-glibc@2.4.1: + resolution: {integrity: sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==} + engines: {node: '>= 10.0.0'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-linux-arm64-glibc@2.4.1: + resolution: {integrity: sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-linux-arm64-musl@2.4.1: + resolution: {integrity: sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-linux-x64-glibc@2.4.1: + resolution: {integrity: sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-linux-x64-musl@2.4.1: + resolution: {integrity: sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-win32-arm64@2.4.1: + resolution: {integrity: sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-win32-ia32@2.4.1: + resolution: {integrity: sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==} + engines: {node: '>= 10.0.0'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher-win32-x64@2.4.1: + resolution: {integrity: sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@parcel/watcher@2.4.1: + resolution: {integrity: sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==} + engines: {node: '>= 10.0.0'} + dependencies: + detect-libc: 1.0.3 + is-glob: 4.0.3 + micromatch: 4.0.5 + node-addon-api: 7.1.1 + optionalDependencies: + '@parcel/watcher-android-arm64': 2.4.1 + '@parcel/watcher-darwin-arm64': 2.4.1 + '@parcel/watcher-darwin-x64': 2.4.1 + '@parcel/watcher-freebsd-x64': 2.4.1 + '@parcel/watcher-linux-arm-glibc': 2.4.1 + '@parcel/watcher-linux-arm64-glibc': 2.4.1 + '@parcel/watcher-linux-arm64-musl': 2.4.1 + '@parcel/watcher-linux-x64-glibc': 2.4.1 + '@parcel/watcher-linux-x64-musl': 2.4.1 + '@parcel/watcher-win32-arm64': 2.4.1 + '@parcel/watcher-win32-ia32': 2.4.1 + '@parcel/watcher-win32-x64': 2.4.1 + dev: true + /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -4386,7 +4517,7 @@ packages: storybook: 8.3.2 ts-dedent: 2.2.0 typescript: 5.3.3 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) dev: true /@storybook/components@8.3.2(storybook@8.3.2): @@ -4515,7 +4646,7 @@ packages: resolve: 1.22.8 storybook: 8.3.2 tsconfig-paths: 4.2.0 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) transitivePeerDependencies: - '@preact/preset-vite' - '@storybook/test' @@ -4808,7 +4939,7 @@ packages: babel-dead-code-elimination: 1.0.6 chokidar: 3.6.0 unplugin: 1.12.3 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) zod: 3.23.8 transitivePeerDependencies: - supports-color @@ -5700,7 +5831,7 @@ packages: vite: ^4 || ^5 dependencies: '@swc/core': 1.7.26 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) transitivePeerDependencies: - '@swc/helpers' dev: true @@ -5716,7 +5847,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.25.2) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) transitivePeerDependencies: - supports-color dev: true @@ -6593,6 +6724,13 @@ packages: fsevents: 2.3.3 dev: true + /chokidar@4.0.1: + resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + engines: {node: '>= 14.16.0'} + dependencies: + readdirp: 4.0.2 + dev: true + /ci-info@3.9.0: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} @@ -6972,6 +7110,12 @@ packages: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + /detect-libc@1.0.3: + resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} + engines: {node: '>=0.10'} + hasBin: true + dev: true + /detect-newline@3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -10652,6 +10796,10 @@ packages: /nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} + /node-addon-api@7.1.1: + resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} + dev: true + /node-dir@0.1.17: resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==} engines: {node: '>= 0.10.5'} @@ -11608,6 +11756,11 @@ packages: picomatch: 2.3.1 dev: true + /readdirp@4.0.2: + resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} + engines: {node: '>= 14.16.0'} + dev: true + /recast@0.20.5: resolution: {integrity: sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==} engines: {node: '>= 4'} @@ -11915,14 +12068,15 @@ packages: /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - /sass@1.77.8: - resolution: {integrity: sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==} + /sass@1.80.4: + resolution: {integrity: sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==} engines: {node: '>=14.0.0'} hasBin: true dependencies: - chokidar: 3.5.3 + '@parcel/watcher': 2.4.1 + chokidar: 4.0.1 immutable: 4.3.5 - source-map-js: 1.2.0 + source-map-js: 1.2.1 dev: true /sax@1.3.0: @@ -13106,7 +13260,7 @@ packages: debug: 4.3.4(supports-color@8.1.1) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) transitivePeerDependencies: - '@types/node' - less @@ -13129,7 +13283,7 @@ packages: fast-glob: 3.3.2 fs-extra: 11.2.0 picocolors: 1.1.0 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) dev: true /vite-tsconfig-paths@5.0.1(typescript@5.3.3)(vite@5.4.7): @@ -13143,13 +13297,13 @@ packages: debug: 4.3.4(supports-color@8.1.1) globrex: 0.1.2 tsconfck: 3.1.3(typescript@5.3.3) - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@5.4.7(@types/node@18.11.5)(sass@1.77.8): + /vite@5.4.7(@types/node@18.11.5)(sass@1.80.4): resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -13184,7 +13338,7 @@ packages: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.22.4 - sass: 1.77.8 + sass: 1.80.4 optionalDependencies: fsevents: 2.3.3 dev: true @@ -13233,7 +13387,7 @@ packages: strip-literal: 2.1.0 tinybench: 2.6.0 tinypool: 0.8.3 - vite: 5.4.7(@types/node@18.11.5)(sass@1.77.8) + vite: 5.4.7(@types/node@18.11.5)(sass@1.80.4) vite-node: 1.6.0(@types/node@18.11.5) why-is-node-running: 2.2.2 transitivePeerDependencies: From a195f36ee1b6f31ba5e8d3a46030562d32e09d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Tue, 29 Oct 2024 13:07:01 +0200 Subject: [PATCH 20/26] Fixed e2e tests --- ...ngroup-default-visual-1-chromium-linux.png | Bin 3069 -> 3133 bytes .../src/appui-react/pickers/ViewSelector.tsx | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-enum-enum-buttongroup-default-visual-1-chromium-linux.png b/e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-enum-enum-buttongroup-default-visual-1-chromium-linux.png index d093c52721f25aec2c6d67967a77ef10f894ccb4..406d4b840930daf55eeca69f4789c4c84b11fe59 100644 GIT binary patch literal 3133 zcmV-D48rq?P);&e00001b5ch_0Itp) z=>Px=_en%SRCt{2oqJGIS02aDO+o^t1Y!UyPs?N546RTT9uiiA73d0e>qsqsR60&a zptIcop;o~Vf?>7ont+Ikj}FVWrR-Kmw*`FF8j1{HC)ENu}27&as!CU^h1 zHcgXD0wIJz&u94K&b{ZJ-}iU#mvipp+!I8t(Etd+fG|70VyO`1m-2Ad4--)j<#hURXN;*g->F2xr?d`RLclN56J*P{>k&1L9IYGF`p2*xw+BN(N+q~KMTnGv0=x&yuAAQ`qsqf zpeF6J;SXP;XFY5G3%Zn)6h5E-_Sp!uy6h8IZ(HR)#_{59P-i!tAq#i^;Od_JGc<(g&D-Q8VSSSS<< z=br^+{>qswRa5$X(`}Y?X7GhcOcs%Gu zmtqc&!4ne`MIsT8$1@lV6%`d5Hf(T+f}aczFh|yJ_RTo^KyLtzTl{_>;o+bVKgZy3 zIAvvJ4$lJO5a#w696PT>BGL2&J6I3`5CBL7U|6^i1OkE}3z`MQKIYImwzahh1cDDf z_<%$r@p!xg2M(~=?D;D&9Zq!a?o@WmXwx=-06@ms2Y-9nFFo7=4W#LiC8<;@6bdC0 z2>`%>SwI|ujn>h4B4sk!zJ2@NfB*gX_;@ChdFarg;^N|~SFbuy%DKB!uQ!c0ZS&^@ zyK{owo3{DC_QlA#yHgGfA(cu60)a##VKSLaCQ~Ajl$4Z6rBVlmfXs(kb=Fd;w4|g& zB9SB{Bw%Y|V`C)}iAW@Jlq1jGoyu+=HQrVO05C_s-ZbhcM`G=w@wOTOfH_hi5I{$| z2)6BL?A?rK5rf5IiN#`(NHqU**(g_KH;-O=b*0gZ7@T1D=1l+WW(PR(^5x4yp|HBT z+AIqulUZ3=DHIB!BV7R-*N#`NT&b_Gudc4feZ9tHGOMerxm@m>Z@y`_f{$+fPyDsA zB@_Q8At%_qdE3g2v%`Dhz3mQh;lhPaKKZ1os%oYzDl02_JYIHow%s8h4#9>UYin!s z^73>#o!QF_Q?j$OYierjR#4vlup-GvkD_L;WK4NC-kWdl3u^$t>C>n4^78b0y_GC> z?ATFTTWfa+h(oY_XYGWOG#{(Y5@@w0fi*iiVdS43;}_=&9KX1PfTO`7E`+ncmEnZ1 zaB@V*5`sjd(NGk1+Najn{t)Y&K#m1PQ5uc5*eaGkgoua;g+j5|GF%;nLJ=MjvDhk> zKZIu)jJCG6k&zLD!LZn3ToHr8FfuaI*4D;gFcw?O@&{3CG%A%!E|=ef6YAkXqtU`6 zA{cN&J*R-c=|&;01ANc}aUq}`Aua^8BgBPp_G56!uYr6nx2LDaN`aV|n8Vf8mg`~b z2yr~ty=bKX2>?*a=WDfEB9RCHh>eTex^=7NOPayK!QkNF*+{`HIs4sz4dm?Fb@J4y z#a7{pJZ>Gi`S}OmdyijQDwoS;GMQN+gTYW$Ri)GEY*vR`a`wAJmJ`=oTa62*e^z$+ zMQ82l=^4Fd&Ct-0c_9KpEEc=Dx!F`;T2g%I(B$OgoOb_}F#8b##$#xDLe!X$Q z^v}vJL_VK??W?a?EEbhYRjE|x&z(z5OnmC8r}mYUP^r|KBS*d;8j6mI$=S8*;IC1sMFK@KA1_lPMpwqQl?e2HpiH?r; z^769WifKRr`1qrbT3TBEJ2)5<6Qk8?^SRvg^mHt%EcB< zGWpYnhKm<3jw%#UQBkx~<~dFB}a zz>T)H$E_og>^a|iA3U;mOgs)s8S;7?C5x5?OMw^&5ogQS*=zdJ9ey) z#|sGwQ7V-cB2hp-l{C^z^h?EbeG;Pn`KH_3N#zSX*e;L0f4cAKQ_epC1$yWOm3hGBV7(hz+&EK5zB& z^Lz5iC*$Jc002}fl}4i}l}fYYZbm{v!avTRSF6Jy2?)vH&JkBxyDTw+tLa{^tze*LSfR{;RqGBe}i z;*8ajNTh^y>u%q^jcdo5xOeYfKtKRyEGm^68yENOx8H_^g;}ayxpJlP*Q*c&(N0fW zo?P78X0oF(1er``v)Om<+_7Ru)6RO9sabpOIMbj3<9Y-^j8}vRg4mp6ghHXLUAq?h zT7bo3Q79A?MMFYE_w3n&Ti(i6509T`r$8;P#->!NIjLRfKxt`dX=!PuJL>g%V`#lz zZ>3sG+(;z7$?z)_McqgwT(uFAks+a>g3?lNZ*MOu)pWiMqgveBtmrWwx9RC=V-}8L z0iQd%xw%bDn17SSNlxzU?3Br5oaAHxKzMlg_d`R*-&Y&^Y2@YQ%a=78%}iS@A(P1{ zivIZHj{tz-;o*USfmw=lS|Bs9|4E%r*U{0zU@&H?*7O(}mqS8B6$-`u`}Y9=N~N;< z=FO<*o|`Gq{egjkf`WH;@6OH5#l4%vt<6fB?d|QD@^+cb`k*^I?yMK^t<2{1^qM0_ zyu7^lrKQG|*d>7*iG+0r9v&WlGu8z+@Y0)fC_FtXoxL#x$Zyl~<9=bvA-YL(?y z+*k;L?A*Dt=ExB;ne6B9Kg;RqofgQ9pr9c2)ReHSOs!VOyzs)h#Kf7ZH9dx=%Wu8) zR%2tMZh9I3@X9N%JpJ_3xPhjpr=RfjEGsJ`kw_?tu1ieJ%E~e;hW&CMPE`ahGENoe&QUL^^QmON)a86SY+J9#aS(d!IeS1SgLrY5wkw74k zNO`%rWHQ-l(P3u|aS811tl@|rh~u&TyI9yXUAXIE>j-fnVCx8RA)p;0E(EkA#D(}j X^0=REY4$#Z00000NkvXXu0mjf$yF>X literal 3069 zcmV>00001b5ch_0Itp) z=>Px=w@E}nRCt{2oo!H4S02Wnn}h_G5*iV#yjsLQ6v06?SBU{I;V(9jSjCnuTK zw4e|O1V~9q!NWo!!o$OvmP7Cp)K4lEeWjxVSy@?#ii!e@#R|BHrluwo7Z(S--C)pQ zGMS)KsnFHcg~!*gCuX}xVGSyk$j;72baXT$CR^yRSS&fMBQBhI2IW)wy41%9vO-@dNq9~?yEO;o2BIn2VFl4MqAOwJ*G+OS_FOhrn zOQvNI2tI?uv;cdw-<)7t0)gODg7Sz)Alz%XeMA$B#a=bg*VpG&J$q1f|MRLIElKj3 zhG2*T;qJqup(CHqM_pYVQd3i%mKzutfJ7pJTCM)A`sT4XjD?oG7-YxuoR;hSR*$@v zF{pGVpKFMWj6`j1Eu(QD++BDybgZtfMoCEt6bgmIG75zPrKP2i%jLe%H;;cl8;vbz z#?U>gcUY!+AkUo95{f|(o$T#devbWf5(Avcj1xI#A2~!C$nd^{{DVQ zrBc+?)IcN>`BJBaoPj+p?=XI5{Xb-TZ`Sh zciWAFLZN^}B0+6!t>5B6xV!K;86p;oQBzZc($Z4&_xD@=-{0Sl^73-j)YKp?EzQ?D ztuUMI*)!H=Yah`ezhxZfo{RCD$;_C|CXq<2%%)H%AeBl{S64?&MzG*j)=?}LLoSy? zDwRT^P(YzjKqix+zP{e?CNqgufGAeBnd z*w{!+MzF%`>u4Dn8K|$Xhg2$s$z;O8g9ou{)hgerb3sl*D9+`_Ag^T%CYr|iZA*|D z=R8T`YeXUu>g($vkw_Se10neNO&6?9CKD)%0*Axgb#E5+%ZJTkZoVc(QH;ld5ZrjZ zXY};+pscJ6H8nNha5yL}Ek$EvV?ck+&BMi({9m$*Th5H3bz4k8k80-OVr^|L05B2< zLh$3&IhsPDz}~%kA(zV`7K%X&vv}@m$ghw2skuNLm&_^ zErZ}ESScwfP^nZ*>saupR4Ob_Nnu(B!B4Or77EeX*@^M-ahOcLf4&C6IVO_{GP#0q&a2ow6JNsH~`f zUatq6%?1FhO;1ODe!j!mA|oRsNJvQVOtp)8-hL;+Gj{FViFZ$&U|Pn4!*WC`EGohQ zxf~Uhl~5{`=<4dSTft;9p{c0}27|$)hMd*&_B#oLKybOE!|HF_k2}m8I);abWA&<4 z7#$t8UxCF!Lqh{XLP9(eYg@0Oz8=%l)4%CE37+HaoYuM9%ii+6%oFR^Tm5bOaR+uq zMaAovzW4%ZX=&i|`Os)IINQ>K%*;$Y@W2DuTV4)6pN}Jl597PhQLIi)#jc$@v1RL4 z06=+J84Lyk-hcmnw6?Y)G&B_dzIqiOHaDZStqsOIcd%l`3Sf5FvSsU5oIZUTeZ9RH z92`VnUmvovvMlTVwr?MnE?tVK#ft#|*9Ql2?C4QEk&}ZP*RSL4cizG0pM8ca9UX{^ zi^HO*DCqTiNM3yvt5>f^L_~zca%R0WfPZ}O0ovNy@a@P5Qd3i**XvPKScuJ=H(P>p z{P=MIKwMm$+x-kCE%vy0;Q~UqTzuHvj0+bo;3t&|D_5>`+GbBrkJa}2{`>FeZNLBC zxPjxxj^X0Pi)g=e30y80iHV6$`$2x@G z@+71(83Y0WzWL@G9BOJpeM19yJRbh=^wU_hXpz%$6h&DkP`_4H1*6f318=?wrBaFH zty$x+J$u`0?y^>^#j#_@u)CxL ziHV6&tJSF9zaO!&u}Dr%cGyoIkB8pgUhJ=~21QXgapD9XS-H|;P}_aaSv#?@u})() zF);z7(TIwQ3e3#RprN4wJ>A{N%*t|F53|EX^O4KmP|=;En#E{^MMa2@kDph-U@+jB zXP&WZGR)rIVSc`2baXWCyYD`vr>6t6FD?`a1W>Ehb~m~`GBPr7?(A7;wORncf397_ zOE0~Ip`jtD)oL6)a>P=0YHA9%Z{NoK_ur4Fo_Y!ZaP8VPr{!pxM%HX_*=#nJEn9}k zi3z~P&h1G*gGI~b%a`%R=br-rwr$^z^z?MAHaQ#)GS;ob_3PK28qF0qZ{9>~Y^=o~ zd_Es*)6?NV7VFou7mA{wpP8{N+wObL+HqyHxf-}!F0!(+aO1`e zw~S^xbo2(duA{k{>^gTnMNwAgS`Z^`X3ZMQLvYg4(!k^KK+`l5lae5l z$(+`Ar(9TAm~|Zo=Po~MG*-)=_LFHXn>KC2rcImXeV5T_w9;ra8r^Es5g{B7j5c?E z&@_#ZIqxE{*Uyv{E0CC!gx4x75g8eY2tMCp27CQ<){Z;+=Wd^wnHj4%_#4KqqlJWo zU}|d0?z)`ZT=e$#qN}S5Ik~w2faS}Vqr_kwiF3UNB%jJTm zY5efRFORbO@y8!AJUr}G--1btJ`TJv|T#g)ZB)-ClE-6O)plQmJt3)-3>l zTCIknzaJ|fdBmlbTf@UBE-uEa5(x?l3Y;dyoVDXl%(}a~E&cB9>T>(GBwu758JijM z^ybYta`-SJA|g;xS!uP-JcJG5a4bWDu&^-vwXhJUPMyNES`8M91))%gKfU}i^m;um zeDVn%ee_W*UAoj^IcHE5g&jL~;K<>_;BvW$j*0Q=#qhzT#UAnT@zDPKGhVN%f>x_V z>SK>#U1p}sHf^_;?eZ(Hyn<7wPQfrc^vlc3!-Ee#=v2$h%nW`P9*(N2DsVU)&@_#8 znVER;#TV_C4+{%(+Kw~*JRT2s3!CY z1ORBYT2$=ai?Z@^ES}9e`-*~HyYSAt?|M|nQ&TxRx{J+PB+^#iMeiBI00000 LNkvXXu0mjf!N}Lq diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index 054bf66016e..0a447189e52 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -21,6 +21,7 @@ import { debounce } from "lodash"; import { SvgSavedView } from "../icons/SvgSavedView.js"; import { useReduxFrameworkState } from "../uistate/useReduxFrameworkState.js"; import type { ListenerType } from "@itwin/core-react/internal"; +import { Icon } from "@itwin/core-react"; // cSpell:ignore Spatials @@ -462,7 +463,7 @@ export class ViewSelector extends React.Component< title={this.state.title} setEnabled={this._setEnabled} items={this.state.items} - icon={} + icon={} />} onExpanded={this._onExpanded} searchBox={this.state.searchBox} onSearchValueChange={debounce((search: string) => { From f5e0503bcac65988ecb8417b6eda0b0701c4e394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Tue, 29 Oct 2024 13:38:57 +0200 Subject: [PATCH 21/26] added eslint fix --- ui/appui-react/src/appui-react/pickers/ViewSelector.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index 0a447189e52..de42ebff401 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -463,6 +463,7 @@ export class ViewSelector extends React.Component< title={this.state.title} setEnabled={this._setEnabled} items={this.state.items} + // eslint-disable-next-line deprecation/deprecation icon={} />} onExpanded={this._onExpanded} searchBox={this.state.searchBox} From b2ba8de99e47dfbf68568a1b83914f03849e02b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Tue, 5 Nov 2024 13:36:01 +0200 Subject: [PATCH 22/26] Updated vitest config --- ui/components-react/vitest.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/components-react/vitest.config.ts b/ui/components-react/vitest.config.ts index 96188cf625e..fb5c40f7aa8 100644 --- a/ui/components-react/vitest.config.ts +++ b/ui/components-react/vitest.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ lines: 97, functions: 94, statements: 97, - branches: 97, + branches: 96, }, }, }, From c2c80bff30d047125b7c777581cc7ed9e2df51bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Tue, 5 Nov 2024 14:37:52 +0200 Subject: [PATCH 23/26] Fixed lint --- ui/appui-react/src/appui-react/pickers/ViewSelector.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx index 06effad3043..379ef2c3fa5 100644 --- a/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx +++ b/ui/appui-react/src/appui-react/pickers/ViewSelector.tsx @@ -463,7 +463,7 @@ export class ViewSelector extends React.Component< title={this.state.title} setEnabled={this._setEnabled} items={this.state.items} - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line @typescript-eslint/no-deprecated icon={} />} onExpanded={this._onExpanded} searchBox={this.state.searchBox} From 41fdf91ac0b7c452351033d5454c7c2b39c538c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Wed, 6 Nov 2024 10:35:18 +0200 Subject: [PATCH 24/26] Optimized svgs --- .../icons/SvgAssetClassificationHide.tsx | 22 ++-------------- .../src/appui-react/icons/SvgAssetIsolate.tsx | 22 ++-------------- .../src/appui-react/icons/SvgGyroscope.tsx | 12 +++------ .../src/appui-react/icons/SvgLayersHide.tsx | 24 ++---------------- .../appui-react/icons/SvgLayersIsolate.tsx | 25 ++----------------- .../src/appui-react/icons/SvgModelHide.tsx | 4 +-- .../src/appui-react/icons/SvgModelIsolate.tsx | 4 +-- .../src/appui-react/icons/SvgSavedView.tsx | 6 ++--- .../src/appui-react/icons/SvgSectionTool.tsx | 19 +------------- .../appui-react/icons/SvgSelectionClear.tsx | 3 +-- .../icons/cube-faces/SvgCubeFaceBottom.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceFront.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceIsoLeft.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceIsoRight.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceLeft.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceRear.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceRight.tsx | 8 +++--- .../icons/cube-faces/SvgCubeFaceTop.tsx | 8 +++--- 18 files changed, 51 insertions(+), 154 deletions(-) diff --git a/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx b/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx index a15dd59b86c..22e0bc44339 100644 --- a/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx @@ -11,26 +11,8 @@ import * as React from "react"; /** @internal */ export function SvgAssetClassificationHide() { return ( - - + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgAssetIsolate.tsx b/ui/appui-react/src/appui-react/icons/SvgAssetIsolate.tsx index d2e4c725142..1de7eb37f83 100644 --- a/ui/appui-react/src/appui-react/icons/SvgAssetIsolate.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgAssetIsolate.tsx @@ -11,26 +11,8 @@ import * as React from "react"; /** @internal */ export function SvgAssetIsolate() { return ( - - - - - - - - - - + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgGyroscope.tsx b/ui/appui-react/src/appui-react/icons/SvgGyroscope.tsx index df54edf2e10..562b7caa05f 100644 --- a/ui/appui-react/src/appui-react/icons/SvgGyroscope.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgGyroscope.tsx @@ -11,15 +11,9 @@ import * as React from "react"; /** @internal */ export function SvgGyroscope() { return ( - - - - - + + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgLayersHide.tsx b/ui/appui-react/src/appui-react/icons/SvgLayersHide.tsx index ea2908b387a..a3f4b68a374 100644 --- a/ui/appui-react/src/appui-react/icons/SvgLayersHide.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgLayersHide.tsx @@ -11,28 +11,8 @@ import * as React from "react"; /** @internal */ export function SvgLayersHide() { return ( - - + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgLayersIsolate.tsx b/ui/appui-react/src/appui-react/icons/SvgLayersIsolate.tsx index ac32d1a5794..95dfca7b804 100644 --- a/ui/appui-react/src/appui-react/icons/SvgLayersIsolate.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgLayersIsolate.tsx @@ -11,29 +11,8 @@ import * as React from "react"; /** @internal */ export function SvgLayersIsolate() { return ( - - - - - - - - - - - - - + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgModelHide.tsx b/ui/appui-react/src/appui-react/icons/SvgModelHide.tsx index bb599fcef69..10f1e77770f 100644 --- a/ui/appui-react/src/appui-react/icons/SvgModelHide.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgModelHide.tsx @@ -13,10 +13,10 @@ export function SvgModelHide() { return ( - + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgModelIsolate.tsx b/ui/appui-react/src/appui-react/icons/SvgModelIsolate.tsx index fb62df0a16c..f718b914f49 100644 --- a/ui/appui-react/src/appui-react/icons/SvgModelIsolate.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgModelIsolate.tsx @@ -13,10 +13,10 @@ export function SvgModelIsolate() { return ( - + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgSavedView.tsx b/ui/appui-react/src/appui-react/icons/SvgSavedView.tsx index 68891a4be54..269ef30432d 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSavedView.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSavedView.tsx @@ -12,10 +12,8 @@ import * as React from "react"; export function SvgSavedView() { return ( - - - - + + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx index c071d053e6f..5d17df573a8 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx @@ -12,28 +12,11 @@ import * as React from "react"; export function SvgSectionTool() { return ( - - - - - - - - - - - - - - - - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx b/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx index 3aab725e6aa..23953579c2a 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx @@ -12,12 +12,11 @@ import * as React from "react"; export function SvgSelectionClear() { return ( - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx index 95f4fbf433b..2e527ce3a75 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceBottom() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx index 7388c685d99..ec925e798df 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceFront() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx index b0ad11f18f6..da10e6b215e 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceIsoLeft() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx index 5b60adc8122..9505deae23e 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceIsoRight() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx index 01451763f99..44c534300f7 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceLeft() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx index 9f1df74d555..049c43eb19c 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceRear() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx index 69afba92df9..3987050e7cd 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceRight() { return ( - - + ); } diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx index 4cdac2f3b90..42d12955d93 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx @@ -12,12 +12,12 @@ import * as React from "react"; export function SvgCubeFaceTop() { return ( - - + ); } From 34b843b61436ce5387cef4df35f53ff099917a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Wed, 6 Nov 2024 15:03:46 +0200 Subject: [PATCH 25/26] Fixed section tool icon --- ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx index 5d17df573a8..cd8192e4a3f 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx @@ -16,7 +16,8 @@ export function SvgSectionTool() { xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" > - + + ); } From 22c63c2a1e75fe964ffe6d34183cc00bd47df8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Budrevi=C4=8Dius?= Date: Wed, 6 Nov 2024 17:03:51 +0200 Subject: [PATCH 26/26] PR comment fixes. --- ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx | 8 ++------ .../src/appui-react/icons/SvgSelectionClear.tsx | 6 +----- .../appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx | 6 +----- .../src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx | 6 +----- .../appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx | 6 +----- .../appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx | 6 +----- .../src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx | 6 +----- .../src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx | 6 +----- .../src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx | 6 +----- .../src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx | 6 +----- 10 files changed, 11 insertions(+), 51 deletions(-) diff --git a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx index cd8192e4a3f..c37b4a40cf4 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx @@ -11,12 +11,8 @@ import * as React from "react"; /** @internal */ export function SvgSectionTool() { return ( - - + + ); diff --git a/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx b/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx index 23953579c2a..c14fa9baa9b 100644 --- a/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx +++ b/ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx @@ -11,11 +11,7 @@ import * as React from "react"; /** @internal */ export function SvgSelectionClear() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx index 2e527ce3a75..40f14d897bf 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceBottom() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx index ec925e798df..f2a4deff700 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceFront() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx index da10e6b215e..5ab4bf2786c 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceIsoLeft() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx index 9505deae23e..60ea7a362a3 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceIsoRight() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx index 44c534300f7..464cd9b66f8 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceLeft() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx index 049c43eb19c..67cf65cd163 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceRear() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx index 3987050e7cd..79110225ca5 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceRight() { return ( - + ); diff --git a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx index 42d12955d93..90550f2d3eb 100644 --- a/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx +++ b/ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx @@ -12,11 +12,7 @@ import * as React from "react"; export function SvgCubeFaceTop() { return ( - + );