Skip to content

Commit

Permalink
Merge upstream (#2)
Browse files Browse the repository at this point in the history
* In Panel component, isClickableOutsideFocusTrap should not be overriden back to false if it's already set to true in focusTrapZoneProps. (microsoft#4354)

* In Panel, a true value of isClickableOutsideFocusTrap prop in focusTrapZoneProps should not be overriden.

* Add change file.

* MessageBar: For single line, put action button before dismiss button (microsoft#4365)

* Reordered button elements for single line messagebars

* New example for single line with dismiss and action buttons

* Added change file

* [TextField, Panel] Removed componentId internal prop (microsoft#3896)

* Remove componentId internal prop

* change file

* Reinstate prop as deprecated

* Fixed tslint issue

* Update magellan-componentIdInternal_2018-02-06-19-27.json

* Fix errors in Signal styles (microsoft#4367)

* Fix: Website: Does not show neutral quaternary colors (microsoft#4188)

* Add missing quaternary and alt colors on doc page

* + change file

* Fix focuszone props (microsoft#4335)

* Revert "FocusTrapZone does not correctly trap focus when last child is FocusZone (microsoft#4172)"

This reverts commit 699fa69.

* Fix focus zone props so that it doesn't have a typescript error

* adding change file

* Searchbox: deprecate defaultValue (microsoft#4225)

* Deprecate SearchBox defaultValue prop.

* npm run change output

* Do not try to show the suggestions when input is undefined (no more exceptions in IE) (microsoft#4294)

* [BasePicker] suggestions should not be shown when input does not exist

* added change file

* Update master_2018-03-16-09-03.json

* Remove a redundant "value" prop in ComboBox multi select example to eliminate confusing behaviors. (microsoft#4366)

* Add multiSelect for ComboBox

* Unbreak a unit test

* rush change

* bug fixes

* Merge from upstream and resolve local build issues

* Fix merge styles

* Fix pending background

* Unbreak unit test cases

* Fix the merge

* Add controled multi-select in the example page to make sure onChanged cb works

* Remove trailing white spaces

* Fix bug: enter key will not trigger onChanged

* Dummy change to trigger another build

* refactor

* Fix some minor bugs

* Update some comments for ComboBox

* Minor bug fixes to the example page

* rush change

* Delete the old rush change file

* Remove a trailing space

* Remove a redundant property from the ComboBox example

* rush chagne

* Remove old rush change file

* Update stanleyy-fillin_2018-03-26-22-09.json

* Moving to ts-loader, throwing on console.warn in ssr tests (microsoft#4370)

* Break on warnings.

* Shrinkwrap update.

* Applying package updates.

* Missed a reference to awesome-typescript-loader in the webpack-resources file.

* Rewrite suggestions for BaseFloatingPicker (experiments) (microsoft#4273)

* create new suggestions, suggestionsControl, and suggestionsStore in experiments

* add change files

* fix picker tests and separate scss file into two files

* Update BaseFloatingPicker.tsx

* remove autobind reference from bad merge

* address PR comments

* address PR comments, fix selection for shouldSelectFirstItem

* Checkbox: text should be selectable, icon shouldn't. (microsoft#4378)

* Updating checkbox select.

* addin change.

* Fix snapshot.

* Update change output (microsoft#4380)

* Contextual Menu: Revert Split Button Alignment to Previous Left Aligntment (microsoft#4369)

* made spin button and base button menu option un-focusable

* added spin button test

* added split button contextual menu change

* got rid of un-needed code

* added change files

* added abillitiy to not focus on primary button for split button, but only on the container

* enter on focus on split button trigger primary action

* added split button style for disabled

* prevent opening submenu if item is disabled

* tighten restrictions on opening split buttons to open with alt + down

* refactored button name and fixed test

* updated bundle size

* changed on menu item click to bw able to take in a keyboard event

* updated package json

* fixed weird tabbing

* changed way we structured the focus

* added stop propagation

* changed split button container key down to work with other buttons now

* update bundle size

* added correct split button container styles

* removed unnecessary attribute

* fixed focusing on menu button when primary button is disabled

* added change to focus

* added aria hidden

* fixed span location and moved TODO

* added support to focus on whole container in split button for contextual menus

* added comment

* fixed styling issues with buttons

* fixed style problems for contextual split button where content is centered

* reverted change

* added appropriate change file

* Update contextualMenuAlignSplitButton_2018-03-27-18-13.json

* Integrate markdown-to-jsx in example-app-base for use in documentation (microsoft#4302)

* Add markdown to jsx related packages and update shrinkwrap

* Copy template components to example app base and correct imports.

* Create example md files

* Add Markdown typings

* Remove commented code

* Test using md files in Activity Item Page

* Simplify raw-loader md imports

* npm run change output

* Expand md import to full path

* Applying package updates.

* Contextual Menu Fix Split Button Submenu Target (microsoft#4368)

* Update SplitButton submenu in ContextualMenu to base itself of the splitButtonContainer

* rush change

* used ref to pass in container instead of parent element for more defenseive code

* changed class to use correct refs

* added example and refactored focus

* Initials for phone numbers (microsoft#4376)

* Adding option for calculating initials for phone numbers

* Added change description

* Name change and cleanup

* Update initials-for-phonenumbers_2018-03-27-14-10.json

* Update initials-for-phonenumbers_2018-03-27-14-10.json

* Applying package updates.

* Markdown-to-jsx: fix dependencies (microsoft#4389)

* Add markdown to jsx related packages and update shrinkwrap

* Copy template components to example app base and correct imports.

* Create example md files

* Add Markdown typings

* Remove commented code

* Test using md files in Activity Item Page

* Simplify raw-loader md imports

* npm run change output

* Expand md import to full path

* Move markdown and syntax packages to dependencies.

* Move md files to docs folder.

* Applying package updates.

* Remove root-level imports of office-ui-fabric-react from /experiments (microsoft#4392)

* Remove root imports of office-ui-fabric-react

* Update change output

* Fixing tests in experiments to not generate warnings in `npm start`. (microsoft#4391)

* Applying package updates.

* Variants: fix theming output so original input theme values are respected (microsoft#4393)

* oops

* changefile

* dry

* max line length error

* Applying package updates.

* OverflowSet: allow the OverflowSet to not be contained within a FocusZone (microsoft#4400)

* Add a prop so that OverflowSets do not have to contain FocusZones

* pull the common aspects into variables so they can be reused

* simplify OverflowSet even more (use Tag to remove duplication)

* Revert back and remove the key since it's no longer needed

* rush change

* Make sure the focusZoneProps are still getting passed down

* The divProperties only need to be used when doNotContainWithinFocusZone is true

* Remove unneeded import

* DetailsList: link color invisible for selected row in high-contrast-white (microsoft#4395)

* DetailsList: link color too close to selected background in high-contrast-white

* add change file

* SplitButton: Close menu when primary button is clicked (microsoft#4403)

* Updating the split button to close the menu when the primary button is executed.

* change

* Fix Signal rendering in IE (microsoft#4404)

* More Signals fixes

* Update change output

* Pass all props to Signal Icon elements

* Update change output

* Pickers: Fix suggestions not having proper value selected (microsoft#4408)

* Revert "FocusTrapZone does not correctly trap focus when last child is FocusZone (microsoft#4172)"

This reverts commit 699fa69.

* fix picker suggestions and add many tests

* adding snap file

* adding change file

* improve test

* fix tests and config

* revert test changes

* last test update

* update test name and snapshot

* remove tests to expedite checkin

* Breadcrumb: File rename to make the 6.0 merge diff more readable. (microsoft#4394)

* File rename to make the 6.0 merge diff more readable.

* Adding checkbox.

* Also moving a few more.

* Pickers: Add suggestions tests (microsoft#4409)

* Revert "FocusTrapZone does not correctly trap focus when last child is FocusZone (microsoft#4172)"

This reverts commit 699fa69.

* fix picker suggestions and add many tests

* adding snap file

* adding change file

* improve test

* fix tests and config

* revert test changes

* last test update

* update test name and snapshot

* undo suggestions change so it will merge properly

* revert change to suggestions

* Disable tree shaking (temporarily) (microsoft#4410)

* Temporarily disable tree shaking.

* Adding change files.
  • Loading branch information
christiango authored Mar 30, 2018
1 parent 957b409 commit 91a7f14
Show file tree
Hide file tree
Showing 137 changed files with 8,938 additions and 1,694 deletions.
19 changes: 19 additions & 0 deletions apps/fabric-website/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
{
"name": "@uifabric/fabric-website",
"entries": [
{
"version": "5.5.2",
"tag": "@uifabric/fabric-website_v5.5.2",
"date": "Tue, 27 Mar 2018 10:14:02 GMT",
"comments": {
"patch": [
{
"author": "Kevin Coughlin <[email protected]>",
"commit": "ccf2163bda809f6033fff3892b494c004fe0ff13",
"comment": "Adds missing neutralQuaternary and neutralQuaternaryAlt to document colors page"
}
],
"dependency": [
{
"comment": "Updating dependency \"office-ui-fabric-react\" from `>=5.70.0 <6.0.0` to `>=5.71.0 <6.0.0`"
}
]
}
},
{
"version": "5.5.1",
"tag": "@uifabric/fabric-website_v5.5.1",
Expand Down
9 changes: 8 additions & 1 deletion apps/fabric-website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log - @uifabric/fabric-website

This log was last generated on Wed, 21 Mar 2018 10:18:29 GMT and should not be manually modified.
This log was last generated on Tue, 27 Mar 2018 10:14:02 GMT and should not be manually modified.

## 5.5.2
Tue, 27 Mar 2018 10:14:02 GMT

### Patches

- Adds missing neutralQuaternary and neutralQuaternaryAlt to document colors page

## 5.5.1
Wed, 21 Mar 2018 10:18:29 GMT
Expand Down
4 changes: 2 additions & 2 deletions apps/fabric-website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uifabric/fabric-website",
"version": "5.5.1",
"version": "5.5.2",
"description": "Reusable React components for building experiences for Office 365.",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down 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.70.0 <6.0.0",
"office-ui-fabric-react": ">=5.74.0 <6.0.0",
"tslib": "^1.7.1"
}
}
10 changes: 10 additions & 0 deletions apps/fabric-website/src/data/colors-neutral.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
"value": "#c8c8c8",
"labelColorClass": "ms-fontColor-black"
},
{
"name": "neutralQuaternary",
"value": "#d0d0d0",
"labelColorClass": "ms-fontColor-black"
},
{
"name": "neutralQuaternaryAlt",
"value": "#dadada",
"labelColorClass": "ms-fontColor-black"
},
{
"name": "neutralLight",
"value": "#eaeaea",
Expand Down
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.70.0 <6.0.0",
"office-ui-fabric-react": ">=5.74.0 <6.0.0",
"raw-loader": "^0.5.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
Expand Down
6 changes: 6 additions & 0 deletions apps/ssr-tests/test/test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
'use strict';


import { initializeIcons } from 'office-ui-fabric-react/lib/Icons';

// Treat warnings as failures.
console.warn = (message) => { throw new Error(message); };

// Initialize icons.
initializeIcons('dist/');

// Configure load-themed-styles to avoid registering styles.
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.70.0 <6.0.0",
"office-ui-fabric-react": ">=5.74.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.70.0 <6.0.0",
"office-ui-fabric-react": ">=5.74.0 <6.0.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"typescript": "2.7.2",
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.70.0 <6.0.0",
"office-ui-fabric-react": ">=5.74.0 <6.0.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"typescript": "2.7.2",
Expand Down
67 changes: 66 additions & 1 deletion apps/vr-tests/src/stories/PeoplePicker.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,56 @@ const people: (IPersonaProps & { key: string | number })[] = [
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
},
{
key: 5,
imageUrl: TestImages.personaMale,
imageInitials: 'RK',
primaryText: 'Alex Lundberg1',
secondaryText: 'Financial Analyst',
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
},
{
key: 6,
imageUrl: TestImages.personaMale,
imageInitials: 'RK',
primaryText: 'Alex Lundberg2',
secondaryText: 'Financial Analyst',
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
},
{
key: 7,
imageUrl: TestImages.personaMale,
imageInitials: 'RK',
primaryText: 'Alex Lundberg2',
secondaryText: 'Financial Analyst',
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
},
{
key: 8,
imageUrl: TestImages.personaMale,
imageInitials: 'RK',
primaryText: 'Alex Lundberg3',
secondaryText: 'Financial Analyst',
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
},
{
key: 9,
imageUrl: TestImages.personaMale,
imageInitials: 'RK',
primaryText: 'Alex Lundberg4',
secondaryText: 'Financial Analyst',
tertiaryText: 'In a meeting',
optionalText: 'Available at 4:00pm',
presence: PersonaPresence.offline
}
];

Expand Down Expand Up @@ -96,7 +146,22 @@ storiesOf('PeoplePicker', module)
pickerSuggestionsProps={ suggestionProps }
disabled
/>
))
)).add('Normal with text', () => (
<Screener
steps={ new Screener.Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.click('.ms-BasePicker-input')
.setValue('.ms-BasePicker-input', 'a')
.snapshot('suggestion: "a"')
.end() }>
<NormalPeoplePicker
onResolveSuggestions={ getPeople }
onEmptyInputFocus={ getPeople }
getTextFromItem={ getTextFromItem }
className={ 'ms-PeoplePicker' }
pickerSuggestionsProps={ suggestionProps }
/>
</Screener>))
.addDecorator(story => (
<Screener
steps={ new Screener.Steps()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/example-app-base",
"comment": "We need to temporarily remove `sideEffects: false` flag from package.json which will disable w",
"type": "patch"
}
],
"packageName": "@uifabric/example-app-base",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/experiments",
"comment": "We need to temporarily remove `sideEffects: false` flag from package.json which will disable w",
"type": "patch"
}
],
"packageName": "@uifabric/experiments",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/experiments/signals_2018-03-29-18-33.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Fix flex styling for SignalField",
"packageName": "@uifabric/experiments",
"type": "patch"
}
],
"packageName": "@uifabric/experiments",
"email": "[email protected]"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/experiments/signals_2018-03-29-20-23.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/experiments",
"comment": "Pass all props to Signal Icon elements",
"type": "patch"
}
],
"packageName": "@uifabric/experiments",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Dropdown: do not select disabled items on keydown",
"comment": "DetailsList: link color too close to selected background in high-contrast-white",
"type": "patch"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "We need to temporarily remove `sideEffects: false` flag from package.json which will disable webpack 4 tree shaking until we can identify a good fix for it to not shake out the scss files.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Pickers: fix bug where suggestions wouldn't have correct value selected",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "OverflowSet: Allow the OverflowSet to not be contained within a FocusZone",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Updating the split button to close the menu when the primary button is executed.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
Loading

0 comments on commit 91a7f14

Please sign in to comment.