Changed 24

total-typescript · Jun 21, 2023 · 245283a · 245283a
1 parent f73001d
commit 245283a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 4 deletions.
diff --git a/src/04-advanced-props/24-discriminated-union-with-other-props.problem.tsx b/src/04-advanced-props/24-discriminated-union-with-other-props.problem.tsx
@@ -13,9 +13,31 @@ type ModalProps =
  */
 export const Modal = (props: ModalProps) => {
   if (props.variant === "no-title") {
-    return <div>No title</div>;
+    return (
+      <div>
+        <span>No title</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
   } else {
-    return <div>Title: {props.title}</div>;
+    return (
+      <div>
+        <span>Title: {props.title}</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
   }
 };
 

diff --git a/src/04-advanced-props/24-discriminated-union-with-other-props.solution.tsx b/src/04-advanced-props/24-discriminated-union-with-other-props.solution.tsx
@@ -17,9 +17,31 @@ type ModalProps = (
 
 export const Modal = (props: ModalProps) => {
   if (props.variant === "no-title") {
-    return <div>No title</div>;
+    return (
+      <div>
+        <span>No title</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
   } else {
-    return <div>Title: {props.title}</div>;
+    return (
+      <div>
+        <span>Title: {props.title}</span>
+        <button
+          style={{
+            backgroundColor: props.buttonColor,
+          }}
+        >
+          Click me!
+        </button>
+      </div>
+    );
   }
 };