@codecademy/codebytes 0.3.1-alpha.405be7.0 → 0.3.1-alpha.cef935.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-### [0.3.1-alpha.405be7.0](https://github.com/Codecademy/client-modules/compare/@codecademy/codebytes@0.3.0...@codecademy/codebytes@0.3.1-alpha.405be7.0) (2022-01-13)
+### [0.3.1-alpha.cef935.0](https://github.com/Codecademy/client-modules/compare/@codecademy/codebytes@0.3.0...@codecademy/codebytes@0.3.1-alpha.cef935.0) (2022-01-13)
 
 **Note:** Version bump only for package @codecademy/codebytes
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/codebytes",
   "description": "Codebytes Code Editor",
-  "version": "0.3.1-alpha.405be7.0",
+  "version": "0.3.1-alpha.cef935.0",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "sideEffects": [
     "**/*.css",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b0c7c52677bf95764fd29e9baa58a30761858f85"
+  "gitHead": "0f05e194904faae9337cdbd57e84382acc355a92"
 }

package/src/consts.ts

@@ -52,7 +52,7 @@ const scheme = `(begin
   (display "Hello world!")
   (newline))`;
 
-export const helloWorld = {
+export const helloWorld: { [key in languageOption]?: string } = {
   cpp,
   csharp,
   golang,
@@ -61,4 +61,4 @@ export const helloWorld = {
   python,
   ruby,
   scheme,
-} as const;
+};

package/src/editor.tsx

@@ -13,6 +13,7 @@ import { postSnippet } from './api';
 import type { languageOption } from './consts';
 import { Drawers } from './drawers';
 import { SimpleMonacoEditor } from './MonacoEditor';
+import { CodebytesChangeHandlerMap } from './types';
 
 const Output = styled.pre<{ hasError: boolean }>`
   width: 100%;
@@ -39,7 +40,7 @@ type EditorProps = {
   language: languageOption;
   text: string;
   onChange: (text: string) => void;
-  onCopy?: (text: string, language: string) => void;
+  on?: CodebytesChangeHandlerMap;
   snippetsBaseUrl?: string;
 };
 
@@ -47,7 +48,7 @@ export const Editor: React.FC<EditorProps> = ({
   language,
   text,
   hideCopyButton,
-  onCopy,
+  on = {},
   onChange,
   snippetsBaseUrl,
 }) => {
@@ -60,7 +61,7 @@ export const Editor: React.FC<EditorProps> = ({
         .writeText(text)
         // eslint-disable-next-line no-console
         .catch(() => console.error('Failed to copy'));
-      onCopy?.(text, language);
+      on.copy?.(text, language);
       setIsCodeByteCopied(true);
     }
   };
@@ -80,6 +81,7 @@ export const Editor: React.FC<EditorProps> = ({
     };
     setStatus('waiting');
     setOutput('');
+    on.run?.();
 
     try {
       const response = await postSnippet(data, snippetsBaseUrl);

package/src/index.tsx

@@ -8,19 +8,7 @@ import React, { useState } from 'react';
 import { helloWorld, languageOption } from './consts';
 import { Editor } from './editor';
 import { LanguageSelection } from './languageSelection';
-
-type CodebytesChangeHandler = (text: string, language: languageOption) => void;
-
-export interface CodeByteEditorProps {
-  text: string;
-  language: languageOption;
-  hideCopyButton: boolean;
-  onCopy?: CodebytesChangeHandler;
-  isIFrame?: boolean;
-  snippetsBaseUrl?: string;
-  onEdit?: CodebytesChangeHandler;
-  onLanguageChange?: CodebytesChangeHandler;
-}
+import { CodeByteEditorProps } from './types';
 
 const editorStates = states({
   isIFrame: { height: '100vh' },
@@ -49,9 +37,8 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
   language: initialLanguage,
   hideCopyButton,
   isIFrame = false,
+  on = {},
   snippetsBaseUrl = process.env.CONTAINER_API_BASE,
-  onEdit,
-  onLanguageChange,
 }) => {
   const [text, setText] = useState<string>(initialText);
   const [language, setLanguage] = useState<languageOption>(initialLanguage);
@@ -65,6 +52,7 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
           target="_blank"
           rel="noreferrer"
           aria-label="visit codecademy.com"
+          onClick={() => on.logoClick?.()}
         />
       </Box>
       {language ? (
@@ -74,8 +62,9 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
           hideCopyButton={hideCopyButton}
           onChange={(newText: string) => {
             setText(newText);
-            onEdit?.(newText, language);
+            on.edit?.(newText, language);
           }}
+          on={on}
           snippetsBaseUrl={snippetsBaseUrl}
         />
       ) : (
@@ -84,7 +73,7 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
             const newText: string = text || helloWorld[newLanguage] || '';
             setLanguage(newLanguage);
             setText(newText);
-            onLanguageChange?.(newText, newLanguage);
+            on.languageChange?.(newText, newLanguage);
           }}
         />
       )}

package/src/languageSelection.tsx

@@ -1,10 +1,29 @@
-import { Select, Text } from '@codecademy/gamut';
-import { ColorMode } from '@codecademy/gamut-styles';
+import { Select } from '@codecademy/gamut';
+import { Background } from '@codecademy/gamut-styles';
+import styled from '@emotion/styled';
 import React from 'react';
 
 import type { languageOption } from './consts';
 import { languageOptions } from './consts';
 
+const StyledSelect = styled(Select)`
+  margin-top: 1rem;
+  color: ${({ theme }) => theme.colors.text};
+  select {
+    color: ${({ theme }) => theme.colors.text};
+    background-color: ${({ theme }) => theme.colors.black};
+
+    &:hover,
+    &:active,
+    &:focus {
+      border-color: ${({ theme }) => theme.colors.primary};
+    }
+    &:focus {
+      box-shadow: inset 0 0 0 1px ${({ theme }) => theme.colors.primary};
+    }
+  }
+`;
+
 export type LanguageSelectionProps = {
   onChange: (newLanguage: languageOption) => void;
 };
@@ -13,14 +32,14 @@ export const LanguageSelection: React.FC<LanguageSelectionProps> = ({
   onChange,
 }) => {
   return (
-    <ColorMode mode="dark" flex={1} px={16} pt={48}>
-      <Text mb={16}>Which language do you want to code in?</Text>
-      <Select
+    <Background bg="black" flex={1} px={16} pt={48}>
+      Which language do you want to code in?
+      <StyledSelect
         id="language-select"
         aria-label="Select a language"
         options={languageOptions}
         onChange={(e) => onChange(e.target.value as languageOption)}
       />
-    </ColorMode>
+    </Background>
   );
 };

package/src/types.ts

@@ -0,0 +1,20 @@
+import { languageOption } from './consts';
+
+type CodebytesChangeHandler = (text: string, language: languageOption) => void;
+
+export type CodebytesChangeHandlerMap = {
+  logoClick?: () => void;
+  edit?: CodebytesChangeHandler;
+  languageChange?: CodebytesChangeHandler;
+  copy?: CodebytesChangeHandler;
+  run?: () => void;
+};
+
+export interface CodeByteEditorProps {
+  text: string;
+  language: languageOption;
+  hideCopyButton: boolean;
+  isIFrame?: boolean;
+  snippetsBaseUrl?: string /* TODO in DISC-353: Determine best way to host and include snippets endpoint for both staging and production in both the monolith and next.js repo. */;
+  on?: CodebytesChangeHandlerMap;
+}