@dosgato/templating 0.0.62 → 0.0.63

package/dist/component.d.ts

@@ -116,7 +116,7 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      */
     renderComponents(components?: RenderedComponent[] | string, opts?: {
         hideInheritBars?: boolean;
-        editBarOpts?: EditBarOpts;
+        editBarOpts?: RenderAreaEditBarOpts;
     }): string;
     /**
      * helper function to print an area and set a minimum or maximum number of components
@@ -128,8 +128,8 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
         maxWarning?: string;
         hideInheritBars?: boolean;
         newBarOpts: NewBarOpts;
-        editBarOpts: EditBarOpts;
-    }): void;
+        editBarOpts: RenderAreaEditBarOpts;
+    }): string;
     /**
      * During rendering, each component should determine the CSS blocks that it needs. This may
      * change depending on the data. For instance, if you need some CSS to style up an image, but
@@ -256,16 +256,18 @@ export interface ContextBase {
 }
 interface BarOpts {
     editMode?: boolean;
+    label?: string;
+    extraClass?: string;
 }
 export interface EditBarOpts extends BarOpts {
-    label?: string | ((c: Component) => string);
-    extraClass?: string | ((c: Component) => string);
     inheritedFrom?: string;
     disableDelete?: boolean;
 }
+export interface RenderAreaEditBarOpts extends Omit<Omit<EditBarOpts, 'label'>, 'extraClass'> {
+    label?: string | ((c: Component) => string);
+    extraClass?: string | ((c: Component) => string);
+}
 export interface NewBarOpts extends BarOpts {
-    label?: string;
-    extraClass?: string;
     disabled?: boolean;
 }
 export interface RenderedComponent<C extends Component = Component> {

package/dist/component.js

@@ -89,7 +89,15 @@ export class Component extends ResourceProvider {
     renderComponents(components = [], opts) {
         if (!Array.isArray(components))
             components = this.renderedAreas.get(components) ?? [];
-        return components.flatMap(c => c.component.inheritedFrom && opts?.hideInheritBars ? [c.output] : [c.component.editBar(opts?.editBarOpts), c.output]).join('');
+        return components
+            .flatMap(c => c.component.inheritedFrom &&
+            opts?.hideInheritBars
+            ? [c.output]
+            : [c.component.editBar({
+                    ...opts?.editBarOpts,
+                    label: typeof opts?.editBarOpts?.label === 'function' ? opts.editBarOpts.label(c.component) : opts?.editBarOpts?.label,
+                    extraClass: typeof opts?.editBarOpts?.extraClass === 'function' ? opts.editBarOpts.extraClass(c.component) : opts?.editBarOpts?.extraClass
+                }), c.output]).join('');
     }
     /**
      * helper function to print an area and set a minimum or maximum number of components
@@ -105,6 +113,7 @@ export class Component extends ResourceProvider {
         else {
             output += this.newBar(areaName, opts?.newBarOpts);
         }
+        return output;
     }
     /**
      * During rendering, each component should determine the CSS blocks that it needs. This may
@@ -157,11 +166,12 @@ export class Component extends ResourceProvider {
      * Generally should not be overridden - override editLabel and editClass instead
      */
     editBar(opts = {}) {
-        opts.label ?? (opts.label = this.editLabel() ?? this.autoLabel);
-        opts.extraClass ?? (opts.extraClass = this.editClass());
-        opts.editMode ?? (opts.editMode = this.editMode);
-        opts.inheritedFrom ?? (opts.inheritedFrom = this.inheritedFrom);
-        return Component.editBar(this.path, opts);
+        const options = { ...opts };
+        options.label ?? (options.label = this.editLabel() ?? this.autoLabel);
+        options.extraClass ?? (options.extraClass = this.editClass());
+        options.editMode ?? (options.editMode = this.editMode);
+        options.inheritedFrom ?? (options.inheritedFrom = this.inheritedFrom);
+        return Component.editBar(this.path, options);
     }
     /**
      * Components may override this function to provide a custom new bar

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/templating",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "description": "A library to support building templates for dosgato CMS.",
   "type": "module",
   "exports": {