From 0115a46d8af03ec818588d9551cde6a2eed1ac6a Mon Sep 17 00:00:00 2001
From: Enoch Riese <enoch.riese@gmail.com>
Date: Mon, 14 Nov 2022 16:33:57 -0600
Subject: [PATCH] get tests passing

---
 packages/core/src/pattern.mjs                 | 11 ++++++-----
 packages/core/tests/hooks.test.mjs            |  1 +
 sites/shared/components/wrappers/workbench.js |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/pattern.mjs b/packages/core/src/pattern.mjs
index 2b3b676bd5d..77b9f2d932a 100644
--- a/packages/core/src/pattern.mjs
+++ b/packages/core/src/pattern.mjs
@@ -140,11 +140,7 @@ Pattern.prototype.createPartForSet = function (partName, set = 0) {
   if (this.__needs(partName, set)) {
     // Draft part
     const result = this.draftPartForSet(partName, set)
-    if (typeof result === 'undefined') {
-      this.setStores[set].log.error(
-        `Result of drafting part ${partName} was undefined. Did you forget to return the part?`
-      )
-    } else this.parts[set][partName] = result
+    if (typeof result !== 'undefined') this.parts[set][partName] = result
     // FIXME: THis won't work not that this is immutable
     // But is it still needed?
     // this.parts[set][partName].hidden === true ? true : !this.__wants(partName, set)
@@ -163,6 +159,11 @@ Pattern.prototype.draftPartForSet = function (partName, set) {
       this.__runHooks('prePartDraft')
       const result = this.__designParts[partName].draft(this.parts[set][partName].shorthand())
       this.__runHooks('postPartDraft')
+      if (typeof result === 'undefined') {
+        this.setStores[set].log.error(
+          `Result of drafting part ${partName} was undefined. Did you forget to return the part?`
+        )
+      }
       return result
     } catch (err) {
       this.setStores[set].log.error([`Unable to draft part \`${partName}\` (set ${set})`, err])
diff --git a/packages/core/tests/hooks.test.mjs b/packages/core/tests/hooks.test.mjs
index 6fab1d93780..20b24fe2624 100644
--- a/packages/core/tests/hooks.test.mjs
+++ b/packages/core/tests/hooks.test.mjs
@@ -19,6 +19,7 @@ describe('Hooks', () => {
       preSample: [],
       postSample: [],
       preRender: [],
+      preLayout: [],
       postLayout: [],
       postRender: [],
       insertText: [],
diff --git a/sites/shared/components/wrappers/workbench.js b/sites/shared/components/wrappers/workbench.js
index 3d1cd111ef5..9e74bd913ca 100644
--- a/sites/shared/components/wrappers/workbench.js
+++ b/sites/shared/components/wrappers/workbench.js
@@ -3,7 +3,7 @@ import { useGist } from 'shared/hooks/useGist'
 import Layout from 'shared/components/layouts/default'
 import Menu from 'shared/components/workbench/menu/index.js'
 import DraftError from 'shared/components/workbench/draft/error.js'
-import theme from '@freesewing/plugin-theme'
+import { pluginTheme } from '@freesewing/plugin-theme'
 import preloaders from 'shared/components/workbench/preload.js'
 import Modal from 'shared/components/modal'
 
@@ -122,7 +122,7 @@ const WorkbenchWrapper = ({ app, design, preload = false, from = false, layout =
     //draft.__init()
 
     // add theme to svg renderer
-    if (gist.renderer === 'svg') draft.use(theme)
+    if (gist.renderer === 'svg') draft.use(pluginTheme)
 
     // draft it for draft and event views. Other views may add plugins, etc and we don't want to draft twice
     try {