Merge branch 'master' of github.com:payloadcms/payload

Author: jmikrut

src/admin/components/elements/CodeEditor/index.tsx

@@ -22,6 +22,7 @@ const CodeEditor: React.FC<Props> = (props) => {
     <Editor
       height="35vh"
       className={classes}
+      theme={theme === 'dark' ? 'vs-dark' : 'vs'}
       options={
         {
           detectIndentation: true,
@@ -31,7 +32,6 @@ const CodeEditor: React.FC<Props> = (props) => {
           readOnly: Boolean(readOnly),
           scrollBeyondLastLine: false,
           tabSize: 2,
-          theme: theme === 'dark' ? 'vs-dark' : 'vs',
           wordWrap: 'on',
           ...options,
         }