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.

Sign up for GitHub

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

feat(admin-ui): IconPicker #4519

Draft
wants to merge 8 commits into
base: feat/new-admin-ui
Choose a base branch
from
Draft

feat(admin-ui): IconPicker #4519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
175459d
chore: export utils
leopuleo Jan 31, 2025
8d10841
fix: support forwardEventOnChange prop
leopuleo Jan 31, 2025
3823221
feat: new DelayedOnChange + IconPicker
leopuleo Feb 1, 2025
1b4b8be
feat: add IconPicker to app-page-builder and app-headless-cms
leopuleo Feb 2, 2025
31c8e2f
Merge branch 'feat/new-admin-ui' into leo/feat/ui-icon-picker
leopuleo Feb 3, 2025
51fad7c
fix: dependencies
leopuleo Feb 3, 2025
532873b
Merge branch 'feat/new-admin-ui' into leo/feat/ui-icon-picker
leopuleo Feb 3, 2025
7d1b300
chore: merge next
leopuleo Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: dependencies
  • Loading branch information
@leopuleo
leopuleo committed Feb 3, 2025
commit 51fad7c3a1e297a777130e4d5323519b6020a473
10 changes: 5 additions & 5 deletions packages/admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"description": "The UI component library for Webiny's Admin app.",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@fortawesome/fontawesome-svg-core": "^1.3.0",
"@fortawesome/free-solid-svg-icons": "^6.0.0",
"@fortawesome/react-fontawesome": "^0.1.17",
"@material-design-icons/svg": "^0.14.13",
"@radix-ui/react-accessible-icon": "^1.1.0",
"@radix-ui/react-avatar": "^1.1.0",
Expand Down Expand Up @@ -41,13 +41,13 @@
"mobx": "^6.9.0",
"react": "18.2.0",
"react-ace": "^13.0.0",
"react-virtualized": "^9.22.6",
"react-virtualized": "^9.22.5",
"tailwind-merge": "^2.4.0",
"tailwindcss": "^3.4.6",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@fortawesome/fontawesome-common-types": "^6.7.2",
"@fortawesome/fontawesome-common-types": "^0.3.0",
"@storybook/addon-a11y": "7.6.20",
"@storybook/addon-essentials": "7.6.20",
"@storybook/react": "7.6.20",
Expand Down
1 change: 1 addition & 0 deletions packages/admin-ui/src/IconPicker/IconPicker.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface Icons {

const getIcons = () => {
const icons: IconDto[] = [];
// @ts-expect-error
library.add(fas);
const definitions = (library as unknown as Icons).definitions;
// @ts-expect-error
Expand Down
1 change: 1 addition & 0 deletions packages/admin-ui/src/IconPicker/primitives/IconPickerPrimitive.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ interface Icons {

const getIcons = () => {
const icons: IconDto[] = [];
// @ts-expect-error
library.add(fas);
const definitions = (library as unknown as Icons).definitions;
// @ts-expect-error
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/files/references.json
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 5 additions & 59 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5648,13 +5648,6 @@ __metadata:
languageName: node
linkType: hard

"@fortawesome/fontawesome-common-types@npm:6.7.2, @fortawesome/fontawesome-common-types@npm:^6.7.2":
version: 6.7.2
resolution: "@fortawesome/fontawesome-common-types@npm:6.7.2"
checksum: 10/3c2e938afe6f5939bd63181faaec7b062902d9ed970c75d6becb1fd8e5ca0ed937e7d1513bd7ae545da407d0682039e50730cdb3136b58656128838ea2c58ac0
languageName: node
linkType: hard

"@fortawesome/fontawesome-common-types@npm:^0.3.0":
version: 0.3.0
resolution: "@fortawesome/fontawesome-common-types@npm:0.3.0"
Expand All @@ -5671,15 +5664,6 @@ __metadata:
languageName: node
linkType: hard

"@fortawesome/fontawesome-svg-core@npm:^6.7.2":
version: 6.7.2
resolution: "@fortawesome/fontawesome-svg-core@npm:6.7.2"
dependencies:
"@fortawesome/fontawesome-common-types": "npm:6.7.2"
checksum: 10/a3767631329aaa8c1bfafc9470718628533ceb42365774cd0c121477e0f3125f3cce4c2447058deee2874829ce11aa7a3fe183b0000bad81cf5ed0449c8470ef
languageName: node
linkType: hard

"@fortawesome/free-brands-svg-icons@npm:^6.0.0":
version: 6.2.1
resolution: "@fortawesome/free-brands-svg-icons@npm:6.2.1"
Expand Down Expand Up @@ -5707,15 +5691,6 @@ __metadata:
languageName: node
linkType: hard

"@fortawesome/free-solid-svg-icons@npm:^6.7.2":
version: 6.7.2
resolution: "@fortawesome/free-solid-svg-icons@npm:6.7.2"
dependencies:
"@fortawesome/fontawesome-common-types": "npm:6.7.2"
checksum: 10/efcd90cd5d333995ff4012a9d77a8b23523e246fa418524edf08bb6af8b14db2ee0b08ee5f7460a86474d352af06e1a2581cc827ee3706e9c0e92e178b50e27f
languageName: node
linkType: hard

"@fortawesome/react-fontawesome@npm:^0.1.17":
version: 0.1.19
resolution: "@fortawesome/react-fontawesome@npm:0.1.19"
Expand All @@ -5728,18 +5703,6 @@ __metadata:
languageName: node
linkType: hard

"@fortawesome/react-fontawesome@npm:^0.2.2":
version: 0.2.2
resolution: "@fortawesome/react-fontawesome@npm:0.2.2"
dependencies:
prop-types: "npm:^15.8.1"
peerDependencies:
"@fortawesome/fontawesome-svg-core": ~1 || ~6
react: ">=16.3"
checksum: 10/05537fd7c34d43e0d8823df0195cb6fd935ff78e296e2d362e668bcf75f13d71c70c7fd6d596dff4e37b5f27e0ae43b98cb4732e0d91570f30b8a5581bbe2704
languageName: node
linkType: hard

"@gar/promisify@npm:^1.1.3":
version: 1.1.3
resolution: "@gar/promisify@npm:1.1.3"
Expand Down Expand Up @@ -14987,10 +14950,10 @@ __metadata:
version: 0.0.0-use.local
resolution: "@webiny/admin-ui@workspace:packages/admin-ui"
dependencies:
"@fortawesome/fontawesome-common-types": "npm:^6.7.2"
"@fortawesome/fontawesome-svg-core": "npm:^6.7.2"
"@fortawesome/free-solid-svg-icons": "npm:^6.7.2"
"@fortawesome/react-fontawesome": "npm:^0.2.2"
"@fortawesome/fontawesome-common-types": "npm:^0.3.0"
"@fortawesome/fontawesome-svg-core": "npm:^1.3.0"
"@fortawesome/free-solid-svg-icons": "npm:^6.0.0"
"@fortawesome/react-fontawesome": "npm:^0.1.17"
"@material-design-icons/svg": "npm:^0.14.13"
"@radix-ui/react-accessible-icon": "npm:^1.1.0"
"@radix-ui/react-avatar": "npm:^1.1.0"
Expand Down Expand Up @@ -15035,7 +14998,7 @@ __metadata:
prettier: "npm:^2.8.8"
react: "npm:18.2.0"
react-ace: "npm:^13.0.0"
react-virtualized: "npm:^9.22.6"
react-virtualized: "npm:^9.22.5"
rimraf: "npm:^6.0.1"
sass: "npm:1.44.0"
storybook: "npm:7.6.20"
Expand Down Expand Up @@ -38833,23 +38796,6 @@ __metadata:
languageName: node
linkType: hard

"react-virtualized@npm:^9.22.6":
version: 9.22.6
resolution: "react-virtualized@npm:9.22.6"
dependencies:
"@babel/runtime": "npm:^7.7.2"
clsx: "npm:^1.0.4"
dom-helpers: "npm:^5.1.3"
loose-envify: "npm:^1.4.0"
prop-types: "npm:^15.7.2"
react-lifecycles-compat: "npm:^3.0.4"
peerDependencies:
react: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
checksum: 10/57c24aa6226e628d970dd57b5d20693aec1ebc456c33667833779d26b82addbcbf03b65d874ad25154fb65a070a6a52d3dbdc699932442f1862246ee5d7e328c
languageName: node
linkType: hard

"react@npm:18.2.0":
version: 18.2.0
resolution: "react@npm:18.2.0"
Expand Down