Skip to content

Commit a80c35b

Browse files
committed
EditorPage: Preview only desktop, but note phone and tablet checking using preview tab
1 parent dbd968e commit a80c35b

File tree

2 files changed

+20
-30
lines changed

2 files changed

+20
-30
lines changed

packages/perseus-editor/src/editor-page.tsx

+9-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {components, ApiOptions, ClassNames} from "@khanacademy/perseus";
22
import {View} from "@khanacademy/wonder-blocks-core";
33
import {Checkbox} from "@khanacademy/wonder-blocks-form";
44
import {spacing} from "@khanacademy/wonder-blocks-tokens";
5+
import {LabelSmall} from "@khanacademy/wonder-blocks-typography";
56
import * as React from "react";
67
import invariant from "tiny-invariant";
78
import _ from "underscore";
@@ -194,19 +195,21 @@ class EditorPage extends React.Component<Props, State> {
194195
>
195196
{this.props.developerMode && (
196197
<Checkbox
198+
style={{width: 360, marginRight: 30}}
197199
label="Developer JSON Mode"
198200
checked={this.props.jsonMode}
199201
onChange={this.toggleJsonMode}
200202
/>
201203
)}
202204

203205
{!this.props.jsonMode && (
204-
<ViewportResizer
205-
deviceType={this.props.previewDevice}
206-
onViewportSizeChanged={
207-
this.props.onPreviewDeviceChange
208-
}
209-
/>
206+
<View style={{paddingLeft: 15}}>
207+
<LabelSmall>
208+
<em>Note:</em> Please ensure this exercise looks
209+
correct on a phone and tablet by using the
210+
"Preview" tab.
211+
</LabelSmall>
212+
</View>
210213
)}
211214

212215
{!this.props.jsonMode && (
@@ -247,7 +250,6 @@ class EditorPage extends React.Component<Props, State> {
247250
onChange={this.handleChange}
248251
wasAnswered={this.state.wasAnswered}
249252
gradeMessage={this.state.gradeMessage}
250-
deviceType={this.props.previewDevice}
251253
apiOptions={deviceBasedApiOptions}
252254
previewURL={this.props.previewURL}
253255
/>

packages/perseus-editor/src/item-editor.tsx

+11-23
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import type {
1111
APIOptions,
1212
ImageUploader,
1313
ChangeHandler,
14-
DeviceType,
1514
PerseusRenderer,
1615
} from "@khanacademy/perseus";
1716

1817
const ITEM_DATA_VERSION = itemDataVersion;
1918

2019
type Props = {
2120
apiOptions?: APIOptions;
22-
deviceType?: DeviceType;
2321
gradeMessage?: string;
2422
imageUploader?: ImageUploader;
2523
wasAnswered?: boolean;
@@ -107,28 +105,18 @@ class ItemEditor extends React.Component<Props> {
107105
</div>
108106

109107
<div className="perseus-editor-right-cell">
110-
<div id="problemarea">
111-
<DeviceFramer
112-
deviceType={this.props.deviceType}
113-
nochrome={true}
114-
>
115-
<ContentRenderer
116-
apiOptions={this.props.apiOptions}
117-
question={this.props.question}
118-
linterContext={{
119-
contentType: "exercise",
120-
highlightLint: true,
121-
paths: [],
122-
stack: [],
123-
}}
124-
/>
125-
</DeviceFramer>
126-
<div
127-
id="hintsarea"
128-
className="hintsarea"
129-
style={{display: "none"}}
108+
<DeviceFramer deviceType={"desktop"} nochrome={true}>
109+
<ContentRenderer
110+
apiOptions={this.props.apiOptions}
111+
question={this.props.question}
112+
linterContext={{
113+
contentType: "exercise",
114+
highlightLint: true,
115+
paths: [],
116+
stack: [],
117+
}}
130118
/>
131-
</div>
119+
</DeviceFramer>
132120
</div>
133121
</div>
134122

0 commit comments

Comments
 (0)