@khanacademy/perseus 6.5.0 → 6.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/es/index.css +24 -21
- package/dist/es/index.js +7 -16
- package/dist/es/index.js.map +1 -1
- package/dist/index.css +24 -21
- package/dist/index.d.ts +1 -1
- package/dist/index.js +7 -18
- package/dist/index.js.flow +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interaction-tracker.d.ts +4 -4
- package/dist/interaction-tracker.js.flow +6 -4
- package/dist/perseus-api.d.ts +5 -1
- package/dist/perseus-api.js.flow +10 -1
- package/dist/server-item-renderer.js.flow +4 -4
- package/dist/types.d.ts +5 -1
- package/dist/types.js.flow +8 -1
- package/dist/widgets/radio/choice.js.flow +1 -4
- package/dist/widgets/sequence.d.ts +16 -51
- package/dist/widgets/sequence.js.flow +16 -63
- package/package.json +2 -2
- package/src/index.ts +1 -0
- package/src/interaction-tracker.ts +6 -5
- package/src/styles/widgets/passage.less +37 -28
- package/src/types.ts +22 -6
- package/src/widgets/__stories__/passage-ref.stories.tsx +18 -7
- package/src/widgets/__stories__/passage.stories.tsx +16 -3
- package/src/widgets/__tests__/__snapshots__/passage-ref.test.ts.snap +6 -6
- package/src/widgets/__tests__/__snapshots__/passage.test.tsx.snap +12 -12
- package/src/widgets/passage.tsx +13 -2
- package/src/widgets/sequence.tsx +21 -24
- package/tsconfig-build.tsbuildinfo +1 -1
|
@@ -17,7 +17,7 @@ exports[`passage-ref widget should render with invalid reference 1`] = `
|
|
|
17
17
|
>
|
|
18
18
|
<div>
|
|
19
19
|
<div
|
|
20
|
-
|
|
20
|
+
id="perseus-widget-passage-container-"
|
|
21
21
|
>
|
|
22
22
|
<div
|
|
23
23
|
class="perseus-widget-passage-instructions"
|
|
@@ -26,7 +26,7 @@ exports[`passage-ref widget should render with invalid reference 1`] = `
|
|
|
26
26
|
|
|
27
27
|
</div>
|
|
28
28
|
<div
|
|
29
|
-
|
|
29
|
+
id="perseus-widget-passage-"
|
|
30
30
|
>
|
|
31
31
|
<h3
|
|
32
32
|
class="perseus-sr-only"
|
|
@@ -158,7 +158,7 @@ exports[`passage-ref widget should render with multi-line reference 1`] = `
|
|
|
158
158
|
>
|
|
159
159
|
<div>
|
|
160
160
|
<div
|
|
161
|
-
|
|
161
|
+
id="perseus-widget-passage-container-"
|
|
162
162
|
>
|
|
163
163
|
<div
|
|
164
164
|
class="perseus-widget-passage-instructions"
|
|
@@ -167,7 +167,7 @@ exports[`passage-ref widget should render with multi-line reference 1`] = `
|
|
|
167
167
|
|
|
168
168
|
</div>
|
|
169
169
|
<div
|
|
170
|
-
|
|
170
|
+
id="perseus-widget-passage-"
|
|
171
171
|
>
|
|
172
172
|
<h3
|
|
173
173
|
class="perseus-sr-only"
|
|
@@ -304,7 +304,7 @@ exports[`passage-ref widget should render with single-line reference 1`] = `
|
|
|
304
304
|
>
|
|
305
305
|
<div>
|
|
306
306
|
<div
|
|
307
|
-
|
|
307
|
+
id="perseus-widget-passage-container-"
|
|
308
308
|
>
|
|
309
309
|
<div
|
|
310
310
|
class="perseus-widget-passage-instructions"
|
|
@@ -313,7 +313,7 @@ exports[`passage-ref widget should render with single-line reference 1`] = `
|
|
|
313
313
|
|
|
314
314
|
</div>
|
|
315
315
|
<div
|
|
316
|
-
|
|
316
|
+
id="perseus-widget-passage-"
|
|
317
317
|
>
|
|
318
318
|
<h3
|
|
319
319
|
class="perseus-sr-only"
|
|
@@ -97,7 +97,7 @@ exports[`passage widget should snapshot multiple passages (mobile: false) 1`] =
|
|
|
97
97
|
>
|
|
98
98
|
<div>
|
|
99
99
|
<div
|
|
100
|
-
|
|
100
|
+
id="perseus-widget-passage-container-passage-1"
|
|
101
101
|
>
|
|
102
102
|
<div
|
|
103
103
|
class="perseus-widget-passage-instructions"
|
|
@@ -136,7 +136,7 @@ exports[`passage widget should snapshot multiple passages (mobile: false) 1`] =
|
|
|
136
136
|
</div>
|
|
137
137
|
</div>
|
|
138
138
|
<div
|
|
139
|
-
|
|
139
|
+
id="perseus-widget-passage-passage-1"
|
|
140
140
|
>
|
|
141
141
|
<h3
|
|
142
142
|
class="passage-title"
|
|
@@ -590,7 +590,7 @@ exports[`passage widget should snapshot multiple passages (mobile: false) 1`] =
|
|
|
590
590
|
>
|
|
591
591
|
<div>
|
|
592
592
|
<div
|
|
593
|
-
|
|
593
|
+
id="perseus-widget-passage-container-passage-2"
|
|
594
594
|
>
|
|
595
595
|
<div
|
|
596
596
|
class="perseus-widget-passage-instructions"
|
|
@@ -626,7 +626,7 @@ exports[`passage widget should snapshot multiple passages (mobile: false) 1`] =
|
|
|
626
626
|
</div>
|
|
627
627
|
</div>
|
|
628
628
|
<div
|
|
629
|
-
|
|
629
|
+
id="perseus-widget-passage-passage-2"
|
|
630
630
|
>
|
|
631
631
|
<h3
|
|
632
632
|
class="passage-title"
|
|
@@ -956,7 +956,7 @@ exports[`passage widget should snapshot multiple passages (mobile: true) 1`] = `
|
|
|
956
956
|
>
|
|
957
957
|
<div>
|
|
958
958
|
<div
|
|
959
|
-
|
|
959
|
+
id="perseus-widget-passage-container-passage-1"
|
|
960
960
|
>
|
|
961
961
|
<div
|
|
962
962
|
class="perseus-widget-passage-instructions"
|
|
@@ -995,7 +995,7 @@ exports[`passage widget should snapshot multiple passages (mobile: true) 1`] = `
|
|
|
995
995
|
</div>
|
|
996
996
|
</div>
|
|
997
997
|
<div
|
|
998
|
-
|
|
998
|
+
id="perseus-widget-passage-passage-1"
|
|
999
999
|
>
|
|
1000
1000
|
<h3
|
|
1001
1001
|
class="passage-title"
|
|
@@ -1449,7 +1449,7 @@ exports[`passage widget should snapshot multiple passages (mobile: true) 1`] = `
|
|
|
1449
1449
|
>
|
|
1450
1450
|
<div>
|
|
1451
1451
|
<div
|
|
1452
|
-
|
|
1452
|
+
id="perseus-widget-passage-container-passage-2"
|
|
1453
1453
|
>
|
|
1454
1454
|
<div
|
|
1455
1455
|
class="perseus-widget-passage-instructions"
|
|
@@ -1485,7 +1485,7 @@ exports[`passage widget should snapshot multiple passages (mobile: true) 1`] = `
|
|
|
1485
1485
|
</div>
|
|
1486
1486
|
</div>
|
|
1487
1487
|
<div
|
|
1488
|
-
|
|
1488
|
+
id="perseus-widget-passage-passage-2"
|
|
1489
1489
|
>
|
|
1490
1490
|
<h3
|
|
1491
1491
|
class="passage-title"
|
|
@@ -1778,7 +1778,7 @@ exports[`passage widget should snapshot simple passage (mobile: false) 1`] = `
|
|
|
1778
1778
|
>
|
|
1779
1779
|
<div>
|
|
1780
1780
|
<div
|
|
1781
|
-
|
|
1781
|
+
id="perseus-widget-passage-container-"
|
|
1782
1782
|
>
|
|
1783
1783
|
<div
|
|
1784
1784
|
class="perseus-widget-passage-instructions"
|
|
@@ -1787,7 +1787,7 @@ exports[`passage widget should snapshot simple passage (mobile: false) 1`] = `
|
|
|
1787
1787
|
|
|
1788
1788
|
</div>
|
|
1789
1789
|
<div
|
|
1790
|
-
|
|
1790
|
+
id="perseus-widget-passage-"
|
|
1791
1791
|
>
|
|
1792
1792
|
<h3
|
|
1793
1793
|
class="perseus-sr-only"
|
|
@@ -1875,7 +1875,7 @@ exports[`passage widget should snapshot simple passage (mobile: true) 1`] = `
|
|
|
1875
1875
|
>
|
|
1876
1876
|
<div>
|
|
1877
1877
|
<div
|
|
1878
|
-
|
|
1878
|
+
id="perseus-widget-passage-container-"
|
|
1879
1879
|
>
|
|
1880
1880
|
<div
|
|
1881
1881
|
class="perseus-widget-passage-instructions"
|
|
@@ -1884,7 +1884,7 @@ exports[`passage widget should snapshot simple passage (mobile: true) 1`] = `
|
|
|
1884
1884
|
|
|
1885
1885
|
</div>
|
|
1886
1886
|
<div
|
|
1887
|
-
|
|
1887
|
+
id="perseus-widget-passage-"
|
|
1888
1888
|
>
|
|
1889
1889
|
<h3
|
|
1890
1890
|
class="perseus-sr-only"
|
package/src/widgets/passage.tsx
CHANGED
|
@@ -509,12 +509,13 @@ export class Passage extends React.Component<PassageProps, PassageState> {
|
|
|
509
509
|
);
|
|
510
510
|
// Check if the title has any non-empty text in it.
|
|
511
511
|
const hasTitle = /\S/.test(this.props.passageTitle);
|
|
512
|
+
const joinedTitle = joinString(this.props.passageTitle);
|
|
512
513
|
|
|
513
514
|
return (
|
|
514
515
|
<div>
|
|
515
|
-
<div
|
|
516
|
+
<div id={"perseus-widget-passage-container" + joinedTitle}>
|
|
516
517
|
{this._renderInstructions(parseState)}
|
|
517
|
-
<div
|
|
518
|
+
<div id={"perseus-widget-passage" + joinedTitle}>
|
|
518
519
|
{hasTitle && (
|
|
519
520
|
<h3 className="passage-title">
|
|
520
521
|
<Renderer
|
|
@@ -567,6 +568,16 @@ export class Passage extends React.Component<PassageProps, PassageState> {
|
|
|
567
568
|
}
|
|
568
569
|
}
|
|
569
570
|
|
|
571
|
+
// That's All, Folks! => -thats-all-folks
|
|
572
|
+
const joinString = (title: string): string =>
|
|
573
|
+
"-" +
|
|
574
|
+
title
|
|
575
|
+
.toLowerCase()
|
|
576
|
+
.replace(/[^\w\s]/gi, "")
|
|
577
|
+
.trim()
|
|
578
|
+
.split(/\s+/)
|
|
579
|
+
.join("-");
|
|
580
|
+
|
|
570
581
|
export default {
|
|
571
582
|
name: "passage",
|
|
572
583
|
displayName: "Passage (SAT only)",
|
package/src/widgets/sequence.tsx
CHANGED
|
@@ -1,36 +1,33 @@
|
|
|
1
|
-
import {
|
|
2
|
-
linterContextProps,
|
|
3
|
-
linterContextDefault,
|
|
4
|
-
} from "@khanacademy/perseus-linter";
|
|
5
|
-
import PropTypes from "prop-types";
|
|
1
|
+
import {linterContextDefault} from "@khanacademy/perseus-linter";
|
|
6
2
|
import * as React from "react";
|
|
7
3
|
import _ from "underscore";
|
|
8
4
|
|
|
9
5
|
import InlineIcon from "../components/inline-icon";
|
|
10
6
|
import {iconOk} from "../icon-paths";
|
|
11
7
|
import * as Changeable from "../mixins/changeable";
|
|
12
|
-
import {
|
|
8
|
+
import {PerseusSequenceWidgetOptions} from "../perseus-types";
|
|
13
9
|
import Renderer from "../renderer";
|
|
14
10
|
import Util from "../util";
|
|
15
11
|
|
|
16
|
-
import type {WidgetExports} from "../types";
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
12
|
+
import type {WidgetExports, WidgetProps} from "../types";
|
|
13
|
+
|
|
14
|
+
type Rubric = PerseusSequenceWidgetOptions;
|
|
15
|
+
|
|
16
|
+
type ExternalProps = WidgetProps<PerseusSequenceWidgetOptions, Rubric>;
|
|
17
|
+
|
|
18
|
+
type Props = ExternalProps;
|
|
19
|
+
|
|
20
|
+
type DefaultProps = {
|
|
21
|
+
json: Props["json"];
|
|
22
|
+
linterContext: Props["linterContext"];
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
type State = {
|
|
26
|
+
visible: number;
|
|
27
|
+
};
|
|
32
28
|
|
|
33
|
-
|
|
29
|
+
class Sequence extends React.Component<Props, State> {
|
|
30
|
+
static defaultProps: DefaultProps = {
|
|
34
31
|
json: [
|
|
35
32
|
{
|
|
36
33
|
content: "",
|
|
@@ -41,7 +38,7 @@ class Sequence extends React.Component<any, any> {
|
|
|
41
38
|
linterContext: linterContextDefault,
|
|
42
39
|
};
|
|
43
40
|
|
|
44
|
-
state
|
|
41
|
+
state = {
|
|
45
42
|
visible: 1,
|
|
46
43
|
};
|
|
47
44
|
|