Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6d18606
Add ComboBox functionality
jspurlin Jun 2, 2017
3cc47d2
Merge branch 'master' into jspurlin/ComboBox
jspurlin Jun 2, 2017
ec78224
Make a fix for IE where non-allowFreeform is showing the keypresses...
jspurlin Jun 2, 2017
3399566
Update the PR with code review feedback. Simplified the code a lot, d…
jspurlin Jun 8, 2017
e43ac7b
Fixing some build warnings
jspurlin Jun 8, 2017
ac35bdc
Update my example page to explicitly not use two mutually exclusive p…
jspurlin Jun 8, 2017
d4c84ec
Merge branch 'master' into jspurlin/ComboBox
jspurlin Jun 8, 2017
6b2ef29
The npm-shrinkwrap.json file automatically updated... commiting
jspurlin Jun 8, 2017
aad70fb
Had a bad copy paste, fixing up the incorrectly logic
jspurlin Jun 8, 2017
1c6b74b
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
jspurlin Jun 9, 2017
1612bcc
Removing the fontFamily aspect of the comboBox and utilizing the onRe…
jspurlin Jun 9, 2017
3941b20
Update based on feedback
jspurlin Jun 9, 2017
d52e4e3
Merge branch 'master' into jspurlin/ComboBox
jspurlin Jun 9, 2017
4b779c6
Jspurlin jspurlin/combo box (#2)
christiango Jun 12, 2017
ba63a49
merge
jspurlin Jun 12, 2017
8a0a24c
New Component: Stepper (#1759)
Boris-Em Jun 8, 2017
8db368f
merge some changes
jspurlin Jun 12, 2017
b1a1f6e
merge changes
jspurlin Jun 12, 2017
2be2043
merge
jspurlin Jun 12, 2017
f61ce25
Fix a new tslint warning after npm installing
jspurlin Jun 12, 2017
51e4e21
Fixing some casing warnings npm start was angry about
jspurlin Jun 12, 2017
f8e0956
Removing an extra line that got added with the last push
jspurlin Jun 12, 2017
b312e36
Create SelectableOption.ts
dzearing Jun 12, 2017
97c208f
Create SelectableOption.ts
dzearing Jun 12, 2017
80f901e
Create ComboBox.Props.ts
dzearing Jun 12, 2017
2670a5d
Create ComboBox.test.tsx
dzearing Jun 12, 2017
d02daaa
Create ComboBox.Basic.Example.tsx
dzearing Jun 12, 2017
398bdd1
Create Dropdown.Props.ts
dzearing Jun 12, 2017
12b7b7b
Fix the case sensitivity issue
jspurlin Jun 12, 2017
3536017
one more casing issue
jspurlin Jun 12, 2017
55e2ad7
changing the reference of utilities in the test file
jspurlin Jun 13, 2017
c6b98ed
Actually it look like it has to be pascalCase here
jspurlin Jun 13, 2017
460f3de
... really... what's going on with the casing here
jspurlin Jun 13, 2017
5bd6c64
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
jspurlin Jun 15, 2017
3022036
Address feedback from in person review with David
jspurlin Jun 15, 2017
358d025
A few minor updated to remove uneeded comment and unneeded try/finall…
jspurlin Jun 19, 2017
705a852
Merge branch 'master' into jspurlin/ComboBox
jspurlin Jun 19, 2017
2634c1b
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
jspurlin Jun 19, 2017
6b0e678
Merge branch 'jspurlin/ComboBox' of https://github.com/jspurlin/offic…
jspurlin Jun 19, 2017
9039ab4
Fix up a typo and fix up to use consistent syntax on a few lines
jspurlin Jun 19, 2017
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
803 changes: 405 additions & 398 deletions apps/fabric-website/src/components/App/AppState.tsx

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import * as React from 'react';
import { ComboBoxPage } from 'office-ui-fabric-react/lib/components/ComboBox/ComboBoxPage';
import { PageHeader } from '../../components/PageHeader/PageHeader';
import { ComponentPage } from '../../components/ComponentPage/ComponentPage';

export class ComboBoxComponentPage extends React.Component<any, any> {
public render() {
return (
<div ref='pageElement'>
<ComponentPage>
<PageHeader pageTitle='ComboBox' backgroundColor='#038387'
links={
[
{
'text': 'Overview',
'location': 'Overview'
},
{
'text': 'Variants',
'location': 'Variants'
},
{
'text': 'Implementation',
'location': 'Implementation'
}
]
} />
<ComboBoxPage isHeaderVisible={ false } />
</ComponentPage>
</div>
);
}
}
Loading