Skip to content

Switch to standard icons package #3982

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

Open
dannyvv wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −75
Open

Switch to standard icons package #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/fluent-tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"@fluentui-react-native/vibrancy-view": "workspace:*",
"@fluentui-react-native/win32-theme": "workspace:*",
"@fluentui/react-native": "workspace:*",
"@fluentui/react-native-icons": "^2.0.316",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-native-fontawesome": "^0.3.0",
Expand All @@ -95,7 +96,6 @@
"@react-native-picker/picker": "^2.7.0",
"@types/node": "^22.0.0",
"@types/react": "~18.2.0",
"@warren-ms/react-native-icons": "^0.0.13",
"react": "18.2.0",
"react-native": "^0.74.0",
"react-native-macos": "^0.74.0",
Expand Down
19 changes: 11 additions & 8 deletions apps/fluent-tester/src/TestComponents/Svg/RNSVGIcons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import * as React from 'react';
import { View } from 'react-native';
import type { SvgProps } from 'react-native-svg';

import { RNSVGIcons_TESTPAGE } from '@fluentui-react-native/e2e-testing';
import { faMountainCity } from '@fortawesome/free-solid-svg-icons/faMountainCity';
import { faMugHot } from '@fortawesome/free-solid-svg-icons/faMugHot';
import { faMugSaucer } from '@fortawesome/free-solid-svg-icons/faMugSaucer';
import { faSquareCheck } from '@fortawesome/free-solid-svg-icons/faSquareCheck';
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
import {
AccessTime20Filled,
AccessTime20Regular,
Expand Down Expand Up @@ -508,12 +503,20 @@ import {
ArrowCircleUp48Regular,
ArrowCircleUpLeft20Filled,
ArrowCircleUpLeft20Regular,
} from '@warren-ms/react-native-icons';
} from '@fluentui/react-native-icons';
import { RNSVGIcons_TESTPAGE } from '@fluentui-react-native/e2e-testing';
import { faMountainCity } from '@fortawesome/free-solid-svg-icons/faMountainCity';
import { faMugHot } from '@fortawesome/free-solid-svg-icons/faMugHot';
import { faMugSaucer } from '@fortawesome/free-solid-svg-icons/faMugSaucer';
import { faSquareCheck } from '@fortawesome/free-solid-svg-icons/faSquareCheck';
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';

import type { TestSection, PlatformStatus } from '../Test';
import { Test } from '../Test';

