Skip to content

Commit b2c47f8

Browse files
committed
use icons
1 parent 0c2d064 commit b2c47f8

File tree

4 files changed

+36
-75
lines changed

4 files changed

+36
-75
lines changed

apps/fluent-tester/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"@fluentui-react-native/vibrancy-view": "workspace:*",
8787
"@fluentui-react-native/win32-theme": "workspace:*",
8888
"@fluentui/react-native": "workspace:*",
89+
"@fluentui/react-native-icons": "^2.0.316",
8990
"@fortawesome/fontawesome-svg-core": "^6.2.0",
9091
"@fortawesome/free-solid-svg-icons": "^6.2.0",
9192
"@fortawesome/react-native-fontawesome": "^0.3.0",
@@ -95,7 +96,6 @@
9596
"@react-native-picker/picker": "^2.7.0",
9697
"@types/node": "^22.0.0",
9798
"@types/react": "~18.2.0",
98-
"@warren-ms/react-native-icons": "^0.0.13",
9999
"react": "18.2.0",
100100
"react-native": "^0.74.0",
101101
"react-native-macos": "^0.74.0",

apps/fluent-tester/src/TestComponents/Svg/RNSVGIcons.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import * as React from 'react';
22
import { View } from 'react-native';
3+
import type { SvgProps } from 'react-native-svg';
34

4-
import { RNSVGIcons_TESTPAGE } from '@fluentui-react-native/e2e-testing';
5-
import { faMountainCity } from '@fortawesome/free-solid-svg-icons/faMountainCity';
6-
import { faMugHot } from '@fortawesome/free-solid-svg-icons/faMugHot';
7-
import { faMugSaucer } from '@fortawesome/free-solid-svg-icons/faMugSaucer';
8-
import { faSquareCheck } from '@fortawesome/free-solid-svg-icons/faSquareCheck';
9-
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
105
import {
116
AccessTime20Filled,
127
AccessTime20Regular,
@@ -508,12 +503,20 @@ import {
508503
ArrowCircleUp48Regular,
509504
ArrowCircleUpLeft20Filled,
510505
ArrowCircleUpLeft20Regular,
511-
} from '@warren-ms/react-native-icons';
506+
} from '@fluentui/react-native-icons';
507+
import { RNSVGIcons_TESTPAGE } from '@fluentui-react-native/e2e-testing';
508+
import { faMountainCity } from '@fortawesome/free-solid-svg-icons/faMountainCity';
509+
import { faMugHot } from '@fortawesome/free-solid-svg-icons/faMugHot';
510+
import { faMugSaucer } from '@fortawesome/free-solid-svg-icons/faMugSaucer';
511+
import { faSquareCheck } from '@fortawesome/free-solid-svg-icons/faSquareCheck';
512+
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
512513

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

