Skip to content

Commit 67804f7

Browse files
author
Linsen Wu
committed
Fix arrow direction, fix sectiongroup order, update picker react version
1 parent fa324b8 commit 67804f7

10 files changed

+10207
-2617
lines changed

Diff for: package-lock.json

+2,597-2,596
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"bulma": "^0.4.2",
99
"mini-css-extract-plugin": "^0.4.0",
1010
"onenoteapi": "2.0.6",
11-
"react": "^15.6.2",
12-
"react-dom": "^15.6.2"
11+
"react": "16.2.0",
12+
"react-dom": "16.2.0"
1313
},
1414
"devDependencies": {
1515
"@types/classnames": "^2.2.0",
@@ -18,8 +18,8 @@
1818
"@types/history": "^4.5.2",
1919
"@types/jasmine": "^2.5.51",
2020
"@types/node": "^7.0.29",
21-
"@types/react": "^15.6.15",
22-
"@types/react-dom": "^15.5.6",
21+
"@types/react": "16.0.38",
22+
"@types/react-dom": "16.0.4",
2323
"@types/sinon": "^2.3.1",
2424
"@types/webpack": "^2.2.15",
2525
"@types/webpack-env": "^1.13.0",

Diff for: src/components/createNewNotebook/createNewNotebookNode.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export interface CreateNewNotebookNodeProps extends InnerGlobals {
1818
* UI.
1919
*/
2020
export class CreateNewNotebookNode extends React.Component<CreateNewNotebookNodeProps, {}> {
21-
constructor() {
22-
super();
21+
constructor(props: CreateNewNotebookNodeProps) {
22+
super(props);
2323

2424
this.notStartedRenderStrategy = this.notStartedRenderStrategy.bind(this);
2525
this.inputRenderStrategy = this.inputRenderStrategy.bind(this);

Diff for: src/components/createNewSection/createNewSectionNode.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export interface CreateNewSectionNodeProps extends InnerGlobals {
2222
* UI.
2323
*/
2424
export class CreateNewSectionNode extends React.Component<CreateNewSectionNodeProps, {}> {
25-
constructor() {
26-
super();
25+
constructor(props: CreateNewSectionNodeProps) {
26+
super(props);
2727

2828
this.notStartedRenderStrategy = this.notStartedRenderStrategy.bind(this);
2929
this.inputRenderStrategy = this.inputRenderStrategy.bind(this);

Diff for: src/components/sharedNotebookRenderStrategy.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,27 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg
6767
];
6868
}
6969

70-
const sectionGroupRenderStrategies = this.notebook.apiProperties.spSectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
71-
const sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
72-
!!this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected ?
70+
const sectionRenderStrategies = this.notebook.apiProperties.spSections.map(section => new SectionRenderStrategy(section, this.globals));
71+
const sections = sectionRenderStrategies.map(renderStrategy =>
72+
!!this.globals.callbacks.onPageSelected ?
7373
<ExpandableNode
7474
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
7575
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
7676
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
7777
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
7878
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
7979

80-
const sectionRenderStrategies = this.notebook.apiProperties.spSections.map(section => new SectionRenderStrategy(section, this.globals));
81-
const sections = sectionRenderStrategies.map(renderStrategy =>
82-
!!this.globals.callbacks.onPageSelected ?
80+
const sectionGroupRenderStrategies = this.notebook.apiProperties.spSectionGroups.map(sectionGroup => new SectionGroupRenderStrategy(sectionGroup, this.globals));
81+
const sectionGroups = sectionGroupRenderStrategies.map(renderStrategy =>
82+
!!this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected ?
8383
<ExpandableNode
8484
expanded={renderStrategy.isExpanded()} node={renderStrategy} globals={this.globals}
8585
treeViewId={Constants.TreeView.id} key={renderStrategy.getId()}
8686
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} /> :
8787
<LeafNode node={renderStrategy} treeViewId={Constants.TreeView.id} key={renderStrategy.getId()} globals={this.globals}
8888
id={renderStrategy.getId()} level={childrenLevel} ariaSelected={renderStrategy.isAriaSelected()} />);
8989

90-
return [...sectionGroups, ...sections];
90+
return [...sections, ...sectionGroups];
9191
}
9292

9393
isExpanded(): boolean {

Diff for: src/components/treeView/createEntityNode.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export class CreateEntityNode extends React.Component<CreateEntityNodeProps, Cre
3737
private inputRef: HTMLInputElement;
3838
private componentIsMounted: boolean;
3939

40-
constructor() {
41-
super();
40+
constructor(props: CreateEntityNodeProps) {
41+
super(props);
4242
this.state = this.defaultState();
4343

4444
this.setWrapperRef = this.setWrapperRef.bind(this);

Diff for: src/localizedComponent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface LocalizedComponentProps {
1111
*/
1212
export class LocalizedComponent extends React.Component<LocalizedComponentProps, {}> {
1313
constructor(props: LocalizedComponentProps) {
14-
super();
14+
super(props);
1515
Strings.setOverrides(props.stringOverrides);
1616
}
1717

Diff for: src/oneNotePicker.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ svg.spinner {
6363
.chevron-icon {
6464
transition-duration: 0.3s;
6565
transition-property: transform;
66-
transform: rotate(180deg);
6766

6867
svg {
68+
transform: rotate(180deg);
6969
width: 0.5rem;
7070
}
7171

Diff for: src/oneNoteSingleNotebookDropdown.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export interface OneNoteSingleNotebookDropdownProps extends OneNoteSingleNoteboo
1717
export class OneNoteSingleNotebookDropdown extends React.Component<OneNoteSingleNotebookDropdownProps, OneNoteSingleNotebookDropdownState> {
1818
private wrapperRef: Node;
1919

20-
constructor() {
21-
super();
20+
constructor(props: OneNoteSingleNotebookDropdownProps) {
21+
super(props);
2222
this.state = {
2323
popupVisible: false
2424
};

0 commit comments

Comments
 (0)