Skip to content

Commit

Permalink
Merge pull request #33 from SharePoint/dev
Browse files Browse the repository at this point in the history
Bug fixes for version 1.1.2
  • Loading branch information
estruyf authored Jan 9, 2018
2 parents 8fc6c95 + 2969370 commit c652fcf
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Thank you for reporting an issue, suggesting an enhancement, or asking a question. We appreciate your feedback - to help the team understand your
needs please complete the below template to ensure we have the details to help. Thanks!

**Please check out the [documentation](https://github.com/SharePoint/sp-dev-fx-controls-react/wiki) to see if your question is already addressed there. This will help us ensure our documentation is up to date.**
**Please check out the [documentation](https://sharepoint.github.io/sp-dev-fx-controls-react/) to see if your question is already addressed there. This will help us ensure our documentation is up to date.**

#### Category
[ ] Enhancement
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Releases

## 1.1.2

- Fix for WebPartTitle control to inherit color
- Improved telemetry with some object checks

## 1.1.1

- Removed operation name from telemetry
Expand All @@ -9,7 +14,7 @@
- Telemetry added

## 1.0.0
- **New control**: WebPartTilte control got added.
- **New control**: WebPartTitle control got added.
- **Enhancement**: ListView control got extended with the ability to specify a set of preselected items.

## Beta 1.0.0-beta.8
Expand Down
7 changes: 6 additions & 1 deletion docs/documentation/docs/about/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Releases

## 1.1.2

- Fix for WebPartTitle control to inherit color
- Improved telemetry with some object checks

## 1.1.1

- Removed operation name from telemetry
Expand All @@ -9,7 +14,7 @@
- Telemetry added

## 1.0.0
- **New control**: WebPartTilte control got added.
- **New control**: WebPartTitle control got added.
- **Enhancement**: ListView control got extended with the ability to specify a set of preselected items.

## Beta 1.0.0-beta.8
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/mpa.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Before you start contributing to this project, you will need Node.js. This proje

### Documentation

SharePoint Framework Property Controls uses [MkDocs](http://www.mkdocs.org) to publish documentation pages. See more information about installing MkDocs on your operating system at http://www.mkdocs.org/#installation.
SharePoint Framework React Controls uses [MkDocs](http://www.mkdocs.org) to publish documentation pages. See more information about installing MkDocs on your operating system at http://www.mkdocs.org/#installation.

Also, documentation uses custom MkDocs theme that should be installed as well. See [Material theme for MkDocs](https://squidfunk.github.io/mkdocs-material/).

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@pnp/spfx-controls-react",
"description": "Reusable React controls for SharePoint Framework solutions",
"version": "1.1.1",
"version": "1.1.2",
"engines": {
"node": ">=0.10.0"
},
Expand Down Expand Up @@ -57,5 +57,7 @@
"bugs": {
"url": "https://github.com/SharePoint/sp-dev-fx-controls-react/issues"
},
"main":"lib/index.js",

"homepage": "https://github.com/SharePoint/sp-dev-fx-controls-react"
}
4 changes: 3 additions & 1 deletion src/common/appInsights/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import {Environment,EnvironmentType} from "@microsoft/sp-core-library";
AppInsights.downloadAndSetup({ instrumentationKey: "9f59b81e-d2ed-411e-a961-8bcf3f7f04d0" });

// Remove operation name from the telemetry
AppInsights.context.operation.name = null;
if (AppInsights.context && AppInsights.context.operation && AppInsights.context.operation.name) {
AppInsights.context.operation.name = null;
}

export function track(componentName: string, properties: any = {}): void {
AppInsights.trackEvent(componentName, {
Expand Down
1 change: 1 addition & 0 deletions src/controls/webPartTitle/WebPartTitle.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
background-color: transparent;
border: none;
box-sizing: border-box;
color: inherit;
display: block;
font-family: inherit;
font-size: inherit;
Expand Down
11 changes: 1 addition & 10 deletions src/controls/webPartTitle/WebPartTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class WebPartTitle extends React.Component<IWebPartTitleProps, {}> {
*/
public render(): React.ReactElement<IWebPartTitleProps> {
return (
<div className={`${styles.webPartTitle} ${this.props.className}` }>
<div className={`${styles.webPartTitle} ${this.props.className ? this.props.className : ''}` }>
{
this.props.displayMode === DisplayMode.Edit && <textarea placeholder={strings.WebPartTitlePlaceholder} aria-label={strings.WebPartTitleLabel} onChange={this._onChange} defaultValue={this.props.title}></textarea>
}
Expand All @@ -54,12 +54,3 @@ export class WebPartTitle extends React.Component<IWebPartTitleProps, {}> {
);
}
}






/*
*/

0 comments on commit c652fcf

Please sign in to comment.