From 11a1f4d6e511ed81082adfd4c4455f3bfdfb7198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:24:07 +0900
Subject: [PATCH] =?UTF-8?q?-=20=ED=9A=8C=EB=A1=9C=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EC=A0=81=EC=9A=A9=20-=20=EC=98=A4?=
 =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../floor-plan/modal/circuitTrestle/step/StepUp.jsx      | 9 ++++++---
 .../step/type/PassivityCircuitAllocation.jsx             | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index 9152c332..bb2ec998 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -426,11 +426,14 @@ export default function StepUp(props) {
       roofSurface.moduleList.forEach((module) => {
         const targetModule = canvas.getObjects().filter((obj) => obj.id === module.uniqueId)[0]
         if (module.circuit === '') return
-        const moduleCircuitText = new fabricxtxt(module.circuit, {
+        const moduleCircuitText = new fabric.Text(module.circuit, {
           left: targetModule.left + targetModule.width / 2,
           top: targetModule.top + targetModule.height / 2,
-          fill: 'black',
-          fontSize: 20,
+          fontFamily: circuitNumberText.fontFamily.value,
+          fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
+          fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
+          fontSize: circuitNumberText.fontSize.value,
+          fill: circuitNumberText.fontColor.value,
           width: targetModule.width,
           height: targetModule.height,
           textAlign: 'center',
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index 8bde32d2..6ec3ba25 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -133,11 +133,11 @@ export default function PassivityCircuitAllocation(props) {
         const moduleCircuitText = new fabric.Text(getCircuitNumber(), {
           left: obj.left + obj.width / 2,
           top: obj.top + obj.height / 2,
-          fill: 'black',
           fontFamily: circuitNumberText.fontFamily.value,
           fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
           fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
           fontSize: circuitNumberText.fontSize.value,
+          fill: circuitNumberText.fontColor.value,
           width: obj.width,
           height: obj.height,
           textAlign: 'center',