@knovator/pagecreator-admin 1.6.10 → 1.7.1

package/index.cjs

@@ -3370,13 +3370,25 @@ const Input$1 = ({
   onChange,
   wrapperClassName
 }) => {
+  const isTextarea = type === 'textarea';
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"]('khb_input-wrapper', wrapperClassName)
   }, label && (/*#__PURE__*/React__default["default"].createElement("label", {
     className: "khb_input-label"
   }, label, required ? (/*#__PURE__*/React__default["default"].createElement("span", {
     className: "khb_input-label-required"
-  }, "*")) : null)), /*#__PURE__*/React__default["default"].createElement("input", Object.assign({
+  }, "*")) : null)), isTextarea ? (/*#__PURE__*/React__default["default"].createElement("textarea", Object.assign({
+    className: classNames__default["default"]('khb_input', `khb_input-${_size}`, className),
+    placeholder: placeholder,
+    disabled: disabled,
+    id: id,
+    value: value,
+    onChange: onChange,
+    rows: 10
+  }, rest, {
+    onInput: onInput,
+    onBlur: onBlur
+  }))) : (/*#__PURE__*/React__default["default"].createElement("input", Object.assign({
     className: classNames__default["default"]('khb_input', `khb_input-${_size}`, className),
     type: type,
     placeholder: placeholder,
@@ -3387,7 +3399,7 @@ const Input$1 = ({
   }, rest, {
     onInput: onInput,
     onBlur: onBlur
-  })), error && /*#__PURE__*/React__default["default"].createElement("p", {
+  }))), error && /*#__PURE__*/React__default["default"].createElement("p", {
     className: "khb_input-error "
   }, error), info && /*#__PURE__*/React__default["default"].createElement("p", {
     className: "khb_input-info"
@@ -7197,7 +7209,7 @@ const WidgetForm = ({
   const [collectionItemsUpdated, setCollectionItemsUpdated] = React.useState(false);
   const [tabCollectionItemsUpdated, setTabCollectionItemsUpdated] = React.useState([]);
   const [blogCategory, setBlogCategory] = React.useState(null);
-  const [blogLimit, setBlogLimit] = React.useState(10);
+  const [blogLimit, setBlogLimit] = React.useState(undefined);
   const [blogCategories, setBlogCategories] = React.useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = React.useState(false);
   const pagesLoadedRef = React.useRef(false);
@@ -7284,7 +7296,7 @@ const WidgetForm = ({
   // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   React.useEffect(() => {
     if (currentItemsType === 'blog') {
-      if (blogCategory || blogLimit > 0) {
+      if (blogCategory || blogLimit && blogLimit > 0) {
         // Clear selected collection items since server will fetch latest blogs based on category/limit
         setSelectedCollectionItems([]);
         setCollectionItemsUpdated(true);
@@ -7295,7 +7307,7 @@ const WidgetForm = ({
   React.useEffect(() => {
     if (currentItemsType !== 'blog') {
       setBlogCategory(null);
-      setBlogLimit(10);
+      setBlogLimit(undefined);
       setBlogCategories([]);
       blogCategoryInitialized.current = false;
     }
@@ -7513,6 +7525,14 @@ const WidgetForm = ({
       }
       return item;
     });
+    // Clean up fields based on widget type
+    const currentWidgetType = formData['widgetType'] || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value);
+    if (currentWidgetType !== constants.htmlWidgetTypeValue) {
+      delete formData['htmlContent'];
+    }
+    if (currentWidgetType !== constants.textWidgetTypeValue) {
+      delete formData['textContent'];
+    }
     const submitPayload = Object.assign(Object.assign(Object.assign(Object.assign({}, formData), {
       items
     }), blogCategory && {
@@ -7639,6 +7659,7 @@ const WidgetForm = ({
       required: widgetTranslations.htmlContentRequired
     },
     show: (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.htmlWidgetTypeValue,
+    wrapperClassName: 'khb_html-content-field',
     Input: customInputs && customInputs['htmlContent'] ? customInputs['htmlContent'] : undefined
   }, {
     label: widgetTranslations.itemsType,

package/index.js

@@ -3358,13 +3358,25 @@ const Input$1 = ({
   onChange,
   wrapperClassName
 }) => {
+  const isTextarea = type === 'textarea';
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('khb_input-wrapper', wrapperClassName)
   }, label && (/*#__PURE__*/React.createElement("label", {
     className: "khb_input-label"
   }, label, required ? (/*#__PURE__*/React.createElement("span", {
     className: "khb_input-label-required"
-  }, "*")) : null)), /*#__PURE__*/React.createElement("input", Object.assign({
+  }, "*")) : null)), isTextarea ? (/*#__PURE__*/React.createElement("textarea", Object.assign({
+    className: classNames('khb_input', `khb_input-${_size}`, className),
+    placeholder: placeholder,
+    disabled: disabled,
+    id: id,
+    value: value,
+    onChange: onChange,
+    rows: 10
+  }, rest, {
+    onInput: onInput,
+    onBlur: onBlur
+  }))) : (/*#__PURE__*/React.createElement("input", Object.assign({
     className: classNames('khb_input', `khb_input-${_size}`, className),
     type: type,
     placeholder: placeholder,
@@ -3375,7 +3387,7 @@ const Input$1 = ({
   }, rest, {
     onInput: onInput,
     onBlur: onBlur
-  })), error && /*#__PURE__*/React.createElement("p", {
+  }))), error && /*#__PURE__*/React.createElement("p", {
     className: "khb_input-error "
   }, error), info && /*#__PURE__*/React.createElement("p", {
     className: "khb_input-info"
@@ -7185,7 +7197,7 @@ const WidgetForm = ({
   const [collectionItemsUpdated, setCollectionItemsUpdated] = useState(false);
   const [tabCollectionItemsUpdated, setTabCollectionItemsUpdated] = useState([]);
   const [blogCategory, setBlogCategory] = useState(null);
-  const [blogLimit, setBlogLimit] = useState(10);
+  const [blogLimit, setBlogLimit] = useState(undefined);
   const [blogCategories, setBlogCategories] = useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = useState(false);
   const pagesLoadedRef = useRef(false);
@@ -7272,7 +7284,7 @@ const WidgetForm = ({
   // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   useEffect(() => {
     if (currentItemsType === 'blog') {
-      if (blogCategory || blogLimit > 0) {
+      if (blogCategory || blogLimit && blogLimit > 0) {
         // Clear selected collection items since server will fetch latest blogs based on category/limit
         setSelectedCollectionItems([]);
         setCollectionItemsUpdated(true);
@@ -7283,7 +7295,7 @@ const WidgetForm = ({
   useEffect(() => {
     if (currentItemsType !== 'blog') {
       setBlogCategory(null);
-      setBlogLimit(10);
+      setBlogLimit(undefined);
       setBlogCategories([]);
       blogCategoryInitialized.current = false;
     }
@@ -7501,6 +7513,14 @@ const WidgetForm = ({
       }
       return item;
     });
+    // Clean up fields based on widget type
+    const currentWidgetType = formData['widgetType'] || (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value);
+    if (currentWidgetType !== constants.htmlWidgetTypeValue) {
+      delete formData['htmlContent'];
+    }
+    if (currentWidgetType !== constants.textWidgetTypeValue) {
+      delete formData['textContent'];
+    }
     const submitPayload = Object.assign(Object.assign(Object.assign(Object.assign({}, formData), {
       items
     }), blogCategory && {
@@ -7627,6 +7647,7 @@ const WidgetForm = ({
       required: widgetTranslations.htmlContentRequired
     },
     show: (selectedWidgetType === null || selectedWidgetType === void 0 ? void 0 : selectedWidgetType.value) === constants.htmlWidgetTypeValue,
+    wrapperClassName: 'khb_html-content-field',
     Input: customInputs && customInputs['htmlContent'] ? customInputs['htmlContent'] : undefined
   }, {
     label: widgetTranslations.itemsType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knovator/pagecreator-admin",
-  "version": "1.6.10",
+  "version": "1.7.1",
   "dependencies": {
     "classnames": "^2.3.1",
     "react-beautiful-dnd": "^13.1.0",