function withAccessibility<P extends React.SVGAttributes<SVGElement>>(Component: React.ComponentType<React.SVGAttributes<SVGElement>>) {
function withAccessibility<P extends SvgProps>(
Component: React.ComponentType<SvgProps & { accessibilityLabel?: string }>,
): React.FC<P & { accessibilityLabel?: string }> {
const WithAccessibility: React.FC<P & { accessibilityLabel?: string }> = (props) => {
const { accessibilityLabel, ...restProps } = props;
return (
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-tester-df993457-6959-426f-9eed-eda194e79042.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Use public fluentui-react-native icons package rather than a private one",
"packageName": "@fluentui-react-native/tester",
"email": "dannyvv@microsoft.com",
"dependentChangeType": "patch"
}
83 changes: 17 additions & 66 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.22.0, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.8.0":
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.22.0, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.8.0":
version: 7.28.2
resolution: "@babel/runtime@npm:7.28.2"
checksum: 10c0/c20afe253629d53a405a610b12a62ac74d341a2c1e0fb202bbef0c118f6b5c84f94bf16039f58fd0483dd256901259930a43976845bdeb180cab1f882c21b6e0
Expand Down Expand Up @@ -2103,13 +2103,6 @@ __metadata:
languageName: node
linkType: hard

"@emotion/hash@npm:^0.8.0":
version: 0.8.0
resolution: "@emotion/hash@npm:0.8.0"
checksum: 10c0/706303d35d416217cd7eb0d36dbda4627bb8bdf4a32ea387e8dd99be11b8e0a998e10af21216e8a5fade518ad955ff06aa8890f20e694ce3a038ae7fc1000556
languageName: node
linkType: hard

"@esbuild/aix-ppc64@npm:0.25.5":
version: 0.25.5
resolution: "@esbuild/aix-ppc64@npm:0.25.5"
Expand Down Expand Up @@ -4745,6 +4738,7 @@ __metadata:
"@fluentui-react-native/vibrancy-view": "workspace:*"
"@fluentui-react-native/win32-theme": "workspace:*"
"@fluentui/react-native": "workspace:*"
"@fluentui/react-native-icons": "npm:^2.0.316"
"@fortawesome/fontawesome-svg-core": "npm:^6.2.0"
"@fortawesome/free-solid-svg-icons": "npm:^6.2.0"
"@fortawesome/react-native-fontawesome": "npm:^0.3.0"
Expand All @@ -4765,7 +4759,6 @@ __metadata:
"@types/node": "npm:^22.0.0"
"@types/react": "npm:~18.2.0"
"@types/react-test-renderer": "npm:^18.2.0"
"@warren-ms/react-native-icons": "npm:^0.0.13"
"@wdio/cli": "npm:^8.40.0"
"@wdio/globals": "npm:^8.40.0"
"@wdio/jasmine-framework": "npm:^8.40.0"
Expand Down Expand Up @@ -5189,6 +5182,19 @@ __metadata:
languageName: unknown
linkType: soft

"@fluentui/react-native-icons@npm:^2.0.316":
version: 2.0.316
resolution: "@fluentui/react-native-icons@npm:2.0.316"
dependencies:
"@types/react-native": "npm:^0.68.0"
tslib: "npm:^2.1.0"
peerDependencies:
react: ">=16.8.0 <19.0.0"
react-native-svg: ">=12.5.0"
checksum: 10c0/5a9bc85b41dd6551ddbd6f4a505ac6f1892748554f2db2b5ca40cbddfa511d04b1c1124ea841c74b4d82ce1ae9e44e4a4e5920d06fa3e1b4cd8f032c3100d233
languageName: node
linkType: hard

"@fluentui/react-native@npm:*, @fluentui/react-native@workspace:*, @fluentui/react-native@workspace:packages/libraries/core":
version: 0.0.0-use.local
resolution: "@fluentui/react-native@workspace:packages/libraries/core"
Expand Down Expand Up @@ -5278,31 +5284,6 @@ __metadata:
languageName: node
linkType: hard

"@griffel/core@npm:^1.9.1":
version: 1.9.1
resolution: "@griffel/core@npm:1.9.1"
dependencies:
"@emotion/hash": "npm:^0.8.0"
csstype: "npm:^3.0.10"
rtl-css-js: "npm:^1.16.0"
stylis: "npm:^4.0.13"
tslib: "npm:^2.1.0"
checksum: 10c0/e36d6b40dc88da2676d39e7356d4f76f8b3e4e09d3d4b1a6e20ad47e10365bbe3ce6f50b0eab8c4384f3be9a9f4a9de9714498e58fe22237881ffa1ad92765b5
languageName: node
linkType: hard

"@griffel/react@npm:^1.0.0":
version: 1.5.3
resolution: "@griffel/react@npm:1.5.3"
dependencies:
"@griffel/core": "npm:^1.9.1"
tslib: "npm:^2.1.0"
peerDependencies:
react: ">=16.8.0 <19.0.0"
checksum: 10c0/531ff99a5e82b1cf81149b975c547acf4fde9df3900a5ad9a48fbd67821e98d31b8c55329cec311a3c5cab9e3ee51480123a03ade03bf4ba635f39a35eb71271
languageName: node
linkType: hard

"@hapi/hoek@npm:^9.0.0":
version: 9.3.0
resolution: "@hapi/hoek@npm:9.3.0"
Expand Down Expand Up @@ -8687,20 +8668,6 @@ __metadata:
languageName: node
linkType: hard

"@warren-ms/react-native-icons@npm:^0.0.13":
version: 0.0.13
resolution: "@warren-ms/react-native-icons@npm:0.0.13"
dependencies:
"@griffel/react": "npm:^1.0.0"
"@types/react-native": "npm:^0.68.0"
react-native-svg: "npm:^12.5.0"
tslib: "npm:^2.1.0"
peerDependencies:
react: ">=16.8.0 <19.0.0"
checksum: 10c0/91d74acd6014eb41cf3b77904452f1f813f53d7addb676526d63cfcafc2a528cc59d96f16eb8032ba6254645d6f154af217e6b8160ca836d48f74888abcf4278
languageName: node
linkType: hard

"@wdio/appium-service@npm:^9.12.6":
version: 9.15.0
resolution: "@wdio/appium-service@npm:9.15.0"
Expand Down Expand Up @@ -11501,7 +11468,7 @@ __metadata:
languageName: node
linkType: hard

"csstype@npm:^3.0.10, csstype@npm:^3.0.2":
"csstype@npm:^3.0.2":
version: 3.1.1
resolution: "csstype@npm:3.1.1"
checksum: 10c0/7c8b8c5923049d84132581c13bae6e1faf999746fe3998ba5f3819a8e1cdc7512ace87b7d0a4a69f0f4b8ba11daf835d4f1390af23e09fc4f0baad52c084753a
Expand Down Expand Up @@ -18771,7 +18738,7 @@ __metadata:
languageName: node
linkType: hard

"react-native-svg@npm:>=15.4.0 <15.13.0, react-native-svg@npm:^15.4.0":
"react-native-svg@npm:>=15.4.0 <15.13.0":
version: 15.12.1
resolution: "react-native-svg@npm:15.12.1"
dependencies:
Expand Down Expand Up @@ -19529,15 +19496,6 @@ __metadata:
languageName: node
linkType: hard

"rtl-css-js@npm:^1.16.0":
version: 1.16.1
resolution: "rtl-css-js@npm:1.16.1"
dependencies:
"@babel/runtime": "npm:^7.1.2"
checksum: 10c0/4b81ef50e50c97455d61c9bb576e2892651c79bac5d0c52b4123ebb9d6a2c5144590a79c9db0a3212a81b4eb83bf317e03637220f20b387a37b96cbac324d3d2
languageName: node
linkType: hard

"run-async@npm:^3.0.0":
version: 3.0.0
resolution: "run-async@npm:3.0.0"
Expand Down Expand Up @@ -20613,13 +20571,6 @@ __metadata:
languageName: node
linkType: hard

"stylis@npm:^4.0.13":
version: 4.1.3
resolution: "stylis@npm:4.1.3"
checksum: 10c0/3e4670f26f79bcfba628dcc2756d9d415edfcbf4ec51e40f3b628fd15286222257317cad57390752964eba85cca6163a7621ce90038d68dd630a674479e52334
languageName: node
linkType: hard

"sudo-prompt@npm:^9.0.0":
version: 9.2.1
resolution: "sudo-prompt@npm:9.2.1"
Expand Down
Loading