Skip to content

ChoiceGroup: Flex layout for image and icon options #4137

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
dzearing merged 9 commits into from
Mar 2, 2018
Merged

ChoiceGroup: Flex layout for image and icon options #4137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9617d9
Flex container for options with images or icons
lynamemi Feb 27, 2018
557087a
Edge case layout bugs
lynamemi Feb 27, 2018
824ad30
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
lynamemi Feb 28, 2018
e13cadd
Added change file
lynamemi Feb 28, 2018
6abaff8
Updated snapshot
lynamemi Feb 28, 2018
af544d1
Attempt to fix diff
lynamemi Feb 28, 2018
e91bb1b
Attempt to fix diff 2
lynamemi Feb 28, 2018
ed62aca
Reverted tsx changes for flex to improve diff
lynamemi Feb 28, 2018
f776352
Committing wrapper without indentation
lynamemi Feb 28, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/choicegroup-flex_2018-02-28-22-03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "ChoiceGroup: Flex layout for icon and image fields. Fixed some image field bugs.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "lynam.emily@gmail.com"
}
9 changes: 8 additions & 1 deletion packages/office-ui-fabric-react/src/components/ChoiceGroup/ChoiceGroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ $ms-choiceField-transition-timing: cubic-bezier(.4, 0, .23, 1);
display: block;
}

.optionsContainIconOrImage {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}

.choiceField {
display: flex;
align-items: center;
Expand Down Expand Up @@ -194,14 +200,15 @@ $ms-choiceField-transition-timing: cubic-bezier(.4, 0, .23, 1);
@include ms-margin(0, 4px, 4px, 0);
@include ms-padding-left(0px);
@include ms-bgColor-neutralLighter;
height: 100%;

$radioButtonSpacing: 3px;
$radioButtonInnerSize: 5px;

.fieldIsImage, .fieldIsIcon {

display: inline-block;
box-sizing: border-box;
box-sizing: content-box;
cursor: pointer;
padding-top: 22px;
margin: 0;
Expand Down
6 changes: 6 additions & 0 deletions packages/office-ui-fabric-react/src/components/ChoiceGroup/ChoiceGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ export class ChoiceGroup extends BaseComponent<IChoiceGroupProps, IChoiceGroupSt
{ this.props.label && (
<Label className={ className } required={ required } id={ this._id + '-label' }>{ label }</Label>
) }
<div
className={ css('ms-ChoiceFieldGroup-flexContainer', options!.some(
option => Boolean(option.iconProps || option.imageSrc)
) && styles.optionsContainIconOrImage) }
>

{ options!.map((option: IChoiceGroupOption) => {
const {
Expand Down Expand Up @@ -125,6 +130,7 @@ export class ChoiceGroup extends BaseComponent<IChoiceGroupProps, IChoiceGroupSt
</div>
);
}) }
</div>
</div>
</div>
);
Expand Down
162 changes: 83 additions & 79 deletions ...office-ui-fabric-react/src/components/ChoiceGroup/__snapshots__/ChoiceGroup.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,100 +11,104 @@ exports[`ChoiceGroup renders ChoiceGroup correctly 1`] = `
role="radiogroup"
>
<div
className="ms-ChoiceField"
className="ms-ChoiceFieldGroup-flexContainer"
>
<div
className="ms-ChoiceField-wrapper"
className="ms-ChoiceField"
>
<input
aria-labelledby="ChoiceGroup0-1"
checked={false}
className="ms-ChoiceField-input"
data-automation-id="auto1"
disabled={undefined}
id="ChoiceGroup0-1"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-1"
<div
className="ms-ChoiceField-wrapper"
>
<span
className="ms-Label"
id="ChoiceGroupLabel1-1"
<input
aria-labelledby="ChoiceGroup0-1"
checked={false}
className="ms-ChoiceField-input"
data-automation-id="auto1"
disabled={undefined}
id="ChoiceGroup0-1"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-1"
>
1
</span>
</label>
<span
className="ms-Label"
id="ChoiceGroupLabel1-1"
>
1
</span>
</label>
</div>
</div>
</div>
<div
className="ms-ChoiceField"
>
<div
className="ms-ChoiceField-wrapper"
className="ms-ChoiceField"
>
<input
aria-labelledby="ChoiceGroup0-2"
checked={false}
className="ms-ChoiceField-input"
disabled={undefined}
id="ChoiceGroup0-2"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-2"
<div
className="ms-ChoiceField-wrapper"
>
<span
className="ms-Label"
id="ChoiceGroupLabel1-2"
<input
aria-labelledby="ChoiceGroup0-2"
checked={false}
className="ms-ChoiceField-input"
disabled={undefined}
id="ChoiceGroup0-2"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-2"
>
2
</span>
</label>
<span
className="ms-Label"
id="ChoiceGroupLabel1-2"
>
2
</span>
</label>
</div>
</div>
</div>
<div
className="ms-ChoiceField"
>
<div
className="ms-ChoiceField-wrapper"
className="ms-ChoiceField"
>
<input
aria-labelledby="ChoiceGroup0-3"
checked={false}
className="ms-ChoiceField-input"
disabled={undefined}
id="ChoiceGroup0-3"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-3"
<div
className="ms-ChoiceField-wrapper"
>
<span
className="ms-Label"
id="ChoiceGroupLabel1-3"
<input
aria-labelledby="ChoiceGroup0-3"
checked={false}
className="ms-ChoiceField-input"
disabled={undefined}
id="ChoiceGroup0-3"
name="ChoiceGroup0"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={true}
type="radio"
/>
<label
className="ms-ChoiceField-field"
htmlFor="ChoiceGroup0-3"
>
3
</span>
</label>
<span
className="ms-Label"
id="ChoiceGroupLabel1-3"
>
3
</span>
</label>
</div>
</div>
</div>
</div>
Expand Down