Merge pull request #1014 from LauraKokkarinen/PR1000

Manual merge of PR #1000

samples/react-visio/.yo-rc.json

@@ -2,7 +2,7 @@
   "@microsoft/generator-sharepoint": {
     "isCreatingSolution": true,
     "environment": "spo",
-    "version": "1.7.1",
+    "version": "1.9.1",
     "libraryName": "react-visio",
     "libraryId": "0ad401f1-b158-4626-8e71-cf27b1f4848d",
     "packageManager": "npm",

samples/react-visio/README.md

@@ -8,7 +8,7 @@ This sample shows how the [Visio JavaScript APIs](https://dev.office.com/referen
 
 ## Used SharePoint Framework Version
 
-![drop](https://img.shields.io/badge/drop-1.7.1-green.svg)
+![drop](https://img.shields.io/badge/drop-1.9.1-green.svg)
 
 ## Applies to
 
@@ -29,7 +29,8 @@ This sample shows how the [Visio JavaScript APIs](https://dev.office.com/referen
 ## Version history
 
 | Version | Date               | Comments             |
-| ------- | --------------- | -------------------- |
+| ------- | ------------------ | -------------------- |
+| 1.4     | September 20, 2019 | Update to SPFx 1.9.1 |
 | 1.3     | April 4, 2019      | Update readme        |
 | 1.2     | January 4, 2019    | Update to SPFx 1.7.1 |
 | 1.1     | October 3, 2018    | Update to SPFx 1.6.0 |

samples/react-visio/package.json

@@ -2,6 +2,7 @@
   "name": "react-visio",
   "version": "0.0.1",
   "private": true,
+  "main": "lib/index.js",
   "engines": {
     "node": ">=0.10.0"
   },
@@ -11,25 +12,31 @@
     "test": "gulp test"
   },
   "dependencies": {
-    "@microsoft/sp-core-library": "1.7.1",
+    "@microsoft/sp-core-library": "1.9.1",
-    "@microsoft/sp-lodash-subset": "1.7.1",
+    "@microsoft/sp-lodash-subset": "1.9.1",
-    "@microsoft/sp-office-ui-fabric-core": "1.7.1",
+    "@microsoft/sp-office-ui-fabric-core": "1.9.1",
-    "@microsoft/sp-webpart-base": "1.7.1",
+    "@microsoft/sp-webpart-base": "1.9.1",
     "@types/es6-promise": "0.0.33",
     "@types/office-js": "0.0.101",
-    "@types/react": "16.4.2",
+    "@types/react": "16.8.8",
-    "@types/react-dom": "16.0.5",
+    "@types/react-dom": "16.8.3",
     "@types/webpack-env": "1.13.1",
-    "react": "16.3.2",
+    "office-ui-fabric-react": "6.189.2",
-    "react-dom": "16.3.2"
+    "react": "16.8.5",
+    "react-dom": "16.8.5"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.7.1",
+    "@microsoft/rush-stack-compiler-2.9": "0.7.16",
-    "@microsoft/sp-module-interfaces": "1.7.1",
+    "@microsoft/sp-build-web": "1.9.1",
-    "@microsoft/sp-webpart-workbench": "1.7.1",
+    "@microsoft/sp-module-interfaces": "1.9.1",
+    "@microsoft/sp-tslint-rules": "1.9.1",
+    "@microsoft/sp-webpart-workbench": "1.9.1",
     "@types/chai": "3.4.34",
     "@types/mocha": "2.2.38",
     "ajv": "~5.2.2",
     "gulp": "~3.9.1"
+  },
+  "resolutions": {
+    "@types/react": "16.8.8"
   }
 }

samples/react-visio/src/shared/services/VisioService.ts

@@ -299,8 +299,8 @@ export class VisioService {
       // trigger document and page loaded event handlers manually as sometimes Visio fails to trigger them
       // we are sending a null event, which is fine in this case as we don't need any of the event data
       // this is randomly happening on chrome, but seems to always fail on IE...
-        this._onDocumentLoadComplete(null);
+        // this._onDocumentLoadComplete(null);
-        this._onPageLoadComplete(null);
+        // this._onPageLoadComplete(null);
 
     } catch (error) {
       this.logError(error);

samples/react-visio/src/webparts/visioSample/VisioSampleWebPart.manifest.json

@@ -12,6 +12,7 @@
   // Components that allow authors to embed arbitrary script code should set this to true.
   // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
   "requiresCustomScript": false,
+  "supportedHosts": ["SharePointWebPart"],
 
   "preconfiguredEntries": [{
     "groupId": "5c03119e-3074-46fd-976b-c60198311f70", // Other

samples/react-visio/src/webparts/visioSample/VisioSampleWebPart.ts

@@ -1,11 +1,8 @@
 import * as React from 'react';
 import * as ReactDom from 'react-dom';
 import { Version, Environment, EnvironmentType } from '@microsoft/sp-core-library';
-import {
+import { BaseClientSideWebPart } from "@microsoft/sp-webpart-base";
-  BaseClientSideWebPart,
+import { IPropertyPaneConfiguration, PropertyPaneTextField } from "@microsoft/sp-property-pane";
-  IPropertyPaneConfiguration,
-  PropertyPaneTextField
-} from '@microsoft/sp-webpart-base';
 
 import 'officejs';
 import * as strings from 'VisioSampleWebPartStrings';

samples/react-visio/src/webparts/visioSample/components/hyperlink/Hyperlink.module.scss

@@ -1,2 +1,2 @@
-@import '~@microsoft/sp-office-ui-fabric-core/dist/sass/SPFabricCore.scss';
+@import '~office-ui-fabric-react/dist/sass/References.scss';
 .hyperlink {}

samples/react-visio/src/webparts/visioSample/components/visioSample/VisioSample.module.scss

@@ -1,4 +1,4 @@
-@import '~@microsoft/sp-office-ui-fabric-core/dist/sass/SPFabricCore.scss';
+@import '~office-ui-fabric-react/dist/sass/References.scss';
 .visioSample {
     /* layout */
     display: flex;

samples/react-visio/tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "extends": "./node_modules/@microsoft/rush-stack-compiler-2.9/includes/tsconfig-web.json",
   "compilerOptions": {
     "target": "es5",
     "forceConsistentCasingInFileNames": true,
@@ -10,6 +11,9 @@
     "experimentalDecorators": true,
     "skipLibCheck": true,
     "outDir": "lib",
+    "inlineSources": false,
+    "strictNullChecks": false,
+    "noUnusedLocals": false,
     "typeRoots": [
       "./node_modules/@types",
       "./node_modules/@microsoft"