f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-29 09:02:37 +00:00
Code Wiki Activity

Fix merging snippets with base snippets.

Browse Source
This commit is contained in:
Trevor Buckner
2022-08-04 22:20:29 -04:00
parent 993bcc2719
commit 3da2d094a0
3 changed files with 22 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/homebrew/editor/snippetbar/snippetbar.jsx
View File

@@ -13,6 +13,7 @@ ThemeSnippets['Legacy_5ePHB'] = require('themes/Legacy/5ePHB/snippets.js');
ThemeSnippets['V3_5ePHB'] = require('themes/V3/5ePHB/snippets.js');
ThemeSnippets['V3_5eDMG'] = require('themes/V3/5eDMG/snippets.js');
ThemeSnippets['V3_Journal'] = require('themes/V3/Journal/snippets.js');
ThemeSnippets['V3_Blank'] = require('themes/V3/Blank/snippets.js');
const execute = function(val, brew){
if(_.isFunction(val)) return val(brew);
@@ -46,7 +47,7 @@ const Snippetbar = createClass({
componentDidMount : async function() {
const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
const themePath = this.props.theme ?? '5ePHB';
let snippets = ThemeSnippets[`${rendererPath}_${themePath}`];
let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
snippets = this.compileSnippets(rendererPath, themePath, snippets);
this.setState({
snippets : snippets
@@ -57,8 +58,7 @@ const Snippetbar = createClass({
if(prevProps.renderer != this.props.renderer || prevProps.theme != this.props.theme) {
const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
const themePath = this.props.theme ?? '5ePHB';
console.log({ ThemeSnippets: ThemeSnippets });
let snippets = ThemeSnippets[`${rendererPath}_${themePath}`];
let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
snippets = this.compileSnippets(rendererPath, themePath, snippets);
this.setState({
snippets : snippets
@@ -66,9 +66,9 @@ const Snippetbar = createClass({
}
},
mergeCustomizer : function(objValue, srcValue) {
if(_.isArray(objValue)) {
const result = _.unionBy(srcValue, objValue, 'name'); // Join snippets together, with preference for the current theme over the base theme
mergeCustomizer : function(valueA, valueB, key) {
if(key == "snippets") {
const result = _.unionBy(valueB, valueA, 'name'); // Join snippets together, with preference for the current theme over the base theme
return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
}
},
@@ -76,13 +76,16 @@ const Snippetbar = createClass({
compileSnippets : function(rendererPath, themePath, snippets) {
let compiledSnippets = snippets;
const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
//console.log({ baseSnippets: ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`] });
//console.log({ themeSnippets: compiledSnippets });
let objB = _.keyBy(compiledSnippets, 'groupName');
if(baseSnippetsPath) {
compiledSnippets = _.mergeWith([], ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`], compiledSnippets, this.mergeCustomizer);
console.log({ compiledSnippets: compiledSnippets });
//this.compileSnippets(rendererPath, themePath, compiledSnippets); (for nested baseSnippets)
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`], 'groupName'));
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
}
else {
let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`], 'groupName'));
compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
}
return compiledSnippets;
},