@saltcorn/markup 0.6.0-alpha.0 → 0.6.0-beta.0

package/builder.js

@@ -41,6 +41,14 @@ module.exports = (
         ? `/static_assets/${version_tag}/fonticonpicker.react.css`
         : "/fonticonpicker.react.css",
     }),
+    link({
+      rel: "stylesheet",
+      type: "text/css",
+      media: "screen",
+      href: version_tag
+        ? `/static_assets/${version_tag}/saltcorn-builder.css`
+        : "/saltcorn-builder.css",
+    }),
     div({ id: "saltcorn-builder" }),
     form(
       { action, method: "post", id: "scbuildform" },

package/form.js

@@ -104,7 +104,7 @@ const innerField = (v, errors, nameAdd = "") => (hdr) => {
       }"${maybe_disabled} data-fieldname="${text_attr(
         hdr.form_name
       )}" name="${text_attr(name)}" id="input${text_attr(name)}">${text(
-        v[hdr.form_name]
+        v[hdr.form_name] || ""
       )}</textarea>`;
     case "code":
       return `<textarea mode="${
@@ -114,7 +114,7 @@ const innerField = (v, errors, nameAdd = "") => (hdr) => {
       }"${maybe_disabled} data-fieldname="${text_attr(
         hdr.form_name
       )}" name="${text_attr(name)}" id="input${text_attr(name)}">${
-        v[hdr.form_name]
+        v[hdr.form_name] || ""
       }</textarea>`;
     case "file":
       if (hdr.attributes && hdr.attributes.select_file_where) {

package/layout.js

@@ -282,6 +282,7 @@ const render = ({ blockDispatch, layout, role, alerts, is_owner }) => {
         vAlign,
         hAlign,
         block,
+        display,
         imageSize,
         borderWidth,
         borderStyle,
@@ -307,6 +308,7 @@ const render = ({ blockDispatch, layout, role, alerts, is_owner }) => {
         fullPageWidth,
         overflow,
         rotate,
+        style,
       } = segment;
       if (hide) return "";
       if (
@@ -323,7 +325,8 @@ const render = ({ blockDispatch, layout, role, alerts, is_owner }) => {
               unit || segment[segKey + "Unit"] || "px"
             };`;
       const ppCustomCSS = (s) => (s ? s.split("\n").join("") + ";" : "");
-      const baseDisplayClass = block === false ? "inline-block" : "block";
+      const baseDisplayClass =
+        block === false ? "inline-block" : display ? display : "block";
       let displayClass = minScreenWidth
         ? `d-none d-${minScreenWidth}-${baseDisplayClass}`
         : baseDisplayClass === "block"
@@ -336,6 +339,10 @@ const render = ({ blockDispatch, layout, role, alerts, is_owner }) => {
         !segment[what] || allZero(segment[what])
           ? ""
           : `${what}: ${segment[what].map((p) => p + "px").join(" ")};`;
+      let flexStyles = "";
+      Object.keys(style || {}).forEach((k) => {
+        flexStyles += `${k}:${style[k]};`;
+      });
       return wrap(
         segment,
         isTop,
@@ -357,7 +364,7 @@ const render = ({ blockDispatch, layout, role, alerts, is_owner }) => {
             ],
             onclick: segment.url ? `location.href='${segment.url}'` : false,
 
-            style: `${ppCustomCSS(customCSS || "")}${sizeProp(
+            style: `${flexStyles}${ppCustomCSS(customCSS || "")}${sizeProp(
               "minHeight",
               "min-height"
             )}${sizeProp("height", "height")}${sizeProp(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/markup",
-  "version": "0.6.0-alpha.0",
+  "version": "0.6.0-beta.0",
   "description": "Markup for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",