Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@
"@pie-lib/test-utils": "2.0.0",
"@pie-lib/text-select": "3.0.0",
"@pie-lib/tools": "2.0.0",
"@pie-lib/translator": "4.0.0",
"@pie-framework/mathquill": "1.2.1-beta.1"
"@pie-lib/translator": "4.0.0"
},
"browserslist": [
">0.5%",
Expand Down
12 changes: 2 additions & 10 deletions packages/math-templated/src/__tests__/main.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ import { render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import Main from '../main';

const Mathquill = require('@pie-framework/mathquill');

jest.mock('@pie-framework/mathquill', () => ({
StaticMath: jest.fn().mockReturnValue({
latex: jest.fn(),
}),
registerEmbed: jest.fn(),
getInterface: jest.fn().mockReturnThis(),
}));

jest.mock('@pie-lib/render-ui', () => ({
color: {
text: () => '#000',
Expand Down Expand Up @@ -46,6 +36,8 @@ jest.mock('@pie-lib/math-input', () => ({
},
HorizontalKeypad: (props) => <div data-testid="horizontal-keypad" {...props} />,
updateSpans: jest.fn(),
registerEmbed: jest.fn(),
applyStaticMath: jest.fn(),
}));

jest.mock('@pie-lib/math-rendering', () => ({
Expand Down
12 changes: 3 additions & 9 deletions packages/math-templated/src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ import PropTypes from 'prop-types';
import { isEmpty, isEqual } from 'lodash-es';
import { styled } from '@mui/material/styles';
import Tooltip from '@mui/material/Tooltip';
import { mq, HorizontalKeypad, updateSpans } from '@pie-lib/math-input';
import { mq, HorizontalKeypad, updateSpans, registerEmbed, applyStaticMath } from '@pie-lib/math-input';
import { color, Collapsible, Readable, hasText, hasMedia, PreviewPrompt, UiLayout } from '@pie-lib/render-ui';
import { renderMath } from '@pie-lib/math-rendering';
import MathQuill from '@pie-framework/mathquill';
import { Customizable } from '@pie-lib/mask-markup';
import CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';
import ReactDOM from 'react-dom';
Expand Down Expand Up @@ -366,10 +365,8 @@ export class Main extends React.Component {

UNSAFE_componentWillMount() {
if (typeof window !== 'undefined') {
let MQ = MathQuill.getInterface(3);

if (!registered) {
MQ.registerEmbed('answerBlock', (data) => ({
registerEmbed('answerBlock', (data) => ({
htmlString: `<div class="block-container">
<div class="block-response" id="${data}Index">R</div>
<div class="block-math">
Expand All @@ -396,18 +393,15 @@ export class Main extends React.Component {
const indexEl = this.root.querySelector(`#${answerId}Index`);

if (el) {
let MQ = MathQuill.getInterface(3);
const answer = answers[answerId];

el.textContent = (answer && answer.value) || '';
applyStaticMath(el, (answer && answer.value) || '');

if (model.view) {
el.parentElement.parentElement.classList.remove('correct');
el.parentElement.parentElement.classList.remove('incorrect');
}

MQ.StaticMath(el);

indexEl.textContent = 'R';
}
});
Expand Down
Loading