Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
"label": "Typescript (oufr) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"packages/office-ui-fabric-react/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "packages/office-ui-fabric-react/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
],
"packageName": "@uifabric/charting",
"email": "kakje@microsoft.com"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
],
"packageName": "@uifabric/utilities",
"email": "benw@microsoft.com"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "CommandBarPage: Remove fabric js reference.",
"comment": "Update Coachmark basic example and fix TeachingBubble SCSS selectors",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "lynam.emily@gmail.com"
}
"email": "edwl@microsoft.com"
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "office-ui-fabric-react",
"comment": "Added Prettier",
"type": "patch"
"type": "none"
}
],
"packageName": "office-ui-fabric-react",
"email": "mark@thedutchies.com"
}
"email": "kchau@microsoft.com"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment":
"Fixed FocusTrapZone bug: If first child in the FTZ is a FocusZone and that FZ's last focused child is not the first focusable child, shift-tab would break out of the FTZ.",
"comment": "Fixed FocusTrapZone bug: If first child in the FTZ is a FocusZone and that FZ's last focused child is not the first focusable child, shift-tab would break out of the FTZ.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "benw@microsoft.com"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "FocusTrapZone: Added new capability. When `FTZ.focus()` is called, it will pass focus to a descendant element. The new prop `focusPreviouslyFocusedInnerElement` controls the descendant-choosing behavior.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "benw@microsoft.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "adding css fix to remove unnecessary scroll bars on calendar and datepicker components",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "jolore@microsoft.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "HoverCard: Removing unnecessary animation class causing a visual bug in IE browser.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "v-vibr@microsoft.com"
}
2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"definitionName": "individualVersion",
"lockedMajor": 6
}
]
]
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
"lint-staged": "^7.0.5"
},
"lint-staged": {
"*.{ts,tsx,js,json}": [
"*.{ts,tsx}": [
"node ./scripts/lint-staged/prettier",
"node ./scripts/lint-staged/tslint",
"git add"
],
"*.{ts,tsx}": [
"node ./scripts/lint-staged/tslint",
"*.{js,json}": [
"node ./scripts/lint-staged/prettier",
"git add"
]
}
Expand Down
68 changes: 34 additions & 34 deletions packages/experiments/src/components/Nav/Nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class NavComponent extends NavBase {

return (
<nav role="navigation">
{this.props.groups.map((group: ICustomNavLinkGroup, groupIndex: number) => {
{ this.props.groups.map((group: ICustomNavLinkGroup, groupIndex: number) => {
return this._renderGroup(group, groupIndex);
})}
}) }
</nav>
);
}
Expand Down Expand Up @@ -108,21 +108,21 @@ class NavComponent extends NavBase {

return (
<NavLink
id={link.key}
content={linkText}
href={link.url}
target={link.target}
onClick={onClickHandler}
dataHint={dataHint}
dataValue={link.key}
ariaLabel={linkText}
{...ariaProps}
id={ link.key }
content={ linkText }
href={ link.url }
target={ link.target }
onClick={ onClickHandler }
dataHint={ dataHint }
dataValue={ link.key }
ariaLabel={ linkText }
{ ...ariaProps }
role="menu"
rootClassName={classNames.navItemRoot}
leftIconName={leftIconName}
rightIconName={rightIconName}
textClassName={classNames.navItemNameColumn}
iconClassName={classNames.navItemIconColumn}
rootClassName={ classNames.navItemRoot }
leftIconName={ leftIconName }
rightIconName={ rightIconName }
textClassName={ classNames.navItemNameColumn }
iconClassName={ classNames.navItemIconColumn }
/>
);
}
Expand All @@ -142,16 +142,16 @@ class NavComponent extends NavBase {
link.disableAutoExpand = false;

return (
<li role="listitem" key={link.key || linkIndex} title={linkText}>
{this._renderCompositeLink(link, linkIndex, nestingLevel)}
<li role="listitem" key={ link.key || linkIndex } title={ linkText }>
{ this._renderCompositeLink(link, linkIndex, nestingLevel) }
{// show child links
// 1. only for the first level and
// 2. if the link is expanded
nestingLevel == 0 && link.isExpanded ? (
<div className={AnimationClassNames.slideDownIn20}>
{this._renderLinks(link.links as INavLink[], ++nestingLevel)}
</div>
) : null}
// 1. only for the first level and
// 2. if the link is expanded
nestingLevel == 0 && link.isExpanded ? (
<div className={ AnimationClassNames.slideDownIn20 }>
{ this._renderLinks(link.links as INavLink[], ++nestingLevel) }
</div>
) : null }
</li>
);
}
Expand All @@ -165,7 +165,7 @@ class NavComponent extends NavBase {

return (
<ul role="list">
{links.map((link: INavLink, linkIndex: number) => {
{ links.map((link: INavLink, linkIndex: number) => {
if (enableCustomization && link.isHidden && !showMore) {
// atleast one link is hidden
this._hasAtleastOneHiddenLink = true;
Expand All @@ -178,7 +178,7 @@ class NavComponent extends NavBase {
} else {
return this._renderLink(link, linkIndex, nestingLevel);
}
})}
}) }
</ul>
);
}
Expand All @@ -205,15 +205,15 @@ class NavComponent extends NavBase {
}

return (
<div key={groupIndex}>
{isGroupHeaderVisible ? (
<div className={classNames.navGroupSeparatorRoot}>
<div className={classNames.navGroupSeparatorHrLine}>
{group.name ? <span className={classNames.navGroupSeparatorGroupName}>{group.name}</span> : null}
<div key={ groupIndex }>
{ isGroupHeaderVisible ? (
<div className={ classNames.navGroupSeparatorRoot }>
<div className={ classNames.navGroupSeparatorHrLine }>
{ group.name ? <span className={ classNames.navGroupSeparatorGroupName }>{ group.name }</span> : null }
</div>
</div>
) : null}
{this._renderLinks(group.links, 0 /* nestingLevel */)}
) : null }
{ this._renderLinks(group.links, 0 /* nestingLevel */) }
</div>
);
}
Expand Down
8 changes: 3 additions & 5 deletions packages/experiments/src/components/Nav/NavBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,8 @@ export class NavBase extends React.Component<INavProps, INavState> implements IN
return false;
}

return links.some(
(link: INavLink): boolean => {
return !link.isHidden;
}
);
return links.some((link: INavLink): boolean => {
return !link.isHidden;
});
}
}
Loading