@layer styleTab {\n${this.props.style}\n} ` }} />;
+ return
\n${this.props.style}\n` }} />;
},
renderPage : function(pageText, index){
@@ -189,7 +191,6 @@ const BrewRenderer = createClass({
const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
const themePath = this.props.theme ?? '5ePHB';
const baseThemePath = Themes[rendererPath][themePath].baseTheme;
-
return (
{!this.state.isMounted
@@ -222,7 +223,7 @@ const BrewRenderer = createClass({
&&
<>
{this.renderStyle()}
-
+
- V3.2.0 Released!
- We are happy to announce that after nearly a year of use by our many users, - we are making the V3 render mode the default setting for all new brews. - This mode has become quite popular, and has proven to be stable and powerful. - Of course, we will always keep the option to use the Legacy renderer for any - brew, which can still be accessed from the Properties menu. -
-
-
- Change to Google Drive Storage!
- We have made a change to the process of tranferring brews between Google - Drive and the Homebrewery storage. Starting now, any time a brew is - transferred, it will keep the same links instead of generating new ones! - We hope this change will help reduce issues where people "lost" their work - by trying to visit old links. + Broken default logo on CoverPage
+ If you have used the Cover Page snippet and notice the Naturalcrit + logo is showing as a broken image, this is due to some small tweaks + of this BETA feature. To fix the logo in your cover page, rename + the image link "/assets/naturalCritLogoRed.svg". Remember + that any snippet marked "BETA" may have a similar change in the + future as we encounter any bugs or reworks.
diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index de3a53a36..58e84e4fc 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -19,11 +19,6 @@ const DEFAULT_STYLE_TEXT = dedent`
color: black;
}`;
-const splice = function(str, index, inject){
- return str.slice(0, index) + inject + str.slice(index);
-};
-
-
const Editor = createClass({
displayName : 'Editor',
@@ -37,6 +32,7 @@ const Editor = createClass({
onTextChange : ()=>{},
onStyleChange : ()=>{},
onMetaChange : ()=>{},
+ reportError : ()=>{},
renderer : 'legacy'
};
@@ -80,19 +76,7 @@ const Editor = createClass({
},
handleInject : function(injectText){
- let text;
- if(this.isText()) text = this.props.brew.text;
- if(this.isStyle()) text = this.props.brew.style ?? DEFAULT_STYLE_TEXT;
-
- const lines = text.split('\n');
- const cursorPos = this.refs.codeEditor.getCursorPosition();
- lines[cursorPos.line] = splice(lines[cursorPos.line], cursorPos.ch, injectText);
-
- const injectLines = injectText.split('\n');
- this.refs.codeEditor.setCursorPosition(cursorPos.line + injectLines.length, cursorPos.ch + injectLines[injectLines.length - 1].length);
-
- if(this.isText()) this.props.onTextChange(lines.join('\n'));
- if(this.isStyle()) this.props.onStyleChange(lines.join('\n'));
+ this.refs.codeEditor?.injectText(injectText, false);
},
handleViewChange : function(newView){
@@ -154,9 +138,17 @@ const Editor = createClass({
codeMirror.addLineClass(lineNumber, 'text', 'columnSplit');
}
+ // Highlight injectors {style}
+ if(line.includes('{') && line.includes('}')){
+ const regex = /(?:^|[^{\n])({(?=((?::(?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':{}\s]*)*))\2})/gm;
+ let match;
+ while ((match = regex.exec(line)) != null) {
+ codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'injection' });
+ }
+ }
// Highlight inline spans {{content}}
if(line.includes('{{') && line.includes('}}')){
- const regex = /{{(?::(?:"[\w,\-()#%. ]*"|[\w\,\-()#%.]*)|[^"'{}\s])*\s*|}}/g;
+ const regex = /{{(?=((?::(?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':{}\s]*)*))\1 *|}}/g;
let match;
let blockCount = 0;
while ((match = regex.exec(line)) != null) {
@@ -175,7 +167,7 @@ const Editor = createClass({
// Highlight block divs {{\n Content \n}}
let endCh = line.length+1;
- const match = line.match(/^ *{{(?::(?:"[\w,\-()#%. ]*"|[\w\,\-()#%.]*)|[^"'{}\s])* *$|^ *}}$/);
+ const match = line.match(/^ *{{(?=((?::(?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':{}\s]*)*))\1 *$|^ *}}$/);
if(match)
endCh = match.index+match[0].length;
codeMirror.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
@@ -300,7 +292,8 @@ const Editor = createClass({
rerenderParent={this.rerenderParent} />
+
;
} else {
dropdown =
-
+
;
},
+ renderLanguageDropdown : function(){
+ const langCodes = ['en', 'de', 'de-ch', 'fr', 'ja', 'es', 'it', 'sv', 'ru', 'zh-Hans', 'zh-Hant'];
+ const listLanguages = ()=>{
+ return _.map(langCodes.sort(), (code, index)=>{
+ const localName = new Intl.DisplayNames([code], { type: 'language' });
+ const englishName = new Intl.DisplayNames('en', { type: 'language' });
+ return
{this.renderPages()}
diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
index f0a0f5f1f..3c706d6f7 100644
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -4,7 +4,7 @@ const createClass = require('create-react-class');
const _ = require('lodash');
const cx = require('classnames'); //Unused variable
-const DISMISS_KEY = 'dismiss_notification08-27-22';
+const DISMISS_KEY = 'dismiss_notification12-04-23';
const NotificationPopup = createClass({
displayName : 'NotificationPopup',
@@ -25,21 +25,13 @@ const NotificationPopup = createClass({
return (
<>
- We are happy to announce that after nearly a year of use by our many users, - we are making the V3 render mode the default setting for all new brews. - This mode has become quite popular, and has proven to be stable and powerful. - Of course, we will always keep the option to use the Legacy renderer for any - brew, which can still be accessed from the Properties menu. -
- We have made a change to the process of tranferring brews between Google - Drive and the Homebrewery storage. Starting now, any time a brew is - transferred, it will keep the same links instead of generating new ones! - We hope this change will help reduce issues where people "lost" their work - by trying to visit old links. + Broken default logo on CoverPage
+ If you have used the Cover Page snippet and notice the Naturalcrit + logo is showing as a broken image, this is due to some small tweaks + of this BETA feature. To fix the logo in your cover page, rename + the image link "/assets/naturalCritLogoRed.svg". Remember + that any snippet marked "BETA" may have a similar change in the + future as we encounter any bugs or reworks.
this.handleTheme(theme)} title={''}>
{`${theme.renderer} : ${theme.name}`}
+
;
});
};
@@ -168,14 +210,14 @@ const MetadataEditor = createClass({
if(this.props.metadata.renderer == 'legacy') {
dropdown =
-
+
+ 
+
{`${theme.name}`} preview
+
+
{`Themes are not supported in the Legacy Renderer`}
{`${_.upperFirst(currentTheme.renderer)} : ${currentTheme.name}`}
@@ -190,6 +232,47 @@ const MetadataEditor = createClass({
+ {`${code}`}
+
;
+ });
+ };
+
+ const debouncedHandleFieldChange = _.debounce(this.handleFieldChange, 500);
+
+ return {`${localName.of(code)}`}
+
+
+
;
+ },
+
renderRenderOptions : function(){
if(!global.enable_v3) return;
@@ -225,24 +308,26 @@ const MetadataEditor = createClass({
render : function(){
return
+ this.handleLanguage(value)}
+ onEntry={(e)=>{
+ e.target.setCustomValidity(''); //Clear the validation popup while typing
+ debouncedHandleFieldChange('lang', e);
+ }}
+ options={listLanguages()}
+ autoSuggest={{
+ suggestMethod : 'startsWith',
+ clearAutoSuggestOnClick : true,
+ filterOn : ['data-value', 'data-detail', 'title']
+ }}
+ >
+
+ Sets the HTML Lang property for your brew. May affect hyphenation or spellcheck.
+
+
+
+
Brew
+
this.handleFieldChange('title', e)} />
-