Use `syntax` as merged name instead of `mergedSyntax`

Nate Butler created 2 years ago

This lets us retain the existing uses of syntax, and fixes colors that were being assigned incorrectly.

Change summary

styles/src/styleTree/editor.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Detailed changes

styles/src/styleTree/editor.ts

@@ -38,7 +38,7 @@ export default function editor(colorScheme: ColorScheme) {
         }
     }
 
-    const syntax: Syntax = {
+    const defaultSyntax: Syntax = {
         primary: {
             color: colorScheme.ramps.neutral(1).hex(),
             weight: fontWeights.normal,
@@ -134,10 +134,10 @@ export default function editor(colorScheme: ColorScheme) {
 
     function createSyntax(colorScheme: ColorScheme): Syntax {
         if (!colorScheme.syntax) {
-            return syntax
+            return defaultSyntax
         }
 
-        return deepmerge<Syntax, Partial<ThemeSyntax>>(syntax, colorScheme.syntax, {
+        return deepmerge<Syntax, Partial<ThemeSyntax>>(defaultSyntax, colorScheme.syntax, {
             arrayMerge: (destinationArray, sourceArray) => [
                 ...destinationArray,
                 ...sourceArray,
@@ -145,7 +145,7 @@ export default function editor(colorScheme: ColorScheme) {
         });
     }
 
-    const mergedSyntax = createSyntax(colorScheme)
+    const syntax = createSyntax(colorScheme)
 
     return {
         textColor: syntax.primary.color,
@@ -303,6 +303,6 @@ export default function editor(colorScheme: ColorScheme) {
                 color: borderColor(layer),
             },
         },
-        syntax: mergedSyntax,
+        syntax,
     }
 }