Skip to content

Commit acf0be6

Browse files
tomi-msfttomi-msft
authored
Merge branch 'master' into file-icon-url
2 parents 9b6c76f + 711a734 commit acf0be6

39 files changed

+326
-160
lines changed

‎apps/public-docsite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@fluentui/react-docsite-components": "^8.12.21",
3939
"@fluentui/react-examples": "^8.34.4",
4040
"@fluentui/react-experiments": "^8.14.90",
41-
"@fluentui/fluent2-theme": "^8.107.20",
41+
"@fluentui/fluent2-theme": "^8.107.21",
4242
"@fluentui/react-file-type-icons": "^8.8.21",
4343
"@fluentui/react-icons-mdl2": "^1.3.45",
4444
"@fluentui/react-icons-mdl2-branded": "^1.2.46",

‎change/@fluentui-react-file-type-icons-875366fc-ab42-48a7-a74f-7394aab5b49f.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "feat(react-file-type-icons): add getFileTypeIconAsUrl to allow icons usage in React without global initialization",
4+
"packageName": "@fluentui/react-file-type-icons",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-infobutton-e927d0f0-b768-40eb-b81e-400ad3c5d3a2.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "chore: Rename InfoTip to InfoIcon to better align with InfoButton.",
4+
"packageName": "@fluentui/react-infobutton",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎packages/fluent2-theme/CHANGELOG.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@fluentui/fluent2-theme",
33
"entries": [
4+
{
5+
"date": "Fri, 09 Jun 2023 07:33:46 GMT",
6+
"tag": "@fluentui/fluent2-theme_v8.107.21",
7+
"version": "8.107.21",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "[email protected]",
12+
"package": "@fluentui/fluent2-theme",
13+
"commit": "945152edc28fe1379aa0b1918a7a0e831cf822f7",
14+
"comment": "[FIX] Recenters selection dot in choice group with icon."
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Thu, 08 Jun 2023 07:35:14 GMT",
621
"tag": "@fluentui/fluent2-theme_v8.107.20",

‎packages/fluent2-theme/CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
# Change Log - @fluentui/fluent2-theme
22

3-
This log was last generated on Thu, 08 Jun 2023 07:35:14 GMT and should not be manually modified.
3+
This log was last generated on Fri, 09 Jun 2023 07:33:46 GMT and should not be manually modified.
44

55
<!-- Start content -->
66

7+
## [8.107.21](https://github.com/microsoft/fluentui/tree/@fluentui/fluent2-theme_v8.107.21)
8+
9+
Fri, 09 Jun 2023 07:33:46 GMT
10+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/fluent2-theme_v8.107.20..@fluentui/fluent2-theme_v8.107.21)
11+
12+
### Patches
13+
14+
- [FIX] Recenters selection dot in choice group with icon. ([PR #28173](https://github.com/microsoft/fluentui/pull/28173) by [email protected])
15+
716
## [8.107.20](https://github.com/microsoft/fluentui/tree/@fluentui/fluent2-theme_v8.107.20)
817

918
Thu, 08 Jun 2023 07:35:14 GMT

‎packages/fluent2-theme/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fluentui/fluent2-theme",
3-
"version": "8.107.20",
3+
"version": "8.107.21",
44
"description": "A Fluent2 theme for Fluent UI React 8.x",
55
"main": "lib-commonjs/index.js",
66
"module": "lib/index.js",

‎packages/fluent2-theme/src/componentStyles/ChoiceGroupOption.styles.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export const getDefaultChoiceGroupOptionStyles = (
8686
color: getChoiceGroupTextColor(props),
8787
'.ms-ChoiceFieldLabel': {
8888
color: getChoiceGroupTextColor(props),
89-
paddingLeft: '32px',
9089
},
9190
'&:hover .ms-ChoiceFieldLabel': {
9291
color: getTextHoverColor(props),
@@ -99,9 +98,8 @@ export const getDefaultChoiceGroupOptionStyles = (
9998
height: '17px',
10099
margin: '2px',
101100
},
101+
// the inner dot
102102
'::after': {
103-
top: '5px',
104-
left: '5px',
105103
width: '11px',
106104
height: '11px',
107105
background: getInnerCircleColor(props, false),

‎packages/react-components/react-infobutton/etc/react-infobutton.api.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,51 +38,51 @@ export type InfoButtonSlots = {
3838
export type InfoButtonState = ComponentState<InfoButtonSlots> & Required<Pick<InfoButtonProps, 'size'>>;
3939

4040
// @public
41-
export const InfoLabel: ForwardRefComponent<InfoLabelProps>;
41+
export const InfoIcon: ForwardRefComponent<InfoIconProps>;
4242

4343
// @public (undocumented)
44-
export const infoLabelClassNames: SlotClassNames<InfoLabelSlots>;
44+
export const infoIconClassNames: SlotClassNames<InfoIconSlots>;
4545

4646
// @public
47-
export type InfoLabelProps = ComponentProps<Partial<InfoLabelSlots>, 'label'> & {
48-
info?: InfoButtonProps['info'];
49-
};
47+
export type InfoIconProps = ComponentProps<InfoIconSlots> & {};
5048

5149
// @public (undocumented)
52-
export type InfoLabelSlots = {
53-
root: NonNullable<Slot<'span'>>;
54-
label: NonNullable<Slot<typeof Label>>;
55-
infoButton: Slot<typeof InfoButton>;
50+
export type InfoIconSlots = {
51+
root: Slot<'div'>;
5652
};
5753

5854
// @public
59-
export type InfoLabelState = ComponentState<InfoLabelSlots> & Pick<InfoLabelProps, 'size'>;
55+
export type InfoIconState = ComponentState<InfoIconSlots>;
6056

6157
// @public
62-
export const InfoTip: ForwardRefComponent<InfoTipProps>;
58+
export const InfoLabel: ForwardRefComponent<InfoLabelProps>;
6359

6460
// @public (undocumented)
65-
export const infoTipClassNames: SlotClassNames<InfoTipSlots>;
61+
export const infoLabelClassNames: SlotClassNames<InfoLabelSlots>;
6662

6763
// @public
68-
export type InfoTipProps = ComponentProps<InfoTipSlots> & {};
64+
export type InfoLabelProps = ComponentProps<Partial<InfoLabelSlots>, 'label'> & {
65+
info?: InfoButtonProps['info'];
66+
};
6967

7068
// @public (undocumented)
71-
export type InfoTipSlots = {
72-
root: Slot<'div'>;
69+
export type InfoLabelSlots = {
70+
root: NonNullable<Slot<'span'>>;
71+
label: NonNullable<Slot<typeof Label>>;
72+
infoButton: Slot<typeof InfoButton>;
7373
};
7474

7575
// @public
76-
export type InfoTipState = ComponentState<InfoTipSlots>;
76+
export type InfoLabelState = ComponentState<InfoLabelSlots> & Pick<InfoLabelProps, 'size'>;
7777

7878
// @public
7979
export const renderInfoButton_unstable: (state: InfoButtonState) => JSX.Element;
8080

8181
// @public
82-
export const renderInfoLabel_unstable: (state: InfoLabelState) => JSX.Element;
82+
export const renderInfoIcon_unstable: (state: InfoIconState) => JSX.Element;
8383

8484
// @public
85-
export const renderInfoTip_unstable: (state: InfoTipState) => JSX.Element;
85+
export const renderInfoLabel_unstable: (state: InfoLabelState) => JSX.Element;
8686

8787
// @public
8888
export const useInfoButton_unstable: (props: InfoButtonProps, ref: React_2.Ref<HTMLElement>) => InfoButtonState;
@@ -91,16 +91,16 @@ export const useInfoButton_unstable: (props: InfoButtonProps, ref: React_2.Ref<H
9191
export const useInfoButtonStyles_unstable: (state: InfoButtonState) => InfoButtonState;
9292

9393
// @public
94-
export const useInfoLabel_unstable: (props: InfoLabelProps, ref: React_2.Ref<HTMLLabelElement>) => InfoLabelState;
94+
export const useInfoIcon_unstable: (props: InfoIconProps, ref: React_2.Ref<HTMLElement>) => InfoIconState;
9595

9696
// @public
97-
export const useInfoLabelStyles_unstable: (state: InfoLabelState) => InfoLabelState;
97+
export const useInfoIconStyles_unstable: (state: InfoIconState) => InfoIconState;
9898

9999
// @public
100-
export const useInfoTip_unstable: (props: InfoTipProps, ref: React_2.Ref<HTMLElement>) => InfoTipState;
100+
export const useInfoLabel_unstable: (props: InfoLabelProps, ref: React_2.Ref<HTMLLabelElement>) => InfoLabelState;
101101

102102
// @public
103-
export const useInfoTipStyles_unstable: (state: InfoTipState) => InfoTipState;
103+
export const useInfoLabelStyles_unstable: (state: InfoLabelState) => InfoLabelState;
104104

105105
// (No @packageDocumentation comment for this package)
106106

‎packages/react-components/react-infobutton/src/InfoIcon.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './components/InfoIcon/index';

‎packages/react-components/react-infobutton/src/InfoTip.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)