Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove icons-generic (backport #1074) #1144

Merged
merged 6 commits into from
Dec 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2024

Changes

Removed several references to @bentley/icons-generic by either reusing similar icons from @itwin/itwinui-icons or inlining the icons directly.

Testing

Verified the components with updated icons in the test app to ensure they function as expected.


This is an automatic backport of pull request #1074 done by [Mergify](https://mergify.com).

* Removed a lot of dependencies on @bentley/icons-generic

* Updated e2e tests to use relative path

---------

Co-authored-by: GerardasB <[email protected]>
(cherry picked from commit 2810fd0)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	ui/appui-react/src/appui-react/statusfields/SectionsField.tsx
#	ui/components-react/package.json
#	ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx
Copy link
Contributor Author

mergify bot commented Dec 7, 2024

Cherry-pick of 2810fd0 has failed:

On branch mergify/bp/release/5.0.x/pr-1074
Your branch is up to date with 'origin/release/5.0.x'.

You are currently cherry-picking commit 2810fd052.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   common/changes/@itwin/appui-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json
	new file:   common/changes/@itwin/components-react/MBudrevicius-RemoveIconsGeneric_2024-10-23-10-21.json
	new file:   docs/storybook/assets/placeholder.svg
	modified:   docs/storybook/package.json
	modified:   docs/storybook/src/deprecated/Icon.stories.tsx
	modified:   e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-enum-enum-buttongroup-default-visual-1-chromium-linux.png
	new file:   ui/appui-react/src/appui-react/icons/SvgAssetClassificationHide.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgAssetIsolate.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgGyroscope.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgLayersHide.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgLayersIsolate.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgModelHide.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgModelIsolate.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgSavedView.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgSectionTool.tsx
	new file:   ui/appui-react/src/appui-react/icons/SvgSelectionClear.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceBottom.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceFront.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoLeft.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceIsoRight.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceLeft.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRear.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceRight.tsx
	new file:   ui/appui-react/src/appui-react/icons/cube-faces/SvgCubeFaceTop.tsx
	modified:   ui/appui-react/src/appui-react/navigationaids/StandardRotationNavigationAid.tsx
	modified:   ui/appui-react/src/appui-react/pickers/ViewSelector.tsx
	renamed:    ui/appui-react/src/appui-react/selection/SelectionContextItemDef.ts -> ui/appui-react/src/appui-react/selection/SelectionContextItemDef.tsx
	modified:   ui/appui-react/src/appui-react/settings/ui/UiSettingsPage.tsx
	modified:   ui/appui-react/src/appui-react/tools/CoreToolDefinitions.tsx
	modified:   ui/components-react/vitest.config.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   ui/appui-react/src/appui-react/statusfields/SectionsField.tsx
	both modified:   ui/components-react/package.json
	both modified:   ui/components-react/src/components-react/editors/EnumButtonGroupEditor.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner December 7, 2024 00:51
@mergify mergify bot added the conflicts label Dec 7, 2024
@mergify mergify bot mentioned this pull request Dec 7, 2024
@GerardasB GerardasB self-assigned this Dec 7, 2024
@GerardasB GerardasB enabled auto-merge (squash) December 9, 2024 13:08
@GerardasB GerardasB merged commit cb78850 into release/5.0.x Dec 10, 2024
18 checks passed
@GerardasB GerardasB deleted the mergify/bp/release/5.0.x/pr-1074 branch December 10, 2024 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants