diff --git a/package-lock.json b/package-lock.json index 02757ec0..20677bfc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,24 +5,24 @@ "requires": true, "dependencies": { "@mcschema/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.11.0.tgz", - "integrity": "sha512-6FZxNI2PQleT/4wDIatL7PvTZRHvbD5zWzcJLl0JgvKu7G6XXmox+TNT3L7j/auGCDSSf4wq+n+MtoXYxZ/EnQ==" + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.11.1.tgz", + "integrity": "sha512-WSPS8Ht7/ugv0grAF1UWIIzdQ8OQzSpscby6U/BSip7Wgos0ITnX79fQpq7iIlbkIf6VfdTlM1yO4VRMks8D0g==" }, "@mcschema/java-1.16": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.5.12.tgz", - "integrity": "sha512-o6bnFQgilAYYMLklv3buBbVRDeK3THN2FiHHaJqHiFbs+EeNpcJ0tWm/PDRgrTUnw8TIfiNft6Ro992NwWXkkg==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.16/-/java-1.16-0.5.13.tgz", + "integrity": "sha512-wANhbztNSnvHWkqpRq3xZaqazT2AkA8UlOYHFtvP+8LA3IbKyQ7YmUH0J+OGMZ/FnFrrLbdFZhBSFZwy/vIGww==", "requires": { - "@mcschema/core": "^0.11.0" + "@mcschema/core": "^0.11.1" } }, "@mcschema/java-1.17": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.1.1.tgz", - "integrity": "sha512-2lhzsKIvwZIWjDUYSAu6gnvRyI2yRNF/R/2sq5GfWVWLHpMyh8r9g1kR0i8sKcUj2+bxgivNMzkR62qFSPC+gw==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@mcschema/java-1.17/-/java-1.17-0.1.2.tgz", + "integrity": "sha512-LMT6QVpTypceZJmPM/Ceuit6NFa7HxSh5tvWXQAM3cAUv5zQ7WTKe6/BeRCLEnp3a80t46umEr1NzS82S8HUZg==", "requires": { - "@mcschema/core": "^0.11.0" + "@mcschema/core": "^0.11.1" } }, "@mcschema/locales": { diff --git a/package.json b/package.json index b5c58bc7..4004ed07 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "author": "Misode", "license": "MIT", "dependencies": { - "@mcschema/core": "^0.11.0", - "@mcschema/java-1.16": "^0.5.12", - "@mcschema/java-1.17": "^0.1.1", + "@mcschema/core": "^0.11.1", + "@mcschema/java-1.16": "^0.5.13", + "@mcschema/java-1.17": "^0.1.2", "@mcschema/locales": "^0.1.11", "@types/google.analytics": "0.0.40", "@types/split.js": "^1.4.0", diff --git a/src/app/hooks/renderHtml.ts b/src/app/hooks/renderHtml.ts index d55be8f3..5fb2424c 100644 --- a/src/app/hooks/renderHtml.ts +++ b/src/app/hooks/renderHtml.ts @@ -34,7 +34,7 @@ export const renderHtml: Hook<[any, Mounter], [string, string, string]> = { }, choice({ choices, config, switchNode }, path, value, mounter) { - const choice = switchNode.activeCase(path) ?? choices[0] + const choice = switchNode.activeCase(path, true) const pathWithContext = (config?.context) ? new ModelPath(path.getModel(), new Path(path.getArray(), [config.context])) : path const pathWithChoiceContext = config?.choiceContext ? new Path([], [config.choiceContext]) : config?.context ? new Path([], [config.context]) : path