Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug in quest editor UI persister.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-07-24 23:28:22 +02:00
parent 50eaf43082
commit 7f404ff35a
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/persistence/QuestEditorUiPersister.ts
View File

@ -1,5 +1,6 @@
import { Persister } from "./Persister"; import { Persister } from "./Persister";
import { throttle } from "lodash"; import { throttle } from "lodash";
import GoldenLayout from "golden-layout";
const LAYOUT_CONFIG_KEY = "QuestEditorUiPersister.layout_config"; const LAYOUT_CONFIG_KEY = "QuestEditorUiPersister.layout_config";
@ -8,16 +9,17 @@ class QuestEditorUiPersister extends Persister {
(config: any) => { (config: any) => {
this.persist(LAYOUT_CONFIG_KEY, config); this.persist(LAYOUT_CONFIG_KEY, config);
}, },
1000, 500,
{ leading: false, trailing: true } { leading: false, trailing: true }
); );
async load_layout_config(components: string[], default_config: any): Promise<any> { async load_layout_config(
const config = await this.load(LAYOUT_CONFIG_KEY); components: string[],
default_config: GoldenLayout.ItemConfigType[]
): Promise<any> {
const config = await this.load<GoldenLayout.ItemConfigType[]>(LAYOUT_CONFIG_KEY);
let valid = this.verify_layout_config(config, new Set(components)); if (config && this.verify_layout_config(config, components)) {
if (valid) {
return config; return config;
} else { } else {
return default_config; return default_config;
@ -25,16 +27,31 @@ class QuestEditorUiPersister extends Persister {
} }
private verify_layout_config( private verify_layout_config(
config: any, config: GoldenLayout.ItemConfigType[],
components: string[]
): boolean {
const set = new Set(components);
for (const child of config) {
if (!this.verify_layout_child(child, set, new Set(), true)) {
return false;
}
}
return true;
}
private verify_layout_child(
config: GoldenLayout.ItemConfigType,
components: Set<string>, components: Set<string>,
found: Set<string> = new Set(), found: Set<string>,
first: boolean = true first: boolean
): boolean { ): boolean {
if (!config) { if (!config) {
return false; return false;
} }
if (config.component) { if ("component" in config) {
if (!components.has(config.component)) { if (!components.has(config.component)) {
return false; return false;
} else { } else {
@ -44,7 +61,7 @@ class QuestEditorUiPersister extends Persister {
if (config.content) { if (config.content) {
for (const child of config.content) { for (const child of config.content) {
if (!this.verify_layout_config(child, components, found, false)) { if (!this.verify_layout_child(child, components, found, false)) {
return false; return false;
} }
} }

6
src/ui/quest_editor/QuestEditorComponent.tsx
View File

@ -1,4 +1,4 @@
import GoldenLayout from "golden-layout"; import GoldenLayout, { ItemConfigType } from "golden-layout";
import Logger from "js-logger"; import Logger from "js-logger";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import React, { Component, createRef, FocusEvent, ReactNode } from "react"; import React, { Component, createRef, FocusEvent, ReactNode } from "react";
@ -28,7 +28,7 @@ const DEFAULT_LAYOUT_CONFIG = {
}, },
}; };
const DEFAULT_LAYOUT_CONTENT = [ const DEFAULT_LAYOUT_CONTENT: ItemConfigType[] = [
{ {
type: "row", type: "row",
content: [ content: [
@ -90,7 +90,7 @@ export class QuestEditorComponent extends Component {
DEFAULT_LAYOUT_CONTENT DEFAULT_LAYOUT_CONTENT
); );
const config = { const config: GoldenLayout.Config = {
...DEFAULT_LAYOUT_CONFIG, ...DEFAULT_LAYOUT_CONFIG,
content, content,
}; };