@pie-lib/config-ui 11.30.3-next.2 → 11.30.3-next.205

package/src/choice-configuration/index.jsx

@@ -1,117 +1,176 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
-import TextField from '@material-ui/core/TextField';
-import ActionDelete from '@material-ui/icons/Delete';
-import ArrowRight from '@material-ui/icons/SubdirectoryArrowRight';
-import IconButton from '@material-ui/core/IconButton';
-import classNames from 'classnames';
+import { styled } from '@mui/material/styles';
+import TextField from '@mui/material/TextField';
+import ActionDelete from '@mui/icons-material/Delete';
+import ArrowRight from '@mui/icons-material/SubdirectoryArrowRight';
+import IconButton from '@mui/material/IconButton';
 import { InputContainer } from '@pie-lib/render-ui';
-import EditableHtml from '@pie-lib/editable-html';
+// import EditableHtml from '@pie-lib/editable-html-tip-tap';
 import { InputCheckbox, InputRadio } from '../inputs';
 import FeedbackMenu from './feedback-menu';
 
-const EditableHtmlContainer = withStyles((theme) => ({
-  labelContainer: {},
-  editorHolder: {
-    marginTop: theme.spacing.unit * 2,
-  },
-}))(
-  ({
-    label,
-    classes,
-    onChange,
-    value,
-    className,
-    imageSupport,
-    disableImageAlignmentButtons,
-    disabled,
-    spellCheck,
-    nonEmpty,
-    pluginOpts,
-    toolbarOpts,
-    error,
-    maxImageWidth,
-    maxImageHeight,
-    uploadSoundSupport,
-    mathMlOptions = {},
-  }) => {
-    const names = classNames(classes.labelContainer, className);
+// - mathquill error window not defined
+let EditableHtml;
+if (typeof window !== 'undefined') {
+  EditableHtml = require('@pie-lib/editable-html-tip-tap')['default'];
+}
 
-    return (
-      <InputContainer label={label} className={names}>
-        <div className={classes.editorHolder}>
-          <EditableHtml
-            markup={value || ''}
-            disabled={disabled}
-            spellCheck={spellCheck}
-            nonEmpty={nonEmpty}
-            onChange={onChange}
-            imageSupport={imageSupport}
-            disableImageAlignmentButtons={disableImageAlignmentButtons}
-            className={classes.editor}
-            pluginProps={pluginOpts || {}}
-            toolbarOpts={toolbarOpts}
-            error={error}
-            maxImageWidth={maxImageWidth}
-            maxImageHeight={maxImageHeight}
-            uploadSoundSupport={uploadSoundSupport}
-            languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
-            mathMlOptions={mathMlOptions}
-          />
-        </div>
-      </InputContainer>
-    );
-  },
-);
-
-const Feedback = withStyles((theme) => ({
-  text: {
-    width: '100%',
-  },
-  feedbackContainer: {
-    position: 'relative',
-  },
-  arrowIcon: {
-    fill: theme.palette.grey[400],
-    left: -56,
-    position: 'absolute',
-    top: 20,
-  },
-}))(({ value, onChange, type, correct, classes, defaults, toolbarOpts, mathMlOptions = {} }) => {
+const StyledEditorHolder = styled('div')(({ theme }) => ({
+  marginTop: theme.spacing(2),
+}));
+
+const EditableHtmlContainer = ({
+  label,
+  onChange,
+  value,
+  className,
+  imageSupport,
+  disableImageAlignmentButtons,
+  disabled,
+  spellCheck,
+  nonEmpty,
+  pluginOpts,
+  toolbarOpts,
+  error,
+  maxImageWidth,
+  maxImageHeight,
+  uploadSoundSupport,
+  mathMlOptions = {},
+}) => {
+  return (
+    <InputContainer label={label} className={className}>
+      <StyledEditorHolder>
+        <EditableHtml
+          markup={value || ''}
+          disabled={disabled}
+          spellCheck={spellCheck}
+          nonEmpty={nonEmpty}
+          onChange={onChange}
+          imageSupport={imageSupport}
+          disableImageAlignmentButtons={disableImageAlignmentButtons}
+          pluginProps={pluginOpts || {}}
+          toolbarOpts={toolbarOpts}
+          error={error}
+          maxImageWidth={maxImageWidth}
+          maxImageHeight={maxImageHeight}
+          uploadSoundSupport={uploadSoundSupport}
+          languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
+          mathMlOptions={mathMlOptions}
+        />
+      </StyledEditorHolder>
+    </InputContainer>
+  );
+};
+
+const StyledFeedbackContainer = styled('div')(() => ({
+  position: 'relative',
+}));
+
+const StyledArrowIcon = styled(ArrowRight)(({ theme }) => ({
+  fill: theme.palette.grey[400],
+  left: -56,
+  position: 'absolute',
+  top: 40,
+}));
+
+const StyledTextField = styled(TextField)(({ theme }) => ({
+  width: '100%',
+  marginTop: theme.spacing(2),
+}));
+
+const StyledEditableHtmlContainer = styled(EditableHtmlContainer)(({ theme }) => ({
+  width: '100%',
+  marginTop: theme.spacing(2),
+}));
+
+const Feedback = ({ value, onChange, type, correct, defaults, toolbarOpts, mathMlOptions = {} }) => {
   if (!type || type === 'none') {
     return null;
   } else if (type === 'default') {
     return (
-      <div className={classes.feedbackContainer}>
-        <ArrowRight className={classes.arrowIcon} />
-        <TextField
-          className={classes.text}
+      <StyledFeedbackContainer>
+        <StyledArrowIcon />
+        <StyledTextField
           label="Feedback Text"
           value={correct ? defaults.correct : defaults.incorrect}
+          variant="standard"
         />
-      </div>
+      </StyledFeedbackContainer>
     );
   } else {
     return (
-      <div className={classes.feedbackContainer}>
-        <ArrowRight className={classes.arrowIcon} />
-        <EditableHtmlContainer
-          className={classes.text}
+      <StyledFeedbackContainer>
+        <StyledArrowIcon />
+        <StyledEditableHtmlContainer
           label="Feedback Text"
           value={value}
           onChange={onChange}
           toolbarOpts={toolbarOpts}
           mathMlOptions={mathMlOptions}
         />
-      </div>
+      </StyledFeedbackContainer>
     );
   }
-});
+};
+
+const StyledIndex = styled('span')(({ theme }) => ({
+  paddingRight: theme.spacing(1),
+  paddingTop: theme.spacing(3),
+}));
+
+const StyledTopRow = styled('div')(() => ({
+  display: 'flex',
+  alignItems: 'center',
+}));
+
+const StyledToggle = styled('div')(({ theme }) => ({
+  flex: '0 1 auto',
+  paddingTop: theme.spacing(0.5),
+  paddingBottom: 0,
+  marginRight: 0,
+  marginLeft: theme.spacing(1),
+}));
+
+const StyledFeedback = styled('div')(({ theme }) => ({
+  flex: '0 1 auto',
+  paddingTop: theme.spacing(2),
+  paddingLeft: 0,
+  marginLeft: 0,
+  marginRight: theme.spacing(1),
+}));
+
+const StyledFeedbackIcon = styled('div')(() => ({
+  margin: 0,
+  width: 'inherit',
+}));
+
+const StyledDeleteIcon = styled('div')(() => ({
+  margin: 0,
+  width: 'inherit',
+}));
+
+const StyledDelete = styled('div')(({ theme }) => ({
+  flex: '0 1 auto',
+  paddingTop: theme.spacing(2),
+  paddingLeft: 0,
+  marginLeft: 0,
+}));
+
+const StyledMiddleColumn = styled('div')(({ theme }) => ({
+  display: 'flex',
+  flex: 1,
+  flexDirection: 'column',
+  marginRight: theme.spacing(1),
+}));
+
+const StyledErrorText = styled('div')(({ theme }) => ({
+  fontSize: theme.typography.fontSize - 2,
+  color: theme.palette.error.main,
+}));
 
 export class ChoiceConfiguration extends React.Component {
   static propTypes = {
-    classes: PropTypes.object.isRequired,
     noLabels: PropTypes.bool,
     useLetterOrdering: PropTypes.bool,
     className: PropTypes.string,
@@ -201,7 +260,6 @@ export class ChoiceConfiguration extends React.Component {
   render() {
     const {
       data,
-      classes,
       mode,
       onDelete,
       defaultFeedback,
@@ -227,139 +285,79 @@ export class ChoiceConfiguration extends React.Component {
     } = this.props;
 
     const InputToggle = mode === 'checkbox' ? InputCheckbox : InputRadio;
-    const names = classNames(classes.choiceConfiguration, className);
 
     return (
-      <div className={names}>
-        <div className={classes.topRow}>
-          {index > 0 && (
-            <span className={classes.index} type="title">
-              {useLetterOrdering ? String.fromCharCode(96 + index).toUpperCase() : index}
-            </span>
-          )}
+      <StyledTopRow>
+        {index > 0 && (
+          <StyledIndex type="title">
+            {useLetterOrdering ? String.fromCharCode(96 + index).toUpperCase() : index}
+          </StyledIndex>
+        )}
 
+        <StyledToggle>
           <InputToggle
-            className={classes.toggle}
             onChange={this.onCheckedChange}
             label={!noLabels ? 'Correct' : ''}
             checked={!!data.correct}
             error={noCorrectAnswerError}
           />
+        </StyledToggle>
+
+        <StyledMiddleColumn>
+          <EditableHtmlContainer
+            label={!noLabels ? 'Label' : ''}
+            value={data.label}
+            onChange={this.onLabelChange}
+            imageSupport={imageSupport}
+            disableImageAlignmentButtons={disableImageAlignmentButtons}
+            disabled={disabled}
+            spellCheck={spellCheck}
+            nonEmpty={nonEmpty}
+            pluginOpts={pluginOpts}
+            toolbarOpts={toolbarOpts}
+            error={error}
+            uploadSoundSupport={uploadSoundSupport}
+            mathMlOptions={mathMlOptions}
+            maxImageWidth={maxImageWidth}
+            maxImageHeight={maxImageHeight}
+          />
+          {error && <StyledErrorText>{error}</StyledErrorText>}
 
-          <div className={classes.middleColumn}>
-            <EditableHtmlContainer
-              className={classes.input}
-              label={!noLabels ? 'Label' : ''}
-              value={data.label}
-              onChange={this.onLabelChange}
-              imageSupport={imageSupport}
-              disableImageAlignmentButtons={disableImageAlignmentButtons}
-              disabled={disabled}
-              spellCheck={spellCheck}
-              nonEmpty={nonEmpty}
-              pluginOpts={pluginOpts}
+          {allowFeedBack && (
+            <Feedback
+              {...data.feedback}
+              correct={data.correct}
+              defaults={defaultFeedback}
+              onChange={this.onFeedbackValueChange}
               toolbarOpts={toolbarOpts}
-              error={error}
-              uploadSoundSupport={uploadSoundSupport}
-              mathMlOptions={mathMlOptions}
-              maxImageWidth={maxImageWidth}
-              maxImageHeight={maxImageHeight}
             />
-            {error && <div className={classes.errorText}>{error}</div>}
-
-            {allowFeedBack && (
-              <Feedback
-                {...data.feedback}
-                correct={data.correct}
-                defaults={defaultFeedback}
-                onChange={this.onFeedbackValueChange}
-                toolbarOpts={toolbarOpts}
-              />
-            )}
-          </div>
+          )}
+        </StyledMiddleColumn>
 
-          {allowFeedBack && (
-            <InputContainer className={classes.feedback} label={!noLabels ? 'Feedback' : ''}>
-              <FeedbackMenu
-                onChange={this.onFeedbackTypeChange}
-                value={data.feedback}
-                classes={{
-                  icon: classes.feedbackIcon,
-                }}
-              />
+        {allowFeedBack && (
+          <StyledFeedback>
+            <InputContainer label={!noLabels ? 'Feedback' : ''}>
+              <StyledFeedbackIcon>
+                <FeedbackMenu onChange={this.onFeedbackTypeChange} value={data.feedback} />
+              </StyledFeedbackIcon>
             </InputContainer>
-          )}
+          </StyledFeedback>
+        )}
 
-          {allowDelete && (
-            <InputContainer className={classes.delete} label={!noLabels ? 'Delete' : ''}>
-              <IconButton aria-label="delete" className={classes.deleteIcon} onClick={onDelete}>
-                <ActionDelete />
-              </IconButton>
+        {allowDelete && (
+          <StyledDelete>
+            <InputContainer label={!noLabels ? 'Delete' : ''}>
+              <StyledDeleteIcon>
+                <IconButton aria-label="delete" onClick={onDelete} size="large">
+                  <ActionDelete />
+                </IconButton>
+              </StyledDeleteIcon>
             </InputContainer>
-          )}
-        </div>
-      </div>
+          </StyledDelete>
+        )}
+      </StyledTopRow>
     );
   }
 }
 
-const styles = (theme) => ({
-  index: {
-    paddingRight: theme.spacing.unit,
-    paddingTop: theme.spacing.unit * 3.5,
-  },
-  choiceConfiguration: {},
-  topRow: {
-    display: 'flex',
-  },
-  value: {
-    flex: '0.5',
-    paddingRight: theme.spacing.unit,
-  },
-  editorHolder: {
-    marginTop: theme.spacing.unit * 2,
-  },
-  toggle: {
-    flex: '0 1 auto',
-    paddingTop: theme.spacing.unit / 2,
-    paddingBottom: 0,
-    marginRight: 0,
-    marginLeft: theme.spacing.unit,
-  },
-  feedback: {
-    flex: '0 1 auto',
-    paddingTop: theme.spacing.unit * 2,
-    paddingLeft: 0,
-    marginLeft: 0,
-    marginRight: theme.spacing.unit,
-  },
-  feedbackIcon: {
-    margin: 0,
-    width: 'inherit',
-  },
-  deleteIcon: {
-    margin: 0,
-    width: 'inherit',
-  },
-  delete: {
-    flex: '0 1 auto',
-    paddingTop: theme.spacing.unit * 2,
-    paddingLeft: 0,
-    marginLeft: 0,
-  },
-  middleColumn: {
-    display: 'flex',
-    flex: 1,
-    flexDirection: 'column',
-    marginRight: theme.spacing.unit,
-  },
-  input: {
-    marginRight: 0,
-  },
-  errorText: {
-    fontSize: theme.typography.fontSize - 2,
-    color: theme.palette.error.main,
-  },
-});
-
-export default withStyles(styles)(ChoiceConfiguration);
+export default ChoiceConfiguration;

package/src/feedback-config/__tests__/feedback-config.test.jsx

@@ -1,70 +1,140 @@
-import React, { PropTypes } from 'react';
-import Enzyme, { shallow, mount } from 'enzyme';
-import { FeedbackConfig } from '../index';
-import FeedbackSelector from '../feedback-selector';
-import Adapter from 'enzyme-adapter-react-16';
+import React from 'react';
+import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { FeedbackConfig, buildDefaults } from '../index';
 
-Enzyme.configure({ adapter: new Adapter() });
+// Mock FeedbackSelector to simplify testing
+jest.mock('../feedback-selector', () => {
+  return function FeedbackSelector({ label, feedback, onChange }) {
+    return (
+      <div data-testid="feedback-selector">
+        <label>{label}</label>
+        <select
+          aria-label={label}
+          value={feedback.type}
+          onChange={(e) => onChange({ ...feedback, type: e.target.value })}
+        >
+          <option value="default">Default</option>
+          <option value="custom">Custom</option>
+          <option value="none">None</option>
+        </select>
+      </div>
+    );
+  };
+});
 
 describe('FeedbackConfig', () => {
-  describe('render', () => {
-    let component, selectors;
-    let feedback = {
-      correctFeedback: undefined,
-      correctFeedbackType: 'default',
-      incorrectFeedback: undefined,
-      incorrectFeedbackType: 'default',
-    };
-
-    let defaults = {
-      correct: 'Correct',
-      incorrect: 'Incorrect',
-      partial: 'Nearly',
-    };
-
-    describe('Feedback Config Component', () => {
-      it('should exist', () => {
-        component = shallow(
-          <FeedbackConfig feedback={feedback} defaults={defaults} onChange={jest.fn()} classes={{}} />,
-        );
-
-        selectors = component.find(FeedbackSelector);
-
-        expect(selectors.length).toEqual(3);
+  const onChange = jest.fn();
+
+  beforeEach(() => {
+    onChange.mockClear();
+  });
+
+  describe('rendering', () => {
+    it('renders with default feedback types', () => {
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig feedback={feedback} onChange={onChange} />);
+
+      expect(screen.getByText('Feedback')).toBeInTheDocument();
+      expect(screen.getByText('If correct, show')).toBeInTheDocument();
+      expect(screen.getByText('If partially correct, show')).toBeInTheDocument();
+      expect(screen.getByText('If incorrect, show')).toBeInTheDocument();
+    });
+
+    it('renders all three feedback selectors by default', () => {
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig feedback={feedback} onChange={onChange} />);
+
+      const selectors = screen.getAllByTestId('feedback-selector');
+      expect(selectors).toHaveLength(3);
+    });
+
+    it('does not render partial feedback selector when allowPartial is false', () => {
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig allowPartial={false} feedback={feedback} onChange={onChange} />);
+
+      expect(screen.getByText('If correct, show')).toBeInTheDocument();
+      expect(screen.queryByText('If partially correct, show')).not.toBeInTheDocument();
+      expect(screen.getByText('If incorrect, show')).toBeInTheDocument();
+
+      const selectors = screen.getAllByTestId('feedback-selector');
+      expect(selectors).toHaveLength(2);
+    });
+  });
+
+  describe('user interactions', () => {
+    it('calls onChange when correct feedback type changes', async () => {
+      const user = userEvent.setup();
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig feedback={feedback} onChange={onChange} />);
+
+      const correctSelect = screen.getByLabelText('If correct, show');
+      await user.selectOptions(correctSelect, 'custom');
+
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          correct: expect.objectContaining({ type: 'custom' }),
+        }),
+      );
+    });
+
+    it('calls onChange when incorrect feedback type changes', async () => {
+      const user = userEvent.setup();
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig feedback={feedback} onChange={onChange} />);
+
+      const incorrectSelect = screen.getByLabelText('If incorrect, show');
+      await user.selectOptions(incorrectSelect, 'none');
+
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          incorrect: expect.objectContaining({ type: 'none' }),
+        }),
+      );
+    });
+
+    it('calls onChange when partial feedback type changes', async () => {
+      const user = userEvent.setup();
+      const feedback = buildDefaults();
+
+      render(<FeedbackConfig feedback={feedback} onChange={onChange} />);
+
+      const partialSelect = screen.getByLabelText('If partially correct, show');
+      await user.selectOptions(partialSelect, 'custom');
+
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          partial: expect.objectContaining({ type: 'custom' }),
+        }),
+      );
+    });
+  });
+
+  describe('buildDefaults helper', () => {
+    it('returns default feedback configuration', () => {
+      const defaults = buildDefaults();
+
+      expect(defaults).toEqual({
+        correct: { type: 'default', default: 'Correct' },
+        incorrect: { type: 'default', default: 'Incorrect' },
+        partial: { type: 'default', default: 'Nearly' },
       });
+    });
 
-      describe('props', () => {
-        it('should not render optionally correct if optional is not needed', () => {
-          component = shallow(
-            <FeedbackConfig
-              allowPartial={false}
-              feedback={feedback}
-              defaults={defaults}
-              onChange={jest.fn()}
-              classes={{}}
-            />,
-          );
-
-          selectors = component.find(FeedbackSelector);
-
-          expect(selectors.length).toEqual(2);
-        });
+    it('merges custom values with defaults', () => {
+      const defaults = buildDefaults({
+        correct: { type: 'custom', custom: 'Great job!' },
       });
 
-      describe('snapshot', () => {
-        it('matches the snapshot', () => {
-          component = shallow(
-            <FeedbackConfig
-              allowPartial={false}
-              feedback={feedback}
-              defaults={defaults}
-              onChange={jest.fn()}
-              classes={{}}
-            />,
-          );
-
-          expect(component).toMatchSnapshot();
-        });
+      expect(defaults).toEqual({
+        correct: { type: 'custom', default: 'Correct', custom: 'Great job!' },
+        incorrect: { type: 'default', default: 'Incorrect' },
+        partial: { type: 'default', default: 'Nearly' },
       });
     });
   });