@codecademy/codebytes 0.3.1-alpha.2eff1d.0 → 0.3.1-alpha.8f8ccd.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.2eff1d.0](https://github.com/Codecademy/client-modules/compare/@codecademy/codebytes@0.3.0...@codecademy/codebytes@0.3.1-alpha.2eff1d.0) (2022-01-13)
+### [0.3.1-alpha.8f8ccd.0](https://github.com/Codecademy/client-modules/compare/@codecademy/codebytes@0.3.0...@codecademy/codebytes@0.3.1-alpha.8f8ccd.0) (2022-01-21)
 
 **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.2eff1d.0",
+  "version": "0.3.1-alpha.8f8ccd.0",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "sideEffects": [
     "**/*.css",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ceb6728e18a6fd6920b1b3fa8077e92d2b2d26d"
+  "gitHead": "41f8ca85bfff777a9f60105a63055eadb69d8cae"
 }

package/src/api.ts

@@ -1,4 +1,4 @@
-import type { languageOption } from './consts';
+import type { LanguageOption } from './consts';
 
 interface Response {
   stderr: string;
@@ -7,7 +7,7 @@ interface Response {
 }
 
 interface PostSnippetData {
-  language: languageOption;
+  language: LanguageOption;
   code: string;
 }
 

package/src/consts.ts

@@ -1,6 +1,6 @@
 // key = language param to send to snippets service
 // val = label in language selection drop down
-export const languageOptions = {
+export const LanguageOptions = {
   '': 'Select a language',
   cpp: 'C++',
   csharp: 'C#',
@@ -12,11 +12,11 @@ export const languageOptions = {
   scheme: 'Scheme',
 };
 
-export type languageOption = keyof typeof languageOptions;
+export type LanguageOption = keyof typeof LanguageOptions;
 
-export const validLanguages = Object.keys(languageOptions).filter(
+export const validLanguages = Object.keys(LanguageOptions).filter(
   (option) => !!option
-) as languageOption[];
+) as LanguageOption[];
 
 const cpp = `#include <iostream>
 int main() {
@@ -52,7 +52,7 @@ const scheme = `(begin
   (display "Hello world!")
   (newline))`;
 
-export const helloWorld: { [key in languageOption]?: string } = {
+export const helloWorld = {
   cpp,
   csharp,
   golang,
@@ -61,4 +61,4 @@ export const helloWorld: { [key in languageOption]?: string } = {
   python,
   ruby,
   scheme,
-};
+} as const;

package/src/editor.tsx

@@ -13,7 +13,6 @@ 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,9 +38,8 @@ type EditorProps = {
   hideCopyButton: boolean;
   language: languageOption;
   text: string;
-
   onChange: (text: string) => void;
-  on?: CodebytesChangeHandlerMap;
+  onCopy?: (text: string, language: string) => void;
   snippetsBaseUrl?: string;
 };
 
@@ -49,7 +47,7 @@ export const Editor: React.FC<EditorProps> = ({
   language,
   text,
   hideCopyButton,
-  on,
+  onCopy,
   onChange,
   snippetsBaseUrl,
 }) => {
@@ -62,7 +60,7 @@ export const Editor: React.FC<EditorProps> = ({
         .writeText(text)
         // eslint-disable-next-line no-console
         .catch(() => console.error('Failed to copy'));
-      on?.copy?.(text, language);
+      onCopy?.(text, language);
       setIsCodeByteCopied(true);
     }
   };
@@ -82,7 +80,6 @@ export const Editor: React.FC<EditorProps> = ({
     };
     setStatus('waiting');
     setOutput('');
-    on?.run?.();
 
     try {
       const response = await postSnippet(data, snippetsBaseUrl);

package/src/index.tsx

@@ -5,10 +5,22 @@ import { StyleProps } from '@codecademy/variance';
 import styled from '@emotion/styled';
 import React, { useState } from 'react';
 
-import { helloWorld, languageOption } from './consts';
+import { helloWorld, LanguageOption } from './consts';
 import { Editor } from './editor';
 import { LanguageSelection } from './languageSelection';
-import { CodeByteEditorProps } from './types';
+
+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;
+}
 
 const editorStates = states({
   isIFrame: { height: '100vh' },
@@ -37,11 +49,12 @@ 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);
+  const [language, setLanguage] = useState<LanguageOption>(initialLanguage);
   return (
     <EditorContainer bg="black" as="main" isIFrame={isIFrame}>
       <Box borderBottom={1} borderColor="gray-900" py={4} pl={8}>
@@ -52,7 +65,6 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
           target="_blank"
           rel="noreferrer"
           aria-label="visit codecademy.com"
-          onClick={() => on?.logoClick?.()}
         />
       </Box>
       {language ? (
@@ -62,18 +74,18 @@ export const CodeByteEditor: React.FC<CodeByteEditorProps> = ({
           hideCopyButton={hideCopyButton}
           onChange={(newText: string) => {
             setText(newText);
-            on?.edit?.(newText, language);
+            onEdit?.(newText, language);
           }}
-          on={on}
           snippetsBaseUrl={snippetsBaseUrl}
         />
       ) : (
         <LanguageSelection
           onChange={(newLanguage) => {
-            const newText: string = text || helloWorld[newLanguage] || '';
+            const newText: string =
+              text || (newLanguage ? helloWorld[newLanguage] : '');
             setLanguage(newLanguage);
             setText(newText);
-            on?.languageChange?.(newText, newLanguage);
+            onLanguageChange?.(newText, newLanguage);
           }}
         />
       )}

package/src/languageSelection.tsx

@@ -1,45 +1,26 @@
-import { Select } from '@codecademy/gamut';
-import { Background } from '@codecademy/gamut-styles';
-import styled from '@emotion/styled';
+import { Select, Text } from '@codecademy/gamut';
+import { ColorMode } from '@codecademy/gamut-styles';
 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};
-    }
-  }
-`;
+import type { LanguageOption } from './consts';
+import { LanguageOptions } from './consts';
 
 export type LanguageSelectionProps = {
-  onChange: (newLanguage: languageOption) => void;
+  onChange: (newLanguage: LanguageOption) => void;
 };
 
 export const LanguageSelection: React.FC<LanguageSelectionProps> = ({
   onChange,
 }) => {
   return (
-    <Background bg="black" flex={1} px={16} pt={48}>
-      Which language do you want to code in?
-      <StyledSelect
+    <ColorMode mode="dark" flex={1} px={16} pt={48}>
+      <Text mb={16}>Which language do you want to code in?</Text>
+      <Select
         id="language-select"
         aria-label="Select a language"
-        options={languageOptions}
-        onChange={(e) => onChange(e.target.value as languageOption)}
+        options={LanguageOptions}
+        onChange={(e) => onChange(e.target.value as LanguageOption)}
       />
-    </Background>
+    </ColorMode>
   );
 };

package/src/types.ts

@@ -1,20 +0,0 @@
-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;
-}