Skip to content

Commit

Permalink
Merge branch 'master' into mapol/allow-overriding-root-element-on-link
Browse files Browse the repository at this point in the history
* master: (34 commits)
  Applying package updates.
  ProgressIndicator: Finish conversion to mergeStyles (microsoft#4595)
  Fix props validation for Breadcrumb (microsoft#4666)
  No unused vars part of ts (microsoft#4670)
  Picker/Autofill: fixes several minor bugs. (microsoft#4569)
  Fix Calendar component PREV/NEXT month, year, and "Go to today" handlers firing twice (microsoft#4662)
  Applying package updates.
  Merge styles order (microsoft#4664)
  Fabric component: revert class change and make it backwards compatible (microsoft#4671)
  Addressing Issue microsoft#3707 - OverflowSet: Add the ability to set aria-label (microsoft#4667)
  Fix input type for Tile ARIA label prop (microsoft#4668)
  Fix theme slots for DetailsList header colors (microsoft#4658)
  Applying package updates.
  Jolore/calendar updates (microsoft#4643)
  Remove wordWrap setting. (microsoft#4657)
  Pivot: convert to mergeStyles - part 1  (microsoft#4656)
  Use the `data-is-scrollable` attribute on the correct ScrollablePane div (microsoft#4602)
  Applying package updates.
  Remove unused iconClassName prop from Nav.types (microsoft#4634)
  Jest snapshots: classes in animations should autoexpand. (microsoft#4647)
  ...
  • Loading branch information
Markionium committed Apr 26, 2018
2 parents e72cd84 + e097cbc commit 6f05b43
Show file tree
Hide file tree
Showing 190 changed files with 3,168 additions and 1,691 deletions.
23 changes: 16 additions & 7 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
{
"version": "0.1.0",
"command": "gulp",
"isShellCommand": true,
"version": "2.0.0",
"tasks": [
{
"taskName": "bundle",
"isBuildCommand": true,
"showOutput": "always",
"isWatching": true
"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"
],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
2 changes: 1 addition & 1 deletion apps/fabric-website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@microsoft/load-themed-styles": "^1.7.13",
"color-functions": "1.1.0",
"json-loader": "^0.5.7",
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"tslib": "^1.7.1"
}
}
2 changes: 1 addition & 1 deletion apps/ssr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/mocha": "2.2.39",
"@types/webpack-env": "1.13.0",
"mocha": "^3.3.0",
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"raw-loader": "^0.5.1",
"react": "^16.3.1",
"react-dom": "^16.3.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/test-bundle-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"react": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"react-dom": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"tslib": "^1.7.1"
}
}
2 changes: 1 addition & 1 deletion apps/todo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@microsoft/load-themed-styles": "^1.7.13",
"es6-promise": "^4.1.0",
"immutability-helper": "^2.6.4",
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"react": "^16.3.1",
"react-dom": "^16.3.1",
"typescript": "2.8.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"storybook-readme": "=3.0.6"
},
"dependencies": {
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"react": "^16.3.1",
"react-dom": "^16.3.1",
"typescript": "2.8.1",
Expand Down
6 changes: 6 additions & 0 deletions apps/vr-tests/src/stories/Rating.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ storiesOf('Rating', module)
max={ 5 }
rating={ 2 }
/>
)).add('Allow Zero', () => (
<Rating
allowZeroStars={ true }
max={ 5 }
rating={ 0 }
/>
)).add('Large', () => (
<Rating
min={ 1 }
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion ghdocs/Contributing/NewComponent.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ For any new component you should think of adding **Unit tests**, **React functio

### Code Owners

Add yourself to the [Code owners file](../../,github/CODEOWNERS).
Add yourself to the [Code owners file](../../.github/CODEOWNERS).
14 changes: 2 additions & 12 deletions ghdocs/References/Fabric_Component.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The Fabric component

Consumers using Fabric components should be wrapping their content within the Fabric component.
Consumers using Fabric components should be wrapping their content within the Fabric component.

```tsx
import { Fabric } from 'office-ui-fabric-react/lib/Fabric';
Expand All @@ -17,15 +17,5 @@ ReactDOM.render(

* Note: The Fabric component will render a div, and will mix in div properties. You may use it as a replacement for a root div.

The Fabric component is a root wrapper component which solves 2 problems:

1. The default fontFamily css style is defined at this layer, allowing components within to inherit the default fontFamily. The class `ms-Fabric` defines this.

2. The focus rectangle visibility is managed through the `is-focusVisible` css class.

## Focus rectangle

Focus rectangles around components should only be shown when the user presses tab or directional keys. When they press mouse buttons, focus rectangles should not be shown. The `Fabric` component that will conditionally add/remove an `is-focusVisible` class, and components rendering focus rectangles should conditionalize their visibility based on the `.ms-Fabric.is-focusVisible` parent selector.

This is abstracted in the scss include `focus-border()`.
The Fabric component is a root wrapper component which defines the default fontFamily for elements within to use.

22 changes: 22 additions & 0 deletions packages/example-app-base/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
{
"name": "@uifabric/example-app-base",
"entries": [
{
"version": "5.11.0",
"tag": "@uifabric/example-app-base_v5.11.0",
"date": "Mon, 23 Apr 2018 10:24:54 GMT",
"comments": {
"minor": [
{
"author": "David Zearing <dzearing@microsoft.com>",
"commit": "2bbc7950bd9f10ea1e792dcb1155c625aa8e8f4f",
"comment": "Updating the focus styling to use the generalized `ms-Fabric--isFocusVisibl"
}
],
"dependency": [
{
"comment": "Updating dependency \"@uifabric/styling\" from `>=5.25.0 <6.0.0` to `>=5.26.0 <6.0.0`"
},
{
"comment": "Updating dependency \"@uifabric/utilities\" from `>=5.26.0 <6.0.0` to `>=5.27.0 <6.0.0`"
}
]
}
},
{
"version": "5.10.2",
"tag": "@uifabric/example-app-base_v5.10.2",
Expand Down
9 changes: 8 additions & 1 deletion packages/example-app-base/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log - @uifabric/example-app-base

This log was last generated on Thu, 19 Apr 2018 18:25:59 GMT and should not be manually modified.
This log was last generated on Mon, 23 Apr 2018 10:24:54 GMT and should not be manually modified.

## 5.11.0
Mon, 23 Apr 2018 10:24:54 GMT

### Minor changes

- Updating the focus styling to use the generalized `ms-Fabric--isFocusVisibl

## 5.10.2
Thu, 19 Apr 2018 18:25:59 GMT
Expand Down
6 changes: 3 additions & 3 deletions packages/example-app-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/example-app-base",
"version": "5.10.2",
"version": "5.11.0",
"description": "Office UI Fabric example app base utilities for building example sites.",
"main": "lib/index.js",
"typings": "lib-es2015/index.d.ts",
Expand Down Expand Up @@ -33,8 +33,8 @@
"react-dom": "^0.14.9 || ^15.0.1-0 || ^16.0.0-0"
},
"dependencies": {
"@uifabric/styling": ">=5.25.0 <6.0.0",
"@uifabric/utilities": ">=5.25.0 <6.0.0",
"@uifabric/styling": ">=5.27.0 <6.0.0",
"@uifabric/utilities": ">=5.28.0 <6.0.0",
"highlight.js": "^9.12.0",
"markdown-to-jsx": "^6.6.0",
"office-ui-fabric-react": ">=5.1.0 <6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/example-app-base/src/common/_focusBorder.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
position: relative;
}

:global(.ms-Fabric.is-focusVisible) &:focus:after {
:global(.ms-Fabric--isFocusVisible) &:focus:after {
// Wrap the parent element with $padding pixels.
content: '';
position: absolute;
Expand All @@ -33,7 +33,7 @@

// When focus is set using the keyboard, apply an outline.
@mixin focus-outline {
:global(.ms-Fabric.is-focusVisible) &:focus {
:global(.ms-Fabric--isFocusVisible) &:focus {
outline: 1px solid $focusedBorderColor;
}
}
3 changes: 2 additions & 1 deletion packages/experiments/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
"search.exclude": {
"**/node_modules": true,
"**/lib": true,
"**/lib-es2015": true,
"**/lib-amd": true,
"**/dist": true,
"**/*.scss.ts": true
},
// Controls after how many characters the editor will wrap to the next line. Setting this to 0 turns on viewport width wrapping
"editor.wrappingColumn": 140,
"editor.wordWrapColumn": 140,
"tslint.enable": true,
"tslint.rulesDirectory": "../../common/node_modules/tslint-microsoft-contrib",
// Defines space handling after opening and before closing JSX expression braces. Requires TypeScript >= 2.0.6.
Expand Down
87 changes: 87 additions & 0 deletions packages/experiments/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,93 @@
{
"name": "@uifabric/experiments",
"entries": [
{
"version": "5.33.1",
"tag": "@uifabric/experiments_v5.33.1",
"date": "Wed, 25 Apr 2018 05:32:09 GMT",
"comments": {
"none": [
{
"author": "Jordan Janzen <jordancjanzen@gmail.com>",
"commit": "a15bb064e6ec7551c593730e266b09f0873784dc",
"comment": "Remove wordWrap setting."
}
],
"patch": [
{
"author": "Thomas Michon <thomas@michon.com>",
"commit": "56c4cfb63266ef8b1952d967598bf4044a7eed7a",
"comment": "Fix bad aria-label prop in Tile"
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=5.88.0 <6.0.0` to `>=5.89.0 <6.0.0`"
}
]
}
},
{
"version": "5.33.0",
"tag": "@uifabric/experiments_v5.33.0",
"date": "Mon, 23 Apr 2018 10:24:54 GMT",
"comments": {
"patch": [
{
"author": "Cliff Koh <cliff.koh@microsoft.com>",
"commit": "edf45906e38be620dd26401b05b9bda10322027f",
"comment": "Fix code in @uifabric/experiments such that it adheres to same tslint rules as the main office-ui-fabric-react package."
},
{
"author": "Thomas Michon <thomas@michon.com>",
"commit": "cf2fcbcb9ed19793090d86186042cc8e463659c8",
"comment": "Fix index import"
}
],
"minor": [
{
"author": "David Zearing <dzearing@microsoft.com>",
"commit": "2bbc7950bd9f10ea1e792dcb1155c625aa8e8f4f",
"comment": "Updating the focus styling to use the generalized `ms-Fabric--isFocusVisibl"
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=5.86.0 <6.0.0` to `>=5.87.0 <6.0.0`"
},
{
"comment": "Updating dependency \"@uifabric/example-app-base\" from `>=5.10.2 <6.0.0` to `>=5.11.0 <6.0.0`"
},
{
"comment": "Updating dependency \"@uifabric/jest-serializer-merge-styles\" from `>=5.1.0 <6.0.0` to `>=5.2.0 <6.0.0`"
}
]
}
},
{
"version": "5.32.0",
"tag": "@uifabric/experiments_v5.32.0",
"date": "Fri, 20 Apr 2018 23:06:06 GMT",
"comments": {
"minor": [
{
"author": "amyngu <31973030+amyngu@users.noreply.github.com>",
"commit": "602a5b9fe30e8df5bf22342288f7b97dc8bd3c6e",
"comment": "Add delete callback, expose item change methods on SelectedItemsList"
},
{
"author": "Vitalie Braga <vitaliebraga@gmail.com>",
"commit": "703efd38ae346d2b0b1be7c6082c2aad492b1d31",
"comment": "Shimmer: adding two new props and deprecating another one."
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=5.85.0 <6.0.0` to `>=5.86.0 <6.0.0`"
}
]
}
},
{
"version": "5.31.4",
"tag": "@uifabric/experiments_v5.31.4",
Expand Down
29 changes: 28 additions & 1 deletion packages/experiments/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
# Change Log - @uifabric/experiments

This log was last generated on Thu, 19 Apr 2018 18:25:59 GMT and should not be manually modified.
This log was last generated on Wed, 25 Apr 2018 05:32:09 GMT and should not be manually modified.

## 5.33.1
Wed, 25 Apr 2018 05:32:09 GMT

### Patches

- Fix bad aria-label prop in Tile

## 5.33.0
Mon, 23 Apr 2018 10:24:54 GMT

### Minor changes

- Updating the focus styling to use the generalized `ms-Fabric--isFocusVisibl

### Patches

- Fix code in @uifabric/experiments such that it adheres to same tslint rules as the main office-ui-fabric-react package.
- Fix index import

## 5.32.0
Fri, 20 Apr 2018 23:06:06 GMT

### Minor changes

- Add delete callback, expose item change methods on SelectedItemsList
- Shimmer: adding two new props and deprecating another one.

## 5.31.4
Thu, 19 Apr 2018 18:25:59 GMT
Expand Down
8 changes: 4 additions & 4 deletions packages/experiments/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/experiments",
"version": "5.31.4",
"version": "5.33.1",
"description": "Experimental React components for building experiences for Office 365.",
"main": "lib/index.js",
"typings": "lib-es2015/index.d.ts",
Expand Down Expand Up @@ -30,9 +30,9 @@
"@types/enzyme": "3.1.5",
"@types/enzyme-adapter-react-16": "1.0.1",
"@types/webpack-env": "1.13.0",
"@uifabric/example-app-base": ">=5.10.2 <6.0.0",
"@uifabric/example-app-base": ">=5.11.0 <6.0.0",
"@uifabric/file-type-icons": ">=0.6.1 <1.0.0",
"@uifabric/jest-serializer-merge-styles": ">=5.1.0 <6.0.0",
"@uifabric/jest-serializer-merge-styles": ">=5.2.0 <6.0.0",
"es6-weak-map": "^2.0.2",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
Expand All @@ -45,7 +45,7 @@
},
"dependencies": {
"@microsoft/load-themed-styles": "^1.7.13",
"office-ui-fabric-react": ">=5.85.0 <6.0.0",
"office-ui-fabric-react": ">=5.90.0 <6.0.0",
"@uifabric/icons": ">=5.7.1 <6.0.0",
"prop-types": "^15.5.10",
"tslib": "^1.7.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/experiments/src/CommandBar.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './components/CommandBar';
export * from './components/CommandBar/index';
Loading

0 comments on commit 6f05b43

Please sign in to comment.