516-
function withAccessibility<P extends React.SVGAttributes<SVGElement>>(Component: React.ComponentType<React.SVGAttributes<SVGElement>>) {
517+
function withAccessibility<P extends SvgProps>(
518+
Component: React.ComponentType<SvgProps & { accessibilityLabel?: string }>,
519+
): React.FC<P & { accessibilityLabel?: string }> {
517520
const WithAccessibility: React.FC<P & { accessibilityLabel?: string }> = (props) => {
518521
const { accessibilityLabel, ...restProps } = props;
519522
return (
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Use public fluentui-react-native icons package rather than a private one",
4+
"packageName": "@fluentui-react-native/tester",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

yarn.lock

Lines changed: 17 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ __metadata:
20172017
languageName: node
20182018
linkType: hard
20192019

2020-
"@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":
2020+
"@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":
20212021
version: 7.28.2
20222022
resolution: "@babel/runtime@npm:7.28.2"
20232023
checksum: 10c0/c20afe253629d53a405a610b12a62ac74d341a2c1e0fb202bbef0c118f6b5c84f94bf16039f58fd0483dd256901259930a43976845bdeb180cab1f882c21b6e0
@@ -2103,13 +2103,6 @@ __metadata:
21032103
languageName: node
21042104
linkType: hard
21052105

2106-
"@emotion/hash@npm:^0.8.0":
2107-
version: 0.8.0
2108-
resolution: "@emotion/hash@npm:0.8.0"
2109-
checksum: 10c0/706303d35d416217cd7eb0d36dbda4627bb8bdf4a32ea387e8dd99be11b8e0a998e10af21216e8a5fade518ad955ff06aa8890f20e694ce3a038ae7fc1000556
2110-
languageName: node
2111-
linkType: hard
2112-
21132106
"@esbuild/aix-ppc64@npm:0.25.5":
21142107
version: 0.25.5
21152108
resolution: "@esbuild/aix-ppc64@npm:0.25.5"
@@ -4745,6 +4738,7 @@ __metadata:
47454738
"@fluentui-react-native/vibrancy-view": "workspace:*"
47464739
"@fluentui-react-native/win32-theme": "workspace:*"
47474740
"@fluentui/react-native": "workspace:*"
4741+
"@fluentui/react-native-icons": "npm:^2.0.316"
47484742
"@fortawesome/fontawesome-svg-core": "npm:^6.2.0"
47494743
"@fortawesome/free-solid-svg-icons": "npm:^6.2.0"
47504744
"@fortawesome/react-native-fontawesome": "npm:^0.3.0"
@@ -4765,7 +4759,6 @@ __metadata:
47654759
"@types/node": "npm:^22.0.0"
47664760
"@types/react": "npm:~18.2.0"
47674761
"@types/react-test-renderer": "npm:^18.2.0"
4768-
"@warren-ms/react-native-icons": "npm:^0.0.13"
47694762
"@wdio/cli": "npm:^8.40.0"
47704763
"@wdio/globals": "npm:^8.40.0"
47714764
"@wdio/jasmine-framework": "npm:^8.40.0"
@@ -5189,6 +5182,19 @@ __metadata:
51895182
languageName: unknown
51905183
linkType: soft
51915184

5185+
"@fluentui/react-native-icons@npm:^2.0.316":
5186+
version: 2.0.316
5187+
resolution: "@fluentui/react-native-icons@npm:2.0.316"
5188+
dependencies:
5189+
"@types/react-native": "npm:^0.68.0"
5190+
tslib: "npm:^2.1.0"
5191+
peerDependencies:
5192+
react: ">=16.8.0 <19.0.0"
5193+
react-native-svg: ">=12.5.0"
5194+
checksum: 10c0/5a9bc85b41dd6551ddbd6f4a505ac6f1892748554f2db2b5ca40cbddfa511d04b1c1124ea841c74b4d82ce1ae9e44e4a4e5920d06fa3e1b4cd8f032c3100d233
5195+
languageName: node
5196+
linkType: hard
5197+
51925198
"@fluentui/react-native@npm:*, @fluentui/react-native@workspace:*, @fluentui/react-native@workspace:packages/libraries/core":
51935199
version: 0.0.0-use.local
51945200
resolution: "@fluentui/react-native@workspace:packages/libraries/core"
@@ -5278,31 +5284,6 @@ __metadata:
52785284
languageName: node
52795285
linkType: hard
52805286

5281-
"@griffel/core@npm:^1.9.1":
5282-
version: 1.9.1
5283-
resolution: "@griffel/core@npm:1.9.1"
5284-
dependencies:
5285-
"@emotion/hash": "npm:^0.8.0"
5286-
csstype: "npm:^3.0.10"
5287-
rtl-css-js: "npm:^1.16.0"
5288-
stylis: "npm:^4.0.13"
5289-
tslib: "npm:^2.1.0"
5290-
checksum: 10c0/e36d6b40dc88da2676d39e7356d4f76f8b3e4e09d3d4b1a6e20ad47e10365bbe3ce6f50b0eab8c4384f3be9a9f4a9de9714498e58fe22237881ffa1ad92765b5
5291-
languageName: node
5292-
linkType: hard
5293-
5294-
"@griffel/react@npm:^1.0.0":
5295-
version: 1.5.3
5296-
resolution: "@griffel/react@npm:1.5.3"
5297-
dependencies:
5298-
"@griffel/core": "npm:^1.9.1"
5299-
tslib: "npm:^2.1.0"
5300-
peerDependencies:
5301-
react: ">=16.8.0 <19.0.0"
5302-
checksum: 10c0/531ff99a5e82b1cf81149b975c547acf4fde9df3900a5ad9a48fbd67821e98d31b8c55329cec311a3c5cab9e3ee51480123a03ade03bf4ba635f39a35eb71271
5303-
languageName: node
5304-
linkType: hard
5305-
53065287
"@hapi/hoek@npm:^9.0.0":
53075288
version: 9.3.0
53085289
resolution: "@hapi/hoek@npm:9.3.0"
@@ -8687,20 +8668,6 @@ __metadata:
86878668
languageName: node
86888669
linkType: hard
86898670

8690-
"@warren-ms/react-native-icons@npm:^0.0.13":
8691-
version: 0.0.13
8692-
resolution: "@warren-ms/react-native-icons@npm:0.0.13"
8693-
dependencies:
8694-
"@griffel/react": "npm:^1.0.0"
8695-
"@types/react-native": "npm:^0.68.0"
8696-
react-native-svg: "npm:^12.5.0"
8697-
tslib: "npm:^2.1.0"
8698-
peerDependencies:
8699-
react: ">=16.8.0 <19.0.0"
8700-
checksum: 10c0/91d74acd6014eb41cf3b77904452f1f813f53d7addb676526d63cfcafc2a528cc59d96f16eb8032ba6254645d6f154af217e6b8160ca836d48f74888abcf4278
8701-
languageName: node
8702-
linkType: hard
8703-
87048671
"@wdio/appium-service@npm:^9.12.6":
87058672
version: 9.15.0
87068673
resolution: "@wdio/appium-service@npm:9.15.0"
@@ -11501,7 +11468,7 @@ __metadata:
1150111468
languageName: node
1150211469
linkType: hard
1150311470

11504-
"csstype@npm:^3.0.10, csstype@npm:^3.0.2":
11471+
"csstype@npm:^3.0.2":
1150511472
version: 3.1.1
1150611473
resolution: "csstype@npm:3.1.1"
1150711474
checksum: 10c0/7c8b8c5923049d84132581c13bae6e1faf999746fe3998ba5f3819a8e1cdc7512ace87b7d0a4a69f0f4b8ba11daf835d4f1390af23e09fc4f0baad52c084753a
@@ -18771,7 +18738,7 @@ __metadata:
1877118738
languageName: node
1877218739
linkType: hard
1877318740

18774-
"react-native-svg@npm:>=15.4.0 <15.13.0, react-native-svg@npm:^15.4.0":
18741+
"react-native-svg@npm:>=15.4.0 <15.13.0":
1877518742
version: 15.12.1
1877618743
resolution: "react-native-svg@npm:15.12.1"
1877718744
dependencies:
@@ -19529,15 +19496,6 @@ __metadata:
1952919496
languageName: node
1953019497
linkType: hard
1953119498

19532-
"rtl-css-js@npm:^1.16.0":
19533-
version: 1.16.1
19534-
resolution: "rtl-css-js@npm:1.16.1"
19535-
dependencies:
19536-
"@babel/runtime": "npm:^7.1.2"
19537-
checksum: 10c0/4b81ef50e50c97455d61c9bb576e2892651c79bac5d0c52b4123ebb9d6a2c5144590a79c9db0a3212a81b4eb83bf317e03637220f20b387a37b96cbac324d3d2
19538-
languageName: node
19539-
linkType: hard
19540-
1954119499
"run-async@npm:^3.0.0":
1954219500
version: 3.0.0
1954319501
resolution: "run-async@npm:3.0.0"
@@ -20613,13 +20571,6 @@ __metadata:
2061320571
languageName: node
2061420572
linkType: hard
2061520573

20616-
"stylis@npm:^4.0.13":
20617-
version: 4.1.3
20618-
resolution: "stylis@npm:4.1.3"
20619-
checksum: 10c0/3e4670f26f79bcfba628dcc2756d9d415edfcbf4ec51e40f3b628fd15286222257317cad57390752964eba85cca6163a7621ce90038d68dd630a674479e52334
20620-
languageName: node
20621-
linkType: hard
20622-
2062320574
"sudo-prompt@npm:^9.0.0":
2062420575
version: 9.2.1
2062520576
resolution: "sudo-prompt@npm:9.2.1"

0 commit comments

Comments
 (0)