aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx4
-rw-r--r--src/client/views/nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils.tsx2
-rw-r--r--src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateBackend.tsx8
3 files changed, 7 insertions, 7 deletions
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx
index 2e96465fc..a08686a36 100644
--- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx
+++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/DocCreatorMenu.tsx
@@ -112,7 +112,7 @@ export class DocCreatorMenu extends ObservableReactComponent<FieldViewProps> {
this._userTemplates.push({template: template, doc: template.mainField.renderedDoc()});
};
@action removeUserTemplate = (template: Template) => {
- this._userTemplates = this._userTemplates.filter(info => info.template === template);
+ this._userTemplates = this._userTemplates.filter(info => info.template !== template);
}
@action updateTemplatePreview = (template: Template) => {
template.renderUpdates();
@@ -897,7 +897,7 @@ export class DocCreatorMenu extends ObservableReactComponent<FieldViewProps> {
removeDocument={returnFalse}
PanelWidth={() => this._selectedTemplate === template ? 104 : 111}
PanelHeight={() => this._selectedTemplate === template ? 104 : 111}
- ScreenToLocalTransform={() => new Transform(-this._pageX - 5,-this._pageY - 35, 1)}
+ ScreenToLocalTransform={() => new Transform(-this._pageX - 5, -this._pageY - 35, 1)}
renderDepth={1}
whenChildContentsActiveChanged={emptyFunction}
focus={emptyFunction}
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils.tsx
index cfe4d2632..de542b40b 100644
--- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils.tsx
+++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils.tsx
@@ -25,7 +25,7 @@ export class FieldUtils {
doc._height = oldDoc ? oldDoc.height : parentDimensions.height;
doc._width = oldDoc ? oldDoc.width : parentDimensions.width;
doc.backgroundColor = oldDoc ? oldDoc.backgroundColor : opts.backgroundColor ?? '';
- doc._layout_borderRounding = ScriptField.MakeFunction(`${(opts.cornerRounding ?? 0) * parentDimensions.width}px`);
+ doc._layout_borderRounding = !opts.cornerRounding ? '0px' : ScriptField.MakeScript(`${opts.cornerRounding * parentDimensions.width}px`);
doc.borderColor = oldDoc ? oldDoc.borderColor : opts.borderColor;
doc.borderWidth = oldDoc ? oldDoc.borderWidth : opts.borderWidth;
doc.opacity = oldDoc ? oldDoc.opacity : opts.opacity;
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateBackend.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateBackend.tsx
index 20080e7b1..d434e98b1 100644
--- a/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateBackend.tsx
+++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu/TemplateBackend.tsx
@@ -28,8 +28,8 @@ export class TemplateLayouts {
opts: {
backgroundColor: '#C0B887',
cornerRounding: 20,
- borderColor: '#6B461F',
- borderWidth: '12',
+ //borderColor: '#6B461F',
+ //borderWidth: '12',
},
subfields: [
{
@@ -268,8 +268,8 @@ export class TemplateLayouts {
br: [414,583],
opts: {
backgroundColor: '#6CCAF0',
- borderColor: '#1088C3',
- borderWidth: '10',
+ //borderColor: '#1088C3',
+ //borderWidth: '10',
},
subfields: [
{