@goldenpine/react-form-builder2 0.20.3-build.3 → 0.20.3-build.5

package/lib/form-elements/component-label.js

@@ -13,17 +13,30 @@ var ComponentLabel = function ComponentLabel(props) {
   if (!labelText) {
     return null;
   }
+
+  // Since we use <div> to replace <span> in the label in form-elements-edit.jsx to support multiple-line labels,
+  // we need to ensure that the required label, *,  is inserted correctly.
+  // If it's simply appended the label string, it will show on a new line.
+  // The workaround is to insert it before the first closing </div> or </li> tag if it exists,
+  // so it appears at the end of the first line of the label.
+  var updatedLabel = labelText;
+  if (hasRequiredLabel) {
+    var insertSpan = '<span class="label-required" style="color:red;">*</span>';
+    var closingTagRegex = /<\/(div|li)>/i; // case-insensitive match for </div> or </li>
+
+    if (closingTagRegex.test(labelText)) {
+      updatedLabel = labelText.replace(closingTagRegex, "".concat(insertSpan, "</$1>"));
+    } else {
+      // Neither </div> nor </li> found — append at the end
+      updatedLabel = labelText + insertSpan;
+    }
+  }
   return /*#__PURE__*/_react["default"].createElement("label", {
     className: props.className || 'form-label'
   }, /*#__PURE__*/_react["default"].createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: labelText
-    }
-  }), hasRequiredLabel && /*#__PURE__*/_react["default"].createElement("span", {
-    className: "label-required",
-    style: {
-      color: "red"
+      __html: updatedLabel
     }
-  }, "*"));
+  }));
 };
 var _default = exports["default"] = ComponentLabel;

package/lib/form-elements/index.js

@@ -1057,9 +1057,9 @@ var Range = /*#__PURE__*/function (_React$Component19) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "clearfix"
       }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: "float-left"
+        className: "float-start"
       }, this.props.data.min_label), /*#__PURE__*/_react["default"].createElement("span", {
-        className: "float-right"
+        className: "float-end"
       }, this.props.data.max_label)), /*#__PURE__*/_react["default"].createElement(_reactBootstrapSlider["default"], props)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "visible_marks"
       }, visible_marks), /*#__PURE__*/_react["default"].createElement("input", {

package/lib/form-elements-edit.js

@@ -164,9 +164,9 @@ var FormElementsEdit = exports["default"] = /*#__PURE__*/function (_React$Compon
       return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
         className: "clearfix"
       }, /*#__PURE__*/_react["default"].createElement("h4", {
-        className: "float-left"
+        className: "float-start"
       }, this.props.element.text), /*#__PURE__*/_react["default"].createElement("i", {
-        className: "float-right fas fa-times dismiss-edit",
+        className: "float-end fas fa-times dismiss-edit",
         onClick: this.props.manualEditModeOff
       })), this.props.element.hasOwnProperty('content') && /*#__PURE__*/_react["default"].createElement("div", {
         className: "form-group"

package/lib/form-validator.js

@@ -85,13 +85,13 @@ var FormValidator = exports["default"] = /*#__PURE__*/function (_React$Component
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "clearfix"
       }, /*#__PURE__*/_react["default"].createElement("i", {
-        className: "fas fa-exclamation-triangle float-left"
+        className: "fas fa-exclamation-triangle float-start"
       }), /*#__PURE__*/_react["default"].createElement("ul", {
-        className: "float-left"
+        className: "float-start"
       }, errors)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "clearfix"
       }, /*#__PURE__*/_react["default"].createElement("a", {
-        className: "float-right btn btn-default btn-sm btn-danger",
+        className: "float-end btn btn-default btn-sm btn-danger",
         onClick: this.dismissModal.bind(this)
       }, /*#__PURE__*/_react["default"].createElement(_IntlMessages["default"], {
         id: "dismiss"

package/lib/multi-column/dustbin.js

@@ -61,7 +61,9 @@ function isContainer(item) {
         return true;
       }
       if (data.field_name) {
-        return data.field_name.indexOf('_col_row') > -1;
+        // Check if the field name indicates a container
+        // Fix a runtime error when dropping a fieldset inside a multi-column row - which dropping seems not supported
+        return data.field_name.indexOf('_col_row') > -1 || data.field_name.indexOf('fieldset') > -1;
       }
     }
   }

package/lib/preview.js

@@ -381,7 +381,7 @@ Preview.defaultProps = {
   files: [],
   editMode: false,
   editElement: null,
-  className: 'col-md-9 react-form-builder-preview float-left',
+  className: 'col-md-9 react-form-builder-preview float-start',
   renderEditForm: function renderEditForm(props) {
     return /*#__PURE__*/_react["default"].createElement(_formDynamicEdit["default"], props);
   }

package/lib/toolbar.js

@@ -588,7 +588,7 @@ var Toolbar = /*#__PURE__*/function (_React$Component) {
         grouped = _buildGroupItems.grouped,
         groupKeys = _buildGroupItems.groupKeys;
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "col-md-3 react-form-builder-toolbar float-right",
+        className: "col-md-3 react-form-builder-toolbar float-end",
         style: {
           position: this.state.isPinned ? 'fixed' : '',
           // set up the vertical boundary by top/bottom,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goldenpine/react-form-builder2",
-  "version": "0.20.3-build.3",
+  "version": "0.20.3-build.5",
   "description": "A complete form builder for react.",
   "main": "lib/index.js",
   "types": "types/index.d.ts",