From c64e70ba476e7f482eb2ec48e605dad0a1380a8e Mon Sep 17 00:00:00 2001
From: Forrest Li <forrest.li@kitware.com>
Date: Fri, 14 May 2021 17:05:19 -0400
Subject: [PATCH] fix(AbstractWidgetFactory): Fix view widget model

Widgets should not take on the WidgetFactory's model. Instead,
explicitly specify what members we want from the factory object.

This avoids populating widgetModel.classHierarchy with unnecessary classes.
---
 Sources/Widgets/Core/AbstractWidgetFactory/index.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Sources/Widgets/Core/AbstractWidgetFactory/index.js b/Sources/Widgets/Core/AbstractWidgetFactory/index.js
index 959f6cb81d3..a2846747870 100644
--- a/Sources/Widgets/Core/AbstractWidgetFactory/index.js
+++ b/Sources/Widgets/Core/AbstractWidgetFactory/index.js
@@ -31,10 +31,15 @@ function vtkAbstractWidgetFactory(publicAPI, model) {
         camera,
       } = extractRenderingComponents(renderer);
       const widgetModel = {};
-      const widgetPublicAPI = {
+      const widgetPublicAPI = {};
+
+      macro.obj(widgetPublicAPI, widgetModel);
+      Object.assign(widgetPublicAPI, {
         onWidgetChange: publicAPI.onWidgetChange,
-      };
-      Object.assign(widgetModel, model, {
+      });
+      Object.assign(widgetModel, {
+        widgetState: model.widgetState,
+        manipulator: model.manipulator,
         viewType,
         renderer,
         camera,