From 9b79ac57acbe31e710becd7265e96424ed549798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ro=C5=BCek?= <jakub@stoplight.io>
Date: Thu, 12 Sep 2019 01:31:09 +0200
Subject: [PATCH] feat: share worker

---
 src/components/JsonSchemaViewer.tsx           | 23 +++++++++----------
 .../__tests__/JsonSchemaViewer.spec.tsx       | 15 ++++++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/components/JsonSchemaViewer.tsx b/src/components/JsonSchemaViewer.tsx
index 1eda17a4..897482a8 100644
--- a/src/components/JsonSchemaViewer.tsx
+++ b/src/components/JsonSchemaViewer.tsx
@@ -40,7 +40,7 @@ export interface IJsonSchemaViewerComponent extends Omit<IJsonSchemaViewer, 'Fal
 export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaViewerComponent> {
   protected treeStore: TreeStore;
   protected instanceId: string;
-  protected schemaWorker?: WebWorker;
+  public static schemaWorker?: WebWorker;
 
   public state = {
     computing: false,
@@ -89,7 +89,8 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
 
   protected prerenderSchema() {
     const schema = this.schema;
-    const isWorkerSpawn = this.schemaWorker !== void 0 && !('isShim' in this.schemaWorker);
+    const isWorkerSpawn =
+      JsonSchemaViewerComponent.schemaWorker !== void 0 && !('isShim' in JsonSchemaViewerComponent.schemaWorker);
     let needsFullRendering = isWorkerSpawn;
 
     const renderedSchema = renderSchema(
@@ -146,23 +147,21 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
       mergeAllOf: this.props.mergeAllOf !== false,
     };
 
-    if (this.schemaWorker) {
-      this.schemaWorker.postMessage(message);
+    if (JsonSchemaViewerComponent.schemaWorker !== void 0) {
+      JsonSchemaViewerComponent.schemaWorker.postMessage(message);
     }
 
     this.setState({ computing: true });
   }
 
   public componentDidMount() {
-    this.schemaWorker = new SchemaWorker();
-    this.schemaWorker.addEventListener('message', this.handleWorkerMessage);
-    this.renderSchema();
-  }
-
-  public componentWillUnmount() {
-    if (this.schemaWorker !== void 0) {
-      this.schemaWorker.terminate();
+    // let's initialize it lazily
+    if (JsonSchemaViewerComponent.schemaWorker === void 0) {
+      JsonSchemaViewerComponent.schemaWorker = new SchemaWorker();
     }
+
+    JsonSchemaViewerComponent.schemaWorker.addEventListener('message', this.handleWorkerMessage);
+    this.renderSchema();
   }
 
   public componentDidUpdate(prevProps: Readonly<IJsonSchemaViewer>) {
diff --git a/src/components/__tests__/JsonSchemaViewer.spec.tsx b/src/components/__tests__/JsonSchemaViewer.spec.tsx
index 0418dd3f..8f14100e 100644
--- a/src/components/__tests__/JsonSchemaViewer.spec.tsx
+++ b/src/components/__tests__/JsonSchemaViewer.spec.tsx
@@ -210,4 +210,19 @@ describe('JSON Schema Viewer component', () => {
 
     expect(wrapper.instance()).toHaveProperty('treeStore.nodes', []);
   });
+
+  test('should create one shared instance of schema worker one mounted for a first time and keep it', () => {
+    const worker = (shallow(
+      <JsonSchemaViewerComponent schema={schema as JSONSchema4} maxRows={0} onError={jest.fn()} />,
+    ).instance()!.constructor as any).schemaWorker;
+
+    expect(SchemaWorker).toHaveBeenCalledTimes(1);
+
+    expect(worker).toBe(
+      (shallow(<JsonSchemaViewerComponent schema={schema as JSONSchema4} maxRows={0} onError={jest.fn()} />).instance()!
+        .constructor as any).schemaWorker,
+    );
+
+    expect(SchemaWorker).toHaveBeenCalledTimes(1);
+  });
 });