Merge 6ea6c35683 into c68bdfd594

samples/react-rhythm-of-business-calendar/config/package-solution.json

@@ -3,7 +3,7 @@
     "solution": {
         "name": "Rhythm of Business Calendar",
         "id": "37df9a1c-b53e-46ad-9efb-2e4da77a724f",
-        "version": "5.0.2.0",
+        "version": "5.0.1.0",
         "includeClientSideAssets": true,
         "skipFeatureDeployment": true,
         "webApiPermissionRequests": [

samples/react-rhythm-of-business-calendar/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythm-of-business-calendar",
-  "version": "5.0.2",
+  "version": "5.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

samples/react-rhythm-of-business-calendar/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rhythm-of-business-calendar",
-    "version": "5.0.2",
+    "version": "5.0.1",
     "main": "lib/index.js",
     "private": true,
     "scripts": {

samples/react-rhythm-of-business-calendar/src/components/views/list/ExportToExcel.tsx

@@ -6,7 +6,6 @@ import { Refiner, humanizeRecurrencePattern } from 'model';
 import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react';
 import { Humanize as _strings } from 'ComponentStrings';
 import { EventOccurrence } from 'model';
-import { renderSanitizedHTML } from "common/components/LiveUtils";
 interface IExportToExcelProps {
   items: any[];
   _refiners:readonly Refiner[]
@@ -85,7 +84,7 @@ const ExportToExcel: React.FC<any> = forwardRef(( props: IExportToExcelProps, re
               <td style={{ border: '1px solid black', padding: '8px' }}>{item.title}</td>
               <td style={{ border: '1px solid black', padding: '8px' }}>{formatDate(item.start)}</td>
               <td style={{ border: '1px solid black', padding: '8px' }}>{formatDate(item.end)}</td>
-              <td style={{ border: '1px solid black', padding: '8px' }} dangerouslySetInnerHTML={{ __html: renderSanitizedHTML(item.description) }}></td>
+              <td style={{ border: '1px solid black', padding: '8px' }}>{item.description}</td>
               <td style={{ border: '1px solid black', padding: '8px' }}>{item.isRecurring ? 'Yes' : 'No'}</td>
               <td style={{ border: '1px solid black', padding: '8px' }}>{item.isAllDay ? 'Yes' : 'No'}</td>
               {_refiners.map((refiner, index) => (

samples/react-rhythm-of-business-calendar/src/components/views/list/ListView.tsx

@@ -10,7 +10,6 @@ import moment from "moment";
 import {humanizeRecurrencePattern } from 'model';
 import { Humanize as _strings } from "ComponentStrings";
 import ExportToExcel from './ExportToExcel';
-import { renderSanitizedHTML } from "common/components/LiveUtils";
 
 const classNames = mergeStyleSets({
   fileIconHeaderIcon: {
@@ -229,14 +228,8 @@ export class ListView extends React.Component<IViewProps, IDetailsListState> {
             isResizable: true,
             data: 'string',
             onRender: (item: any) => {
-              return (
-                  <div 
-                      dangerouslySetInnerHTML={{ 
-                          __html: renderSanitizedHTML(item.description) 
-                      }} 
-                  />
-              );
-          },
+              return <span>{item.description}</span>;
+            },
             isPadded: true,
           });
           this.setState({ columns: newColumns });

samples/react-rhythm-of-business-calendar/src/model/EventOccurrence.ts

@@ -30,7 +30,7 @@ export class EventOccurrence implements IEvent {
     public get isConfidential() { return this.event.isConfidential; }
     public get refinerValues() { return this.event.refinerValues; }
     public get contacts() { return this.event.contacts; }
-    public get description() { return this.event.description ? this.event.description : undefined; }
+    public get description() { return this.event.description ? this.parseHTML(this.event.description) : undefined; }
     public get recurrenceExceptionInstanceDate() { return this.event.recurrenceExceptionInstanceDate; }
     public get created(){ return this.event.created; }
     public get createdBy(){ return this.event.creator; }