Merge branch 'monaco-editor' of https://github.com/nishikaza/office-u…

…i-fabric-react into monaco-editor
sopranopillow · Jul 30, 2019 · 8acb904 · 8acb904
2 parents d4fc528 + 72a4d96
commit 8acb904
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/example-app-base/src/components/ExampleCard/ExampleCard.tsx b/packages/example-app-base/src/components/ExampleCard/ExampleCard.tsx
@@ -205,7 +205,7 @@ export class ExampleCardBase extends React.Component<IExampleCardProps, IExample
   };
 
   private _onToggleCodeClick = () => {
-    if (!this.Editor && !this.EditorPreview) {
+    if (this.canRenderLiveEditor && !this.Editor && !this.EditorPreview) {
       this.Editor = React.lazy(() => import('@uifabric/tsx-editor/lib/components/Editor'));
       this.EditorPreview = React.lazy(() => import('@uifabric/tsx-editor/lib/components/EditorPreview'));
     }

diff --git a/packages/example-app-base/src/components/Page/sections/ExamplesSection.tsx b/packages/example-app-base/src/components/Page/sections/ExamplesSection.tsx
@@ -32,7 +32,7 @@ export const ExamplesSection: React.StatelessComponent<IExamplesSectionProps> =
             const { view, ...exampleProps } = example;
             return (
               <div key={example.title + '-key'} className={styles.subSection}>
-                <ExampleCard {...exampleProps} onToggleEditor={handleEditorToggle} isCodeVisible={exampleProps.title === activeEditorTitle}>
+                <ExampleCard {...exampleProps} onToggleEditor={setActiveEditorTitle} isCodeVisible={exampleProps.title === activeEditorTitle}>
                   {view}
                 </ExampleCard>
               </div>