yarn-spinner-runner-ts 0.1.4-a → 0.1.4-b
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/dist/markup/parser.js +15 -2
- package/dist/markup/parser.js.map +1 -1
- package/dist/react/MarkupRenderer.js +1 -1
- package/dist/react/MarkupRenderer.js.map +1 -1
- package/dist/tests/markup.test.js +7 -0
- package/dist/tests/markup.test.js.map +1 -1
- package/docs/markup.md +33 -33
- package/eslint.config.cjs +39 -39
- package/package.json +1 -1
- package/src/markup/parser.ts +56 -43
- package/src/react/DialogueExample.tsx +1 -2
- package/src/react/DialogueView.tsx +298 -297
- package/src/react/MarkupRenderer.tsx +1 -2
- package/src/tests/markup.test.ts +17 -1
package/dist/markup/parser.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
1
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark", "br"]);
|
|
2
|
+
const SELF_CLOSING_TAGS = new Set(["br"]);
|
|
2
3
|
const SELF_CLOSING_SPACE_REGEX = /\s+\/$/;
|
|
3
4
|
const ATTRIBUTE_REGEX = /^([a-zA-Z_][a-zA-Z0-9_-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"']+)))?/;
|
|
4
5
|
export function parseMarkup(input) {
|
|
@@ -102,7 +103,8 @@ export function parseMarkup(input) {
|
|
|
102
103
|
properties[key] = value;
|
|
103
104
|
rest = rest.slice(attrMatch[0].length).trim();
|
|
104
105
|
}
|
|
105
|
-
|
|
106
|
+
const finalKind = kind === "self" || SELF_CLOSING_TAGS.has(name) ? "self" : kind;
|
|
107
|
+
return { kind: finalKind, name, properties };
|
|
106
108
|
};
|
|
107
109
|
const parseAttributeValue = (raw) => {
|
|
108
110
|
const trimmed = raw.trim();
|
|
@@ -118,6 +120,9 @@ export function parseMarkup(input) {
|
|
|
118
120
|
return trimmed;
|
|
119
121
|
};
|
|
120
122
|
const handleSelfClosing = (tag) => {
|
|
123
|
+
if (tag.name === "br") {
|
|
124
|
+
appendChar("\n");
|
|
125
|
+
}
|
|
121
126
|
const wrapper = {
|
|
122
127
|
name: tag.name,
|
|
123
128
|
type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",
|
|
@@ -191,6 +196,10 @@ export function parseMarkup(input) {
|
|
|
191
196
|
}
|
|
192
197
|
// closing tag
|
|
193
198
|
if (stack.length === 0) {
|
|
199
|
+
if (SELF_CLOSING_TAGS.has(parsed.name)) {
|
|
200
|
+
i = closeIndex + 1;
|
|
201
|
+
continue;
|
|
202
|
+
}
|
|
194
203
|
appendLiteral(originalText);
|
|
195
204
|
i = closeIndex + 1;
|
|
196
205
|
continue;
|
|
@@ -202,6 +211,10 @@ export function parseMarkup(input) {
|
|
|
202
211
|
i = closeIndex + 1;
|
|
203
212
|
continue;
|
|
204
213
|
}
|
|
214
|
+
if (SELF_CLOSING_TAGS.has(parsed.name)) {
|
|
215
|
+
i = closeIndex + 1;
|
|
216
|
+
continue;
|
|
217
|
+
}
|
|
205
218
|
// mismatched closing; treat as literal
|
|
206
219
|
appendLiteral(originalText);
|
|
207
220
|
i = closeIndex + 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/markup/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/markup/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import React from "react";
|
|
3
|
-
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
3
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark", "br"]);
|
|
4
4
|
export function MarkupRenderer({ text, markup, length }) {
|
|
5
5
|
const maxLength = length ?? text.length;
|
|
6
6
|
if (!markup || markup.segments.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkupRenderer.js","sourceRoot":"","sources":["../../src/react/MarkupRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MarkupRenderer.js","sourceRoot":"","sources":["../../src/react/MarkupRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAe5G,MAAM,UAAU,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAuB;IAC1E,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;IACxC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,OAAO,4BAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,GAAI,CAAC;IACzC,CAAC;IAED,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACzC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,EAAE;oBACR,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,WAAW,EAAE,IAAI;oBACjB,GAAG,EAAE,QAAQ,KAAK,EAAE;iBACrB,CAAC,CAAC;YACL,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1D,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,EAAE,OAAO,KAAK,IAAI,KAAK,IAAI,GAAG,EAAE;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,4BAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,GAAI,CAAC;IACzC,CAAC;IAED,OAAO,CACL,4BACG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,GACjE,CACJ,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAkB,EAAE,UAAkB;IACzD,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;IAE7C,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,QAAQ,CAAC,WAAW,CAC/B,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,GAAG,OAAO,YAAY,YAAY,EAAE,EAAE,KAAK,CAAC,EAC5G,IAAI,CACL,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CACxC,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,GAAG,OAAO,YAAY,YAAY,EAAE,EAAE,KAAK,CAAC,EAC5G,KAAK,CAAC,IAAI,CACX,CAAC;IAEF,OAAO,KAAC,KAAK,CAAC,QAAQ,cAAgB,OAAO,IAAjB,OAAO,CAA4B,CAAC;AAClE,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAsB,EACtB,GAAW,EACX,QAAyB;IAEzB,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5E,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEzF,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,KAAK,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACvE,cAAc,CAAC,eAAe,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC,aAAa,CACxB,OAAO,EACP;QACE,GAAG;QACH,SAAS;QACT,GAAG,cAAc;KAClB,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -30,6 +30,13 @@ test("parseMarkup handles self-closing tags", () => {
|
|
|
30
30
|
strictEqual(result.text, " Ready.");
|
|
31
31
|
ok(result.segments.some((seg) => seg.selfClosing && seg.wrappers.some((wrapper) => wrapper.name === "pause")), "Expected self closing pause marker");
|
|
32
32
|
});
|
|
33
|
+
test("parseMarkup handles br line breaks", () => {
|
|
34
|
+
const result = parseMarkup("Line one[br]Line two[/br][br/]Line three");
|
|
35
|
+
strictEqual(result.text, "Line one\nLine two\nLine three");
|
|
36
|
+
const brSegments = result.segments.filter((segment) => segment.selfClosing && segment.wrappers.some((wrapper) => wrapper.name === "br"));
|
|
37
|
+
strictEqual(brSegments.length, 2);
|
|
38
|
+
ok(brSegments.every((segment) => segment.wrappers.some((wrapper) => wrapper.name === "br" && wrapper.type === "default")), "Expected br wrappers to use default HTML type");
|
|
39
|
+
});
|
|
33
40
|
test("parseMarkup respects nomarkup blocks and escaping", () => {
|
|
34
41
|
const result = parseMarkup(`[nomarkup][b] raw [/b][/nomarkup] and \\[escaped\\]`);
|
|
35
42
|
strictEqual(result.text, "[b] raw [/b] and [escaped]");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markup.test.js","sourceRoot":"","sources":["../../src/tests/markup.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"markup.test.js","sourceRoot":"","sources":["../../src/tests/markup.test.ts"],"names":[],"mappings":"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"}
|
package/docs/markup.md
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
|
-
## Markup (Yarn Spinner)
|
|
2
|
-
|
|
3
|
-
Source: [docs.yarnspinner.dev � Markup](https://docs.yarnspinner.dev/write-yarn-scripts/advanced-scripting/markup)
|
|
4
|
-
|
|
5
|
-
### Supported formatting
|
|
6
|
-
|
|
7
|
-
The runtime now parses Yarn Spinner markup and surfaces it through `TextResult.markup` and option metadata. The React components (`DialogueView`, `TypingText`, and the option buttons) render this markup automatically.
|
|
8
|
-
|
|
9
|
-
- The following tags map directly to native HTML elements: `b`, `strong`, `em`, `small`, `sub`, `sup`, `ins`, `del`, and `
|
|
10
|
-
- Any other markup tag is rendered as a `<span>` with the class `yd-markup-<tagName>` so you can style or animate it via CSS.
|
|
11
|
-
- Markup attributes are exposed as `data-markup-*` attributes on the rendered element. For example `[wave speed=2]` renders `<span class="yd-markup-wave" data-markup-speed="2">`.
|
|
12
|
-
|
|
13
|
-
### Example
|
|
14
|
-
|
|
15
|
-
```yarn
|
|
16
|
-
title: Start
|
|
17
|
-
---
|
|
18
|
-
Narrator: Plain [b]bold[/b] [wave speed=2]custom[/wave]
|
|
19
|
-
===
|
|
20
|
-
```
|
|
21
|
-
|
|
22
|
-
The React renderer produces:
|
|
23
|
-
|
|
24
|
-
```html
|
|
25
|
-
Plain <b>bold</b> <span class="yd-markup-wave" data-markup-speed="2">custom</span>
|
|
26
|
-
```
|
|
27
|
-
|
|
28
|
-
### Integration notes
|
|
29
|
-
|
|
30
|
-
- Markup data is available on `TextResult.markup` and on each option entry (`result.options[i].markup`).
|
|
31
|
-
- `TypingText` respects markup while animating, so formatting stays intact during the typewriter effect.
|
|
32
|
-
- When a markup tag is not recognised, it remains in the output (as a span) rather than being stripped, so you can add custom CSS in your host application.
|
|
33
|
-
|
|
1
|
+
## Markup (Yarn Spinner)
|
|
2
|
+
|
|
3
|
+
Source: [docs.yarnspinner.dev � Markup](https://docs.yarnspinner.dev/write-yarn-scripts/advanced-scripting/markup)
|
|
4
|
+
|
|
5
|
+
### Supported formatting
|
|
6
|
+
|
|
7
|
+
The runtime now parses Yarn Spinner markup and surfaces it through `TextResult.markup` and option metadata. The React components (`DialogueView`, `TypingText`, and the option buttons) render this markup automatically.
|
|
8
|
+
|
|
9
|
+
- The following tags map directly to native HTML elements: `b`, `strong`, `em`, `small`, `sub`, `sup`, `ins`, `del`, `mark`, and the self-closing line break `br`.
|
|
10
|
+
- Any other markup tag is rendered as a `<span>` with the class `yd-markup-<tagName>` so you can style or animate it via CSS.
|
|
11
|
+
- Markup attributes are exposed as `data-markup-*` attributes on the rendered element. For example `[wave speed=2]` renders `<span class="yd-markup-wave" data-markup-speed="2">`.
|
|
12
|
+
|
|
13
|
+
### Example
|
|
14
|
+
|
|
15
|
+
```yarn
|
|
16
|
+
title: Start
|
|
17
|
+
---
|
|
18
|
+
Narrator: Plain [b]bold[/b] [wave speed=2]custom[/wave]
|
|
19
|
+
===
|
|
20
|
+
```
|
|
21
|
+
|
|
22
|
+
The React renderer produces:
|
|
23
|
+
|
|
24
|
+
```html
|
|
25
|
+
Plain <b>bold</b> <span class="yd-markup-wave" data-markup-speed="2">custom</span>
|
|
26
|
+
```
|
|
27
|
+
|
|
28
|
+
### Integration notes
|
|
29
|
+
|
|
30
|
+
- Markup data is available on `TextResult.markup` and on each option entry (`result.options[i].markup`).
|
|
31
|
+
- `TypingText` respects markup while animating, so formatting stays intact during the typewriter effect.
|
|
32
|
+
- When a markup tag is not recognised, it remains in the output (as a span) rather than being stripped, so you can add custom CSS in your host application.
|
|
33
|
+
|
|
34
34
|
For the full markup vocabulary see the official Yarn Spinner documentation.
|
package/eslint.config.cjs
CHANGED
|
@@ -1,39 +1,39 @@
|
|
|
1
|
-
// ESLint v9 flat config
|
|
2
|
-
const js = require("@eslint/js");
|
|
3
|
-
const tsParser = require("@typescript-eslint/parser");
|
|
4
|
-
const tsPlugin = require("@typescript-eslint/eslint-plugin");
|
|
5
|
-
|
|
6
|
-
module.exports = [
|
|
7
|
-
{
|
|
8
|
-
ignores: ["dist/**", "node_modules/**", "examples/**", "src/examples/**", "src/tests/**"],
|
|
9
|
-
},
|
|
10
|
-
{
|
|
11
|
-
files: ["src/**/*.ts", "src/**/*.tsx"],
|
|
12
|
-
languageOptions: {
|
|
13
|
-
parser: tsParser,
|
|
14
|
-
ecmaVersion: "latest",
|
|
15
|
-
sourceType: "module",
|
|
16
|
-
globals: {
|
|
17
|
-
console: "readonly",
|
|
18
|
-
window: "readonly",
|
|
19
|
-
setTimeout: "readonly",
|
|
20
|
-
clearTimeout: "readonly",
|
|
21
|
-
setInterval: "readonly",
|
|
22
|
-
clearInterval: "readonly",
|
|
23
|
-
requestAnimationFrame: "readonly",
|
|
24
|
-
},
|
|
25
|
-
},
|
|
26
|
-
plugins: {
|
|
27
|
-
"@typescript-eslint": tsPlugin,
|
|
28
|
-
},
|
|
29
|
-
rules: {
|
|
30
|
-
...js.configs.recommended.rules,
|
|
31
|
-
...tsPlugin.configs.recommended.rules,
|
|
32
|
-
"@typescript-eslint/explicit-module-boundary-types": "off",
|
|
33
|
-
"@typescript-eslint/no-explicit-any": "off",
|
|
34
|
-
"no-console": ["warn", { allow: ["warn", "error", "assert", "log"] }],
|
|
35
|
-
},
|
|
36
|
-
},
|
|
37
|
-
];
|
|
38
|
-
|
|
39
|
-
|
|
1
|
+
// ESLint v9 flat config
|
|
2
|
+
const js = require("@eslint/js");
|
|
3
|
+
const tsParser = require("@typescript-eslint/parser");
|
|
4
|
+
const tsPlugin = require("@typescript-eslint/eslint-plugin");
|
|
5
|
+
|
|
6
|
+
module.exports = [
|
|
7
|
+
{
|
|
8
|
+
ignores: ["dist/**", "node_modules/**", "examples/**", "src/examples/**", "src/tests/**"],
|
|
9
|
+
},
|
|
10
|
+
{
|
|
11
|
+
files: ["src/**/*.ts", "src/**/*.tsx"],
|
|
12
|
+
languageOptions: {
|
|
13
|
+
parser: tsParser,
|
|
14
|
+
ecmaVersion: "latest",
|
|
15
|
+
sourceType: "module",
|
|
16
|
+
globals: {
|
|
17
|
+
console: "readonly",
|
|
18
|
+
window: "readonly",
|
|
19
|
+
setTimeout: "readonly",
|
|
20
|
+
clearTimeout: "readonly",
|
|
21
|
+
setInterval: "readonly",
|
|
22
|
+
clearInterval: "readonly",
|
|
23
|
+
requestAnimationFrame: "readonly",
|
|
24
|
+
},
|
|
25
|
+
},
|
|
26
|
+
plugins: {
|
|
27
|
+
"@typescript-eslint": tsPlugin,
|
|
28
|
+
},
|
|
29
|
+
rules: {
|
|
30
|
+
...js.configs.recommended.rules,
|
|
31
|
+
...tsPlugin.configs.recommended.rules,
|
|
32
|
+
"@typescript-eslint/explicit-module-boundary-types": "off",
|
|
33
|
+
"@typescript-eslint/no-explicit-any": "off",
|
|
34
|
+
"no-console": ["warn", { allow: ["warn", "error", "assert", "log"] }],
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
];
|
|
38
|
+
|
|
39
|
+
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yarn-spinner-runner-ts",
|
|
3
|
-
"version": "0.1.4-
|
|
3
|
+
"version": "0.1.4-b",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "TypeScript parser, compiler, and runtime for Yarn Spinner 3.x with React adapter [NPM package](https://www.npmjs.com/package/yarn-spinner-runner-ts)",
|
|
6
6
|
"license": "MIT",
|
package/src/markup/parser.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { MarkupParseResult, MarkupSegment, MarkupValue, MarkupWrapper } from "./types.js";
|
|
2
|
-
|
|
3
|
-
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
1
|
+
import type { MarkupParseResult, MarkupSegment, MarkupValue, MarkupWrapper } from "./types.js";
|
|
2
|
+
|
|
3
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark", "br"]);
|
|
4
|
+
const SELF_CLOSING_TAGS = new Set(["br"]);
|
|
4
5
|
|
|
5
6
|
interface StackEntry {
|
|
6
7
|
name: string;
|
|
@@ -125,8 +126,9 @@ export function parseMarkup(input: string): MarkupParseResult {
|
|
|
125
126
|
rest = rest.slice(attrMatch[0].length).trim();
|
|
126
127
|
}
|
|
127
128
|
|
|
128
|
-
|
|
129
|
-
|
|
129
|
+
const finalKind: ParsedTag["kind"] = kind === "self" || SELF_CLOSING_TAGS.has(name) ? "self" : kind;
|
|
130
|
+
return { kind: finalKind, name, properties };
|
|
131
|
+
};
|
|
130
132
|
|
|
131
133
|
const parseAttributeValue = (raw: string): MarkupValue => {
|
|
132
134
|
const trimmed = raw.trim();
|
|
@@ -142,20 +144,23 @@ export function parseMarkup(input: string): MarkupParseResult {
|
|
|
142
144
|
return trimmed;
|
|
143
145
|
};
|
|
144
146
|
|
|
145
|
-
const handleSelfClosing = (tag: ParsedTag) => {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
147
|
+
const handleSelfClosing = (tag: ParsedTag) => {
|
|
148
|
+
if (tag.name === "br") {
|
|
149
|
+
appendChar("\n");
|
|
150
|
+
}
|
|
151
|
+
const wrapper: MarkupWrapper = {
|
|
152
|
+
name: tag.name,
|
|
153
|
+
type: DEFAULT_HTML_TAGS.has(tag.name) ? "default" : "custom",
|
|
154
|
+
properties: tag.properties,
|
|
155
|
+
};
|
|
156
|
+
const position = chars.length;
|
|
157
|
+
pushSegment({
|
|
158
|
+
start: position,
|
|
159
|
+
end: position,
|
|
160
|
+
wrappers: [wrapper],
|
|
161
|
+
selfClosing: true,
|
|
162
|
+
});
|
|
163
|
+
};
|
|
159
164
|
|
|
160
165
|
let i = 0;
|
|
161
166
|
while (i < input.length) {
|
|
@@ -215,30 +220,38 @@ export function parseMarkup(input: string): MarkupParseResult {
|
|
|
215
220
|
continue;
|
|
216
221
|
}
|
|
217
222
|
|
|
218
|
-
if (parsed.kind === "self") {
|
|
219
|
-
handleSelfClosing(parsed);
|
|
220
|
-
i = closeIndex + 1;
|
|
221
|
-
continue;
|
|
222
|
-
}
|
|
223
|
-
|
|
224
|
-
// closing tag
|
|
225
|
-
if (stack.length === 0) {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
223
|
+
if (parsed.kind === "self") {
|
|
224
|
+
handleSelfClosing(parsed);
|
|
225
|
+
i = closeIndex + 1;
|
|
226
|
+
continue;
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// closing tag
|
|
230
|
+
if (stack.length === 0) {
|
|
231
|
+
if (SELF_CLOSING_TAGS.has(parsed.name)) {
|
|
232
|
+
i = closeIndex + 1;
|
|
233
|
+
continue;
|
|
234
|
+
}
|
|
235
|
+
appendLiteral(originalText);
|
|
236
|
+
i = closeIndex + 1;
|
|
237
|
+
continue;
|
|
238
|
+
}
|
|
239
|
+
const top = stack[stack.length - 1];
|
|
240
|
+
if (top.name === parsed.name) {
|
|
241
|
+
flushCurrentSegment();
|
|
242
|
+
stack.pop();
|
|
243
|
+
i = closeIndex + 1;
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
if (SELF_CLOSING_TAGS.has(parsed.name)) {
|
|
247
|
+
i = closeIndex + 1;
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
// mismatched closing; treat as literal
|
|
251
|
+
appendLiteral(originalText);
|
|
252
|
+
i = closeIndex + 1;
|
|
253
|
+
continue;
|
|
254
|
+
}
|
|
242
255
|
|
|
243
256
|
appendChar(char);
|
|
244
257
|
i += 1;
|
|
@@ -8,7 +8,6 @@ import type { SceneCollection } from "../scene/types.js";
|
|
|
8
8
|
const DEFAULT_YARN = `title: Start
|
|
9
9
|
scene: scene1
|
|
10
10
|
---
|
|
11
|
-
Narrator: {greet()}
|
|
12
11
|
Narrator: Welcome to [b]yarn-spinner-ts[/b]!
|
|
13
12
|
npc: This is a dialogue system powered by Yarn Spinner.
|
|
14
13
|
Narrator: Click anywhere to continue, or choose an option below.
|
|
@@ -46,7 +45,7 @@ actors:
|
|
|
46
45
|
export function DialogueExample() {
|
|
47
46
|
const [yarnText] = useState(DEFAULT_YARN);
|
|
48
47
|
const [error, setError] = useState<string | null>(null);
|
|
49
|
-
const enableTypingAnimation =
|
|
48
|
+
const enableTypingAnimation = false;
|
|
50
49
|
|
|
51
50
|
const scenes: SceneCollection = useMemo(() => {
|
|
52
51
|
try {
|
|
@@ -1,297 +1,298 @@
|
|
|
1
|
-
import React, { useRef, useEffect, useState } from "react";
|
|
2
|
-
import { DialogueScene } from "./DialogueScene.js";
|
|
3
|
-
import type { SceneCollection } from "../scene/types.js";
|
|
4
|
-
import { TypingText } from "./TypingText.js";
|
|
5
|
-
import { useYarnRunner } from "./useYarnRunner.js";
|
|
6
|
-
import { MarkupRenderer } from "./MarkupRenderer.js";
|
|
7
|
-
// Note: CSS is imported in the browser demo entry point (examples/browser/main.tsx)
|
|
8
|
-
// This prevents Node.js from trying to resolve CSS imports during tests
|
|
9
|
-
|
|
10
|
-
import type { IRProgram } from "../compile/ir.js";
|
|
11
|
-
|
|
12
|
-
export interface DialogueViewProps {
|
|
13
|
-
program: IRProgram;
|
|
14
|
-
startNode?: string;
|
|
15
|
-
className?: string;
|
|
16
|
-
scenes?: SceneCollection;
|
|
17
|
-
actorTransitionDuration?: number;
|
|
18
|
-
// Custom functions and callbacks
|
|
19
|
-
functions?: Record<string, (...args: unknown[]) => unknown>;
|
|
20
|
-
onStoryEnd?: (info: { variables: Readonly<Record<string, unknown>>; storyEnd: true }) => void;
|
|
21
|
-
// Typing animation options
|
|
22
|
-
enableTypingAnimation?: boolean;
|
|
23
|
-
typingSpeed?: number;
|
|
24
|
-
showTypingCursor?: boolean;
|
|
25
|
-
cursorCharacter?: string;
|
|
26
|
-
// Auto-advance after typing completes
|
|
27
|
-
autoAdvanceAfterTyping?: boolean;
|
|
28
|
-
autoAdvanceDelay?: number; // Delay in ms after typing completes before auto-advancing
|
|
29
|
-
// Pause before advance
|
|
30
|
-
pauseBeforeAdvance?: number; // Delay in ms before advancing when clicking (0 = no pause)
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
// Helper to parse CSS string into object
|
|
34
|
-
function parseCss(cssStr: string | undefined): React.CSSProperties {
|
|
35
|
-
if (!cssStr) return {};
|
|
36
|
-
const styles: React.CSSProperties = {};
|
|
37
|
-
// Improved parser: handles quoted values and commas
|
|
38
|
-
// Split by semicolon, but preserve quoted strings
|
|
39
|
-
const rules: string[] = [];
|
|
40
|
-
let currentRule = "";
|
|
41
|
-
let inQuotes = false;
|
|
42
|
-
let quoteChar = "";
|
|
43
|
-
|
|
44
|
-
for (let i = 0; i < cssStr.length; i++) {
|
|
45
|
-
const char = cssStr[i];
|
|
46
|
-
if ((char === '"' || char === "'") && !inQuotes) {
|
|
47
|
-
inQuotes = true;
|
|
48
|
-
quoteChar = char;
|
|
49
|
-
currentRule += char;
|
|
50
|
-
} else if (char === quoteChar && inQuotes) {
|
|
51
|
-
inQuotes = false;
|
|
52
|
-
quoteChar = "";
|
|
53
|
-
currentRule += char;
|
|
54
|
-
} else if (char === ";" && !inQuotes) {
|
|
55
|
-
rules.push(currentRule.trim());
|
|
56
|
-
currentRule = "";
|
|
57
|
-
} else {
|
|
58
|
-
currentRule += char;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
if (currentRule.trim()) {
|
|
62
|
-
rules.push(currentRule.trim());
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
rules.forEach((rule) => {
|
|
66
|
-
if (!rule) return;
|
|
67
|
-
const colonIndex = rule.indexOf(":");
|
|
68
|
-
if (colonIndex === -1) return;
|
|
69
|
-
const prop = rule.slice(0, colonIndex).trim();
|
|
70
|
-
const value = rule.slice(colonIndex + 1).trim();
|
|
71
|
-
if (prop && value) {
|
|
72
|
-
// Convert kebab-case to camelCase
|
|
73
|
-
const camelProp = prop.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
|
|
74
|
-
// Remove quotes from value if present, and strip !important (React doesn't support it)
|
|
75
|
-
let cleanValue = value.trim();
|
|
76
|
-
if (cleanValue.endsWith("!important")) {
|
|
77
|
-
cleanValue = cleanValue.slice(0, -10).trim();
|
|
78
|
-
}
|
|
79
|
-
if (cleanValue.startsWith('"') && cleanValue.endsWith('"')) {
|
|
80
|
-
cleanValue = cleanValue.slice(1, -1);
|
|
81
|
-
} else if (cleanValue.startsWith("'") && cleanValue.endsWith("'")) {
|
|
82
|
-
cleanValue = cleanValue.slice(1, -1);
|
|
83
|
-
}
|
|
84
|
-
(styles as any)[camelProp] = cleanValue;
|
|
85
|
-
}
|
|
86
|
-
});
|
|
87
|
-
return styles;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
export function DialogueView({
|
|
91
|
-
program,
|
|
92
|
-
startNode = "Start",
|
|
93
|
-
className,
|
|
94
|
-
scenes,
|
|
95
|
-
actorTransitionDuration = 350,
|
|
96
|
-
functions,
|
|
97
|
-
onStoryEnd,
|
|
98
|
-
enableTypingAnimation = false,
|
|
99
|
-
typingSpeed = 50, // Characters per second (50 cps = ~20ms per character)
|
|
100
|
-
showTypingCursor = true,
|
|
101
|
-
cursorCharacter = "|",
|
|
102
|
-
autoAdvanceAfterTyping = false,
|
|
103
|
-
autoAdvanceDelay = 500,
|
|
104
|
-
pauseBeforeAdvance = 0,
|
|
105
|
-
}: DialogueViewProps) {
|
|
106
|
-
const { result, advance } = useYarnRunner(program, {
|
|
107
|
-
startAt: startNode,
|
|
108
|
-
functions,
|
|
109
|
-
variables: {},
|
|
110
|
-
onStoryEnd,
|
|
111
|
-
});
|
|
112
|
-
const sceneName = result?.type === "text" || result?.type === "options" ? result.scene : undefined;
|
|
113
|
-
const speaker = result?.type === "text" ? result.speaker : undefined;
|
|
114
|
-
const sceneCollection = scenes || { scenes: {} };
|
|
115
|
-
|
|
116
|
-
const [typingComplete, setTypingComplete] = useState(false);
|
|
117
|
-
const [currentTextKey, setCurrentTextKey] = useState(0);
|
|
118
|
-
const [skipTyping, setSkipTyping] = useState(false);
|
|
119
|
-
const advanceTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
if (result
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
1
|
+
import React, { useRef, useEffect, useState } from "react";
|
|
2
|
+
import { DialogueScene } from "./DialogueScene.js";
|
|
3
|
+
import type { SceneCollection } from "../scene/types.js";
|
|
4
|
+
import { TypingText } from "./TypingText.js";
|
|
5
|
+
import { useYarnRunner } from "./useYarnRunner.js";
|
|
6
|
+
import { MarkupRenderer } from "./MarkupRenderer.js";
|
|
7
|
+
// Note: CSS is imported in the browser demo entry point (examples/browser/main.tsx)
|
|
8
|
+
// This prevents Node.js from trying to resolve CSS imports during tests
|
|
9
|
+
|
|
10
|
+
import type { IRProgram } from "../compile/ir.js";
|
|
11
|
+
|
|
12
|
+
export interface DialogueViewProps {
|
|
13
|
+
program: IRProgram;
|
|
14
|
+
startNode?: string;
|
|
15
|
+
className?: string;
|
|
16
|
+
scenes?: SceneCollection;
|
|
17
|
+
actorTransitionDuration?: number;
|
|
18
|
+
// Custom functions and callbacks
|
|
19
|
+
functions?: Record<string, (...args: unknown[]) => unknown>;
|
|
20
|
+
onStoryEnd?: (info: { variables: Readonly<Record<string, unknown>>; storyEnd: true }) => void;
|
|
21
|
+
// Typing animation options
|
|
22
|
+
enableTypingAnimation?: boolean;
|
|
23
|
+
typingSpeed?: number;
|
|
24
|
+
showTypingCursor?: boolean;
|
|
25
|
+
cursorCharacter?: string;
|
|
26
|
+
// Auto-advance after typing completes
|
|
27
|
+
autoAdvanceAfterTyping?: boolean;
|
|
28
|
+
autoAdvanceDelay?: number; // Delay in ms after typing completes before auto-advancing
|
|
29
|
+
// Pause before advance
|
|
30
|
+
pauseBeforeAdvance?: number; // Delay in ms before advancing when clicking (0 = no pause)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// Helper to parse CSS string into object
|
|
34
|
+
function parseCss(cssStr: string | undefined): React.CSSProperties {
|
|
35
|
+
if (!cssStr) return {};
|
|
36
|
+
const styles: React.CSSProperties = {};
|
|
37
|
+
// Improved parser: handles quoted values and commas
|
|
38
|
+
// Split by semicolon, but preserve quoted strings
|
|
39
|
+
const rules: string[] = [];
|
|
40
|
+
let currentRule = "";
|
|
41
|
+
let inQuotes = false;
|
|
42
|
+
let quoteChar = "";
|
|
43
|
+
|
|
44
|
+
for (let i = 0; i < cssStr.length; i++) {
|
|
45
|
+
const char = cssStr[i];
|
|
46
|
+
if ((char === '"' || char === "'") && !inQuotes) {
|
|
47
|
+
inQuotes = true;
|
|
48
|
+
quoteChar = char;
|
|
49
|
+
currentRule += char;
|
|
50
|
+
} else if (char === quoteChar && inQuotes) {
|
|
51
|
+
inQuotes = false;
|
|
52
|
+
quoteChar = "";
|
|
53
|
+
currentRule += char;
|
|
54
|
+
} else if (char === ";" && !inQuotes) {
|
|
55
|
+
rules.push(currentRule.trim());
|
|
56
|
+
currentRule = "";
|
|
57
|
+
} else {
|
|
58
|
+
currentRule += char;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (currentRule.trim()) {
|
|
62
|
+
rules.push(currentRule.trim());
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
rules.forEach((rule) => {
|
|
66
|
+
if (!rule) return;
|
|
67
|
+
const colonIndex = rule.indexOf(":");
|
|
68
|
+
if (colonIndex === -1) return;
|
|
69
|
+
const prop = rule.slice(0, colonIndex).trim();
|
|
70
|
+
const value = rule.slice(colonIndex + 1).trim();
|
|
71
|
+
if (prop && value) {
|
|
72
|
+
// Convert kebab-case to camelCase
|
|
73
|
+
const camelProp = prop.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
|
|
74
|
+
// Remove quotes from value if present, and strip !important (React doesn't support it)
|
|
75
|
+
let cleanValue = value.trim();
|
|
76
|
+
if (cleanValue.endsWith("!important")) {
|
|
77
|
+
cleanValue = cleanValue.slice(0, -10).trim();
|
|
78
|
+
}
|
|
79
|
+
if (cleanValue.startsWith('"') && cleanValue.endsWith('"')) {
|
|
80
|
+
cleanValue = cleanValue.slice(1, -1);
|
|
81
|
+
} else if (cleanValue.startsWith("'") && cleanValue.endsWith("'")) {
|
|
82
|
+
cleanValue = cleanValue.slice(1, -1);
|
|
83
|
+
}
|
|
84
|
+
(styles as any)[camelProp] = cleanValue;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
return styles;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
export function DialogueView({
|
|
91
|
+
program,
|
|
92
|
+
startNode = "Start",
|
|
93
|
+
className,
|
|
94
|
+
scenes,
|
|
95
|
+
actorTransitionDuration = 350,
|
|
96
|
+
functions,
|
|
97
|
+
onStoryEnd,
|
|
98
|
+
enableTypingAnimation = false,
|
|
99
|
+
typingSpeed = 50, // Characters per second (50 cps = ~20ms per character)
|
|
100
|
+
showTypingCursor = true,
|
|
101
|
+
cursorCharacter = "|",
|
|
102
|
+
autoAdvanceAfterTyping = false,
|
|
103
|
+
autoAdvanceDelay = 500,
|
|
104
|
+
pauseBeforeAdvance = 0,
|
|
105
|
+
}: DialogueViewProps) {
|
|
106
|
+
const { result, advance } = useYarnRunner(program, {
|
|
107
|
+
startAt: startNode,
|
|
108
|
+
functions,
|
|
109
|
+
variables: {},
|
|
110
|
+
onStoryEnd,
|
|
111
|
+
});
|
|
112
|
+
const sceneName = result?.type === "text" || result?.type === "options" ? result.scene : undefined;
|
|
113
|
+
const speaker = result?.type === "text" ? result.speaker : undefined;
|
|
114
|
+
const sceneCollection = scenes || { scenes: {} };
|
|
115
|
+
|
|
116
|
+
const [typingComplete, setTypingComplete] = useState(false);
|
|
117
|
+
const [currentTextKey, setCurrentTextKey] = useState(0);
|
|
118
|
+
const [skipTyping, setSkipTyping] = useState(false);
|
|
119
|
+
const advanceTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
120
|
+
|
|
121
|
+
useEffect(() => {
|
|
122
|
+
if (!result || result.type !== "command") {
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
const timer = setTimeout(() => advance(), 50);
|
|
126
|
+
return () => clearTimeout(timer);
|
|
127
|
+
}, [result, advance]);
|
|
128
|
+
|
|
129
|
+
// Reset typing completion when text changes
|
|
130
|
+
useEffect(() => {
|
|
131
|
+
if (result?.type === "text") {
|
|
132
|
+
setTypingComplete(false);
|
|
133
|
+
setSkipTyping(false);
|
|
134
|
+
setCurrentTextKey((prev) => prev + 1); // Force re-render of TypingText
|
|
135
|
+
}
|
|
136
|
+
// Cleanup any pending advance timeouts when text changes
|
|
137
|
+
return () => {
|
|
138
|
+
if (advanceTimeoutRef.current) {
|
|
139
|
+
clearTimeout(advanceTimeoutRef.current);
|
|
140
|
+
advanceTimeoutRef.current = null;
|
|
141
|
+
}
|
|
142
|
+
};
|
|
143
|
+
}, [result?.type === "text" ? result.text : null]);
|
|
144
|
+
|
|
145
|
+
// Handle auto-advance after typing completes
|
|
146
|
+
useEffect(() => {
|
|
147
|
+
if (
|
|
148
|
+
autoAdvanceAfterTyping &&
|
|
149
|
+
typingComplete &&
|
|
150
|
+
result?.type === "text" &&
|
|
151
|
+
!result.isDialogueEnd
|
|
152
|
+
) {
|
|
153
|
+
const timer = setTimeout(() => {
|
|
154
|
+
advance();
|
|
155
|
+
}, autoAdvanceDelay);
|
|
156
|
+
return () => clearTimeout(timer);
|
|
157
|
+
}
|
|
158
|
+
}, [autoAdvanceAfterTyping, typingComplete, result, advance, autoAdvanceDelay]);
|
|
159
|
+
|
|
160
|
+
if (!result) {
|
|
161
|
+
return (
|
|
162
|
+
<div className={`yd-empty ${className || ""}`}>
|
|
163
|
+
<p>Dialogue ended or not started.</p>
|
|
164
|
+
</div>
|
|
165
|
+
);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
if (result.type === "text") {
|
|
169
|
+
const nodeStyles = parseCss(result.nodeCss);
|
|
170
|
+
const displayText = result.text || "\u00A0";
|
|
171
|
+
const shouldShowContinue = !result.isDialogueEnd && !enableTypingAnimation;
|
|
172
|
+
|
|
173
|
+
// Handle story end and call onStoryEnd if provided
|
|
174
|
+
if (result.isDialogueEnd && onStoryEnd && 'variables' in result) {
|
|
175
|
+
onStoryEnd({
|
|
176
|
+
variables: result.variables as Readonly<Record<string, unknown>>,
|
|
177
|
+
storyEnd: true
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
const handleClick = () => {
|
|
182
|
+
if (result.isDialogueEnd) return;
|
|
183
|
+
|
|
184
|
+
// If typing is in progress, skip it; otherwise advance
|
|
185
|
+
if (enableTypingAnimation && !typingComplete) {
|
|
186
|
+
// Skip typing animation
|
|
187
|
+
setSkipTyping(true);
|
|
188
|
+
setTypingComplete(true);
|
|
189
|
+
} else {
|
|
190
|
+
// Clear any pending timeout
|
|
191
|
+
if (advanceTimeoutRef.current) {
|
|
192
|
+
clearTimeout(advanceTimeoutRef.current);
|
|
193
|
+
advanceTimeoutRef.current = null;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
// Apply pause before advance if configured
|
|
197
|
+
if (pauseBeforeAdvance > 0) {
|
|
198
|
+
advanceTimeoutRef.current = setTimeout(() => {
|
|
199
|
+
advance();
|
|
200
|
+
advanceTimeoutRef.current = null;
|
|
201
|
+
}, pauseBeforeAdvance);
|
|
202
|
+
} else {
|
|
203
|
+
advance();
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
};
|
|
207
|
+
|
|
208
|
+
return (
|
|
209
|
+
<div className="yd-container">
|
|
210
|
+
<DialogueScene
|
|
211
|
+
sceneName={sceneName}
|
|
212
|
+
speaker={speaker}
|
|
213
|
+
scenes={sceneCollection}
|
|
214
|
+
actorTransitionDuration={actorTransitionDuration}
|
|
215
|
+
/>
|
|
216
|
+
<div
|
|
217
|
+
className={`yd-dialogue-box ${result.isDialogueEnd ? "yd-text-box-end" : ""} ${className || ""}`}
|
|
218
|
+
style={nodeStyles} // Only apply dynamic node CSS
|
|
219
|
+
onClick={handleClick}
|
|
220
|
+
>
|
|
221
|
+
<div className="yd-text-box">
|
|
222
|
+
{result.speaker && (
|
|
223
|
+
<div className="yd-speaker">
|
|
224
|
+
{result.speaker}
|
|
225
|
+
</div>
|
|
226
|
+
)}
|
|
227
|
+
<p className={`yd-text ${result.speaker ? "yd-text-with-speaker" : ""}`}>
|
|
228
|
+
{enableTypingAnimation ? (
|
|
229
|
+
<TypingText
|
|
230
|
+
key={currentTextKey}
|
|
231
|
+
text={displayText}
|
|
232
|
+
markup={result.markup}
|
|
233
|
+
typingSpeed={typingSpeed}
|
|
234
|
+
showCursor={showTypingCursor}
|
|
235
|
+
cursorCharacter={cursorCharacter}
|
|
236
|
+
disabled={skipTyping}
|
|
237
|
+
onComplete={() => setTypingComplete(true)}
|
|
238
|
+
/>
|
|
239
|
+
) : (
|
|
240
|
+
<MarkupRenderer text={displayText} markup={result.markup} />
|
|
241
|
+
)}
|
|
242
|
+
</p>
|
|
243
|
+
{shouldShowContinue && (
|
|
244
|
+
<div className="yd-continue">
|
|
245
|
+
▼
|
|
246
|
+
</div>
|
|
247
|
+
)}
|
|
248
|
+
</div>
|
|
249
|
+
</div>
|
|
250
|
+
</div>
|
|
251
|
+
);
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
if (result.type === "options") {
|
|
255
|
+
const nodeStyles = parseCss(result.nodeCss);
|
|
256
|
+
return (
|
|
257
|
+
<div className="yd-container">
|
|
258
|
+
<DialogueScene
|
|
259
|
+
sceneName={sceneName}
|
|
260
|
+
speaker={speaker}
|
|
261
|
+
scenes={sceneCollection}
|
|
262
|
+
actorTransitionDuration={actorTransitionDuration}
|
|
263
|
+
/>
|
|
264
|
+
<div className={`yd-options-container ${className || ""}`}>
|
|
265
|
+
<div className="yd-options-box" style={nodeStyles}>
|
|
266
|
+
<div className="yd-options-title">Choose an option:</div>
|
|
267
|
+
<div className="yd-options-list">
|
|
268
|
+
{result.options.map((option, index) => {
|
|
269
|
+
const optionStyles = parseCss(option.css);
|
|
270
|
+
return (
|
|
271
|
+
<button
|
|
272
|
+
key={index}
|
|
273
|
+
className="yd-option-button"
|
|
274
|
+
onClick={() => advance(index)}
|
|
275
|
+
style={optionStyles} // Only apply dynamic option CSS
|
|
276
|
+
>
|
|
277
|
+
<MarkupRenderer text={option.text} markup={option.markup} />
|
|
278
|
+
</button>
|
|
279
|
+
);
|
|
280
|
+
})}
|
|
281
|
+
</div>
|
|
282
|
+
</div>
|
|
283
|
+
</div>
|
|
284
|
+
</div>
|
|
285
|
+
);
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
// Command result - auto-advance
|
|
289
|
+
if (result.type === "command") {
|
|
290
|
+
return (
|
|
291
|
+
<div className={`yd-command ${className || ""}`}>
|
|
292
|
+
<p>Executing: {result.command}</p>
|
|
293
|
+
</div>
|
|
294
|
+
);
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
return null;
|
|
298
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import type { MarkupParseResult, MarkupWrapper } from "../markup/types.js";
|
|
3
3
|
|
|
4
|
-
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
4
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark", "br"]);
|
|
5
5
|
|
|
6
6
|
interface RenderPiece {
|
|
7
7
|
text: string;
|
|
@@ -107,4 +107,3 @@ function createWrapperElement(
|
|
|
107
107
|
function sanitizeClassName(name: string): string {
|
|
108
108
|
return name.toLowerCase().replace(/[^a-z0-9_-]/g, "-");
|
|
109
109
|
}
|
|
110
|
-
|
package/src/tests/markup.test.ts
CHANGED
|
@@ -43,6 +43,23 @@ test("parseMarkup handles self-closing tags", () => {
|
|
|
43
43
|
);
|
|
44
44
|
});
|
|
45
45
|
|
|
46
|
+
test("parseMarkup handles br line breaks", () => {
|
|
47
|
+
const result = parseMarkup("Line one[br]Line two[/br][br/]Line three");
|
|
48
|
+
strictEqual(result.text, "Line one\nLine two\nLine three");
|
|
49
|
+
|
|
50
|
+
const brSegments = result.segments.filter(
|
|
51
|
+
(segment) => segment.selfClosing && segment.wrappers.some((wrapper) => wrapper.name === "br")
|
|
52
|
+
);
|
|
53
|
+
|
|
54
|
+
strictEqual(brSegments.length, 2);
|
|
55
|
+
ok(
|
|
56
|
+
brSegments.every((segment) =>
|
|
57
|
+
segment.wrappers.some((wrapper) => wrapper.name === "br" && wrapper.type === "default")
|
|
58
|
+
),
|
|
59
|
+
"Expected br wrappers to use default HTML type"
|
|
60
|
+
);
|
|
61
|
+
});
|
|
62
|
+
|
|
46
63
|
test("parseMarkup respects nomarkup blocks and escaping", () => {
|
|
47
64
|
const result = parseMarkup(`[nomarkup][b] raw [/b][/nomarkup] and \\[escaped\\]`);
|
|
48
65
|
strictEqual(result.text, "[b] raw [/b] and [escaped]");
|
|
@@ -59,4 +76,3 @@ function findSegment(result: MarkupParseResult, target: string) {
|
|
|
59
76
|
return text === target;
|
|
60
77
|
});
|
|
61
78
|
}
|
|
62
|
-
|