Skip to content

fix: Field should have block layout, not inline #25126

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

Merged
behowell merged 1 commit into from
Oct 10, 2022
Merged

fix: Field should have block layout, not inline #25126

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
7 changes: 7 additions & 0 deletions change/@fluentui-react-field-fe73a1e2-7458-4f5a-8262-01dcd3bb507f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Field should have block layout, not inline",
"packageName": "@fluentui/react-field",
"email": "behowell@microsoft.com",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions packages/react-components/react-field/etc/react-field.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ export type FieldSlots<T extends FieldComponent> = {
root: NonNullable<Slot<'div'>>;
control: SlotComponent<T>;
label?: Slot<typeof Label>;
validationMessage?: Slot<'span'>;
validationMessage?: Slot<'div'>;
validationMessageIcon?: Slot<'span'>;
hint?: Slot<'span'>;
hint?: Slot<'div'>;
};

// @public
Expand Down
4 changes: 2 additions & 2 deletions packages/react-components/react-field/src/components/Field/Field.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export type FieldSlots<T extends FieldComponent> = {
/**
* A message about the validation state. The appearance of the `validationMessage` depends on `validationState`.
*/
validationMessage?: Slot<'span'>;
validationMessage?: Slot<'div'>;

/**
* The icon associated with the `validationMessage`. If the `validationState` prop is set, this will default to an
Expand All @@ -48,7 +48,7 @@ export type FieldSlots<T extends FieldComponent> = {
/**
* Additional hint text below the field.
*/
hint?: Slot<'span'>;
hint?: Slot<'div'>;
};

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/react-components/react-field/src/components/Field/useField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ export const useField_unstable = <T extends FieldComponent>(
root: 'div',
control: params.component,
label: Label,
validationMessage: 'span',
validationMessage: 'div',
validationMessageIcon: 'span',
hint: 'span',
hint: 'div',
},
root,
control,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-field/src/components/Field/useFieldStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const getFieldClassNames = (name: string): SlotClassNames<FieldSlots<Fiel
*/
const useRootStyles = makeStyles({
base: {
display: 'inline-grid',
display: 'grid',
gridAutoFlow: 'row',
justifyItems: 'start',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-field/src/stories/Field/FieldHorizontal.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { InputField } from '@fluentui/react-field';

const useStyles = makeStyles({
stack: {
display: 'inline-grid',
display: 'grid',
rowGap: tokens.spacingVerticalM,
width: '400px',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-field/src/stories/Field/FieldSize.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { InputField } from '@fluentui/react-field';

const useStyles = makeStyles({
stack: {
display: 'inline-grid',
display: 'grid',
rowGap: tokens.spacingVerticalM,
width: '400px',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-field/src/stories/Field/FieldValidationState.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SparkleFilled } from '@fluentui/react-icons';

const useStyles = makeStyles({
stack: {
display: 'inline-grid',
display: 'grid',
rowGap: tokens.spacingVerticalM,
width: '400px',
},
Expand Down